Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 62574: [KERNEL32] Implement GetNextVDMCommand.
by aandrejevic＠svn.reactos.org 29 Mar '14

29 Mar '14

Author: aandrejevic Date: Sat Mar 29 04:05:09 2014 New Revision: 62574 URL: http://svn.reactos.org/svn/reactos?rev=62574&view=rev Log: [KERNEL32] Implement GetNextVDMCommand. Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c branches/ntvdm/include/reactos/subsys/win/vdm.h Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/client/vdm.c [iso-8859-1] Sat Mar 29 04:05:09 2014 @@ -1124,16 +1124,293 @@ } } - /* - * @unimplemented + * @implemented */ -DWORD +BOOL WINAPI GetNextVDMCommand(PVDM_COMMAND_INFO CommandData) { - STUB; - return 0; + NTSTATUS Status; + BOOL Result = FALSE; + BASE_API_MESSAGE ApiMessage; + PBASE_GET_NEXT_VDM_COMMAND GetNextVdmCommand = &ApiMessage.Data.GetNextVDMCommandRequest; + PBASE_IS_FIRST_VDM IsFirstVdm = &ApiMessage.Data.IsFirstVDMRequest; + PCSR_CAPTURE_BUFFER CaptureBuffer = NULL; + ULONG NumStrings = 1; + + if (CommandData != NULL) + { + /* Clear the structure */ + ZeroMemory(GetNextVdmCommand, sizeof(GetNextVdmCommand)); + + /* Setup the input parameters */ + GetNextVdmCommand->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + GetNextVdmCommand->CmdLen = CommandData->CmdLen; + GetNextVdmCommand->AppLen = CommandData->AppLen; + GetNextVdmCommand->PifLen = CommandData->PifLen; + GetNextVdmCommand->CurDirectoryLen = CommandData->CurDirectoryLen; + GetNextVdmCommand->EnvLen = CommandData->EnvLen; + GetNextVdmCommand->DesktopLen = CommandData->DesktopLen; + GetNextVdmCommand->TitleLen = CommandData->TitleLen; + GetNextVdmCommand->ReservedLen = CommandData->ReservedLen; + + /* Count the number of strings */ + if (CommandData->CmdLen) NumStrings++; + if (CommandData->AppLen) NumStrings++; + if (CommandData->PifLen) NumStrings++; + if (CommandData->CurDirectoryLen) NumStrings++; + if (CommandData->EnvLen) NumStrings++; + if (CommandData->DesktopLen) NumStrings++; + if (CommandData->TitleLen) NumStrings++; + if (CommandData->ReservedLen) NumStrings++; + + /* Allocate the capture buffer */ + CaptureBuffer = CsrAllocateCaptureBuffer(NumStrings, + GetNextVdmCommand->CmdLen + + GetNextVdmCommand->AppLen + + GetNextVdmCommand->PifLen + + GetNextVdmCommand->CurDirectoryLen + + GetNextVdmCommand->EnvLen + + GetNextVdmCommand->DesktopLen + + GetNextVdmCommand->TitleLen + + GetNextVdmCommand->ReservedLen + + sizeof(STARTUPINFOA)); + if (CaptureBuffer == NULL) + { + BaseSetLastNTError(STATUS_NO_MEMORY); + goto Cleanup; + } + + /* Allocate memory for the startup info */ + CsrAllocateMessagePointer(CaptureBuffer, + sizeof(STARTUPINFOA), + (PVOID*)&GetNextVdmCommand->StartupInfo); + + if (CommandData->CmdLen) + { + /* Allocate memory for the command line */ + CsrAllocateMessagePointer(CaptureBuffer, + CommandData->CmdLen, + (PVOID*)&GetNextVdmCommand->CmdLine); + } + + if (CommandData->AppLen) + { + /* Allocate memory for the application name */ + CsrAllocateMessagePointer(CaptureBuffer, + CommandData->AppLen, + (PVOID*)&GetNextVdmCommand->AppName); + } + + if (CommandData->PifLen) + { + /* Allocate memory for the PIF file name */ + CsrAllocateMessagePointer(CaptureBuffer, + CommandData->PifLen, + (PVOID*)&GetNextVdmCommand->PifFile); + } + + if (CommandData->CurDirectoryLen) + { + /* Allocate memory for the current directory */ + CsrAllocateMessagePointer(CaptureBuffer, + CommandData->CurDirectoryLen, + (PVOID*)&GetNextVdmCommand->CurDirectory); + } + + if (CommandData->EnvLen) + { + /* Allocate memory for the environment */ + CsrAllocateMessagePointer(CaptureBuffer, + CommandData->EnvLen, + (PVOID*)&GetNextVdmCommand->Env); + } + + if (CommandData->DesktopLen) + { + /* Allocate memory for the desktop name */ + CsrAllocateMessagePointer(CaptureBuffer, + CommandData->DesktopLen, + (PVOID*)&GetNextVdmCommand->Desktop); + } + + if (CommandData->TitleLen) + { + /* Allocate memory for the title */ + CsrAllocateMessagePointer(CaptureBuffer, + CommandData->TitleLen, + (PVOID*)&GetNextVdmCommand->Title); + } + + if (CommandData->ReservedLen) + { + /* Allocate memory for the reserved parameter */ + CsrAllocateMessagePointer(CaptureBuffer, + CommandData->ReservedLen, + (PVOID*)&GetNextVdmCommand->Reserved); + } + + do + { + /* Call CSRSS */ + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepGetNextVDMCommand), + sizeof(BASE_GET_NEXT_VDM_COMMAND)); + + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + goto Cleanup; + } + + /* Did we receive an event handle? */ + if (GetNextVdmCommand->WaitObjectForVDM != NULL) + { + /* Wait for the event to become signaled and try again */ + Status = NtWaitForSingleObject(GetNextVdmCommand->WaitObjectForVDM, + FALSE, + NULL); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + goto Cleanup; + } + } + } + while (GetNextVdmCommand->WaitObjectForVDM != NULL); + + /* Write back the standard handles */ + CommandData->StdIn = GetNextVdmCommand->StdIn; + CommandData->StdOut = GetNextVdmCommand->StdOut; + CommandData->StdErr = GetNextVdmCommand->StdErr; + + /* Write back the startup info */ + RtlMoveMemory(&CommandData->StartupInfo, + GetNextVdmCommand->StartupInfo, + sizeof(STARTUPINFOA)); + + if (CommandData->CmdLen) + { + /* Write back the command line */ + RtlMoveMemory(CommandData->CmdLine, + GetNextVdmCommand->CmdLine, + GetNextVdmCommand->CmdLen); + + /* Set the actual length */ + CommandData->CmdLen = GetNextVdmCommand->CmdLen; + } + + if (CommandData->AppLen) + { + /* Write back the application name */ + RtlMoveMemory(CommandData->AppName, + GetNextVdmCommand->AppName, + GetNextVdmCommand->AppLen); + + /* Set the actual length */ + CommandData->AppLen = GetNextVdmCommand->AppLen; + } + + if (CommandData->PifLen) + { + /* Write back the PIF file name */ + RtlMoveMemory(CommandData->PifFile, + GetNextVdmCommand->PifFile, + GetNextVdmCommand->PifLen); + + /* Set the actual length */ + CommandData->PifLen = GetNextVdmCommand->PifLen; + } + + if (CommandData->CurDirectoryLen) + { + /* Write back the current directory */ + RtlMoveMemory(CommandData->CurDirectory, + GetNextVdmCommand->CurDirectory, + GetNextVdmCommand->CurDirectoryLen); + + /* Set the actual length */ + CommandData->CurDirectoryLen = GetNextVdmCommand->CurDirectoryLen; + } + + if (CommandData->EnvLen) + { + /* Write back the environment */ + RtlMoveMemory(CommandData->Env, + GetNextVdmCommand->Env, + GetNextVdmCommand->EnvLen); + + /* Set the actual length */ + CommandData->EnvLen = GetNextVdmCommand->EnvLen; + } + + if (CommandData->DesktopLen) + { + /* Write back the desktop name */ + RtlMoveMemory(CommandData->Desktop, + GetNextVdmCommand->Desktop, + GetNextVdmCommand->DesktopLen); + + /* Set the actual length */ + CommandData->DesktopLen = GetNextVdmCommand->DesktopLen; + } + + if (CommandData->TitleLen) + { + /* Write back the title */ + RtlMoveMemory(CommandData->Title, + GetNextVdmCommand->Title, + GetNextVdmCommand->TitleLen); + + /* Set the actual length */ + CommandData->TitleLen = GetNextVdmCommand->TitleLen; + } + + if (CommandData->ReservedLen) + { + /* Write back the reserved parameter */ + RtlMoveMemory(CommandData->Reserved, + GetNextVdmCommand->Reserved, + GetNextVdmCommand->ReservedLen); + + /* Set the actual length */ + CommandData->ReservedLen = GetNextVdmCommand->ReservedLen; + } + + /* Write the remaining output parameters */ + CommandData->TaskId = GetNextVdmCommand->iTask; + CommandData->CreationFlags = GetNextVdmCommand->dwCreationFlags; + CommandData->CodePage = GetNextVdmCommand->CodePage; + CommandData->ExitCode = GetNextVdmCommand->ExitCode; + CommandData->CurrentDrive = GetNextVdmCommand->CurrentDrive; + CommandData->VDMState = GetNextVdmCommand->VDMState; + CommandData->ComingFromBat = GetNextVdmCommand->fComingFromBat; + + /* It was successful */ + Result = TRUE; + } + else + { + /* Call CSRSS */ + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepIsFirstVDM), + sizeof(BASE_IS_FIRST_VDM)); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + goto Cleanup; + } + + /* Return TRUE if this is the first VDM */ + Result = IsFirstVdm->FirstVDM; + } + +Cleanup: + if (CaptureBuffer != NULL) CsrFreeCaptureBuffer(CaptureBuffer); + return Result; } Modified: branches/ntvdm/include/reactos/subsys/win/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/subsys/wi… ============================================================================== --- branches/ntvdm/include/reactos/subsys/win/vdm.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/subsys/win/vdm.h [iso-8859-1] Sat Mar 29 04:05:09 2014 @@ -50,7 +50,7 @@ typedef struct { ULONG TaskId; - ULONG Unused; + ULONG CreationFlags; ULONG ExitCode; ULONG CodePage; HANDLE StdIn;

1 0

[hbelusca] 62573: Addendum to revision 62571: those SAL v2 annotations exist also in MSVC 2008 (but still not in MSVC <= 2005).
by hbelusca＠svn.reactos.org 28 Mar '14

28 Mar '14

Author: hbelusca Date: Fri Mar 28 02:43:29 2014 New Revision: 62573 URL: http://svn.reactos.org/svn/reactos?rev=62573&view=rev Log: Addendum to revision 62571: those SAL v2 annotations exist also in MSVC 2008 (but still not in MSVC <= 2005). Modified: trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/tools/mkhive/mkhive.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=6257… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Fri Mar 28 02:43:29 2014 @@ -23,7 +23,7 @@ #define strcasecmp _stricmp #endif//_WIN32 - #if (!defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1600))) + #if (!defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1500))) #define _In_ #define _Out_ #define _Inout_ Modified: trunk/reactos/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.h?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] Fri Mar 28 02:43:29 2014 @@ -130,7 +130,7 @@ #define min(a, b) (((a) < (b)) ? (a) : (b)) #endif -#if (!defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1600))) +#if (!defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1500))) #define _In_ #define _Out_ #define _In_opt_

1 0

[hbelusca] 62572: [MSVC] Turns C4163: "'identifier' : not available as an intrinsic function" into an error.
by hbelusca＠svn.reactos.org 28 Mar '14

28 Mar '14

Author: hbelusca Date: Fri Mar 28 01:35:32 2014 New Revision: 62572 URL: http://svn.reactos.org/svn/reactos?rev=62572&view=rev Log: [MSVC] Turns C4163: "'identifier' : not available as an intrinsic function" into an error. 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=62572… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Fri Mar 28 01:35:32 2014 @@ -53,10 +53,11 @@ # - C4113: parameter lists differ # - C4129: unrecognized escape sequence # - TODO: C4133: incompatible types +# - C4163: 'identifier': not available as an intrinsic function # - C4229: modifiers on data are ignored # - C4700: uninitialized variable usage # - C4603: macro is not defined or definition is different after precompiled header use -add_compile_flags("/we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4229 /we4700 /we4603") +add_compile_flags("/we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4163 /we4229 /we4700 /we4603") # Enable warnings above the default level, but don't treat them as errors: # - C4115: named type definition in parentheses

1 0

[hbelusca] 62571: [CMLIB][MKHIVE] (For host tools compilation only) Refine the #ifndefs, because SAL v2 annotations do not exist in MSVC < 2010.
by hbelusca＠svn.reactos.org 28 Mar '14

28 Mar '14

Author: hbelusca Date: Fri Mar 28 01:05:55 2014 New Revision: 62571 URL: http://svn.reactos.org/svn/reactos?rev=62571&view=rev Log: [CMLIB][MKHIVE] (For host tools compilation only) Refine the #ifndefs, because SAL v2 annotations do not exist in MSVC < 2010. Modified: trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/tools/mkhive/mkhive.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=6257… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Fri Mar 28 01:05:55 2014 @@ -23,7 +23,7 @@ #define strcasecmp _stricmp #endif//_WIN32 - #ifndef _MSC_VER + #if (!defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1600))) #define _In_ #define _Out_ #define _Inout_ Modified: trunk/reactos/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.h?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] Fri Mar 28 01:05:55 2014 @@ -130,12 +130,13 @@ #define min(a, b) (((a) < (b)) ? (a) : (b)) #endif -#ifndef _MSC_VER +#if (!defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1600))) #define _In_ #define _Out_ #define _In_opt_ #define _In_range_(x, y) #endif + #define __drv_aliasesMem /* EOF */

1 0

[tfaber] 62570: [COMCTL32][RAPPS] - Mark Str* functions as private in comctl32, they should be imported from shlwapi instead - Remove the associated hack in rapps CORE-7786 #resolve
by tfaber＠svn.reactos.org 26 Mar '14

26 Mar '14

Author: tfaber Date: Wed Mar 26 20:15:54 2014 New Revision: 62570 URL: http://svn.reactos.org/svn/reactos?rev=62570&view=rev Log: [COMCTL32][RAPPS] - Mark Str* functions as private in comctl32, they should be imported from shlwapi instead - Remove the associated hack in rapps CORE-7786 #resolve Modified: trunk/reactos/base/applications/rapps/rapps.h trunk/reactos/base/applications/rapps/winmain.c trunk/reactos/dll/win32/comctl32/comctl32.spec Modified: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Wed Mar 26 20:15:54 2014 @@ -17,6 +17,7 @@ #include <wincon.h> #include <richedit.h> #include <shlobj.h> +#include <shlwapi.h> #include <stdio.h> #include <strsafe.h> Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Wed Mar 26 20:15:54 2014 @@ -18,8 +18,6 @@ INT SelectedEnumType = ENUM_ALL_COMPONENTS; SETTINGS_INFO SettingsInfo; -PCWSTR (WINAPI *pStrStrIW)(PCWSTR, PCWSTR); - WCHAR szSearchPattern[MAX_STR_LEN] = L""; BOOL SearchEnabled = TRUE; @@ -29,7 +27,7 @@ if (!*szNeedle) return TRUE; /* TODO: Improve pattern search beyond a simple case-insensitive substring search. */ - return pStrStrIW(szHaystack, szNeedle) != NULL; + return StrStrIW(szHaystack, szNeedle) != NULL; } VOID @@ -907,10 +905,6 @@ HANDLE hMutex = NULL; MSG Msg; - /* FIXME: CORE-7786 requires this to be loaded at runtime because we - * would get comctl32's version otherwise */ - pStrStrIW = (PVOID)GetProcAddress(GetModuleHandle(L"shlwapi"), "StrStrIW"); - switch (GetUserDefaultUILanguage()) { case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): Modified: trunk/reactos/dll/win32/comctl32/comctl32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.spec [iso-8859-1] Wed Mar 26 20:15:54 2014 @@ -62,32 +62,32 @@ 341 stdcall -noname SendNotify(long long long ptr) 342 stdcall -noname SendNotifyEx(long long long ptr long) 345 stdcall -ordinal TaskDialogIndirect(ptr ptr ptr ptr) -350 stdcall -noname StrChrA(str str) -351 stdcall -noname StrRChrA(str str long) -352 stdcall -noname StrCmpNA(str str long) -353 stdcall -noname StrCmpNIA(str str long) -354 stdcall -noname StrStrA(str str) -355 stdcall -noname StrStrIA(str str) -356 stdcall -noname StrCSpnA(str str) -357 stdcall -noname StrToIntA(str) -358 stdcall -noname StrChrW(wstr long) -359 stdcall -noname StrRChrW(wstr wstr long) -360 stdcall -noname StrCmpNW(wstr wstr long) -361 stdcall -noname StrCmpNIW(wstr wstr long) -362 stdcall -noname StrStrW(wstr wstr) -363 stdcall -noname StrStrIW(wstr wstr) -364 stdcall -noname StrCSpnW(wstr wstr) -365 stdcall -noname StrToIntW(wstr) -366 stdcall -noname StrChrIA(str long) -367 stdcall -noname StrChrIW(wstr long) -368 stdcall -noname StrRChrIA(str str long) -369 stdcall -noname StrRChrIW(wstr wstr long) -372 stdcall -noname StrRStrIA(str str str) -373 stdcall -noname StrRStrIW(wstr wstr wstr) -374 stdcall -noname StrCSpnIA(str str) -375 stdcall -noname StrCSpnIW(wstr wstr) -376 stdcall -noname IntlStrEqWorkerA(long str str long) -377 stdcall -noname IntlStrEqWorkerW(long wstr wstr long) +350 stdcall -noname -private StrChrA(str str) +351 stdcall -noname -private StrRChrA(str str long) +352 stdcall -noname -private StrCmpNA(str str long) +353 stdcall -noname -private StrCmpNIA(str str long) +354 stdcall -noname -private StrStrA(str str) +355 stdcall -noname -private StrStrIA(str str) +356 stdcall -noname -private StrCSpnA(str str) +357 stdcall -noname -private StrToIntA(str) +358 stdcall -noname -private StrChrW(wstr long) +359 stdcall -noname -private StrRChrW(wstr wstr long) +360 stdcall -noname -private StrCmpNW(wstr wstr long) +361 stdcall -noname -private StrCmpNIW(wstr wstr long) +362 stdcall -noname -private StrStrW(wstr wstr) +363 stdcall -noname -private StrStrIW(wstr wstr) +364 stdcall -noname -private StrCSpnW(wstr wstr) +365 stdcall -noname -private StrToIntW(wstr) +366 stdcall -noname -private StrChrIA(str long) +367 stdcall -noname -private StrChrIW(wstr long) +368 stdcall -noname -private StrRChrIA(str str long) +369 stdcall -noname -private StrRChrIW(wstr wstr long) +372 stdcall -noname -private StrRStrIA(str str str) +373 stdcall -noname -private StrRStrIW(wstr wstr wstr) +374 stdcall -noname -private StrCSpnIA(str str) +375 stdcall -noname -private StrCSpnIW(wstr wstr) +376 stdcall -noname -private IntlStrEqWorkerA(long str str long) +377 stdcall -noname -private IntlStrEqWorkerW(long wstr wstr long) 382 stdcall -noname SmoothScrollWindow(ptr) 383 stdcall -noname DoReaderMode(ptr) 384 stdcall -noname SetPathWordBreakProc(ptr long)

1 0

[tfaber] 62569: [WINETESTS] - Remove unnecessary use of allow_warnings - Do not hide warnings that indicate actual problems in setuapi (non-Wine test, should move to apitests) and winmm (Wine bugs, ...
by tfaber＠svn.reactos.org 26 Mar '14

26 Mar '14

Author: tfaber Date: Wed Mar 26 12:15:55 2014 New Revision: 62569 URL: http://svn.reactos.org/svn/reactos?rev=62569&view=rev Log: [WINETESTS] - Remove unnecessary use of allow_warnings - Do not hide warnings that indicate actual problems in setuapi (non-Wine test, should move to apitests) and winmm (Wine bugs, fixed upstream) Modified: trunk/rostests/winetests/setupapi/CMakeLists.txt trunk/rostests/winetests/winmm/CMakeLists.txt trunk/rostests/winetests/ws2_32/CMakeLists.txt Modified: trunk/rostests/winetests/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/CMakeL… ============================================================================== --- trunk/rostests/winetests/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/CMakeLists.txt [iso-8859-1] Wed Mar 26 12:15:55 2014 @@ -17,5 +17,5 @@ add_cd_file(TARGET setupapi_winetest DESTINATION reactos/bin FOR all) if(NOT MSVC) - add_target_compile_flags(setupapi_winetest "-Wno-format") + add_target_compile_flags(setupapi_winetest "-Wno-error=format") endif() Modified: trunk/rostests/winetests/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/CMakeList… ============================================================================== --- trunk/rostests/winetests/winmm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/winmm/CMakeLists.txt [iso-8859-1] Wed Mar 26 12:15:55 2014 @@ -17,5 +17,5 @@ add_cd_file(TARGET winmm_winetest DESTINATION reactos/bin FOR all) if(NOT MSVC) - add_target_compile_flags(winmm_winetest "-Wno-format -Wno-unused-but-set-variable") + add_target_compile_flags(winmm_winetest "-Wno-error=format -Wno-error=unused-but-set-variable") endif() Modified: trunk/rostests/winetests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/CMakeLis… ============================================================================== --- trunk/rostests/winetests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/CMakeLists.txt [iso-8859-1] Wed Mar 26 12:15:55 2014 @@ -6,5 +6,4 @@ if(NOT MSVC) add_target_compile_flags(ws2_32_winetest "-Wno-format") - allow_warnings(ws2_32_winetest) endif()

1 0

[tfaber] 62568: [NTDLL_APITEST] - Fix -Wformat warnings and enable -Wformat where possible
by tfaber＠svn.reactos.org 26 Mar '14

26 Mar '14

Author: tfaber Date: Wed Mar 26 12:07:25 2014 New Revision: 62568 URL: http://svn.reactos.org/svn/reactos?rev=62568&view=rev Log: [NTDLL_APITEST] - Fix -Wformat warnings and enable -Wformat where possible Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c trunk/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c trunk/rostests/apitests/ntdll/RtlGetFullPathName_U.c trunk/rostests/apitests/ntdll/RtlGetFullPathName_Ustr.c trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c trunk/rostests/apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c trunk/rostests/apitests/ntdll/RtlMemoryStream.c trunk/rostests/apitests/ntdll/Timer.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Wed Mar 26 12:07:25 2014 @@ -36,9 +36,7 @@ add_importlibs(ntdll_apitest msvcrt advapi32 kernel32 ntdll) if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #add_target_compile_flags(ntdll_apitest "-Wno-format") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format") + set_source_files_properties(RtlGetFullPathName_UstrEx.c PROPERTIES COMPILE_FLAGS "-Wno-format") endif() add_cd_file(TARGET ntdll_apitest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtProtectV… ============================================================================== --- trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c [iso-8859-1] Wed Mar 26 12:07:25 2014 @@ -55,7 +55,7 @@ PAGE_READONLY, &oldProtection); ok(NT_SUCCESS(status), "NtProtectVirtualMemory failed.\n"); - ok(oldProtection == PAGE_READWRITE, "Expected PAGE_READWRITE, got %08x.\n", oldProtection); + ok(oldProtection == PAGE_READWRITE, "Expected PAGE_READWRITE, got %08lx.\n", oldProtection); /* Try writing it */ StartSeh() @@ -76,7 +76,7 @@ PAGE_NOACCESS, &oldProtection); ok(NT_SUCCESS(status), "NtProtectVirtualMemory failed.\n"); - ok(oldProtection == PAGE_READONLY, "Expected PAGE_READONLY, got %08x.\n", oldProtection); + ok(oldProtection == PAGE_READONLY, "Expected PAGE_READONLY, got %08lx.\n", oldProtection); /* Try writing it */ StartSeh() Modified: trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDosSear… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c [iso-8859-1] Wed Mar 26 12:07:25 2014 @@ -205,7 +205,7 @@ ok(Success, "DeleteFile failed, test might leave stale file\n"); swprintf(FileName, L"C:\\%ls\\ThisFolderExists", CustomPath); Success = RemoveDirectoryW(FileName); - ok(Success, "RemoveDirectory failed %(lu), test might leave stale directory\n", GetLastError()); + ok(Success, "RemoveDirectory failed (%lu), test might leave stale directory\n", GetLastError()); swprintf(FileName, L"C:\\%ls", CustomPath); Success = RemoveDirectoryW(FileName); ok(Success, "RemoveDirectory failed (%lu), test might leave stale directory\n", GetLastError()); Modified: trunk/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDosSear… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c [iso-8859-1] Wed Mar 26 12:07:25 2014 @@ -128,8 +128,8 @@ ok_eq_ustr(&CallerBuffer, &EmptyString); ok_eq_ustr(&DynamicString, &EmptyString); ok_eq_pointer(FullNameOut, NULL); - ok_eq_ulong(FilePartSize, 0); - ok_eq_ulong(LengthNeeded, 0); + ok_eq_ulong(FilePartSize, 0UL); + ok_eq_ulong(LengthNeeded, 0UL); /* Everything except FileNameString */ RtlInitUnicodeString(&PathString, NULL); @@ -156,8 +156,8 @@ ok_eq_ustr(&CallerBuffer, &EmptyString); ok_eq_ustr(&DynamicString, &EmptyString); ok_eq_pointer(FullNameOut, NULL); - ok_eq_ulong(FilePartSize, 0); - ok_eq_ulong(LengthNeeded, 0); + ok_eq_ulong(FilePartSize, 0UL); + ok_eq_ulong(LengthNeeded, 0UL); /* Passing CallerBuffer and DynamicString, but not FullNameOut is invalid */ RtlInitUnicodeString(&PathString, NULL); @@ -185,8 +185,8 @@ ok_eq_ustr(&ExtensionString, &EmptyString); ok_eq_ustr(&CallerBuffer, &EmptyString); ok_eq_ustr(&DynamicString, &EmptyString); - ok_eq_ulong(FilePartSize, 0); - ok_eq_ulong(LengthNeeded, 0); + ok_eq_ulong(FilePartSize, 0UL); + ok_eq_ulong(LengthNeeded, 0UL); /* All parameters given */ RtlInitUnicodeString(&PathString, NULL); @@ -215,6 +215,6 @@ ok_eq_ustr(&CallerBuffer, &EmptyString); ok_eq_ustr(&DynamicString, &EmptyString); ok_eq_pointer(FullNameOut, NULL); - ok_eq_ulong(FilePartSize, 0); - ok_eq_ulong(LengthNeeded, 0); + ok_eq_ulong(FilePartSize, 0UL); + ok_eq_ulong(LengthNeeded, 0UL); } Modified: trunk/rostests/apitests/ntdll/RtlGetFullPathName_U.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGetFull… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGetFullPathName_U.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlGetFullPathName_U.c [iso-8859-1] Wed Mar 26 12:07:25 2014 @@ -155,7 +155,7 @@ ExpectedPathName[2] = UNICODE_NULL; break; default: - skip(0, "Invalid test!\n"); + skip("Invalid test!\n"); continue; } wcscat(ExpectedPathName, TestCases[i].FullPathName); @@ -207,7 +207,7 @@ break; } default: - skip(0, "Invalid test!\n"); + skip("Invalid test!\n"); continue; } ExpectedFilePartSize += TestCases[i].FilePartSize; Modified: trunk/rostests/apitests/ntdll/RtlGetFullPathName_Ustr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGetFull… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGetFullPathName_Ustr.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlGetFullPathName_Ustr.c [iso-8859-1] Wed Mar 26 12:07:25 2014 @@ -215,7 +215,7 @@ break; } default: - skip(0, "Invalid test!\n"); + skip("Invalid test!\n"); continue; } wcscat(ExpectedPathName, TestCases[i].FullPathName); @@ -269,7 +269,7 @@ break; } default: - skip(0, "Invalid test!\n"); + skip("Invalid test!\n"); continue; } ExpectedFilePartSize += TestCases[i].FilePartSize; @@ -288,7 +288,7 @@ ok(PathType.Type == TestCases[i].PathType, "PathType = %d, expected %d\n", PathType.Type, TestCases[i].PathType); ok(PathType.Unknown == 1234 || broken(PathType.Unknown == 0) || - broken(PathType.Unknown == 32), "Unknown = %d\n", PathType.Unknown); + broken(PathType.Unknown == 32), "Unknown = %lu\n", PathType.Unknown); } } @@ -339,7 +339,7 @@ EndSeh(STATUS_ACCESS_VIOLATION); ok(PathType.Type == RtlPathTypeUnknown, "PathType = %d\n", PathType.Type); ok(PathType.Unknown == 1234 || - broken(PathType.Unknown == 0) /* Win7 */, "Unknown = %d\n", PathType.Unknown); + broken(PathType.Unknown == 0) /* Win7 */, "Unknown = %lu\n", PathType.Unknown); /* check what else is initialized before it crashes */ PathType.Type = RtlPathTypeNotSet; @@ -354,7 +354,7 @@ broken(ShortName == NULL) /* Win7 */, "ShortName = %p\n", ShortName); ok(PathType.Type == RtlPathTypeUnknown, "PathType = %d\n", PathType.Type); ok(PathType.Unknown == 1234 || - broken(PathType.Unknown == 0) /* Win7 */, "Unknown = %d\n", PathType.Unknown); + broken(PathType.Unknown == 0) /* Win7 */, "Unknown = %lu\n", PathType.Unknown); RtlInitUnicodeString(&FileName, L""); TempString = FileName; @@ -380,7 +380,7 @@ ok_eq_ustr(&FileName, &TempString); ok(PathType.Type == RtlPathTypeUnknown, "PathType = %d\n", PathType.Type); ok(PathType.Unknown == 1234 || - broken(PathType.Unknown == 0) /* Win7 */, "Unknown = %d\n", PathType.Unknown); + broken(PathType.Unknown == 0) /* Win7 */, "Unknown = %lu\n", PathType.Unknown); RtlInitUnicodeString(&FileName, L""); TempString = FileName; @@ -393,7 +393,7 @@ ok_eq_ustr(&FileName, &TempString); ok(PathType.Type == RtlPathTypeUnknown, "PathType = %d\n", PathType.Type); ok(PathType.Unknown == 1234 || - broken(PathType.Unknown == 0) /* Win7 */, "Unknown = %d\n", PathType.Unknown); + broken(PathType.Unknown == 0) /* Win7 */, "Unknown = %lu\n", PathType.Unknown); /* Show that NameInvalid is indeed BOOLEAN */ RtlInitUnicodeString(&FileName, L""); @@ -408,7 +408,7 @@ ok_eq_ustr(&FileName, &TempString); ok(PathType.Type == RtlPathTypeUnknown, "PathType = %d\n", PathType.Type); ok(PathType.Unknown == 1234 || - broken(PathType.Unknown == 0) /* Win7 */, "Unknown = %d\n", PathType.Unknown); + broken(PathType.Unknown == 0) /* Win7 */, "Unknown = %lu\n", PathType.Unknown); ok(NameInvalidArray[0] == FALSE, "NameInvalid = %u\n", NameInvalidArray[0]); Okay = CheckBuffer(NameInvalidArray + 1, sizeof(NameInvalidArray) - sizeof(NameInvalidArray[0]), 0x55); ok(Okay, "CheckBuffer failed\n"); @@ -425,7 +425,7 @@ ok_eq_ustr(&FileName, &TempString); ok(PathType.Type == RtlPathTypeDriveAbsolute, "PathType = %d\n", PathType.Type); ok(PathType.Unknown == 1234 || - broken(PathType.Unknown == 0) /* Win7 */, "Unknown = %d\n", PathType.Unknown); + broken(PathType.Unknown == 0) /* Win7 */, "Unknown = %lu\n", PathType.Unknown); /* check the actual functionality with different paths */ RunTestCases(); Modified: trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGetFull… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c [iso-8859-1] Wed Mar 26 12:07:25 2014 @@ -207,7 +207,7 @@ break; } default: - skip(0, "Invalid test!\n"); + skip("Invalid test!\n"); continue; } wcscat(ExpectedPathName, TestCases[i].FullPathName); @@ -268,7 +268,7 @@ break; } default: - skip(0, "Invalid test!\n"); + skip("Invalid test!\n"); continue; } ExpectedFilePartSize += TestCases[i].FilePartSize; Modified: trunk/rostests/apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGetLeng… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlGetLengthWithoutTrailingPathSeperators.c [iso-8859-1] Wed Mar 26 12:07:25 2014 @@ -110,11 +110,11 @@ EndSeh(STATUS_SUCCESS); ok(res == pentry->expected_result, - "Unexpected result 0x%08x (expected 0x%08x) in [%d:%d]\n", + "Unexpected result 0x%08lx (expected 0x%08lx) in [%d:%d]\n", res, pentry->expected_result, i, pentry->line); ok(len == pentry->expected_output, - "Unexpected length %d (expected %d) in [%d:%d]\n", + "Unexpected length %lu (expected %lu) in [%d:%d]\n", len, pentry->expected_output, i, pentry->line); } @@ -128,10 +128,10 @@ EndSeh(STATUS_SUCCESS); ok(res == STATUS_INVALID_PARAMETER, - "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n", + "Unexpected result 0x%08lx (expected STATUS_INVALID_PARAMETER)\n", res); ok(len == 0, - "Unexpected length %08x (expected 0)\n", + "Unexpected length %08lx (expected 0)\n", len); StartSeh() @@ -139,7 +139,7 @@ EndSeh(STATUS_SUCCESS); ok(res == STATUS_INVALID_PARAMETER, - "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n", + "Unexpected result 0x%08lx (expected STATUS_INVALID_PARAMETER)\n", res); StartSeh() @@ -147,7 +147,7 @@ EndSeh(STATUS_SUCCESS); ok(res == STATUS_INVALID_PARAMETER, - "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n", + "Unexpected result 0x%08lx (expected STATUS_INVALID_PARAMETER)\n", res); for(i = 0; i < 32; i++) @@ -159,11 +159,11 @@ EndSeh(STATUS_SUCCESS); ok(res == STATUS_INVALID_PARAMETER, - "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n", + "Unexpected result 0x%08lx (expected STATUS_INVALID_PARAMETER)\n", res); ok(len == 0, - "Unexpected length %08x (expected 0)\n", + "Unexpected length %08lx (expected 0)\n", len); } @@ -174,10 +174,10 @@ EndSeh(STATUS_SUCCESS); ok(res == STATUS_INVALID_PARAMETER, - "Unexpected result 0x%08x (expected STATUS_INVALID_PARAMETER)\n", + "Unexpected result 0x%08lx (expected STATUS_INVALID_PARAMETER)\n", res); ok(len == 0, - "Unexpected length %08x (expected 0)\n", + "Unexpected length %08lx (expected 0)\n", len); } Modified: trunk/rostests/apitests/ntdll/RtlMemoryStream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlMemoryS… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlMemoryStream.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlMemoryStream.c [iso-8859-1] Wed Mar 26 12:07:25 2014 @@ -37,8 +37,8 @@ // Compare if (pold->Vtbl != pnew->Vtbl) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("Vtbl changed from %p to %p\n", pold->Vtbl, pnew->Vtbl);} - if (pold->RefCount != pnew->RefCount) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("RefCount changed from %p to %p\n", pold->RefCount, pnew->RefCount); } - if (pold->Unk1 != pnew->Unk1) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("Unk1 changed from %p to %p\n", pold->Unk1, pnew->Unk1); } + if (pold->RefCount != pnew->RefCount) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("RefCount changed from %ld to %ld\n", pold->RefCount, pnew->RefCount); } + if (pold->Unk1 != pnew->Unk1) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("Unk1 changed from %lu to %lu\n", pold->Unk1, pnew->Unk1); } if (pold->Current != pnew->Current) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("Current changed from %p to %p\n", pold->Current, pnew->Current); } if (pold->Start != pnew->Start) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("Start changed from %p to %p\n", pold->Start, pnew->Start); } if (pold->End != pnew->End) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("End changed from %p to %p\n", pold->End, pnew->End); } @@ -96,7 +96,7 @@ CompareStructsAndSaveForLater(&previous, &stream, "After init"); - ok(stream.RefCount == 0, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 0); + ok(stream.RefCount == 0, "RefCount has a wrong value: %ld (expected %d).\n", stream.RefCount, 0); stream.Current = buffer2; stream.Start = buffer2; @@ -106,39 +106,33 @@ CompareStructsAndSaveForLater(&previous, &stream, "After assigning"); StartSeh() - res = IStream_QueryInterface((struct IStream*)&stream, NULL, NULL); - ok(res == E_INVALIDARG, "QueryInterface to IStream returned wrong hResult: 0x%08x.\n", res); - ok(stream.RefCount == 0, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 2); + IStream_QueryInterface((struct IStream*)&stream, NULL, NULL); EndSeh(STATUS_ACCESS_VIOLATION); StartSeh() - res = IStream_QueryInterface((struct IStream*)&stream, &IID_IStream, NULL); - ok(res == E_INVALIDARG, "QueryInterface to IStream returned wrong hResult: 0x%08x.\n", res); - ok(stream.RefCount == 1, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 2); + IStream_QueryInterface((struct IStream*)&stream, &IID_IStream, NULL); EndSeh(STATUS_ACCESS_VIOLATION); StartSeh() - res = IStream_QueryInterface((struct IStream*)&stream, NULL, (void**)&istream); - ok(res == E_INVALIDARG, "QueryInterface to IStream returned wrong hResult: 0x%08x.\n", res); - ok(stream.RefCount == 1, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 2); + IStream_QueryInterface((struct IStream*)&stream, NULL, (void**)&istream); EndSeh(STATUS_ACCESS_VIOLATION); StartSeh() res = IStream_QueryInterface((struct IStream*)&stream, &IID_IStream, (void**)&istream); - ok(res == S_OK, "QueryInterface to IStream returned wrong hResult: 0x%08x.\n", res); - ok(stream.RefCount == 2, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 2); + ok(res == S_OK, "QueryInterface to IStream returned wrong hResult: 0x%08lx.\n", res); + ok(stream.RefCount == 2, "RefCount has a wrong value: %ld (expected %d).\n", stream.RefCount, 2); EndSeh(STATUS_SUCCESS); CompareStructsAndSaveForLater(&previous, &stream, "After QueryInterface"); StartSeh() res = IStream_Stat(istream, NULL, 0); - ok(res == STG_E_INVALIDPOINTER, "Stat to IStream returned wrong hResult: 0x%08x.\n", res); + ok(res == STG_E_INVALIDPOINTER, "Stat to IStream returned wrong hResult: 0x%08lx.\n", res); EndSeh(STATUS_SUCCESS); StartSeh() res = IStream_Stat(istream, &stat, STATFLAG_NONAME); - ok(res == S_OK, "Stat to IStream returned wrong hResult: 0x%08x.\n", res); + ok(res == S_OK, "Stat to IStream returned wrong hResult: 0x%08lx.\n", res); EndSeh(STATUS_SUCCESS); ok(stream.Current == buffer2, @@ -148,56 +142,56 @@ ok(stream.End == buffer2 + sizeof(buffer2), "stream.End was changed unexpectedly\n"); ok(stat.cbSize.QuadPart == ((PUCHAR)stream.End - (PUCHAR)stream.Start), - "stat.cbSize has the wrong value %lld (expected %d)\n", + "stat.cbSize has the wrong value %I64u (expected %d)\n", stat.cbSize.QuadPart, (PUCHAR)stream.End - (PUCHAR)stream.Start); CompareStructsAndSaveForLater(&previous, &stream, "After Stat"); StartSeh() res = IStream_AddRef(istream); - ok(res == 3, "AddRef to IStream returned wrong hResult: %d.\n", res); + ok(res == 3, "AddRef to IStream returned wrong hResult: %ld.\n", res); EndSeh(STATUS_SUCCESS); StartSeh() res = IStream_AddRef(istream); - ok(res == 4, "AddRef to IStream returned wrong hResult: %d.\n", res); + ok(res == 4, "AddRef to IStream returned wrong hResult: %ld.\n", res); EndSeh(STATUS_SUCCESS); StartSeh() res = IStream_Release(istream); - ok(res == 3, "Release to IStream returned wrong hResult: %d.\n", res); + ok(res == 3, "Release to IStream returned wrong hResult: %ld.\n", res); EndSeh(STATUS_SUCCESS); StartSeh() res = IStream_AddRef(istream); - ok(res == 4, "AddRef to IStream returned wrong hResult: %d.\n", res); + ok(res == 4, "AddRef to IStream returned wrong hResult: %ld.\n", res); EndSeh(STATUS_SUCCESS); StartSeh() res = IStream_Release(istream); - ok(res == 3, "Release to IStream returned wrong hResult: %d.\n", res); + ok(res == 3, "Release to IStream returned wrong hResult: %ld.\n", res); EndSeh(STATUS_SUCCESS); StartSeh() res = IStream_Release(istream); - ok(res == 2, "Release to IStream returned wrong hResult: %d.\n", res); + ok(res == 2, "Release to IStream returned wrong hResult: %ld.\n", res); EndSeh(STATUS_SUCCESS); CompareStructsAndSaveForLater(&previous, &stream, "After AddRef"); StartSeh() res = IStream_Read(istream, NULL, 0, &bytesRead); - ok(res == S_OK, "Read to IStream returned wrong hResult: 0x%08x.\n", res); + ok(res == S_OK, "Read to IStream returned wrong hResult: 0x%08lx.\n", res); EndSeh(STATUS_SUCCESS); StartSeh() res = IStream_Read(istream, buffer, 40, NULL); - ok(res == S_OK, "Read to IStream returned wrong hResult: 0x%08x.\n", res); + ok(res == S_OK, "Read to IStream returned wrong hResult: 0x%08lx.\n", res); EndSeh(STATUS_ACCESS_VIOLATION); StartSeh() res = IStream_Read(istream, buffer + 40, 39, &bytesRead); - ok(res == S_OK, "Read to IStream returned wrong hResult: 0x%08x.\n", res); + ok(res == S_OK, "Read to IStream returned wrong hResult: 0x%08lx.\n", res); EndSeh(STATUS_SUCCESS); if (SUCCEEDED(res)) @@ -205,7 +199,7 @@ bytesRead += 40; for (i = 0; i < bytesRead; i++) { - ok(buffer[i] == i, "Buffer[%d] contains a wrong number %d (expected %d).\n", i, buffer[i], i); + ok(buffer[i] == i, "Buffer[%lu] contains a wrong number %u (expected %lu).\n", i, buffer[i], i); } } @@ -222,15 +216,15 @@ StartSeh() move.QuadPart = -1; res = IStream_Seek(istream, move, STREAM_SEEK_END, &size); - ok(res == STG_E_INVALIDPOINTER, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); - ok(size.QuadPart == 0x9090909090909090ull, "Seek modified the new location in an error (0x%08x,0x%08x).\n", size.HighPart, size.LowPart); + ok(res == STG_E_INVALIDPOINTER, "Seek to IStream returned wrong hResult: 0x%08lx.\n", res); + ok(size.QuadPart == 0x9090909090909090ull, "Seek modified the new location in an error (0x%08lx,0x%08lx).\n", size.HighPart, size.LowPart); EndSeh(STATUS_SUCCESS); StartSeh() move.QuadPart = 0; res = IStream_Seek(istream, move, STREAM_SEEK_END, &size); - ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); - ok(size.QuadPart == (PUCHAR)stream.End - (PUCHAR)stream.Start, "Seek new location unexpected value: 0x%08x.\n", size.LowPart); + ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08lx.\n", res); + ok(size.QuadPart == (PUCHAR)stream.End - (PUCHAR)stream.Start, "Seek new location unexpected value: 0x%08lx.\n", size.LowPart); EndSeh(STATUS_SUCCESS); size.QuadPart = 0x9090909090909090ull; @@ -238,8 +232,8 @@ StartSeh() move.QuadPart = 1; res = IStream_Seek(istream, move, STREAM_SEEK_END, &size); - ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); - ok(size.QuadPart == (PUCHAR)stream.End - (PUCHAR)stream.Start - 1, "Seek new location unexpected value: 0x%08x.\n", size.LowPart); + ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08lx.\n", res); + ok(size.QuadPart == (PUCHAR)stream.End - (PUCHAR)stream.Start - 1, "Seek new location unexpected value: 0x%08lx.\n", size.LowPart); EndSeh(STATUS_SUCCESS); size.QuadPart = 0x9090909090909090ull; @@ -247,8 +241,8 @@ StartSeh() move.QuadPart = 2; res = IStream_Seek(istream, move, STREAM_SEEK_END, &size); - ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); - ok(size.QuadPart == (PUCHAR)stream.End - (PUCHAR)stream.Start - 2, "Seek new location unexpected value: 0x%08x.\n", size.LowPart); + ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08lx.\n", res); + ok(size.QuadPart == (PUCHAR)stream.End - (PUCHAR)stream.Start - 2, "Seek new location unexpected value: 0x%08lx.\n", size.LowPart); EndSeh(STATUS_SUCCESS); size.QuadPart = 0x9090909090909090ull; @@ -256,14 +250,14 @@ StartSeh() move.QuadPart = -20; res = IStream_Seek(istream, move, STREAM_SEEK_SET, &size); - ok(res == STG_E_INVALIDPOINTER, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); + ok(res == STG_E_INVALIDPOINTER, "Seek to IStream returned wrong hResult: 0x%08lx.\n", res); ok(size.QuadPart == 0x9090909090909090ull, "Seek modified the new location in an error.\n"); EndSeh(STATUS_SUCCESS); StartSeh() move.QuadPart = 4000; res = IStream_Seek(istream, move, STREAM_SEEK_SET, &size); - ok(res == STG_E_INVALIDPOINTER, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); + ok(res == STG_E_INVALIDPOINTER, "Seek to IStream returned wrong hResult: 0x%08lx.\n", res); ok(size.QuadPart == 0x9090909090909090ull, "Seek modified the new location in an error.\n"); EndSeh(STATUS_SUCCESS); @@ -271,11 +265,11 @@ move.QuadPart = 0x100000000ull; res = IStream_Seek(istream, move, STREAM_SEEK_SET, &size); #ifdef _WIN64 - ok(res == STG_E_INVALIDPOINTER, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); - ok(size.QuadPart == 0x9090909090909090ull, "Seek modified the new location in an error (0x%08x,0x%08x).\n", size.HighPart, size.LowPart); + ok(res == STG_E_INVALIDPOINTER, "Seek to IStream returned wrong hResult: 0x%08lx.\n", res); + ok(size.QuadPart == 0x9090909090909090ull, "Seek modified the new location in an error (0x%08lx,0x%08lx).\n", size.HighPart, size.LowPart); #else - ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); - ok(size.QuadPart == 0, "Seek new location unexpected value: 0x%08x.\n", size.LowPart); + ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08lx.\n", res); + ok(size.QuadPart == 0, "Seek new location unexpected value: 0x%08lx.\n", size.LowPart); #endif EndSeh(STATUS_SUCCESS); @@ -283,8 +277,8 @@ StartSeh() move.QuadPart = 0; res = IStream_Seek(istream, move, STREAM_SEEK_SET, &size); - ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); - ok(size.QuadPart == 0, "Seek new location unexpected value: 0x%08x.\n", size.LowPart); + ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08lx.\n", res); + ok(size.QuadPart == 0, "Seek new location unexpected value: 0x%08lx.\n", size.LowPart); EndSeh(STATUS_SUCCESS); #endif @@ -293,30 +287,30 @@ StartSeh() move.QuadPart = -20; res = IStream_Seek(istream, move, STREAM_SEEK_CUR, &size); - ok(res == STG_E_INVALIDPOINTER, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); - ok(size.QuadPart == 0x9090909090909090ull, "Seek modified the new location in an error (0x%08x,0x%08x).\n", size.HighPart, size.LowPart); + ok(res == STG_E_INVALIDPOINTER, "Seek to IStream returned wrong hResult: 0x%08lx.\n", res); + ok(size.QuadPart == 0x9090909090909090ull, "Seek modified the new location in an error (0x%08lx,0x%08lx).\n", size.HighPart, size.LowPart); EndSeh(STATUS_SUCCESS); StartSeh() move.QuadPart = 0x100000000ull; res = IStream_Seek(istream, move, STREAM_SEEK_CUR, &size); #ifdef _WIN64 - ok(res == STG_E_INVALIDPOINTER, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); - ok(size.QuadPart == 0x9090909090909090ull, "Seek modified the new location in an error (0x%08x,0x%08x).\n", size.HighPart, size.LowPart); + ok(res == STG_E_INVALIDPOINTER, "Seek to IStream returned wrong hResult: 0x%08lx.\n", res); + ok(size.QuadPart == 0x9090909090909090ull, "Seek modified the new location in an error (0x%08lx,0x%08lx).\n", size.HighPart, size.LowPart); #else - ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); - ok(size.QuadPart == 0, "Seek new location unexpected value: 0x%08x.\n", size.LowPart); + ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08lx.\n", res); + ok(size.QuadPart == 0, "Seek new location unexpected value: 0x%08lx.\n", size.LowPart); #endif EndSeh(STATUS_SUCCESS); StartSeh() move.QuadPart = 40; res = IStream_Seek(istream, move, STREAM_SEEK_SET, &size); - ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); + ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08lx.\n", res); EndSeh(STATUS_SUCCESS); ok(size.QuadPart == 40, - "Seek returned wrong offset %lld (expected %d)\n", + "Seek returned wrong offset %I64u (expected %d)\n", size.QuadPart, 40); ok(stream.Current == buffer2 + 40, @@ -329,13 +323,13 @@ res = IStream_Read(istream, buffer, sizeof(buffer), &bytesRead); - ok(res == S_OK, "Read to IStream returned wrong hResult: 0x%08x.\n", res); + ok(res == S_OK, "Read to IStream returned wrong hResult: 0x%08lx.\n", res); if (SUCCEEDED(res)) { for (i = 0; i < bytesRead; i++) { - ok(buffer[i] == (i + 40), "Buffer[%d] contains a wrong number %d (expected %d).\n", i, buffer[i], i + 40); + ok(buffer[i] == (i + 40), "Buffer[%lu] contains a wrong number %u (expected %lu).\n", i, buffer[i], i + 40); } } @@ -349,17 +343,17 @@ res = IStream_Release(istream); - ok(res == 1, "Release to IStream returned wrong hResult: 0x%08x.\n", res); - - ok(stream.RefCount == 1, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 1); + ok(res == 1, "Release to IStream returned wrong hResult: 0x%08lx.\n", res); + + ok(stream.RefCount == 1, "RefCount has a wrong value: %ld (expected %d).\n", stream.RefCount, 1); res = IStream_Release(istream); - ok(res == S_OK, "Release to IStream returned wrong hResult: 0x%08x.\n", res); - - ok(stream.RefCount == 0, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 0); - - ok(finalReleaseCallCount == 1, "FinalRelease was called %d times instead of 1.\n", finalReleaseCallCount); + ok(res == S_OK, "Release to IStream returned wrong hResult: 0x%08lx.\n", res); + + ok(stream.RefCount == 0, "RefCount has a wrong value: %ld (expected %d).\n", stream.RefCount, 0); + + ok(finalReleaseCallCount == 1, "FinalRelease was called %lu times instead of 1.\n", finalReleaseCallCount); } void test_OutOfProcess() @@ -399,7 +393,7 @@ "stream.FinalRelease unexpected %p != %p.\n", stream.FinalRelease, RtlFinalReleaseOutOfProcessMemoryStream); - ok(stream.RefCount == 0, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 0); + ok(stream.RefCount == 0, "RefCount has a wrong value: %ld (expected %d).\n", stream.RefCount, 0); CompareStructsAndSaveForLater(&previous, &stream, "After init"); @@ -413,19 +407,19 @@ res = IStream_QueryInterface((struct IStream*)&stream, &IID_IStream, (void**)&istream); - ok(res == S_OK, "QueryInterface to IStream returned wrong hResult: 0x%08x.\n", res); - - ok(stream.RefCount == 1, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 1); + ok(res == S_OK, "QueryInterface to IStream returned wrong hResult: 0x%08lx.\n", res); + + ok(stream.RefCount == 1, "RefCount has a wrong value: %ld (expected %d).\n", stream.RefCount, 1); ok(stream.ProcessHandle == process, - "ProcessHandle changed unexpectedly: 0x%08x (expected 0x%p)\n", + "ProcessHandle changed unexpectedly: 0x%p (expected 0x%p)\n", stream.ProcessHandle, process); CompareStructsAndSaveForLater(&previous, &stream, "After QueryInterface"); res = IStream_Stat(istream, &stat, STATFLAG_NONAME); - ok(res == S_OK, "Stat to IStream returned wrong hResult: 0x%08x.\n", res); + ok(res == S_OK, "Stat to IStream returned wrong hResult: 0x%08lx.\n", res); ok(stream.Current == buffer2, "stream.Current points to the wrong address 0x%p (expected 0x%p)\n", @@ -433,24 +427,24 @@ ok(stream.Start == buffer2, "stream.Start was changed unexpectedly\n"); ok(stream.End == buffer2 + sizeof(buffer2), "stream.End was changed unexpectedly\n"); ok(stream.ProcessHandle == process, - "ProcessHandle changed unexpectedly: 0x%08x (expected 0x%p)\n", + "ProcessHandle changed unexpectedly: 0x%p (expected 0x%p)\n", stream.ProcessHandle, process); ok(stat.cbSize.QuadPart == ((PUCHAR)stream.End - (PUCHAR)stream.Start), - "stat.cbSize has the wrong value %lld (expected %d)\n", + "stat.cbSize has the wrong value %I64u (expected %d)\n", stat.cbSize.QuadPart, (PUCHAR)stream.End - (PUCHAR)stream.Start); CompareStructsAndSaveForLater(&previous, &stream, "After Stat"); res = IStream_Read(istream, buffer, sizeof(buffer), &bytesRead); - ok(res == S_OK, "Read to IStream returned wrong hResult: 0x%08x.\n", res); + ok(res == S_OK, "Read to IStream returned wrong hResult: 0x%08lx.\n", res); if (SUCCEEDED(res)) { for (i = 0; i < bytesRead; i++) { - ok(buffer[i] == i, "Buffer[%d] contains a wrong number %d (expected %d).\n", i, buffer[i], i); + ok(buffer[i] == i, "Buffer[%lu] contains a wrong number %u (expected %lu).\n", i, buffer[i], i); } } @@ -460,7 +454,7 @@ ok(stream.Start == buffer2, "stream.Start was changed unexpectedly\n"); ok(stream.End == buffer2 + sizeof(buffer2), "stream.End was changed unexpectedly\n"); ok(stream.ProcessHandle == process, - "ProcessHandle changed unexpectedly: 0x%08x (expected 0x%p)\n", + "ProcessHandle changed unexpectedly: 0x%p (expected 0x%p)\n", stream.ProcessHandle, process); CompareStructsAndSaveForLater(&previous, &stream, "After Read 1"); @@ -469,10 +463,10 @@ res = IStream_Seek(istream, move, STREAM_SEEK_SET, &size); - ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08x.\n", res); + ok(res == S_OK, "Seek to IStream returned wrong hResult: 0x%08lx.\n", res); ok(size.QuadPart == 40, - "Seek returned wrong offset %lld (expected %d)\n", + "Seek returned wrong offset %I64u (expected %d)\n", size.QuadPart, 40); ok(stream.Current == buffer2 + 40, @@ -481,20 +475,20 @@ ok(stream.Start == buffer2, "stream.Start was changed unexpectedly\n"); ok(stream.End == buffer2 + sizeof(buffer2), "stream.End was changed unexpectedly\n"); ok(stream.ProcessHandle == process, - "ProcessHandle changed unexpectedly: 0x%08x (expected 0x%p)\n", + "ProcessHandle changed unexpectedly: 0x%p (expected 0x%p)\n", stream.ProcessHandle, process); CompareStructsAndSaveForLater(&previous, &stream, "After Seek"); res = IStream_Read(istream, buffer, sizeof(buffer), &bytesRead); - ok(res == S_OK, "Read to IStream returned wrong hResult: 0x%08x.\n", res); + ok(res == S_OK, "Read to IStream returned wrong hResult: 0x%08lx.\n", res); if (SUCCEEDED(res)) { for (i = 0; i < bytesRead; i++) { - ok(buffer[i] == (i + 40), "Buffer[%d] contains a wrong number %d (expected %d).\n", i, buffer[i], i + 40); + ok(buffer[i] == (i + 40), "Buffer[%lu] contains a wrong number %u (expected %lu).\n", i, buffer[i], i + 40); } } @@ -504,18 +498,18 @@ ok(stream.Start == buffer2, "stream.Start was changed unexpectedly\n"); ok(stream.End == buffer2 + sizeof(buffer2), "stream.End was changed unexpectedly\n"); ok(stream.ProcessHandle == process, - "ProcessHandle changed unexpectedly: 0x%08x (expected 0x%p)\n", + "ProcessHandle changed unexpectedly: 0x%p (expected 0x%p)\n", stream.ProcessHandle, process); CompareStructsAndSaveForLater(&previous, &stream, "After Read 2"); res = IStream_Release(istream); - ok(res == S_OK, "Release to IStream returned wrong hResult: 0x%08x.\n", res); - - ok(stream.RefCount == 0, "RefCount has a wrong value: %d (expected %d).\n", stream.RefCount, 0); - - ok(finalReleaseCallCount == 1, "FinalRelease was called %d times instead of 1.\n", finalReleaseCallCount); + ok(res == S_OK, "Release to IStream returned wrong hResult: 0x%08lx.\n", res); + + ok(stream.RefCount == 0, "RefCount has a wrong value: %ld (expected %d).\n", stream.RefCount, 0); + + ok(finalReleaseCallCount == 1, "FinalRelease was called %lu times instead of 1.\n", finalReleaseCallCount); } START_TEST(RtlMemoryStream) Modified: trunk/rostests/apitests/ntdll/Timer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/Timer.c?re… ============================================================================== --- trunk/rostests/apitests/ntdll/Timer.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/Timer.c [iso-8859-1] Wed Mar 26 12:07:25 2014 @@ -58,15 +58,15 @@ TRUE, &CurrentResolution); ok_hex(Status, STATUS_SUCCESS); - printf("Current resolution: %d ; minimum resolution: %d\n", CurrentResolution, MinimumResolution); - ok(CurrentResolution <= MinimumResolution, "Current resolution: %d became too high! (minimum resolution: %d)\n", CurrentResolution, MinimumResolution); + printf("Current resolution: %lu ; minimum resolution: %lu\n", CurrentResolution, MinimumResolution); + ok(CurrentResolution <= MinimumResolution, "Current resolution: %lu became too high! (minimum resolution: %lu)\n", CurrentResolution, MinimumResolution); Status = NtSetTimerResolution(MaximumResolution - 1, TRUE, &CurrentResolution); ok_hex(Status, STATUS_SUCCESS); - printf("Current resolution: %d ; maximum resolution: %d\n", CurrentResolution, MaximumResolution); - ok(CurrentResolution >= MaximumResolution, "Current resolution: %d became too low! (maximum resolution: %d)\n", CurrentResolution, MaximumResolution); + printf("Current resolution: %lu ; maximum resolution: %lu\n", CurrentResolution, MaximumResolution); + ok(CurrentResolution >= MaximumResolution, "Current resolution: %lu became too low! (maximum resolution: %lu)\n", CurrentResolution, MaximumResolution); /* Get the current timer resolution */ Status = NtSetTimerResolution(0, /* Ignored */

1 0

[dquintana] 62567: [RSHELL] * Redesigned large portions of the focus manager. All the mouse interactions seem to work now CORE-7586.
by dquintana＠svn.reactos.org 26 Mar '14

26 Mar '14

Author: dquintana Date: Wed Mar 26 11:33:52 2014 New Revision: 62567 URL: http://svn.reactos.org/svn/reactos?rev=62567&view=rev Log: [RSHELL] * Redesigned large portions of the focus manager. All the mouse interactions seem to work now CORE-7586. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/misc.cpp branches/shell-experiments/base/shell/rshell/precomp.h Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Wed Mar 26 11:33:52 2014 @@ -284,17 +284,17 @@ if (m_SFToolbar) { m_SFToolbar->SetPosSize( - prc->left, - prc->top, - prc->right - prc->left, + prc->left, + prc->top, + prc->right - prc->left, syShlFld); } if (m_staticToolbar) { m_staticToolbar->SetPosSize( - prc->left, - prc->top + syShlFld, - prc->right - prc->left, + prc->left, + prc->top + syShlFld, + prc->right - prc->left, syStatic); } @@ -360,10 +360,20 @@ m_parentBand->SetClient(NULL); } - if (fShow) - hr = m_focusManager->PushMenu(this); + if (_IsPopup() == S_OK) + { + if (fShow) + hr = m_focusManager->PushMenuPopup(this); + else + hr = m_focusManager->PopMenuPopup(this); + } else - hr = m_focusManager->PopMenu(this); + { + if (fShow) + hr = m_focusManager->PushMenuBar(this); + else + hr = m_focusManager->PopMenuBar(this); + } return S_OK; } @@ -510,15 +520,15 @@ HRESULT STDMETHODCALLTYPE CMenuBand::SetClient(IUnknown *punkClient) { - if (m_subMenuChild) - m_subMenuChild = NULL; + m_subMenuChild = NULL; + if (!punkClient) { if (m_staticToolbar) m_staticToolbar->OnPopupItemChanged(NULL, -1); if (m_SFToolbar) m_SFToolbar->OnPopupItemChanged(NULL, -1); return S_OK; } - HRESULT hr = punkClient->QueryInterface(IID_PPV_ARG(IMenuPopup, &m_subMenuChild)); + HRESULT hr = punkClient->QueryInterface(IID_PPV_ARG(IMenuPopup, &m_subMenuChild)); m_trackingPopup = m_subMenuChild != NULL; DbgPrint("Tracking: %d\n", m_trackingPopup); return hr; @@ -596,7 +606,7 @@ { return m_SFToolbar->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); } - + return S_FALSE; } @@ -659,7 +669,7 @@ m_trackingPopup = TRUE; DbgPrint("Tracking: %d\n", m_trackingPopup); - m_focusManager->PushTrackedPopup(this, popup); + m_focusManager->PushTrackedPopup(popup); if (m_menuOwner) { ::TrackPopupMenuEx(popup, flags, x, y, m_menuOwner, &params); @@ -668,7 +678,7 @@ { ::TrackPopupMenuEx(popup, flags, x, y, m_topLevelWindow, &params); } - m_focusManager->PopTrackedPopup(this, popup); + m_focusManager->PopTrackedPopup(popup); m_trackingPopup = FALSE; DbgPrint("Tracking: %d\n", m_trackingPopup); @@ -1008,8 +1018,8 @@ return S_OK; } -HRESULT STDMETHODCALLTYPE CMenuBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) -{ - UNIMPLEMENTED; - return S_OK; -} +HRESULT STDMETHODCALLTYPE CMenuBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) +{ + UNIMPLEMENTED; + return S_OK; +} Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Wed Mar 26 11:33:52 2014 @@ -133,7 +133,7 @@ { return this->QueryInterface(riid, ppvObject); } - + if (IsEqualGUID(guidService, SID_SMenuBandBottom) || IsEqualGUID(guidService, SID_SMenuBandBottomSelected) || IsEqualGUID(guidService, SID_SMenuBandChild)) @@ -299,7 +299,7 @@ ::GetObject(m_Banner, sizeof(bm), &bm); rc.right += bm.bmWidth; } - + int x, y, cx, cy; RECT rcWorkArea; @@ -350,7 +350,7 @@ { cy = waHeight; } - + if (y + cy > rcWorkArea.bottom) { y = rcWorkArea.bottom - cy; @@ -438,23 +438,23 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect(DWORD dwSelectType) { /* As far as I can tell, the submenu hierarchy looks like this: - - The DeskBar's Child is the Band it contains. - The DeskBar's Parent is the SID_SMenuPopup of the Site. - - The Band's Child is the IMenuPopup of the child submenu. - The Band's Parent is the SID_SMenuPopup of the Site (the DeskBar). - - When the DeskBar receives a selection event: - If it requires closing the window, it will notify the Child (Band) using CancelLevel. - If it has to spread upwards (everything but CancelLevel), it will notify the Parent. - - When the Band receives a selection event, this is where it gets fuzzy: - In which cases does it call the Parent? Probably not CancelLevel. - In which cases does it call the Child? - How does it react to calls? - - */ + * + * The DeskBar's Child is the Band it contains. + * The DeskBar's Parent is the SID_SMenuPopup of the Site. + * + * The Band's Child is the IMenuPopup of the child submenu. + * The Band's Parent is the SID_SMenuPopup of the Site (the DeskBar). + * + * When the DeskBar receives a selection event: + * If it requires closing the window, it will notify the Child (Band) using CancelLevel. + * If it has to spread upwards (everything but CancelLevel), it will notify the Parent. + * + * When the Band receives a selection event, this is where it gets fuzzy: + * In which cases does it call the Parent? Probably not CancelLevel. + * In which cases does it call the Child? + * How does it react to calls? + * + */ switch (dwSelectType) { Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Wed Mar 26 11:33:52 2014 @@ -26,6 +26,36 @@ #include "CMenuToolbars.h" #include "CMenuBand.h" +#undef _ASSERT +#define _ASSERT(x) DbgAssert(!!(x), __FILE__, __LINE__, #x) + +bool DbgAssert(bool x, const char * filename, int line, const char * expr) +{ + if (!x) + { + char szMsg[512]; + const char *fname; + + fname = strrchr(filename, '\\'); + if (fname == NULL) + { + fname = strrchr(filename, '/'); + } + + if (fname == NULL) + fname = filename; + else + fname++; + + sprintf(szMsg, "%s:%d: Assertion failed: %s\n", fname, line, expr); + + OutputDebugStringA(szMsg); + + __debugbreak(); + } + return x; +} + WINE_DEFAULT_DEBUG_CHANNEL(CMenuFocus); DWORD CMenuFocusManager::TlsIndex = 0; @@ -76,60 +106,56 @@ return GetManager()->GetMsgHook(nCode, wParam, lParam); } -HRESULT CMenuFocusManager::PushToArray(CMenuBand * item) +HRESULT CMenuFocusManager::PushToArray(StackEntryType type, CMenuBand * mb, HMENU hmenu) { if (m_bandCount >= MAX_RECURSE) return E_OUTOFMEMORY; - m_bandStack[m_bandCount++] = item; - return S_OK; -} - -HRESULT CMenuFocusManager::PopFromArray(CMenuBand ** pItem) -{ - if (pItem) - *pItem = NULL; + m_bandStack[m_bandCount].type = type; + m_bandStack[m_bandCount].mb = mb; + m_bandStack[m_bandCount].hmenu = hmenu; + m_bandCount++; + + return S_OK; +} + +HRESULT CMenuFocusManager::PopFromArray(StackEntryType * pType, CMenuBand ** pMb, HMENU * pHmenu) +{ + if (pType) *pType = NoEntry; + if (pMb) *pMb = NULL; + if (pHmenu) *pHmenu = NULL; if (m_bandCount <= 0) return S_FALSE; m_bandCount--; - if (pItem) - *pItem = m_bandStack[m_bandCount]; - - m_bandStack[m_bandCount] = NULL; - - return S_OK; -} - -HRESULT CMenuFocusManager::PeekArray(CMenuBand ** pItem) -{ - if (!pItem) - return E_FAIL; - - *pItem = NULL; - - if (m_bandCount <= 0) - return S_FALSE; - - *pItem = m_bandStack[m_bandCount - 1]; - + if (pType) *pType = m_bandStack[m_bandCount].type; + if (*pType == TrackedMenuEntry) + { + if (pHmenu) *pHmenu = m_bandStack[m_bandCount].hmenu; + } + else + { + if (pMb) *pMb = m_bandStack[m_bandCount].mb; + } + return S_OK; } CMenuFocusManager::CMenuFocusManager() : - m_currentBand(NULL), - m_currentFocus(NULL), - m_currentMenu(NULL), - m_parentToolbar(NULL), + m_current(NULL), + m_parent(NULL), m_hMsgFilterHook(NULL), m_hGetMsgHook(NULL), m_mouseTrackDisabled(FALSE), m_lastMoveFlags(0), m_lastMovePos(0), + m_captureHwnd(0), m_bandCount(0) { + m_ptPrev.x = 0; + m_ptPrev.y = 0; m_threadId = GetCurrentThreadId(); } @@ -137,41 +163,60 @@ { } -void CMenuFocusManager::DisableMouseTrack(HWND enableTo, BOOL disableThis) +void CMenuFocusManager::DisableMouseTrack(HWND parent, BOOL disableThis) { BOOL bDisable = FALSE; + BOOL lastDisable = FALSE; int i = m_bandCount; while (--i >= 0) { - CMenuBand * band = m_bandStack[i]; - - HWND hwnd; - HRESULT hr = band->_GetTopLevelWindow(&hwnd); - if (FAILED_UNEXPECTEDLY(hr)) - break; - - if (hwnd == enableTo) - { - band->_DisableMouseTrack(disableThis); - bDisable = TRUE; + StackEntry& entry = m_bandStack[i]; + + if (entry.type == MenuPopupEntry) + { + HWND hwnd; + HRESULT hr = entry.mb->_GetTopLevelWindow(&hwnd); + if (FAILED_UNEXPECTEDLY(hr)) + break; + + if (hwnd == parent) + { + lastDisable = disableThis; + entry.mb->_DisableMouseTrack(disableThis); + bDisable = TRUE; + } + else + { + lastDisable = bDisable; + entry.mb->_DisableMouseTrack(bDisable); + } } else { - band->_DisableMouseTrack(bDisable); - } - } - - if (m_mouseTrackDisabled == bDisable) - { - if (bDisable) - { - SetCapture(m_currentFocus); + continue; + } + } + m_mouseTrackDisabled = lastDisable; +} + +void CMenuFocusManager::SetCapture(HWND child) +{ + if (m_captureHwnd != child) + { + if (child) + { + ::SetCapture(child); + m_captureHwnd = child; + DbgPrint("MouseTrack is now capturing %p\n", child); } else - ReleaseCapture(); - - m_mouseTrackDisabled = bDisable; + { + ::ReleaseCapture(); + m_captureHwnd = NULL; + DbgPrint("MouseTrack is now off\n"); + } + } } @@ -180,16 +225,15 @@ int i = m_bandCount; while (--i >= 0) { - CMenuBand * band = m_bandStack[i]; - - HWND hwnd; - HRESULT hr = band->_GetTopLevelWindow(&hwnd); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - if (hwnd == hWnd) - { - return band->_IsPopup(); + StackEntry& entry = m_bandStack[i]; + + if (entry.type == MenuPopupEntry) + { + HRESULT hr = entry.mb->IsWindowOwner(hWnd); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + if (hr == S_OK) + return S_OK; } } @@ -198,23 +242,21 @@ LRESULT CMenuFocusManager::ProcessMouseMove(MSG* msg) { - HWND parent; HWND child; POINT pt; int iHitTestResult; pt = msg->pt; - parent = WindowFromPoint(pt); - - ScreenToClient(parent, &pt); - - child = ChildWindowFromPoint(parent, pt); - - if (child != m_parentToolbar) + child = WindowFromPoint(pt); + + if (!m_parent) return TRUE; - ScreenToClient(m_parentToolbar, &msg->pt); + if (m_parent->mb->IsWindowOwner(child) != S_OK) + return TRUE; + + ScreenToClient(child, &msg->pt); /* Don't do anything if the mouse has not been moved */ if (msg->pt.x == m_ptPrev.x && msg->pt.y == m_ptPrev.y) @@ -222,20 +264,19 @@ m_ptPrev = msg->pt; - iHitTestResult = SendMessageW(m_parentToolbar, TB_HITTEST, 0, (LPARAM) &msg->pt); + iHitTestResult = SendMessageW(child, TB_HITTEST, 0, (LPARAM) &msg->pt); /* Make sure that iHitTestResult is one of the menu items and that it is not the current menu item */ if (iHitTestResult >= 0) { - HWND hwndToolbar = m_parentToolbar; + HWND hwndToolbar = child; if (SendMessage(hwndToolbar, WM_USER_ISTRACKEDITEM, iHitTestResult, 0)) { DbgPrint("Hot item tracking detected a change...\n"); - if (m_currentMenu) - SendMessage(m_currentFocus, WM_CANCELMODE, 0, 0); + if (m_current->type == TrackedMenuEntry) + SendMessage(m_parent->hwnd, WM_CANCELMODE, 0, 0); else - m_currentBand->_MenuItemHotTrack(MPOS_CANCELLEVEL); - DbgPrint("Active popup cancelled, notifying of change...\n"); + m_current->mb->_MenuItemHotTrack(MPOS_CANCELLEVEL); PostMessage(hwndToolbar, WM_USER_CHANGETRACKEDITEM, iHitTestResult, iHitTestResult); return FALSE; } @@ -253,9 +294,7 @@ { BOOL callNext = TRUE; MSG* msg = reinterpret_cast<MSG*>(lParam); - - // Do whatever is necessary here - + switch (msg->message) { case WM_MOUSEMOVE: @@ -281,9 +320,7 @@ { BOOL callNext = TRUE; MSG* msg = reinterpret_cast<MSG*>(lParam); - - // Do whatever is necessary here - + switch (msg->message) { case WM_CLOSE: @@ -291,65 +328,78 @@ case WM_NCLBUTTONDOWN: case WM_LBUTTONDOWN: - { - POINT pt = { GET_X_LPARAM(pos), GET_Y_LPARAM(pos) }; - - HWND window = GetAncestor(WindowFromPoint(pt), GA_ROOT); - - if (IsTrackedWindow(window) != S_OK) + if (m_current->type == MenuPopupEntry) { - DisableMouseTrack(NULL, FALSE); - m_currentBand->_MenuItemHotTrack(MPOS_FULLCANCEL); - } - - break; - } - case WM_MOUSEMOVE: - if (m_lastMoveFlags != wParam || m_lastMovePos != pos) - { - m_lastMoveFlags = wParam; - m_lastMovePos = pos; - POINT pt = { GET_X_LPARAM(pos), GET_Y_LPARAM(pos) }; - HWND window = WindowFromPoint(pt); - - if (IsTrackedWindow(window) == S_OK) + HWND child = WindowFromPoint(pt); + HWND window = GetAncestor(child, GA_ROOT); + + if (IsTrackedWindow(window) != S_OK) { - DisableMouseTrack(window, FALSE); - } - else - { - DisableMouseTrack(NULL, FALSE); + m_current->mb->_MenuItemHotTrack(MPOS_FULLCANCEL); } } - callNext = ProcessMouseMove(msg); + break; + case WM_MOUSEMOVE: + if ((m_parent && m_parent->type==MenuPopupEntry) || ProcessMouseMove(msg)) + { + if (m_current->type == MenuPopupEntry) + { + if (m_lastMoveFlags != wParam || m_lastMovePos != pos) + { + m_lastMoveFlags = wParam; + m_lastMovePos = pos; + + POINT pt = { GET_X_LPARAM(pos), GET_Y_LPARAM(pos) }; + + HWND child = WindowFromPoint(pt); + HWND window = GetAncestor(child, GA_ROOT); + + if (m_parent && m_parent->mb->IsWindowOwner(child) == S_OK) + { + DisableMouseTrack(window, FALSE); + } + else if (IsTrackedWindow(child) == S_OK) + { + DisableMouseTrack(window, FALSE); + SetCapture(child); + } + else + { + DisableMouseTrack(NULL, FALSE); + SetCapture(NULL); + } + } + } + } + else + { + callNext = FALSE; + } break; case WM_SYSKEYDOWN: case WM_KEYDOWN: - //if (!m_currentMenu) + DisableMouseTrack(m_current->hwnd, TRUE); + switch (msg->wParam) { - DisableMouseTrack(m_currentFocus, TRUE); - switch (msg->wParam) - { - case VK_MENU: - case VK_LMENU: - case VK_RMENU: - m_currentBand->_MenuItemHotTrack(MPOS_FULLCANCEL); - break; - case VK_LEFT: - m_currentBand->_MenuItemHotTrack(MPOS_SELECTLEFT); - break; - case VK_RIGHT: - m_currentBand->_MenuItemHotTrack(MPOS_SELECTRIGHT); - break; - case VK_UP: - m_currentBand->_MenuItemHotTrack(VK_UP); - break; - case VK_DOWN: - m_currentBand->_MenuItemHotTrack(VK_DOWN); - break; - } + case VK_MENU: + case VK_LMENU: + case VK_RMENU: + m_current->mb->_MenuItemHotTrack(MPOS_FULLCANCEL); + break; + case VK_LEFT: + m_current->mb->_MenuItemHotTrack(MPOS_SELECTLEFT); + break; + case VK_RIGHT: + m_current->mb->_MenuItemHotTrack(MPOS_SELECTRIGHT); + break; + case VK_UP: + m_current->mb->_MenuItemHotTrack(VK_UP); + break; + case VK_DOWN: + m_current->mb->_MenuItemHotTrack(VK_DOWN); + break; } break; } @@ -363,8 +413,7 @@ HRESULT CMenuFocusManager::PlaceHooks() { - //SetCapture(window); - if (m_currentMenu) + if (m_current->hmenu) { DbgPrint("Entering MSGFILTER hook...\n"); m_hMsgFilterHook = SetWindowsHookEx(WH_MSGFILTER, s_MsgFilterHook, NULL, m_threadId); @@ -389,34 +438,37 @@ return S_OK; } -HRESULT CMenuFocusManager::UpdateFocus(CMenuBand * newBand, HMENU popupToTrack) +HRESULT CMenuFocusManager::UpdateFocus() { HRESULT hr; - HWND newFocus = NULL; - HWND oldFocus = m_currentFocus; - HMENU oldMenu = m_currentMenu; - - if (newBand) - { - hr = newBand->_GetTopLevelWindow(&newFocus); + StackEntry * old = m_current; + + if (old) + SetCapture(NULL); + + if (m_bandCount > 0) + m_current = &(m_bandStack[m_bandCount - 1]); + else + m_current = NULL; + + if (m_current && m_current->type != TrackedMenuEntry) + { + hr = m_current->mb->_GetTopLevelWindow(&(m_current->hwnd)); if (FAILED_UNEXPECTEDLY(hr)) return hr; } - m_currentBand = newBand; - m_currentMenu = popupToTrack; - m_currentFocus = newFocus; - m_parentToolbar = NULL; - if (popupToTrack) - { - m_currentBand->GetWindow(&m_parentToolbar); - } - else if (m_bandCount >= 2) - { - m_bandStack[m_bandCount - 2]->GetWindow(&m_parentToolbar); - } - - if (oldFocus && (!newFocus || (oldMenu != popupToTrack))) + if (m_bandCount >= 2) + { + m_parent = &(m_bandStack[m_bandCount - 2]); + _ASSERT(m_parent->type != TrackedMenuEntry); + } + else + { + m_parent = NULL; + } + + if (old && (!m_current || old->type != m_current->type)) { DisableMouseTrack(NULL, FALSE); @@ -424,123 +476,161 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; } - - if (newFocus && (!oldFocus || (oldMenu != popupToTrack))) + + if (m_current && (!old || old->type != m_current->type)) { hr = PlaceHooks(); if (FAILED_UNEXPECTEDLY(hr)) return hr; } - - return S_OK; -} - -HRESULT CMenuFocusManager::PushMenu(CMenuBand * mb) -{ - HRESULT hr; - - CMenuBand * mbParent = m_currentBand; - - hr = PushToArray(mb); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - if (mbParent) - { - mbParent->_SetChildBand(mb); - mb->_SetParentBand(mbParent); - } - - return UpdateFocus(mb); -} - -HRESULT CMenuFocusManager::PopMenu(CMenuBand * mb) -{ + if ((m_current && m_current->type == MenuPopupEntry) && + (!m_parent || m_parent->type == MenuBarEntry)) + { + DisableMouseTrack(m_current->hwnd, FALSE); + + // When the mouse moves, it should set itself to the proper band + SetCapture(m_current->hwnd); + } + + _ASSERT(!m_parent || m_parent->type != TrackedMenuEntry); + + return S_OK; +} + +HRESULT CMenuFocusManager::PushMenuBar(CMenuBand * mb) +{ + _ASSERT(m_bandCount == 0); + + HRESULT hr = PushToArray(MenuBarEntry, mb, NULL); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return UpdateFocus(); +} + +HRESULT CMenuFocusManager::PushMenuPopup(CMenuBand * mb) +{ + _ASSERT(!m_current || m_current->type != TrackedMenuEntry); + + HRESULT hr = PushToArray(MenuPopupEntry, mb, NULL); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = UpdateFocus(); + + if (m_parent && m_parent->type != TrackedMenuEntry) + { + m_parent->mb->_SetChildBand(mb); + mb->_SetParentBand(m_parent->mb); + } + + return hr; +} + +HRESULT CMenuFocusManager::PushTrackedPopup(HMENU popup) +{ + _ASSERT(m_bandCount > 0); + _ASSERT(!m_current || m_current->type != TrackedMenuEntry); + + HRESULT hr = PushToArray(TrackedMenuEntry, NULL, popup); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return UpdateFocus(); +} + +HRESULT CMenuFocusManager::PopMenuBar(CMenuBand * mb) +{ + StackEntryType type; CMenuBand * mbc; HRESULT hr; - if (m_currentBand) - { - m_currentBand->_SetParentBand(NULL); - } - - HWND newFocus; - hr = mb->_GetTopLevelWindow(&newFocus); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - DbgPrint("Trying to pop %08p, hwnd=%08x\n", mb, newFocus); - - do { - hr = PopFromArray(&mbc); - if (FAILED_UNEXPECTEDLY(hr)) - { - UpdateFocus(NULL); - return hr; - } - } - while (mbc && mb != mbc); + hr = PopFromArray(&type, &mbc, NULL); + if (FAILED_UNEXPECTEDLY(hr)) + { + UpdateFocus(); + return hr; + } + + _ASSERT(type == MenuBarEntry); + if (type != MenuBarEntry) + return E_FAIL; if (!mbc) return E_FAIL; - - hr = PeekArray(&mb); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = UpdateFocus(mb); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - if (mb) - { - mb->_SetChildBand(NULL); - } - - return S_OK; -} - -HRESULT CMenuFocusManager::PushTrackedPopup(CMenuBand * mb, HMENU popup) -{ - HRESULT hr; - - hr = PushToArray(mb); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - return UpdateFocus(mb, popup); -} - -HRESULT CMenuFocusManager::PopTrackedPopup(CMenuBand * mb, HMENU popup) -{ + + mbc->_SetParentBand(NULL); + + hr = UpdateFocus(); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (m_current) + { + _ASSERT(m_current->type != TrackedMenuEntry); + m_current->mb->_SetChildBand(NULL); + } + + return S_OK; +} + +HRESULT CMenuFocusManager::PopMenuPopup(CMenuBand * mb) +{ + StackEntryType type; CMenuBand * mbc; HRESULT hr; - HWND newFocus; - hr = mb->_GetTopLevelWindow(&newFocus); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - DbgPrint("Trying to pop %08p, hwnd=%08x\n", mb, newFocus); - - do { - hr = PopFromArray(&mbc); - if (FAILED_UNEXPECTEDLY(hr)) - { - UpdateFocus(NULL); - return hr; - } - } while (mbc && mb != mbc); + hr = PopFromArray(&type, &mbc, NULL); + if (FAILED_UNEXPECTEDLY(hr)) + { + UpdateFocus(); + return hr; + } + + _ASSERT(type == MenuPopupEntry); + if (type != MenuPopupEntry) + return E_FAIL; if (!mbc) return E_FAIL; - hr = PeekArray(&mb); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = UpdateFocus(mb); + mbc->_SetParentBand(NULL); + + hr = UpdateFocus(); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (m_current) + { + _ASSERT(m_current->type != TrackedMenuEntry); + m_current->mb->_SetChildBand(NULL); + } + + return S_OK; +} + +HRESULT CMenuFocusManager::PopTrackedPopup(HMENU popup) +{ + StackEntryType type; + HMENU hmenu; + HRESULT hr; + + hr = PopFromArray(&type, NULL, &hmenu); + if (FAILED_UNEXPECTEDLY(hr)) + { + UpdateFocus(); + return hr; + } + + _ASSERT(type == TrackedMenuEntry); + if (type != TrackedMenuEntry) + return E_FAIL; + + if (hmenu != popup) + return E_FAIL; + + hr = UpdateFocus(); if (FAILED_UNEXPECTEDLY(hr)) return hr; Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h [iso-8859-1] Wed Mar 26 11:33:52 2014 @@ -30,6 +30,22 @@ static CMenuFocusManager * GetManager(); + enum StackEntryType + { + NoEntry, + MenuBarEntry, + MenuPopupEntry, + TrackedMenuEntry + }; + + struct StackEntry + { + StackEntryType type; + CMenuBand * mb; + HMENU hmenu; + HWND hwnd; + }; + public: static CMenuFocusManager * AcquireManager(); @@ -40,26 +56,29 @@ static LRESULT CALLBACK s_GetMsgHook(INT nCode, WPARAM wParam, LPARAM lParam); private: - CMenuBand * m_currentBand; - HWND m_currentFocus; - HMENU m_currentMenu; - HWND m_parentToolbar; + StackEntry * m_current; + StackEntry * m_parent; + HHOOK m_hMsgFilterHook; HHOOK m_hGetMsgHook; DWORD m_threadId; + BOOL m_mouseTrackDisabled; + WPARAM m_lastMoveFlags; LPARAM m_lastMovePos; + POINT m_ptPrev; + + HWND m_captureHwnd; // TODO: make dynamic #define MAX_RECURSE 20 - CMenuBand* m_bandStack[MAX_RECURSE]; + StackEntry m_bandStack[MAX_RECURSE]; int m_bandCount; - HRESULT PushToArray(CMenuBand * item); - HRESULT PopFromArray(CMenuBand ** pItem); - HRESULT PeekArray(CMenuBand ** pItem); + HRESULT PushToArray(StackEntryType type, CMenuBand * mb, HMENU hmenu); + HRESULT PopFromArray(StackEntryType * pType, CMenuBand ** pMb, HMENU * pHmenu); protected: CMenuFocusManager(); @@ -77,15 +96,18 @@ LRESULT MsgFilterHook(INT nCode, WPARAM wParam, LPARAM lParam); HRESULT PlaceHooks(); HRESULT RemoveHooks(); - HRESULT UpdateFocus(CMenuBand * newBand, HMENU popupToTrack = NULL); + HRESULT UpdateFocus(); HRESULT IsTrackedWindow(HWND hWnd); - void DisableMouseTrack(HWND enableTo, BOOL disableThis); + void DisableMouseTrack(HWND parent, BOOL disableThis); + void SetCapture(HWND child); LRESULT ProcessMouseMove(MSG* msg); public: - HRESULT PushMenu(CMenuBand * mb); - HRESULT PopMenu(CMenuBand * mb); - HRESULT PushTrackedPopup(CMenuBand * mb, HMENU popup); - HRESULT PopTrackedPopup(CMenuBand * mb, HMENU popup); + HRESULT PushMenuBar(CMenuBand * mb); + HRESULT PushMenuPopup(CMenuBand * mb); + HRESULT PushTrackedPopup(HMENU popup); + HRESULT PopMenuBar(CMenuBand * mb); + HRESULT PopMenuPopup(CMenuBand * mb); + HRESULT PopTrackedPopup(HMENU popup); }; Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Wed Mar 26 11:33:52 2014 @@ -121,9 +121,9 @@ default: DbgPrint("WM_NOTIFY unknown code %d, %d\n", hdr->code, hdr->idFrom); - break; - } - return S_OK; + return S_OK; + } + return S_FALSE; } return S_FALSE; @@ -195,7 +195,7 @@ if (btni.fsStyle & BTNS_DROPDOWN) { SelectObject(cdraw->nmcd.hdc, m_marlett); - WCHAR text[] = L"8"; + WCHAR text [] = L"8"; SetBkMode(cdraw->nmcd.hdc, TRANSPARENT); RECT rc = cdraw->nmcd.rc; rc.right += 1; @@ -210,7 +210,7 @@ CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager) : m_hwnd(NULL), m_useFlatMenus(FALSE), - m_SubclassOld(NULL), + m_SubclassOld(NULL), m_disableMouseTrack(FALSE), m_menuBand(menuBand), m_hwndToolbar(NULL), @@ -235,7 +235,7 @@ HRESULT CMenuToolbarBase::IsWindowOwner(HWND hwnd) { return (m_hwnd && m_hwnd == hwnd) || - (m_hwndToolbar && m_hwndToolbar == hwnd) ? S_OK : S_FALSE; + (m_hwndToolbar && m_hwndToolbar == hwnd) ? S_OK : S_FALSE; } void CMenuToolbarBase::InvalidateDraw() @@ -256,7 +256,7 @@ HRESULT CMenuToolbarBase::UpdateImageLists() { - if ((m_toolbarFlags & (SMINIT_TOPLEVEL| SMINIT_VERTICAL)) == SMINIT_TOPLEVEL) // not vertical. + if ((m_toolbarFlags & (SMINIT_TOPLEVEL | SMINIT_VERTICAL)) == SMINIT_TOPLEVEL) // not vertical. { /* Hide the placeholders for the button images */ SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, 0); @@ -358,7 +358,7 @@ m_hwndToolbar = hwndToolbar; m_hwnd = hwndToolbar; } - + /* Identify the version of the used Common Controls DLL by sending the size of the TBBUTTON structure */ SendMessageW(hwndToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); @@ -441,9 +441,13 @@ { KillTimer(hWnd, TIMERID_HOTTRACK); + DbgPrint("Closing previous submenu...\n"); + m_menuBand->_OnPopupSubMenu(NULL, NULL, NULL, NULL, -1); - PopupItem(m_hotItem); + DbgPrint("Opening new submenu...\n"); + + PopupItem(m_hotItem); } } @@ -474,11 +478,9 @@ return S_OK; } - + if (m_hotItem != hot->idNew) { - DbgPrint("Hot item is now %d\n", hot->idNew); - if (hot->dwFlags & HICF_MOUSE && m_toolbarFlags & SMINIT_VERTICAL) { @@ -531,7 +533,7 @@ { SendMessage(m_hwndToolbar, TB_CHECKBUTTON, m_popupItem, FALSE); m_isTracking = FALSE; - DbgPrint("Is Tracking: %d\n", m_isTracking); + DbgPrint("%s -- Is Tracking: %d\n", __FUNCTION__, m_isTracking); } m_popupBar = toolbar; m_popupItem = item; @@ -558,13 +560,16 @@ TBBUTTON btn; SendMessage(m_hwndToolbar, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn)); + DbgPrint("Changing tracked item to %d...\n", index); + if (m_hotItem != btn.idCommand) { m_isTracking = TRUE; - DbgPrint("Is Tracking: %d\n", m_isTracking); + DbgPrint("%s -- Is Tracking: %d\n", __FUNCTION__, m_isTracking); SendMessage(m_hwndToolbar, TB_SETHOTITEM, index, 0); } + return S_OK; } @@ -595,7 +600,7 @@ POINTL pt = { a.x, b.y }; RECTL rcl = { c.x, c.y, d.x, d.y }; - if(m_toolbarFlags & SMINIT_VERTICAL) + if (m_toolbarFlags & SMINIT_VERTICAL) { pt.x = b.x - 3; pt.y = a.y - 3; @@ -647,7 +652,7 @@ return hr; m_isTracking = TRUE; - DbgPrint("Is Tracking: %d\n", m_isTracking); + DbgPrint("%s -- Is Tracking: %d\n", __FUNCTION__, m_isTracking); m_menuBand->_OnPopupSubMenu(popup, &pt, &rcl, this, uItem); @@ -686,14 +691,14 @@ HMENU popup = GetSubMenu(menu, index); m_isTracking = TRUE; - DbgPrint("Is Tracking: %d\n", m_isTracking); + DbgPrint("%s -- Is Tracking: %d\n", __FUNCTION__, m_isTracking); m_menuBand->_TrackSubMenuUsingTrackPopupMenu(popup, pt.x, pt.y, rcl); SendMessage(m_hwndToolbar, TB_CHECKBUTTON, uItem, FALSE); m_isTracking = FALSE; - DbgPrint("Is Tracking: %d\n", m_isTracking); + DbgPrint("%s -- Is Tracking: %d\n", __FUNCTION__, m_isTracking); return S_OK; } @@ -1095,6 +1100,7 @@ return ::GetSubMenu(m_hmenu, index) ? S_OK : S_FALSE; } + CMenuSFToolbar::CMenuSFToolbar(CMenuBand * menuBand) : CMenuToolbarBase(menuBand, TRUE), m_shellFolder(NULL), Modified: branches/shell-experiments/base/shell/rshell/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/misc.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/misc.cpp [iso-8859-1] Wed Mar 26 11:33:52 2014 @@ -50,7 +50,7 @@ new (&_AtlComModule) CAtlComModule; gModule.Init(NULL, hInstance, NULL); - DisableThreadLibraryCalls (hInstance); + DisableThreadLibraryCalls(hInstance); } else if (dwReason == DLL_PROCESS_DETACH) { Modified: branches/shell-experiments/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Wed Mar 26 11:33:52 2014 @@ -65,14 +65,12 @@ if (fname == NULL) { fname = strrchr(filename, '/'); - if (fname != NULL) - fname++; } - else - fname++; if (fname == NULL) fname = filename; + else + fname++; szMsgStart = szMsg + sprintf(szMsg, "%s:%d: ", fname, line);

1 0

[tfaber] 62566: [CMAKE] - Remove unnecessary allow_warnings throughout the code base - Make -Wnarrowing an error unless excepted specifically (only done in explorer)
by tfaber＠svn.reactos.org 26 Mar '14

26 Mar '14

Author: tfaber Date: Wed Mar 26 11:08:45 2014 New Revision: 62566 URL: http://svn.reactos.org/svn/reactos?rev=62566&view=rev Log: [CMAKE] - Remove unnecessary allow_warnings throughout the code base - Make -Wnarrowing an error unless excepted specifically (only done in explorer) Modified: trunk/reactos/base/applications/atactl/CMakeLists.txt trunk/reactos/base/applications/write/CMakeLists.txt trunk/reactos/base/shell/explorer/CMakeLists.txt trunk/reactos/cmake/gcc.cmake trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt trunk/reactos/dll/win32/mciseq/CMakeLists.txt trunk/reactos/dll/win32/mciwave/CMakeLists.txt trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt trunk/reactos/drivers/filesystems/ext2/CMakeLists.txt trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt trunk/reactos/lib/3rdparty/libmpg123/CMakeLists.txt trunk/reactos/lib/drivers/lwip/CMakeLists.txt trunk/reactos/lib/fslib/ext2lib/CMakeLists.txt trunk/reactos/lib/pseh/CMakeLists.txt trunk/reactos/lib/rossym_new/CMakeLists.txt trunk/reactos/lib/sdk/crt/msvcrtex.cmake trunk/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt Modified: trunk/reactos/base/applications/atactl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/C… ============================================================================== --- trunk/reactos/base/applications/atactl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/atactl/CMakeLists.txt [iso-8859-1] Wed Mar 26 11:08:45 2014 @@ -7,10 +7,4 @@ set_module_type(atactl win32cui) add_importlibs(atactl advapi32 msvcrt kernel32 ntdll) -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(atactl) - set_source_files_properties(atactl.cpp PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - add_cd_file(TARGET atactl DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/write/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/CM… ============================================================================== --- trunk/reactos/base/applications/write/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/CMakeLists.txt [iso-8859-1] Wed Mar 26 11:08:45 2014 @@ -3,9 +3,3 @@ set_module_type(write win32gui UNICODE) add_importlibs(write user32 gdi32 msvcrt kernel32) add_cd_file(TARGET write DESTINATION reactos/system32 FOR all) - -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(write) - set_source_files_properties(write.c PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL… ============================================================================== --- trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] Wed Mar 26 11:08:45 2014 @@ -60,3 +60,7 @@ add_dependencies(explorer psdk) add_cd_file(TARGET explorer DESTINATION reactos FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml DESTINATION reactos FOR all) + +if(NOT MSVC) + add_compile_flags("-Wno-error=narrowing") +endif() Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=62566&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Wed Mar 26 11:08:45 2014 @@ -85,7 +85,6 @@ add_compile_flags("-Wno-error=unused-but-set-variable") endif() -add_compile_flags("-Wno-error=narrowing") add_compile_flags("-Wtype-limits -Wno-error=type-limits") if(ARCH STREQUAL "amd64") Modified: trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/CMake… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] Wed Mar 26 11:08:45 2014 @@ -49,5 +49,4 @@ if(NOT MSVC) add_target_compile_flags(libxslt "-Wno-pointer-sign -Wno-unused-but-set-variable -Wno-unused-function") - allow_warnings(libxslt) endif() Modified: trunk/reactos/dll/win32/mciseq/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciseq/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/mciseq/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciseq/CMakeLists.txt [iso-8859-1] Wed Mar 26 11:08:45 2014 @@ -15,5 +15,5 @@ add_cd_file(TARGET mciseq DESTINATION reactos/system32 FOR all) if(NOT MSVC) - allow_warnings(mciseq) + add_target_compile_flags(mciseq "-Wno-error=overflow") endif() Modified: trunk/reactos/dll/win32/mciwave/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciwave/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/mciwave/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciwave/CMakeLists.txt [iso-8859-1] Wed Mar 26 11:08:45 2014 @@ -21,5 +21,5 @@ add_cd_file(TARGET mciwave DESTINATION reactos/system32 FOR all) if(NOT MSVC) - allow_warnings(mciwave) + add_target_compile_flags(mciwave "-Wno-error=overflow") endif() Modified: trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/C… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt [iso-8859-1] Wed Mar 26 11:08:45 2014 @@ -12,10 +12,8 @@ add_library(fbtusb SHARED ${SOURCE} fbtusb.rc) -# FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(NOT MSVC) - #allow_warnings(fbtusb) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error -Wno-unused-but-set-variable") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-unused-but-set-variable") endif() set_module_type(fbtusb kernelmodedriver) Modified: trunk/reactos/drivers/filesystems/ext2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/C… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] Wed Mar 26 11:08:45 2014 @@ -28,7 +28,6 @@ add_compile_flags("-Wno-unused-but-set-variable") endif() -allow_warnings(ext2fs) target_link_libraries(ext2fs ${PSEH_LIB}) add_pch(ext2fs inc/ext2fsd.h SOURCE) set_module_type(ext2fs kernelmodedriver) Modified: trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] Wed Mar 26 11:08:45 2014 @@ -22,9 +22,7 @@ if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(uniata) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error -Wno-unused-but-set-variable -Wno-narrowing") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-unused-but-set-variable -Wno-narrowing") endif() add_pch(uniata stdafx.h SOURCE) Modified: trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt [iso-8859-1] Wed Mar 26 11:08:45 2014 @@ -17,7 +17,6 @@ ff_time.c) add_library(fullfat ${SOURCE}) -allow_warnings(fullfat) add_dependencies(fullfat bugcodes) if(NOT MSVC) Modified: trunk/reactos/lib/3rdparty/libmpg123/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libmpg123/CMa… ============================================================================== --- trunk/reactos/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] Wed Mar 26 11:08:45 2014 @@ -44,4 +44,3 @@ add_library(libmpg123 ${SOURCE}) add_dependencies(libmpg123 psdk) add_pch(libmpg123 precomp.h SOURCE) -allow_warnings(libmpg123) Modified: trunk/reactos/lib/drivers/lwip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/CMakeList… ============================================================================== --- trunk/reactos/lib/drivers/lwip/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/CMakeLists.txt [iso-8859-1] Wed Mar 26 11:08:45 2014 @@ -61,7 +61,6 @@ add_dependencies(lwip bugcodes) add_pch(lwip precomp.h SOURCE) if(NOT MSVC) - allow_warnings(lwip) if(LTCG) add_compile_flags("-fno-builtin-malloc -fno-builtin-free") endif() Modified: trunk/reactos/lib/fslib/ext2lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/CMakeLis… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ext2lib/CMakeLists.txt [iso-8859-1] Wed Mar 26 11:08:45 2014 @@ -14,4 +14,3 @@ add_library(ext2lib ${SOURCE}) add_pch(ext2lib Mke2fs.h SOURCE) add_dependencies(ext2lib psdk) -allow_warnings(ext2lib) Modified: trunk/reactos/lib/pseh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] Wed Mar 26 11:08:45 2014 @@ -20,7 +20,6 @@ endif() add_library(pseh ${SOURCE}) - allow_warnings(pseh) target_link_libraries(pseh chkstk) add_dependencies(pseh psdk) Modified: trunk/reactos/lib/rossym_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/CMakeLists.… ============================================================================== --- trunk/reactos/lib/rossym_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/CMakeLists.txt [iso-8859-1] Wed Mar 26 11:08:45 2014 @@ -19,4 +19,3 @@ add_library(rossym ${SOURCE}) add_pch(rossym precomp.h) add_dependencies(rossym psdk bugcodes) -allow_warnings(rossym) Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Wed Mar 26 11:08:45 2014 @@ -83,7 +83,6 @@ if(NOT MSVC) target_link_libraries(msvcrtex oldnames) - allow_warnings(msvcrtex) endif() add_dependencies(msvcrtex psdk asm) Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt [iso-8859-1] Wed Mar 26 11:08:45 2014 @@ -13,12 +13,6 @@ target_link_libraries(vga libcntpr) -# FIXME: http://www.cmake.org/Bug/view.php?id=12998 -if(NOT MSVC) - #allow_warnings(vga) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - set_module_type(vga kernelmodedriver) add_importlibs(vga videoprt)

1 0

[hbelusca] 62565: [CMAKE] Improve comparison. Needs to be send upstream, AmineKhaldi :)
by hbelusca＠svn.reactos.org 26 Mar '14

26 Mar '14

Author: hbelusca Date: Wed Mar 26 00:49:41 2014 New Revision: 62565 URL: http://svn.reactos.org/svn/reactos?rev=62565&view=rev Log: [CMAKE] Improve comparison. Needs to be send upstream, AmineKhaldi :) Modified: trunk/reactos/cmake/Platform/Windows-MSVC.cmake Modified: trunk/reactos/cmake/Platform/Windows-MSVC.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows-MSV… ============================================================================== --- trunk/reactos/cmake/Platform/Windows-MSVC.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/Platform/Windows-MSVC.cmake [iso-8859-1] Wed Mar 26 00:49:41 2014 @@ -119,7 +119,7 @@ set(CMAKE_CL_64 1) endif() -if("${MSVC_VERSION}" GREATER 1599) +if(MSVC_VERSION GREATER 1599) set(MSVC_INCREMENTAL_DEFAULT ON) endif()

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs