commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1814146 - in /commons/proper/daemon/trunk/src/native/windows: apps/prunmgr/prunmgr.c src/gui.c
Date Fri, 03 Nov 2017 09:07:10 GMT
Author: markt
Date: Fri Nov  3 09:07:10 2017
New Revision: 1814146

URL: http://svn.apache.org/viewvc?rev=1814146&view=rev
Log:
UNICODE is always defined (more work to do on this)

Modified:
    commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c
    commons/proper/daemon/trunk/src/native/windows/src/gui.c

Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c?rev=1814146&r1=1814145&r2=1814146&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c Fri Nov  3 09:07:10
2017
@@ -1711,15 +1711,7 @@ int WINAPI WinMain(HINSTANCE hInstance,
                             lpCmdline->szApplication);
         goto cleanup;
     }
-#ifdef _UNICODE
     _gui_store = apxGuiInitialize(MainWndProc, lpCmdline->szApplication);
-#else
-    {
-        CHAR szApp[MAX_PATH];
-        _gui_store = apxGuiInitialize(MainWndProc,
-                                  WideToAscii(lpCmdline->szApplication, szApp));
-    }
-#endif
     if (!_gui_store) {
         if (!quiet)
             apxDisplayError(TRUE, NULL, 0, "Unable to initialize GUI manager");

Modified: commons/proper/daemon/trunk/src/native/windows/src/gui.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/gui.c?rev=1814146&r1=1814145&r2=1814146&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/src/gui.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/src/gui.c Fri Nov  3 09:07:10 2017
@@ -846,10 +846,6 @@ static void __apxSelectUserCreateCbex(HW
     DWORD               res;
     HWND hCombo = GetDlgItem(hDlg, IDSU_COMBO);
 
-#ifndef _UNICODE
-    SendMessageW(hCombo, CBEM_SETUNICODEFORMAT, TRUE, 0);    
-#endif
-
     cbEi.mask = CBEIF_TEXT | CBEIF_INDENT |
                 CBEIF_IMAGE | CBEIF_SELECTEDIMAGE;
 



Mime
View raw message