Ros-diffs May 2015

ros-diffs@reactos.org

15 participants
500 discussions

[cfinck] 67694: - Fix the importlib order for the GNU linker according to Amine's suggestion. - Add PSEH for winspool.

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue May 12 14:56:54 2015 New Revision: 67694 URL: http://svn.reactos.org/svn/reactos?rev=67694&view=rev Log: - Fix the importlib order for the GNU linker according to Amine's suggestion. - Add PSEH for winspool. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt [iso-8859-1] Tue May 12 14:56:54 2015 @@ -14,6 +14,6 @@ set_module_type(spoolss win32dll UNICODE) target_link_libraries(spoolss wine) -add_importlibs(spoolss msvcrt kernel32 advapi32 ntdll) +add_importlibs(spoolss advapi32 msvcrt kernel32 ntdll) add_pch(spoolss precomp.h SOURCE) add_cd_file(TARGET spoolss DESTINATION reactos/system32 FOR all) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt [iso-8859-1] Tue May 12 14:56:54 2015 @@ -14,6 +14,6 @@ set_module_type(spoolsv win32cui UNICODE) target_link_libraries(spoolsv wine) add_delay_importlibs(spoolsv spoolss) -add_importlibs(spoolsv msvcrt kernel32 advapi32 ntdll rpcrt4) +add_importlibs(spoolsv advapi32 rpcrt4 msvcrt kernel32 ntdll) add_pch(spoolsv precomp.h SOURCE) add_cd_file(TARGET spoolsv DESTINATION reactos/system32 FOR all) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt [iso-8859-1] Tue May 12 14:56:54 2015 @@ -16,7 +16,7 @@ set_target_properties(winspool PROPERTIES SUFFIX ".drv") set_module_type(winspool win32dll UNICODE) -target_link_libraries(winspool wine) -add_importlibs(winspool kernel32 msvcrt ntdll rpcrt4) +target_link_libraries(winspool wine ${PSEH_LIB}) +add_importlibs(winspool rpcrt4 msvcrt kernel32 ntdll) add_pch(winspool precomp.h SOURCE) add_cd_file(TARGET winspool DESTINATION reactos/system32 FOR all)

9 years, 7 months

[cfinck] 67693: - Add a dummy winspool.drv SpoolerInit doing an RPC call to a dummy RpcSpoolerInit, which itself passes the call to a dummy spoolss.dll SpoolerInit. This serves as an example to sho...

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue May 12 14:43:25 2015 New Revision: 67693 URL: http://svn.reactos.org/svn/reactos?rev=67693&view=rev Log: - Add a dummy winspool.drv SpoolerInit doing an RPC call to a dummy RpcSpoolerInit, which itself passes the call to a dummy spoolss.dll SpoolerInit. This serves as an example to show how I expect most spooler functions to work. - Implement the publicly exported and fundamental RevertToPrinterSelf and ImpersonatePrinterClient spoolss.dll functions. - Fix WINSPOOL_HANDLE_bind. - Fix build with GCC. Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/context.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/init.c (with props) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/precomp.h branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcstubs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt [iso-8859-1] Tue May 12 14:43:25 2015 @@ -2,6 +2,7 @@ spec2def(spoolss spoolss.spec ADD_IMPORTLIB) list(APPEND SOURCE + context.c main.c precomp.h) @@ -13,6 +14,6 @@ set_module_type(spoolss win32dll UNICODE) target_link_libraries(spoolss wine) -add_importlibs(spoolss kernel32 msvcrt ntdll) +add_importlibs(spoolss msvcrt kernel32 advapi32 ntdll) add_pch(spoolss precomp.h SOURCE) add_cd_file(TARGET spoolss DESTINATION reactos/system32 FOR all) Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/context.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/context.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/context.c [iso-8859-1] Tue May 12 14:43:25 2015 @@ -0,0 +1,62 @@ +/* + * PROJECT: ReactOS Spooler Router + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Functions related to switching between security contexts + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +/** + * @see RevertToPrinterSelf + */ +BOOL WINAPI +ImpersonatePrinterClient(HANDLE hToken) +{ + if (!hToken) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!SetThreadToken(NULL, hToken)) + { + ERR("SetThreadToken failed with error %u!\n", GetLastError()); + CloseHandle(hToken); + return FALSE; + } + + CloseHandle(hToken); + return TRUE; +} + +/** + * RevertToPrinterSelf reverts the security context from the current user's context back to the process context. + * As spoolss.dll is used by spoolsv.exe, this is usually the SYSTEM security context. + * + * Unlike the traditional ImpersonateClient and then RevertToSelf approach, we do it the other way round here, + * because spoolss.dll is delay-loaded by spoolsv.exe in the current user's context. Use RevertToPrinterSelf then to + * return to the SYSTEM context for specific tasks. + */ +HANDLE WINAPI +RevertToPrinterSelf() +{ + HANDLE hToken; + + // Retrieve our current impersonation token + if (!OpenThreadToken(GetCurrentThread(), TOKEN_IMPERSONATE, TRUE, &hToken)) + { + ERR("OpenThreadToken failed with error %u!\n", GetLastError()); + return NULL; + } + + // Tell the thread to stop impersonating + if (!SetThreadToken(NULL, NULL)) + { + ERR("SetThreadToken failed with error %u!\n", GetLastError()); + return NULL; + } + + // Return the token required for reverting back to impersonation in ImpersonatePrinterClient + return hToken; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/context.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/main.c [iso-8859-1] Tue May 12 14:43:25 2015 @@ -67,6 +67,13 @@ return 0; } +DWORD WINAPI +SpoolerInit() +{ + // Nothing to do here yet + return ERROR_SUCCESS; +} + BOOL WINAPI StartPagePrinter(HANDLE hPrinter) { Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] Tue May 12 14:43:25 2015 @@ -89,7 +89,7 @@ @ stdcall GetPrintProcessorDirectoryW(wstr wstr long ptr long ptr) @ stub GetServerPolicy @ stub GetShrinkedSize -@ stub ImpersonatePrinterClient +@ stdcall ImpersonatePrinterClient(long) @ stdcall InitializeRouter(long) @ stub IsNamedPipeRpcCall @ stub LoadDriver @@ -122,7 +122,7 @@ @ stub ReplyOpenPrinter @ stub ReplyPrinterChangeNotification @ stub ResetPrinterW -@ stub RevertToPrinterSelf +@ stdcall RevertToPrinterSelf() @ stub RouterAllocBidiMem @ stub RouterAllocBidiResponseContainer @ stub RouterAllocPrinterNotifyInfo @@ -161,7 +161,7 @@ @ stub SpoolerFindNextPrinterChangeNotification @ stub SpoolerFreePrinterNotifyInfo @ stub SpoolerHasInitialized -@ stub SpoolerInit +@ stdcall SpoolerInit() @ stdcall StartDocPrinterW(long long ptr) @ stdcall StartPagePrinter(long) @ stub UndoAlignKMPtr Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/CMakeLists.txt [iso-8859-1] Tue May 12 14:43:25 2015 @@ -3,6 +3,7 @@ add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/winspool.idl) list(APPEND SOURCE + init.c main.c rpcserver.c rpcstubs.c @@ -12,7 +13,7 @@ add_executable(spoolsv ${SOURCE} spoolsv.rc) set_module_type(spoolsv win32cui UNICODE) target_link_libraries(spoolsv wine) -add_importlibs(spoolsv advapi32 kernel32 msvcrt ntdll rpcrt4) add_delay_importlibs(spoolsv spoolss) +add_importlibs(spoolsv msvcrt kernel32 advapi32 ntdll rpcrt4) add_pch(spoolsv precomp.h SOURCE) add_cd_file(TARGET spoolsv DESTINATION reactos/system32 FOR all) Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/init.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/init.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/init.c [iso-8859-1] Tue May 12 14:43:25 2015 @@ -0,0 +1,33 @@ +/* + * PROJECT: ReactOS Print Spooler Service + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Various initialization functions + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +DWORD +_RpcSpoolerInit() +{ + DWORD ErrorCode; + + // Call SpoolerInit in the security context of the client. + // This delay-loads spoolss.dll in the user context and all further calls to functions in spoolss.dll will be done in the user context as well. + ErrorCode = RpcImpersonateClient(NULL); + if (ErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with status %u!\n", ErrorCode); + return ErrorCode; + } + + ErrorCode = SpoolerInit(); + if (ErrorCode != ERROR_SUCCESS) + { + ERR("SpoolerInit failed with status %u!\n", ErrorCode); + RpcRevertToSelf(); + return ErrorCode; + } + + return RpcRevertToSelf(); +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/init.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/precomp.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/precomp.h [iso-8859-1] Tue May 12 14:43:25 2015 @@ -19,4 +19,7 @@ // rpcserver.c extern DWORD WINAPI RpcThreadProc(LPVOID lpParameter); +// Undocumented spoolss +DWORD WINAPI SpoolerInit(); + #endif Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcstubs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcstubs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcstubs.c [iso-8859-1] Tue May 12 14:43:25 2015 @@ -449,13 +449,6 @@ } DWORD -_RpcSpoolerInit() -{ - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; -} - -DWORD _RpcResetPrinterEx() { UNIMPLEMENTED; Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c [iso-8859-1] Tue May 12 14:43:25 2015 @@ -15,7 +15,7 @@ RPC_STATUS Status; // Get us a string binding handle from the supplied connection information - Status = RpcStringBindingComposeW(NULL, L"ncacn_np", wszStringBinding, L"\\pipe\\spoolss", NULL, &wszStringBinding); + Status = RpcStringBindingComposeW(NULL, L"ncacn_np", wszName, L"\\pipe\\spoolss", NULL, &wszStringBinding); if (Status != RPC_S_OK) { ERR("RpcStringBindingComposeW failed with status %u!\n", Status); @@ -209,8 +209,8 @@ if (pDefault->pDevMode) { // Fixed size strings, so no additional memory needs to be allocated - MultiByteToWideChar(CP_ACP, 0, pDefault->pDevMode->dmDeviceName, -1, wDevMode.dmDeviceName, sizeof(wDevMode.dmDeviceName) / sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, pDefault->pDevMode->dmFormName, -1, wDevMode.dmFormName, sizeof(wDevMode.dmFormName) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pDefault->pDevMode->dmDeviceName, -1, wDevMode.dmDeviceName, sizeof(wDevMode.dmDeviceName) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pDefault->pDevMode->dmFormName, -1, wDevMode.dmFormName, sizeof(wDevMode.dmFormName) / sizeof(WCHAR)); // Use CopyMemory to copy over several structure values in one step CopyMemory(&wDevMode.dmSpecVersion, &pDefault->pDevMode->dmSpecVersion, (ULONG_PTR)&wDevMode.dmCollate - (ULONG_PTR)&wDevMode.dmSpecVersion + sizeof(wDevMode.dmCollate)); @@ -272,6 +272,32 @@ return ReturnValue; } +BOOL WINAPI +SpoolerInit() +{ + BOOL ReturnValue = FALSE; + DWORD ErrorCode; + + // Nothing to initialize here yet, but pass this call to the Spool Service as well. + RpcTryExcept + { + ErrorCode = _RpcSpoolerInit(); + if (ErrorCode) + { + ERR("_RpcSpoolerInit failed with error %u!\n", ErrorCode); + } + + ReturnValue = (ErrorCode == ERROR_SUCCESS); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ERR("_RpcSpoolerInit failed with exception code %u!\n", RpcExceptionCode()); + } + RpcEndExcept; + + return ReturnValue; +} + DWORD WINAPI StartDocPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo) { Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec [iso-8859-1] Tue May 12 14:43:25 2015 @@ -157,7 +157,7 @@ @ stub SetPrinterW @ stub SplDriverUnloadComplete @ stub SpoolerDevQueryPrintW -@ stub SpoolerInit +@ stdcall SpoolerInit() @ stub SpoolerPrinterEvent @ stub StartDocDlgA @ stub StartDocDlgW

9 years, 7 months

[akhaldi] 67692: [WINMINE] Sync with Wine Staging 1.7.37 while keeping our own resources. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue May 12 14:40:23 2015 New Revision: 67692 URL: http://svn.reactos.org/svn/reactos?rev=67692&view=rev Log: [WINMINE] Sync with Wine Staging 1.7.37 while keeping our own resources. CORE-9246 Modified: trunk/reactos/base/applications/games/winmine/CMakeLists.txt trunk/reactos/base/applications/games/winmine/dialog.c trunk/reactos/base/applications/games/winmine/lang/bg-BG.rc trunk/reactos/base/applications/games/winmine/lang/cs-CZ.rc trunk/reactos/base/applications/games/winmine/lang/da-DK.rc trunk/reactos/base/applications/games/winmine/lang/de-DE.rc trunk/reactos/base/applications/games/winmine/lang/en-US.rc trunk/reactos/base/applications/games/winmine/lang/es-ES.rc trunk/reactos/base/applications/games/winmine/lang/fi-FI.rc trunk/reactos/base/applications/games/winmine/lang/fr-FR.rc trunk/reactos/base/applications/games/winmine/lang/he-IL.rc trunk/reactos/base/applications/games/winmine/lang/it-IT.rc trunk/reactos/base/applications/games/winmine/lang/ja-JP.rc trunk/reactos/base/applications/games/winmine/lang/ko-KR.rc trunk/reactos/base/applications/games/winmine/lang/lt-LT.rc trunk/reactos/base/applications/games/winmine/lang/nl-NL.rc trunk/reactos/base/applications/games/winmine/lang/no-NO.rc trunk/reactos/base/applications/games/winmine/lang/pl-PL.rc trunk/reactos/base/applications/games/winmine/lang/pt-PT.rc trunk/reactos/base/applications/games/winmine/lang/ro-RO.rc trunk/reactos/base/applications/games/winmine/lang/ru-RU.rc trunk/reactos/base/applications/games/winmine/lang/sl-SI.rc trunk/reactos/base/applications/games/winmine/lang/sq-AL.rc trunk/reactos/base/applications/games/winmine/lang/sv-SE.rc trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc trunk/reactos/base/applications/games/winmine/lang/uk-UA.rc trunk/reactos/base/applications/games/winmine/lang/zh-CN.rc trunk/reactos/base/applications/games/winmine/lang/zh-TW.rc trunk/reactos/base/applications/games/winmine/main.c trunk/reactos/base/applications/games/winmine/main.h trunk/reactos/base/applications/games/winmine/resource.h trunk/reactos/base/applications/games/winmine/rsrc.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/games/winmine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/CMakeLists.txt [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ main.h) add_executable(winmine ${SOURCE} rsrc.rc) -set_module_type(winmine win32gui) +set_module_type(winmine win32gui UNICODE) target_link_libraries(winmine wine) add_importlibs(winmine user32 gdi32 advapi32 shell32 msvcrt kernel32 ntdll) add_pch(winmine main.h SOURCE) Modified: trunk/reactos/base/applications/games/winmine/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/dialog.c [iso-8859-1] Tue May 12 14:40:23 2015 @@ -59,16 +59,15 @@ switch( uMsg ) { case WM_INITDIALOG: p_board = (BOARD*) lParam; - SetDlgItemText( hDlg, IDC_EDITNAME, - p_board->best_name[p_board->difficulty] ); + SetDlgItemTextW( hDlg, IDC_EDITNAME, p_board->best_name[p_board->difficulty] ); return TRUE; case WM_COMMAND: switch( LOWORD( wParam ) ) { case IDOK: - GetDlgItemText( hDlg, IDC_EDITNAME, - p_board->best_name[p_board->difficulty], - sizeof( p_board->best_name[p_board->difficulty] ) ); + GetDlgItemTextW( hDlg, IDC_EDITNAME, + p_board->best_name[p_board->difficulty], + sizeof( p_board->best_name[p_board->difficulty] ) / sizeof(WCHAR) ); EndDialog( hDlg, 0 ); return TRUE; @@ -92,7 +91,7 @@ /* set best names */ for( i = 0; i < 3; i++ ) - SetDlgItemText( hDlg, (IDC_NAME1) + i, p_board->best_name[i] ); + SetDlgItemTextW( hDlg, (IDC_NAME1) + i, p_board->best_name[i] ); /* set best times */ for( i = 0; i < 3; i++ ) Modified: trunk/reactos/base/applications/games/winmine/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/bg-BG.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "ÐÐ°&ÑÑÑÐ¾Ð¹ÐºÐ¸" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/cs-CZ.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "N&astavenÃ" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/da-DK.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Ophavsret 2000 tilhÃ¸rer Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&Indstillinger" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/de-DE.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&Optionen" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/en-US.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&Options" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/es-ES.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&Opciones" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/fi-FI.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&Valinnat" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/fr-FR.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&Options" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/he-IL.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&××¤×©×¨××××ª" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/it-IT.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&Opzioni" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/ja-JP.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "ãªãã·ã§ã³(&O)" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/ko-KR.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "ìµì(&O)" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/lt-LT.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Autoriaus teisÄs 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&Parinktys" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/nl-NL.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&Opties" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/no-NO.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Kopirett 2000 tilhÃ¸rer Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&Innstillinger" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/pl-PL.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&Opcje" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/pt-PT.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&OpÃ§Ãµes" BEGIN @@ -38,7 +38,7 @@ IDS_ABOUT "Direitos de autor 2000, Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&OpÃ§Ãµes" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/ro-RO.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -8,7 +8,7 @@ IDS_ABOUT "Drept de autor 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "J&oc" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/ru-RU.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&ÐÐ³ÑÐ°" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/sl-SI.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&MoÅ¾nosti" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/sq-AL.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -11,7 +11,7 @@ IDS_ABOUT "Te Drejtat 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&Opsione" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/sv-SE.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "A&lternativ" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -9,7 +9,7 @@ IDS_ABOUT "Telif HakkÄ±: 2000 - Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&SeÃ§enekler" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/uk-UA.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "&ÐÑÐ°" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/zh-CN.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "éé¡¹(&O)" BEGIN Modified: trunk/reactos/base/applications/games/winmine/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/zh-TW.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -7,7 +7,7 @@ IDS_ABOUT "Copyright 2000 Joshua Thielen" END -MENU_WINEMINE MENU +IDM_WINEMINE MENU BEGIN POPUP "é¸é (&O)" BEGIN Modified: trunk/reactos/base/applications/games/winmine/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/main.c [iso-8859-1] Tue May 12 14:40:23 2015 @@ -32,8 +32,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(winemine); static const DWORD wnd_style = WS_OVERLAPPEDWINDOW & ~WS_THICKFRAME & ~WS_MAXIMIZEBOX; -static const char* registry_key = "Software\\Microsoft\\WinMine"; - +static const WCHAR registry_key[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','M','i','n','e',0}; + +static const WCHAR xposW[] = {'X','p','o','s',0}; +static const WCHAR yposW[] = {'Y','p','o','s',0}; +static const WCHAR heightW[] = {'H','e','i','g','h','t',0}; +static const WCHAR widthW[] = {'W','i','d','t','h',0}; +static const WCHAR minesW[] = {'M','i','n','e','s',0}; +static const WCHAR difficultyW[] = {'D','i','f','f','i','c','u','l','t','y',0}; +static const WCHAR markW[] = {'M','a','r','k',0}; +static const WCHAR nameW[] = {'N','a','m','e','%','u',0}; +static const WCHAR timeW[] = {'T','i','m','e','%','u',0}; void CheckLevel( BOARD *p_board ) { @@ -61,62 +72,61 @@ DWORD size; DWORD type; HKEY hkey; - char data[MAX_PLAYER_NAME_SIZE+1]; - char key_name[8]; + WCHAR data[MAX_PLAYER_NAME_SIZE+1]; + WCHAR key_name[8]; unsigned i; - RegOpenKeyEx( HKEY_CURRENT_USER, registry_key, - 0, KEY_QUERY_VALUE, &hkey ); + RegOpenKeyExW( HKEY_CURRENT_USER, registry_key, 0, KEY_QUERY_VALUE, &hkey ); size = sizeof( p_board->pos.x ); - if( !RegQueryValueEx( hkey, "Xpos", NULL, &type, + if( !RegQueryValueExW( hkey, xposW, NULL, &type, (LPBYTE) &p_board->pos.x, &size ) == ERROR_SUCCESS ) p_board->pos.x = 0; size = sizeof( p_board->pos.y ); - if( !RegQueryValueEx( hkey, "Ypos", NULL, &type, + if( !RegQueryValueExW( hkey, yposW, NULL, &type, (LPBYTE) &p_board->pos.y, &size ) == ERROR_SUCCESS ) p_board->pos.y = 0; size = sizeof( p_board->rows ); - if( !RegQueryValueEx( hkey, "Height", NULL, &type, + if( !RegQueryValueExW( hkey, heightW, NULL, &type, (LPBYTE) &p_board->rows, &size ) == ERROR_SUCCESS ) p_board->rows = BEGINNER_ROWS; size = sizeof( p_board->cols ); - if( !RegQueryValueEx( hkey, "Width", NULL, &type, + if( !RegQueryValueExW( hkey, widthW, NULL, &type, (LPBYTE) &p_board->cols, &size ) == ERROR_SUCCESS ) p_board->cols = BEGINNER_COLS; size = sizeof( p_board->mines ); - if( !RegQueryValueEx( hkey, "Mines", NULL, &type, + if( !RegQueryValueExW( hkey, minesW, NULL, &type, (LPBYTE) &p_board->mines, &size ) == ERROR_SUCCESS ) p_board->mines = BEGINNER_MINES; size = sizeof( p_board->difficulty ); - if( !RegQueryValueEx( hkey, "Difficulty", NULL, &type, + if( !RegQueryValueExW( hkey, difficultyW, NULL, &type, (LPBYTE) &p_board->difficulty, &size ) == ERROR_SUCCESS ) p_board->difficulty = BEGINNER; size = sizeof( p_board->IsMarkQ ); - if( !RegQueryValueEx( hkey, "Mark", NULL, &type, + if( !RegQueryValueExW( hkey, markW, NULL, &type, (LPBYTE) &p_board->IsMarkQ, &size ) == ERROR_SUCCESS ) p_board->IsMarkQ = TRUE; for( i = 0; i < 3; i++ ) { - wsprintf( key_name, "Name%u", i+1 ); + wsprintfW( key_name, nameW, i+1 ); size = sizeof( data ); - if( RegQueryValueEx( hkey, key_name, NULL, &type, + if( RegQueryValueExW( hkey, key_name, NULL, &type, (LPBYTE) data, &size ) == ERROR_SUCCESS ) - lstrcpynA( p_board->best_name[i], data, sizeof(p_board->best_name[i]) ); + lstrcpynW( p_board->best_name[i], data, sizeof(p_board->best_name[i])/sizeof(WCHAR) ); else - LoadString( p_board->hInst, IDS_NOBODY, p_board->best_name[i], MAX_PLAYER_NAME_SIZE+1 ); + LoadStringW( p_board->hInst, IDS_NOBODY, p_board->best_name[i], MAX_PLAYER_NAME_SIZE+1 ); } for( i = 0; i < 3; i++ ) { - wsprintf( key_name, "Time%u", i+1 ); + wsprintfW( key_name, timeW, i+1 ); size = sizeof( p_board->best_time[i] ); - if( !RegQueryValueEx( hkey, key_name, NULL, &type, + if( !RegQueryValueExW( hkey, key_name, NULL, &type, (LPBYTE) &p_board->best_time[i], &size ) == ERROR_SUCCESS ) p_board->best_time[i] = 999; } @@ -127,9 +137,9 @@ { HMENU hMenu; - p_board->hMinesBMP = LoadBitmap( p_board->hInst, "mines"); - p_board->hFacesBMP = LoadBitmap( p_board->hInst, "faces"); - p_board->hLedsBMP = LoadBitmap( p_board->hInst, "leds"); + p_board->hMinesBMP = LoadBitmapW( p_board->hInst, MAKEINTRESOURCEW(IDI_MINES)); + p_board->hFacesBMP = LoadBitmapW( p_board->hInst, MAKEINTRESOURCEW(IDI_FACES)); + p_board->hLedsBMP = LoadBitmapW( p_board->hInst, MAKEINTRESOURCEW(IDI_LEDS)); LoadBoard( p_board ); @@ -147,32 +157,32 @@ { HKEY hkey; unsigned i; - char data[MAX_PLAYER_NAME_SIZE+1]; - char key_name[8]; - - if( RegCreateKeyEx( HKEY_CURRENT_USER, registry_key, + WCHAR data[MAX_PLAYER_NAME_SIZE+1]; + WCHAR key_name[8]; + + if( RegCreateKeyExW( HKEY_CURRENT_USER, registry_key, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, NULL ) != ERROR_SUCCESS) return; - RegSetValueEx( hkey, "Xpos", 0, REG_DWORD, (LPBYTE) &p_board->pos.x, sizeof(p_board->pos.x) ); - RegSetValueEx( hkey, "Ypos", 0, REG_DWORD, (LPBYTE) &p_board->pos.y, sizeof(p_board->pos.y) ); - RegSetValueEx( hkey, "Difficulty", 0, REG_DWORD, (LPBYTE) &p_board->difficulty, sizeof(p_board->difficulty) ); - RegSetValueEx( hkey, "Height", 0, REG_DWORD, (LPBYTE) &p_board->rows, sizeof(p_board->rows) ); - RegSetValueEx( hkey, "Width", 0, REG_DWORD, (LPBYTE) &p_board->cols, sizeof(p_board->cols) ); - RegSetValueEx( hkey, "Mines", 0, REG_DWORD, (LPBYTE) &p_board->mines, sizeof(p_board->mines) ); - RegSetValueEx( hkey, "Mark", 0, REG_DWORD, (LPBYTE) &p_board->IsMarkQ, sizeof(p_board->IsMarkQ) ); + RegSetValueExW( hkey, xposW, 0, REG_DWORD, (LPBYTE) &p_board->pos.x, sizeof(p_board->pos.x) ); + RegSetValueExW( hkey, yposW, 0, REG_DWORD, (LPBYTE) &p_board->pos.y, sizeof(p_board->pos.y) ); + RegSetValueExW( hkey, difficultyW, 0, REG_DWORD, (LPBYTE) &p_board->difficulty, sizeof(p_board->difficulty) ); + RegSetValueExW( hkey, heightW, 0, REG_DWORD, (LPBYTE) &p_board->rows, sizeof(p_board->rows) ); + RegSetValueExW( hkey, widthW, 0, REG_DWORD, (LPBYTE) &p_board->cols, sizeof(p_board->cols) ); + RegSetValueExW( hkey, minesW, 0, REG_DWORD, (LPBYTE) &p_board->mines, sizeof(p_board->mines) ); + RegSetValueExW( hkey, markW, 0, REG_DWORD, (LPBYTE) &p_board->IsMarkQ, sizeof(p_board->IsMarkQ) ); for( i = 0; i < 3; i++ ) { - wsprintf( key_name, "Name%u", i+1 ); - lstrcpyn( data, p_board->best_name[i], sizeof( data ) ); - RegSetValueEx( hkey, key_name, 0, REG_SZ, (LPBYTE) data, strlen(data)+1 ); + wsprintfW( key_name, nameW, i+1 ); + lstrcpynW( data, p_board->best_name[i], sizeof(data)/sizeof(WCHAR) ); + RegSetValueExW( hkey, key_name, 0, REG_SZ, (LPBYTE) data, (lstrlenW(data)+1) * sizeof(WCHAR) ); } for( i = 0; i < 3; i++ ) { - wsprintf( key_name, "Time%u", i+1 ); - RegSetValueEx( hkey, key_name, 0, REG_DWORD, (LPBYTE) &p_board->best_time[i], sizeof(p_board->best_time[i]) ); + wsprintfW( key_name, timeW, i+1 ); + RegSetValueExW( hkey, key_name, 0, REG_DWORD, (LPBYTE) &p_board->best_time[i], sizeof(p_board->best_time[i]) ); } RegCloseKey( hkey ); } @@ -189,7 +199,7 @@ HMENU hMenu; if ( difficulty == CUSTOM ) - if (DialogBoxParam( p_board->hInst, "DLG_CUSTOM", p_board->hWnd, + if (DialogBoxParamW( p_board->hInst, MAKEINTRESOURCEW(DLG_CUSTOM), p_board->hWnd, CustomDlgProc, (LPARAM) p_board) != 0) return; @@ -245,7 +255,7 @@ /* ... and move it into the work area (ie excluding task bar)*/ mi.cbSize = sizeof(mi); - GetMonitorInfo(hMonitor, &mi); + GetMonitorInfoW(hMonitor, &mi); ShiftBetween(&rect->left, &rect->right, mi.rcWork.left, mi.rcWork.right); ShiftBetween(&rect->top, &rect->bottom, mi.rcWork.top, mi.rcWork.bottom); @@ -820,11 +830,10 @@ p_board->time < p_board->best_time[p_board->difficulty] ) { p_board->best_time[p_board->difficulty] = p_board->time; - DialogBoxParam( p_board->hInst, "DLG_CONGRATS", hWnd, - CongratsDlgProc, (LPARAM) p_board); - - DialogBoxParam( p_board->hInst, "DLG_TIMES", hWnd, - TimesDlgProc, (LPARAM) p_board); + DialogBoxParamW( p_board->hInst, MAKEINTRESOURCEW(DLG_CONGRATS), hWnd, + CongratsDlgProc, (LPARAM) p_board); + DialogBoxParamW( p_board->hInst, MAKEINTRESOURCEW(DLG_TIMES), hWnd, + TimesDlgProc, (LPARAM) p_board); } } TestFace( p_board, pt, msg ); @@ -840,7 +849,7 @@ switch( msg ) { case WM_CREATE: - board.hInst = ((LPCREATESTRUCT) lParam)->hInstance; + board.hInst = ((LPCREATESTRUCTW) lParam)->hInstance; board.hWnd = hWnd; InitBoard( &board ); CreateBoard( &board ); @@ -884,7 +893,7 @@ case WM_LBUTTONDOWN: WINE_TRACE("WM_LBUTTONDOWN\n"); - if( wParam & (MK_RBUTTON | MK_SHIFT) ) + if( wParam & MK_RBUTTON ) msg = WM_MBUTTONDOWN; TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); SetCapture( hWnd ); @@ -892,7 +901,7 @@ case WM_LBUTTONUP: WINE_TRACE("WM_LBUTTONUP\n"); - if( wParam & (MK_RBUTTON | MK_SHIFT) ) + if( wParam & MK_RBUTTON ) msg = WM_MBUTTONUP; TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); ReleaseCapture(); @@ -979,12 +988,12 @@ return 0; case IDM_EXIT: - SendMessage( hWnd, WM_CLOSE, 0, 0); + SendMessageW( hWnd, WM_CLOSE, 0, 0); return 0; case IDM_TIMES: - DialogBoxParam( board.hInst, "DLG_TIMES", hWnd, - TimesDlgProc, (LPARAM) &board); + DialogBoxParamW( board.hInst, MAKEINTRESOURCEW(DLG_TIMES), hWnd, + TimesDlgProc, (LPARAM) &board); return 0; case IDM_ABOUT: @@ -1001,18 +1010,18 @@ break; } } - return( DefWindowProc( hWnd, msg, wParam, lParam )); -} - -int WINAPI WinMain( HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow ) + return DefWindowProcW( hWnd, msg, wParam, lParam ); +} + +int WINAPI wWinMain( HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow ) { MSG msg; - WNDCLASSEX wc; + WNDCLASSEXW wc; HWND hWnd; HACCEL haccel; - char appname[20]; - - LoadString( hInst, IDS_APPNAME, appname, sizeof(appname)); + WCHAR appname[20]; + + LoadStringW( hInst, IDS_APPNAME, appname, sizeof(appname)/sizeof(WCHAR)); wc.cbSize = sizeof(wc); wc.style = 0; @@ -1020,16 +1029,16 @@ wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = hInst; - wc.hIcon = LoadIcon( hInst, "WINEMINE" ); - wc.hCursor = LoadCursor( 0, IDI_APPLICATION ); + wc.hIcon = LoadIconW( hInst, MAKEINTRESOURCEW(IDI_WINEMINE) ); + wc.hCursor = LoadCursorW( 0, (LPWSTR)IDI_APPLICATION ); wc.hbrBackground = GetSysColorBrush(COLOR_BTNFACE); //MOD for ROS - wc.lpszMenuName = "MENU_WINEMINE"; + wc.lpszMenuName = MAKEINTRESOURCEW(IDM_WINEMINE); wc.lpszClassName = appname; - wc.hIconSm = LoadImage( hInst, "WINEMINE", IMAGE_ICON, + wc.hIconSm = LoadImageW( hInst, MAKEINTRESOURCEW(IDI_WINEMINE), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED ); - if (!RegisterClassEx(&wc)) ExitProcess(1); - hWnd = CreateWindow( appname, appname, + if (!RegisterClassExW(&wc)) ExitProcess(1); + hWnd = CreateWindowW( appname, appname, wnd_style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, hInst, NULL ); @@ -1039,14 +1048,14 @@ ShowWindow( hWnd, cmdshow ); UpdateWindow( hWnd ); - haccel = LoadAccelerators( hInst, MAKEINTRESOURCE(IDA_WINEMINE) ); + haccel = LoadAcceleratorsW( hInst, MAKEINTRESOURCEW(IDA_WINEMINE) ); SetTimer( hWnd, ID_TIMER, 1000, NULL ); - while( GetMessage(&msg, 0, 0, 0) ) { - if (!TranslateAccelerator( hWnd, haccel, &msg )) + while( GetMessageW(&msg, 0, 0, 0) ) { + if (!TranslateAcceleratorW( hWnd, haccel, &msg )) TranslateMessage( &msg ); - DispatchMessage( &msg ); + DispatchMessageW( &msg ); } return msg.wParam; } Modified: trunk/reactos/base/applications/games/winmine/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/main.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/main.h [iso-8859-1] Tue May 12 14:40:23 2015 @@ -95,7 +95,7 @@ unsigned rows; unsigned cols; unsigned mines; - char best_name [3][MAX_PLAYER_NAME_SIZE+1]; + WCHAR best_name [3][MAX_PLAYER_NAME_SIZE+1]; DWORD best_time [3]; DIFFICULTY difficulty; Modified: trunk/reactos/base/applications/games/winmine/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/resource.h [iso-8859-1] Tue May 12 14:40:23 2015 @@ -20,34 +20,45 @@ #pragma once -#define ID_TIMER 1000 +#define ID_TIMER 1000 /* menu defines */ -#define IDM_NEW 1001 -#define IDM_EXIT 1002 -#define IDM_TIMES 1003 -#define IDM_ABOUT 1004 -#define IDM_BEGINNER 1005 -#define IDM_ADVANCED 1006 -#define IDM_EXPERT 1007 -#define IDM_CUSTOM 1008 -#define IDM_MARKQ 1009 +#define IDM_NEW 1001 +#define IDM_EXIT 1002 +#define IDM_TIMES 1003 +#define IDM_ABOUT 1004 +#define IDM_BEGINNER 1005 +#define IDM_ADVANCED 1006 +#define IDM_EXPERT 1007 +#define IDM_CUSTOM 1008 +#define IDM_MARKQ 1009 -#define IDC_TIME1 1011 -#define IDC_TIME2 1012 -#define IDC_TIME3 1013 -#define IDC_NAME1 1014 -#define IDC_NAME2 1015 -#define IDC_NAME3 1016 +#define IDC_TIME1 1011 +#define IDC_TIME2 1012 +#define IDC_TIME3 1013 +#define IDC_NAME1 1014 +#define IDC_NAME2 1015 +#define IDC_NAME3 1016 -#define IDC_EDITNAME 1021 +#define IDC_EDITNAME 1021 -#define IDC_EDITCOLS 1031 -#define IDC_EDITROWS 1032 -#define IDC_EDITMINES 1033 +#define IDC_EDITCOLS 1031 +#define IDC_EDITROWS 1032 +#define IDC_EDITMINES 1033 -#define IDS_APPNAME 1101 -#define IDS_NOBODY 1102 -#define IDS_ABOUT 1103 +#define IDS_APPNAME 1101 +#define IDS_NOBODY 1102 +#define IDS_ABOUT 1103 -#define IDA_WINEMINE 1201 +#define IDA_WINEMINE 1201 + +#define IDM_WINEMINE 1 + +#define IDI_WINEMINE 1 +#define IDI_FACES 2 +#define IDI_LEDS 3 +#define IDI_MINES 4 + +#define DLG_TIMES 1 +#define DLG_CONGRATS 2 +#define DLG_CUSTOM 3 Modified: trunk/reactos/base/applications/games/winmine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/rsrc.rc [iso-8859-1] Tue May 12 14:40:23 2015 @@ -33,16 +33,16 @@ END /* @makedep: winemine.ico */ -WINEMINE ICON "rc/winemine.ico" +IDI_WINEMINE ICON "rc/winemine.ico" /* @makedep: faces.bmp */ -FACES BITMAP "rc/faces.bmp" +IDI_FACES BITMAP "rc/faces.bmp" /* @makedep: leds.bmp */ -LEDS BITMAP "rc/leds.bmp" +IDI_LEDS BITMAP "rc/leds.bmp" /* @makedep: mines.bmp */ -MINES BITMAP "rc/mines.bmp" +IDI_MINES BITMAP "rc/mines.bmp" #include <reactos/manifest_exe.rc> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue May 12 14:40:23 2015 @@ -235,7 +235,7 @@ reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.27 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.7.37 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.7.37 -reactos/base/applications/games/winmine # Forked at Wine-1_3_5 +reactos/base/applications/games/winmine # Synced to WineStaging-1.7.37 with our own resources. reactos/base/applications/extrac32 # Synced to Wine-1.7.27 reactos/base/applications/iexplore # Synced to Wine-1.7.27 reactos/base/applications/notepad # Forked at Wine-20041201

9 years, 7 months

[akhaldi] 67691: [NDK] Add FILE_READ_ONLY_VOLUME definition in NTOS_MODE_USER mode. [SHELL32] Remove the now unneeded FILE_READ_ONLY_VOLUME definition.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue May 12 12:51:50 2015 New Revision: 67691 URL: http://svn.reactos.org/svn/reactos?rev=67691&view=rev Log: [NDK] Add FILE_READ_ONLY_VOLUME definition in NTOS_MODE_USER mode. [SHELL32] Remove the now unneeded FILE_READ_ONLY_VOLUME definition. Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Tue May 12 12:51:50 2015 @@ -13,9 +13,6 @@ */ #include "precomp.h" - -/* FIXME: ntifs.h */ -#define FILE_READ_ONLY_VOLUME 0x00080000 WINE_DEFAULT_DEBUG_CHANNEL(dmenu); Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/iotypes.h [iso-8859-1] Tue May 12 12:51:50 2015 @@ -50,6 +50,13 @@ // #define SYMBOLIC_LINK_QUERY 0x0001 #define SYMBOLIC_LINK_ALL_ACCESS STANDARD_RIGHTS_REQUIRED | 0x0001 +#endif + +#ifdef NTOS_MODE_USER + +/* File System Attributes Flags */ +#define FILE_READ_ONLY_VOLUME 0x00080000 + #endif //

9 years, 7 months

[akhaldi] 67690: [CMAKE] Prevent CMake from doing importlib handling as we do that on our own.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue May 12 12:19:41 2015 New Revision: 67690 URL: http://svn.reactos.org/svn/reactos?rev=67690&view=rev Log: [CMAKE] Prevent CMake from doing importlib handling as we do that on our own. Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=67690&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Tue May 12 12:19:41 2015 @@ -67,6 +67,9 @@ if(MSVC_IDE) add_compile_flags("/MP") endif() + +# We don't need CMake importlib handling +unset(CMAKE_IMPORT_LIBRARY_SUFFIX) if(NOT CMAKE_CROSSCOMPILING)

9 years, 7 months

[akhaldi] 67689: [CMAKE] The /SUBSYSTEM flag takes uppercase parameters.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue May 12 12:18:02 2015 New Revision: 67689 URL: http://svn.reactos.org/svn/reactos?rev=67689&view=rev Log: [CMAKE] The /SUBSYSTEM flag takes uppercase parameters. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=67689… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue May 12 12:18:02 2015 @@ -210,10 +210,11 @@ endfunction() function(set_subsystem MODULE SUBSYSTEM) + string(TOUPPER ${SUBSYSTEM} _subsystem) if(ARCH STREQUAL "amd64") - add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.02") - else() - add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.01") + add_target_link_flags(${MODULE} "/SUBSYSTEM:${_subsystem},5.02") + else() + add_target_link_flags(${MODULE} "/SUBSYSTEM:${_subsystem},5.01") endif() endfunction()

9 years, 7 months

[akhaldi] 67688: [CMAKE] Take into account the build type when referencing rsym.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue May 12 12:11:50 2015 New Revision: 67688 URL: http://svn.reactos.org/svn/reactos?rev=67688&view=rev Log: [CMAKE] Take into account the build type when referencing rsym. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=67688&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Tue May 12 12:11:50 2015 @@ -216,7 +216,8 @@ set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") else() # Normal rsym build - get_target_property(RSYM native-rsym IMPORTED_LOCATION) + string(TOUPPER ${CMAKE_BUILD_TYPE} _build_type) + get_target_property(RSYM native-rsym IMPORTED_LOCATION_${_build_type}) set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" "${RSYM} -s ${REACTOS_SOURCE_DIR} <TARGET> <TARGET>")

9 years, 7 months

[akhaldi] 67687: [CMAKE] Update rsym location in the GCC build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue May 12 11:40:07 2015 New Revision: 67687 URL: http://svn.reactos.org/svn/reactos?rev=67687&view=rev Log: [CMAKE] Update rsym location in the GCC build. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=67687&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Tue May 12 11:40:07 2015 @@ -216,7 +216,7 @@ set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") else() # Normal rsym build - get_target_property(RSYM native-rsym IMPORTED_LOCATION_NOCONFIG) + get_target_property(RSYM native-rsym IMPORTED_LOCATION) set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" "${RSYM} -s ${REACTOS_SOURCE_DIR} <TARGET> <TARGET>")

9 years, 7 months

[akhaldi] 67686: [CMAKE] Set the /MP flag for MSVC_IDE globally.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue May 12 11:38:32 2015 New Revision: 67686 URL: http://svn.reactos.org/svn/reactos?rev=67686&view=rev Log: [CMAKE] Set the /MP flag for MSVC_IDE globally. Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=67686&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Tue May 12 11:38:32 2015 @@ -63,6 +63,10 @@ include(cmake/compilerflags.cmake) add_definitions(-D__REACTOS__) + +if(MSVC_IDE) + add_compile_flags("/MP") +endif() if(NOT CMAKE_CROSSCOMPILING) Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=67686… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue May 12 11:38:32 2015 @@ -82,11 +82,8 @@ add_compile_flags("/Ob2 /D NDEBUG") endif() -if(MSVC_IDE) - add_compile_flags("/MP") - if(NOT DEFINED USE_FOLDER_STRUCTURE) - set(USE_FOLDER_STRUCTURE FALSE) - endif() +if(MSVC_IDE AND (NOT DEFINED USE_FOLDER_STRUCTURE)) + set(USE_FOLDER_STRUCTURE FALSE) endif() if(NOT DEFINED RUNTIME_CHECKS)

9 years, 7 months

[akhaldi] 67685: [CMAKE] Set "Debug" as the default build type globally.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue May 12 11:35:19 2015 New Revision: 67685 URL: http://svn.reactos.org/svn/reactos?rev=67685&view=rev Log: [CMAKE] Set "Debug" as the default build type globally. Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=67685&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Tue May 12 11:35:19 2015 @@ -46,6 +46,10 @@ # for more information. string(TOLOWER ${ARCH} ARCH) +# Default to Debug for the build type +set(CMAKE_BUILD_TYPE "Debug" CACHE STRING + "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) + # Compile options if(ARCH STREQUAL "i386") include(cmake/config.cmake) @@ -101,10 +105,6 @@ #useful stuff! include(CMakeParseArguments) - - # Default to Debug for the build type - set(CMAKE_BUILD_TYPE "Debug" CACHE STRING -"Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) # Do some cleanup file(REMOVE

9 years, 7 months

← Newer
1
...
27
28
29
30
31
32
33
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2015