Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 66451: [DESK.CPL] - Don't convert the selected wallpaper if it is already a bitmap. Patch by Ricardo Hanke. CORE-8802 #resolve
by tfaber＠svn.reactos.org 25 Feb '15

25 Feb '15

Author: tfaber Date: Wed Feb 25 13:24:13 2015 New Revision: 66451 URL: http://svn.reactos.org/svn/reactos?rev=66451&view=rev Log: [DESK.CPL] - Don't convert the selected wallpaper if it is already a bitmap. Patch by Ricardo Hanke. CORE-8802 #resolve Added: trunk/reactos/dll/cpl/desk/guid.c (with props) Modified: trunk/reactos/dll/cpl/desk/CMakeLists.txt trunk/reactos/dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/cpl/desk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/CMakeLists.txt [iso-8859-1] Wed Feb 25 13:24:13 2015 @@ -25,6 +25,7 @@ add_library(desk SHARED ${SOURCE} + guid.c desk.rc ${CMAKE_CURRENT_BINARY_DIR}/desk.def) Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Wed Feb 25 13:24:13 2015 @@ -913,6 +913,7 @@ TCHAR szWallpaper[MAX_PATH]; GpImage *image; CLSID encoderClsid; + GUID guidFormat; size_t length = 0; GpStatus status; @@ -953,6 +954,15 @@ if (!image) { RegCloseKey(regKey); + return; + } + + GdipGetImageRawFormat(image, &guidFormat); + if (IsEqualGUID(&guidFormat, &ImageFormatBMP)) + { + GdipDisposeImage(image); + RegCloseKey(regKey); + SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, pData->backgroundItems[pData->backgroundSelection].szFilename, SPIF_UPDATEINIFILE); return; } Added: trunk/reactos/dll/cpl/desk/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/guid.c?rev=66… ============================================================================== --- trunk/reactos/dll/cpl/desk/guid.c (added) +++ trunk/reactos/dll/cpl/desk/guid.c [iso-8859-1] Wed Feb 25 13:24:13 2015 @@ -0,0 +1,14 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#define WIN32_NO_STATuS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <objbase.h> +#include <initguid.h> +#include <gdiplus.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/cpl/desk/guid.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 66450: [CPLS]: Add the console CPL to the control panel.
by hbelusca＠svn.reactos.org 25 Feb '15

25 Feb '15

Author: hbelusca Date: Wed Feb 25 13:07:44 2015 New Revision: 66450 URL: http://svn.reactos.org/svn/reactos?rev=66450&view=rev Log: [CPLS]: Add the console CPL to the control panel. Modified: trunk/reactos/boot/bootdata/hivesft.inf 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 13:07:44 2015 @@ -19,7 +19,7 @@ HKLM,"SOFTWARE\Classes\gopher\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1" HKLM,"SOFTWARE\Classes\http","",0x00000000,"URL:HyperText Transfer Protocol" -HKLM,"SOFTWARE\Classes\http\DefaultIcon","",0x00000000,"%systemroot%\system32\url.dll,0" +HKLM,"SOFTWARE\Classes\http\DefaultIcon","",0x00000000,"%SystemRoot%\system32\url.dll,0" HKLM,"SOFTWARE\Classes\http\Source Filter","",0x00000000,"{E436EBB6-524F-11CE-9F53-0020AF0BA770}" HKLM,"SOFTWARE\Classes\http\URL Protocol","",0x00000000,"" HKLM,"SOFTWARE\Classes\http\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1" @@ -30,7 +30,7 @@ ;HKLM,"SOFTWARE\Classes\http\shell\open\ddeexec\Topic","",0x00000000,"WWW_OpenURL" HKLM,"SOFTWARE\Classes\https","",0x00000000,"URL:HyperText Transfer Protocol with Privacy" -HKLM,"SOFTWARE\Classes\https\DefaultIcon","",0x00000000,"%systemroot%\system32\url.dll,0" +HKLM,"SOFTWARE\Classes\https\DefaultIcon","",0x00000000,"%SystemRoot%\system32\url.dll,0" HKLM,"SOFTWARE\Classes\https\Source Filter","",0x00000000,"{E436EBB6-524F-11CE-9F53-0020AF0BA770}" HKLM,"SOFTWARE\Classes\https\URL Protocol","",0x00000000,"" ;see http @@ -86,7 +86,11 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion","WallPaperDir",0x00020002,"%SystemRoot%\Web\Wallpaper" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Applets",,0x00000012 + +; Extra Control Panel Applets HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cpls",,0x00000012 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cpls","Console",0x00020000,"%SystemRoot%\system32\console.dll" + ; Cursors Schemes HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cursors\Schemes","ReactOS Default",0x00020000,""",,,,,,,,,,,,,""" @@ -94,7 +98,7 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\DefragPath",,0x00000012 -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\DefragPath","",0x00020000,"%systemroot%\system32\dfrg.msc %c:" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\DefragPath","",0x00020000,"%SystemRoot%\system32\dfrg.msc %c:" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\BackupPath",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\BackupPath","",0x00020000,"%SystemRoot%\system32\ntbackup.exe"

1 0

[tfaber] 66449: [USER32] - In MsgiUnicodeToAnsiMessage, use a single contiguous buffer for CREATESTRUCTA and its strings. This allows applications to modify the structure without ill effects - Don'...
by tfaber＠svn.reactos.org 25 Feb '15

25 Feb '15

Author: tfaber Date: Wed Feb 25 12:24:38 2015 New Revision: 66449 URL: http://svn.reactos.org/svn/reactos?rev=66449&view=rev Log: [USER32] - In MsgiUnicodeToAnsiMessage, use a single contiguous buffer for CREATESTRUCTA and its strings. This allows applications to modify the structure without ill effects - Don't return the address of a stack structure in MsgiAnsiToUnicodeMessage CORE-8777 #resolve Modified: trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Wed Feb 25 12:24:38 2015 @@ -578,12 +578,12 @@ case WM_NCCREATE: case WM_CREATE: { - MDICREATESTRUCTW mdi_cs; struct s { - CREATESTRUCTW cs; /* new structure */ - LPCWSTR lpszName; /* allocated Name */ - LPCWSTR lpszClass; /* allocated Class */ + CREATESTRUCTW cs; /* new structure */ + MDICREATESTRUCTW mdi_cs; /* MDI info */ + LPCWSTR lpszName; /* allocated Name */ + LPCWSTR lpszClass; /* allocated Class */ }; struct s *xs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct s)); @@ -605,10 +605,10 @@ if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD) { - mdi_cs = *(MDICREATESTRUCTW *)xs->cs.lpCreateParams; - mdi_cs.szTitle = xs->cs.lpszName; - mdi_cs.szClass = xs->cs.lpszClass; - xs->cs.lpCreateParams = &mdi_cs; + xs->mdi_cs = *(MDICREATESTRUCTW *)xs->cs.lpCreateParams; + xs->mdi_cs.szTitle = xs->cs.lpszName; + xs->mdi_cs.szClass = xs->cs.lpszClass; + xs->cs.lpCreateParams = &xs->mdi_cs; } UnicodeMsg->lParam = (LPARAM)xs; @@ -737,9 +737,10 @@ { struct s { - CREATESTRUCTW cs; /* new structure */ - LPWSTR lpszName; /* allocated Name */ - LPWSTR lpszClass; /* allocated Class */ + CREATESTRUCTW cs; /* new structure */ + MDICREATESTRUCTW mdi_cs; /* MDI info */ + LPWSTR lpszName; /* allocated Name */ + LPWSTR lpszClass; /* allocated Class */ }; struct s *xs = (struct s *)UnicodeMsg->lParam; @@ -847,10 +848,28 @@ MDICREATESTRUCTA *pmdi_cs; CREATESTRUCTA* CsA; CREATESTRUCTW* CsW; + ULONG NameSize, ClassSize; NTSTATUS Status; CsW = (CREATESTRUCTW*)(UnicodeMsg->lParam); - CsA = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(CREATESTRUCTA) + sizeof(MDICREATESTRUCTA)); + RtlInitUnicodeString(&UnicodeString, CsW->lpszName); + NameSize = RtlUnicodeStringToAnsiSize(&UnicodeString); + if (NameSize == 0) + { + return FALSE; + } + ClassSize = 0; + if (!IS_ATOM(CsW->lpszClass)) + { + RtlInitUnicodeString(&UnicodeString, CsW->lpszClass); + ClassSize = RtlUnicodeStringToAnsiSize(&UnicodeString); + if (ClassSize == 0) + { + return FALSE; + } + } + + CsA = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(CREATESTRUCTA) + sizeof(MDICREATESTRUCTA) + NameSize + ClassSize); if (NULL == CsA) { return FALSE; @@ -861,21 +880,21 @@ pmdi_cs = (MDICREATESTRUCTA*)(CsA + 1); RtlInitUnicodeString(&UnicodeString, CsW->lpszName); - Status = RtlUnicodeStringToAnsiString(&AnsiString, &UnicodeString, TRUE); + RtlInitEmptyAnsiString(&AnsiString, (PCHAR)(pmdi_cs + 1), NameSize); + Status = RtlUnicodeStringToAnsiString(&AnsiString, &UnicodeString, FALSE); if (! NT_SUCCESS(Status)) { RtlFreeHeap(GetProcessHeap(), 0, CsA); return FALSE; } CsA->lpszName = AnsiString.Buffer; - if (HIWORD((ULONG_PTR)CsW->lpszClass) != 0) + if (!IS_ATOM(CsW->lpszClass)) { RtlInitUnicodeString(&UnicodeString, CsW->lpszClass); - Status = RtlUnicodeStringToAnsiString(&AnsiString, &UnicodeString, TRUE); + RtlInitEmptyAnsiString(&AnsiString, (PCHAR)(pmdi_cs + 1) + NameSize, ClassSize); + Status = RtlUnicodeStringToAnsiString(&AnsiString, &UnicodeString, FALSE); if (! NT_SUCCESS(Status)) { - RtlInitAnsiString(&AnsiString, CsA->lpszName); - RtlFreeAnsiString(&AnsiString); RtlFreeHeap(GetProcessHeap(), 0, CsA); return FALSE; } @@ -1118,13 +1137,6 @@ CREATESTRUCTA* Cs; Cs = (CREATESTRUCTA*) AnsiMsg->lParam; - RtlInitAnsiString(&AnsiString, Cs->lpszName); - RtlFreeAnsiString(&AnsiString); - if (HIWORD((ULONG_PTR)Cs->lpszClass) != 0) - { - RtlInitAnsiString(&AnsiString, Cs->lpszClass); - RtlFreeAnsiString(&AnsiString); - } RtlFreeHeap(GetProcessHeap(), 0, Cs); break; }

1 0

[tfaber] 66448: [WIN32K:NTUSER] - Store string system parameter settings null-terminated CORE-8653 #resolve
by tfaber＠svn.reactos.org 25 Feb '15

25 Feb '15

Author: tfaber Date: Wed Feb 25 09:12:56 2015 New Revision: 66448 URL: http://svn.reactos.org/svn/reactos?rev=66448&view=rev Log: [WIN32K:NTUSER] - Store string system parameter settings null-terminated CORE-8653 #resolve Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] Wed Feb 25 09:12:56 2015 @@ -374,7 +374,7 @@ pwszValue, REG_SZ, (PWSTR)pwsz, - wcslen(pwsz) * sizeof(WCHAR)); + (wcslen(pwsz) + 1) * sizeof(WCHAR)); } static

1 0

[jimtabor] 66447: [NtUser] - Fix wine Msg test_SetActiveWindow with six remaining.
by jimtabor＠svn.reactos.org 25 Feb '15

25 Feb '15

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);

1 0

[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 25 Feb '15

25 Feb '15

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"

1 0

[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 25 Feb '15

25 Feb '15

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);

1 0

[tkreuzer] 66444: [USER32_APITEST] Add some test for GetDCEx that highlight the ridiculous implementation of owned and class DCs.
by tkreuzer＠svn.reactos.org 24 Feb '15

24 Feb '15

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 },

1 0

[ekohl] 66443: [NETAPI32] Fix indentation. No code changes!
by ekohl＠svn.reactos.org 24 Feb '15

24 Feb '15

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,

1 0

[ekohl] 66442: [NETAPI32] DsRoleGetPrimaryDomainInformation: Implement stubs for the DsRoleUpgradeStatus and DsRoleOperationState cases.
by ekohl＠svn.reactos.org 24 Feb '15

24 Feb '15

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; }

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