Ros-diffs September 2016

ros-diffs@reactos.org

18 participants
342 discussions

[hbelusca] 72660: [NTDLL]: Fix misspelling.
by hbelusca＠svn.reactos.org 11 Sep '16

11 Sep '16

Author: hbelusca Date: Sun Sep 11 20:40:41 2016 New Revision: 72660 URL: http://svn.reactos.org/svn/reactos?rev=72660&view=rev Log: [NTDLL]: Fix misspelling. Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Sun Sep 11 20:40:41 2016 @@ -17,7 +17,7 @@ /* GLOBALS *******************************************************************/ LIST_ENTRY LdrpUnloadHead; -LONG LdrpLoaderLockAcquisitonCount; +LONG LdrpLoaderLockAcquisitionCount; BOOLEAN LdrpShowRecursiveLoads, LdrpBreakOnRecursiveDllLoads; UNICODE_STRING LdrApiDefaultExtension = RTL_CONSTANT_STRING(L".DLL"); ULONG AlternateResourceModuleCount; @@ -90,7 +90,7 @@ { /* Generate a cookie */ return (((ULONG_PTR)NtCurrentTeb()->RealClientId.UniqueThread & 0xFFF) << 16) | - (_InterlockedIncrement(&LdrpLoaderLockAcquisitonCount) & 0xFFFF); + (_InterlockedIncrement(&LdrpLoaderLockAcquisitionCount) & 0xFFFF); } /* @@ -580,7 +580,7 @@ } else if (Status != STATUS_SXS_KEY_NOT_FOUND) { - /* Unrecoverable SxS failure; */ + /* Unrecoverable SxS failure */ goto Quickie; } else

1 0

[dchapyshev] 72659: [USER32] We have to use the copy of DEVMODEA structure (having size expanded on dmDriverExtra) for support of extra data of the driver
by dchapyshev＠svn.reactos.org 11 Sep '16

11 Sep '16

Author: dchapyshev Date: Sun Sep 11 20:11:35 2016 New Revision: 72659 URL: http://svn.reactos.org/svn/reactos?rev=72659&view=rev Log: [USER32] We have to use the copy of DEVMODEA structure (having size expanded on dmDriverExtra) for support of extra data of the driver Modified: trunk/reactos/win32ss/user/user32/misc/display.c Modified: trunk/reactos/win32ss/user/user32/misc/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/display.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/display.c [iso-8859-1] Sun Sep 11 20:11:35 2016 @@ -191,8 +191,10 @@ DWORD dwFlags) { NTSTATUS Status; - UNICODE_STRING usDeviceName, *pusDeviceName = NULL; - DEVMODEW DevModeW; + UNICODE_STRING usDeviceName; + PUNICODE_STRING pusDeviceName = NULL; + LPDEVMODEW lpExtendedDevMode; + BOOL Result = FALSE; if (lpszDeviceName) { @@ -204,74 +206,105 @@ pusDeviceName = &usDeviceName; } - memset(&DevModeW,0, sizeof(DEVMODEW)); - DevModeW.dmSize = sizeof(DEVMODEW); - - Status = NtUserEnumDisplaySettings(pusDeviceName, iModeNum, &DevModeW, dwFlags); + /* Allocate memory for DEVMODEW and extra data */ + lpExtendedDevMode = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(DEVMODEW) + lpDevMode->dmDriverExtra); + if (!lpExtendedDevMode) + { + if (pusDeviceName) + RtlFreeUnicodeString(&usDeviceName); + + return FALSE; + } + + /* Initialize structure fields */ + lpExtendedDevMode->dmSize = sizeof(DEVMODEW); + lpExtendedDevMode->dmDriverExtra = lpDevMode->dmDriverExtra; + + Status = NtUserEnumDisplaySettings(pusDeviceName, iModeNum, lpExtendedDevMode, dwFlags); if (pusDeviceName) - { - RtlFreeUnicodeString (&usDeviceName); - } - - if (!NT_SUCCESS(Status)) - { - return FALSE; - } - -#define COPYS(f,len) WideCharToMultiByte( CP_THREAD_ACP, 0, DevModeW.f, len, (LPSTR)lpDevMode->f, len, NULL, NULL ) -#define COPYN(f) lpDevMode->f = DevModeW.f - COPYS(dmDeviceName, CCHDEVICENAME ); - COPYN(dmSpecVersion); - COPYN(dmDriverVersion); - switch (lpDevMode->dmSize) - { - case SIZEOF_DEVMODEA_300: - case SIZEOF_DEVMODEA_400: - case SIZEOF_DEVMODEA_500: - break; - default: - lpDevMode->dmSize = SIZEOF_DEVMODEA_300; - break; - } - COPYN(dmDriverExtra); - COPYN(dmFields); - COPYN(dmPosition.x); - COPYN(dmPosition.y); - COPYN(dmScale); - COPYN(dmCopies); - COPYN(dmDefaultSource); - COPYN(dmPrintQuality); - COPYN(dmColor); - COPYN(dmDuplex); - COPYN(dmYResolution); - COPYN(dmTTOption); - COPYN(dmCollate); - COPYS(dmFormName,CCHFORMNAME); - COPYN(dmLogPixels); - COPYN(dmBitsPerPel); - COPYN(dmPelsWidth); - COPYN(dmPelsHeight); - COPYN(dmDisplayFlags); // aka dmNup - COPYN(dmDisplayFrequency); - - if (lpDevMode->dmSize <= SIZEOF_DEVMODEW_300) - return TRUE; // we're done with 0x300 fields - - COPYN(dmICMMethod); - COPYN(dmICMIntent); - COPYN(dmMediaType); - COPYN(dmDitherType); - COPYN(dmReserved1); - COPYN(dmReserved2); - - if (lpDevMode->dmSize <= SIZEOF_DEVMODEW_400) - return TRUE; // we're done with 0x400 fields - - COPYN(dmPanningWidth); - COPYN(dmPanningHeight); - - return TRUE; + RtlFreeUnicodeString(&usDeviceName); + + if (NT_SUCCESS(Status)) + { + /* Store old structure size */ + WORD OldSize = lpDevMode->dmSize; + +#define COPYS(f,len) WideCharToMultiByte(CP_THREAD_ACP, 0, lpExtendedDevMode->f, len, (LPSTR)lpDevMode->f, len, NULL, NULL) +#define COPYN(f) lpDevMode->f = lpExtendedDevMode->f + + COPYS(dmDeviceName, CCHDEVICENAME); + COPYN(dmSpecVersion); + COPYN(dmDriverVersion); + COPYN(dmDriverExtra); + COPYN(dmFields); + COPYN(dmPosition.x); + COPYN(dmPosition.y); + COPYN(dmScale); + COPYN(dmCopies); + COPYN(dmDefaultSource); + COPYN(dmPrintQuality); + COPYN(dmColor); + COPYN(dmDuplex); + COPYN(dmYResolution); + COPYN(dmTTOption); + COPYN(dmCollate); + COPYS(dmFormName,CCHFORMNAME); + COPYN(dmLogPixels); + COPYN(dmBitsPerPel); + COPYN(dmPelsWidth); + COPYN(dmPelsHeight); + COPYN(dmDisplayFlags); // aka dmNup + COPYN(dmDisplayFrequency); + + /* we're done with 0x300 fields */ + if (OldSize > SIZEOF_DEVMODEA_300) + { + COPYN(dmICMMethod); + COPYN(dmICMIntent); + COPYN(dmMediaType); + COPYN(dmDitherType); + COPYN(dmReserved1); + COPYN(dmReserved2); + + /* we're done with 0x400 fields */ + if (OldSize > SIZEOF_DEVMODEA_400) + { + COPYN(dmPanningWidth); + COPYN(dmPanningHeight); + } + } + + /* Restore old size */ + lpDevMode->dmSize = OldSize; + + /* Extra data presented? */ + if (lpDevMode->dmDriverExtra && lpExtendedDevMode->dmDriverExtra) + { + /* We choose the smallest size */ + if (lpDevMode->dmDriverExtra > lpExtendedDevMode->dmDriverExtra) + lpDevMode->dmDriverExtra = lpExtendedDevMode->dmDriverExtra; + + /* Copy extra data */ + RtlCopyMemory(lpDevMode + OldSize, lpExtendedDevMode + 1, lpDevMode->dmDriverExtra); + } + + /* If the size of source structure is less, than used, we clean unsupported flags */ + if (OldSize < FIELD_OFFSET(DEVMODEA, dmPanningHeight)) + lpDevMode->dmFields &= ~DM_PANNINGHEIGHT; + + if (OldSize < FIELD_OFFSET(DEVMODEA, dmPanningWidth)) + lpDevMode->dmFields &= ~DM_PANNINGWIDTH; + + Result = TRUE; + } + + /* Free memory */ + RtlFreeHeap(RtlGetProcessHeap(), 0, lpExtendedDevMode); + + return Result; } @@ -285,7 +318,11 @@ DWORD iModeNum, LPDEVMODEA lpDevMode) { - return EnumDisplaySettingsExA ( lpszDeviceName, iModeNum, lpDevMode, 0 ); + /* Fixup sizes */ + lpDevMode->dmSize = FIELD_OFFSET(DEVMODEA, dmICMMethod); + lpDevMode->dmDriverExtra = 0; + + return EnumDisplaySettingsExA(lpszDeviceName, iModeNum, lpDevMode, 0); } @@ -374,7 +411,7 @@ LPDEVMODEW lpDevMode) { /* Fixup sizes */ - lpDevMode->dmSize = FIELD_OFFSET(DEVMODE, dmICMMethod); + lpDevMode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); lpDevMode->dmDriverExtra = 0; return EnumDisplaySettingsExW(lpszDeviceName, iModeNum, lpDevMode, 0);

1 0

[dchapyshev] 72658: [USER32_APITEST] Add tests for EnumDisplaySettingsA
by dchapyshev＠svn.reactos.org 11 Sep '16

11 Sep '16

Author: dchapyshev Date: Sun Sep 11 19:50:16 2016 New Revision: 72658 URL: http://svn.reactos.org/svn/reactos?rev=72658&view=rev Log: [USER32_APITEST] Add tests for EnumDisplaySettingsA Modified: trunk/rostests/apitests/user32/EnumDisplaySettings.c Modified: trunk/rostests/apitests/user32/EnumDisplaySettings.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/EnumDispl… ============================================================================== --- trunk/rostests/apitests/user32/EnumDisplaySettings.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/EnumDisplaySettings.c [iso-8859-1] Sun Sep 11 19:50:16 2016 @@ -3,13 +3,18 @@ #include <wingdi.h> #include <winuser.h> -#define SIZEOF_DEVMODEW_300 188 -#define SIZEOF_DEVMODEW_400 212 -#define SIZEOF_DEVMODEW_500 220 +#define SIZEOF_DEVMODEW_300_W 188 +#define SIZEOF_DEVMODEW_400_W 212 +#define SIZEOF_DEVMODEW_500_W 220 + +#define SIZEOF_DEVMODEW_300_A 124 +#define SIZEOF_DEVMODEW_400_A 148 +#define SIZEOF_DEVMODEW_500_A 156 START_TEST(EnumDisplaySettings) { - DEVMODEW dm; + DEVMODEW dmW; + DEVMODEA dmA; HDC icDisplay; /* TODO: test with a printer driver */ @@ -17,44 +22,88 @@ icDisplay = CreateICW(L"DISPLAY", NULL, NULL, NULL); ok(icDisplay != NULL, "\n"); - dm.dmDriverExtra = 0x7777; + dmW.dmDriverExtra = 0x7777; /* Try ridiculous size */ - dm.dmSize = 0x8888; - ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dm), "\n"); - ok(dm.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dm.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); - ok(dm.dmSize == SIZEOF_DEVMODEW_300, "%d\n", dm.dmSize); - ok(dm.dmDriverExtra == 0, "%d\n", dm.dmDriverExtra); + dmW.dmSize = 0x8888; + ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dmW), "\n"); + ok(dmW.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dmW.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); + ok(dmW.dmSize == SIZEOF_DEVMODEW_300_W, "%d\n", dmW.dmSize); + ok(dmW.dmDriverExtra == 0, "%d\n", dmW.dmDriverExtra); /* Try a tiny size */ - dm.dmSize = 4; - ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dm), "\n"); - ok(dm.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dm.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); - ok(dm.dmSize == SIZEOF_DEVMODEW_300, "%d\n", dm.dmSize); + dmW.dmSize = 4; + ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dmW), "\n"); + ok(dmW.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dmW.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); + ok(dmW.dmSize == SIZEOF_DEVMODEW_300_W, "%d\n", dmW.dmSize); /* Something in between */ - dm.dmSize = (SIZEOF_DEVMODEW_300 + SIZEOF_DEVMODEW_400) / 2 ; - ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dm), "\n"); - ok(dm.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dm.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); - ok(dm.dmSize == SIZEOF_DEVMODEW_300, "%d\n", dm.dmSize); + dmW.dmSize = (SIZEOF_DEVMODEW_300_W + SIZEOF_DEVMODEW_400_W) / 2 ; + ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dmW), "\n"); + ok(dmW.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dmW.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); + ok(dmW.dmSize == SIZEOF_DEVMODEW_300_W, "%d\n", dmW.dmSize); /* WINVER < 0x0400 */ - dm.dmSize = SIZEOF_DEVMODEW_300; - ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dm), "\n"); - ok(dm.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dm.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); - ok(dm.dmSize == SIZEOF_DEVMODEW_300, "%d\n", dm.dmSize); + dmW.dmSize = SIZEOF_DEVMODEW_300_W; + ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dmW), "\n"); + ok(dmW.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dmW.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); + ok(dmW.dmSize == SIZEOF_DEVMODEW_300_W, "%d\n", dmW.dmSize); /* WINVER < 0x0500 */ - dm.dmSize = SIZEOF_DEVMODEW_400; - ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dm), "\n"); - ok(dm.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dm.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); - ok(dm.dmSize == SIZEOF_DEVMODEW_300, "%d\n", dm.dmSize); + dmW.dmSize = SIZEOF_DEVMODEW_400_W; + ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dmW), "\n"); + ok(dmW.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dmW.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); + ok(dmW.dmSize == SIZEOF_DEVMODEW_300_W, "%d\n", dmW.dmSize); /* "Modern" windows */ - dm.dmSize = SIZEOF_DEVMODEW_500; - ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dm), "\n"); - ok(dm.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dm.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); - ok(dm.dmSize == SIZEOF_DEVMODEW_300, "%d\n", dm.dmSize); + dmW.dmSize = SIZEOF_DEVMODEW_500_W; + ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dmW), "\n"); + ok(dmW.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dmW.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); + ok(dmW.dmSize == SIZEOF_DEVMODEW_300_W, "%d\n", dmW.dmSize); + + DeleteDC(icDisplay); + + icDisplay = CreateICA("DISPLAY", NULL, NULL, NULL); + ok(icDisplay != NULL, "\n"); + + dmA.dmDriverExtra = 0x7777; + + /* Try ridiculous size */ + dmA.dmSize = 0x8888; + ok(EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dmA), "\n"); + ok(dmA.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dmA.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); + ok(dmA.dmSize == SIZEOF_DEVMODEW_300_A, "%d\n", dmA.dmSize); + ok(dmA.dmDriverExtra == 0, "%d\n", dmA.dmDriverExtra); + + /* Try a tiny size */ + dmA.dmSize = 4; + ok(EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dmA), "\n"); + ok(dmA.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dmA.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); + ok(dmA.dmSize == SIZEOF_DEVMODEW_300_A, "%d\n", dmA.dmSize); + + /* Something in between */ + dmA.dmSize = (SIZEOF_DEVMODEW_300_A + SIZEOF_DEVMODEW_400_A) / 2 ; + ok(EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dmA), "\n"); + ok(dmA.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dmA.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); + ok(dmA.dmSize == SIZEOF_DEVMODEW_300_A, "%d\n", dmA.dmSize); + + /* WINVER < 0x0400 */ + dmA.dmSize = SIZEOF_DEVMODEW_300_A; + ok(EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dmA), "\n"); + ok(dmA.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dmA.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); + ok(dmA.dmSize == SIZEOF_DEVMODEW_300_A, "%d\n", dmA.dmSize); + + /* WINVER < 0x0500 */ + dmA.dmSize = SIZEOF_DEVMODEW_400_A; + ok(EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dmA), "\n"); + ok(dmA.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dmA.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); + ok(dmA.dmSize == SIZEOF_DEVMODEW_300_A, "%d\n", dmA.dmSize); + + /* "Modern" windows */ + dmA.dmSize = SIZEOF_DEVMODEW_500_A; + ok(EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dmA), "\n"); + ok(dmA.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dmA.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); + ok(dmA.dmSize == SIZEOF_DEVMODEW_300_A, "%d\n", dmA.dmSize); DeleteDC(icDisplay); }

1 0

[dchapyshev] 72657: [USER32] We have to use the copy of DEVMODEW structure (having size expanded on dmDriverExtra) for support of extra data of the driver * Fixes 16 tests for EnumDisplaySettings
by dchapyshev＠svn.reactos.org 11 Sep '16

11 Sep '16

Author: dchapyshev Date: Sun Sep 11 19:05:27 2016 New Revision: 72657 URL: http://svn.reactos.org/svn/reactos?rev=72657&view=rev Log: [USER32] We have to use the copy of DEVMODEW structure (having size expanded on dmDriverExtra) for support of extra data of the driver * Fixes 16 tests for EnumDisplaySettings Modified: trunk/reactos/win32ss/user/ntuser/display.c trunk/reactos/win32ss/user/user32/misc/display.c Modified: trunk/reactos/win32ss/user/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/displa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Sun Sep 11 19:05:27 2016 @@ -571,12 +571,12 @@ _SEH2_TRY { - ProbeForRead(lpDevMode, sizeof(DEVMODEW), 1); + ProbeForRead(lpDevMode, sizeof(DEVMODEW), sizeof(UCHAR)); cbSize = lpDevMode->dmSize; cbExtra = lpDevMode->dmDriverExtra; - ProbeForWrite(lpDevMode, cbSize + cbExtra, 1); + ProbeForWrite(lpDevMode, cbSize + cbExtra, sizeof(UCHAR)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Modified: trunk/reactos/win32ss/user/user32/misc/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/display.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/display.c [iso-8859-1] Sun Sep 11 19:05:27 2016 @@ -301,7 +301,10 @@ DWORD dwFlags) { NTSTATUS Status; - UNICODE_STRING usDeviceName, *pusDeviceName = NULL; + UNICODE_STRING usDeviceName; + PUNICODE_STRING pusDeviceName = NULL; + LPDEVMODEW lpExtendedDevMode; + BOOL Result = FALSE; if (lpszDeviceName) { @@ -309,9 +312,54 @@ pusDeviceName = &usDeviceName; } - Status = NtUserEnumDisplaySettings(pusDeviceName, iModeNum, lpDevMode, dwFlags); - - return NT_SUCCESS(Status); + /* Allocate memory for DEVMODEW and extra data */ + lpExtendedDevMode = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(DEVMODEW) + lpDevMode->dmDriverExtra); + if (!lpExtendedDevMode) + return FALSE; + + /* Initialize structure fields */ + lpExtendedDevMode->dmSize = sizeof(DEVMODEW); + lpExtendedDevMode->dmDriverExtra = lpDevMode->dmDriverExtra; + + Status = NtUserEnumDisplaySettings(pusDeviceName, iModeNum, lpExtendedDevMode, dwFlags); + if (NT_SUCCESS(Status)) + { + /* Store old structure size */ + WORD OldSize = lpDevMode->dmSize; + + /* Copy general data */ + RtlCopyMemory(lpDevMode, lpExtendedDevMode, OldSize); + + /* Restore old size */ + lpDevMode->dmSize = OldSize; + + /* Extra data presented? */ + if (lpDevMode->dmDriverExtra && lpExtendedDevMode->dmDriverExtra) + { + /* We choose the smallest size */ + if (lpDevMode->dmDriverExtra > lpExtendedDevMode->dmDriverExtra) + lpDevMode->dmDriverExtra = lpExtendedDevMode->dmDriverExtra; + + /* Copy extra data */ + RtlCopyMemory(lpDevMode + OldSize, lpExtendedDevMode + 1, lpDevMode->dmDriverExtra); + } + + /* If the size of source structure is less, than used, we clean unsupported flags */ + if (OldSize < FIELD_OFFSET(DEVMODEW, dmPanningHeight)) + lpDevMode->dmFields &= ~DM_PANNINGHEIGHT; + + if (OldSize < FIELD_OFFSET(DEVMODEW, dmPanningWidth)) + lpDevMode->dmFields &= ~DM_PANNINGWIDTH; + + Result = TRUE; + } + + /* Free memory */ + RtlFreeHeap(RtlGetProcessHeap(), 0, lpExtendedDevMode); + + return Result; } @@ -325,7 +373,11 @@ DWORD iModeNum, LPDEVMODEW lpDevMode) { - return EnumDisplaySettingsExW ( lpszDeviceName, iModeNum, lpDevMode, 0 ); + /* Fixup sizes */ + lpDevMode->dmSize = FIELD_OFFSET(DEVMODE, dmICMMethod); + lpDevMode->dmDriverExtra = 0; + + return EnumDisplaySettingsExW(lpszDeviceName, iModeNum, lpDevMode, 0); }

1 0

[cwittich] 72656: [WIN32K] set lasterror in NtGdiCombineRgn
by cwittich＠svn.reactos.org 11 Sep '16

11 Sep '16

Author: cwittich Date: Sun Sep 11 17:27:59 2016 New Revision: 72656 URL: http://svn.reactos.org/svn/reactos?rev=72656&view=rev Log: [WIN32K] set lasterror in NtGdiCombineRgn Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Sun Sep 11 17:27:59 2016 @@ -3506,6 +3506,7 @@ { DPRINT1("NtGdiCombineRgn invalid parameters: %p, %p, %p, %d\n", hrgnDst, hrgnSrc1, hrgnSrc2, iMode); + EngSetLastError(ERROR_INVALID_HANDLE); return ERROR; }

1 0

[dchapyshev] 72655: [NtUser] Try to fix tests for user32:EnumDisplaySettings
by dchapyshev＠svn.reactos.org 11 Sep '16

11 Sep '16

Author: dchapyshev Date: Sun Sep 11 16:13:46 2016 New Revision: 72655 URL: http://svn.reactos.org/svn/reactos?rev=72655&view=rev Log: [NtUser] Try to fix tests for user32:EnumDisplaySettings Modified: trunk/reactos/win32ss/user/ntuser/display.c Modified: trunk/reactos/win32ss/user/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/displa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Sun Sep 11 16:13:46 2016 @@ -443,7 +443,7 @@ { /* No device found */ ERR("No PDEV found!\n"); - return STATUS_UNSUCCESSFUL; + return STATUS_INVALID_PARAMETER_1; } *ppdm = ppdev->pdmwDev; @@ -474,7 +474,7 @@ { /* No device found */ ERR("No device found!\n"); - return STATUS_UNSUCCESSFUL; + return STATUS_INVALID_PARAMETER_1; } iFoundMode = 0; @@ -571,13 +571,18 @@ _SEH2_TRY { - ProbeForWrite(lpDevMode, sizeof(DEVMODEW), 1); + ProbeForRead(lpDevMode, sizeof(DEVMODEW), 1); + + cbSize = lpDevMode->dmSize; + cbExtra = lpDevMode->dmDriverExtra; + + ProbeForWrite(lpDevMode, cbSize + cbExtra, 1); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { _SEH2_YIELD(return _SEH2_GetExceptionCode()); } - _SEH2_END + _SEH2_END; if (lpDevMode->dmSize != sizeof(DEVMODEW)) { @@ -586,31 +591,30 @@ if (pustrDevice) { - if (pustrDevice->Buffer == NULL || pustrDevice->Length == 0) - { - Status = STATUS_INVALID_PARAMETER_1; - } - /* Initialize destination string */ RtlInitEmptyUnicodeString(&ustrDevice, awcDevice, sizeof(awcDevice)); _SEH2_TRY { /* Probe the UNICODE_STRING and the buffer */ - ProbeForRead(pustrDevice, sizeof(UNICODE_STRING), 1); - ProbeForRead(pustrDevice->Buffer, pustrDevice->Length, 1); + ProbeForReadUnicodeString(pustrDevice); + + if (!pustrDevice->Length || !pustrDevice->Buffer) + ExRaiseStatus(STATUS_NO_MEMORY); + + ProbeForRead(pustrDevice->Buffer, pustrDevice->Length, sizeof(UCHAR)); /* Copy the string */ RtlCopyUnicodeString(&ustrDevice, pustrDevice); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END + _SEH2_YIELD(return STATUS_INVALID_PARAMETER_1); + } + _SEH2_END; pustrDevice = &ustrDevice; - } + } /* Acquire global USER lock */ UserEnterShared(); @@ -642,11 +646,6 @@ /* Copy some information back */ _SEH2_TRY { - ProbeForRead(lpDevMode, sizeof(DEVMODEW), 1); - cbSize = lpDevMode->dmSize; - cbExtra = lpDevMode->dmDriverExtra; - - ProbeForWrite(lpDevMode, cbSize + cbExtra, 1); /* Output what we got */ RtlCopyMemory(lpDevMode, pdm, min(cbSize, pdm->dmSize)); @@ -663,13 +662,6 @@ Status = _SEH2_GetExceptionCode(); } _SEH2_END; - } - else - { - if (Status == STATUS_UNSUCCESSFUL) - { - Status = STATUS_INVALID_PARAMETER_1; - } } return Status;

1 0

[cwittich] 72654: [KERNEL32] set ExitCode when terminating threads in ExitProcess as well
by cwittich＠svn.reactos.org 11 Sep '16

11 Sep '16

Author: cwittich Date: Sun Sep 11 13:22:33 2016 New Revision: 72654 URL: http://svn.reactos.org/svn/reactos?rev=72654&view=rev Log: [KERNEL32] set ExitCode when terminating threads in ExitProcess as well Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Sep 11 13:22:33 2016 @@ -1542,7 +1542,7 @@ RtlAcquirePebLock(); /* Kill all the threads */ - NtTerminateProcess(NULL, 0); + NtTerminateProcess(NULL, uExitCode); /* Unload all DLLs */ LdrShutdownProcess();

1 0

[cwittich] 72653: [WIN32K] add missing parameter check in NtGdiArcInternal
by cwittich＠svn.reactos.org 11 Sep '16

11 Sep '16

Author: cwittich Date: Sun Sep 11 09:01:04 2016 New Revision: 72653 URL: http://svn.reactos.org/svn/reactos?rev=72653&view=rev Log: [WIN32K] add missing parameter check in NtGdiArcInternal Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/arc.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] Sun Sep 11 09:01:04 2016 @@ -376,6 +376,12 @@ /* Yes, Windows really returns TRUE in this case */ return TRUE; } + if (arctype > GdiTypePie) + { + DC_UnlockDc(dc); + EngSetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL);

1 0

[jimtabor] 72652: [USER32] - Sync with Wine Staging 1.9.18.
by jimtabor＠svn.reactos.org 11 Sep '16

11 Sep '16

Author: jimtabor Date: Sun Sep 11 00:58:12 2016 New Revision: 72652 URL: http://svn.reactos.org/svn/reactos?rev=72652&view=rev Log: [USER32] - Sync with Wine Staging 1.9.18. Modified: trunk/reactos/win32ss/user/user32/controls/listbox.c Modified: trunk/reactos/win32ss/user/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/listbox.c [iso-8859-1] Sun Sep 11 00:58:12 2016 @@ -1069,14 +1069,10 @@ else rect.bottom = rect.top + descr->items[i].height; + /* keep the focus rect, to paint the focus item after */ if (i == descr->focus_item) - { - /* keep the focus rect, to paint the focus item after */ - focusRect.left = rect.left; - focusRect.right = rect.right; - focusRect.top = rect.top; - focusRect.bottom = rect.bottom; - } + focusRect = rect; + LISTBOX_PaintItem( descr, hdc, &rect, i, ODA_DRAWENTIRE, TRUE ); rect.top = rect.bottom;

1 0

[jimtabor] 72651: [USER32] - Sync with Wine Staging 1.9.18.
by jimtabor＠svn.reactos.org 11 Sep '16

11 Sep '16

Author: jimtabor Date: Sun Sep 11 00:58:00 2016 New Revision: 72651 URL: http://svn.reactos.org/svn/reactos?rev=72651&view=rev Log: [USER32] - Sync with Wine Staging 1.9.18. Modified: trunk/reactos/win32ss/user/user32/controls/edit.c Modified: trunk/reactos/win32ss/user/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] Sun Sep 11 00:58:00 2016 @@ -1,9 +1,9 @@ /* - * Edit control - * - * Copyright David W. Metcalfe, 1994 - * Copyright William Magro, 1995, 1996 - * Copyright Frans van Dorsselaer, 1996, 1997 + * Edit control + * + * Copyright David W. Metcalfe, 1994 + * Copyright William Magro, 1995, 1996 + * Copyright Frans van Dorsselaer, 1996, 1997 * * * This library is free software; you can redistribute it and/or @@ -2904,30 +2904,30 @@ /********************************************************************* * - * EM_SETMARGINS + * EM_SETMARGINS * * EC_USEFONTINFO is used as a left or right value i.e. lParam and not as an * action wParam despite what the docs say. EC_USEFONTINFO calculates the * margin according to the textmetrics of the current font. * - * FIXME - With TrueType or vector fonts EC_USEFONTINFO currently sets one third - * of the char's width as the margin, but this is not how Windows handles this. - * For all other fonts Windows sets the margins to zero. - * - * FIXME - When EC_USEFONTINFO is used the margins only change if the - * edit control is equal to or larger than a certain size. - * Interestingly if one subtracts both the left and right margins from - * this size one always seems to get an even number. The extents of - * the (four character) string "'**'" match this quite closely, so - * we'll use this until we come up with a better idea. - */ -static int calc_min_set_margin_size(HDC dc, INT left, INT right) -{ - static const WCHAR magic_string[] = {'\'','*','*','\'', 0}; - SIZE sz; - - GetTextExtentPointW(dc, magic_string, sizeof(magic_string)/sizeof(WCHAR) - 1, &sz); - return sz.cx + left + right; + * When EC_USEFONTINFO is used in the non_cjk case the margins only + * change if the edit control is equal to or larger than a certain + * size. Though there is an exception for the empty client rect case + * with small font sizes. + */ +static BOOL is_cjk(UINT charset) +{ + switch(charset) + { + case SHIFTJIS_CHARSET: + case HANGUL_CHARSET: + case GB2312_CHARSET: + case CHINESEBIG5_CHARSET: + return TRUE; + } + /* HANGUL_CHARSET is strange, though treated as CJK by Win 8, it is + * not by other versions including Win 10. */ + return FALSE; } static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, @@ -2941,19 +2941,25 @@ if (es->font && (left == EC_USEFONTINFO || right == EC_USEFONTINFO)) { HDC dc = GetDC(es->hwndSelf); HFONT old_font = SelectObject(dc, es->font); - GetTextMetricsW(dc, &tm); + LONG width = GdiGetCharDimensions(dc, &tm, NULL); + RECT rc; + /* The default margins are only non zero for TrueType or Vector fonts */ if (tm.tmPitchAndFamily & ( TMPF_VECTOR | TMPF_TRUETYPE )) { - int min_size; - RECT rc; - /* This must be calculated more exactly! But how? */ - default_left_margin = tm.tmAveCharWidth / 2; - default_right_margin = tm.tmAveCharWidth / 2; - min_size = calc_min_set_margin_size(dc, default_left_margin, default_right_margin); - GetClientRect(es->hwndSelf, &rc); - if (!IsRectEmpty(&rc) && (rc.right - rc.left < min_size)) { - default_left_margin = es->left_margin; - default_right_margin = es->right_margin; + if (!is_cjk(tm.tmCharSet)) { + default_left_margin = width / 2; + default_right_margin = width / 2; + + GetClientRect(es->hwndSelf, &rc); + if (rc.right - rc.left < (width / 2 + width) * 2 && + (width >= 28 || !IsRectEmpty(&rc)) ) { + default_left_margin = es->left_margin; + default_right_margin = es->right_margin; + } + } else { + /* FIXME: figure out the CJK values. They are not affected by the client rect. */ + default_left_margin = width / 2; + default_right_margin = width / 2; } } SelectObject(dc, old_font);

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2016