Ros-diffs May 2017

ros-diffs@reactos.org

17 participants
288 discussions

[mjansen] 74514: [SDK] Add enum for PEB.AppCompatFlagsUser

by mjansen＠svn.reactos.org

Author: mjansen Date: Tue May 9 18:15:22 2017 New Revision: 74514 URL: http://svn.reactos.org/svn/reactos?rev=74514&view=rev Log: [SDK] Add enum for PEB.AppCompatFlagsUser Modified: trunk/reactos/sdk/include/ndk/pstypes.h Modified: trunk/reactos/sdk/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/pstypes.h?… ============================================================================== --- trunk/reactos/sdk/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/pstypes.h [iso-8859-1] Tue May 9 18:15:22 2017 @@ -762,6 +762,61 @@ // +// PEB.AppCompatFlagsUser.LowPart +// Tag FLAG_MASK_USER +// +typedef enum _APPCOMPAT_USERFLAGS +{ + DisableAnimation = 0x1, + DisableKeyboardCues = 0x2, + No50StylebitsInSetWindowLong = 0x4, + DisableDrawPatternRect = 0x8, + MSShellDialog = 0x10, + NoDDETerminateDuringDestroy = 0x20, + GiveupForeground = 0x40, + AlwaysActiveMenus = 0x80, + NoMouseHideInEdit = 0x100, + NoGdiBatching = 0x200, + FontSubstitution = 0x400, + No50StylebitsInCreateWindow = 0x800, + NoCustomPaperSizes = 0x1000, + AllTheDdeHacks = 0x2000, + UseDefaultCharset = 0x4000, + NoCharDeadKey = 0x8000, + NoTryExceptForWindowProc = 0x10000, + NoInitInsertReplaceFlags = 0x20000, + NoDdeSync = 0x40000, + NoGhost = 0x80000, + NoDdeAsyncReg = 0x100000, + StrictLLHook = 0x200000, + NoShadow = 0x400000, + NoTimerCallbackProtection = 0x1000000, + HighDpiAware = 0x2000000, + OpenGLEmfAware = 0x4000000, + EnableTransparantBltMirror = 0x8000000, + NoPaddedBorder = 0x10000000, + ForceLegacyResizeCM = 0x20000000, + HardwareAudioMixer = 0x40000000, + DisableSWCursorOnMoveSize = 0x80000000, +#if 0 + DisableWindowArrangement = 0x100000000, + ReorderWaveForCommunications = 0x200000000, + NoGdiHwAcceleration = 0x400000000, +#endif +} APPCOMPAT_USERFLAGS; + +// +// PEB.AppCompatFlagsUser.HighPart +// Tag FLAG_MASK_USER +// +typedef enum _APPCOMPAT_USERFLAGS_HIGHPART +{ + DisableWindowArrangement = 0x1, + ReorderWaveForCommunications = 0x2, + NoGdiHwAcceleration = 0x4, +} APPCOMPAT_USERFLAGS_HIGHPART; + +// // Process Environment Block (PEB) // Thread Environment Block (TEB) //

7 years, 4 months

[cfinck] 74513: [PRINTING] - Implement GetDefaultPrinterA/W and SetDefaultPrinterA/W in winspool.drv. Also add tests for these functions. - Set our "Dummy Printer on LPT1" as the default printer in...

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue May 9 15:44:42 2017 New Revision: 74513 URL: http://svn.reactos.org/svn/reactos?rev=74513&view=rev Log: [PRINTING] - Implement GetDefaultPrinterA/W and SetDefaultPrinterA/W in winspool.drv. Also add tests for these functions. - Set our "Dummy Printer on LPT1" as the default printer in the user registry. - Return meaningful values for DeviceNotSelectedTimeout and TransmissionRetryTimeout in PRINTER_INFO_5 in localspl. The Print dialog now preselects "Dummy Printer on LPT1" in all applications. One more task done from the list at https://reactos.org/wiki/Printing :) Added: trunk/rostests/apitests/winspool/GetDefaultPrinter.c (with props) Modified: trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/win32ss/printing/base/winspool/CMakeLists.txt trunk/reactos/win32ss/printing/base/winspool/printers.c trunk/reactos/win32ss/printing/base/winspool/winspool.spec trunk/reactos/win32ss/printing/include/spoolss.h trunk/reactos/win32ss/printing/providers/localspl/precomp.h trunk/reactos/win32ss/printing/providers/localspl/printers.c trunk/rostests/apitests/winspool/CMakeLists.txt trunk/rostests/apitests/winspool/testlist.c 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] Tue May 9 15:44:42 2017 @@ -1837,13 +1837,13 @@ HKCU,"SOFTWARE\Microsoft\Windows NT",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion",,0x00000012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Devices",,0x00000012 +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Devices","Dummy Printer On LPT1",2,"winspool,LPT1:" HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Network",,0x00000012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\PrinterPorts",,0x00000012 +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\PrinterPorts","Dummy Printer On LPT1",2,"winspool,LPT1:,15,45" HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Program Manager",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DebugOptions",2,"2048" -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","device",2,"" +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","Device",2,"Dummy Printer On LPT1,winspool,LPT1:" HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","Documents",2,"" HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DosPrint",2,"no" HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","load",2,"" Modified: trunk/reactos/win32ss/printing/base/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/wins… ============================================================================== --- trunk/reactos/win32ss/printing/base/winspool/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/winspool/CMakeLists.txt [iso-8859-1] Tue May 9 15:44:42 2017 @@ -26,6 +26,6 @@ set_target_properties(winspool PROPERTIES SUFFIX ".drv") set_module_type(winspool win32dll UNICODE) target_link_libraries(winspool wine ${PSEH_LIB}) -add_importlibs(winspool gdi32 rpcrt4 msvcrt kernel32 ntdll) +add_importlibs(winspool advapi32 gdi32 rpcrt4 msvcrt kernel32 ntdll) add_pch(winspool precomp.h SOURCE) add_cd_file(TARGET winspool DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/printing/base/winspool/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/wins… ============================================================================== --- trunk/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] Tue May 9 15:44:42 2017 @@ -6,6 +6,13 @@ */ #include "precomp.h" + +// Local Constants + +/** And the award for the most confusingly named setting goes to "Device", for storing the default printer of the current user. + Ok, I admit that this has historical reasons. It's still not straightforward in any way though! */ +static const WCHAR wszWindowsKey[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows"; +static const WCHAR wszDeviceValue[] = L"Device"; static void _MarshallUpPrinterInfo(PBYTE* ppPrinterInfo, DWORD Level) @@ -415,13 +422,131 @@ BOOL WINAPI GetDefaultPrinterA(LPSTR pszBuffer, LPDWORD pcchBuffer) { - return FALSE; + DWORD dwErrorCode; + PWSTR pwszBuffer = NULL; + + // Sanity check. + if (!pcchBuffer) + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + // Check if an ANSI buffer was given and if so, allocate a Unicode buffer of the same size. + if (pszBuffer && *pcchBuffer) + { + pwszBuffer = HeapAlloc(hProcessHeap, 0, *pcchBuffer * sizeof(WCHAR)); + if (!pwszBuffer) + { + dwErrorCode = GetLastError(); + ERR("HeapAlloc failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + } + + if (!GetDefaultPrinterW(pwszBuffer, pcchBuffer)) + { + dwErrorCode = GetLastError(); + goto Cleanup; + } + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + if (pwszBuffer) + HeapFree(hProcessHeap, 0, pwszBuffer); + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } BOOL WINAPI GetDefaultPrinterW(LPWSTR pszBuffer, LPDWORD pcchBuffer) { - return FALSE; + DWORD cbNeeded; + DWORD cchInputBuffer; + DWORD dwErrorCode; + HKEY hWindowsKey = NULL; + PWSTR pwszDevice = NULL; + PWSTR pwszComma; + + // Sanity check. + if (!pcchBuffer) + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + cchInputBuffer = *pcchBuffer; + + // Open the registry key where the default printer for the current user is stored. + dwErrorCode = (DWORD)RegOpenKeyExW(HKEY_CURRENT_USER, wszWindowsKey, 0, KEY_READ, &hWindowsKey); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } + + // Determine the size of the required buffer. + dwErrorCode = (DWORD)RegQueryValueExW(hWindowsKey, wszDeviceValue, NULL, NULL, NULL, &cbNeeded); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } + + // Allocate it. + pwszDevice = HeapAlloc(hProcessHeap, 0, cbNeeded); + if (!pwszDevice) + { + dwErrorCode = GetLastError(); + ERR("HeapAlloc failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + + // Now get the actual value. + dwErrorCode = RegQueryValueExW(hWindowsKey, wszDeviceValue, NULL, NULL, (PBYTE)pwszDevice, &cbNeeded); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } + + // We get a string "<Printer Name>,winspool,<Port>:". + // Extract the printer name from it. + pwszComma = wcschr(pwszDevice, L','); + if (!pwszComma) + { + ERR("Found no or invalid default printer: %S!\n", pwszDevice); + dwErrorCode = ERROR_INVALID_NAME; + goto Cleanup; + } + + // Store the length of the Printer Name (including the terminating NUL character!) in *pcchBuffer. + *pcchBuffer = pwszComma - pwszDevice + 1; + + // Check if the supplied buffer is large enough. + if (cchInputBuffer < *pcchBuffer) + { + dwErrorCode = ERROR_INSUFFICIENT_BUFFER; + goto Cleanup; + } + + // Copy the default printer. + *pwszComma = 0; + CopyMemory(pszBuffer, pwszDevice, *pcchBuffer * sizeof(WCHAR)); + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + if (hWindowsKey) + RegCloseKey(hWindowsKey); + + if (pwszDevice) + HeapFree(hProcessHeap, 0, pwszDevice); + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } BOOL WINAPI @@ -633,6 +758,147 @@ } BOOL WINAPI +SetDefaultPrinterA(LPCSTR pszPrinter) +{ + BOOL bReturnValue = FALSE; + DWORD cch; + PWSTR pwszPrinter = NULL; + + if (pszPrinter) + { + // Convert pszPrinter to a Unicode string pwszPrinter + cch = strlen(pszPrinter); + + pwszPrinter = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(WCHAR)); + if (!pwszPrinter) + { + ERR("HeapAlloc failed for pwszPrinter with last error %lu!\n", GetLastError()); + goto Cleanup; + } + + MultiByteToWideChar(CP_ACP, 0, pszPrinter, -1, pwszPrinter, cch + 1); + } + + bReturnValue = SetDefaultPrinterW(pwszPrinter); + +Cleanup: + if (pwszPrinter) + HeapFree(hProcessHeap, 0, pwszPrinter); + + return bReturnValue; +} + +BOOL WINAPI +SetDefaultPrinterW(LPCWSTR pszPrinter) +{ + const WCHAR wszDevicesKey[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Devices"; + + DWORD cbDeviceValueData; + DWORD cbPrinterValueData = 0; + DWORD cchPrinter; + DWORD dwErrorCode; + HKEY hDevicesKey = NULL; + HKEY hWindowsKey = NULL; + PWSTR pwszDeviceValueData = NULL; + WCHAR wszPrinter[MAX_PRINTER_NAME + 1]; + + // Open the Devices registry key. + dwErrorCode = (DWORD)RegOpenKeyExW(HKEY_CURRENT_USER, wszDevicesKey, 0, KEY_READ, &hDevicesKey); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } + + // Did the caller give us a printer to set as default? + if (pszPrinter && *pszPrinter) + { + // Check if the given printer exists and query the value data size. + dwErrorCode = (DWORD)RegQueryValueExW(hDevicesKey, pszPrinter, NULL, NULL, NULL, &cbPrinterValueData); + if (dwErrorCode == ERROR_FILE_NOT_FOUND) + { + // The caller gave us an invalid printer name, return with ERROR_FILE_NOT_FOUND. + goto Cleanup; + } + else if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } + + cchPrinter = wcslen(pszPrinter); + } + else + { + // If there is already a default printer, we're done! + cchPrinter = _countof(wszPrinter); + if (GetDefaultPrinterW(wszPrinter, &cchPrinter)) + { + dwErrorCode = ERROR_SUCCESS; + goto Cleanup; + } + + // Otherwise, get us the first printer from the "Devices" key to later set it as default and query the value data size. + cchPrinter = _countof(wszPrinter); + dwErrorCode = (DWORD)RegEnumValueW(hDevicesKey, 0, wszPrinter, &cchPrinter, NULL, NULL, NULL, &cbPrinterValueData); + if (dwErrorCode != ERROR_MORE_DATA) + goto Cleanup; + + pszPrinter = wszPrinter; + } + + // We now need to query the value data, which has the format "winspool,<Port>:" + // and make "<Printer Name>,winspool,<Port>:" out of it. + // Allocate a buffer large enough for the final data. + cbDeviceValueData = (cchPrinter + 1) * sizeof(WCHAR) + cbPrinterValueData; + pwszDeviceValueData = HeapAlloc(hProcessHeap, 0, cbDeviceValueData); + if (!pwszDeviceValueData) + { + dwErrorCode = GetLastError(); + ERR("HeapAlloc failed with error %lu\n", dwErrorCode); + goto Cleanup; + } + + // Copy the Printer Name and a comma into it. + CopyMemory(pwszDeviceValueData, pszPrinter, cchPrinter * sizeof(WCHAR)); + pwszDeviceValueData[cchPrinter] = L','; + + // Append the value data, which has the format "winspool,<Port>:" + dwErrorCode = (DWORD)RegQueryValueExW(hDevicesKey, pszPrinter, NULL, NULL, (PBYTE)&pwszDeviceValueData[cchPrinter + 1], &cbPrinterValueData); + if (dwErrorCode != ERROR_SUCCESS) + goto Cleanup; + + // Open the Windows registry key. + dwErrorCode = (DWORD)RegOpenKeyExW(HKEY_CURRENT_USER, wszWindowsKey, 0, KEY_SET_VALUE, &hWindowsKey); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } + + // Store our new default printer. + dwErrorCode = (DWORD)RegSetValueExW(hWindowsKey, wszDeviceValue, 0, REG_SZ, (PBYTE)pwszDeviceValueData, cbDeviceValueData); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegSetValueExW failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } + +Cleanup: + if (hDevicesKey) + RegCloseKey(hDevicesKey); + + if (hWindowsKey) + RegCloseKey(hWindowsKey); + + if (pwszDeviceValueData) + HeapFree(hProcessHeap, 0, pwszDeviceValueData); + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} + +BOOL WINAPI SetPrinterW(HANDLE hPrinter, DWORD Level, PBYTE pPrinter, DWORD Command) { UNIMPLEMENTED; Modified: trunk/reactos/win32ss/printing/base/winspool/winspool.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/wins… ============================================================================== --- trunk/reactos/win32ss/printing/base/winspool/winspool.spec [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/winspool/winspool.spec [iso-8859-1] Tue May 9 15:44:42 2017 @@ -100,9 +100,9 @@ 199 stub EnumPrinterDriversA 200 stdcall EnumPrinterDriversW(wstr wstr long ptr long ptr ptr) 201 stdcall GetDefaultPrinterA(ptr ptr) -202 stub SetDefaultPrinterA +202 stdcall SetDefaultPrinterA(str) 203 stdcall GetDefaultPrinterW(ptr ptr) -204 stub SetDefaultPrinterW +204 stdcall SetDefaultPrinterW(wstr) 205 stub -noname SplReadPrinter 206 stub -noname AddPerMachineConnectionA 207 stub -noname AddPerMachineConnectionW Modified: trunk/reactos/win32ss/printing/include/spoolss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/include/s… ============================================================================== --- trunk/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] Tue May 9 15:44:42 2017 @@ -1,12 +1,15 @@ /* * PROJECT: ReactOS Printing Include files * LICENSE: GNU LGPLv2 or any later version as published by the Free Software Foundation - * PURPOSE: Undocumented APIs of the Spooler Router "spoolss.dll" + * PURPOSE: Undocumented APIs of the Spooler Router "spoolss.dll" and internally shared interfaces * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #ifndef _REACTOS_SPOOLSS_H #define _REACTOS_SPOOLSS_H + +// Constants +#define MAX_PRINTER_NAME 220 typedef struct _MARSHALL_DOWN_INFO { Modified: trunk/reactos/win32ss/printing/providers/localspl/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] Tue May 9 15:44:42 2017 @@ -36,7 +36,6 @@ #define IS_VALID_PRIORITY(P) (P >= MIN_PRIORITY && P <= MAX_PRIORITY) // Constants -#define MAX_PRINTER_NAME 220 #define SHD_WIN2003_SIGNATURE 0x4968 // Function pointers Modified: trunk/reactos/win32ss/printing/providers/localspl/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] Tue May 9 15:44:42 2017 @@ -74,6 +74,12 @@ FIELD_OFFSET(PRINTER_INFO_5W, pPortName), MAXDWORD }; + +/** These values serve no purpose anymore, but are still used in PRINTER_INFO_5 and + HKEY_CURRENT_USER\Software\Microsoft\Windows NT\CurrentVersion\PrinterPorts */ +static const DWORD dwDeviceNotSelectedTimeout = 15000; +static const DWORD dwTransmissionRetryTimeout = 45000; + /** * @name _PrinterListCompareRoutine @@ -765,8 +771,8 @@ // Set the general fields. (*ppPrinterInfo)->Attributes = pPrinter->dwAttributes; - (*ppPrinterInfo)->DeviceNotSelectedTimeout = 0; - (*ppPrinterInfo)->TransmissionRetryTimeout = 0; + (*ppPrinterInfo)->DeviceNotSelectedTimeout = dwDeviceNotSelectedTimeout; + (*ppPrinterInfo)->TransmissionRetryTimeout = dwTransmissionRetryTimeout; // Set the pPrinterName field. pwszStrings[0] = DllAllocSplMem(cbPrinterName); Modified: trunk/rostests/apitests/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/CMakeLi… ============================================================================== --- trunk/rostests/apitests/winspool/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/CMakeLists.txt [iso-8859-1] Tue May 9 15:44:42 2017 @@ -3,6 +3,7 @@ ClosePrinter.c EnumPrinters.c EnumPrintProcessorDatatypes.c + GetDefaultPrinter.c GetPrintProcessorDirectory.c IsValidDevmode.c OpenPrinter.c Added: trunk/rostests/apitests/winspool/GetDefaultPrinter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/GetDefa… ============================================================================== --- trunk/rostests/apitests/winspool/GetDefaultPrinter.c (added) +++ trunk/rostests/apitests/winspool/GetDefaultPrinter.c [iso-8859-1] Tue May 9 15:44:42 2017 @@ -0,0 +1,49 @@ +/* + * PROJECT: ReactOS Print Spooler DLL API Tests + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Tests for GetDefaultPrinterA/GetDefaultPrinterW/SetDefaultPrinterA/SetDefaultPrinterW + * COPYRIGHT: Copyright 2017 Colin Finck <colin(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winspool.h> + +START_TEST(GetDefaultPrinter) +{ + DWORD cchDefaultPrinter; + PWSTR pwszDefaultPrinter; + + // Don't supply any parameters, this has to fail with ERROR_INVALID_PARAMETER. + SetLastError(0xDEADBEEF); + ok(!GetDefaultPrinterW(NULL, NULL), "GetDefaultPrinterW returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetDefaultPrinterW returns error %lu!\n", GetLastError()); + + // Determine the size of the required buffer. This has to bail out with ERROR_INSUFFICIENT_BUFFER. + cchDefaultPrinter = 0; + SetLastError(0xDEADBEEF); + ok(!GetDefaultPrinterW(NULL, &cchDefaultPrinter), "GetDefaultPrinterW returns TRUE!\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetDefaultPrinterW returns error %lu!\n", GetLastError()); + + // Try with a buffer large enough. + pwszDefaultPrinter = HeapAlloc(GetProcessHeap(), 0, cchDefaultPrinter * sizeof(WCHAR)); + SetLastError(0xDEADBEEF); + ok(GetDefaultPrinterW(pwszDefaultPrinter, &cchDefaultPrinter), "GetDefaultPrinterW returns FALSE!\n"); + ok(GetLastError() == ERROR_SUCCESS, "GetDefaultPrinterW returns error %lu!\n", GetLastError()); + + // SetDefaultPrinterW with NULL needs to succeed and leave the default printer unchanged. + SetLastError(0xDEADBEEF); + ok(SetDefaultPrinterW(NULL), "SetDefaultPrinterW returns FALSE!\n"); + ok(GetLastError() == ERROR_SUCCESS, "SetDefaultPrinterW returns error %lu!\n", GetLastError()); + + // SetDefaultPrinterW with the previous default printer also needs to succeed. + SetLastError(0xDEADBEEF); + ok(SetDefaultPrinterW(pwszDefaultPrinter), "SetDefaultPrinterW returns FALSE!\n"); + ok(GetLastError() == ERROR_SUCCESS, "SetDefaultPrinterW returns error %lu!\n", GetLastError()); + + HeapFree(GetProcessHeap(), 0, pwszDefaultPrinter); +} Propchange: trunk/rostests/apitests/winspool/GetDefaultPrinter.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/winspool/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/testlis… ============================================================================== --- trunk/rostests/apitests/winspool/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/testlist.c [iso-8859-1] Tue May 9 15:44:42 2017 @@ -13,6 +13,7 @@ extern void func_ClosePrinter(void); extern void func_EnumPrinters(void); extern void func_EnumPrintProcessorDatatypes(void); +extern void func_GetDefaultPrinter(void); extern void func_GetPrintProcessorDirectoryA(void); extern void func_GetPrintProcessorDirectoryW(void); extern void func_IsValidDevmodeA(void); @@ -25,6 +26,7 @@ { "ClosePrinter", func_ClosePrinter }, { "EnumPrinters", func_EnumPrinters }, { "EnumPrintProcessorDatatypes", func_EnumPrintProcessorDatatypes }, + { "GetDefaultPrinter", func_GetDefaultPrinter }, { "GetPrintProcessorDirectoryA", func_GetPrintProcessorDirectoryA }, { "GetPrintProcessorDirectoryW", func_GetPrintProcessorDirectoryW }, { "IsValidDevmodeA", func_IsValidDevmodeA },

7 years, 4 months

[hbelusca] 74512: [USETUP]: Improve the bootsector validity check performed in IsThereAValidBootSector: - Check for the first 3 bytes (and not 4) of the bootsector to not be zero (that's our criter...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue May 9 15:31:53 2017 New Revision: 74512 URL: http://svn.reactos.org/svn/reactos?rev=74512&view=rev Log: [USETUP]: Improve the bootsector validity check performed in IsThereAValidBootSector: - Check for the first 3 bytes (and not 4) of the bootsector to not be zero (that's our criterium for a "valid instruction"). Therefore, a bootsector starting with "00 00 00 xx" (with xx the first byte of a volume identifier) is detected as invalid (because the BIOS won't be able to run it anyways) and therefore, needs to be overwritten. - Check that its last 2 bytes are the valid 0xAA55 signature. These improvements were suggested by Serge Gautherie and Peter Hater. CORE-4870 CORE-12672 CORE-13188 - Move a DPRINT1 around. Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Tue May 9 15:31:53 2017 @@ -630,12 +630,14 @@ IsThereAValidBootSector(PWSTR RootPath) { /* - * Check the first DWORD (4 bytes) of the bootsector for a potential - * "valid" instruction (the BIOS starts execution of the bootsector - * at its beginning). Currently the criterium is that this DWORD must - * be non-zero. + * We first demand that the bootsector has a valid signature at its end. + * We then check the first 3 bytes (as a ULONG) of the bootsector for a + * potential "valid" instruction (the BIOS starts execution of the bootsector + * at its beginning). Currently this criterium is that this ULONG must be + * non-zero. If both these tests pass, then the bootsector is valid; otherwise + * it is invalid and certainly needs to be overwritten. */ - + BOOLEAN IsValid = FALSE; NTSTATUS Status; UNICODE_STRING Name; OBJECT_ATTRIBUTES ObjectAttributes; @@ -666,10 +668,9 @@ 0, FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(ProcessHeap, 0, BootSector); - return FALSE; // Status; - } + goto Quit; + + RtlZeroMemory(BootSector, SECTORSIZE); FileOffset.QuadPart = 0ULL; Status = NtReadFile(FileHandle, @@ -682,16 +683,20 @@ &FileOffset, NULL); NtClose(FileHandle); - - Instruction = *(PULONG)BootSector; - + if (!NT_SUCCESS(Status)) + goto Quit; + + /* Check the instruction; we use a ULONG to read three bytes */ + Instruction = (*(PULONG)BootSector) & 0x00FFFFFF; + IsValid = (Instruction != 0x00000000); + + /* Check the bootsector signature */ + IsValid &= (*(PUSHORT)(BootSector + 0x1fe) == 0xaa55); + +Quit: /* Free the boot sector */ RtlFreeHeap(ProcessHeap, 0, BootSector); - - if (!NT_SUCCESS(Status)) - return FALSE; // Status; - - return (Instruction != 0x00000000); + return IsValid; // Status; } NTSTATUS Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Tue May 9 15:31:53 2017 @@ -4442,9 +4442,6 @@ wcscpy(SourceMbrPathBuffer, SourceRootPath.Buffer); wcscat(SourceMbrPathBuffer, L"\\loader\\dosmbr.bin"); - DPRINT1("Install MBR bootcode: %S ==> %S\n", - SourceMbrPathBuffer, DestinationDevicePathBuffer); - if (IsThereAValidBootSector(DestinationDevicePathBuffer)) { /* Save current MBR */ @@ -4460,6 +4457,8 @@ } } + DPRINT1("Install MBR bootcode: %S ==> %S\n", + SourceMbrPathBuffer, DestinationDevicePathBuffer); Status = InstallMbrBootCodeToDisk(SourceMbrPathBuffer, DestinationDevicePathBuffer); if (!NT_SUCCESS(Status))

7 years, 4 months

[gadamopoulos] 74511: [DESK.CPL] -Addendum to 74506 which was a bit rushed. Make it possible to apply a theme that was opened by double click. Also add the active theme in the list of themes if it ...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue May 9 08:13:49 2017 New Revision: 74511 URL: http://svn.reactos.org/svn/reactos?rev=74511&view=rev Log: [DESK.CPL] -Addendum to 74506 which was a bit rushed. Make it possible to apply a theme that was opened by double click. Also add the active theme in the list of themes if it was not enumerated in the themes directory. Modified: trunk/reactos/dll/cpl/desk/appearance.c trunk/reactos/dll/cpl/desk/appearance.h trunk/reactos/dll/cpl/desk/theme.c Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] Tue May 9 08:13:49 2017 @@ -117,40 +117,27 @@ g->pThemes = LoadThemes(); if (g->pThemes) { - PTHEME pLoadedTheme = NULL; - + BOOL bLoadedTheme = FALSE; + if (g_GlobalData.pwszAction && g_GlobalData.pwszFile && wcscmp(g_GlobalData.pwszAction, L"OpenMSTheme") == 0) { - /* Check if the theme specified was already loaded */ - for (pTheme = g->pThemes; pTheme; pTheme = pTheme->NextTheme) - { - if (pTheme->ThemeFileName && wcsicmp(pTheme->ThemeFileName, g_GlobalData.pwszFile) == 0) - { - pLoadedTheme = pTheme; - break; - } - - if (!pTheme->NextTheme) - break; - } - - if (!pLoadedTheme) - { - /* Load it now and insert it in the list */ - pLoadedTheme = LoadTheme(g_GlobalData.pwszFile, g_GlobalData.pwszFile); - if (pLoadedTheme) - pTheme->NextTheme = pLoadedTheme; - } - } - - if (pLoadedTheme) - { - g->ActiveTheme.ThemeActive = TRUE; - g->ActiveTheme.Theme = pLoadedTheme; - g->ActiveTheme.Color = pLoadedTheme->ColoursList; - g->ActiveTheme.Size = pLoadedTheme->SizesList; + bLoadedTheme = FindOrAppendTheme(g->pThemes, + g_GlobalData.pwszFile, + NULL, + NULL, + &g->ActiveTheme); + } + + if (bLoadedTheme) + { + g->bThemeChanged = TRUE; + g->bSchemeChanged = TRUE; + + PostMessageW(GetParent(hwndDlg), PSM_CHANGED, (WPARAM)hwndDlg, 0); + + AppearancePage_LoadSelectedScheme(hwndDlg, g); } else { Modified: trunk/reactos/dll/cpl/desk/appearance.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.h?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.h [iso-8859-1] Tue May 9 08:13:49 2017 @@ -137,6 +137,7 @@ PLOGFONTW SchemeGetFont(COLOR_SCHEME *scheme, int id); PTHEME LoadTheme(IN LPCWSTR pszThemeFileName,IN LPCWSTR pszThemeName); PTHEME LoadThemes(VOID); +BOOL FindOrAppendTheme(IN PTHEME pThemeList, IN LPCWSTR pwszThemeFileName, IN LPCWSTR pwszColorBuff, IN LPCWSTR pwszSizeBuff, OUT PTHEME_SELECTION pSelectedTheme); BOOL GetActiveTheme(PTHEME pThemeList, PTHEME_SELECTION pSelectedTheme); BOOL GetActiveClassicTheme(PTHEME pThemeList, PTHEME_SELECTION pSelectedTheme); BOOL LoadCurrentScheme(PCOLOR_SCHEME scheme); Modified: trunk/reactos/dll/cpl/desk/theme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/theme.c?rev=7… ============================================================================== --- trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] Tue May 9 08:13:49 2017 @@ -784,8 +784,61 @@ } /* + * FindSelectedTheme: Finds the specified theme in the list of themes + * or loads it if it was not loaded already. + */ +BOOL +FindOrAppendTheme(IN PTHEME pThemeList, + IN LPCWSTR pwszThemeFileName, + IN LPCWSTR pwszColorBuff, + IN LPCWSTR pwszSizeBuff, + OUT PTHEME_SELECTION pSelectedTheme) +{ + PTHEME pTheme; + PTHEME pFoundTheme = NULL; + + ZeroMemory(pSelectedTheme, sizeof(THEME_SELECTION)); + + for (pTheme = pThemeList; pTheme; pTheme = pTheme->NextTheme) + { + if (pTheme->ThemeFileName && + _wcsicmp(pTheme->ThemeFileName, pwszThemeFileName) == 0) + { + pFoundTheme = pTheme; + break; + } + + if (pTheme->NextTheme == NULL) + break; + } + + if (!pFoundTheme) + { + pFoundTheme = LoadTheme(pwszThemeFileName, pwszThemeFileName); + if (!pFoundTheme) + return FALSE; + + pTheme->NextTheme = pFoundTheme; + } + + pSelectedTheme->ThemeActive = TRUE; + pSelectedTheme->Theme = pFoundTheme; + if (pwszColorBuff) + pSelectedTheme->Color = FindStyle(pFoundTheme->ColoursList, pwszColorBuff); + else + pSelectedTheme->Color = pFoundTheme->ColoursList; + + if (pwszSizeBuff) + pSelectedTheme->Size = FindStyle(pFoundTheme->SizesList, pwszSizeBuff); + else + pSelectedTheme->Size = pFoundTheme->SizesList; + + return TRUE; +} + +/* * GetActiveTheme: Gets the active theme and populates pSelectedTheme - * with entries from the list of loaded themes + * with entries from the list of loaded themes. */ BOOL GetActiveTheme(IN PTHEME pThemeList, OUT PTHEME_SELECTION pSelectedTheme) @@ -793,10 +846,7 @@ WCHAR szThemeFileName[MAX_PATH]; WCHAR szColorBuff[MAX_PATH]; WCHAR szSizeBuff[MAX_PATH]; - PTHEME pTheme; HRESULT hret; - - ZeroMemory(pSelectedTheme, sizeof(THEME_SELECTION)); /* Retrieve the name of the current theme */ hret = GetCurrentThemeName(szThemeFileName, @@ -805,25 +855,10 @@ MAX_PATH, szSizeBuff, MAX_PATH); - if (FAILED(hret)) return FALSE; - - for (pTheme = pThemeList; pTheme; pTheme = pTheme->NextTheme) - { - if (pTheme->ThemeFileName && - _wcsicmp(pTheme->ThemeFileName, szThemeFileName) == 0) - { - break; - } - } - - if (pTheme == NULL) return FALSE; - - pSelectedTheme->ThemeActive = TRUE; - pSelectedTheme->Theme = pTheme; - pSelectedTheme->Color = FindStyle(pTheme->ColoursList, szColorBuff); - pSelectedTheme->Size = FindStyle(pTheme->SizesList, szSizeBuff); - - return TRUE; + if (FAILED(hret)) + return FALSE; + + return FindOrAppendTheme(pThemeList, szThemeFileName, szColorBuff, szSizeBuff, pSelectedTheme); } /*

7 years, 4 months

[tfaber] 74510: [SHELL32] - Fix AddCommasW

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue May 9 07:45:30 2017 New Revision: 74510 URL: http://svn.reactos.org/svn/reactos?rev=74510&view=rev Log: [SHELL32] - Fix AddCommasW Added: trunk/rostests/apitests/shell32/AddCommas.c (with props) Modified: trunk/reactos/dll/win32/shell32/shell32.cpp trunk/rostests/apitests/shell32/CMakeLists.txt trunk/rostests/apitests/shell32/testlist.c Modified: trunk/reactos/dll/win32/shell32/shell32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] Tue May 9 07:45:30 2017 @@ -42,20 +42,19 @@ numFormat.NumDigits = 0; numFormat.LeadingZero = 0; - numFormat.Grouping = 0; // FIXME! Use GetLocaleInfoW with LOCALE_SGROUPING and interpret the result. + numFormat.Grouping = 3; // FIXME! Use GetLocaleInfoW with LOCALE_SGROUPING and interpret the result. numFormat.lpDecimalSep = szSeparator; numFormat.lpThousandSep = szSeparator; numFormat.NegativeOrder = 0; - swprintf(szValue, L"%llu", lValue); - //_ultow(lValue, szValue, 10); + swprintf(szValue, L"%lu", lValue); if (GetNumberFormatW(LOCALE_USER_DEFAULT, 0, szValue, &numFormat, lpNumber, - wcslen(lpNumber)) != 0) + MAX_PATH) != 0) { return lpNumber; } Added: trunk/rostests/apitests/shell32/AddCommas.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/AddComma… ============================================================================== --- trunk/rostests/apitests/shell32/AddCommas.c (added) +++ trunk/rostests/apitests/shell32/AddCommas.c [iso-8859-1] Tue May 9 07:45:30 2017 @@ -0,0 +1,76 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for AddCommas + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> +#include <windef.h> +#include <winnls.h> +#include <bcrypt.h> +#include <ntstatus.h> +#include <strsafe.h> + +DECLSPEC_IMPORT LPWSTR WINAPI AddCommasW(DWORD lValue, LPWSTR lpNumber); + +START_TEST(AddCommas) +{ + WCHAR Separator[4]; + WCHAR Grouping[11]; + WCHAR Number[32]; + WCHAR Expected[32]; + PWSTR Ptr; + int Ret; + + StartSeh() + AddCommasW(0, NULL); + EndSeh(STATUS_ACCESS_VIOLATION); + + RtlFillMemory(Number, sizeof(Number), 0x55); + Ptr = AddCommasW(0, Number); + ok(Ptr == Number, "Ptr = %p, expected %p\n", Ptr, Number); + ok(Number[0] == L'0', "Number[0] = 0x%x\n", Number[0]); + ok(Number[1] == 0, "Number[1] = 0x%x\n", Number[1]); + ok(Number[2] == 0x5555, "Number[2] = 0x%x\n", Number[2]); + + Ret = GetLocaleInfoW(LOCALE_USER_DEFAULT, + LOCALE_STHOUSAND, + Separator, + RTL_NUMBER_OF(Separator)); + if (!Ret) + { + skip("GetLocaleInfoW failed with %lu\n", GetLastError()); + return; + } + Ret = GetLocaleInfoW(LOCALE_USER_DEFAULT, + LOCALE_SGROUPING, + Grouping, + RTL_NUMBER_OF(Grouping)); + if (!Ret) + { + skip("GetLocaleInfoW failed with %lu\n", GetLastError()); + return; + } + + if (wcscmp(Grouping, L"3;0")) + { + skip("Skipping remaining tests due to incompatible locale (separator '%ls', grouping '%ls')\n", + Separator, Grouping); + return; + } + + RtlFillMemory(Number, sizeof(Number), 0x55); + Ptr = AddCommasW(123456789, Number); + ok(Ptr == Number, "Ptr = %p, expected %p\n", Ptr, Number); + StringCbPrintfW(Expected, sizeof(Expected), L"123%ls456%ls789", Separator, Separator); + ok(!wcscmp(Number, Expected), "Number = '%ls', expected %ls\n", Number, Expected); + ok(Number[wcslen(Number) + 1] == 0x5555, "Number[N] = 0x%x\n", Number[wcslen(Number) + 1]); + + RtlFillMemory(Number, sizeof(Number), 0x55); + Ptr = AddCommasW(4294967295U, Number); + ok(Ptr == Number, "Ptr = %p, expected %p\n", Ptr, Number); + StringCbPrintfW(Expected, sizeof(Expected), L"4%ls294%ls967%ls295", Separator, Separator, Separator); + ok(!wcscmp(Number, Expected), "Number = '%ls', expected %ls\n", Number, Expected); + ok(Number[wcslen(Number) + 1] == 0x5555, "Number[N] = 0x%x\n", Number[wcslen(Number) + 1]); +} Propchange: trunk/rostests/apitests/shell32/AddCommas.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CMakeLis… ============================================================================== --- trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] Tue May 9 07:45:30 2017 @@ -4,6 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) add_executable(shell32_apitest + AddCommas.c CFSFolder.cpp CMyComputer.cpp CShellDesktop.cpp Modified: trunk/rostests/apitests/shell32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/testlist… ============================================================================== --- trunk/rostests/apitests/shell32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/testlist.c [iso-8859-1] Tue May 9 07:45:30 2017 @@ -3,6 +3,7 @@ #define STANDALONE #include <wine/test.h> +extern void func_AddCommas(void); extern void func_CFSFolder(void); extern void func_CMyComputer(void); extern void func_CShellDesktop(void); @@ -13,6 +14,7 @@ const struct test winetest_testlist[] = { + { "AddCommas", func_AddCommas }, { "CFSFolder", func_CFSFolder }, { "CMyComputer", func_CMyComputer }, { "CShellDesktop", func_CShellDesktop },

7 years, 4 months

[hbelusca] 74509: [DISK]: Small fixes: - Check for malformed disk identifier, which must be at least 9 WCHARs long (as done by disk_new); - Prevent possible memory leaks (missing ExFreePool's) + cl...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon May 8 21:34:07 2017 New Revision: 74509 URL: http://svn.reactos.org/svn/reactos?rev=74509&view=rev Log: [DISK]: Small fixes: - Check for malformed disk identifier, which must be at least 9 WCHARs long (as done by disk_new); - Prevent possible memory leaks (missing ExFreePool's) + closing registry key. Investigated by Lesan Ilie during tests; as part of CORE-13131. - Make one of our hacks more readable (by me). (We also note that this driver uses the ExAllocate/FreePool functions in the old-school way). Modified: trunk/reactos/drivers/storage/class/disk/disk.c Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Mon May 8 21:34:07 2017 @@ -2286,7 +2286,7 @@ outputBuffer->PartitionType = diskData->PartitionType; outputBuffer->StartingOffset = deviceExtension->StartingOffset; outputBuffer->PartitionLength.QuadPart = (diskData->PartitionNumber) ? - deviceExtension->PartitionLength.QuadPart : 2305843009213693951LL; // HACK + deviceExtension->PartitionLength.QuadPart : 0x1FFFFFFFFFFFFFFFLL; // HACK outputBuffer->HiddenSectors = diskData->HiddenSectors; outputBuffer->PartitionNumber = diskData->PartitionNumber; outputBuffer->BootIndicator = diskData->BootIndicator; @@ -3921,6 +3921,17 @@ ZwClose(targetKey); if (!NT_SUCCESS(status)) { + ExFreePool(keyData); + continue; + } + + if (keyData->DataLength < 9*sizeof(WCHAR)) { + // + // the data is too short to use (we subtract 9 chars in normal path) + // + DebugPrint((1, "EnumerateBusKey: Saved data was invalid, " + "not enough data in registry!\n")); + ExFreePool(keyData); continue; } @@ -3943,6 +3954,7 @@ TRUE); if (!NT_SUCCESS(status)) { + ExFreePool(keyData); continue; } @@ -4124,6 +4136,7 @@ DebugPrint((1, "SCSIDISK: ExtractBiosGeometry: Can't query configuration data (%x)\n", status)); + ZwClose(hardwareKey); ExFreePool(keyData); return; }

7 years, 4 months

[gadamopoulos] 74508: More build fixes.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon May 8 19:08:30 2017 New Revision: 74508 URL: http://svn.reactos.org/svn/reactos?rev=74508&view=rev Log: More build fixes. Modified: trunk/reactos/dll/cpl/desk/desk.c Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=74… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.c [iso-8859-1] Mon May 8 19:08:30 2017 @@ -126,7 +126,6 @@ PROPSHEETHEADER psh; HPSXA hpsxa; TCHAR Caption[1024]; - LONG ret; UINT i; LPWSTR *argv = NULL; LPCWSTR pwszSelectedTab = NULL; @@ -211,7 +210,7 @@ /* NOTE: Don't call SHAddFromPropSheetExtArray here because this applet only allows replacing the background page but not extending the applet by more pages */ - ret = (LONG)(PropertySheet(&psh) != -1); + PropertySheet(&psh); if (hpsxa != NULL) SHDestroyPropSheetExtArray(hpsxa);

7 years, 4 months

[gadamopoulos] 74507: Fix build.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon May 8 19:02:49 2017 New Revision: 74507 URL: http://svn.reactos.org/svn/reactos?rev=74507&view=rev Log: Fix build. Modified: trunk/reactos/dll/cpl/desk/desk.c Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=74… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.c [iso-8859-1] Mon May 8 19:02:49 2017 @@ -8,7 +8,7 @@ */ #include "desk.h" -#include <Shellapi.h> +#include <shellapi.h> #include <cplext.h> #include <debug.h>

7 years, 4 months

[gadamopoulos] 74506: [DESK.CPL] -Implement opening msstyles files.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon May 8 18:45:35 2017 New Revision: 74506 URL: http://svn.reactos.org/svn/reactos?rev=74506&view=rev Log: [DESK.CPL] -Implement opening msstyles files. Modified: trunk/reactos/dll/cpl/desk/appearance.c trunk/reactos/dll/cpl/desk/appearance.h trunk/reactos/dll/cpl/desk/desk.c trunk/reactos/dll/cpl/desk/desk.h trunk/reactos/dll/cpl/desk/theme.c Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] Mon May 8 18:45:35 2017 @@ -117,8 +117,48 @@ g->pThemes = LoadThemes(); if (g->pThemes) { - if (!GetActiveTheme(g->pThemes, &g->ActiveTheme)) - g->ActiveTheme.ThemeActive = FALSE; + PTHEME pLoadedTheme = NULL; + + if (g_GlobalData.pwszAction && + g_GlobalData.pwszFile && + wcscmp(g_GlobalData.pwszAction, L"OpenMSTheme") == 0) + { + /* Check if the theme specified was already loaded */ + for (pTheme = g->pThemes; pTheme; pTheme = pTheme->NextTheme) + { + if (pTheme->ThemeFileName && wcsicmp(pTheme->ThemeFileName, g_GlobalData.pwszFile) == 0) + { + pLoadedTheme = pTheme; + break; + } + + if (!pTheme->NextTheme) + break; + } + + if (!pLoadedTheme) + { + /* Load it now and insert it in the list */ + pLoadedTheme = LoadTheme(g_GlobalData.pwszFile, g_GlobalData.pwszFile); + if (pLoadedTheme) + pTheme->NextTheme = pLoadedTheme; + } + } + + if (pLoadedTheme) + { + g->ActiveTheme.ThemeActive = TRUE; + g->ActiveTheme.Theme = pLoadedTheme; + g->ActiveTheme.Color = pLoadedTheme->ColoursList; + g->ActiveTheme.Size = pLoadedTheme->SizesList; + } + else + { + if (!GetActiveTheme(g->pThemes, &g->ActiveTheme)) + { + g->ActiveTheme.ThemeActive = FALSE; + } + } /* * Keep a copy of the selected classic theme in order to select this Modified: trunk/reactos/dll/cpl/desk/appearance.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.h?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.h [iso-8859-1] Mon May 8 18:45:35 2017 @@ -135,6 +135,7 @@ VOID SchemeSetMetric(COLOR_SCHEME *scheme, int id, int value); int SchemeGetMetric(COLOR_SCHEME *scheme, int id); PLOGFONTW SchemeGetFont(COLOR_SCHEME *scheme, int id); +PTHEME LoadTheme(IN LPCWSTR pszThemeFileName,IN LPCWSTR pszThemeName); PTHEME LoadThemes(VOID); BOOL GetActiveTheme(PTHEME pThemeList, PTHEME_SELECTION pSelectedTheme); BOOL GetActiveClassicTheme(PTHEME pThemeList, PTHEME_SELECTION pSelectedTheme); Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=74… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.c [iso-8859-1] Mon May 8 18:45:35 2017 @@ -8,7 +8,7 @@ */ #include "desk.h" - +#include <Shellapi.h> #include <cplext.h> #include <debug.h> @@ -109,12 +109,13 @@ WORD idDlg; DLGPROC DlgProc; LPFNPSPCALLBACK Callback; + LPWSTR Name; } PropPages[] = { - { IDD_BACKGROUND, BackgroundPageProc, NULL }, - { IDD_SCREENSAVER, ScreenSaverPageProc, NULL }, - { IDD_APPEARANCE, AppearancePageProc, NULL }, - { IDD_SETTINGS, SettingsPageProc, SettingsPageCallbackProc }, + { IDD_BACKGROUND, BackgroundPageProc, NULL, L"Desktop" }, + { IDD_SCREENSAVER, ScreenSaverPageProc, NULL, L"Screen Saver" }, + { IDD_APPEARANCE, AppearancePageProc, NULL, L"Appearance" }, + { IDD_SETTINGS, SettingsPageProc, SettingsPageCallbackProc, L"Settings" }, }; /* Display Applet */ @@ -127,12 +128,51 @@ TCHAR Caption[1024]; LONG ret; UINT i; - - UNREFERENCED_PARAMETER(lParam); + LPWSTR *argv = NULL; + LPCWSTR pwszSelectedTab = NULL; + LPCWSTR pwszFile = NULL; + LPCWSTR pwszAction = NULL; + UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(uMsg); - UNREFERENCED_PARAMETER(hwnd); - + + hCPLWindow = hwnd; + + if (uMsg == CPL_STARTWPARMSW && lParam) + { + int argc; + int i; + LPCWSTR pszCommandLine = (LPCWSTR)lParam; + + argv = CommandLineToArgvW(pszCommandLine, &argc); + + if (argv && argc) + { + for (i = 0; i<argc; i++) + { + if (argv[i][0] == L'@') + pwszSelectedTab = &argv[i][1]; + else if (wcsncmp(argv[i], L"/Action:", 8) == 0) + pwszAction = &argv[i][8]; + else if (wcsncmp(argv[i], L"/file:", 6) == 0) + pwszFile = &argv[i][6]; + } + } + + /* HACK: shell32 doesn't give the correct params to CPL_STARTWPARMSW so we need to ... improvise */ + if (wcsncmp(pszCommandLine, L"/file:", 6) == 0) + { + LPCWSTR pwszType = wcsrchr(pszCommandLine, L'.'); + if (pwszType && wcsicmp(pwszType, L".msstyles") == 0) + { + pwszFile = &pszCommandLine[6]; + pwszSelectedTab = L"Appearance"; + pwszAction = L"OpenMSTheme"; + } + } + } + + g_GlobalData.pwszFile = pwszFile; + g_GlobalData.pwszAction = pwszAction; g_GlobalData.desktop_color = GetSysColor(COLOR_DESKTOP); LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); @@ -153,6 +193,9 @@ for (i = 0; i != sizeof(PropPages) / sizeof(PropPages[0]); i++) { + if (pwszSelectedTab && wcsicmp(pwszSelectedTab, PropPages[i].Name) == 0) + psh.nStartPage = i; + /* Override the background page if requested by a shell extension */ if (PropPages[i].idDlg == IDD_BACKGROUND && hpsxa != NULL && SHReplaceFromPropSheetExtArray(hpsxa, CPLPAGE_DISPLAY_BACKGROUND, PropSheetAddPage, (LPARAM)&psh) != 0) @@ -173,7 +216,10 @@ if (hpsxa != NULL) SHDestroyPropSheetExtArray(hpsxa); - return ret; + if (argv) + LocalFree(argv); + + return TRUE; } @@ -202,9 +248,10 @@ break; case CPL_DBLCLK: - hCPLWindow = hwndCPl; Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); break; + case CPL_STARTWPARMSW: + return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); } return FALSE; Modified: trunk/reactos/dll/cpl/desk/desk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.h?rev=74… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.h [iso-8859-1] Mon May 8 18:45:35 2017 @@ -104,6 +104,8 @@ typedef struct _GLOBAL_DATA { COLORREF desktop_color; + LPCWSTR pwszFile; + LPCWSTR pwszAction; } GLOBAL_DATA, *PGLOBAL_DATA; extern GLOBAL_DATA g_GlobalData; Modified: trunk/reactos/dll/cpl/desk/theme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/theme.c?rev=7… ============================================================================== --- trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] Mon May 8 18:45:35 2017 @@ -704,6 +704,23 @@ return List; } +PTHEME LoadTheme(IN LPCWSTR pszThemeFileName,IN LPCWSTR pszThemeName) +{ + PTHEME pTheme = CreateTheme(pszThemeFileName, pszThemeName); + if (pTheme == NULL) + return NULL; + + pTheme->SizesList = EnumThemeStyles( pszThemeFileName, (ENUMTHEMESTYLE)EnumThemeSizes); + pTheme->ColoursList = EnumThemeStyles( pszThemeFileName, (ENUMTHEMESTYLE)EnumThemeColors); + if(pTheme->SizesList == NULL || pTheme->ColoursList == NULL) + { + CleanupThemes(pTheme); + return NULL; + } + + return pTheme; +} + BOOL CALLBACK EnumThemeProc(IN LPVOID lpReserved, IN LPCWSTR pszThemeFileName, @@ -715,17 +732,8 @@ PTHEME *List, pTheme; List = (PTHEME*)lpData; - - pTheme = CreateTheme(pszThemeFileName, pszThemeName); + pTheme = LoadTheme(pszThemeFileName, pszThemeName); if (pTheme == NULL) return FALSE; - - pTheme->SizesList = EnumThemeStyles( pszThemeFileName, (ENUMTHEMESTYLE)EnumThemeSizes); - pTheme->ColoursList = EnumThemeStyles( pszThemeFileName, (ENUMTHEMESTYLE)EnumThemeColors); - if(pTheme->SizesList == NULL || pTheme->ColoursList == NULL) - { - CleanupThemes(pTheme); - return FALSE; - } pTheme->NextTheme = *List; *List = pTheme;

7 years, 4 months

[rnaumann] 74505: [EXPLORER] Some style suggestions by Mark Jansen. Thanks

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Mon May 8 17:46:55 2017 New Revision: 74505 URL: http://svn.reactos.org/svn/reactos?rev=74505&view=rev Log: [EXPLORER] Some style suggestions by Mark Jansen. Thanks Modified: trunk/reactos/base/shell/explorer/settings.cpp Modified: trunk/reactos/base/shell/explorer/settings.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/settin… ============================================================================== --- trunk/reactos/base/shell/explorer/settings.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/settings.cpp [iso-8859-1] Mon May 8 17:46:55 2017 @@ -29,17 +29,17 @@ { DWORD dwValue = NULL; - LoadSettingDword(szAdvancedSettingsKey, TEXT("TaskbarSizeMove"), dwValue); - TaskBarSettings.bLock = (dwValue != 0) ? FALSE : TRUE; + LoadSettingDword(szAdvancedSettingsKey, L"TaskbarSizeMove", dwValue); + TaskBarSettings.bLock = (dwValue == 0); - LoadSettingDword(szAdvancedSettingsKey, TEXT("ShowSeconds"), dwValue); - TaskBarSettings.bShowSeconds = (dwValue != 0) ? TRUE : FALSE; + LoadSettingDword(szAdvancedSettingsKey, L"ShowSeconds", dwValue); + TaskBarSettings.bShowSeconds = (dwValue != 0); - LoadSettingDword(szSettingsKey, TEXT("EnableAutotray"), dwValue); - TaskBarSettings.bHideInactiveIcons = (dwValue != 0) ? TRUE : FALSE; + LoadSettingDword(szSettingsKey, L"EnableAutotray", dwValue); + TaskBarSettings.bHideInactiveIcons = (dwValue != 0); - LoadSettingDword(szAdvancedSettingsKey, TEXT("TaskbarGlomming"), dwValue); - TaskBarSettings.bGroupButtons = (dwValue != 0) ? TRUE : FALSE; + LoadSettingDword(szAdvancedSettingsKey, L"TaskbarGlomming", dwValue); + TaskBarSettings.bGroupButtons = (dwValue != 0); TaskBarSettings.bShowQuickLaunch = TRUE; //FIXME: Where is this stored, and how? @@ -53,10 +53,10 @@ VOID SaveTaskBarSettings(VOID) { - SaveSettingDword(szAdvancedSettingsKey, TEXT("TaskbarSizeMove"), TaskBarSettings.bLock); - SaveSettingDword(szAdvancedSettingsKey, TEXT("ShowSeconds"), TaskBarSettings.bShowSeconds); - SaveSettingDword(szSettingsKey, TEXT("EnableAutotray"), TaskBarSettings.bHideInactiveIcons); - SaveSettingDword(szAdvancedSettingsKey, TEXT("TaskbarGlomming"), TaskBarSettings.bGroupButtons); + SaveSettingDword(szAdvancedSettingsKey, L"TaskbarSizeMove", TaskBarSettings.bLock); + SaveSettingDword(szAdvancedSettingsKey, L"ShowSeconds", TaskBarSettings.bShowSeconds); + SaveSettingDword(szSettingsKey, L"EnableAutotray", TaskBarSettings.bHideInactiveIcons); + SaveSettingDword(szAdvancedSettingsKey, L"TaskbarGlomming", TaskBarSettings.bGroupButtons); /* FIXME: Show Clock, AutoHide and Always on top are stored in the stuckrects2 key but are not written to it with a click on apply. How is this done instead? AutoHide writes something to HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Desktop\Components\0 figure out what and why */

7 years, 4 months

← Newer
1
...
19
20
21
22
23
24
25
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2017