Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[jimtabor] 66447: [NtUser] - Fix wine Msg test_SetActiveWindow with six remaining.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Feb 25 04:37:56 2015 New Revision: 66447 URL: http://svn.reactos.org/svn/reactos?rev=66447&view=rev Log: [NtUser] - Fix wine Msg test_SetActiveWindow with six remaining. Modified: trunk/reactos/win32ss/user/ntuser/focus.c trunk/reactos/win32ss/user/ntuser/winpos.h Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Wed Feb 25 04:37:56 2015 @@ -717,6 +717,8 @@ BOOL FASTCALL UserSetActiveWindow(PWND Wnd) { + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + if (Wnd) // Must have a window! { if ((Wnd->style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; @@ -734,7 +736,34 @@ SetActiveWindow(0); check_wnd_state(0, 0, 0, 0); <-- This should pass if ShowWindow does it's job!!! As of 10/28/2012 it does! + Now Handle wines Msg.c test_SetActiveWindow( 0 )... */ + TRACE("USAW: Previous active window\n"); + if ( gpqForegroundPrev && + gpqForegroundPrev->spwndActivePrev && + (gpqForegroundPrev->spwndActivePrev->style & (WS_VISIBLE|WS_DISABLED)) == WS_VISIBLE && + !(gpqForegroundPrev->spwndActivePrev->state2 & WNDS2_BOTTOMMOST) && + (Wnd = VerifyWnd(gpqForegroundPrev->spwndActivePrev)) != NULL ) + { + TRACE("USAW:PAW hwnd %p\n",Wnd?Wnd->head.h:NULL); + return co_IntSetActiveWindow(Wnd, FALSE, TRUE, FALSE); + } + + // Activate anyone but the active window. + if ( pti->MessageQueue->spwndActive && + (Wnd = VerifyWnd(pti->MessageQueue->spwndActive)) != NULL ) + { + ERR("USAW:AOWM hwnd %p\n",Wnd?Wnd->head.h:NULL); + if (!ActivateOtherWindowMin(Wnd)) + { + // Okay, now go find someone else to play with! + ERR("USAW: Going to WPAOW\n"); + co_WinPosActivateOtherWindow(Wnd); + } + return TRUE; + } + + TRACE("USAW: Nothing\n"); return FALSE; } Modified: trunk/reactos/win32ss/user/ntuser/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.h [iso-8859-1] Wed Feb 25 04:37:56 2015 @@ -44,6 +44,7 @@ y - pwnd->rcWindow.top); } +BOOL FASTCALL ActivateOtherWindowMin(PWND); UINT FASTCALL co_WinPosArrangeIconicWindows(PWND parent); BOOL FASTCALL IntGetClientOrigin(PWND Window, LPPOINT Point); LRESULT FASTCALL co_WinPosGetNonClientSize(PWND Window, RECTL* WindowRect, RECTL* ClientRect);

9 years, 10 months

[gadamopoulos] 66446: [IEXPLORE] - Set http://www.reactos.org as the default homepage. [BOOTDATA] - Remove settings that are now set by iexplore.inf

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Feb 25 01:20:06 2015 New Revision: 66446 URL: http://svn.reactos.org/svn/reactos?rev=66446&view=rev Log: [IEXPLORE] - Set http://www.reactos.org as the default homepage. [BOOTDATA] - Remove settings that are now set by iexplore.inf Modified: trunk/reactos/base/applications/iexplore/iexplore.inf trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/base/applications/iexplore/iexplore.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… ============================================================================== --- trunk/reactos/base/applications/iexplore/iexplore.inf [iso-8859-1] (original) +++ trunk/reactos/base/applications/iexplore/iexplore.inf [iso-8859-1] Wed Feb 25 01:20:06 2015 @@ -22,12 +22,13 @@ HKCR,"CLSID\%CLSID_Internet%\Shell\OpenHomePage\Command",,,"""%16422%\Internet Explorer\iexplore.exe""" HKCR,"CLSID\%CLSID_Internet%\ShellFolder",,2,"0x24" - [Settings.Reg] -HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.winehq.org" +#HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.winehq.org" +HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.reactos.org" HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",2,"http://www.google.com" HKCU,"Software\Microsoft\Internet Explorer\Settings","Text Color",2,"0,0,0" -HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"http://www.winehq.org" +#HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"http://www.winehq.org" +HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"http://www.reactos.org" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe",,,"%16422%\Internet Explorer\iexplore.exe" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",,"%16422%\Internet Explorer;" Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Wed Feb 25 01:20:06 2015 @@ -1917,8 +1917,6 @@ ; Internet Explorer HKCU,"SOFTWARE\Wine\MSHTML","GeckoUrl",,"http://source.winehq.org/winegecko.php" HKCU,"SOFTWARE\Wine\MSHTML","GeckoCabDir",0x00020000,"%SystemRoot%\" - -HKCU,"SOFTWARE\Microsoft\Internet Explorer\Main","Start Page",0x00000000,"http://www.reactos.org" ; Sound Schemes HKCU,"AppEvents",,0x00000012 Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Wed Feb 25 01:20:06 2015 @@ -2,11 +2,6 @@ Signature="$ReactOS$" [AddReg] - -; Internet Explorer -HKLM,"SOFTWARE\Microsoft\Internet Explorer","Build",,"62800" -HKLM,"SOFTWARE\Microsoft\Internet Explorer","Version",,"6.0.2800.3959" -HKLM,"SOFTWARE\Microsoft\Internet Explorer","W2kVersion",,"6.0.2800.3959" HKLM,"SOFTWARE\Classes\Applications\iexplore.exe","",0x00000000,"" HKLM,"SOFTWARE\Classes\Applications\iexplore.exe\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1"

9 years, 10 months

[gadamopoulos] 66445: [IEXPLORE] - Contrary to wine we store our version info with utf16 (like windows do). Fix checking for native internet explorer. - Now our iexplore.inf is installed.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Feb 25 01:02:03 2015 New Revision: 66445 URL: http://svn.reactos.org/svn/reactos?rev=66445&view=rev Log: [IEXPLORE] - Contrary to wine we store our version info with utf16 (like windows do). Fix checking for native internet explorer. - Now our iexplore.inf is installed. Modified: trunk/reactos/base/applications/iexplore/main.c Modified: trunk/reactos/base/applications/iexplore/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… ============================================================================== --- trunk/reactos/base/applications/iexplore/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/iexplore/main.c [iso-8859-1] Wed Feb 25 01:02:03 2015 @@ -53,7 +53,11 @@ static const WCHAR wineW[] = {'W','i','n','e',0}; static const WCHAR file_desc_strW[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', +#ifndef __REACTOS__ '\\','0','4','0','9','0','4','e','4', +#else + '\\','0','4','0','9','0','4','b','0', +#endif '\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; size = GetFileVersionInfoSizeW(browseui_dllW, &handle);

9 years, 10 months

[tkreuzer] 66444: [USER32_APITEST] Add some test for GetDCEx that highlight the ridiculous implementation of owned and class DCs.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 24 23:15:08 2015 New Revision: 66444 URL: http://svn.reactos.org/svn/reactos?rev=66444&view=rev Log: [USER32_APITEST] Add some test for GetDCEx that highlight the ridiculous implementation of owned and class DCs. Added: trunk/rostests/apitests/user32/GetDCEx.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Tue Feb 24 23:15:08 2015 @@ -9,6 +9,7 @@ DrawIconEx.c desktop.c EnumDisplaySettings.c + GetDCEx.c GetIconInfo.c GetKeyState.c GetPeekMessage.c Added: trunk/rostests/apitests/user32/GetDCEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetDCEx.c… ============================================================================== --- trunk/rostests/apitests/user32/GetDCEx.c (added) +++ trunk/rostests/apitests/user32/GetDCEx.c [iso-8859-1] Tue Feb 24 23:15:08 2015 @@ -0,0 +1,450 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for GetDCEx + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> +#include "helper.h" + +#define DCX_USESTYLE 0x00010000 + +void Test_GetDCEx_Params() +{ + +} + +static +LRESULT +CALLBACK +WndProc( + _In_ HWND hwnd, + _In_ UINT uMsg, + _In_ WPARAM wParam, + _In_ LPARAM lParam) +{ + return TRUE; +} + +static +ATOM +RegisterClassHelper( + PSTR pszClassName, + UINT style, + WNDPROC pfnWndProc) +{ + WNDCLASSA cls; + + cls.style = style; + cls.lpfnWndProc = pfnWndProc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = pszClassName; + + return RegisterClassA(&cls); +} + +static +HWND +CreateWindowHelper( + PSZ pszClassName, + PSZ pszTitle) +{ + return CreateWindowA(pszClassName, + pszTitle, + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, + CW_USEDEFAULT, + 100, + 100, + NULL, + NULL, + 0, + NULL); +} + +static +void +Test_GetDCEx_Cached() +{ + static const PSTR pszClassName = "TestClass_Cached"; + ATOM atomClass; + HWND hwnd; + HDC hdc1, hdc2; + HRGN hrgn; + + atomClass = RegisterClassHelper(pszClassName, 0, WndProc); + ok(atomClass != 0, "Failed to register class\n"); + + hwnd = CreateWindowHelper(pszClassName, "Test Window1"); + ok(hwnd != NULL, "Failed to create hwnd\n"); + + hdc1 = GetDCEx(hwnd, 0, 0); + ok(hdc1 == NULL, "GetDCEx should fail\n"); + hrgn = CreateRectRgn(0, 0, 100, 100); + hdc1 = GetDCEx(hwnd, hrgn, 0); + ok(hdc1 == NULL, "GetDCEx should fail\n"); + + hdc1 = GetDCEx(hwnd, 0, DCX_WINDOW); + ok(hdc1 == NULL, "GetDCEx should fail\n"); + hdc1 = GetDCEx(hwnd, hrgn, DCX_WINDOW); + ok(hdc1 == NULL, "GetDCEx should fail\n"); + + hdc1 = GetDCEx(hwnd, hrgn, DCX_INTERSECTRGN); + ok(hdc1 == NULL, "GetDCEx should fail\n"); + + hdc1 = GetDCEx(hwnd, hrgn, DCX_PARENTCLIP); + ok(hdc1 != NULL, "GetDCEx failed\n"); + ReleaseDC(hwnd, hdc1); + + hdc1 = GetDCEx(hwnd, hrgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_PARENTCLIP); + ok(hdc1 != NULL, "GetDCEx failed\n"); + ReleaseDC(hwnd, hdc1); + + hdc1 = GetDCEx(hwnd, 0, DCX_CACHE); + ok(hdc1 != NULL, "GetDCEx failed\n"); + ReleaseDC(hwnd, hdc1); + + hrgn = CreateRectRgn(0, 0, 100, 100); + hdc2 = GetDCEx(hwnd, hrgn, DCX_CACHE); + ok(hdc2 != NULL, "GetDCEx failed\n"); + ReleaseDC(hwnd, hdc2); + ok(hdc2 == hdc1, "Expected the same DC\n"); + + hdc1 = GetDCEx(hwnd, 0, DCX_CACHE); + hdc2 = GetDCEx(hwnd, hrgn, DCX_CACHE); + ok(hdc1 != NULL, "GetDCEx failed\n"); + ok(hdc2 != hdc1, "Expected a different DC\n"); + ReleaseDC(hwnd, hdc1); + ReleaseDC(hwnd, hdc2); + + hdc1 = GetDCEx(NULL, NULL, 0); + ok(hdc1 != NULL, "GetDCEx failed\n"); + hdc2 = GetDCEx(NULL, NULL, 0); + ok(hdc2 != NULL, "GetDCEx failed\n"); + ok(hdc2 != hdc1, "Expected a different DC\n"); + ReleaseDC(hwnd, hdc1); + ReleaseDC(hwnd, hdc2); + + ok(CombineRgn(hrgn, hrgn, hrgn, RGN_OR) == SIMPLEREGION, "region is not valid"); + + DestroyWindow(hwnd); + ok(UnregisterClass(pszClassName, GetModuleHandleA(0)) == TRUE, + "UnregisterClass failed"); +} + +static +void +Test_GetDCEx_CS_OWNDC() +{ + static const PSTR pszClassName = "TestClass_CS_OWNDC"; + ATOM atomClass; + HWND hwnd; + HDC hdc1, hdc2; + //HRGN hrgn; + + atomClass = RegisterClassHelper(pszClassName, CS_OWNDC, WndProc); + ok(atomClass != 0, "Failed to register class\n"); + + hwnd = CreateWindowHelper(pszClassName, "Test Window1"); + ok(hwnd != NULL, "Failed to create hwnd\n"); + + hdc1 = GetDCEx(hwnd, NULL, 0); + ok(hdc1 != NULL, "GetDCEx failed\n"); + hdc2 = GetDCEx(hwnd, NULL, 0); + ok(hdc2 != NULL, "GetDCEx failed\n"); + ok(hdc2 == hdc1, "Expected the same DC\n"); + ok(ReleaseDC(hwnd, hdc1) == TRUE, "ReleaseDC failed\n"); + ok(ReleaseDC(hwnd, hdc2) == TRUE, "ReleaseDC failed\n"); + + hdc2 = GetDCEx(hwnd, NULL, 0); + ok(hdc2 == hdc1, "Expected the same DC\n"); + ok(ReleaseDC(hwnd, hdc2) == TRUE, "ReleaseDC failed\n"); + + hdc2 = GetDCEx(hwnd, NULL, DCX_CACHE); + ok(hdc2 != hdc1, "Expected a different DC\n"); + ok(ReleaseDC(hwnd, hdc2) == TRUE, "ReleaseDC failed\n"); + + hdc2 = GetDCEx(hwnd, NULL, DCX_WINDOW); + ok(hdc2 == hdc1, "Expected the same DC\n"); + ok(ReleaseDC(hwnd, hdc2) == TRUE, "ReleaseDC failed\n"); + + /* Try after resetting CS_OWNDC in the class */ + ok(SetClassLongPtrA(hwnd, GCL_STYLE, 0) == CS_OWNDC, "class style wrong\n"); + hdc2 = GetDCEx(hwnd, NULL, 0); + ok(hdc2 == hdc1, "Expected the same DC, got %p\n", hdc2); + ok(ReleaseDC(hwnd, hdc2) == TRUE, "ReleaseDC failed\n"); + + /* Try after setting CS_CLASSDC in the class */ + ok(SetClassLongPtrA(hwnd, GCL_STYLE, CS_CLASSDC) == 0, "class style not set\n"); + hdc2 = GetDCEx(hwnd, NULL, 0); + ok(hdc2 == hdc1, "Expected the same DC, got %p\n", hdc2); + ok(ReleaseDC(hwnd, hdc2) == TRUE, "ReleaseDC failed\n"); + + /* CS_OWNDC and CS_CLASSDC? Is that even legal? */ + ok(SetClassLongPtrA(hwnd, GCL_STYLE, (CS_OWNDC | CS_CLASSDC)) == CS_CLASSDC, "class style not set\n"); + hdc2 = GetDCEx(hwnd, NULL, 0); + ok(hdc2 == hdc1, "Expected the same DC, got %p\n", hdc2); + ok(ReleaseDC(hwnd, hdc2) == TRUE, "ReleaseDC failed\n"); + + SetClassLongPtrA(hwnd, GCL_STYLE, CS_OWNDC); + + DestroyWindow(hwnd); + ok(UnregisterClass(pszClassName, GetModuleHandleA(0)) == TRUE, + "UnregisterClass failed"); +} + +static +void +Test_GetDCEx_CS_CLASSDC() +{ + static const PSTR pszClassName = "TestClass_CS_CLASSDC"; + ATOM atomClass; + HWND hwnd1, hwnd2; + HDC hdc1, hdc2; + //HRGN hrgn; + + atomClass = RegisterClassHelper(pszClassName, CS_CLASSDC, WndProc); + ok(atomClass != 0, "Failed to register class\n"); + + hwnd1 = CreateWindowHelper(pszClassName, "Test Window1"); + ok(hwnd1 != NULL, "Failed to create hwnd1\n"); + + /* Looks legit, but this is not the DC you are looking for! + In fact this is NOT the class dc, but an own DC, doh! + When the first Window is created, the DC for that Window is both it's own + AND the class DC. But we only get the class DC, when using DCX_USESTYLE */ + hdc1 = GetDCEx(hwnd1, NULL, 0); + ok(hdc1 != NULL, "GetDCEx failed\n"); + hdc2 = GetDCEx(hwnd1, NULL, 0); + ok(hdc2 == hdc1, "Expected the same DC, got %p\n", hdc2); + ok(ReleaseDC(hwnd1, hdc1) == TRUE, "ReleaseDC failed\n"); + ok(ReleaseDC(hwnd1, hdc2) == TRUE, "ReleaseDC failed\n"); + + /* Now with DCX_USESTYLE */ + hdc2 = GetDCEx(hwnd1, NULL, DCX_USESTYLE); + ok(hdc2 == hdc1, "Expected the same DC, got %p\n", hdc2); + ok(ReleaseDC(hwnd1, hdc2) == TRUE, "ReleaseDC failed\n"); + + hwnd2 = CreateWindowHelper(pszClassName, "Test Window2"); + ok(hwnd2 != NULL, "Failed to create hwnd2\n"); + + /* Yeah, this doesn't work anymore. Once the */ + hdc2 = GetDCEx(hwnd2, NULL, 0); + ok(hdc2 == NULL, "Expected failure\n"); + + /* Now with DCX_USESTYLE ... */ + hdc2 = GetDCEx(hwnd2, NULL, DCX_USESTYLE); + ok(hdc2 == hdc1, "Expected the same DC, got %p\n", hdc2); + ok(ReleaseDC(hwnd2, hdc2) == TRUE, "ReleaseDC failed\n"); + + SendMessage(hwnd2, WM_USER, 0, 0); + + DestroyWindow(hwnd1); + DestroyWindow(hwnd2); + ok(UnregisterClass(pszClassName, GetModuleHandleA(0)) == TRUE, + "UnregisterClass failed"); +} + +static +void +Test_GetDCEx_CS_Mixed() +{ + static const PSTR pszClassName = "TestClass_CS_Mixed"; + ATOM atomClass; + HWND hwnd1,hwnd2, hwnd3; + HDC hdc1, hdc2, hdc3; + + /* Register a class with CS_OWNDC *and* CS_CLASSDC */ + atomClass = RegisterClassHelper(pszClassName, CS_OWNDC | CS_CLASSDC, WndProc); + ok(atomClass != 0, "Failed to register class\n"); + + /* Create the first window, this should create a single own and class DC */ + hwnd1 = CreateWindowHelper(pszClassName, "Test Window1"); + ok(hwnd1 != NULL, "Failed to create hwnd1\n"); + + /* Verify that we have the right style */ + ok(GetClassLongPtrA(hwnd1, GCL_STYLE) == (CS_OWNDC | CS_CLASSDC), + "class style not set\n"); + + /* This is now the class DC and the first windows own DC */ + hdc1 = GetDCEx(hwnd1, NULL, 0); + ok(hdc1 != NULL, "GetDCEx failed\n"); + ok(ReleaseDC(hwnd1, hdc1) == TRUE, "ReleaseDC failed\n"); + + /* This should get us the own/class DC again */ + hdc2 = GetDCEx(hwnd1, NULL, 0); + ok(hdc2 == hdc1, "Expected the own/class DC, got %p\n", hdc2); + ok(ReleaseDC(hwnd1, hdc2) == TRUE, "ReleaseDC failed\n"); + + /* This should get us the class DC, but it's the same */ + hdc2 = GetDCEx(hwnd1, NULL, DCX_USESTYLE); + ok(hdc2 == hdc1, "Expected the own/class DC, got %p\n", hdc2); + ok(ReleaseDC(hwnd1, hdc2) == TRUE, "ReleaseDC failed\n"); + + /* Create a second window */ + hwnd2 = CreateWindowHelper(pszClassName, "Test Window1"); + ok(hwnd1 != NULL, "Failed to create hwnd1\n"); + + /* This should get us the own DC of the new window */ + hdc2 = GetDCEx(hwnd2, NULL, 0); + ok(hdc2 != NULL, "GetDCEx failed\n"); + ok(hdc2 != hdc1, "Expected different DC\n"); + ok(ReleaseDC(hwnd2, hdc2) == TRUE, "ReleaseDC failed\n"); + + /* This gets us the own DC again, CS_OWNDC has priority! */ + hdc3 = GetDCEx(hwnd2, NULL, DCX_USESTYLE); + ok(hdc3 == hdc2, "Expected the own DC, got %p\n", hdc3); + ok(ReleaseDC(hwnd2, hdc3) == TRUE, "ReleaseDC failed\n"); + + /* Disable CS_OWNDC */ + ok(SetClassLongPtrA(hwnd1, GCL_STYLE, CS_CLASSDC) == (CS_OWNDC | CS_CLASSDC), "unexpected style\n"); + ok(GetClassLongPtrA(hwnd1, GCL_STYLE) == CS_CLASSDC, "class style not set\n"); + + /* Since the window already has an own DC, we get it again! */ + hdc3 = GetDCEx(hwnd2, NULL, DCX_USESTYLE); + ok(hdc3 == hdc2, "Expected the own DC, got %p\n", hdc3); + ok(ReleaseDC(hwnd2, hdc3) == TRUE, "ReleaseDC failed\n"); + + /* Disable CS_CLASSDC, too */ + ok(SetClassLongPtrA(hwnd1, GCL_STYLE, 0) == CS_CLASSDC, "unexpected style\n"); + ok(GetClassLongPtrA(hwnd1, GCL_STYLE) == 0, "class style not set\n"); + + /* With DCX_USESTYLE we only get a cached DC */ + hdc3 = GetDCEx(hwnd2, NULL, DCX_USESTYLE); + ok(hdc3 != NULL, "GetDCEx failed\n"); + ok(hdc3 != hdc1, "Expected different DC, got class DC\n"); + ok(hdc3 != hdc2, "Expected different DC, got own DC\n"); + ok(ReleaseDC(hwnd2, hdc3) == TRUE, "ReleaseDC failed\n"); + + /* Without DCX_USESTYLE we get the own DC */ + hdc3 = GetDCEx(hwnd2, NULL, 0); + ok(hdc3 != NULL, "GetDCEx failed\n"); + ok(hdc3 != hdc1, "Expected different DC, got class DC\n"); + ok(hdc3 == hdc2, "Expected the own DC, got %p\n", hdc3); + ok(ReleaseDC(hwnd2, hdc3) == TRUE, "ReleaseDC failed\n"); + + /* Set only CS_OWNDC */ + ok(SetClassLongPtrA(hwnd1, GCL_STYLE, CS_OWNDC) == 0, "unexpected style\n"); + ok(GetClassLongPtrA(hwnd1, GCL_STYLE) == CS_OWNDC, "class style not set\n"); + + hwnd3 = CreateWindowHelper(pszClassName, "Test Window1"); + ok(hwnd3 != NULL, "Failed to create hwnd1\n"); + + /* This should get a new own DC */ + hdc2 = GetDCEx(hwnd3, NULL, 0); + ok(hdc2 != hdc1, "Expected different DC\n"); + ok(ReleaseDC(hwnd3, hdc2) == TRUE, "ReleaseDC failed\n"); + + /* Re-enable CS_CLASSDC */ + ok(SetClassLongPtrA(hwnd1, GCL_STYLE, (CS_OWNDC | CS_CLASSDC)) == CS_OWNDC, "unexpected style\n"); + ok(GetClassLongPtrA(hwnd1, GCL_STYLE) == (CS_OWNDC | CS_CLASSDC), "class style not set\n"); + + /* This should get us the own DC */ + hdc3 = GetDCEx(hwnd3, NULL, 0); + ok(hdc3 == hdc2, "Expected the same DC, got %p\n", hdc3); + ok(ReleaseDC(hwnd3, hdc3) == TRUE, "ReleaseDC failed\n"); + + /* This should still get us the new own DC */ + hdc3 = GetDCEx(hwnd3, NULL, DCX_USESTYLE); + ok(hdc3 == hdc2, "Expected the same DC, got %p\n", hdc3); + ok(ReleaseDC(hwnd3, hdc3) == TRUE, "ReleaseDC failed\n"); + + /* Disable CS_OWNDC */ + ok(SetClassLongPtrA(hwnd1, GCL_STYLE, CS_CLASSDC) == (CS_OWNDC | CS_CLASSDC), "unexpected style\n"); + ok(GetClassLongPtrA(hwnd1, GCL_STYLE) == CS_CLASSDC, "class style not set\n"); + + /* This should get us the own DC */ + hdc3 = GetDCEx(hwnd3, NULL, 0); + ok(hdc3 == hdc2, "Expected the same DC, got %p\n", hdc3); + ok(ReleaseDC(hwnd3, hdc3) == TRUE, "ReleaseDC failed\n"); + + /* This should still get us the new own DC */ + hdc3 = GetDCEx(hwnd3, NULL, DCX_USESTYLE); + ok(hdc3 == hdc2, "Expected the same DC, got %p\n", hdc3); + ok(ReleaseDC(hwnd3, hdc3) == TRUE, "ReleaseDC failed\n"); + + /* cleanup for a second run */ + DestroyWindow(hwnd1); + DestroyWindow(hwnd2); + DestroyWindow(hwnd3); + ok(UnregisterClass(pszClassName, GetModuleHandleA(0)) == TRUE, + "UnregisterClass failed\n"); + + /* Create class again with CS_OWNDC */ + atomClass = RegisterClassHelper(pszClassName, CS_OWNDC, WndProc); + ok(atomClass != 0, "Failed to register class\n"); + + hwnd1 = CreateWindowHelper(pszClassName, "Test Window1"); + ok(hwnd1 != NULL, "Failed to create hwnd1\n"); + + /* This is the windows own DC, the class does not have a class DC yet */ + hdc1 = GetDCEx(hwnd1, NULL, 0); + ok(hdc1 != NULL, "GetDCEx failed\n"); + ok(ReleaseDC(hwnd1, hdc1) == TRUE, "ReleaseDC failed\n"); + + /* Enable only CS_CLASSDC */ + ok(SetClassLongPtrA(hwnd1, GCL_STYLE, CS_CLASSDC) == CS_OWNDC, "unexpected style\n"); + ok(GetClassLongPtrA(hwnd1, GCL_STYLE) == CS_CLASSDC, "class style not set\n"); + + /* Create a second window. Now we should create a class DC! */ + hwnd2 = CreateWindowHelper(pszClassName, "Test Window2"); + ok(hwnd2 != NULL, "Failed to create hwnd1\n"); + + /* We expect a new DCE (the class DCE) */ + hdc2 = GetDCEx(hwnd2, NULL, DCX_USESTYLE); + ok(hdc2 != NULL, "GetDCEx failed\n"); + ok(hdc2 != hdc1, "Expected different DCs\n"); + ok(ReleaseDC(hwnd2, hdc2) == TRUE, "ReleaseDC failed\n"); + + /* cleanup */ + DestroyWindow(hwnd1); + DestroyWindow(hwnd2); + ok(UnregisterClass(pszClassName, GetModuleHandleA(0)) == TRUE, + "UnregisterClass failed\n"); +} + +static +void +Test_GetDCEx_CS_SwitchedStyle() +{ + static const PSTR pszClassName = "TestClass_CS_SwitchedStyle"; + ATOM atomClass; + HWND hwnd1, hwnd2; + + atomClass = RegisterClassHelper(pszClassName, CS_OWNDC, WndProc); + ok(atomClass != 0, "Failed to register class\n"); + + hwnd1 = CreateWindowHelper(pszClassName, "Test Window1"); + ok(hwnd1 != NULL, "Failed to create hwnd1\n"); + + ok(SetClassLongPtrA(hwnd1, GCL_STYLE, CS_CLASSDC) == CS_OWNDC, "unexpected style\n"); + ok(GetClassLongPtrA(hwnd1, GCL_STYLE) == CS_CLASSDC, "class style not set\n"); + + hwnd2 = CreateWindowHelper(pszClassName, "Test Window2"); + ok(hwnd2 != NULL, "Failed to create hwnd2\n"); + + DestroyWindow(hwnd1); + DestroyWindow(hwnd2); + ok(UnregisterClass(pszClassName, GetModuleHandleA(0)) == TRUE, + "UnregisterClass failed\n"); +} + +START_TEST(GetDCEx) +{ + Test_GetDCEx_Params(); + Test_GetDCEx_Cached(); + Test_GetDCEx_CS_OWNDC(); + Test_GetDCEx_CS_CLASSDC(); + Test_GetDCEx_CS_Mixed(); + Test_GetDCEx_CS_SwitchedStyle(); +} + Propchange: trunk/rostests/apitests/user32/GetDCEx.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Tue Feb 24 23:15:08 2015 @@ -11,6 +11,7 @@ extern void func_DrawIconEx(void); extern void func_desktop(void); extern void func_EnumDisplaySettings(void); +extern void func_GetDCEx(void); extern void func_GetIconInfo(void); extern void func_GetKeyState(void); extern void func_GetPeekMessage(void); @@ -40,6 +41,7 @@ { "DrawIconEx", func_DrawIconEx }, { "desktop", func_desktop }, { "EnumDisplaySettings", func_EnumDisplaySettings }, + { "GetDCEx", func_GetDCEx }, { "GetIconInfo", func_GetIconInfo }, { "GetKeyState", func_GetKeyState }, { "GetPeekMessage", func_GetPeekMessage },

9 years, 10 months

[ekohl] 66443: [NETAPI32] Fix indentation. No code changes!

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Feb 24 22:58:01 2015 New Revision: 66443 URL: http://svn.reactos.org/svn/reactos?rev=66443&view=rev Log: [NETAPI32] Fix indentation. No code changes! Modified: trunk/reactos/dll/win32/netapi32/local_group.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Tue Feb 24 22:58:01 2015 @@ -1880,7 +1880,9 @@ /************************************************************ * NetLocalGroupSetMember (NETAPI32.@) */ -NET_API_STATUS WINAPI NetLocalGroupSetMembers( +NET_API_STATUS +WINAPI +NetLocalGroupSetMembers( LPCWSTR servername, LPCWSTR groupname, DWORD level,

9 years, 10 months

[ekohl] 66442: [NETAPI32] DsRoleGetPrimaryDomainInformation: Implement stubs for the DsRoleUpgradeStatus and DsRoleOperationState cases.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Feb 24 22:50:55 2015 New Revision: 66442 URL: http://svn.reactos.org/svn/reactos?rev=66442&view=rev Log: [NETAPI32] DsRoleGetPrimaryDomainInformation: Implement stubs for the DsRoleUpgradeStatus and DsRoleOperationState cases. Modified: trunk/reactos/dll/win32/netapi32/ds.c Modified: trunk/reactos/dll/win32/netapi32/ds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/ds.c?re… ============================================================================== --- trunk/reactos/dll/win32/netapi32/ds.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/ds.c [iso-8859-1] Tue Feb 24 22:50:55 2015 @@ -136,6 +136,40 @@ LsaFreeMemory(DomainInfo); } break; + + case DsRoleUpgradeStatus: + { + PDSROLE_UPGRADE_STATUS_INFO buffer; + + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DSROLE_UPGRADE_STATUS_INFO)); + if (buffer) + { + buffer->OperationState = 0; + buffer->PreviousServerState = 0; + ret = ERROR_SUCCESS; + } + else + ret = ERROR_OUTOFMEMORY; + *Buffer = (PBYTE)buffer; + } + break; + + case DsRoleOperationState: + { + PDSROLE_OPERATION_STATE_INFO buffer; + + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DSROLE_OPERATION_STATE_INFO)); + if (buffer) + { + buffer->OperationState = DsRoleOperationIdle; + ret = ERROR_SUCCESS; + } + else + ret = ERROR_OUTOFMEMORY; + *Buffer = (PBYTE)buffer; + } + break; + default: ret = ERROR_CALL_NOT_IMPLEMENTED; }

9 years, 10 months

[ekohl] 66441: [NETAPI32] Implement the client side of NetWkstaSetInfo and NetWkstaUserEnum.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Feb 24 22:15:58 2015 New Revision: 66441 URL: http://svn.reactos.org/svn/reactos?rev=66441&view=rev Log: [NETAPI32] Implement the client side of NetWkstaSetInfo and NetWkstaUserEnum. Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec trunk/reactos/dll/win32/netapi32/wksta.c trunk/reactos/dll/win32/netapi32/wksta_new.c Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Tue Feb 24 22:15:58 2015 @@ -254,10 +254,10 @@ @ stub NetValidatePasswordPolicy @ stub NetValidatePasswordPolicyFree @ stdcall NetWkstaGetInfo(wstr long ptr) -@ stub NetWkstaSetInfo +@ stdcall NetWkstaSetInfo(wstr long ptr ptr) @ stub NetWkstaTransportAdd @ stub NetWkstaTransportDel -@ stdcall NetWkstaTransportEnum (wstr long ptr long ptr ptr ptr) +@ stdcall NetWkstaTransportEnum(wstr long ptr long ptr ptr ptr) @ stdcall NetWkstaUserEnum(wstr long ptr long ptr ptr ptr) @ stdcall NetWkstaUserGetInfo(wstr long ptr) @ stub NetWkstaUserSetInfo Modified: trunk/reactos/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] Tue Feb 24 22:15:58 2015 @@ -417,6 +417,7 @@ /************************************************************ * NetWkstaUserEnum (NETAPI32.@) */ +#if 0 NET_API_STATUS WINAPI NetWkstaUserEnum(LMSTR servername, DWORD level, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread, @@ -426,6 +427,7 @@ level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); return ERROR_INVALID_PARAMETER; } +#endif /************************************************************ * NetpGetComputerName (NETAPI32.@) Modified: trunk/reactos/dll/win32/netapi32/wksta_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta_n… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta_new.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta_new.c [iso-8859-1] Tue Feb 24 22:15:58 2015 @@ -171,7 +171,7 @@ NET_API_STATUS WINAPI NetWkstaGetInfo( - LMSTR servername, + LPWSTR servername, DWORD level, LPBYTE *bufptr) { @@ -194,4 +194,102 @@ return status; } + +NET_API_STATUS +WINAPI +NetWkstaSetInfo( + LPWSTR servername, + DWORD level, + LPBYTE buffer, + LPDWORD parm_err) +{ + NET_API_STATUS status; + + RpcTryExcept + { + status = NetrWkstaSetInfo(servername, + level, + (LPWKSTA_INFO)buffer, + parm_err); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetWkstaUserEnum( + LMSTR servername, + DWORD level, + LPBYTE *bufptr, + DWORD prefmaxlen, + LPDWORD entriesread, + LPDWORD totalentries, + LPDWORD resumehandle) +{ + WKSTA_USER_ENUM_STRUCT UserEnumInfo; + WKSTA_USER_INFO_0_CONTAINER Level0; + WKSTA_USER_INFO_1_CONTAINER Level1; + NET_API_STATUS status; + + TRACE("(%s, %d, %p, %d, %p, %p, %p): stub!\n", debugstr_w(servername), + level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); + + UserEnumInfo.Level = level; + switch (level) + { + case 0: + UserEnumInfo.WkstaUserInfo.Level0 = &Level0; + UserEnumInfo.WkstaUserInfo.Level0->EntriesRead = 0; + UserEnumInfo.WkstaUserInfo.Level0->Buffer = NULL; + break; + + case 1: + UserEnumInfo.WkstaUserInfo.Level1 = &Level1; + UserEnumInfo.WkstaUserInfo.Level1->EntriesRead = 0; + UserEnumInfo.WkstaUserInfo.Level1->Buffer = NULL; + break; + + default: + return ERROR_INVALID_PARAMETER; + } + + RpcTryExcept + { + status = NetrWkstaUserEnum(servername, + &UserEnumInfo, + prefmaxlen, + totalentries, + resumehandle); + if (status == NERR_Success || status == ERROR_MORE_DATA) + { + switch (level) + { + case 0: + *bufptr = (LPBYTE)UserEnumInfo.WkstaUserInfo.Level0->Buffer; + *entriesread = UserEnumInfo.WkstaUserInfo.Level0->EntriesRead; + break; + + case 1: + *bufptr = (LPBYTE)UserEnumInfo.WkstaUserInfo.Level1->Buffer; + *entriesread = UserEnumInfo.WkstaUserInfo.Level1->EntriesRead; + break; + } + } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + /* EOF */

9 years, 10 months

[tfaber] 66440: [COM_APITEST] - Add IID_ITranslateShellChangeNotify, the answer to CORE-8844 - found by David - Fix some non-constant offsets - Re-alphabetize the lists

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Feb 24 12:52:18 2015 New Revision: 66440 URL: http://svn.reactos.org/svn/reactos?rev=66440&view=rev Log: [COM_APITEST] - Add IID_ITranslateShellChangeNotify, the answer to CORE-8844 - found by David - Fix some non-constant offsets - Re-alphabetize the lists Modified: trunk/rostests/apitests/com/browseui.c trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h trunk/rostests/apitests/com/shell32.c Modified: trunk/rostests/apitests/com/browseui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/browseui.c?r… ============================================================================== --- trunk/rostests/apitests/com/browseui.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/browseui.c [iso-8859-1] Tue Feb 24 12:52:18 2015 @@ -53,6 +53,7 @@ { 0x0, &IID_IShellFolder }, { 0x0, &IID_IUnknown }, { 0x4, &IID_IShellService }, + { 0x8, &IID_ITranslateShellChangeNotify }, } }, { @@ -64,6 +65,7 @@ { 0x0, &IID_IUnknown }, { 0x4, &IID_IShellFolder2 }, { 0x8, &IID_IShellService }, + { 0xc, &IID_ITranslateShellChangeNotify }, { 0x10, &IID_IDropTarget }, } }, @@ -76,6 +78,13 @@ { 0x8, &IID_IEnumString }, { 0xc, &IID_IAccessible }, { 0xc, &IID_IDispatch }, + } + }, + { + ID_NAME(CLSID_BackgroundTaskScheduler), + { + { 0x0, &IID_IShellTaskScheduler }, + { 0x0, &IID_IUnknown }, } }, { @@ -204,6 +213,16 @@ } }, { + ID_NAME(CLSID_ProgressDialog), + { + { 0x0, &IID_IProgressDialog }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IOleWindow }, + { 0x10, &IID_IObjectWithSite }, + }, + L"Both" + }, + { ID_NAME(CLSID_RebarBandSite), { { 0x0, &IID_IUnknown }, @@ -240,6 +259,13 @@ } }, { + ID_NAME(CLSID_SharedTaskScheduler), + { + { 0x0, &IID_IShellTaskScheduler }, + { 0x0, &IID_IUnknown }, + } + }, + { ID_NAME(CLSID_ShellSearchExt), { { 0x0, &IID_IContextMenu }, @@ -247,30 +273,6 @@ { 0x4, &IID_IObjectWithSite }, } }, - { - ID_NAME(CLSID_ProgressDialog), - { - { 0x0, &IID_IProgressDialog }, - { 0x0, &IID_IUnknown }, - { 0x4, &IID_IOleWindow }, - { 0x10, &IID_IObjectWithSite }, - }, - L"Both" - }, - { - ID_NAME(CLSID_SharedTaskScheduler), - { - { 0x0, &IID_IShellTaskScheduler }, - { 0x0, &IID_IUnknown }, - } - }, - { - ID_NAME(CLSID_BackgroundTaskScheduler), - { - { 0x0, &IID_IShellTaskScheduler }, - { 0x0, &IID_IUnknown }, - } - } }; static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces); Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Tue Feb 24 12:52:18 2015 @@ -105,6 +105,8 @@ { ID_NAME(IID_IExtractImage2) }, { ID_NAME(IID_IFileDialog) }, { ID_NAME(IID_IFileDialog2), TRUE }, + { ID_NAME(IID_IFileOpenDialog) }, + { ID_NAME(IID_IFileSaveDialog) }, { ID_NAME(IID_IFileSearchBand) }, { ID_NAME(IID_IFolderBandPriv) }, { ID_NAME(IID_IFolderFilter) }, @@ -199,6 +201,7 @@ { ID_NAME(IID_IShellMenuCallback), TRUE }, { ID_NAME(IID_IShellNameSpace) }, { ID_NAME(IID_IShellService), TRUE }, + { ID_NAME(IID_IShellTaskScheduler), TRUE }, { ID_NAME(IID_IShellView) }, { ID_NAME(IID_IShellView2) }, { ID_NAME(IID_IShellView3) }, @@ -213,6 +216,7 @@ { ID_NAME(IID_ITaskbarList) }, { ID_NAME(IID_ITaskbarList2) }, { ID_NAME(IID_ITrackShellMenu), TRUE }, + { ID_NAME(IID_ITranslateShellChangeNotify), TRUE }, { ID_NAME(IID_ITrayPriv), TRUE }, { ID_NAME(IID_ITrayPriv2), TRUE }, { ID_NAME(IID_IUnknown) }, @@ -235,7 +239,6 @@ { ID_NAME(IID_FolderItems3) }, { ID_NAME(IID_FolderItemVerb) }, { ID_NAME(IID_FolderItemVerbs) }, - { ID_NAME(IID_IShellTaskScheduler) }, { ID_NAME(CLSID_ShellDesktop), TRUE } }; Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Tue Feb 24 12:52:18 2015 @@ -127,6 +127,7 @@ DEFINE_GUID(IID_IShellLinkDual, 0x88a05c00, 0xf000, 0x11ce, 0x83, 0x50, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); DEFINE_GUID(IID_IShellLinkDual2, 0x317ee249, 0xf12e, 0x11d2, 0xb1, 0xe4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); DEFINE_GUID(IID_IShellView3, 0xec39fa88, 0xf8af, 0x41c5, 0x84, 0x21, 0x38, 0xbe, 0xd2, 0x8f, 0x46, 0x73); +DEFINE_GUID(IID_ITranslateShellChangeNotify,0xb4df2675, 0xba23, 0x11d2, 0xb5, 0xee, 0x00, 0x60, 0x97, 0xc6, 0x86, 0xf6); DEFINE_GUID(IID_IViewObjectEx, 0x3af24292, 0x0c96, 0x11ce, 0xa0, 0xcf, 0x00, 0xaa, 0x00, 0x60, 0x0a, 0xb8); DEFINE_GUID(IID_DFConstraint, 0x403df050, 0x23bd, 0x11d2, 0x93, 0x9f, 0x00, 0xa0, 0xc9, 0x1e, 0xed, 0xba); Modified: trunk/rostests/apitests/com/shell32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shell32.c?re… ============================================================================== --- trunk/rostests/apitests/com/shell32.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Tue Feb 24 12:52:18 2015 @@ -19,8 +19,8 @@ { 0x10, &IID_IPersistFolder2 }, { 0x10, &IID_IPersistFolder }, { 0x10, &IID_IPersist }, - { 0xbc, &IID_IShellFolder2 }, - { 0xbc, &IID_IShellFolder }, + { FARAWY, &IID_IShellFolder2 }, + { FARAWY, &IID_IShellFolder }, } }, { @@ -229,6 +229,7 @@ { 0x0, &IID_IShellFolder }, { 0x0, &IID_IUnknown }, { 0x4, &IID_IShellService }, + { 0x8, &IID_ITranslateShellChangeNotify }, { 0xc, &IID_IPersistFolder2 }, { 0xc, &IID_IPersistFolder }, { 0xc, &IID_IPersist }, @@ -254,8 +255,8 @@ { 0x10, &IID_IPersistFolder2 }, { 0x10, &IID_IPersistFolder }, { 0x10, &IID_IPersist }, - { 0x64, &IID_IShellFolder2 }, - { 0x64, &IID_IShellFolder }, + { FARAWY, &IID_IShellFolder2 }, + { FARAWY, &IID_IShellFolder }, } }, { @@ -266,13 +267,12 @@ { 0x0, &IID_IShellFolder2 }, { 0x0, &IID_IShellFolder }, { 0x0, &IID_IUnknown }, - { 0x70, &IID_IShellIcon }, - { 0x78, &IID_IPersistFolder3 }, - { 0x78, &IID_IPersistFolder2 }, - { 0x7c, &IID_IStorage }, - { 0x8c, &IID_IContextMenuCB }, - { 0x94, &IID_IOleCommandTarget }, - + { FARAWY, &IID_IShellIcon }, + { FARAWY, &IID_IPersistFolder3 }, + { FARAWY, &IID_IPersistFolder2 }, + { FARAWY, &IID_IStorage }, + { FARAWY, &IID_IContextMenuCB }, + { FARAWY, &IID_IOleCommandTarget }, } }, { @@ -283,8 +283,8 @@ { 0x10, &IID_IPersistFolder2 }, { 0x10, &IID_IPersistFolder }, { 0x10, &IID_IPersist }, - { 0xcc, &IID_IShellFolder2 }, - { 0xcc, &IID_IShellFolder }, + { FARAWY, &IID_IShellFolder2 }, + { FARAWY, &IID_IShellFolder }, } }, { @@ -410,6 +410,7 @@ { 0x8, &IID_IPersist }, { 0xc, &IID_IShellIcon }, { 0x14, &IID_IContextMenuCB }, + { 0x18, &IID_ITranslateShellChangeNotify }, { 0x20, &IID_IOleCommandTarget }, { FARAWY, &IID_IShellFolder2 }, { FARAWY, &IID_IShellFolder },

9 years, 10 months

[cwittich] 66439: [PSDK] add missing members to DISK_PERFORMANCE struct

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Feb 24 11:04:02 2015 New Revision: 66439 URL: http://svn.reactos.org/svn/reactos?rev=66439&view=rev Log: [PSDK] add missing members to DISK_PERFORMANCE struct Modified: trunk/reactos/include/psdk/winioctl.h Modified: trunk/reactos/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winioctl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winioctl.h [iso-8859-1] Tue Feb 24 11:04:02 2015 @@ -367,9 +367,14 @@ LARGE_INTEGER BytesWritten; LARGE_INTEGER ReadTime; LARGE_INTEGER WriteTime; + LARGE_INTEGER IdleTime; DWORD ReadCount; DWORD WriteCount; DWORD QueueDepth; + DWORD SplitCount; + LARGE_INTEGER QueryTime; + DWORD StorageDeviceNumber; + WCHAR StorageManagerName[8]; } DISK_PERFORMANCE, *PDISK_PERFORMANCE; typedef struct _DISK_RECORD { LARGE_INTEGER ByteOffset;

9 years, 10 months

[cwittich] 66438: [PSDK] fix NOTIFYICONDATA definition

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Feb 24 10:21:10 2015 New Revision: 66438 URL: http://svn.reactos.org/svn/reactos?rev=66438&view=rev Log: [PSDK] fix NOTIFYICONDATA definition Modified: trunk/reactos/include/psdk/shellapi.h Modified: trunk/reactos/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shellapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/shellapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shellapi.h [iso-8859-1] Tue Feb 24 10:21:10 2015 @@ -203,7 +203,10 @@ UINT uFlags; UINT uCallbackMessage; HICON hIcon; -#if _WIN32_IE >= 0x0500 +#if (NTDDI_VERSION < NTDDI_WIN2K) + CHAR szTip[64]; +#endif +#if (NTDDI_VERSION >= NTDDI_WIN2K) CHAR szTip[128]; DWORD dwState; DWORD dwStateMask; @@ -217,8 +220,11 @@ #else CHAR szTip[64]; #endif -#if _WIN32_IE >= 0x600 +#if (NTDDI_VERSION >= NTDDI_WINXP) GUID guidItem; +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) + HICON hBalloonIcon; #endif } NOTIFYICONDATAA,*PNOTIFYICONDATAA; @@ -229,7 +235,10 @@ UINT uFlags; UINT uCallbackMessage; HICON hIcon; -#if _WIN32_IE >= 0x0500 +#if (NTDDI_VERSION < NTDDI_WIN2K) + CHAR szTip[64]; +#endif +#if (NTDDI_VERSION >= NTDDI_WIN2K) WCHAR szTip[128]; DWORD dwState; DWORD dwStateMask; @@ -243,8 +252,11 @@ #else WCHAR szTip[64]; #endif -#if _WIN32_IE >= 0x600 +#if (NTDDI_VERSION >= NTDDI_WINXP) GUID guidItem; +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) + HICON hBalloonIcon; #endif } NOTIFYICONDATAW,*PNOTIFYICONDATAW;

9 years, 10 months

← Newer
1
...
4
5
6
7
8
9
10
...
38
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 February 2015