Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 66351: [KMTESTS:RTL] - Add some simple tests for RtlRaiseStatus to the RtlException test - Add missing volatile in (disabled) stack overflow test that caused an infinite loop on GCC builds...
by tfaber＠svn.reactos.org 19 Feb '15

19 Feb '15

Author: tfaber Date: Thu Feb 19 12:55:57 2015 New Revision: 66351 URL: http://svn.reactos.org/svn/reactos?rev=66351&view=rev Log: [KMTESTS:RTL] - Add some simple tests for RtlRaiseStatus to the RtlException test - Add missing volatile in (disabled) stack overflow test that caused an infinite loop on GCC builds CORE-8773 Modified: trunk/rostests/kmtests/include/kmt_platform.h trunk/rostests/kmtests/rtl/RtlException.c Modified: trunk/rostests/kmtests/include/kmt_platform.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_platf… ============================================================================== --- trunk/rostests/kmtests/include/kmt_platform.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/include/kmt_platform.h [iso-8859-1] Thu Feb 19 12:55:57 2015 @@ -55,6 +55,7 @@ #define ExFreePoolWithTag(p, tag) HeapFree(GetProcessHeap(), 0, p) #define RtlCopyMemoryNonTemporal RtlCopyMemory #define RtlPrefetchMemoryNonTemporal(s, l) +#define ExRaiseStatus RtlRaiseStatus #endif /* defined KMT_EMULATE_KERNEL */ #endif /* defined KMT_USER_MODE */ Modified: trunk/rostests/kmtests/rtl/RtlException.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlException.… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlException.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlException.c [iso-8859-1] Thu Feb 19 12:55:57 2015 @@ -5,6 +5,7 @@ * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */ +#define KMT_EMULATE_KERNEL #include <kmt_test.h> START_TEST(RtlException) @@ -39,13 +40,29 @@ KmtEndSeh(STATUS_ACCESS_VIOLATION); #endif + KmtStartSeh() + ExRaiseStatus(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); + + KmtStartSeh() + ExRaiseStatus(STATUS_TIMEOUT); + KmtEndSeh(STATUS_TIMEOUT); + + KmtStartSeh() + ExRaiseStatus(STATUS_STACK_OVERFLOW); + KmtEndSeh(STATUS_STACK_OVERFLOW); + + KmtStartSeh() + ExRaiseStatus(STATUS_GUARD_PAGE_VIOLATION); + KmtEndSeh(STATUS_GUARD_PAGE_VIOLATION); + /* We cannot test this in kernel mode easily - the stack is just "somewhere" * in system space, and there's no guard page below it */ #if CORE_6640_IS_FIXED #ifdef KMT_USER_MODE /* Overflow the stack - must cause a special exception */ KmtStartSeh() - PCHAR Pointer; + volatile CHAR *Pointer; while (1) {

1 0

[jimtabor] 66350: [NtUser] - Fix wine msg test_SetParent tests. See CORE-7447. Show owned pop up code was added for later testing.
by jimtabor＠svn.reactos.org 19 Feb '15

19 Feb '15

Author: jimtabor Date: Thu Feb 19 02:03:53 2015 New Revision: 66350 URL: http://svn.reactos.org/svn/reactos?rev=66350&view=rev Log: [NtUser] - Fix wine msg test_SetParent tests. See CORE-7447. Show owned pop up code was added for later testing. Modified: trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Thu Feb 19 02:03:53 2015 @@ -207,7 +207,7 @@ USER_REFERENCE_ENTRY Ref; PTHREADINFO pti = gptiCurrent; - //ERR("AOWM 1\n"); + //ERR("AOWM 1 %p\n",Wnd->head.h); ActivePrev = (pti->MessageQueue->spwndActivePrev != NULL); FindTopWnd = TRUE; @@ -238,7 +238,7 @@ //ERR("ActivateOtherWindowMin Set FG 1\n"); co_IntSetForegroundWindow(pWndSetActive); UserDerefObjectCo(pWndSetActive); - //ERR("AOWM 2 Exit Good\n"); + //ERR("AOWM 2 Exit Good %p\n",pWndSetActive->head.h); return TRUE; } if (!pWndTemp ) pWndTemp = pWndSetActive; @@ -275,7 +275,7 @@ //ERR("ActivateOtherWindowMin Set FG 2\n"); co_IntSetForegroundWindow(pWndSetActive); UserDerefObjectCo(pWndSetActive); - //ERR("AOWM 3 Exit Good\n"); + //ERR("AOWM 3 Exit Good %p\n",pWndSetActive->head.h); return TRUE; } //ERR("AOWM 4 Bad\n"); @@ -385,6 +385,7 @@ //ERR("WinPosActivateOtherWindow Set Active 0x%p\n",WndTo); if (!co_IntSetActiveWindow(WndTo,FALSE,TRUE,FALSE)) /* Ok for WndTo to be NULL here */ { + //ERR("WPAOW SA 1\n"); co_IntSetActiveWindow(NULL,FALSE,TRUE,FALSE); } if (WndTo) UserDerefObjectCo(WndTo); @@ -700,7 +701,7 @@ pwndParent = Window->spwndParent; if (pwndParent == UserGetDesktopWindow()) { - //ERR("Parent is Desktop, Min off screen!\n"); + ERR("Parent is Desktop, Min off screen!\n"); /* ReactOS doesn't support iconic minimize to desktop */ Pos->x = Pos->y = -32000; Window->InternalPos.flags |= WPF_MININIT; @@ -775,10 +776,10 @@ { switch (ShowFlag) { + case SW_MINIMIZE: case SW_SHOWMINNOACTIVE: case SW_SHOWMINIMIZED: case SW_FORCEMINIMIZE: - case SW_MINIMIZE: return SWP_NOSIZE | SWP_NOMOVE; } if (!co_IntSendMessageNoWait(Wnd->head.h, WM_QUERYOPEN, 0, 0)) @@ -789,10 +790,10 @@ } switch (ShowFlag) { + case SW_MINIMIZE: case SW_SHOWMINNOACTIVE: case SW_SHOWMINIMIZED: case SW_FORCEMINIMIZE: - case SW_MINIMIZE: { //ERR("MinMaximize Minimize\n"); if (Wnd->style & WS_MAXIMIZE) @@ -813,7 +814,11 @@ WinPosFindIconPos(Wnd, &wpl.ptMinPosition); - if (!(old_style & WS_MINIMIZE)) SwpFlags |= SWP_STATECHANGED; + /*if (!(old_style & WS_MINIMIZE)) + { + SwpFlags |= SWP_STATECHANGED; + IntShowOwnedPopups(Wnd, FALSE); + }*/ RECTL_vSetRect(NewPos, wpl.ptMinPosition.x, wpl.ptMinPosition.y, wpl.ptMinPosition.x + UserGetSystemMetrics(SM_CXMINIMIZED), @@ -836,6 +841,10 @@ wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, Size.x, Size.y); */ old_style = IntSetStyle( Wnd, WS_MAXIMIZE, WS_MINIMIZE ); + /*if (old_style & WS_MINIMIZE) + { + IntShowOwnedPopups(Wnd, TRUE); + }*/ if (!(old_style & WS_MAXIMIZE)) SwpFlags |= SWP_STATECHANGED; RECTL_vSetRect(NewPos, wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, @@ -855,6 +864,8 @@ old_style = IntSetStyle( Wnd, 0, WS_MINIMIZE | WS_MAXIMIZE ); if (old_style & WS_MINIMIZE) { + //IntShowOwnedPopups(Wnd, TRUE); + if (Wnd->InternalPos.flags & WPF_RESTORETOMAXIMIZED) { co_WinPosGetMinMaxInfo(Wnd, &Size, &wpl.ptMaxPosition, NULL, NULL); @@ -1286,7 +1297,7 @@ if (!(WinPos->flags & SWP_NOSENDCHANGING)) { - TRACE("Sending WM_WINDOWPOSCHANGING to hwnd %p.\n", Window->head.h); + TRACE("Sending WM_WINDOWPOSCHANGING to hwnd %p flags %04x.\n", Window->head.h,WinPos->flags); co_IntSendMessage(Window->head.h, WM_WINDOWPOSCHANGING, 0, (LPARAM) WinPos); } @@ -1308,6 +1319,8 @@ WindowRect->bottom = WindowRect->top + WinPos->cy; } } + + WinPos->flags |= SWP_NOCLIENTMOVE | SWP_NOCLIENTSIZE; if (!(WinPos->flags & SWP_NOMOVE)) { @@ -1318,7 +1331,11 @@ Parent = Window->spwndParent; - if (((Window->style & WS_CHILD) != 0) && + // Fix wine msg test_SetParent:WmSetParentSeq_2:19 wParam bits. + WinPos->flags &= ~SWP_NOCLIENTMOVE; + + // Parent child position issue is in here. SetParent_W7 test CORE-6651. + if (//((Window->style & WS_CHILD) != 0) && <- Fixes wine msg test_SetParent: "rects do not match", the last test. Parent && Parent != Window->head.rpdesk->pDeskInfo->spwnd) { @@ -1336,7 +1353,6 @@ RECTL_vOffsetRect(ClientRect, X - Window->rcWindow.left, Y - Window->rcWindow.top); } - WinPos->flags |= SWP_NOCLIENTMOVE | SWP_NOCLIENTSIZE; TRACE( "hwnd %p, after %p, swp %d,%d %dx%d flags %08x\n", WinPos->hwnd, WinPos->hwndInsertAfter, WinPos->x, WinPos->y, @@ -1545,7 +1561,9 @@ WinPos->cy = max(WinPos->cy, 0); Parent = UserGetAncestor( Wnd, GA_PARENT ); - if (!IntIsWindowVisible( Parent )) WinPos->flags |= SWP_NOREDRAW; + if (!IntIsWindowVisible( Parent ) && + /* Fix B : wine msg test_SetParent:WmSetParentSeq_2:25 wParam bits! */ + (WinPos->flags & SWP_AGG_STATUSFLAGS) == SWP_AGG_NOPOSCHANGE) WinPos->flags |= SWP_NOREDRAW; if (Wnd->style & WS_VISIBLE) WinPos->flags &= ~SWP_SHOWWINDOW; else @@ -1572,7 +1590,7 @@ WinPos->flags |= SWP_NOMOVE; } - if (WinPos->hwnd != UserGetForegroundWindow() && (Wnd->style & (WS_POPUP | WS_CHILD)) != WS_CHILD) + if ( WinPos->hwnd != UserGetForegroundWindow() && (Wnd->style & (WS_POPUP | WS_CHILD)) != WS_CHILD) { /* Bring to the top when activating */ if (!(WinPos->flags & (SWP_NOACTIVATE|SWP_HIDEWINDOW)) && @@ -1689,6 +1707,7 @@ RECTL CopyRect; PWND Ancestor; BOOL bPointerInWindow; + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); ASSERT_REFS_CO(Window); @@ -2061,13 +2080,21 @@ { co_IntSendMessageNoWait(WinPos.hwnd, WM_CHILDACTIVATE, 0, 0); } - else - { - //ERR("SetWindowPos Set FG Window!\n"); - if (Window->state & WNDS_BEINGACTIVATED) // Inside SAW? - co_IntSetActiveWindow(Window, FALSE, TRUE, FALSE); // Fixes Api AttachThreadInput tests. - else - co_IntSetForegroundWindow(Window); // Fixes SW_HIDE issues. Wine win test_SetActiveWindow & test_SetForegroundWindow. + /* Do not allow setting if already active. + Fix A : wine msg test_SetParent:WmSetParentSeq_2:25 msg! + Recursion broke the tests. + */ + else if ( pti->MessageQueue->spwndActive != Window || + pti->MessageQueue != gpqForeground ) // This fixes the breakage at boot time caused by the above line! + { + // Inside SAW? Fixes Api AttachThreadInput tests. + ERR("SetWindowPos Set FG Window! hWnd %p\n",WinPos.hwnd); + if (!(Window->state & WNDS_BEINGACTIVATED)) + { + ERR("SetWindowPos Set FG Window!\n"); + // Fixes SW_HIDE issues. Wine win test_SetActiveWindow & test_SetForegroundWindow. + co_IntSetForegroundWindow(Window); + } } } @@ -2083,7 +2110,7 @@ /* And last, send the WM_WINDOWPOSCHANGED message */ - TRACE("\tstatus flags = %04x\n", WinPos.flags & SWP_AGG_STATUSFLAGS); + TRACE("\tstatus hwnd %p flags = %04x\n",Window?Window->head.h:NULL,WinPos.flags & SWP_AGG_STATUSFLAGS); if ((WinPos.flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE) { @@ -2094,7 +2121,7 @@ WinPos.y = NewWindowRect.top; WinPos.cx = NewWindowRect.right - NewWindowRect.left; WinPos.cy = NewWindowRect.bottom - NewWindowRect.top; - TRACE("WM_WINDOWPOSCHANGED hwnd %p Flags %04x\n",WinPos.hwnd,(WinPos.flags&SWP_AGG_STATUSFLAGS)); + TRACE("WM_WINDOWPOSCHANGED hwnd %p Flags %04x\n",WinPos.hwnd,WinPos.flags); co_IntSendMessageNoWait(WinPos.hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM) &WinPos); } @@ -2169,6 +2196,9 @@ IntEngWindowChanged(Wnd, WOC_RGN_CLIENT); } +/* + ShowWindow does not set SWP_FRAMECHANGED!!! Fix wine msg test_SetParent:WmSetParentSeq_2:23 wParam bits! + */ BOOLEAN FASTCALL co_WinPosShowWindow(PWND Wnd, INT Cmd) { @@ -2183,8 +2213,7 @@ BOOL ShowOwned = FALSE; BOOL FirstTime = FALSE; ASSERT_REFS_CO(Wnd); - //ERR("co_WinPosShowWindow START\n"); - + //KeRosDumpStackFrames(NULL, 20); pti = PsGetCurrentThreadWin32Thread(); WasVisible = (Wnd->style & WS_VISIBLE) != 0; style = Wnd->style; @@ -2253,7 +2282,6 @@ if (!(style & WS_MINIMIZE)) { IntShowOwnedPopups(Wnd, FALSE ); - // Fix wine Win test_SetFocus todo #1 & #2, if (Cmd == SW_SHOWMINIMIZED) { @@ -2264,18 +2292,13 @@ co_UserSetFocus(0); } - Swp |= co_WinPosMinMaximize(Wnd, Cmd, &NewPos) | - SWP_FRAMECHANGED; + Swp |= co_WinPosMinMaximize(Wnd, Cmd, &NewPos); EventMsg = EVENT_SYSTEM_MINIMIZESTART; } else { - if (!WasVisible) - { - Swp |= SWP_FRAMECHANGED; - } - else //// + if (WasVisible) { //ERR("co_WinPosShowWindow Exit Good\n"); return TRUE; @@ -2292,18 +2315,13 @@ { ShowOwned = TRUE; - Swp |= co_WinPosMinMaximize(Wnd, SW_MAXIMIZE, &NewPos) | - SWP_FRAMECHANGED; + Swp |= co_WinPosMinMaximize(Wnd, SW_MAXIMIZE, &NewPos); EventMsg = EVENT_SYSTEM_MINIMIZEEND; } else { - if (!WasVisible) - { - Swp |= SWP_FRAMECHANGED; - } - else //// + if (WasVisible) { //ERR("co_WinPosShowWindow Exit Good 1\n"); return TRUE; @@ -2333,18 +2351,12 @@ if (!WasVisible) Swp |= SWP_SHOWWINDOW; if (style & (WS_MINIMIZE | WS_MAXIMIZE)) { - Swp |= co_WinPosMinMaximize(Wnd, Cmd, &NewPos) | - SWP_FRAMECHANGED; - + Swp |= co_WinPosMinMaximize(Wnd, Cmd, &NewPos); if (style & WS_MINIMIZE) EventMsg = EVENT_SYSTEM_MINIMIZEEND; } else { - if (!WasVisible) - { - Swp |= SWP_FRAMECHANGED; - } - else //// + if (WasVisible) { //ERR("co_WinPosShowWindow Exit Good 3\n"); return TRUE; @@ -2366,9 +2378,11 @@ if ((ShowFlag != WasVisible || Cmd == SW_SHOWNA) && Cmd != SW_SHOWMAXIMIZED && !(Swp & SWP_STATECHANGED)) { - co_IntSendMessageNoWait(Wnd->head.h, WM_SHOWWINDOW, ShowFlag, 0); - if (!(Wnd->state2 & WNDS2_WIN31COMPAT)) + co_IntSendMessageNoWait(Wnd->head.h, WM_SHOWWINDOW, ShowFlag, 0); +#if 0 // Fix wine msg test_SetParent:WmSetParentSeq_1:2 + if (!(Wnd->state2 & WNDS2_WIN31COMPAT)) // <------------- XP sets this bit! co_IntSendMessageNoWait(Wnd->head.h, WM_SETVISIBLE, ShowFlag, 0); +#endif if (!VerifyWnd(Wnd)) return WasVisible; } @@ -2395,15 +2409,15 @@ if (IsChildVisible(Wnd) || Swp & SWP_STATECHANGED) { - TRACE("Child is Vis %s or State changed %s. ShowFlag %s\n", + TRACE("Child is Vis %s or State changed %s. ShowFlag %s Swp %04x\n", (IsChildVisible(Wnd) ? "TRUE" : "FALSE"), (Swp & SWP_STATECHANGED ? "TRUE" : "FALSE"), - (ShowFlag ? "TRUE" : "FALSE")); + (ShowFlag ? "TRUE" : "FALSE"),LOWORD(Swp)); co_WinPosSetWindowPos( Wnd, 0 != (Wnd->ExStyle & WS_EX_TOPMOST) ? HWND_TOPMOST : HWND_TOP, NewPos.left, NewPos.top, - NewPos.right, //NewPos.right - NewPos.left, - NewPos.bottom, //NewPos.bottom - NewPos.top, + NewPos.right, // NewPos.right - NewPos.left, when minimized and restore, the window becomes smaller. + NewPos.bottom,// NewPos.bottom - NewPos.top, LOWORD(Swp)); } else @@ -2424,11 +2438,15 @@ { if ( Wnd->spwndParent == UserGetDesktopWindow()) { - if(!ActivateOtherWindowMin(Wnd)) + if (!ActivateOtherWindowMin(Wnd)) + { co_WinPosActivateOtherWindow(Wnd); + } } else + { co_WinPosActivateOtherWindow(Wnd); + } } /* Revert focus to parent */ @@ -2438,6 +2456,8 @@ if (Wnd->spwndParent == UserGetDesktopWindow()) Parent = 0; co_UserSetFocus(Parent); } + // Hide, just return. + if (Cmd == SW_HIDE) return WasVisible; } /* FIXME: Check for window destruction. */ @@ -3429,7 +3449,7 @@ DECLARE_RETURN(BOOL); USER_REFERENCE_ENTRY Ref; - TRACE("Enter NtUserShowWindow\n"); + TRACE("Enter NtUserShowWindow hWnd %p SW_ %d\n",hWnd, nCmdShow); UserEnterExclusive(); if (!(Window = UserGetWindowObject(hWnd)) || // FIXME:

1 0

[jgardou] 66349: [CRYPT32] - Addenratum to r64026: Merge the certificate stores for real. CORE-5675 #resolve
by jgardou＠svn.reactos.org 18 Feb '15

18 Feb '15

Author: jgardou Date: Wed Feb 18 21:27:40 2015 New Revision: 66349 URL: http://svn.reactos.org/svn/reactos?rev=66349&view=rev Log: [CRYPT32] - Addenratum to r64026: Merge the certificate stores for real. CORE-5675 #resolve Modified: trunk/reactos/dll/win32/crypt32/rootstore.c Modified: trunk/reactos/dll/win32/crypt32/rootstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/rootstor… ============================================================================== --- trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] Wed Feb 18 21:27:40 2015 @@ -808,6 +808,7 @@ HCERTSTORE collStore = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); CertAddStoreToCollection(collStore, regStore, 0, 0); + CertAddStoreToCollection(collStore, root, 0, 0); root = collStore; } }

1 0

[pschweitzer] 66348: [ROSAUTOTESTS] Remove redundant GetTickCount() call
by pschweitzer＠svn.reactos.org 18 Feb '15

18 Feb '15

Author: pschweitzer Date: Wed Feb 18 19:52:04 2015 New Revision: 66348 URL: http://svn.reactos.org/svn/reactos?rev=66348&view=rev Log: [ROSAUTOTESTS] Remove redundant GetTickCount() call Modified: trunk/rostests/rosautotest/CWineTest.cpp Modified: trunk/rostests/rosautotest/CWineTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.cpp… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] Wed Feb 18 19:52:04 2015 @@ -254,7 +254,7 @@ { DWORD BytesAvailable; stringstream ss, ssFinish; - DWORD StartTime = GetTickCount(); + DWORD StartTime; float TotalTime; string tailString; CPipe Pipe;

1 0

[tfaber] 66347: [GDI32_APITEST] - Refactor EnumFontFamilies test to be more generic, and check for some common expected system fonts. This shows that EnumFontFamilies behaves correctly, but that we...
by tfaber＠svn.reactos.org 18 Feb '15

18 Feb '15

Author: tfaber Date: Wed Feb 18 13:18:30 2015 New Revision: 66347 URL: http://svn.reactos.org/svn/reactos?rev=66347&view=rev Log: [GDI32_APITEST] - Refactor EnumFontFamilies test to be more generic, and check for some common expected system fonts. This shows that EnumFontFamilies behaves correctly, but that we're missing the System font in the enumeration. CORE-9222 Modified: trunk/rostests/apitests/gdi32/EnumFontFamilies.c Modified: trunk/rostests/apitests/gdi32/EnumFontFamilies.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EnumFontFa… ============================================================================== --- trunk/rostests/apitests/gdi32/EnumFontFamilies.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/EnumFontFamilies.c [iso-8859-1] Wed Feb 18 13:18:30 2015 @@ -7,6 +7,7 @@ #include <apitest.h> +#include <winnls.h> #include <wingdi.h> #include <winddi.h> #include <strsafe.h> @@ -17,6 +18,67 @@ static int EnumProcCalls; static ENUMLOGFONTA LastFontA; static ENUMLOGFONTW LastFontW; + +typedef int WRAP_ENUM_FONT_FAMILIES(_In_ HDC, _In_ PCWSTR, _In_ PVOID, _In_ LPARAM); +typedef WRAP_ENUM_FONT_FAMILIES *PWRAP_ENUM_FONT_FAMILIES; + +static +int +WrapEnumFontFamiliesA( + _In_ HDC hdc, + _In_ PCWSTR Family, + _In_ PVOID EnumProc, + _In_ LPARAM lParam) +{ + char FamilyA[100]; + WideCharToMultiByte(CP_ACP, 0, Family, -1, FamilyA, sizeof(FamilyA), NULL, NULL); + return EnumFontFamiliesA(hdc, FamilyA, EnumProc, lParam); +} + +static +int +WrapEnumFontFamiliesW( + _In_ HDC hdc, + _In_ PCWSTR Family, + _In_ PVOID EnumProc, + _In_ LPARAM lParam) +{ + return EnumFontFamiliesW(hdc, Family, EnumProc, lParam); +} + +static +int +WrapEnumFontFamiliesExA( + _In_ HDC hdc, + _In_ PCWSTR Family, + _In_ PVOID EnumProc, + _In_ LPARAM lParam) +{ + LOGFONTA lf; + + ZeroMemory(&lf, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = 0; + WideCharToMultiByte(CP_ACP, 0, Family, -1, lf.lfFaceName, sizeof(lf.lfFaceName), NULL, NULL); + return EnumFontFamiliesExA(hdc, &lf, EnumProc, lParam, 0); +} + +static +int +WrapEnumFontFamiliesExW( + _In_ HDC hdc, + _In_ PCWSTR Family, + _In_ PVOID EnumProc, + _In_ LPARAM lParam) +{ + LOGFONTW lf; + + ZeroMemory(&lf, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = 0; + StringCbCopyW(lf.lfFaceName, sizeof(lf.lfFaceName), Family); + return EnumFontFamiliesExW(hdc, &lf, EnumProc, lParam, 0); +} static int @@ -60,98 +122,71 @@ static void -TestEnumFontFamiliesA( - _In_ HDC hdc, - _In_ PCSTR FontName) -{ +TestEnumFontFamilies( + _In_ HDC hdc, + _In_ PCWSTR FontName, + _In_ BOOLEAN ExpectToFind) +{ + const struct + { + PWRAP_ENUM_FONT_FAMILIES Wrapper; + PCSTR Name; + BOOLEAN Wide; + } *fun, functions[] = + { + { WrapEnumFontFamiliesA, "EnumFontFamiliesA", FALSE }, + { WrapEnumFontFamiliesW, "EnumFontFamiliesW", TRUE }, + { WrapEnumFontFamiliesExA, "EnumFontFamiliesExA", FALSE }, + { WrapEnumFontFamiliesExW, "EnumFontFamiliesExW", TRUE }, + }; + const struct + { + PVOID Context; + PCSTR Description; + } *ctx, contexts[] = + { + { &ContextContinue, "Continue" }, + { &ContextStop, "Stop" }, + }; int ret; DWORD error; - - EnumProcCalls = 0; - SetLastError(0xdeadbeef); - ret = EnumFontFamiliesA(hdc, - FontName, - EnumProcA, - (LPARAM)&ContextContinue); - error = GetLastError(); - ok(ret == 1, "ret is %d, expected 1\n", ret); - ok(error == 0xdeadbeef, "error is %lu\n", error); - ok(EnumProcCalls == 0, "EnumProcCalls is %d\n", EnumProcCalls); -} - -static -void -TestEnumFontFamiliesW( - _In_ HDC hdc, - _In_ PCWSTR FontName) -{ - int ret; - DWORD error; - - EnumProcCalls = 0; - SetLastError(0xdeadbeef); - ret = EnumFontFamiliesW(hdc, - FontName, - EnumProcW, - (LPARAM)&ContextContinue); - error = GetLastError(); - ok(ret == 1, "ret is %d, expected 1\n", ret); - ok(error == 0xdeadbeef, "error is %lu\n", error); - ok(EnumProcCalls == 0, "EnumProcCalls is %d\n", EnumProcCalls); -} - -static -void -TestEnumFontFamiliesExA( - _In_ HDC hdc, - _In_ PCSTR FontName) -{ - int ret; - DWORD error; - LOGFONTA lf; - - EnumProcCalls = 0; - ZeroMemory(&lf, sizeof(lf)); - lf.lfCharSet = DEFAULT_CHARSET; - lf.lfPitchAndFamily = 0; - StringCbCopyA(lf.lfFaceName, sizeof(lf.lfFaceName), FontName); - SetLastError(0xdeadbeef); - ret = EnumFontFamiliesExA(hdc, - &lf, - EnumProcA, - (LPARAM)&ContextContinue, - 0); - error = GetLastError(); - ok(ret == 1, "ret is %d, expected 1\n", ret); - ok(error == 0xdeadbeef, "error is %lu\n", error); - ok(EnumProcCalls == 0, "EnumProcCalls is %d\n", EnumProcCalls); -} - -static -void -TestEnumFontFamiliesExW( - _In_ HDC hdc, - _In_ PCWSTR FontName) -{ - int ret; - DWORD error; - LOGFONTW lf; - - EnumProcCalls = 0; - ZeroMemory(&lf, sizeof(lf)); - lf.lfCharSet = DEFAULT_CHARSET; - lf.lfPitchAndFamily = 0; - StringCbCopyW(lf.lfFaceName, sizeof(lf.lfFaceName), FontName); - SetLastError(0xdeadbeef); - ret = EnumFontFamiliesExW(hdc, - &lf, - EnumProcW, - (LPARAM)&ContextContinue, - 0); - error = GetLastError(); - ok(ret == 1, "ret is %d, expected 1\n", ret); - ok(error == 0xdeadbeef, "error is %lu\n", error); - ok(EnumProcCalls == 0, "EnumProcCalls is %d\n", EnumProcCalls); + unsigned iFunction; + unsigned iContext; + + for (iContext = 0; iContext < _countof(contexts); iContext++) + { + ctx = &contexts[iContext]; + for (iFunction = 0; iFunction < _countof(functions); iFunction++) + { + fun = &functions[iFunction]; + EnumProcCalls = 0; + SetLastError(0xdeadbeef); + ret = fun->Wrapper(hdc, + FontName, + fun->Wide ? (PVOID)EnumProcW : (PVOID)EnumProcA, + (LPARAM)ctx->Context); + error = GetLastError(); + ok(error == 0xdeadbeef, "[%s, %s, '%ls'] error is %lu\n", fun->Name, ctx->Description, FontName, error); + if (ExpectToFind) + { + if (ctx->Context == &ContextContinue) + { + ok(ret == 7, "[%s, %s, '%ls'] ret is %d, expected 7\n", fun->Name, ctx->Description, FontName, ret); + ok(EnumProcCalls >= 1, "[%s, %s, '%ls'] EnumProcCalls is %d\n", fun->Name, ctx->Description, FontName, EnumProcCalls); + } + else + { + ok(ret == 0, "[%s, %s, '%ls'] ret is %d, expected 0\n", fun->Name, ctx->Description, FontName, ret); + ok(EnumProcCalls == 1, "[%s, %s, '%ls'] EnumProcCalls is %d\n", fun->Name, ctx->Description, FontName, EnumProcCalls); + } + } + else + { + ok(ret == 1, "[%s, %s, '%ls'] ret is %d, expected 1\n", fun->Name, ctx->Description, FontName, ret); + ok(EnumProcCalls == 0, "[%s, %s, '%ls'] EnumProcCalls is %d\n", fun->Name, ctx->Description, FontName, EnumProcCalls); + } + } + } } START_TEST(EnumFontFamilies) @@ -165,10 +200,17 @@ return; } - TestEnumFontFamiliesA(hdc, "ThisFontDoesNotExist"); - TestEnumFontFamiliesW(hdc, L"ThisFontDoesNotExist"); - TestEnumFontFamiliesExA(hdc, "ThisFontDoesNotExist"); - TestEnumFontFamiliesExW(hdc, L"ThisFontDoesNotExist"); + TestEnumFontFamilies(hdc, L"ThisFontDoesNotExist", FALSE); + /* Basic fonts that should be installed */ + TestEnumFontFamilies(hdc, L"MS Sans Serif", TRUE); + TestEnumFontFamilies(hdc, L"Tahoma", TRUE); + TestEnumFontFamilies(hdc, L"System", TRUE); + /* Show case insensitivity */ + TestEnumFontFamilies(hdc, L"tahOmA", TRUE); + /* Special fonts that we have a hack for in win32k ;) */ + TestEnumFontFamilies(hdc, L"Marlett", TRUE); + TestEnumFontFamilies(hdc, L"Symbol", TRUE); + TestEnumFontFamilies(hdc, L"VGA", FALSE); DeleteDC(hdc); }

1 0

[tfaber] 66346: [MSXML3_WINETEST] - Re-enable test_save CORE-6738 ROSTESTS-82
by tfaber＠svn.reactos.org 18 Feb '15

18 Feb '15

Author: tfaber Date: Wed Feb 18 11:44:01 2015 New Revision: 66346 URL: http://svn.reactos.org/svn/reactos?rev=66346&view=rev Log: [MSXML3_WINETEST] - Re-enable test_save CORE-6738 ROSTESTS-82 Removed: trunk/rostests/winetests/msxml3/msxml3_ros.diff Modified: trunk/rostests/winetests/msxml3/domdoc.c Modified: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… ============================================================================== --- trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] Wed Feb 18 11:44:01 2015 @@ -352,9 +352,7 @@ istream_Clone }; -#if CORE_6738_IS_FIXED static IStream savestream = { &StreamVtbl }; -#endif #define EXPECT_CHILDREN(node) _expect_children((IXMLDOMNode*)node, __LINE__) static void _expect_children(IXMLDOMNode *node, int line) @@ -6000,7 +5998,6 @@ free_bstrs(); } -#if CORE_6738_IS_FIXED static void test_save(void) { IXMLDOMDocument *doc, *doc2; @@ -6131,7 +6128,6 @@ IXMLDOMDocument_Release(doc); free_bstrs(); } -#endif /* CORE_6738_IS_FIXED */ static void test_testTransforms(void) { @@ -11934,9 +11930,7 @@ test_XSLPattern(); test_cloneNode(); test_xmlTypes(); -#if CORE_6738_IS_FIXED test_save(); -#endif test_testTransforms(); test_namespaces_basic(); test_namespaces_change(); Removed: trunk/rostests/winetests/msxml3/msxml3_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/msxml3_r… ============================================================================== --- trunk/rostests/winetests/msxml3/msxml3_ros.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/msxml3_ros.diff (removed) @@ -1,94 +0,0 @@ -Index: domdoc.c -=================================================================== ---- domdoc.c (revision 57310) -+++ domdoc.c (working copy) -@@ -1447,6 +1447,9 @@ - #define EXPECT_HR(hr,hr_exp) \ - ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) - -+#define EXPECT_NOT_HR(hr,hr_exp) \ -+ ok(hr != hr_exp, "got 0x%08x, expected not 0x%08x\n", hr, hr_exp) -+ - static const WCHAR szEmpty[] = { 0 }; - static const WCHAR szIncomplete[] = { - '<','?','x','m','l',' ', -@@ -4244,6 +4247,30 @@ - free_bstrs(); - } - -+/* -+ * This function is to display that xmlnodelist_QueryInterface -+ * generates SEGV for these conditions, and once fixed make sure -+ * it never does it again. -+ */ -+static void verify_nodelist_query_interface(IXMLDOMNodeList *node_list) -+{ -+ HRESULT hr; -+ /* -+ * NOTE: The following calls are supposed to test wine's -+ * xmlnodelist_QueryInterface behaving properly. -+ * While we should be able to expect E_POINTER (due to the NULL pointer), -+ * it seems MS' own implementation(s) violate the spec and return -+ * E_INVALIDARG. To not get cought be a potentially correct implementation -+ * in the future, we check for NOT S_OK. -+ */ -+ hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, NULL); -+ EXPECT_NOT_HR(hr, S_OK); -+ hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IDispatch, NULL); -+ EXPECT_NOT_HR(hr, S_OK); -+ hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IXMLDOMNodeList, NULL); -+ EXPECT_NOT_HR(hr, S_OK); -+} -+ - static void test_get_childNodes(void) - { - IXMLDOMNodeList *node_list, *node_list2; -@@ -4271,6 +4298,8 @@ - hr = IXMLDOMElement_get_childNodes( element, &node_list ); - EXPECT_HR(hr, S_OK); - -+ verify_nodelist_query_interface(node_list); -+ - hr = IXMLDOMNodeList_get_length( node_list, &len ); - EXPECT_HR(hr, S_OK); - ok( len == 4, "len %d\n", len); -Index: domdoc.c -=================================================================== ---- domdoc.c (revision 57539) -+++ domdoc.c (revision 57540) -@@ -1398,7 +1398,9 @@ - istream_Clone - }; - -+#if CORE_6738_IS_FIXED - static IStream savestream = { &StreamVtbl }; -+#endif - - #define EXPECT_CHILDREN(node) _expect_children((IXMLDOMNode*)node, __LINE__) - static void _expect_children(IXMLDOMNode *node, int line) -@@ -7274,6 +7276,7 @@ - free_bstrs(); - } - -+#if CORE_6738_IS_FIXED - static void test_save(void) - { - IXMLDOMDocument *doc, *doc2; -@@ -7410,6 +7413,7 @@ - IXMLDOMDocument_Release(doc); - free_bstrs(); - } -+#endif /* CORE_6738_IS_FIXED */ - - static void test_testTransforms(void) - { -@@ -12538,7 +12542,9 @@ - test_XSLPattern(); - test_cloneNode(); - test_xmlTypes(); -+#if CORE_6738_IS_FIXED - test_save(); -+#endif - test_testTransforms(); - test_namespaces_basic(); - test_namespaces_change();

1 0

[tfaber] 66345: [GDIPLUS_WINETESTS] - Re-enable test_font_metrics, test_logfont and test_fontfamily. CORE-6660 ROSTESTS-79 CORE-6643 #resolve - Skip test_font_substitution instead. ROSTESTS-154
by tfaber＠svn.reactos.org 18 Feb '15

18 Feb '15

Author: tfaber Date: Wed Feb 18 11:20:37 2015 New Revision: 66345 URL: http://svn.reactos.org/svn/reactos?rev=66345&view=rev Log: [GDIPLUS_WINETESTS] - Re-enable test_font_metrics, test_logfont and test_fontfamily. CORE-6660 ROSTESTS-79 CORE-6643 #resolve - Skip test_font_substitution instead. ROSTESTS-154 Modified: trunk/rostests/winetests/gdiplus/font.c Modified: trunk/rostests/winetests/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/font.c?… ============================================================================== --- trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] Wed Feb 18 11:20:37 2015 @@ -101,7 +101,6 @@ GdipDeleteFontFamily(fontfamily); } -#if CORE_6660_IS_FIXED static void test_logfont(void) { LOGFONTA lfa, lfa2; @@ -283,7 +282,6 @@ GdipDeleteFontFamily(clonedFontFamily); } -#endif // CORE_6660_IS_FIXED static void test_fontfamily_properties (void) { @@ -495,7 +493,6 @@ GdipDeleteFontFamily(fontfamily); } -#if CORE_6660_IS_FIXED static int CALLBACK font_enum_proc(const LOGFONTW *lfe, const TEXTMETRICW *ntme, DWORD type, LPARAM lparam) { @@ -732,7 +729,6 @@ GdipDeleteGraphics(graphics); DeleteDC(hdc); } -#endif // CORE_6660_IS_FIXED static void test_font_substitution(void) { @@ -1117,15 +1113,14 @@ GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_font_transform(); - test_font_substitution(); -#if CORE_6660_IS_FIXED + if (!winetest_interactive) + skip("ROSTESTS-154: Skipping test_font_substitution because of improper error handling\n"); + else + test_font_substitution(); test_font_metrics(); -#endif test_createfont(); -#if CORE_6660_IS_FIXED test_logfont(); test_fontfamily(); -#endif test_fontfamily_properties(); test_getgenerics(); test_installedfonts();

1 0

[tfaber] 66344: [GDIPLUS_WINETEST] - Re-enable test_string_functions CORE-6659 ROSTESTS-78 #resolve
by tfaber＠svn.reactos.org 18 Feb '15

18 Feb '15

Author: tfaber Date: Wed Feb 18 10:50:00 2015 New Revision: 66344 URL: http://svn.reactos.org/svn/reactos?rev=66344&view=rev Log: [GDIPLUS_WINETEST] - Re-enable test_string_functions CORE-6659 ROSTESTS-78 #resolve Removed: trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff Modified: trunk/rostests/winetests/gdiplus/graphics.c Removed: trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/gdiplus… ============================================================================== --- trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff (removed) @@ -1,62 +0,0 @@ -Index: graphics.c -=================================================================== ---- graphics.c (revision 57206) -+++ graphics.c (working copy) -@@ -2819,6 +2819,7 @@ - ReleaseDC(hwnd, hdc); - } - -+#if CORE_6659_IS_FIXED - static void test_string_functions(void) - { - GpStatus status; -@@ -3138,6 +3139,7 @@ - - ReleaseDC(hwnd, hdc); - } -+#endif /* CORE_6659_IS_FIXED */ - - static void test_get_set_interpolation(void) - { -@@ -3361,7 +3363,9 @@ - test_clear(); - test_textcontrast(); - test_fromMemoryBitmap(); -+#if CORE_6659_IS_FIXED - test_string_functions(); -+#endif - test_get_set_interpolation(); - test_get_set_textrenderinghint(); - test_getdc_scaled(); - -Index: font.c -=================================================================== ---- font.c (revision 57301) -+++ font.c (working copy) -@@ -87,6 +87,7 @@ - GdipDeleteFontFamily(fontfamily); - } - -+#if CORE_6660_IS_FIXED - static void test_logfont(void) - { - LOGFONTA lfa, lfa2; -@@ -274,6 +275,7 @@ - - GdipDeleteFontFamily(clonedFontFamily); - } -+#endif // CORE_6660_IS_FIXED - - static void test_fontfamily_properties (void) - { -@@ -740,8 +742,10 @@ - test_font_metrics(); - #endif - test_createfont(); -+#if CORE_6660_IS_FIXED - test_logfont(); - test_fontfamily(); -+#endif - test_fontfamily_properties(); - test_getgenerics(); - test_installedfonts(); Modified: trunk/rostests/winetests/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… ============================================================================== --- trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] Wed Feb 18 10:50:00 2015 @@ -2931,7 +2931,6 @@ ReleaseDC(hwnd, hdc); } -#if CORE_6659_IS_FIXED static void test_string_functions(void) { GpStatus status; @@ -3300,7 +3299,6 @@ ReleaseDC(hwnd, hdc); } -#endif /* CORE_6659_IS_FIXED */ static void test_get_set_interpolation(void) { @@ -5620,9 +5618,7 @@ test_clear(); test_textcontrast(); test_fromMemoryBitmap(); -#if CORE_6659_IS_FIXED test_string_functions(); -#endif test_get_set_interpolation(); test_get_set_textrenderinghint(); test_getdc_scaled();

1 0

[tfaber] 66343: [WININET_WINETEST] - Re-enable test_cert_struct in test_secure_connection ROSTESTS-121 #resolve
by tfaber＠svn.reactos.org 18 Feb '15

18 Feb '15

Author: tfaber Date: Wed Feb 18 10:06:46 2015 New Revision: 66343 URL: http://svn.reactos.org/svn/reactos?rev=66343&view=rev Log: [WININET_WINETEST] - Re-enable test_cert_struct in test_secure_connection ROSTESTS-121 #resolve Modified: trunk/rostests/winetests/wininet/http.c Modified: trunk/rostests/winetests/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/http.c?… ============================================================================== --- trunk/rostests/winetests/wininet/http.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/http.c [iso-8859-1] Wed Feb 18 10:06:46 2015 @@ -4667,14 +4667,7 @@ ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); ok(flags & SECURITY_FLAG_SECURE, "expected secure flag to be set\n"); - if (!winetest_interactive) - { - skip("test_cert_struct(req, &test_winehq_org_cert), ROSTESTS-121\n"); - } - else - { - test_cert_struct(req, &test_winehq_org_cert); - } + test_cert_struct(req, &test_winehq_org_cert); /* Querying the same option through InternetQueryOptionW still results in * ASCII strings being returned.

1 0

[jgardou] 66342: [WIN32SS/NTGDI] - Reject bits data early in SetBitmapBits when it's clear that they can't fit in the destination bitmap. Fixes ugly Office 2007 rulers showing garbage.
by jgardou＠svn.reactos.org 17 Feb '15

17 Feb '15

Author: jgardou Date: Tue Feb 17 20:41:51 2015 New Revision: 66342 URL: http://svn.reactos.org/svn/reactos?rev=66342&view=rev Log: [WIN32SS/NTGDI] - Reject bits data early in SetBitmapBits when it's clear that they can't fit in the destination bitmap. Fixes ugly Office 2007 rulers showing garbage. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Tue Feb 17 20:41:51 2015 @@ -11,7 +11,8 @@ #define NDEBUG #include <debug.h> -void +static +int NTAPI UnsafeSetBitmapBits( PSURFACE psurf, @@ -32,6 +33,9 @@ lDeltaDst = psurf->SurfObj.lDelta; lDeltaSrc = WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel); + if (cjBits && (cjBits < (lDeltaSrc * nHeight))) + return 0; + while (nHeight--) { /* Copy one line */ @@ -40,6 +44,7 @@ pjDst += lDeltaDst; } + return 1; } HBITMAP @@ -538,9 +543,8 @@ _SEH2_TRY { - ProbeForRead(pUnsafeBits, Bytes, 1); - UnsafeSetBitmapBits(psurf, Bytes, pUnsafeBits); - ret = 1; + ProbeForRead(pUnsafeBits, Bytes, sizeof(WORD)); + ret = UnsafeSetBitmapBits(psurf, Bytes, pUnsafeBits); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs