Ros-diffs January 2019

ros-diffs@reactos.org

31 participants
300 discussions

[reactos] 01/01: [APITESTS][WIN32KNT_APITEST] Improve NtGdiBitBlt testcase (#1277)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7794e8112e31a58829ba… commit b7794e8112e31a58829bac63d44de53677318c3d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 22 20:51:00 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 22 20:51:00 2019 +0900 [APITESTS][WIN32KNT_APITEST] Improve NtGdiBitBlt testcase (#1277) Use `ok_int`, `ok_long` and `ok` macros instead of obsolete `TEST` and `TESTX` macros. --- .../rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c | 96 +++++++++++----------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c index e9031833ae..b54c96ac08 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c @@ -18,77 +18,77 @@ START_TEST(NtGdiBitBlt) /* Test NULL dc */ SetLastError(ERROR_SUCCESS); bRet = NtGdiBitBlt((HDC)0, 0, 0, 10, 10, (HDC)0, 10, 10, SRCCOPY, 0, 0); - TEST(bRet == FALSE); - TEST(GetLastError() == ERROR_SUCCESS); + ok_int(bRet, FALSE); + ok_long(GetLastError(), ERROR_SUCCESS); /* Test invalid dc */ SetLastError(ERROR_SUCCESS); bRet = NtGdiBitBlt((HDC)0x123456, 0, 0, 10, 10, (HDC)0x123456, 10, 10, SRCCOPY, 0, 0); - TEST(bRet == FALSE); - TEST(GetLastError() == ERROR_SUCCESS); + ok_int(bRet, FALSE); + ok_long(GetLastError(), ERROR_SUCCESS); hdc1 = NtGdiCreateCompatibleDC(0); - TEST(hdc1 != NULL); + ok(hdc1 != NULL, "hdc1 was NULL.\n"); hdc2 = NtGdiCreateCompatibleDC(0); - TEST(hdc2 != NULL); + ok(hdc2 != NULL, "hdc2 was NULL.\n"); hbmp1 = NtGdiCreateBitmap(2, 2, 1, 32, (LPBYTE)bytes1 ); - TEST(hbmp1 != NULL); + ok(hbmp1 != NULL, "hbmp1 was NULL.\n"); hOldBmp1 = SelectObject(hdc1, hbmp1); - TESTX(NtGdiGetPixel(hdc1, 0, 0) == 0x000000ff, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); - TESTX(NtGdiGetPixel(hdc1, 0, 1) == 0x00ff0000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); - TESTX(NtGdiGetPixel(hdc1, 1, 0) == 0x0000ff00, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); - TESTX(NtGdiGetPixel(hdc1, 1, 1) == 0x00ffffff, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); + ok(NtGdiGetPixel(hdc1, 0, 0) == 0x000000ff, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); + ok(NtGdiGetPixel(hdc1, 0, 1) == 0x00ff0000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); + ok(NtGdiGetPixel(hdc1, 1, 0) == 0x0000ff00, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); + ok(NtGdiGetPixel(hdc1, 1, 1) == 0x00ffffff, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); hbmp2 = NtGdiCreateBitmap(2, 2, 1, 32, (LPBYTE)bytes2 ); - TEST(hbmp2 != NULL); + ok(hbmp2 != NULL, "hbmp2 was NULL.\n"); hOldBmp2 = SelectObject(hdc2, hbmp2); bRet = NtGdiBitBlt(hdc2, 1, 1, -2, -2, hdc1, 0, 0, SRCCOPY, 0, 0); - TEST(bRet == TRUE); - TEST(GetLastError() == ERROR_SUCCESS); - TESTX(NtGdiGetPixel(hdc2, 0, 0) == 0x00000000, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); - TESTX(NtGdiGetPixel(hdc2, 0, 1) == 0x00000000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); - TESTX(NtGdiGetPixel(hdc2, 1, 0) == 0x00000000, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); - TESTX(NtGdiGetPixel(hdc2, 1, 1) == 0x00000000, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); + ok_int(bRet, TRUE); + ok_long(GetLastError(), ERROR_SUCCESS); + ok(NtGdiGetPixel(hdc2, 0, 0) == 0x00000000, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); + ok(NtGdiGetPixel(hdc2, 0, 1) == 0x00000000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); + ok(NtGdiGetPixel(hdc2, 1, 0) == 0x00000000, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); + ok(NtGdiGetPixel(hdc2, 1, 1) == 0x00000000, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); bRet = NtGdiBitBlt(hdc2, 1, 1, -2, -2, hdc1, 1, 1, SRCCOPY, 0, 0); - TEST(bRet == TRUE); - TEST(GetLastError() == ERROR_SUCCESS); - TESTX(NtGdiGetPixel(hdc2, 0, 0) == 0x000000ff, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); - TESTX(NtGdiGetPixel(hdc2, 0, 1) == 0x00000000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); - TESTX(NtGdiGetPixel(hdc2, 1, 0) == 0x00000000, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); - TESTX(NtGdiGetPixel(hdc2, 1, 1) == 0x00000000, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); + ok_int(bRet, TRUE); + ok_long(GetLastError(), ERROR_SUCCESS); + ok(NtGdiGetPixel(hdc2, 0, 0) == 0x000000ff, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); + ok(NtGdiGetPixel(hdc2, 0, 1) == 0x00000000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); + ok(NtGdiGetPixel(hdc2, 1, 0) == 0x00000000, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); + ok(NtGdiGetPixel(hdc2, 1, 1) == 0x00000000, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); NtGdiSetPixel(hdc2, 0, 0, 0x00000000); bRet = NtGdiBitBlt(hdc2, 1, 1, -2, -2, hdc1, 0, 0, SRCCOPY, 0, 0); - TEST(bRet == TRUE); - TEST(GetLastError() == ERROR_SUCCESS); - TESTX(NtGdiGetPixel(hdc2, 0, 0) == 0x00000000, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); - TESTX(NtGdiGetPixel(hdc2, 0, 1) == 0x00000000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); - TESTX(NtGdiGetPixel(hdc2, 1, 0) == 0x00000000, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); - TESTX(NtGdiGetPixel(hdc2, 1, 1) == 0x00000000, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); + ok_int(bRet, TRUE); + ok_long(GetLastError(), ERROR_SUCCESS); + ok(NtGdiGetPixel(hdc2, 0, 0) == 0x00000000, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); + ok(NtGdiGetPixel(hdc2, 0, 1) == 0x00000000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); + ok(NtGdiGetPixel(hdc2, 1, 0) == 0x00000000, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); + ok(NtGdiGetPixel(hdc2, 1, 1) == 0x00000000, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); bRet = NtGdiBitBlt(hdc2, 1, 1, -2, -2, hdc1, 2, 2, SRCCOPY, 0, 0); - TEST(bRet == TRUE); - TEST(GetLastError() == ERROR_SUCCESS); - TESTX(NtGdiGetPixel(hdc2, 0, 0) == 0x00ffffff, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); - TESTX(NtGdiGetPixel(hdc2, 0, 1) == 0x00000000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); - TESTX(NtGdiGetPixel(hdc2, 1, 0) == 0x00000000, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); - TESTX(NtGdiGetPixel(hdc2, 1, 1) == 0x00000000, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); + ok_int(bRet, TRUE); + ok_long(GetLastError(), ERROR_SUCCESS); + ok(NtGdiGetPixel(hdc2, 0, 0) == 0x00ffffff, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); + ok(NtGdiGetPixel(hdc2, 0, 1) == 0x00000000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); + ok(NtGdiGetPixel(hdc2, 1, 0) == 0x00000000, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); + ok(NtGdiGetPixel(hdc2, 1, 1) == 0x00000000, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); NtGdiSetPixel(hdc2, 0, 0, 0x00000000); bRet = NtGdiBitBlt(hdc2, 2, 2, -2, -2, hdc1, 2, 2, SRCCOPY, 0, 0); - TEST(bRet == TRUE); - TEST(GetLastError() == ERROR_SUCCESS); - TESTX(NtGdiGetPixel(hdc2, 0, 0) == 0x000000ff, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); - TESTX(NtGdiGetPixel(hdc2, 0, 1) == 0x00ff0000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); - TESTX(NtGdiGetPixel(hdc2, 1, 0) == 0x0000ff00, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); - TESTX(NtGdiGetPixel(hdc2, 1, 1) == 0x00ffffff, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); + ok_int(bRet, TRUE); + ok_long(GetLastError(), ERROR_SUCCESS); + ok(NtGdiGetPixel(hdc2, 0, 0) == 0x000000ff, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); + ok(NtGdiGetPixel(hdc2, 0, 1) == 0x00ff0000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); + ok(NtGdiGetPixel(hdc2, 1, 0) == 0x0000ff00, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); + ok(NtGdiGetPixel(hdc2, 1, 1) == 0x00ffffff, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); NtGdiSetPixel(hdc2, 0, 0, 0x00000000); NtGdiSetPixel(hdc2, 1, 0, 0x00000000); @@ -96,12 +96,12 @@ START_TEST(NtGdiBitBlt) NtGdiSetPixel(hdc2, 1, 1, 0x00000000); bRet = NtGdiBitBlt(hdc2, 0, 0, 2, 2, hdc1, 0, 0, SRCCOPY, 0, 0); - TEST(bRet == TRUE); - TEST(GetLastError() == ERROR_SUCCESS); - TESTX(NtGdiGetPixel(hdc2, 0, 0) == 0x000000ff, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); - TESTX(NtGdiGetPixel(hdc2, 0, 1) == 0x00ff0000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); - TESTX(NtGdiGetPixel(hdc2, 1, 0) == 0x0000ff00, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); - TESTX(NtGdiGetPixel(hdc2, 1, 1) == 0x00ffffff, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); + ok_int(bRet, TRUE); + ok_long(GetLastError(), ERROR_SUCCESS); + ok(NtGdiGetPixel(hdc2, 0, 0) == 0x000000ff, "Pixel[0][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 0)); + ok(NtGdiGetPixel(hdc2, 0, 1) == 0x00ff0000, "Pixel[0][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 0, 1)); + ok(NtGdiGetPixel(hdc2, 1, 0) == 0x0000ff00, "Pixel[1][0] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 0)); + ok(NtGdiGetPixel(hdc2, 1, 1) == 0x00ffffff, "Pixel[1][1] 0x%08x\n", (UINT)NtGdiGetPixel(hdc2, 1, 1)); SelectObject(hdc2, hOldBmp2); SelectObject(hdc1, hOldBmp1);

6 years, 5 months

[reactos] 01/01: [APITESTS][WIN32KNT_APITEST] Improve NtGdiCombineRgn testcase (#1279)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b09bceef7dcfed89ebd38… commit b09bceef7dcfed89ebd385e4d91f135b18ee4018 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 22 20:49:47 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 22 20:49:47 2019 +0900 [APITESTS][WIN32KNT_APITEST] Improve NtGdiCombineRgn testcase (#1279) Use `ok_int` and `ok_long` macros instead of obsolete `TEST` macros. --- .../apitests/win32nt/ntgdi/NtGdiCombineRgn.c | 29 +++++++++++----------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c index 7e152dc093..1c2ede4c26 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c @@ -21,33 +21,32 @@ START_TEST(NtGdiCombineRgn) /* RGN_AND = 1, RGN_OR = 2, RGN_XOR = 3, RGN_DIFF = 4, RGN_COPY = 5 */ - TEST(NtGdiCombineRgn(hRgnDest, hRgn1, hRgn2, 0) == ERROR); - TEST(NtGdiCombineRgn(hRgnDest, hRgn1, hRgn2, 6) == ERROR); + ok_int(NtGdiCombineRgn(hRgnDest, hRgn1, hRgn2, 0), ERROR); + ok_int(NtGdiCombineRgn(hRgnDest, hRgn1, hRgn2, 6), ERROR); SetLastError(ERROR_SUCCESS); - TEST(NtGdiCombineRgn(hRgnDest, 0, 0, RGN_AND) == ERROR); - TEST(GetLastError() == ERROR_INVALID_HANDLE); + ok_int(NtGdiCombineRgn(hRgnDest, 0, 0, RGN_AND), ERROR); + ok_long(GetLastError(), ERROR_INVALID_HANDLE); SetLastError(ERROR_SUCCESS); - TEST(NtGdiCombineRgn(hRgnDest, hRgn1, 0, RGN_AND) == ERROR); - TEST(GetLastError() == ERROR_INVALID_HANDLE); + ok_int(NtGdiCombineRgn(hRgnDest, hRgn1, 0, RGN_AND), ERROR); + ok_long(GetLastError(), ERROR_INVALID_HANDLE); SetLastError(ERROR_SUCCESS); - TEST(NtGdiCombineRgn(hRgnDest, 0, hRgn1, RGN_AND) == ERROR); - TEST(GetLastError() == ERROR_INVALID_HANDLE); + ok_int(NtGdiCombineRgn(hRgnDest, 0, hRgn1, RGN_AND), ERROR); + ok_long(GetLastError(), ERROR_INVALID_HANDLE); SetLastError(ERROR_SUCCESS); - TEST(NtGdiCombineRgn(0, hRgn1, hRgn2, RGN_AND) == ERROR); - TEST(GetLastError() == ERROR_INVALID_HANDLE); + ok_int(NtGdiCombineRgn(0, hRgn1, hRgn2, RGN_AND), ERROR); + ok_long(GetLastError(), ERROR_INVALID_HANDLE); /* Create intersection */ - TEST(NtGdiCombineRgn(hRgnDest, hRgn1, hRgn2, RGN_AND) == SIMPLEREGION); + ok_int(NtGdiCombineRgn(hRgnDest, hRgn1, hRgn2, RGN_AND), SIMPLEREGION); SetRectRgn(hRgn1, 2, 2, 4, 3); - TEST(NtGdiCombineRgn(hRgnDest, hRgnDest, hRgn1, RGN_XOR) == NULLREGION); + ok_int(NtGdiCombineRgn(hRgnDest, hRgnDest, hRgn1, RGN_XOR), NULLREGION); /* Create intersection with itself */ SetRectRgn(hRgnDest, 2, 2, 4, 3); - TEST(NtGdiCombineRgn(hRgnDest, hRgnDest, hRgnDest, RGN_AND) == SIMPLEREGION); + ok_int(NtGdiCombineRgn(hRgnDest, hRgnDest, hRgnDest, RGN_AND), SIMPLEREGION); SetRectRgn(hRgn1, 2, 2, 4, 3); - TEST(NtGdiCombineRgn(hRgnDest, hRgnDest, hRgn1, RGN_XOR) == NULLREGION); + ok_int(NtGdiCombineRgn(hRgnDest, hRgnDest, hRgn1, RGN_XOR), NULLREGION); /* What if 2 regions are the same */ } -

6 years, 5 months

[reactos] 02/02: [USER32_APITEST] Show that scrollbars can be created when extra window data is requested.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3df31a821741e7abf5fa9… commit 3df31a821741e7abf5fa9a2f3ab8a1355d1f7338 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jan 20 20:34:57 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Jan 21 22:25:35 2019 +0100 [USER32_APITEST] Show that scrollbars can be created when extra window data is requested. --- modules/rostests/apitests/user32/CMakeLists.txt | 1 + .../rostests/apitests/user32/ScrollBarWndExtra.c | 61 ++++++++++++++++++++++ modules/rostests/apitests/user32/testlist.c | 2 + 3 files changed, 64 insertions(+) diff --git a/modules/rostests/apitests/user32/CMakeLists.txt b/modules/rostests/apitests/user32/CMakeLists.txt index cdd36cc0c2..5652cc76bf 100644 --- a/modules/rostests/apitests/user32/CMakeLists.txt +++ b/modules/rostests/apitests/user32/CMakeLists.txt @@ -29,6 +29,7 @@ list(APPEND SOURCE RedrawWindow.c RegisterClassEx.c RegisterHotKey.c + ScrollBarWndExtra.c ScrollDC.c ScrollWindowEx.c SendMessageTimeout.c diff --git a/modules/rostests/apitests/user32/ScrollBarWndExtra.c b/modules/rostests/apitests/user32/ScrollBarWndExtra.c new file mode 100644 index 0000000000..8f4cb9c8cb --- /dev/null +++ b/modules/rostests/apitests/user32/ScrollBarWndExtra.c @@ -0,0 +1,61 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Test for ScrollBar cbWndExtra + * COPYRIGHT: Copyright 2019 Mark Jansen <mark.jansen(a)reactos.org> + * + * Why do we need this test? + * Ask the authors of Civilization II... + */ + +#include "precomp.h" + +#define BUILTIN_SCROLLBAR "Scrollbar" +#define CUSTOM_SCROLLBAR "MSScrollBarClass" + + + +START_TEST(ScrollBarWndExtra) +{ + HWND hScrollBar; + HWND hScrollBarImpersonator; + WNDCLASSA WndClass; + ATOM ClassAtom; + + LONG_PTR dummyData = (LONG_PTR)0xbeefbeefbeefbeefULL, result; + WNDPROC lpfnWndProc; + DWORD dwExtra; + + hScrollBar = CreateWindowExA(0, BUILTIN_SCROLLBAR, "", WS_POPUP, + 20, 20, 120, 120, NULL, 0, GetModuleHandle(NULL), 0); + + ok(hScrollBar != NULL, "Scrollbar creation failed (%lu)\n", GetLastError()); + + lpfnWndProc = (WNDPROC)GetWindowLongPtrA(hScrollBar, GWL_WNDPROC); + dwExtra = GetClassLongPtrA(hScrollBar, GCL_CBWNDEXTRA); + + ZeroMemory(&WndClass, sizeof(WndClass)); + WndClass.style = CS_DBLCLKS | CS_PARENTDC | CS_HREDRAW | CS_VREDRAW; + WndClass.lpfnWndProc = lpfnWndProc; + WndClass.cbWndExtra = dwExtra + sizeof(LONG_PTR); + WndClass.hInstance = GetModuleHandle(NULL); + WndClass.hCursor = LoadCursor(NULL, IDC_ARROW); + WndClass.hbrBackground = GetStockObject(LTGRAY_BRUSH); + WndClass.lpszClassName = CUSTOM_SCROLLBAR; + ClassAtom = RegisterClassA(&WndClass); + + ok(ClassAtom != 0, "RegisterClassA failed (%lu)\n", GetLastError()); + DestroyWindow(hScrollBar); + + + hScrollBarImpersonator = CreateWindowExA(0, CUSTOM_SCROLLBAR, "", WS_POPUP, + 20, 20, 120, 120, NULL, 0, GetModuleHandle(NULL), 0); + ok(hScrollBarImpersonator != NULL, "Scrollbar creation failed (%lu)\n", GetLastError()); + + SetWindowLongPtrA(hScrollBarImpersonator, dwExtra, dummyData); + result = GetWindowLongPtrA(hScrollBarImpersonator, dwExtra); + ok(result == dummyData, "Invalid dummyData\n"); + + DestroyWindow(hScrollBarImpersonator); + UnregisterClassA(CUSTOM_SCROLLBAR, GetModuleHandle(NULL)); +} diff --git a/modules/rostests/apitests/user32/testlist.c b/modules/rostests/apitests/user32/testlist.c index 0fe6488a9e..82af0c926d 100644 --- a/modules/rostests/apitests/user32/testlist.c +++ b/modules/rostests/apitests/user32/testlist.c @@ -31,6 +31,7 @@ extern void func_RealGetWindowClass(void); extern void func_RedrawWindow(void); extern void func_RegisterHotKey(void); extern void func_RegisterClassEx(void); +extern void func_ScrollBarWndExtra(void); extern void func_ScrollDC(void); extern void func_ScrollWindowEx(void); extern void func_SendMessageTimeout(void); @@ -76,6 +77,7 @@ const struct test winetest_testlist[] = { "RedrawWindow", func_RedrawWindow }, { "RegisterHotKey", func_RegisterHotKey }, { "RegisterClassEx", func_RegisterClassEx }, + { "ScrollBarWndExtra", func_ScrollBarWndExtra }, { "ScrollDC", func_ScrollDC }, { "ScrollWindowEx", func_ScrollWindowEx }, { "SendMessageTimeout", func_SendMessageTimeout },

6 years, 5 months

[reactos] 01/02: [WIN32SS] Require at least the amount of extra memory, not the exact amount This fixes Civ II trying to create scrollbars based on 'native' scrollbars.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e022d8d7cb72bc611d699… commit e022d8d7cb72bc611d6990062ad0f2962c0cab1d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Jan 18 00:07:23 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Jan 21 22:25:29 2019 +0100 [WIN32SS] Require at least the amount of extra memory, not the exact amount This fixes Civ II trying to create scrollbars based on 'native' scrollbars. --- win32ss/user/ntuser/scrollbar.c | 2 +- win32ss/user/user32/controls/scrollbar.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/scrollbar.c b/win32ss/user/ntuser/scrollbar.c index 582a603c1f..325be6fe49 100644 --- a/win32ss/user/ntuser/scrollbar.c +++ b/win32ss/user/ntuser/scrollbar.c @@ -90,7 +90,7 @@ IntGetSBData(PWND pwnd, INT Bar) case SB_VERT: return &pSBInfo->Vert; case SB_CTL: - if ( pwnd->cbwndExtra != (sizeof(SBWND)-sizeof(WND)) ) + if ( pwnd->cbwndExtra < (sizeof(SBWND)-sizeof(WND)) ) { ERR("IntGetSBData Wrong Extra bytes for CTL Scrollbar!\n"); return 0; diff --git a/win32ss/user/user32/controls/scrollbar.c b/win32ss/user/user32/controls/scrollbar.c index 0a4913353c..3eb0242961 100644 --- a/win32ss/user/user32/controls/scrollbar.c +++ b/win32ss/user/user32/controls/scrollbar.c @@ -100,7 +100,7 @@ IntGetSBData(PWND pwnd, INT Bar) case SB_VERT: return &pSBInfo->Vert; case SB_CTL: - if ( pwnd->cbwndExtra != (sizeof(SBWND)-sizeof(WND)) ) + if ( pwnd->cbwndExtra < (sizeof(SBWND)-sizeof(WND)) ) { ERR("IntGetSBData Wrong Extra bytes for CTL Scrollbar!\n"); return 0; @@ -1186,7 +1186,7 @@ ScrollBarWndProc_common(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam if (!pWnd->fnid) { TRACE("ScrollBar CTL size %d\n", (sizeof(SBWND)-sizeof(WND))); - if ( pWnd->cbwndExtra != (sizeof(SBWND)-sizeof(WND)) ) + if ( pWnd->cbwndExtra < (sizeof(SBWND)-sizeof(WND)) ) { ERR("Wrong Extra bytes for Scrollbar!\n"); return 0;

6 years, 5 months

[reactos] 01/01: [SYSDM] Meh

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=342414c7d6f1c2b1f89a0… commit 342414c7d6f1c2b1f89a08b9d3b114d3022695e9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Jan 21 21:27:50 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Jan 21 21:27:50 2019 +0100 [SYSDM] Meh --- dll/cpl/sysdm/lang/fr-FR.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index 67b49df685..d802ef2a3a 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -298,8 +298,8 @@ BEGIN IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Entrez une valeur numérique pour la taille initiale du fichier d'échange." IDS_WARNMAXIMUMSIZE "Entrez une valeur numérique pour la taille maximale du fichier d'échange." - IDS_WARNINITIALRANGE "La taille initiale du fichier d'échange ne peut pas être inférieure à 16 Mo and ne doit pas dépasser l'espace libre total du disque. - IDS_WARNMAXIMUMRANGE "La taille maximale du fichier d'échange ne peut pas être inférieure à sa taille initiale, et ne peut pas être supérieur à 4095 Mo et ne peut pas dépasser l'espace libre total du disque." + IDS_WARNINITIALRANGE "La taille initiale du fichier d'échange ne peut pas être inférieure à 16 Mo and ne doit pas dépasser l'espace libre total du disque." + IDS_WARNMAXIMUMRANGE "La taille maximale du fichier d'échange ne peut pas être inférieure à sa taille initiale, et ne peut pas être supérieure à 4095 Mo et ne peut pas dépasser l'espace libre total du disque." IDS_PAGEFILE_NONE "Aucun" IDS_PAGEFILE_SYSTEM "Géré par le système" IDS_INFOREBOOT "Vous devez redémarrer le système pour appliquer les changements."

6 years, 5 months

[reactos] 01/01: [SYSDM] Update French translation

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d8f0aee5ced083f06fa3… commit 2d8f0aee5ced083f06fa3bdafe49b0f3fa96184e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Jan 21 21:16:11 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Jan 21 21:16:48 2019 +0100 [SYSDM] Update French translation --- dll/cpl/sysdm/lang/fr-FR.rc | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index 4037a2e853..67b49df685 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -10,9 +10,9 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 - LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "Temps d'activité :", IDC_STATIC, 4, 158, 86, 9 LTEXT "", IDC_UPTIME, 10, 170, 116, 9 - LTEXT "Machine:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "Machine :", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 @@ -57,19 +57,19 @@ BEGIN GROUPBOX "Démarrage et Récupération", IDC_STATIC, 6, 131, 244, 52 LTEXT "Les options Démarrage et Récupération indiquent à l'ordinateur comment démarrer et quoi faire si une erreur empêche l'ordinateur de s'arrêter.", IDC_STATIC, 16, 144, 210, 30 PUSHBUTTON "Réglages", IDC_STAREC, 194, 162, 50, 15 - PUSHBUTTON "System Settings", IDC_SYSSETTINGS, 6, 192, 80, 15 + PUSHBUTTON "Paramètres système", IDC_SYSSETTINGS, 6, 192, 80, 15 PUSHBUTTON "Variables d'en&vironnement", IDC_ENVVAR, 88, 192, 80, 15 PUSHBUTTON "Rapport d'e&rreurs", IDC_ERRORREPORT, 170, 192, 80, 15 END IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "System Settings" +CAPTION "Paramètres système" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41 - CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 + GROUPBOX "Information de version", IDC_STATIC, 6, 3, 210, 73 + LTEXT "ReactOS est construit comme un OS serveur et se présente comme tel. Cochez cette case pour changer ce comportement pour les applications.", IDC_STATIC, 15, 15, 183, 41 + CONTROL "Se présenter comme une station de travail", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END @@ -283,7 +283,7 @@ BEGIN IDS_PETABYTE "Po de RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" - IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" + IDS_UPTIME_FORMAT "%u jours, %02u:%02u:%02u" IDS_VARIABLE "Variable" IDS_VALUE "Valeur" IDS_NO_DUMP "(Aucun)" @@ -296,17 +296,17 @@ BEGIN IDS_USERPROFILE_STATUS "Statut" IDS_USERPROFILE_MODIFIED "Modifié" IDS_MESSAGEBOXTITLE "System control panel applet" - IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." - IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." - IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 16 MB and must not exceed the available space on the selected drive." - IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size, must not be larger than 4095 MB and must not exceed the available space on the selected drive." + IDS_WARNINITIALSIZE "Entrez une valeur numérique pour la taille initiale du fichier d'échange." + IDS_WARNMAXIMUMSIZE "Entrez une valeur numérique pour la taille maximale du fichier d'échange." + IDS_WARNINITIALRANGE "La taille initiale du fichier d'échange ne peut pas être inférieure à 16 Mo and ne doit pas dépasser l'espace libre total du disque. + IDS_WARNMAXIMUMRANGE "La taille maximale du fichier d'échange ne peut pas être inférieure à sa taille initiale, et ne peut pas être supérieur à 4095 Mo et ne peut pas dépasser l'espace libre total du disque." IDS_PAGEFILE_NONE "Aucun" - IDS_PAGEFILE_SYSTEM "System Managed" - IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes." + IDS_PAGEFILE_SYSTEM "Géré par le système" + IDS_INFOREBOOT "Vous devez redémarrer le système pour appliquer les changements." IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] - IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" - IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" - IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." - IDS_HWPROFILE_PROFILE "Profile" - IDS_HWPROFILE_WARNING "Warning" + IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirmation de suppression" + IDS_HWPROFILE_CONFIRM_DELETE "Êtes-vous sûre de vouloir supprimer le profil matériel ""%s"" ?" + IDS_HWPROFILE_ALREADY_IN_USE "Le nom de profil est déjà utilisé." + IDS_HWPROFILE_PROFILE "Profil" + IDS_HWPROFILE_WARNING "Attention" END

6 years, 5 months

[reactos] 02/02: [DBGHELP_APITEST] Skip the test when the function is not found

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c296ee510f6ecfa15f393… commit c296ee510f6ecfa15f3939ce20faa101d12fa5a0 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jan 13 19:41:51 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Jan 21 20:42:16 2019 +0100 [DBGHELP_APITEST] Skip the test when the function is not found --- modules/rostests/apitests/dbghelp/pdb.c | 44 ++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/modules/rostests/apitests/dbghelp/pdb.c b/modules/rostests/apitests/dbghelp/pdb.c index 2db3935fe4..8f4988ac0c 100644 --- a/modules/rostests/apitests/dbghelp/pdb.c +++ b/modules/rostests/apitests/dbghelp/pdb.c @@ -11,6 +11,7 @@ #include <dbghelp.h> #include <cvconst.h> // SymTagXXX #include <stdio.h> +#include <delayimp.h> #include "wine/test.h" @@ -189,6 +190,37 @@ static void init_dbghelp_version() LOWORD(fileInfo.dwProductVersionLS)); } +static +int g_SymRegisterCallbackW64NotFound = 0; + +static +BOOL WINAPI SymRegisterCallbackW64_Stub(HANDLE hProcess, PSYMBOL_REGISTERED_CALLBACK64 CallbackFunction, ULONG64 UserContext) +{ + g_SymRegisterCallbackW64NotFound++; + return FALSE; +} + +/* A delay-load failure hook will be called when resolving a delay-load dependency (dll or function) fails */ +FARPROC WINAPI DliFailHook(unsigned dliNotify, PDelayLoadInfo pdli) +{ + /* Was the failure a function, and did we get info */ + if (dliNotify == dliFailGetProc && pdli) + { + /* Is it our function? */ + if (pdli->dlp.fImportByName && !strcmp(pdli->dlp.szProcName, "SymRegisterCallbackW64")) + { + /* Redirect execution to the stub */ + return (FARPROC)SymRegisterCallbackW64_Stub; + } + } + /* This is not the function you are looking for, continue default behavior (throw exception) */ + return NULL; +} + +/* Register the failure hook using the magic name '__pfnDliFailureHook2'. */ +PfnDliHook __pfnDliFailureHook2 = DliFailHook; + + /* Maybe our dbghelp.dll is too old? */ static BOOL can_enumerate(HANDLE hProc, DWORD64 BaseAddress) { @@ -544,18 +576,12 @@ static void test_SymRegCallback(HANDLE hProc, const char* szModuleName, BOOL tes } else { - // dbghelp fileversion 5.2.3790.3959 - // SymRegisterCallbackW64 crash only happens on real Windows 2003 - // Fileversion 5.2.3790.3959 is used in Windows 2003. - // In ROS there is no crash. - // I could not figure out whats wrong. - if ((dbghelpFileVer.dwProductVersionMS == MAKELONG(2, 5)) && - (dbghelpFileVer.dwProductVersionLS == MAKELONG(3959, 3790))) + Ret = SymRegisterCallbackW64(hProc, SymRegisterCallback64Proc, (ULONG_PTR)&ctx); + if (g_SymRegisterCallbackW64NotFound) { - skip("dbghelp.dll ver 5.2.3790.3959 (w2k3), SymRegisterCallbackW64 would crash!\n"); + skip("SymRegisterCallbackW64 not found in dbghelp.dll\n"); return; } - Ret = SymRegisterCallbackW64(hProc, SymRegisterCallback64Proc, (ULONG_PTR)&ctx); } ok_int(Ret, TRUE);

6 years, 5 months

[reactos] 01/02: [DBGHELP_APITEST] Add test for SymRegisterCallbackW64.

by Andreas Maier

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=184255ffdb8f025558e4a… commit 184255ffdb8f025558e4a0c6ce4f35977a5a4945 Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Fri Dec 28 23:33:22 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Jan 21 20:42:15 2019 +0100 [DBGHELP_APITEST] Add test for SymRegisterCallbackW64. --- modules/rostests/apitests/dbghelp/CMakeLists.txt | 2 +- modules/rostests/apitests/dbghelp/pdb.c | 226 +++++++++++++++++++++++ 2 files changed, 227 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/dbghelp/CMakeLists.txt b/modules/rostests/apitests/dbghelp/CMakeLists.txt index fdc6833270..0b98817524 100644 --- a/modules/rostests/apitests/dbghelp/CMakeLists.txt +++ b/modules/rostests/apitests/dbghelp/CMakeLists.txt @@ -16,5 +16,5 @@ add_executable(dbghelp_apitest ${SOURCE} resource.rc) set_module_type(dbghelp_apitest win32cui) target_link_libraries(dbghelp_apitest zlib) add_delay_importlibs(dbghelp_apitest dbghelp) -add_importlibs(dbghelp_apitest msvcrt kernel32 ntdll) +add_importlibs(dbghelp_apitest version msvcrt kernel32 ntdll) add_rostests_file(TARGET dbghelp_apitest) diff --git a/modules/rostests/apitests/dbghelp/pdb.c b/modules/rostests/apitests/dbghelp/pdb.c index 64942c1d39..2db3935fe4 100644 --- a/modules/rostests/apitests/dbghelp/pdb.c +++ b/modules/rostests/apitests/dbghelp/pdb.c @@ -57,6 +57,137 @@ static void deinit_sym() ((PSYMBOL_INFO)(buff))->MaxNameLen = MAX_SYM_NAME; \ } while (0) +/* modified copy of function from apitests/apphelp/apitest.c */ +BOOL get_module_version( + _In_ HMODULE mod, + _Out_ VS_FIXEDFILEINFO *fileinfo) +{ + BOOL res = FALSE; + HRSRC hResInfo; + char *errmsg; + DWORD dwSize, errcode = 0; + UINT uLen; + HGLOBAL hResData = 0; + LPVOID pRes = NULL; + HLOCAL pResCopy = 0; + VS_FIXEDFILEINFO *lpFfi; + + if (fileinfo == NULL) + { + errmsg = "fileinfo is NULL.\n"; + goto cleanup; + } + + hResInfo = FindResource(mod, MAKEINTRESOURCE(VS_VERSION_INFO), RT_VERSION); + if (hResInfo == 0) + { + errmsg = "FindResource failed"; + errcode = GetLastError(); + goto cleanup; + } + + dwSize = SizeofResource(mod, hResInfo); + if (dwSize == 0) + { + errmsg = "SizeofResource failed"; + errcode = GetLastError(); + goto cleanup; + } + + hResData = LoadResource(mod, hResInfo); + if (hResData == 0) + { + errmsg = "LoadResource failed"; + errcode = GetLastError(); + goto cleanup; + } + + pRes = LockResource(hResData); + if (pRes == NULL) + { + errmsg = "LockResource failed"; + errcode = GetLastError(); + goto cleanup; + } + + pResCopy = LocalAlloc(LMEM_FIXED, dwSize); + if (pResCopy == NULL) + { + errmsg = "LocalAlloc failed"; + errcode = GetLastError(); + goto cleanup; + } + + CopyMemory(pResCopy, pRes, dwSize); + + if (VerQueryValueW(pResCopy, L"\\", (LPVOID*)&lpFfi, &uLen)) + { + *fileinfo = *lpFfi; + res = TRUE; + } + +cleanup: + /* cleanup */ + if (hResData != 0) + FreeResource(hResData); + if (pResCopy != NULL) + LocalFree(pResCopy); + /* if it was good */ + if (res == TRUE) + return TRUE; + /* failure path */ + if (errcode == 0) + trace("get_module_version - %s.\n", errmsg); + else + trace("get_module_version - %s (lasterror %d).\n", errmsg, errcode); + return FALSE; +} + +static VS_FIXEDFILEINFO dbghelpFileVer; +static void init_dbghelp_version() +{ + LPAPI_VERSION v; + WCHAR filenameW[MAX_PATH + 1]; + HMODULE hDLL; + DWORD fileLen; + VS_FIXEDFILEINFO fileInfo; + + memset(&dbghelpFileVer, 0, sizeof(dbghelpFileVer)); + + /* get internal file version */ + v = ImagehlpApiVersion(); + if (v == NULL) + return; + + /* get module file version */ + hDLL = GetModuleHandleW(L"dbghelp.dll"); + if (hDLL == 0) + { + ok(FALSE, "Dbghelp.dll is not loaded!\n"); + return; + } + if (!get_module_version(hDLL, &fileInfo)) + memset(&fileInfo, 0, sizeof(fileInfo)); + dbghelpFileVer = fileInfo; + + /* get full file path */ + fileLen = GetModuleFileNameW(hDLL, filenameW, MAX_PATH + 1); + if (fileLen == 0) + { + ok(FALSE, "GetModuleFileNameW for dbghelp.dll failed!\n"); + return; + } + + trace("Using %S\n", filenameW); + trace(" API-Version: %hu.%hu.%hu (%hu)\n", + v->MajorVersion, v->MinorVersion, v->Revision, v->Reserved); + + trace(" Fileversion: %hu.%hu.%hu.%hu\n", + HIWORD(fileInfo.dwProductVersionMS), + LOWORD(fileInfo.dwProductVersionMS), + HIWORD(fileInfo.dwProductVersionLS), + LOWORD(fileInfo.dwProductVersionLS)); +} /* Maybe our dbghelp.dll is too old? */ static BOOL can_enumerate(HANDLE hProc, DWORD64 BaseAddress) @@ -353,6 +484,96 @@ static void test_SymEnumSymbols(HANDLE hProc, const char* szModuleName) deinit_sym(); } +typedef struct _symregcallback_context +{ + UINT idx; + BOOL isANSI; +} symregcallback_context; + +static struct _symregcallback_test_data { + ULONG ActionCode; + const char* Name; +} symregcallback_test_data[] = { + { CBA_DEFERRED_SYMBOL_LOAD_CANCEL }, + { CBA_DEFERRED_SYMBOL_LOAD_START }, + { CBA_READ_MEMORY }, + { CBA_DEFERRED_SYMBOL_LOAD_PARTIAL }, + { CBA_DEFERRED_SYMBOL_LOAD_COMPLETE } +}; + +static BOOL CALLBACK SymRegisterCallback64Proc( + HANDLE hProcess, + ULONG ActionCode, + ULONG64 CallbackData, + ULONG64 UserContext) +{ + symregcallback_context *ctx; + ctx = (symregcallback_context*)(ULONG_PTR)UserContext; + + if (ctx->idx > sizeof(symregcallback_test_data)) + { + ok(FALSE, "SymRegisterCallback64Proc: Too many calls.\n"); + } + else + { + ok(ActionCode == symregcallback_test_data[ctx->idx].ActionCode, + "ActionCode (idx %u) expected %u, got %u\n", + ctx->idx, symregcallback_test_data[ctx->idx].ActionCode, ActionCode); + } + ctx->idx++; + + return FALSE; +} + +static void test_SymRegCallback(HANDLE hProc, const char* szModuleName, BOOL testANSI) +{ + BOOL Ret; + DWORD dwErr; + ULONG64 BaseAddress; + symregcallback_context ctx; + + ctx.idx = 0; + ctx.isANSI = testANSI; + + if (!init_sym()) + return; + + if (testANSI) + { + Ret = SymRegisterCallback64(hProc, SymRegisterCallback64Proc, (ULONG_PTR)&ctx); + } + else + { + // dbghelp fileversion 5.2.3790.3959 + // SymRegisterCallbackW64 crash only happens on real Windows 2003 + // Fileversion 5.2.3790.3959 is used in Windows 2003. + // In ROS there is no crash. + // I could not figure out whats wrong. + if ((dbghelpFileVer.dwProductVersionMS == MAKELONG(2, 5)) && + (dbghelpFileVer.dwProductVersionLS == MAKELONG(3959, 3790))) + { + skip("dbghelp.dll ver 5.2.3790.3959 (w2k3), SymRegisterCallbackW64 would crash!\n"); + return; + } + Ret = SymRegisterCallbackW64(hProc, SymRegisterCallback64Proc, (ULONG_PTR)&ctx); + } + + ok_int(Ret, TRUE); + if (!Ret) + return; + + SetLastError(ERROR_SUCCESS); + BaseAddress = SymLoadModule64(hProc, NULL, szModuleName, NULL, 0x600000, 0); + dwErr = GetLastError(); + + ok_ulonglong(BaseAddress, 0x600000); + ok_hex(dwErr, ERROR_SUCCESS); + + /* this is what we want to test ... we expect 5 calls */ + ok_int(ctx.idx, 5); + + deinit_sym(); +} START_TEST(pdb) { @@ -370,9 +591,14 @@ START_TEST(pdb) return; } + init_dbghelp_version(); + test_SymFromName(proc(), szDllName); test_SymFromAddr(proc(), szDllName); test_SymEnumSymbols(proc(), szDllName); + test_SymRegCallback(proc(), szDllName, TRUE); + test_SymRegCallback(proc(), szDllName, FALSE); cleanup_msvc_exe(); + }

6 years, 5 months

[reactos] 01/01: [APITESTS][WIN32KNT_APITEST] Improve NtGdiArcInternal testcase (#1276)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=289705caa615782eea8a9… commit 289705caa615782eea8a9257754e0f0034de95ab Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 22 01:39:05 2019 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jan 21 17:39:05 2019 +0100 [APITESTS][WIN32KNT_APITEST] Improve NtGdiArcInternal testcase (#1276) Use ok_int() and ok_long() macros instead of obsolete TEST() macro. --- .../apitests/win32nt/ntgdi/NtGdiArcInternal.c | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c index 074d4117c3..7720145f23 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c @@ -12,28 +12,28 @@ START_TEST(NtGdiArcInternal) HDC hDC = CreateDCW(L"Display",NULL,NULL,NULL); SetLastError(ERROR_SUCCESS); - TEST(NtGdiArcInternal(0, 0, 0, 0, 0, 0, 0, 0, 0, 0) == FALSE); - TEST(GetLastError() == ERROR_INVALID_HANDLE); + ok_int(NtGdiArcInternal(0, 0, 0, 0, 0, 0, 0, 0, 0, 0), FALSE); + ok_long(GetLastError(), ERROR_INVALID_HANDLE); SetLastError(ERROR_SUCCESS); - TEST(NtGdiArcInternal(0, hDC, 0, 0, 0, 0, 0, 0, 0, 0) == TRUE); - TEST(NtGdiArcInternal(1, hDC, 0, 0, 0, 0, 0, 0, 0, 0) == TRUE); - TEST(NtGdiArcInternal(2, hDC, 0, 0, 0, 0, 0, 0, 0, 0) == TRUE); - TEST(NtGdiArcInternal(3, hDC, 0, 0, 0, 0, 0, 0, 0, 0) == TRUE); - TEST(GetLastError() == ERROR_SUCCESS); + ok_int(NtGdiArcInternal(0, hDC, 0, 0, 0, 0, 0, 0, 0, 0), TRUE); + ok_int(NtGdiArcInternal(1, hDC, 0, 0, 0, 0, 0, 0, 0, 0), TRUE); + ok_int(NtGdiArcInternal(2, hDC, 0, 0, 0, 0, 0, 0, 0, 0), TRUE); + ok_int(NtGdiArcInternal(3, hDC, 0, 0, 0, 0, 0, 0, 0, 0), TRUE); + ok_long(GetLastError(), ERROR_SUCCESS); SetLastError(ERROR_SUCCESS); - TEST(NtGdiArcInternal(4, hDC, 0, 0, 0, 0, 0, 0, 0, 0) == FALSE); - TEST(GetLastError() == ERROR_INVALID_PARAMETER); + ok_int(NtGdiArcInternal(4, hDC, 0, 0, 0, 0, 0, 0, 0, 0), FALSE); + ok_long(GetLastError(), ERROR_INVALID_PARAMETER); SetLastError(ERROR_SUCCESS); - TEST(NtGdiArcInternal(4, (HDC)10, 0, 0, 0, 0, 0, 0, 0, 0) == FALSE); - TEST(GetLastError() == ERROR_INVALID_HANDLE); + ok_int(NtGdiArcInternal(4, (HDC)10, 0, 0, 0, 0, 0, 0, 0, 0), FALSE); + ok_long(GetLastError(), ERROR_INVALID_HANDLE); SetLastError(ERROR_SUCCESS); - TEST(NtGdiArcInternal(0, hDC, 10, 10, 0, 0, 0, 0, 0, 0) == TRUE); - TEST(NtGdiArcInternal(0, hDC, 10, 10, -10, -10, 0, 0, 0, 0) == TRUE); - TEST(NtGdiArcInternal(0, hDC, 0, 0, 0, 0, 10, 0, -10, 0) == TRUE); + ok_int(NtGdiArcInternal(0, hDC, 10, 10, 0, 0, 0, 0, 0, 0), TRUE); + ok_int(NtGdiArcInternal(0, hDC, 10, 10, -10, -10, 0, 0, 0, 0), TRUE); + ok_int(NtGdiArcInternal(0, hDC, 0, 0, 0, 0, 10, 0, -10, 0), TRUE); // was passiert, wenn left > right ? einfach tauschen?

6 years, 5 months

[reactos] 01/01: [APITESTS][WIN32KNT_APITEST] Use ok_long for NtGdiGetBitmapBits/NtGdiSetBitmapBits (#1275)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6846527f67243a3df2779… commit 6846527f67243a3df27791625cd2e00d90e090cd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 22 01:38:20 2019 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jan 21 17:38:20 2019 +0100 [APITESTS][WIN32KNT_APITEST] Use ok_long for NtGdiGetBitmapBits/NtGdiSetBitmapBits (#1275) --- .../apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c | 36 +++++++++++----------- .../apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c | 36 +++++++++++----------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c index 07f4010ec4..51520b433b 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c @@ -13,56 +13,56 @@ START_TEST(NtGdiGetBitmapBits) HBITMAP hBitmap; SetLastError(ERROR_SUCCESS); - RTEST(NtGdiGetBitmapBits(0, 0, 0) == 0); - RTEST(GetLastError() == ERROR_INVALID_HANDLE); + ok_long(NtGdiGetBitmapBits(0, 0, 0), 0); + ok_long(GetLastError(), ERROR_INVALID_HANDLE); /* Test NULL bitmap handle */ SetLastError(ERROR_SUCCESS); - RTEST(NtGdiGetBitmapBits(0, 5, Bits) == 0); - RTEST(GetLastError() == ERROR_INVALID_HANDLE); + ok_long(NtGdiGetBitmapBits(0, 5, Bits), 0); + ok_long(GetLastError(), ERROR_INVALID_HANDLE); /* Test invalid bitmap handle */ hBitmap = (HBITMAP)CreatePen(PS_SOLID, 1, RGB(1,2,3)); SetLastError(ERROR_SUCCESS); - RTEST(NtGdiGetBitmapBits(hBitmap, 5, Bits) == 0); - RTEST(GetLastError() == ERROR_INVALID_HANDLE); + ok_long(NtGdiGetBitmapBits(hBitmap, 5, Bits), 0); + ok_long(GetLastError(), ERROR_INVALID_HANDLE); DeleteObject(hBitmap); hBitmap = CreateBitmap(3, 3, 1, 8, NULL); SetLastError(ERROR_SUCCESS); /* test NULL pointer and count buffer size != 0 */ - RTEST(NtGdiGetBitmapBits(hBitmap, 5, NULL) == 12); + ok_long(NtGdiGetBitmapBits(hBitmap, 5, NULL), 12); /* test NULL pointer and buffer size == 0*/ - RTEST(NtGdiGetBitmapBits(hBitmap, 0, NULL) == 12); + ok_long(NtGdiGetBitmapBits(hBitmap, 0, NULL), 12); /* test bad pointer */ - RTEST(NtGdiGetBitmapBits(hBitmap, 5, (PBYTE)0x500) == 0); + ok_long(NtGdiGetBitmapBits(hBitmap, 5, (PBYTE)0x500), 0); /* Test if we can set a number of bytes between lines */ - RTEST(NtGdiGetBitmapBits(hBitmap, 5, Bits) == 5); + ok_long(NtGdiGetBitmapBits(hBitmap, 5, Bits), 5); /* Test alignment */ - RTEST(NtGdiGetBitmapBits(hBitmap, 4, Bits+1) == 4); + ok_long(NtGdiGetBitmapBits(hBitmap, 4, Bits+1), 4); /* Test 1 byte too much */ - RTEST(NtGdiGetBitmapBits(hBitmap, 10, Bits) == 10); + ok_long(NtGdiGetBitmapBits(hBitmap, 10, Bits), 10); /* Test one row too much */ - RTEST(NtGdiGetBitmapBits(hBitmap, 12, Bits) == 12); + ok_long(NtGdiGetBitmapBits(hBitmap, 12, Bits), 12); - RTEST(NtGdiGetBitmapBits(hBitmap, 13, Bits) == 12); + ok_long(NtGdiGetBitmapBits(hBitmap, 13, Bits), 12); - RTEST(NtGdiGetBitmapBits(hBitmap, 100, Bits) == 12); + ok_long(NtGdiGetBitmapBits(hBitmap, 100, Bits), 12); /* Test huge bytes count */ - RTEST(NtGdiGetBitmapBits(hBitmap, 12345678, Bits) == 12); + ok_long(NtGdiGetBitmapBits(hBitmap, 12345678, Bits), 12); /* Test negative bytes count */ - RTEST(NtGdiGetBitmapBits(hBitmap, -5, Bits) == 12); + ok_long(NtGdiGetBitmapBits(hBitmap, -5, Bits), 12); - RTEST(GetLastError() == ERROR_SUCCESS); + ok_long(GetLastError(), ERROR_SUCCESS); DeleteObject(hBitmap); } diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c index 4675f55c7d..6924492bf9 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c @@ -13,56 +13,56 @@ START_TEST(NtGdiSetBitmapBits) HBITMAP hBitmap; SetLastError(ERROR_SUCCESS); - RTEST(NtGdiSetBitmapBits(0, 0, 0) == 0); - RTEST(GetLastError() == ERROR_SUCCESS); + ok_long(NtGdiSetBitmapBits(0, 0, 0), 0); + ok_long(GetLastError(), ERROR_SUCCESS); /* Test NULL bitnap handle */ SetLastError(ERROR_SUCCESS); - RTEST(NtGdiSetBitmapBits(0, 5, Bits) == 0); - RTEST(GetLastError() == ERROR_INVALID_HANDLE); + ok_long(NtGdiSetBitmapBits(0, 5, Bits), 0); + ok_long(GetLastError(), ERROR_INVALID_HANDLE); /* Test invalid bitmap handle */ hBitmap = (HBITMAP)CreatePen(PS_SOLID, 1, RGB(1,2,3)); SetLastError(ERROR_SUCCESS); - RTEST(NtGdiSetBitmapBits(hBitmap, 5, Bits) == 0); - RTEST(GetLastError() == ERROR_INVALID_HANDLE); + ok_long(NtGdiSetBitmapBits(hBitmap, 5, Bits), 0); + ok_long(GetLastError(), ERROR_INVALID_HANDLE); DeleteObject(hBitmap); hBitmap = CreateBitmap(3, 3, 1, 8, NULL); SetLastError(ERROR_SUCCESS); /* test NULL pointer and count buffer size != 0 */ - RTEST(NtGdiSetBitmapBits(hBitmap, 5, NULL) == 0); + ok_long(NtGdiSetBitmapBits(hBitmap, 5, NULL), 0); /* test NULL pointer and buffer size == 0*/ - RTEST(NtGdiSetBitmapBits(hBitmap, 0, NULL) == 0); + ok_long(NtGdiSetBitmapBits(hBitmap, 0, NULL), 0); /* test bad pointer */ - RTEST(NtGdiSetBitmapBits(hBitmap, 5, (PBYTE)0x500) == 0); + ok_long(NtGdiSetBitmapBits(hBitmap, 5, (PBYTE)0x500), 0); /* Test if we can set a number of bytes between lines */ - RTEST(NtGdiSetBitmapBits(hBitmap, 5, Bits) == 5); + ok_long(NtGdiSetBitmapBits(hBitmap, 5, Bits), 5); /* Test alignment */ - RTEST(NtGdiSetBitmapBits(hBitmap, 4, Bits+1) == 4); + ok_long(NtGdiSetBitmapBits(hBitmap, 4, Bits+1), 4); /* Test 1 byte too much */ - RTEST(NtGdiSetBitmapBits(hBitmap, 10, Bits) == 10); + ok_long(NtGdiSetBitmapBits(hBitmap, 10, Bits), 10); /* Test one row too much */ - RTEST(NtGdiSetBitmapBits(hBitmap, 12, Bits) == 12); + ok_long(NtGdiSetBitmapBits(hBitmap, 12, Bits), 12); - RTEST(NtGdiSetBitmapBits(hBitmap, 13, Bits) == 12); + ok_long(NtGdiSetBitmapBits(hBitmap, 13, Bits), 12); - RTEST(NtGdiSetBitmapBits(hBitmap, 100, Bits) == 12); + ok_long(NtGdiSetBitmapBits(hBitmap, 100, Bits), 12); /* Test huge bytes count */ - TEST(NtGdiSetBitmapBits(hBitmap, 12345678, Bits) == 0); + ok_long(NtGdiSetBitmapBits(hBitmap, 12345678, Bits), 0); /* Test negative bytes count */ - RTEST(NtGdiSetBitmapBits(hBitmap, -5, Bits) == 0); + ok_long(NtGdiSetBitmapBits(hBitmap, -5, Bits), 0); - RTEST(GetLastError() == ERROR_SUCCESS); + ok_long(GetLastError(), ERROR_SUCCESS); DeleteObject(hBitmap); }

6 years, 5 months

← Newer
1
...
12
13
14
15
16
17
18
...
30
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 January 2019