Ros-diffs June 2017

ros-diffs@reactos.org

20 participants
526 discussions

[gadamopoulos] 74931: [COMCTL32] -Fix a lot of tests for the v5 toolbar without braking the behavior of the v6 one (that needs to be tested).

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Jun 6 12:19:17 2017 New Revision: 74931 URL: http://svn.reactos.org/svn/reactos?rev=74931&view=rev Log: [COMCTL32] -Fix a lot of tests for the v5 toolbar without braking the behavior of the v6 one (that needs to be tested). Modified: trunk/reactos/dll/win32/comctl32/toolbar.c Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Tue Jun 6 12:19:17 2017 @@ -253,12 +253,11 @@ static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) { -#ifndef __REACTOS__ +#ifdef __REACTOS__ + if (infoPtr->iVersion == 6) + return 0; +#endif return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); -#else /* r65766 */ - /* This is the behaviour in comctl32 v6 */ - return 0; -#endif } static inline BOOL TOOLBAR_HasDropDownArrows(DWORD exStyle)

7 years, 3 months

[hbelusca] 74930: [EXPLORER]: Fix what appears to be a copy-pasta error: use the correct window class names in the corresponding message maps. Validated by Giannis Adamopoulos.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jun 5 22:01:09 2017 New Revision: 74930 URL: http://svn.reactos.org/svn/reactos?rev=74930&view=rev Log: [EXPLORER]: Fix what appears to be a copy-pasta error: use the correct window class names in the corresponding message maps. Validated by Giannis Adamopoulos. Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Mon Jun 5 22:01:09 2017 @@ -586,7 +586,7 @@ DECLARE_WND_CLASS_EX(szSysPagerWndClass, CS_DBLCLKS, COLOR_3DFACE) - BEGIN_MSG_MAP(CTaskSwitchWnd) + BEGIN_MSG_MAP(CSysPagerWnd) MESSAGE_HANDLER(WM_CREATE, OnCreate) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) MESSAGE_HANDLER(WM_SIZE, OnSize) @@ -1195,7 +1195,7 @@ DECLARE_WND_CLASS_EX(szTrayClockWndClass, CS_DBLCLKS, COLOR_3DFACE) - BEGIN_MSG_MAP(CTaskSwitchWnd) + BEGIN_MSG_MAP(CTrayClockWnd) MESSAGE_HANDLER(WM_CREATE, OnCreate) MESSAGE_HANDLER(WM_DESTROY, OnDestroy) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) @@ -1588,7 +1588,7 @@ DECLARE_WND_CLASS_EX(szTrayNotifyWndClass, CS_DBLCLKS, COLOR_3DFACE) - BEGIN_MSG_MAP(CTaskSwitchWnd) + BEGIN_MSG_MAP(CTrayNotifyWnd) MESSAGE_HANDLER(WM_CREATE, OnCreate) MESSAGE_HANDLER(WM_THEMECHANGED, OnThemeChanged) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground)

7 years, 3 months

[gadamopoulos] 74929: [COMCTL32_APITEST] -Make comctl32v5.manifest really point to the v5 library.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Jun 5 21:50:21 2017 New Revision: 74929 URL: http://svn.reactos.org/svn/reactos?rev=74929&view=rev Log: [COMCTL32_APITEST] -Make comctl32v5.manifest really point to the v5 library. Modified: trunk/rostests/apitests/comctl32/comctl32v5.manifest Modified: trunk/rostests/apitests/comctl32/comctl32v5.manifest URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/comctl3… ============================================================================== --- trunk/rostests/apitests/comctl32/comctl32v5.manifest [iso-8859-1] (original) +++ trunk/rostests/apitests/comctl32/comctl32v5.manifest [iso-8859-1] Mon Jun 5 21:50:21 2017 @@ -5,7 +5,7 @@ <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" + version="5.82.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="*" language="*"

7 years, 3 months

[tfaber] 74928: [NTDLL_VISTA] - Avoid importing from kernel32. We're supposed to be... ntdll CORE-13361

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Jun 5 21:37:13 2017 New Revision: 74928 URL: http://svn.reactos.org/svn/reactos?rev=74928&view=rev Log: [NTDLL_VISTA] - Avoid importing from kernel32. We're supposed to be... ntdll CORE-13361 Modified: trunk/reactos/dll/win32/ntdll_vista/CMakeLists.txt trunk/reactos/dll/win32/ntdll_vista/DllMain.c Modified: trunk/reactos/dll/win32/ntdll_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdll_vista/CMak… ============================================================================== --- trunk/reactos/dll/win32/ntdll_vista/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntdll_vista/CMakeLists.txt [iso-8859-1] Mon Jun 5 21:37:13 2017 @@ -15,6 +15,6 @@ add_library(ntdll_vista SHARED ${SOURCE}) set_module_type(ntdll_vista win32dll ENTRYPOINT DllMain 12) -add_importlibs(ntdll_vista ntdll kernel32) +add_importlibs(ntdll_vista ntdll) add_dependencies(ntdll_vista psdk) add_cd_file(TARGET ntdll_vista DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/ntdll_vista/DllMain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdll_vista/DllM… ============================================================================== --- trunk/reactos/dll/win32/ntdll_vista/DllMain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntdll_vista/DllMain.c [iso-8859-1] Mon Jun 5 21:37:13 2017 @@ -7,6 +7,8 @@ #include <winreg.h> #include <winuser.h> #include <winwlx.h> +#include <ndk/rtltypes.h> +#include <ndk/umfuncs.h> #define NDEBUG #include <debug.h> @@ -25,7 +27,7 @@ { if (dwReason == DLL_PROCESS_ATTACH) { - DisableThreadLibraryCalls(hDll); + LdrDisableThreadCalloutsForDll(hDll); RtlpInitializeKeyedEvent(); } else if (dwReason == DLL_PROCESS_DETACH)

7 years, 3 months

[phater] 74927: [WINETESTS] Avoid canceling the test when Samba is not installed and NTLM authentication is tested

by phater＠svn.reactos.org

Author: phater Date: Mon Jun 5 19:27:50 2017 New Revision: 74927 URL: http://svn.reactos.org/svn/reactos?rev=74927&view=rev Log: [WINETESTS] Avoid canceling the test when Samba is not installed and NTLM authentication is tested Modified: trunk/rostests/winetests/winhttp/winhttp.c Modified: trunk/rostests/winetests/winhttp/winhttp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/winhttp… ============================================================================== --- trunk/rostests/winetests/winhttp/winhttp.c [iso-8859-1] (original) +++ trunk/rostests/winetests/winhttp/winhttp.c [iso-8859-1] Mon Jun 5 19:27:50 2017 @@ -2188,7 +2188,12 @@ else { send(c, largeauth, sizeof largeauth - 1, 0); +#ifdef __REACTOS__ + memset(buffer, 'A', sizeof(buffer)); + for (i = 0; i < (10240 / sizeof(buffer)); i++) send(c, buffer, sizeof(buffer), 0); +#else for (i = 0; i < 10240; i++) send(c, "A", 1, 0); +#endif continue; } }

7 years, 3 months

[pschweitzer] 74926: [UDFS] Only use unused var warnings. Patch by Thomas. CORE-4375

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Jun 5 16:02:47 2017 New Revision: 74926 URL: http://svn.reactos.org/svn/reactos?rev=74926&view=rev Log: [UDFS] Only use unused var warnings. Patch by Thomas. CORE-4375 Modified: trunk/reactos/drivers/filesystems/udfs/CMakeLists.txt Modified: trunk/reactos/drivers/filesystems/udfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/CMakeLists.txt [iso-8859-1] Mon Jun 5 16:02:47 2017 @@ -46,9 +46,7 @@ # FIXME: Make sure we marked all what needs to be marked with stdcall before removing this. add_target_compile_flags(udfs "/Gz") else() - # FIXME: Tons of warnings. - replace_compile_flags("-Werror" " ") - add_target_compile_flags(udfs "-fpermissive") + add_target_compile_flags(udfs "-Wno-unused-but-set-variable") endif() set_module_type(udfs kernelmodedriver) target_link_libraries(udfs ${PSEH_LIB})

7 years, 3 months

[pschweitzer] 74925: [UDFS] Misc fixes by Thomas. CORE-4375

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Jun 5 15:54:51 2017 New Revision: 74925 URL: http://svn.reactos.org/svn/reactos?rev=74925&view=rev Log: [UDFS] Misc fixes by Thomas. CORE-4375 Modified: trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.h trunk/reactos/drivers/filesystems/udfs/close.cpp trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp trunk/reactos/drivers/filesystems/udfs/misc.cpp trunk/reactos/drivers/filesystems/udfs/protos.h trunk/reactos/drivers/filesystems/udfs/udf_info/phys_eject.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp trunk/reactos/drivers/filesystems/udfs/udfinit.cpp Modified: trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.h [iso-8859-1] Mon Jun 5 15:54:51 2017 @@ -96,7 +96,7 @@ extern OSSTATUS UDFGetDiskInfo(IN PDEVICE_OBJECT DeviceObject, // the target device object IN PVCB Vcb); // Volume control block from this DevObj -extern VOID UDFEjectReqWaiter(IN PVOID Context); +extern VOID NTAPI UDFEjectReqWaiter(IN PVOID Context); extern VOID UDFStopEjectWaiter(PVCB Vcb); @@ -182,4 +182,4 @@ IN BOOLEAN Unlock); -#endif //__UDF_PHYS_LIB__H__ +#endif //__UDF_PHYS_LIB__H__ Modified: trunk/reactos/drivers/filesystems/udfs/close.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/close.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/close.cpp [iso-8859-1] Mon Jun 5 15:54:51 2017 @@ -686,6 +686,7 @@ It operates until reach lower threshold */ VOID +NTAPI UDFDelayedClose( PVOID unused ) Modified: trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp [iso-8859-1] Mon Jun 5 15:54:51 2017 @@ -900,7 +900,7 @@ // terminates automatically ASSERT(!(Vcb->VCBFlags & UDF_VCB_FLAGS_STOP_WAITER_EVENT)); Vcb->VCBFlags |= UDF_VCB_FLAGS_STOP_WAITER_EVENT; - ExInitializeWorkItem(&(Vcb->EjectWaiter->EjectReqWorkQueueItem), (PWORKER_THREAD_ROUTINE)UDFEjectReqWaiter, Vcb->EjectWaiter); + ExInitializeWorkItem(&(Vcb->EjectWaiter->EjectReqWorkQueueItem), UDFEjectReqWaiter, Vcb->EjectWaiter); UDFPrint(("UDFStartEjectWaiter: create thread\n")); ExQueueWorkItem(&(Vcb->EjectWaiter->EjectReqWorkQueueItem), DelayedWorkQueue); } else { Modified: trunk/reactos/drivers/filesystems/udfs/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/misc.cpp [iso-8859-1] Mon Jun 5 15:54:51 2017 @@ -1174,7 +1174,7 @@ KeReleaseSpinLock( &(Vcb->OverflowQueueSpinLock), SavedIrql ); // queue up the request - ExInitializeWorkItem(&(PtrIrpContext->WorkQueueItem), (PWORKER_THREAD_ROUTINE)UDFCommonDispatch, PtrIrpContext); + ExInitializeWorkItem(&(PtrIrpContext->WorkQueueItem), UDFCommonDispatch, PtrIrpContext); ExQueueWorkItem(&(PtrIrpContext->WorkQueueItem), CriticalWorkQueue); // ExQueueWorkItem(&(PtrIrpContext->WorkQueueItem), DelayedWorkQueue); @@ -1204,6 +1204,7 @@ * *************************************************************************/ VOID +NTAPI UDFCommonDispatch( IN PVOID Context // actually is a pointer to IRPContext structure ) Modified: trunk/reactos/drivers/filesystems/udfs/protos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/p… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/protos.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/protos.h [iso-8859-1] Mon Jun 5 15:54:51 2017 @@ -87,7 +87,7 @@ extern VOID UDFCloseAllDelayed(PVCB Vcb); -extern VOID UDFDelayedClose(PVOID unused = NULL); +extern VOID NTAPI UDFDelayedClose(PVOID unused = NULL); extern NTSTATUS UDFCloseAllXXXDelayedInDir(IN PVCB Vcb, IN PUDF_FILE_INFO FileInfo, @@ -642,7 +642,7 @@ PtrUDFIrpContext PtrIrpContext, PIRP Irp); -extern VOID UDFCommonDispatch( +extern VOID NTAPI UDFCommonDispatch( VOID *Context); // actually an IRPContext structure extern NTSTATUS UDFInitializeVCB( @@ -756,7 +756,7 @@ extern OSSTATUS UDFGetDiskInfo(IN PDEVICE_OBJECT DeviceObject, // the target device object IN PVCB Vcb); // Volume control block from this DevObj -extern VOID UDFEjectReqWaiter(IN PVOID Context); +extern VOID NTAPI UDFEjectReqWaiter(IN PVOID Context); extern VOID UDFStopEjectWaiter(PVCB Vcb); Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/phys_eject.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/phys_eject.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/phys_eject.cpp [iso-8859-1] Mon Jun 5 15:54:51 2017 @@ -26,6 +26,7 @@ This routine checks for User Eject request & initiates Dismount */ void +NTAPI UDFEjectReqWaiter( IN void* Context ) Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp [iso-8859-1] Mon Jun 5 15:54:51 2017 @@ -537,10 +537,12 @@ } // end UDFVForget() VOID +NTAPI UDFVWorkItem( - PUDF_VERIFY_REQ VerifyReq - ) -{ + PVOID Context + ) +{ + PUDF_VERIFY_REQ VerifyReq = (PUDF_VERIFY_REQ)Context; PVCB Vcb = VerifyReq->Vcb; ULONG ReadBytes; // OSSTATUS RC; @@ -703,7 +705,7 @@ InterlockedIncrement((PLONG)&(VerifyCtx->QueuedCount)); #ifndef _CONSOLE ExInitializeWorkItem( &(VerifyReq->VerifyItem), - (PWORKER_THREAD_ROUTINE) UDFVWorkItem, + UDFVWorkItem, VerifyReq ); ExQueueWorkItem( &(VerifyReq->VerifyItem), CriticalWorkQueue ); #else Modified: trunk/reactos/drivers/filesystems/udfs/udfinit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udfinit.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udfinit.cpp [iso-8859-1] Mon Jun 5 15:54:51 2017 @@ -179,7 +179,7 @@ InitializeListHead( &UDFGlobalData.DirDelayedCloseQueue ); ExInitializeWorkItem( &UDFGlobalData.CloseItem, - (PWORKER_THREAD_ROUTINE) UDFDelayedClose, + UDFDelayedClose, NULL ); UDFGlobalData.DelayedCloseCount = 0; @@ -312,7 +312,7 @@ FsRegistered = TRUE; UDFPrint(("UDF: IoRegisterFsRegistrationChange()\n")); - IoRegisterFsRegistrationChange( DriverObject, (PDRIVER_FS_NOTIFICATION)UDFFsNotification ); + IoRegisterFsRegistrationChange( DriverObject, UDFFsNotification ); // delay.QuadPart = -10000000; // KeDelayExecutionThread(KernelMode, FALSE, &delay); //10 microseconds

7 years, 3 months

[gadamopoulos] 74924: Fix gcc build.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Jun 5 14:40:48 2017 New Revision: 74924 URL: http://svn.reactos.org/svn/reactos?rev=74924&view=rev Log: Fix gcc build. Modified: trunk/rostests/apitests/comctl32/toolbar.c Modified: trunk/rostests/apitests/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/toolbar… ============================================================================== --- trunk/rostests/apitests/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/rostests/apitests/comctl32/toolbar.c [iso-8859-1] Mon Jun 5 14:40:48 2017 @@ -109,7 +109,7 @@ TestVersionMessage(); hV5ActCtx = _CreateV5ActCtx(); - ok (hV5ActCtx != INVALID_HANDLE_VALUE, ""); + ok (hV5ActCtx != INVALID_HANDLE_VALUE, "CreateActCtxW failed\n"); if (hV5ActCtx) { ULONG_PTR cookie;

7 years, 3 months

[gadamopoulos] 74923: [COMCTL32_APITEST] -Add tests for CCM_GETVERSION and CCM_SETVERSION for the v5 and v6 toolbar control.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Jun 5 14:25:37 2017 New Revision: 74923 URL: http://svn.reactos.org/svn/reactos?rev=74923&view=rev Log: [COMCTL32_APITEST] -Add tests for CCM_GETVERSION and CCM_SETVERSION for the v5 and v6 toolbar control. Added: trunk/rostests/apitests/comctl32/comctl32v5.manifest (with props) trunk/rostests/apitests/comctl32/toolbar.c (with props) Modified: trunk/rostests/apitests/comctl32/CMakeLists.txt trunk/rostests/apitests/comctl32/testlist.c Modified: trunk/rostests/apitests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/comctl32/CMakeLists.txt [iso-8859-1] Mon Jun 5 14:25:37 2017 @@ -1,6 +1,7 @@ -add_executable(comctl32_apitest button.c testlist.c ../include/msgtrace.c comctl32_apitest.rc) +add_executable(comctl32_apitest button.c toolbar.c testlist.c ../include/msgtrace.c comctl32_apitest.rc) target_link_libraries(comctl32_apitest wine) set_module_type(comctl32_apitest win32cui) add_importlibs(comctl32_apitest uxtheme comctl32 user32 gdi32 msvcrt kernel32 ntdll) add_rostests_file(TARGET comctl32_apitest) +add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/comctl32v5.manifest") Added: trunk/rostests/apitests/comctl32/comctl32v5.manifest URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/comctl3… ============================================================================== --- trunk/rostests/apitests/comctl32/comctl32v5.manifest (added) +++ trunk/rostests/apitests/comctl32/comctl32v5.manifest [iso-8859-1] Mon Jun 5 14:25:37 2017 @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Propchange: trunk/rostests/apitests/comctl32/comctl32v5.manifest ------------------------------------------------------------------------------ svn:eol-style = CRLF Modified: trunk/rostests/apitests/comctl32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/testlis… ============================================================================== --- trunk/rostests/apitests/comctl32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/comctl32/testlist.c [iso-8859-1] Mon Jun 5 14:25:37 2017 @@ -2,9 +2,11 @@ #include <apitest.h> extern void func_button(void); +extern void func_toolbar(void); const struct test winetest_testlist[] = { { "buttonv6", func_button }, + { "toolbarv6", func_toolbar }, { 0, 0 } }; Added: trunk/rostests/apitests/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/toolbar… ============================================================================== --- trunk/rostests/apitests/comctl32/toolbar.c (added) +++ trunk/rostests/apitests/comctl32/toolbar.c [iso-8859-1] Mon Jun 5 14:25:37 2017 @@ -0,0 +1,123 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for toolbar window class v6 + * PROGRAMMERS: Giannis Adamopoulos + */ + +#include "wine/test.h" +#include <stdio.h> +#include <windows.h> +#include <commctrl.h> +#include <uxtheme.h> +#include <undocuser.h> +#include <msgtrace.h> +#include <user32testhelpers.h> + +HANDLE _CreateV5ActCtx() +{ + ACTCTXW ActCtx = {sizeof(ACTCTX)}; + WCHAR buffer[MAX_PATH] , *separator; + + ok (GetModuleFileNameW(NULL, buffer, MAX_PATH), "GetModuleFileName failed\n"); + separator = wcsrchr(buffer, L'\\'); + if (separator) + wcscpy(separator + 1, L"comctl32v5.manifest"); + + ActCtx.lpSource = buffer; + + return CreateActCtxW(&ActCtx);; +} + + +void TestVersionMessage() +{ + HWND hwnd; + int version; + + hwnd = CreateWindowExW(0, TOOLBARCLASSNAMEW, L"Test", 0, 0, 0, 0, 0, 0, 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowEx failed\n"); + + version = SendMessageW(hwnd, CCM_GETVERSION, 0, 0); + ok(version == 6, "Got %d, expected 6\n", version); + + version = SendMessageW(hwnd, CCM_SETVERSION, 5, 0); + ok(version == 6, "Got %d, expected 6\n", version); + + version = SendMessageW(hwnd, CCM_GETVERSION, 0, 0); + ok(version == 6, "Got %d, expected 6\n", version); + + version = SendMessageW(hwnd, CCM_SETVERSION, 7, 0); + ok(version == 6, "Got %d, expected 6\n", version); + + version = SendMessageW(hwnd, CCM_GETVERSION, 0, 0); + ok(version == 6, "Got %d, expected 6\n", version); + + version = SendMessageW(hwnd, CCM_SETVERSION, 4, 0); + ok(version == 6, "Got %d, expected 6\n", version); + + version = SendMessageW(hwnd, CCM_GETVERSION, 0, 0); + ok(version == 6, "Got %d, expected 6\n", version); + + DestroyWindow(hwnd); +} + +void TestV5VersionMessage() +{ + HWND hwnd; + int version; + + hwnd = CreateWindowExW(0, TOOLBARCLASSNAMEW, L"Test", 0, 0, 0, 0, 0, 0, 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowEx failed\n"); + + version = SendMessageW(hwnd, CCM_GETVERSION, 0, 0); + ok(version == 0, "Got %d, expected 0\n", version); + + version = SendMessageW(hwnd, CCM_SETVERSION, 6, 0); + ok(version == -1, "Got %d, expected -1\n", version); + + version = SendMessageW(hwnd, CCM_SETVERSION, 7, 0); + ok(version == -1, "Got %d, expected -1\n", version); + + version = SendMessageW(hwnd, CCM_SETVERSION, 5, 0); + ok(version == 0, "Got %d, expected -1\n", version); + + version = SendMessageW(hwnd, CCM_GETVERSION, 0, 0); + ok(version == 5, "Got %d, expected 5\n", version); + + version = SendMessageW(hwnd, CCM_SETVERSION, 4, 0); + ok(version == 5, "Got %d, expected -1\n", version); + + version = SendMessageW(hwnd, CCM_GETVERSION, 0, 0); + ok(version == 4, "Got %d, expected 5\n", version); + + version = SendMessageW(hwnd, CCM_SETVERSION, 3, 0); + ok(version == 4, "Got %d, expected -1\n", version); + + version = SendMessageW(hwnd, CCM_GETVERSION, 0, 0); + ok(version == 3, "Got %d, expected 5\n", version); + + DestroyWindow(hwnd); +} + +START_TEST(toolbar) +{ + HANDLE hV5ActCtx; + + LoadLibraryW(L"comctl32.dll"); + + TestVersionMessage(); + + hV5ActCtx = _CreateV5ActCtx(); + ok (hV5ActCtx != INVALID_HANDLE_VALUE, ""); + if (hV5ActCtx) + { + ULONG_PTR cookie; + BOOL bActivated = ActivateActCtx(hV5ActCtx, &cookie); + if (bActivated) + { + TestV5VersionMessage(); + DeactivateActCtx(0, cookie); + } + } +} Propchange: trunk/rostests/apitests/comctl32/toolbar.c ------------------------------------------------------------------------------ svn:eol-style = native

7 years, 3 months

[gadamopoulos] 74922: [COMCTL32] -Differentiate between v5 and v6 toolbar and make their CCM_SETVERSION behave correct according to their version.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Jun 5 14:23:42 2017 New Revision: 74922 URL: http://svn.reactos.org/svn/reactos?rev=74922&view=rev Log: [COMCTL32] -Differentiate between v5 and v6 toolbar and make their CCM_SETVERSION behave correct according to their version. Modified: trunk/reactos/dll/win32/comctl32/comctl32.h trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/toolbar.c Modified: trunk/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.h [iso-8859-1] Mon Jun 5 14:23:42 2017 @@ -177,6 +177,10 @@ extern void UPDOWN_Unregister(void) DECLSPEC_HIDDEN; extern void BUTTON_Register(); extern void BUTTON_Unregister(); +#ifdef __REACTOS__ +extern void TOOLBARv6_Register(void) DECLSPEC_HIDDEN; +extern void TOOLBARv6_Unregister(void) DECLSPEC_HIDDEN; +#endif int MONTHCAL_MonthLength(int month, int year) DECLSPEC_HIDDEN; int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] Mon Jun 5 14:23:42 2017 @@ -207,7 +207,7 @@ return ret; } -static void RegisterControls() +static void RegisterControls(BOOL bV6) { ANIMATE_Register (); COMBOEX_Register (); @@ -225,14 +225,23 @@ STATUS_Register (); SYSLINK_Register (); TAB_Register (); - TOOLBAR_Register (); TOOLTIPS_Register (); TRACKBAR_Register (); TREEVIEW_Register (); UPDOWN_Register (); -} - -static void UnregisterControls() + + if (!bV6) + { + TOOLBAR_Register (); + } + else + { + BUTTON_Register(); + TOOLBARv6_Register(); + } +} + +static void UnregisterControls(BOOL bV6) { ANIMATE_Unregister (); COMBOEX_Unregister (); @@ -250,11 +259,21 @@ STATUS_Unregister (); SYSLINK_Unregister (); TAB_Unregister (); - TOOLBAR_Unregister (); TOOLTIPS_Unregister (); TRACKBAR_Unregister (); TREEVIEW_Unregister (); UPDOWN_Unregister (); + + if (!bV6) + { + TOOLBAR_Unregister (); + } + else + { + BUTTON_Unregister(); + TOOLBARv6_Unregister (); + } + } static void InitializeClasses() @@ -267,15 +286,14 @@ /* Register the classes once no matter what */ hActCtx5 = CreateComctl32ActCtx(FALSE); activated = (hActCtx5 != INVALID_HANDLE_VALUE ? ActivateActCtx(hActCtx5, &ulCookie) : FALSE); - RegisterControls(); /* Register the classes pretending to be v5 */ + RegisterControls(FALSE); /* Register the classes pretending to be v5 */ if (activated) DeactivateActCtx(0, ulCookie); hActCtx6 = CreateComctl32ActCtx(TRUE); if (hActCtx6 != INVALID_HANDLE_VALUE) { activated = ActivateActCtx(hActCtx6, &ulCookie); - RegisterControls(); /* Register the classes pretending to be v6 */ - BUTTON_Register(); + RegisterControls(TRUE); /* Register the classes pretending to be v6 */ if (activated) DeactivateActCtx(0, ulCookie); /* Initialize the themed controls only when the v6 manifest is present */ @@ -291,7 +309,7 @@ hActCtx5 = CreateComctl32ActCtx(FALSE); activated = (hActCtx5 != INVALID_HANDLE_VALUE ? ActivateActCtx(hActCtx5, &ulCookie) : FALSE); - UnregisterControls(); + UnregisterControls(FALSE); if (activated) DeactivateActCtx(0, ulCookie); hActCtx6 = CreateComctl32ActCtx(TRUE); @@ -299,8 +317,7 @@ { activated = ActivateActCtx(hActCtx6, &ulCookie); THEMING_Uninitialize(); - UnregisterControls(); - BUTTON_Unregister(); + UnregisterControls(TRUE); if (activated) DeactivateActCtx(0, ulCookie); } } Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Mon Jun 5 14:23:42 2017 @@ -5268,6 +5268,16 @@ { INT iOldVersion = infoPtr->iVersion; +#ifdef __REACTOS__ + /* The v6 control doesn't support changing its version */ + if (iOldVersion == 6) + return iOldVersion; + + /* And a control that is not v6 can't be set to be a v6 one */ + if (iVersion >= 6) + return -1; +#endif + infoPtr->iVersion = iVersion; if (infoPtr->iVersion >= 5) @@ -6178,7 +6188,11 @@ static LRESULT +#ifdef __REACTOS__ +TOOLBAR_NCCreate (HWND hwnd, WPARAM wParam, const CREATESTRUCTW *lpcs, int iVersion) +#else TOOLBAR_NCCreate (HWND hwnd, WPARAM wParam, const CREATESTRUCTW *lpcs) +#endif { TOOLBAR_INFO *infoPtr; DWORD styleadd = 0; @@ -6212,7 +6226,11 @@ infoPtr->dwDTFlags = (lpcs->style & TBSTYLE_LIST) ? DT_LEFT | DT_VCENTER | DT_SINGLELINE | DT_END_ELLIPSIS: DT_CENTER | DT_END_ELLIPSIS; infoPtr->bAnchor = FALSE; /* no anchor highlighting */ infoPtr->bDragOutSent = FALSE; +#ifdef __REACTOS__ + infoPtr->iVersion = iVersion; +#else infoPtr->iVersion = 0; +#endif infoPtr->hwndSelf = hwnd; infoPtr->bDoRedraw = TRUE; infoPtr->clrBtnHighlight = CLR_DEFAULT; @@ -7003,7 +7021,11 @@ return TOOLBAR_NCCalcSize (hwnd, wParam, lParam); case WM_NCCREATE: +#ifdef __REACTOS__ + return TOOLBAR_NCCreate (hwnd, wParam, (CREATESTRUCTW*)lParam, 0); +#else return TOOLBAR_NCCreate (hwnd, wParam, (CREATESTRUCTW*)lParam); +#endif case WM_NCPAINT: return TOOLBAR_NCPaint (hwnd, wParam, lParam); @@ -7089,6 +7111,40 @@ UnregisterClassW (TOOLBARCLASSNAMEW, NULL); } +#ifdef __REACTOS__ +static LRESULT WINAPI +ToolbarV6WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (uMsg == WM_NCCREATE) + return TOOLBAR_NCCreate (hwnd, wParam, (CREATESTRUCTW*)lParam, 6); + else + return ToolbarWindowProc(hwnd, uMsg, wParam, lParam); +} + +VOID +TOOLBARv6_Register (void) +{ + WNDCLASSW wndClass; + + ZeroMemory (&wndClass, sizeof(WNDCLASSW)); + wndClass.style = CS_GLOBALCLASS | CS_DBLCLKS; + wndClass.lpfnWndProc = ToolbarV6WindowProc; + wndClass.cbClsExtra = 0; + wndClass.cbWndExtra = sizeof(TOOLBAR_INFO *); + wndClass.hCursor = LoadCursorW (0, (LPWSTR)IDC_ARROW); + wndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + wndClass.lpszClassName = TOOLBARCLASSNAMEW; + + RegisterClassW (&wndClass); +} + +VOID +TOOLBARv6_Unregister (void) +{ + UnregisterClassW (TOOLBARCLASSNAMEW, NULL); +} +#endif + static HIMAGELIST TOOLBAR_InsertImageList(PIMLENTRY **pies, INT *cies, HIMAGELIST himl, INT id) { HIMAGELIST himlold;

7 years, 3 months

← Newer
1
...
30
31
32
33
34
35
36
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2017