August 2017 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : msvcrt/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: d379dc4cb0428cfcf5cd71a17e905fb7c26780ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=d379dc4cb0428cfcf5cd71a17… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 1 01:26:05 2017 +0000 msvcrt/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 2c356ea..d92a6e4 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -184,11 +184,11 @@ static void test_fileops( void ) rewind(file); ok(fgetpos(file,&pos) == 0, "fgetpos failed unexpected for bufmode=%x\n", bufmodes[bufmode]); - ok(pos == 0, "Unexpected result of fgetpos %x%08x for bufmode=%x\n", (DWORD)(pos >> 32), (DWORD)pos, bufmodes[bufmode]); + ok(pos == 0, "Unexpected result of fgetpos %s for bufmode=%x\n", wine_dbgstr_longlong(pos), bufmodes[bufmode]); pos = sizeof (outbuffer); ok(fsetpos(file, &pos) == 0, "fsetpos failed unexpected for bufmode=%x\n", bufmodes[bufmode]); ok(fgetpos(file,&pos) == 0, "fgetpos failed unexpected for bufmode=%x\n", bufmodes[bufmode]); - ok(pos == sizeof (outbuffer), "Unexpected result of fgetpos %x%08x for bufmode=%x\n", (DWORD)(pos >> 32), (DWORD)pos, bufmodes[bufmode]); + ok(pos == sizeof (outbuffer), "Unexpected result of fgetpos %s for bufmode=%x\n", wine_dbgstr_longlong(pos), bufmodes[bufmode]); fclose (file); }

1 0

Alex Henrie : msvcrt: Set errno through the _matherr function.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: 994c071a11aaeca933a726df97cf5383b11b9965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=994c071a11aaeca933a726df9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 1 23:51:36 2017 -0600 msvcrt: Set errno through the _matherr function. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 262 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 164 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=994c071a11aaeca933a72…

1 0

Alex Henrie : ucrtbase/tests: Add tests for math function errors.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: 3bca09ee386e1ea332da2a9760f2eeb729c6031b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bca09ee386e1ea332da2a976… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 1 23:51:37 2017 -0600 ucrtbase/tests: Add tests for math function errors. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 218 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 217 insertions(+), 1 deletion(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index c70e4b6..04718c9 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -55,6 +55,22 @@ expect_ ## func = called_ ## func = FALSE; \ }while(0) +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() + +#define M_PI_2 1.57079632679489661923 + +#define FE_TONEAREST 0 + +#define _DOMAIN 1 /* domain error in argument */ +#define _SING 2 /* singularity */ +#define _OVERFLOW 3 /* range overflow */ +#define _UNDERFLOW 4 /* range underflow */ + DEFINE_EXPECT(global_invalid_parameter_handler); DEFINE_EXPECT(thread_invalid_parameter_handler); @@ -72,6 +88,18 @@ typedef struct MSVCRT__lldiv_t { LONGLONG rem; /* remainder */ } MSVCRT_lldiv_t; +typedef struct MSVCRT__exception { + int type; + char* name; + double arg1; + double arg2; + double retval; +} MSVCRT__exception; + +typedef int (CDECL *MSVCRT_matherr_func)(struct MSVCRT__exception *); + +static HMODULE module; + static int (CDECL *p_initialize_onexit_table)(MSVCRT__onexit_table_t *table); static int (CDECL *p_register_onexit_function)(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func); static int (CDECL *p_execute_onexit_table)(MSVCRT__onexit_table_t *table); @@ -92,6 +120,9 @@ static int (CDECL *p__isblank_l)(int,_locale_t); static int (CDECL *p__iswctype_l)(int,int,_locale_t); static int (CDECL *p_iswblank)(int); static int (CDECL *p__iswblank_l)(wint_t,_locale_t); +static int (CDECL *p_fesetround)(int); +static void (CDECL *p___setusermatherr)(MSVCRT_matherr_func); +static int* (CDECL *p_errno)(void); static void test__initialize_onexit_table(void) { @@ -365,7 +396,7 @@ static void test__get_narrow_winmain_command_line(char *path) static BOOL init(void) { - HMODULE module = LoadLibraryA("ucrtbase.dll"); + module = LoadLibraryA("ucrtbase.dll"); if(!module) { win_skip("ucrtbase.dll not available\n"); @@ -392,6 +423,9 @@ static BOOL init(void) p__iswctype_l = (void*)GetProcAddress(module, "_iswctype_l"); p_iswblank = (void*)GetProcAddress(module, "iswblank"); p__iswblank_l = (void*)GetProcAddress(module, "_iswblank_l"); + p_fesetround = (void*)GetProcAddress(module, "fesetround"); + p___setusermatherr = (void*)GetProcAddress(module, "__setusermatherr"); + p_errno = (void*)GetProcAddress(module, "_errno"); return TRUE; } @@ -509,6 +543,187 @@ static void test_isblank(void) } } +static struct MSVCRT__exception exception; + +static int CDECL matherr_callback(struct MSVCRT__exception *e) +{ + memcpy(&exception, e, sizeof(MSVCRT__exception)); + return 0; +} + +static void test_math_errors(void) +{ + const struct { + char func[16]; + double x; + int error; + int exception; + } testsd[] = { + {"_logb", -INFINITY, -1, -1}, + {"_logb", -1, -1, -1}, + {"_logb", 0, ERANGE, _SING}, + {"_logb", INFINITY, -1, -1}, + {"acos", -INFINITY, EDOM, _DOMAIN}, + {"acos", -2, EDOM, _DOMAIN}, + {"acos", -1, -1, -1}, + {"acos", 1, -1, -1}, + {"acos", 2, EDOM, _DOMAIN}, + {"acos", INFINITY, EDOM, _DOMAIN}, + {"acosh", -INFINITY, EDOM, -1}, + {"acosh", 0, EDOM, -1}, + {"acosh", 1, -1, -1}, + {"acosh", INFINITY, -1, -1}, + {"asin", -INFINITY, EDOM, _DOMAIN}, + {"asin", -2, EDOM, _DOMAIN}, + {"asin", -1, -1, -1}, + {"asin", 1, -1, -1}, + {"asin", 2, EDOM, _DOMAIN}, + {"asin", INFINITY, EDOM, _DOMAIN}, + {"asinh", -INFINITY, -1, -1}, + {"asinh", INFINITY, -1, -1}, + {"atan", -INFINITY, -1, -1}, + {"atan", 0, -1, -1}, + {"atan", INFINITY, -1, -1}, + {"atanh", -INFINITY, EDOM, -1}, + {"atanh", -2, EDOM, -1}, + {"atanh", -1, ERANGE, -1}, + {"atanh", 1, ERANGE, -1}, + {"atanh", 2, EDOM, -1}, + {"atanh", INFINITY, EDOM, -1}, + {"cos", -INFINITY, EDOM, _DOMAIN}, + {"cos", INFINITY, EDOM, _DOMAIN}, + {"cosh", -INFINITY, -1, -1}, + {"cosh", 0, -1, -1}, + {"cosh", INFINITY, -1, -1}, + {"exp", -INFINITY, -1, -1}, + {"exp", -1e100, -1, _UNDERFLOW}, + {"exp", 1e100, ERANGE, _OVERFLOW}, + {"exp", INFINITY, -1, -1}, + {"exp2", -INFINITY, -1, -1}, + {"exp2", -1e100, -1, -1}, + {"exp2", 1e100, ERANGE, -1}, + {"exp2", INFINITY, -1, -1}, + {"expm1", -INFINITY, -1, -1}, + {"expm1", INFINITY, -1, -1}, + {"log", -INFINITY, EDOM, _DOMAIN}, + {"log", -1, EDOM, _DOMAIN}, + {"log", 0, ERANGE, _SING}, + {"log", INFINITY, -1, -1}, + {"log10", -INFINITY, EDOM, _DOMAIN}, + {"log10", -1, EDOM, _DOMAIN}, + {"log10", 0, ERANGE, _SING}, + {"log10", INFINITY, -1, -1}, + {"log1p", -INFINITY, EDOM, -1}, + {"log1p", -2, EDOM, -1}, + {"log1p", -1, ERANGE, -1}, + {"log1p", INFINITY, -1, -1}, + {"log2", INFINITY, -1, -1}, + {"sin", -INFINITY, EDOM, _DOMAIN}, + {"sin", INFINITY, EDOM, _DOMAIN}, + {"sinh", -INFINITY, -1, -1}, + {"sinh", 0, -1, -1}, + {"sinh", INFINITY, -1, -1}, + {"sqrt", -INFINITY, EDOM, _DOMAIN}, + {"sqrt", -1, EDOM, _DOMAIN}, + {"sqrt", 0, -1, -1}, + {"sqrt", INFINITY, -1, -1}, + {"tan", -INFINITY, EDOM, _DOMAIN}, + {"tan", -M_PI_2, -1, -1}, + {"tan", M_PI_2, -1, -1}, + {"tan", INFINITY, EDOM, _DOMAIN}, + {"tanh", -INFINITY, -1, -1}, + {"tanh", 0, -1, -1}, + {"tanh", INFINITY, -1, -1}, + }; + const struct { + char func[16]; + double a; + double b; + int error; + int exception; + } tests2d[] = { + {"atan2", -INFINITY, 0, -1, -1}, + {"atan2", 0, 0, -1, -1}, + {"atan2", INFINITY, 0, -1, -1}, + {"atan2", 0, -INFINITY, -1, -1}, + {"atan2", 0, INFINITY, -1, -1}, + }; + const struct { + char func[16]; + double a; + long b; + int error; + int exception; + } testsdl[] = { + {"_scalb", -INFINITY, 1, -1, -1}, + {"_scalb", -1e100, 1, -1, -1}, + {"_scalb", 1e100, 1, -1, -1}, + {"_scalb", INFINITY, 1, -1, -1}, + {"_scalb", 1, 1e9, ERANGE, _OVERFLOW}, + {"ldexp", -INFINITY, 1, -1, -1}, + {"ldexp", -1e100, 1, -1, -1}, + {"ldexp", 1e100, 1, -1, -1}, + {"ldexp", INFINITY, 1, -1, -1}, + {"ldexp", 1, -1e9, -1, _UNDERFLOW}, + {"ldexp", 1, 1e9, ERANGE, _OVERFLOW}, + }; + double (CDECL *p_funcd)(double); + double (CDECL *p_func2d)(double, double); + double (CDECL *p_funcdl)(double, long); + int i; + + p___setusermatherr(matherr_callback); + + /* necessary so that exp(1e100)==INFINITY on glibc, we can remove this if we change our implementation */ + p_fesetround(FE_TONEAREST); + + for(i = 0; i < sizeof(testsd)/sizeof(testsd[0]); i++) { + p_funcd = (void*)GetProcAddress(module, testsd[i].func); + *p_errno() = -1; + exception.type = -1; + p_funcd(testsd[i].x); + ok(*p_errno() == testsd[i].error, + "%s(%f) got errno %d\n", testsd[i].func, testsd[i].x, *p_errno()); + ok(exception.type == testsd[i].exception, + "%s(%f) got exception type %d\n", testsd[i].func, testsd[i].x, exception.type); + if(exception.type == -1) continue; + ok(exception.arg1 == testsd[i].x, + "%s(%f) got exception arg1 %f\n", testsd[i].func, testsd[i].x, exception.arg1); + } + + for(i = 0; i < sizeof(tests2d)/sizeof(tests2d[0]); i++) { + p_func2d = (void*)GetProcAddress(module, tests2d[i].func); + *p_errno() = -1; + exception.type = -1; + p_func2d(tests2d[i].a, tests2d[i].b); + ok(*p_errno() == tests2d[i].error, + "%s(%f, %f) got errno %d\n", tests2d[i].func, tests2d[i].a, tests2d[i].b, *p_errno()); + ok(exception.type == tests2d[i].exception, + "%s(%f, %f) got exception type %d\n", tests2d[i].func, tests2d[i].a, tests2d[i].b, exception.type); + if(exception.type == -1) continue; + ok(exception.arg1 == tests2d[i].a, + "%s(%f, %f) got exception arg1 %f\n", tests2d[i].func, tests2d[i].a, tests2d[i].b, exception.arg1); + ok(exception.arg2 == tests2d[i].b, + "%s(%f, %f) got exception arg2 %f\n", tests2d[i].func, tests2d[i].a, tests2d[i].b, exception.arg2); + } + + for(i = 0; i < sizeof(testsdl)/sizeof(testsdl[0]); i++) { + p_funcdl = (void*)GetProcAddress(module, testsdl[i].func); + *p_errno() = -1; + exception.type = -1; + p_funcdl(testsdl[i].a, testsdl[i].b); + ok(*p_errno() == testsdl[i].error, + "%s(%f, %ld) got errno %d\n", testsdl[i].func, testsdl[i].a, testsdl[i].b, *p_errno()); + ok(exception.type == testsdl[i].exception, + "%s(%f, %ld) got exception type %d\n", testsdl[i].func, testsdl[i].a, testsdl[i].b, exception.type); + if(exception.type == -1) continue; + ok(exception.arg1 == testsdl[i].a, + "%s(%f, %ld) got exception arg1 %f\n", testsdl[i].func, testsdl[i].a, testsdl[i].b, exception.arg1); + ok(exception.arg2 == testsdl[i].b, + "%s(%f, %ld) got exception arg2 %f\n", testsdl[i].func, testsdl[i].a, testsdl[i].b, exception.arg2); + } +} + START_TEST(misc) { int arg_c; @@ -533,4 +748,5 @@ START_TEST(misc) test__sopen_s(); test_lldiv(); test_isblank(); + test_math_errors(); }

1 0

Hugh McMaster : regedit: Use the heap_*() functions in hexedit.c where possible.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: 4c25f6497e39be6d713a74b156e56ebfd38ef831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c25f6497e39be6d713a74b15… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 2 12:35:42 2017 +0000 regedit: Use the heap_*() functions in hexedit.c where possible. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/hexedit.c | 56 ++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index 103a062..3f05aa6 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -24,6 +24,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <string.h> #include <assert.h> @@ -35,6 +36,7 @@ #include "commctrl.h" #include "main.h" +#include "regproc.h" /* spaces dividing hex and ASCII */ #define DIV_SPACES 4 @@ -74,13 +76,9 @@ static LPWSTR HexEdit_GetLineText(BYTE *pData, LONG cbData, LONG pad) { static const WCHAR percent_02xW[] = {'%','0','2','X',' ',0}; - LPWSTR lpszLine = HeapAlloc(GetProcessHeap(), 0, - (cbData * 3 + pad * 3 + DIV_SPACES + cbData + 1) * sizeof(WCHAR)); + WCHAR *lpszLine = heap_xalloc((cbData * 3 + pad * 3 + DIV_SPACES + cbData + 1) * sizeof(WCHAR)); LONG i; - if (!lpszLine) - return NULL; - for (i = 0; i < cbData; i++) wsprintfW(lpszLine + i*3, percent_02xW, pData[i]); for (i = 0; i < pad * 3; i++) @@ -139,7 +137,7 @@ HexEdit_Paint(HEXEDIT_INFO *infoPtr) TextOutW(hdc, nXStart, nYStart, lpszLine, infoPtr->nBytesPerLine * 3 + DIV_SPACES + nLineLen); nYStart += infoPtr->nHeight; - HeapFree(GetProcessHeap(), 0, lpszLine); + heap_free(lpszLine); } SelectObject(hdc, hOldFont); @@ -178,7 +176,7 @@ HexEdit_UpdateCaret(HEXEDIT_INFO *infoPtr) if (!nLineLen) size.cx = 0; - HeapFree(GetProcessHeap(), 0, lpszLine); + heap_free(lpszLine); SetCaretPos( GetSystemMetrics(SM_CXBORDER) + size.cx, @@ -230,22 +228,18 @@ HexEdit_EnsureVisible(HEXEDIT_INFO *infoPtr, INT nCaretPos) static LRESULT HexEdit_SetData(HEXEDIT_INFO *infoPtr, INT cbData, const BYTE *pData) { - HeapFree(GetProcessHeap(), 0, infoPtr->pData); + heap_free(infoPtr->pData); infoPtr->cbData = 0; - infoPtr->pData = HeapAlloc(GetProcessHeap(), 0, cbData); - if (infoPtr->pData) - { - memcpy(infoPtr->pData, pData, cbData); - infoPtr->cbData = cbData; + infoPtr->pData = heap_xalloc(cbData); + memcpy(infoPtr->pData, pData, cbData); + infoPtr->cbData = cbData; - infoPtr->nCaretPos = 0; - HexEdit_UpdateScrollbars(infoPtr); - HexEdit_UpdateCaret(infoPtr); - InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); - return TRUE; - } - return FALSE; + infoPtr->nCaretPos = 0; + HexEdit_UpdateScrollbars(infoPtr); + HexEdit_UpdateCaret(infoPtr); + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + return TRUE; } static LRESULT @@ -296,8 +290,8 @@ HexEdit_Char (HEXEDIT_INFO *infoPtr, WCHAR ch) { /* make room for another byte */ infoPtr->cbData++; - infoPtr->pData = HeapReAlloc(GetProcessHeap(), 0, infoPtr->pData, infoPtr->cbData + 1); - if (!infoPtr->pData) return 0; + infoPtr->pData = heap_xrealloc(infoPtr->pData, infoPtr->cbData + 1); + /* move everything after caret up one byte */ memmove(infoPtr->pData + nCaretBytePos + 1, infoPtr->pData + nCaretBytePos, @@ -348,9 +342,9 @@ static inline LRESULT HexEdit_Destroy (HEXEDIT_INFO *infoPtr) { HWND hwnd = infoPtr->hwndSelf; - HeapFree(GetProcessHeap(), 0, infoPtr->pData); + heap_free(infoPtr->pData); /* free info data */ - HeapFree(GetProcessHeap(), 0, infoPtr); + heap_free(infoPtr); SetWindowLongPtrW(hwnd, 0, 0); return 0; } @@ -478,7 +472,8 @@ static inline LRESULT HexEdit_NCCreate (HWND hwnd, LPCREATESTRUCTW lpcs) lpcs->dwExStyle | WS_EX_CLIENTEDGE); /* allocate memory for info structure */ - infoPtr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HEXEDIT_INFO)); + infoPtr = heap_xalloc(sizeof(HEXEDIT_INFO)); + memset(infoPtr, 0, sizeof(HEXEDIT_INFO)); SetWindowLongPtrW(hwnd, 0, (DWORD_PTR)infoPtr); /* initialize info structure */ @@ -526,12 +521,15 @@ HexEdit_SetFont (HEXEDIT_INFO *infoPtr, HFONT hFont, BOOL redraw) for (i = 0; ; i++) { - BYTE *pData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, i); - LPWSTR lpszLine = HexEdit_GetLineText(pData, i, 0); + BYTE *pData = heap_xalloc(i); + WCHAR *lpszLine; SIZE size; + + memset(pData, 0, i); + lpszLine = HexEdit_GetLineText(pData, i, 0); GetTextExtentPoint32W(hdc, lpszLine, lstrlenW(lpszLine), &size); - HeapFree(GetProcessHeap(), 0, lpszLine); - HeapFree(GetProcessHeap(), 0, pData); + heap_free(lpszLine); + heap_free(pData); if (size.cx > (rcClient.right - rcClient.left)) { infoPtr->nBytesPerLine = i - 1;

1 0

Hugh McMaster : regedit: Replace a HeapAlloc() HEAP_ZERO_MEMORY call in framewnd.c.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: fc5bd1b4389ce7804677d67aef10d36f5604b0b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5bd1b4389ce7804677d67ae… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 2 12:35:51 2017 +0000 regedit: Replace a HeapAlloc() HEAP_ZERO_MEMORY call in framewnd.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index b82eb10..cb7738c 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -367,7 +367,10 @@ static void ExportRegistryFile_StoreSelection(HWND hdlg, OPENFILENAMEW *pOpenFil SendDlgItemMessageW(hdlg, IDC_EXPORT_PATH, WM_GETTEXT, len+1, pOpenFileName->lCustData); } else - pOpenFileName->lCustData = (LPARAM)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR)); + { + pOpenFileName->lCustData = (LPARAM)heap_xalloc(sizeof(WCHAR)); + *(WCHAR *)pOpenFileName->lCustData = 0; + } } static UINT_PTR CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam)

1 0

Henri Verbeet : wined3d: Only flush valid contexts in wined3d_cs_exec_flush().
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: 6a5c37254194aaed783b219957e6f204b2d674de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5c37254194aaed783b21995… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 2 18:40:33 2017 +0200 wined3d: Only flush valid contexts in wined3d_cs_exec_flush(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c7df670..c785b72 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -830,7 +830,8 @@ static void wined3d_cs_exec_flush(struct wined3d_cs *cs, const void *data) struct wined3d_context *context; context = context_acquire(cs->device, NULL, 0); - context->gl_info->gl_ops.gl.p_glFlush(); + if (context->valid) + context->gl_info->gl_ops.gl.p_glFlush(); context_release(context); }

1 0

Henri Verbeet : wined3d: Properly update the context when falling back to the backup window in context_set_gl_context ().
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: 3441ba9e039521d38be0d8bdad8eca55393e3a0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3441ba9e039521d38be0d8bda… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 2 18:40:34 2017 +0200 wined3d: Properly update the context when falling back to the backup window in context_set_gl_context(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f9c95ba..d8ec251 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1178,8 +1178,6 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) if (backup || !wglMakeCurrent(ctx->hdc, ctx->glCtx)) { - HDC dc; - WARN("Failed to make GL context %p current on device context %p, last error %#x.\n", ctx->glCtx, ctx->hdc, GetLastError()); ctx->valid = 0; @@ -1196,24 +1194,27 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) return FALSE; } - if (!(dc = swapchain_get_backup_dc(swapchain))) + if (!(ctx->hdc = swapchain_get_backup_dc(swapchain))) { context_set_current(NULL); return FALSE; } - if (!context_set_pixel_format(ctx, dc, TRUE, ctx->pixel_format)) + ctx->hdc_is_private = TRUE; + ctx->hdc_has_format = FALSE; + + if (!context_set_pixel_format(ctx, ctx->hdc, TRUE, ctx->pixel_format)) { ERR("Failed to set pixel format %d on device context %p.\n", - ctx->pixel_format, dc); + ctx->pixel_format, ctx->hdc); context_set_current(NULL); return FALSE; } - if (!wglMakeCurrent(dc, ctx->glCtx)) + if (!wglMakeCurrent(ctx->hdc, ctx->glCtx)) { ERR("Fallback to backup window (dc %p) failed too, last error %#x.\n", - dc, GetLastError()); + ctx->hdc, GetLastError()); context_set_current(NULL); return FALSE; }

1 0

Henri Verbeet : wined3d: Use the context information in context_set_pixel_format().
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: f7e37715fa6854c3461d812d44b29c96d928d2a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7e37715fa6854c3461d812d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 2 18:40:35 2017 +0200 wined3d: Use the context information in context_set_pixel_format(). Instead of passing it around. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d8ec251..e084d1c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1094,15 +1094,18 @@ static BOOL context_restore_pixel_format(struct wined3d_context *ctx) return ret; } -static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BOOL private, int format) +static BOOL context_set_pixel_format(struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; + BOOL private = context->hdc_is_private; + int format = context->pixel_format; + HDC dc = context->hdc; int current; - if (dc == context->hdc && context->hdc_is_private && context->hdc_has_format) + if (private && context->hdc_has_format) return TRUE; - if (dc == context->hdc && !context->hdc_is_private && WindowFromDC(dc) != context->win_handle) + if (!private && WindowFromDC(dc) != context->win_handle) return FALSE; current = gl_info->gl_ops.wgl.p_wglGetPixelFormat(dc); @@ -1159,7 +1162,7 @@ static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BO return TRUE; success: - if (dc == context->hdc && context->hdc_is_private) + if (private) context->hdc_has_format = TRUE; return TRUE; } @@ -1169,7 +1172,7 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) struct wined3d_swapchain *swapchain = ctx->swapchain; BOOL backup = FALSE; - if (!context_set_pixel_format(ctx, ctx->hdc, ctx->hdc_is_private, ctx->pixel_format)) + if (!context_set_pixel_format(ctx)) { WARN("Failed to set pixel format %d on device context %p.\n", ctx->pixel_format, ctx->hdc); @@ -1203,7 +1206,7 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) ctx->hdc_is_private = TRUE; ctx->hdc_has_format = FALSE; - if (!context_set_pixel_format(ctx, ctx->hdc, TRUE, ctx->pixel_format)) + if (!context_set_pixel_format(ctx)) { ERR("Failed to set pixel format %d on device context %p.\n", ctx->pixel_format, ctx->hdc); @@ -1820,14 +1823,11 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *color_format; struct wined3d_context *ret; - BOOL hdc_is_private = FALSE; BOOL auxBuffers = FALSE; HGLRC ctx, share_ctx; DWORD target_usage; - int pixel_format; unsigned int i; DWORD state; - HDC hdc = 0; TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle); @@ -1921,12 +1921,12 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, sizeof(*ret->texture_type)))) goto out; - if (!(hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) + if (!(ret->hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) { WARN("Failed to retrieve device context, trying swapchain backup.\n"); - if ((hdc = swapchain_get_backup_dc(swapchain))) - hdc_is_private = TRUE; + if ((ret->hdc = swapchain_get_backup_dc(swapchain))) + ret->hdc_is_private = TRUE; else { ERR("Failed to retrieve a device context.\n"); @@ -1973,16 +1973,17 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } /* Try to find a pixel format which matches our requirements. */ - if (!(pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers))) + if (!(ret->pixel_format = context_choose_pixel_format(device, ret->hdc, color_format, ds_format, auxBuffers))) goto out; ret->gl_info = gl_info; + ret->win_handle = swapchain->win_handle; context_enter(ret); - if (!context_set_pixel_format(ret, hdc, hdc_is_private, pixel_format)) + if (!context_set_pixel_format(ret)) { - ERR("Failed to set pixel format %d on device context %p.\n", pixel_format, hdc); + ERR("Failed to set pixel format %d on device context %p.\n", ret->pixel_format, ret->hdc); context_release(ret); goto out; } @@ -1990,12 +1991,12 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, share_ctx = device->context_count ? device->contexts[0]->glCtx : NULL; if (gl_info->p_wglCreateContextAttribsARB) { - if (!(ctx = context_create_wgl_attribs(gl_info, hdc, share_ctx))) + if (!(ctx = context_create_wgl_attribs(gl_info, ret->hdc, share_ctx))) goto out; } else { - if (!(ctx = wglCreateContext(hdc))) + if (!(ctx = wglCreateContext(ret->hdc))) { ERR("Failed to create a WGL context.\n"); context_release(ret); @@ -2043,11 +2044,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->valid = 1; ret->glCtx = ctx; - ret->win_handle = swapchain->win_handle; - ret->hdc = hdc; - ret->hdc_is_private = hdc_is_private; ret->hdc_has_format = TRUE; - ret->pixel_format = pixel_format; ret->needs_set = 1; /* Set up the context defaults */ @@ -2217,7 +2214,8 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, return ret; out: - if (hdc) wined3d_release_dc(swapchain->win_handle, hdc); + if (ret->hdc) + wined3d_release_dc(swapchain->win_handle, ret->hdc); device->shader_backend->shader_free_context_data(ret); device->adapter->fragment_pipe->free_context_data(ret); HeapFree(GetProcessHeap(), 0, ret->texture_type);

1 0

Henri Verbeet : d3d8/tests: Introduce a test for drawing with a destroyed window.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: d6160213452ec0265f276af10494531b8910f9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6160213452ec0265f276af10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 2 18:40:36 2017 +0200 d3d8/tests: Introduce a test for drawing with a destroyed window. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 54f6505..2c0565a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8277,6 +8277,43 @@ static void test_format_unknown(void) DestroyWindow(window); } +static void test_destroyed_window(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d8; + ULONG refcount; + HWND window; + HRESULT hr; + + /* No WS_VISIBLE. */ + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + + d3d8 = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d8, "Failed to create a D3D object.\n"); + device = create_device(d3d8, window, NULL); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + if (!device) + { + skip("Failed to create a 3D device, skipping test.\n"); + return; + } + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00000000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -8383,6 +8420,7 @@ START_TEST(device) test_miptree_layout(); test_render_target_device_mismatch(); test_format_unknown(); + test_destroyed_window(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Henri Verbeet : d3d9/tests: Introduce a test for drawing with a destroyed window.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: d4bd150c23a9839f2596118fcc1bc34172cb0f7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4bd150c23a9839f2596118fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 2 18:40:37 2017 +0200 d3d9/tests: Introduce a test for drawing with a destroyed window. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 89ea772..50752f8 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11538,6 +11538,43 @@ static void test_format_unknown(void) DestroyWindow(window); } +static void test_destroyed_window(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + ULONG refcount; + HWND window; + HRESULT hr; + + /* No WS_VISIBLE. */ + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); + device = create_device(d3d9, window, NULL); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + if (!device) + { + skip("Failed to create a 3D device, skipping test.\n"); + return; + } + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00000000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -11656,6 +11693,7 @@ START_TEST(device) test_get_render_target_data(); test_render_target_device_mismatch(); test_format_unknown(); + test_destroyed_window(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0