Ros-diffs December 2016

ros-diffs@reactos.org

10 participants
83 discussions

[mjansen] 73473: [KERNEL32] Re-enable Safer and AppCompat checks in CreateProcessInternalW. CORE-12585

by mjansen＠svn.reactos.org

Author: mjansen Date: Tue Dec 20 19:51:44 2016 New Revision: 73473 URL: http://svn.reactos.org/svn/reactos?rev=73473&view=rev Log: [KERNEL32] Re-enable Safer and AppCompat checks in CreateProcessInternalW. CORE-12585 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] Tue Dec 20 19:51:44 2016 @@ -2313,7 +2313,7 @@ HANDLE FileHandle, SectionHandle, ProcessHandle; ULONG ResumeCount; PROCESS_PRIORITY_CLASS PriorityClass; - NTSTATUS Status, Status1, ImageDbgStatus; + NTSTATUS Status, AppCompatStatus, SaferStatus, IFEOStatus, ImageDbgStatus; PPEB Peb, RemotePeb; PTEB Teb; INITIAL_TEB InitialTeb; @@ -2386,7 +2386,7 @@ /* Zero out the initial core variables and handles */ QuerySection = FALSE; InJob = FALSE; - SkipSaferAndAppCompat = TRUE; // HACK for making .bat/.cmd launch working again. + SkipSaferAndAppCompat = FALSE; ParameterFlags = 0; Flags = 0; DebugHandle = NULL; @@ -3051,12 +3051,12 @@ if (QuerySection) { /* Nothing to do */ - Status = STATUS_SUCCESS; + AppCompatStatus = STATUS_SUCCESS; } else { /* Get some information about the executable */ - Status = NtQuerySection(SectionHandle, + AppCompatStatus = NtQuerySection(SectionHandle, SectionImageInformation, &ImageInformation, sizeof(ImageInformation), @@ -3064,7 +3064,7 @@ } /* Do we have section information now? */ - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(AppCompatStatus)) { /* Don't ask for it again, save the machine type */ QuerySection = TRUE; @@ -3073,7 +3073,7 @@ } /* Is there a reason/Shim we shouldn't run this application? */ - Status = BasepCheckBadapp(FileHandle, + AppCompatStatus = BasepCheckBadapp(FileHandle, FreeBuffer, lpEnvironment, ImageMachine, @@ -3082,11 +3082,11 @@ &AppCompatSxsData, &AppCompatSxsDataSize, &FusionFlags); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(AppCompatStatus)) { /* This is usually the status we get back */ - DPRINT1("App compat launch failure: %lx\n", Status); - if (Status == STATUS_ACCESS_DENIED) + DPRINT1("App compat launch failure: %lx\n", AppCompatStatus); + if (AppCompatStatus == STATUS_ACCESS_DENIED) { /* Convert it to something more Win32-specific */ SetLastError(ERROR_CANCELLED); @@ -3094,7 +3094,7 @@ else { /* Some other error */ - BaseSetLastNTError(Status); + BaseSetLastNTError(AppCompatStatus); } /* Did we have a section? */ @@ -3148,13 +3148,13 @@ if (SaferNeeded) { /* We have to call into the WinSafer library and actually check */ - Status = BasepCheckWinSaferRestrictions(hUserToken, + SaferStatus = BasepCheckWinSaferRestrictions(hUserToken, (LPWSTR)lpApplicationName, FileHandle, &InJob, &TokenHandle, &JobHandle); - if (Status == 0xFFFFFFFF) + if (SaferStatus == 0xFFFFFFFF) { /* Back in 2003, they didn't have an NTSTATUS for this... */ DPRINT1("WinSafer blocking process launch\n"); @@ -3164,10 +3164,10 @@ } /* Other status codes are not-Safer related, just convert them */ - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(SaferStatus)) { - DPRINT1("Error checking WinSafer: %lx\n", Status); - BaseSetLastNTError(Status); + DPRINT1("Error checking WinSafer: %lx\n", SaferStatus); + BaseSetLastNTError(SaferStatus); Result = FALSE; goto Quickie; } @@ -3576,7 +3576,7 @@ goto Quickie; } - /* Don't let callers pass in this flag -- we'll only get it from IFRO */ + /* Don't let callers pass in this flag -- we'll only get it from IFEO */ Flags &= ~PROCESS_CREATE_FLAGS_LARGE_PAGES; /* Clear the IFEO-missing flag, before we know for sure... */ @@ -3587,11 +3587,11 @@ (NtCurrentPeb()->ReadImageFileExecOptions)) { /* Let's do this! Attempt to open IFEO */ - Status1 = LdrOpenImageFileOptionsKey(&PathName, 0, &KeyHandle); - if (!NT_SUCCESS(Status1)) + IFEOStatus = LdrOpenImageFileOptionsKey(&PathName, 0, &KeyHandle); + if (!NT_SUCCESS(IFEOStatus)) { /* We failed, set the flag so we store this in the parameters */ - if (Status1 == STATUS_OBJECT_NAME_NOT_FOUND) ParameterFlags |= 2; + if (IFEOStatus == STATUS_OBJECT_NAME_NOT_FOUND) ParameterFlags |= 2; } else { @@ -3605,8 +3605,8 @@ if (!DebuggerCmdLine) { /* Close IFEO on failure */ - Status1 = NtClose(KeyHandle); - ASSERT(NT_SUCCESS(Status1)); + IFEOStatus = NtClose(KeyHandle); + ASSERT(NT_SUCCESS(IFEOStatus)); /* Fail the call */ SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -3616,13 +3616,13 @@ } /* Now query for the debugger */ - Status1 = LdrQueryImageFileKeyOption(KeyHandle, + IFEOStatus = LdrQueryImageFileKeyOption(KeyHandle, L"Debugger", REG_SZ, DebuggerCmdLine, MAX_PATH * sizeof(WCHAR), &ResultSize); - if (!(NT_SUCCESS(Status1)) || + if (!(NT_SUCCESS(IFEOStatus)) || (ResultSize < sizeof(WCHAR)) || (DebuggerCmdLine[0] == UNICODE_NULL)) { @@ -3632,21 +3632,21 @@ } /* Also query if we should map with large pages */ - Status1 = LdrQueryImageFileKeyOption(KeyHandle, + IFEOStatus = LdrQueryImageFileKeyOption(KeyHandle, L"UseLargePages", REG_DWORD, &UseLargePages, sizeof(UseLargePages), NULL); - if ((NT_SUCCESS(Status1)) && (UseLargePages)) + if ((NT_SUCCESS(IFEOStatus)) && (UseLargePages)) { /* Do it! This is the only way this flag can be set */ Flags |= PROCESS_CREATE_FLAGS_LARGE_PAGES; } /* We're done with IFEO, can close it now */ - Status1 = NtClose(KeyHandle); - ASSERT(NT_SUCCESS(Status1)); + IFEOStatus = NtClose(KeyHandle); + ASSERT(NT_SUCCESS(IFEOStatus)); } }

8 years

[jimtabor] 73472: [NtGDI] - Quick Hax to fix gray font anti-aliasing rendering, see CORE-7721.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Dec 19 20:13:17 2016 New Revision: 73472 URL: http://svn.reactos.org/svn/reactos?rev=73472&view=rev Log: [NtGDI] - Quick Hax to fix gray font anti-aliasing rendering, see CORE-7721. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Mon Dec 19 20:13:17 2016 @@ -494,6 +494,7 @@ { switch (logfont->lfQuality) { + case ANTIALIASED_QUALITY: case NONANTIALIASED_QUALITY: return FT_RENDER_MODE_MONO; case DRAFT_QUALITY:

8 years

[jimtabor] 73471: [User32] - Patch by Katayama Hirofumi MZ : DrawFrameControl draws bad, correct centering while drawing radio buttons. See CORE-12573.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Dec 19 16:41:32 2016 New Revision: 73471 URL: http://svn.reactos.org/svn/reactos?rev=73471&view=rev Log: [User32] - Patch by Katayama Hirofumi MZ : DrawFrameControl draws bad, correct centering while drawing radio buttons. See CORE-12573. Modified: trunk/reactos/win32ss/user/user32/windows/draw.c Modified: trunk/reactos/win32ss/user/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] Mon Dec 19 16:41:32 2016 @@ -663,8 +663,15 @@ HFONT hFont, hOldFont; int i; TCHAR OutRight, OutLeft, InRight, InLeft, Center; + INT X, Y, Width, Height, Shorter; INT BkMode = GetBkMode(dc); COLORREF TextColor = GetTextColor(dc); + + Width = r->right - r->left; + Height = r->bottom - r->top; + Shorter = (Width < Height) ? Width : Height; + X = r->left + (Width - Shorter) / 2; + Y = r->top + (Height - Shorter) / 2; if (Radio) { @@ -684,7 +691,7 @@ } ZeroMemory(&lf, sizeof(LOGFONTW)); - lf.lfHeight = r->top - r->bottom; + lf.lfHeight = Shorter; lf.lfCharSet = DEFAULT_CHARSET; lstrcpy(lf.lfFaceName, TEXT("Marlett")); if (Radio && ((uFlags & 0xFF) == DFCS_BUTTONRADIOMASK)) @@ -697,11 +704,12 @@ if (Radio && ((uFlags & 0xFF) == DFCS_BUTTONRADIOMASK)) { #if 1 + // FIXME: improve font rendering RECT Rect; HGDIOBJ hbrOld, hpenOld; FillRect(dc, r, (HBRUSH)GetStockObject(WHITE_BRUSH)); - Rect = *r; - InflateRect(&Rect, -1, -1); + SetRect(&Rect, X, Y, X + Shorter, Y + Shorter); + InflateRect(&Rect, -(Shorter * 8) / 54, -(Shorter * 8) / 54); hbrOld = SelectObject(dc, GetStockObject(BLACK_BRUSH)); hpenOld = SelectObject(dc, GetStockObject(NULL_PEN)); Ellipse(dc, Rect.left, Rect.top, Rect.right, Rect.bottom); @@ -711,12 +719,12 @@ SetBkMode(dc, OPAQUE); SetBkColor(dc, RGB(255, 255, 255)); SetTextColor(dc, RGB(0, 0, 0)); - TextOut(dc, r->left, r->top, &Center, 1); + TextOut(dc, X, Y, &Center, 1); SetBkMode(dc, TRANSPARENT); - TextOut(dc, r->left, r->top, &OutRight, 1); - TextOut(dc, r->left, r->top, &OutLeft, 1); - TextOut(dc, r->left, r->top, &InRight, 1); - TextOut(dc, r->left, r->top, &InLeft, 1); + TextOut(dc, X, Y, &OutRight, 1); + TextOut(dc, X, Y, &OutLeft, 1); + TextOut(dc, X, Y, &InRight, 1); + TextOut(dc, X, Y, &InLeft, 1); #endif } else @@ -729,26 +737,26 @@ else i = COLOR_WINDOW; SetTextColor(dc, GetSysColor(i)); - TextOut(dc, r->left, r->top, &Center, 1); + TextOut(dc, X, Y, &Center, 1); if (uFlags & (DFCS_FLAT | DFCS_MONO)) { SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); - TextOut(dc, r->left, r->top, &OutRight, 1); - TextOut(dc, r->left, r->top, &OutLeft, 1); - TextOut(dc, r->left, r->top, &InRight, 1); - TextOut(dc, r->left, r->top, &InLeft, 1); + TextOut(dc, X, Y, &OutRight, 1); + TextOut(dc, X, Y, &OutLeft, 1); + TextOut(dc, X, Y, &InRight, 1); + TextOut(dc, X, Y, &InLeft, 1); } else { SetTextColor(dc, GetSysColor(COLOR_BTNSHADOW)); - TextOut(dc, r->left, r->top, &OutRight, 1); + TextOut(dc, X, Y, &OutRight, 1); SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT)); - TextOut(dc, r->left, r->top, &OutLeft, 1); + TextOut(dc, X, Y, &OutLeft, 1); SetTextColor(dc, GetSysColor(COLOR_3DDKSHADOW)); - TextOut(dc, r->left, r->top, &InRight, 1); + TextOut(dc, X, Y, &InRight, 1); SetTextColor(dc, GetSysColor(COLOR_3DLIGHT)); - TextOut(dc, r->left, r->top, &InLeft, 1); + TextOut(dc, X, Y, &InLeft, 1); } if (uFlags & DFCS_CHECKED) @@ -756,7 +764,7 @@ TCHAR Check = (Radio) ? 'i' : 'b'; SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); - TextOut(dc, r->left, r->top, &Check, 1); + TextOut(dc, X, Y, &Check, 1); } }

8 years

[jimtabor] 73470: [User32] - Patch by Roman Pi?l : Fix buffer overflow in EDIT_EM_ReplaceSel().

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Dec 19 16:37:44 2016 New Revision: 73470 URL: http://svn.reactos.org/svn/reactos?rev=73470&view=rev Log: [User32] - Patch by Roman Pi?l : Fix buffer overflow in EDIT_EM_ReplaceSel(). 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] Mon Dec 19 16:37:44 2016 @@ -2644,7 +2644,7 @@ if (es->buffer_limit < (tl - (e-s))) strl = 0; else - strl = es->buffer_limit - (tl - (e-s)); + strl = min(strl, es->buffer_limit - (tl - (e-s))); } if (!EDIT_MakeFit(es, tl - (e - s) + strl))

8 years

[jimtabor] 73469: [User32] - Patch by Andrey Gusev : Add support for WS_EX_RIGHT style.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Dec 19 16:36:12 2016 New Revision: 73469 URL: http://svn.reactos.org/svn/reactos?rev=73469&view=rev Log: [User32] - Patch by Andrey Gusev : Add support for WS_EX_RIGHT style. Modified: trunk/reactos/win32ss/user/user32/controls/button.c Modified: trunk/reactos/win32ss/user/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] Mon Dec 19 16:36:12 2016 @@ -1029,6 +1029,7 @@ HFONT hFont; LONG state = get_button_state( hwnd ); LONG style = GetWindowLongPtrW( hwnd, GWL_STYLE ); + LONG ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); HWND parent; HRGN hrgn; @@ -1061,7 +1062,7 @@ #endif hrgn = set_control_clipping( hDC, &client ); - if (style & BS_LEFTTEXT) + if (style & BS_LEFTTEXT || ex_style & WS_EX_RIGHT) { /* magic +4 is what CTL3D expects */

8 years

[jimtabor] 73468: [User32_API] - Patch by Katayama Hirofumi MZ : Add a test for Next Dialog Item for radio buttons.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Dec 19 16:28:42 2016 New Revision: 73468 URL: http://svn.reactos.org/svn/reactos?rev=73468&view=rev Log: [User32_API] - Patch by Katayama Hirofumi MZ : Add a test for Next Dialog Item for radio buttons. Added: trunk/rostests/apitests/user32/NextDlgItem.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/testlist.c trunk/rostests/apitests/user32/user32_apitest.rc 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] Mon Dec 19 16:28:42 2016 @@ -20,6 +20,7 @@ InitializeLpkHooks.c LoadImage.c LookupIconIdFromDirectoryEx.c + NextDlgItem.c RealGetWindowClass.c RegisterHotKey.c ScrollDC.c Added: trunk/rostests/apitests/user32/NextDlgItem.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/NextDlgIt… ============================================================================== --- trunk/rostests/apitests/user32/NextDlgItem.c (added) +++ trunk/rostests/apitests/user32/NextDlgItem.c [iso-8859-1] Mon Dec 19 16:28:42 2016 @@ -0,0 +1,421 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for GetNextDlgTabItem, GetNextDlgGroupItem + * PROGRAMMERS: Katayama Hirofumi MZ + */ + +#include <stdarg.h> +#include <stdio.h> +#include <apitest.h> + +#include <wingdi.h> +#include <winuser.h> +#include <windowsx.h> +#include <dlgs.h> + +#define IDC_TEST1 1 +#define IDC_TEST2 2 +#define IDC_TEST3 3 +#define IDC_END 9 + +static BOOL +OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam) +{ + PostMessage(hwnd, WM_COMMAND, MAKEWPARAM(IDC_TEST1, 0), 0); + return TRUE; +} + +static const char * +GetNameFromID(INT ID) +{ + switch (ID) + { + case rad1: return "rad1"; + case rad2: return "rad2"; + case rad3: return "rad3"; + case psh1: return "psh1"; + case rad5: return "rad5"; + case rad6: return "rad6"; + case rad7: return "rad7"; + case IDOK: return "OK button"; + case IDCANCEL: return "Cancel button"; + default: return "(unknown)"; + } +} + +static const char * +GetNameFromHWND(HWND hwnd) +{ + return GetNameFromID(GetDlgCtrlID(hwnd)); +} + +static void +DoTest1(HWND hwnd) +{ + HWND hCtrl; + HWND hRad1, hRad2, hRad3, hPsh1, hRad5, hRad6, hRad7, hOK, hCancel; + + // check control IDs + hCtrl = GetDlgItem(hwnd, rad1); + ok(GetDlgCtrlID(hCtrl) == rad1, "\n"); + hCtrl = GetDlgItem(hwnd, rad2); + ok(GetDlgCtrlID(hCtrl) == rad2, "\n"); + hCtrl = GetDlgItem(hwnd, rad3); + ok(GetDlgCtrlID(hCtrl) == rad3, "\n"); + hCtrl = GetDlgItem(hwnd, psh1); + ok(GetDlgCtrlID(hCtrl) == psh1, "\n"); + hCtrl = GetDlgItem(hwnd, rad5); + ok(GetDlgCtrlID(hCtrl) == rad5, "\n"); + hCtrl = GetDlgItem(hwnd, rad6); + ok(GetDlgCtrlID(hCtrl) == rad6, "\n"); + hCtrl = GetDlgItem(hwnd, rad7); + ok(GetDlgCtrlID(hCtrl) == rad7, "\n"); + hCtrl = GetDlgItem(hwnd, IDOK); + ok(GetDlgCtrlID(hCtrl) == IDOK, "\n"); + hCtrl = GetDlgItem(hwnd, IDCANCEL); + ok(GetDlgCtrlID(hCtrl) == IDCANCEL, "\n"); + + // get dialog items + hRad1 = GetDlgItem(hwnd, rad1); + hRad2 = GetDlgItem(hwnd, rad2); + hRad3 = GetDlgItem(hwnd, rad3); + hPsh1 = GetDlgItem(hwnd, psh1); + hRad5 = GetDlgItem(hwnd, rad5); + hRad6 = GetDlgItem(hwnd, rad6); + hRad7 = GetDlgItem(hwnd, rad7); + hOK = GetDlgItem(hwnd, IDOK); + hCancel = GetDlgItem(hwnd, IDCANCEL); + + // next + hCtrl = GetNextDlgTabItem(hwnd, hRad1, FALSE); + ok(hCtrl == hRad2, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad2, FALSE); + ok(hCtrl == hRad3, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad3, FALSE); + ok(hCtrl == hPsh1, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hPsh1, FALSE); + ok(hCtrl == hRad5, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad5, FALSE); + ok(hCtrl == hRad6, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad6, FALSE); + ok(hCtrl == hRad7, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad7, FALSE); + ok(hCtrl == hOK, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hOK, FALSE); + ok(hCtrl == hCancel, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hCancel, FALSE); + ok(hCtrl == hRad1, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + + // prev + hCtrl = GetNextDlgTabItem(hwnd, hRad1, TRUE); + ok(hCtrl == hCancel, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad2, TRUE); + ok(hCtrl == hRad1, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad3, TRUE); + ok(hCtrl == hRad2, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hPsh1, TRUE); + ok(hCtrl == hRad3, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad5, TRUE); + ok(hCtrl == hPsh1, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad6, TRUE); + ok(hCtrl == hRad5, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad7, TRUE); + ok(hCtrl == hRad6, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hOK, TRUE); + ok(hCtrl == hRad7, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hCancel, TRUE); + ok(hCtrl == hOK, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + + // hide + ok(ShowWindow(hRad3, SW_HIDE) != 0, "\n"); + ok(ShowWindow(hRad6, SW_HIDE) != 0, "\n"); + + // next with hidden + hCtrl = GetNextDlgTabItem(hwnd, hRad1, FALSE); + ok(hCtrl == hRad2, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad2, FALSE); + ok(hCtrl == hPsh1, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hPsh1, FALSE); + ok(hCtrl == hRad5, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad5, FALSE); + ok(hCtrl == hRad7, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad7, FALSE); + ok(hCtrl == hOK, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hOK, FALSE); + ok(hCtrl == hCancel, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hCancel, FALSE); + ok(hCtrl == hRad1, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + + // prev with hidden + hCtrl = GetNextDlgTabItem(hwnd, hRad1, TRUE); + ok(hCtrl == hCancel, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad2, TRUE); + ok(hCtrl == hRad1, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hPsh1, TRUE); + ok(hCtrl == hRad2, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad5, TRUE); + ok(hCtrl == hPsh1, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad7, TRUE); + ok(hCtrl == hRad5, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hOK, TRUE); + ok(hCtrl == hRad7, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hCancel, TRUE); + ok(hCtrl == hOK, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + + // show + ShowWindow(hRad3, SW_SHOWNOACTIVATE); + ShowWindow(hRad6, SW_SHOWNOACTIVATE); + + // next again + hCtrl = GetNextDlgTabItem(hwnd, hRad1, FALSE); + ok(hCtrl == hRad2, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad2, FALSE); + ok(hCtrl == hRad3, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad3, FALSE); + ok(hCtrl == hPsh1, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hPsh1, FALSE); + ok(hCtrl == hRad5, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad5, FALSE); + ok(hCtrl == hRad6, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad6, FALSE); + ok(hCtrl == hRad7, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad7, FALSE); + ok(hCtrl == hOK, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hOK, FALSE); + ok(hCtrl == hCancel, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hCancel, FALSE); + ok(hCtrl == hRad1, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + + // prev again + hCtrl = GetNextDlgTabItem(hwnd, hRad1, TRUE); + ok(hCtrl == hCancel, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad2, TRUE); + ok(hCtrl == hRad1, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad3, TRUE); + ok(hCtrl == hRad2, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hPsh1, TRUE); + ok(hCtrl == hRad3, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad5, TRUE); + ok(hCtrl == hPsh1, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad6, TRUE); + ok(hCtrl == hRad5, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hRad7, TRUE); + ok(hCtrl == hRad6, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hOK, TRUE); + ok(hCtrl == hRad7, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgTabItem(hwnd, hCancel, TRUE); + ok(hCtrl == hOK, "hCtrl was %s\n", GetNameFromHWND(hCtrl)); +} + +static void +DoTest2(HWND hwnd) +{ + HWND hCtrl; + HWND hRad1, hRad2, hRad3, hPsh1, hRad5, hRad6, hRad7, hOK, hCancel; + + // check control IDs + hCtrl = GetDlgItem(hwnd, rad1); + ok(GetDlgCtrlID(hCtrl) == rad1, "\n"); + hCtrl = GetDlgItem(hwnd, rad2); + ok(GetDlgCtrlID(hCtrl) == rad2, "\n"); + hCtrl = GetDlgItem(hwnd, rad3); + ok(GetDlgCtrlID(hCtrl) == rad3, "\n"); + hCtrl = GetDlgItem(hwnd, psh1); + ok(GetDlgCtrlID(hCtrl) == psh1, "\n"); + hCtrl = GetDlgItem(hwnd, rad5); + ok(GetDlgCtrlID(hCtrl) == rad5, "\n"); + hCtrl = GetDlgItem(hwnd, rad6); + ok(GetDlgCtrlID(hCtrl) == rad6, "\n"); + hCtrl = GetDlgItem(hwnd, rad7); + ok(GetDlgCtrlID(hCtrl) == rad7, "\n"); + hCtrl = GetDlgItem(hwnd, IDOK); + ok(GetDlgCtrlID(hCtrl) == IDOK, "\n"); + hCtrl = GetDlgItem(hwnd, IDCANCEL); + ok(GetDlgCtrlID(hCtrl) == IDCANCEL, "\n"); + + // get dialog items + hRad1 = GetDlgItem(hwnd, rad1); + hRad2 = GetDlgItem(hwnd, rad2); + hRad3 = GetDlgItem(hwnd, rad3); + hPsh1 = GetDlgItem(hwnd, psh1); + hRad5 = GetDlgItem(hwnd, rad5); + hRad6 = GetDlgItem(hwnd, rad6); + hRad7 = GetDlgItem(hwnd, rad7); + hOK = GetDlgItem(hwnd, IDOK); + hCancel = GetDlgItem(hwnd, IDCANCEL); + + // group next + hCtrl = GetNextDlgGroupItem(hwnd, hRad1, FALSE); + ok(hCtrl == hRad2, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hRad2, FALSE); + ok(hCtrl == hRad3, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hRad3, FALSE); + ok(hCtrl == hPsh1, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hPsh1, FALSE); + ok(hCtrl == hRad5, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hRad5, FALSE); + ok(hCtrl == hRad6, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hRad6, FALSE); + ok(hCtrl == hRad7, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hRad7, FALSE); + ok(hCtrl == hOK, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hOK, FALSE); + ok(hCtrl == hCancel, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hCancel, FALSE); + ok(hCtrl == hRad1, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + + // group prev + hCtrl = GetNextDlgGroupItem(hwnd, hRad1, TRUE); + ok(hCtrl == hCancel, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hRad2, TRUE); + ok(hCtrl == hRad1, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hRad3, TRUE); + ok(hCtrl == hRad2, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hPsh1, TRUE); + ok(hCtrl == hRad3, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hRad5, TRUE); + ok(hCtrl == hPsh1, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hRad6, TRUE); + ok(hCtrl == hRad5, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hRad7, TRUE); + ok(hCtrl == hRad6, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hOK, TRUE); + ok(hCtrl == hRad7, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hCancel, TRUE); + ok(hCtrl == hOK, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + + // hide + ok(ShowWindow(hRad3, SW_HIDE) != 0, "\n"); + ok(ShowWindow(hRad6, SW_HIDE) != 0, "\n"); + + // group next with hidden + hCtrl = GetNextDlgGroupItem(hwnd, hRad1, FALSE); + ok(hCtrl == hRad2, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hRad2, FALSE); + ok(hCtrl == hPsh1, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hPsh1, FALSE); + ok(hCtrl == hRad5, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hRad5, FALSE); + ok(hCtrl == hRad7, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hRad7, FALSE); + ok(hCtrl == hOK, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hOK, FALSE); + ok(hCtrl == hCancel, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hCancel, FALSE); + ok(hCtrl == hRad1, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + + // group prev with hidden + hCtrl = GetNextDlgGroupItem(hwnd, hRad1, TRUE); + ok(hCtrl == hCancel, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hRad2, TRUE); + ok(hCtrl == hRad1, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hPsh1, TRUE); + ok(hCtrl == hRad2, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hRad5, TRUE); + ok(hCtrl == hPsh1, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hRad7, TRUE); + ok(hCtrl == hRad5, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hOK, TRUE); + ok(hCtrl == hRad7, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + hCtrl = GetNextDlgGroupItem(hwnd, hCancel, TRUE); + ok(hCtrl == hOK, "hCtrl is %s\n", GetNameFromHWND(hCtrl)); + + // show + ShowWindow(hRad3, SW_SHOWNOACTIVATE); + ShowWindow(hRad6, SW_SHOWNOACTIVATE); +} + +static POINT +GetCtrlCenter(HWND hCtrl) +{ + RECT rc; + POINT pt; + + GetClientRect(hCtrl, &rc); + pt.x = (rc.left + rc.right) / 2; + pt.y = (rc.top + rc.bottom) / 2; + return pt; +} + +static void +DoTest3(HWND hwnd) +{ + HWND hCtrl; + POINT pt; + + CheckDlgButton(hwnd, rad1, BST_CHECKED); + CheckDlgButton(hwnd, rad5, BST_CHECKED); + + ok(IsDlgButtonChecked(hwnd, rad1) == BST_CHECKED, "\n"); + ok(IsDlgButtonChecked(hwnd, rad2) == BST_UNCHECKED, "\n"); + ok(IsDlgButtonChecked(hwnd, rad3) == BST_UNCHECKED, "\n"); + ok(IsDlgButtonChecked(hwnd, rad5) == BST_CHECKED, "\n"); + ok(IsDlgButtonChecked(hwnd, rad6) == BST_UNCHECKED, "\n"); + ok(IsDlgButtonChecked(hwnd, rad7) == BST_UNCHECKED, "\n"); + + hCtrl = GetDlgItem(hwnd, rad1); + pt = GetCtrlCenter(hCtrl); + SendMessage(hCtrl, WM_LBUTTONDOWN, MK_LBUTTON, MAKELPARAM(pt.x, pt.y)); + SendMessage(hCtrl, WM_LBUTTONUP, MK_LBUTTON, MAKELPARAM(pt.x, pt.y)); + + ok(IsDlgButtonChecked(hwnd, rad1) == BST_CHECKED, "\n"); + ok(IsDlgButtonChecked(hwnd, rad2) == BST_UNCHECKED, "\n"); + ok(IsDlgButtonChecked(hwnd, rad3) == BST_UNCHECKED, "\n"); + ok(IsDlgButtonChecked(hwnd, rad5) == BST_UNCHECKED, "\n"); + ok(IsDlgButtonChecked(hwnd, rad6) == BST_UNCHECKED, "\n"); + ok(IsDlgButtonChecked(hwnd, rad7) == BST_UNCHECKED, "\n"); + + hCtrl = GetDlgItem(hwnd, rad5); + pt = GetCtrlCenter(hCtrl); + SendMessage(hCtrl, WM_LBUTTONDOWN, MK_LBUTTON, MAKELPARAM(pt.x, pt.y)); + SendMessage(hCtrl, WM_LBUTTONUP, MK_LBUTTON, MAKELPARAM(pt.x, pt.y)); + + ok(IsDlgButtonChecked(hwnd, rad1) == BST_UNCHECKED, "\n"); + ok(IsDlgButtonChecked(hwnd, rad2) == BST_UNCHECKED, "\n"); + ok(IsDlgButtonChecked(hwnd, rad3) == BST_UNCHECKED, "\n"); + ok(IsDlgButtonChecked(hwnd, rad5) == BST_CHECKED, "\n"); + ok(IsDlgButtonChecked(hwnd, rad6) == BST_UNCHECKED, "\n"); + ok(IsDlgButtonChecked(hwnd, rad7) == BST_UNCHECKED, "\n"); +} + +static void +OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) +{ + switch (id) + { + case IDC_TEST1: + DoTest1(hwnd); + PostMessage(hwnd, WM_COMMAND, MAKEWPARAM(IDC_TEST2, 0), 0); + break; + case IDC_TEST2: + DoTest2(hwnd); + PostMessage(hwnd, WM_COMMAND, MAKEWPARAM(IDC_TEST3, 0), 0); + break; + case IDC_TEST3: + DoTest3(hwnd); + PostMessage(hwnd, WM_COMMAND, MAKEWPARAM(IDC_END, 0), 0); + break; + case IDC_END: + EndDialog(hwnd, IDOK); + break; + } +} + +INT_PTR CALLBACK +RadioButtonDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + HANDLE_MSG(hwnd, WM_INITDIALOG, OnInitDialog); + HANDLE_MSG(hwnd, WM_COMMAND, OnCommand); + } + return 0; +} + +START_TEST(NextDlgItem) +{ + HMODULE hMod = GetModuleHandle(NULL); + ok(hMod != NULL, "\n"); + DialogBox(hMod, TEXT("NEXTDLGITEM"), NULL, RadioButtonDialogProc); +} Propchange: trunk/rostests/apitests/user32/NextDlgItem.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/apitests/user32/NextDlgItem.c ------------------------------------------------------------------------------ svn:mime-type = text/plain 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] Mon Dec 19 16:28:42 2016 @@ -22,6 +22,7 @@ extern void func_InitializeLpkHooks(void); extern void func_LoadImage(void); extern void func_LookupIconIdFromDirectoryEx(void); +extern void func_NextDlgItem(void); extern void func_RealGetWindowClass(void); extern void func_RegisterHotKey(void); extern void func_ScrollDC(void); @@ -58,6 +59,7 @@ { "InitializeLpkHooks", func_InitializeLpkHooks }, { "LoadImage", func_LoadImage }, { "LookupIconIdFromDirectoryEx", func_LookupIconIdFromDirectoryEx }, + { "NextDlgItem", func_NextDlgItem }, { "RealGetWindowClass", func_RealGetWindowClass }, { "RegisterHotKey", func_RegisterHotKey }, { "ScrollDC", func_ScrollDC }, Modified: trunk/rostests/apitests/user32/user32_apitest.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/user32_ap… ============================================================================== --- trunk/rostests/apitests/user32/user32_apitest.rc [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/user32_apitest.rc [iso-8859-1] Mon Dec 19 16:28:42 2016 @@ -1,4 +1,6 @@ #include <windef.h> +#include <winuser.h> +#include <dlgs.h> #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -13,3 +15,19 @@ { PUSHBUTTON "a button", 1, 5,5, 100,20 } + +NEXTDLGITEM DIALOG 0, 0, 281, 135 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "NextDlgItem" +FONT 8, "MS Shell Dlg" +{ + CONTROL "rad1", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 60, 14 + CONTROL "rad2", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 50, 60, 14 + CONTROL "rad3", rad3, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 60, 14 + CONTROL "psh1", psh1, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 93, 60, 60, 14 + CONTROL "rad5", rad5, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 160, 30, 60, 14 + CONTROL "rad6", rad6, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 160, 50, 60, 14 + CONTROL "rad7", rad7, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 160, 70, 60, 14 + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 65, 98, 60, 14 + CONTROL "Cancel", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 187, 100, 60, 14 +}

8 years

[akhaldi] 73467: [RPCRT4] Properly stub RpcMgmtInqServerPrincName{A, W}. Tested by Jared Smudde. CORE-12465

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 18 20:04:19 2016 New Revision: 73467 URL: http://svn.reactos.org/svn/reactos?rev=73467&view=rev Log: [RPCRT4] Properly stub RpcMgmtInqServerPrincName{A,W}. Tested by Jared Smudde. CORE-12465 Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.sp… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec [iso-8859-1] Sun Dec 18 20:04:19 2016 @@ -392,8 +392,8 @@ 392 stub RpcMgmtInqComTimeout 393 stub RpcMgmtInqDefaultProtectLevel 394 stdcall RpcMgmtInqIfIds(ptr ptr) -395 stub RpcMgmtInqServerPrincNameA -396 stub RpcMgmtInqServerPrincNameW +395 stdcall -stub RpcMgmtInqServerPrincNameA(ptr long ptr) +396 stdcall -stub RpcMgmtInqServerPrincNameW(ptr long ptr) 397 stdcall RpcMgmtInqStats(ptr ptr) 398 stdcall RpcMgmtIsServerListening(ptr) 399 stdcall RpcMgmtSetAuthorizationFn(ptr)

8 years

[akhaldi] 73466: [INCLUDE] Fix a WIN32_WINNT => _WIN32_WINNT typo in some comments. Spotted by Serge Gautherie. CORE-12580

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 18 17:57:51 2016 New Revision: 73466 URL: http://svn.reactos.org/svn/reactos?rev=73466&view=rev Log: [INCLUDE] Fix a WIN32_WINNT => _WIN32_WINNT typo in some comments. Spotted by Serge Gautherie. CORE-12580 Modified: trunk/reactos/sdk/include/psdk/reason.h trunk/reactos/sdk/include/psdk/sdkddkver.h trunk/reactos/sdk/include/reactos/idl/pnp.idl trunk/reactos/sdk/include/xdk/winnt_old.h Modified: trunk/reactos/sdk/include/psdk/reason.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/reason.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/reason.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/reason.h [iso-8859-1] Sun Dec 18 17:57:51 2016 @@ -43,6 +43,6 @@ #define SHTDN_REASON_FLAG_USER_DEFINED 0x40000000 #define SHTDN_REASON_FLAG_PLANNED 0x80000000 -#endif /* WIN32_WINNT >= 0x0501 */ +#endif /* _WIN32_WINNT >= 0x0501 */ #endif /* _REASON_H */ Modified: trunk/reactos/sdk/include/psdk/sdkddkver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/sdkddkver… ============================================================================== --- trunk/reactos/sdk/include/psdk/sdkddkver.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/sdkddkver.h [iso-8859-1] Sun Dec 18 17:57:51 2016 @@ -128,7 +128,7 @@ #define NTDDI_VERSION_FROM_WIN32_WINNT2(Version) Version##0000 #define NTDDI_VERSION_FROM_WIN32_WINNT(Version) NTDDI_VERSION_FROM_WIN32_WINNT2(Version) -/* Select Default WIN32_WINNT Value */ +/* Select Default _WIN32_WINNT Value */ #if !defined(_WIN32_WINNT) && !defined(_CHICAGO_) #define _WIN32_WINNT 0x0600 #endif Modified: trunk/reactos/sdk/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/idl/pn… ============================================================================== --- trunk/reactos/sdk/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/idl/pnp.idl [iso-8859-1] Sun Dec 18 17:57:51 2016 @@ -925,6 +925,6 @@ [out] DWORD *pulSSDIFlags, [in] DWORD ulFlags); -cpp_quote("#endif /* WIN32_WINNT >= 0x0501 */") +cpp_quote("#endif /* _WIN32_WINNT >= 0x0501 */") } Modified: trunk/reactos/sdk/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/xdk/winnt_old.… ============================================================================== --- trunk/reactos/sdk/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/xdk/winnt_old.h [iso-8859-1] Sun Dec 18 17:57:51 2016 @@ -3805,7 +3805,7 @@ PowerInformationLevelMaximum } POWER_INFORMATION_LEVEL; -#if 1 /* (WIN32_WINNT >= 0x0500) */ +#if 1 /* (_WIN32_WINNT >= 0x0500) */ typedef struct _SYSTEM_POWER_INFORMATION { ULONG MaxIdlenessAllowed; ULONG Idleness; @@ -3899,7 +3899,7 @@ #define ACTIVATION_CONTEXT_SECTION_GLOBAL_OBJECT_RENAME_TABLE 8 #define ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES 9 -#endif /* (WIN32_WINNT >= 0x0501) */ +#endif /* (_WIN32_WINNT >= 0x0501) */ typedef struct _PROCESSOR_POWER_POLICY_INFO { DWORD TimeCheck;

8 years

[mjansen] 73465: [ATL][ATL_APITEST] Add GetEnvironmentVariable to CString. CORE-12581

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Dec 17 19:38:08 2016 New Revision: 73465 URL: http://svn.reactos.org/svn/reactos?rev=73465&view=rev Log: [ATL][ATL_APITEST] Add GetEnvironmentVariable to CString. CORE-12581 Modified: trunk/reactos/sdk/lib/atl/cstringt.h trunk/rostests/apitests/atl/CString.cpp trunk/rostests/apitests/atl/CString.inl Modified: trunk/reactos/sdk/lib/atl/cstringt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/cstringt.h?rev… ============================================================================== --- trunk/reactos/sdk/lib/atl/cstringt.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/atl/cstringt.h [iso-8859-1] Sat Dec 17 19:38:08 2016 @@ -83,6 +83,14 @@ ::CharLowerBuffW(pszSource, nSrcLength); } + static DWORD GetEnvironmentVariable( + _In_z_ LPCWSTR pszVar, + _Out_writes_opt_(nBufLength) LPWSTR pszBuf, + _In_opt_ int nBufLength) + { + return ::GetEnvironmentVariableW(pszVar, pszBuf, nBufLength); + } + static void __cdecl MakeUpper( _Out_writes_(nSrcLength) LPWSTR pszSource, _In_ int nSrcLength) @@ -199,6 +207,14 @@ _In_ int nSrcLength) { ::CharLowerBuffA(pszSource, nSrcLength); + } + + static DWORD GetEnvironmentVariable( + _In_z_ LPCSTR pszVar, + _Out_writes_opt_(nBufLength) LPSTR pszBuf, + _In_opt_ int nBufLength) + { + return ::GetEnvironmentVariableA(pszVar, pszBuf, nBufLength); } static void __cdecl MakeUpper( @@ -452,6 +468,22 @@ return TRUE; } + BOOL GetEnvironmentVariable(_In_z_ PCXSTR pszVar) + { + int nLength = StringTraits::GetEnvironmentVariable(pszVar, NULL, 0); + + if (nLength > 0) + { + PXSTR pszBuffer = CThisSimpleString::GetBuffer(nLength); + StringTraits::GetEnvironmentVariable(pszVar, pszBuffer, nLength); + CThisSimpleString::ReleaseBuffer(); + return TRUE; + } + + CThisSimpleString::Empty(); + return FALSE; + } + CStringT& MakeLower() { int nLength = CThisSimpleString::GetLength(); Modified: trunk/rostests/apitests/atl/CString.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CString.cpp?… ============================================================================== --- trunk/rostests/apitests/atl/CString.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/atl/CString.cpp [iso-8859-1] Sat Dec 17 19:38:08 2016 @@ -5,8 +5,8 @@ * PROGRAMMER: Mark Jansen */ +#include <atlstr.h> #include <apitest.h> -#include <atlstr.h> struct traits_test @@ -119,12 +119,13 @@ #undef ok #undef _T -#define TEST_NAMEX(name) void test_##name##W() -#define CStringX CStringW -#define _X(x) L ## x -#define XCHAR WCHAR -#define dbgstrx(x) wine_dbgstr_w(x) -#define ok ok_("CStringW:\n" __FILE__, __LINE__) +#define TEST_NAMEX(name) void test_##name##W() +#define CStringX CStringW +#define _X(x) L ## x +#define XCHAR WCHAR +#define dbgstrx(x) wine_dbgstr_w(x) +#define ok ok_("CStringW:\n" __FILE__, __LINE__) +#define GetWindowsDirectoryX GetWindowsDirectoryW #include "CString.inl" @@ -134,13 +135,15 @@ #undef XCHAR #undef dbgstrx #undef ok +#undef GetWindowsDirectoryX -#define TEST_NAMEX(name) void test_##name##A() -#define CStringX CStringA -#define _X(x) x -#define XCHAR CHAR -#define dbgstrx(x) (const char*)x -#define ok ok_("CStringA:\n" __FILE__, __LINE__) +#define TEST_NAMEX(name) void test_##name##A() +#define CStringX CStringA +#define _X(x) x +#define XCHAR CHAR +#define dbgstrx(x) (const char*)x +#define ok ok_("CStringA:\n" __FILE__, __LINE__) +#define GetWindowsDirectoryX GetWindowsDirectoryA #include "CString.inl" @@ -173,4 +176,7 @@ test_trimW(); test_trimA(); + + test_envW(); + test_envA(); } Modified: trunk/rostests/apitests/atl/CString.inl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CString.inl?… ============================================================================== --- trunk/rostests/apitests/atl/CString.inl [iso-8859-1] (original) +++ trunk/rostests/apitests/atl/CString.inl [iso-8859-1] Sat Dec 17 19:38:08 2016 @@ -356,3 +356,35 @@ ok(str2 == _X(""), "Expected str2 to be '', was: %s\n", dbgstrx(str2)); ok(str2.GetLength() == 0, "Expected GetLength() to be 0, was: %i\n", str2.GetLength()); } + +TEST_NAMEX(env) +{ + CStringX test; + BOOL ret; + ok(test.IsEmpty() == true, "Expected test to be empty\n"); + ok(test.GetLength() == 0, "Expected GetLength() to be 0, was: %i\n", test.GetLength()); + ok(test.GetAllocLength() == 0, "Expected GetAllocLength() to be 0, was: %i\n", test.GetAllocLength()); + + XCHAR buf[512]; + GetWindowsDirectoryX(buf, _countof(buf)); + + ret = test.GetEnvironmentVariable(_X("SystemDrive")); + ok(!!ret, "Expected %%SystemDrive%% to exist\n"); + ok(test.IsEmpty() == false, "Expected test to have a valid result\n"); + ok(test.GetLength() == 2, "Expected GetLength() to be 2, was: %i\n", test.GetLength()); + if (test.GetLength() == 2) + { + ok(test[0] == buf[0], "Expected test[0] to equal buf[0], was: %c, %c\n", test[0], buf[0]); + ok(test[1] == buf[1], "Expected test[1] to equal buf[1], was: %c, %c\n", test[1], buf[1]); + } + + ret = test.GetEnvironmentVariable(_X("SystemRoot")); + ok(!!ret, "Expected %%SystemRoot%% to exist\n"); + ok(test.IsEmpty() == false, "Expected test to have a valid result\n"); + ok(test == buf, "Expected test to be %s, was %s\n", dbgstrx(buf), dbgstrx(test)); + + ret = test.GetEnvironmentVariable(_X("some non existing env var")); + ok(!ret, "Expected %%some non existing env var%% to not exist\n"); + ok(test.IsEmpty() == true, "Expected test to be empty\n"); + ok(test.GetLength() == 0, "Expected GetLength() to be 0, was: %i\n", test.GetLength()); +}

8 years

[mjansen] 73464: [SDK] Add Resolution/Bitdepth shims + layers to the appcompat database. CORE-11927 #resolve

by mjansen＠svn.reactos.org

Author: mjansen Date: Fri Dec 16 22:13:01 2016 New Revision: 73464 URL: http://svn.reactos.org/svn/reactos?rev=73464&view=rev Log: [SDK] Add Resolution/Bitdepth shims + layers to the appcompat database. CORE-11927 #resolve Added: trunk/reactos/media/sdb/readme.txt (with props) Modified: trunk/reactos/media/sdb/sysmain.xml Added: trunk/reactos/media/sdb/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/sdb/readme.txt?rev=7… ============================================================================== --- trunk/reactos/media/sdb/readme.txt (added) +++ trunk/reactos/media/sdb/readme.txt [iso-8859-1] Fri Dec 16 22:13:01 2016 @@ -0,0 +1,20 @@ + +Sdb + +Sdb files are Shim Databases. +They contain information about bad applications, and about the fixes that can be applied to them. + + +Shims + +A shim is a piece of code that influences the process it's applied to. +This can be done by calling certain api's, or by changing the behavior of api's. +'DisableThemes' is an example of a shim that changes behavior by calling 'SetThemeAppProperties'. +'Win95VersionLie' is an example of a shim that changes behavior, by intercepting calls to GetVersion[Ex]. + +Layers + +A layer is a collection (1..n) of shims. +Layers are used to reference a collection of shims by name. + + Propchange: trunk/reactos/media/sdb/readme.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/sdb/sysmain.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/sdb/sysmain.xml?rev=… ============================================================================== --- trunk/reactos/media/sdb/sysmain.xml [iso-8859-1] (original) +++ trunk/reactos/media/sdb/sysmain.xml [iso-8859-1] Fri Dec 16 22:13:01 2016 @@ -4,6 +4,9 @@ <OS_PLATFORM >1</OS_PLATFORM> <DATABASE_ID>{11111111-1111-1111-1111-111111111111}</DATABASE_ID> <LIBRARY> + +  + <SHIM> <NAME>Win95VersionLie</NAME> <DLLFILE>aclayers.dll</DLLFILE> @@ -76,7 +79,29 @@ <NAME>Win7RTMVersionLie</NAME> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> + +  + + <SHIM> + <NAME>Force640x480</NAME> + <DLLFILE>aclayers.dll</DLLFILE> + </SHIM> + <SHIM> + <NAME>Force8BitColor</NAME> + <DLLFILE>aclayers.dll</DLLFILE> + </SHIM> + +  + + <SHIM> + <NAME>DisableThemes</NAME> + <DLLFILE>acgenral.dll</DLLFILE> + </SHIM> + </LIBRARY> + +  + <LAYER> <NAME>WIN95</NAME> <SHIM_REF NAME="Win95VersionLie" /> @@ -182,5 +207,26 @@ <SHIM_REF NAME="Win7RTMVersionLie" />  </LAYER> + +  + + <LAYER> + <NAME>256Color</NAME> + <SHIM_REF NAME="DisableThemes" /> + <SHIM_REF NAME="Force8BitColor" /> + </LAYER> + <LAYER> + <NAME>640X480</NAME> + <SHIM_REF NAME="Force640x480" /> + </LAYER> + + +  + + <LAYER> + <NAME>DisableThemes</NAME> + <SHIM_REF NAME="DisableThemes" /> + </LAYER> + </DATABASE> </SDB>

8 years

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2016