February 2017 - Wine-Commits

Alex Henrie : comctl32: Return TRUE from LVM_REDRAWITEMS with bad indices.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: 690022c61b6dfc3af59bd3afdc53b33cc51201b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=690022c61b6dfc3af59bd3afd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 20 00:06:12 2017 -0700 comctl32: Return TRUE from LVM_REDRAWITEMS with bad indices. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 8 ++------ dlls/comctl32/tests/listview.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 56e2563..c01d816 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7989,12 +7989,8 @@ static BOOL LISTVIEW_IsItemVisible(const LISTVIEW_INFO *infoPtr, INT nItem) static BOOL LISTVIEW_RedrawItems(const LISTVIEW_INFO *infoPtr, INT nFirst, INT nLast) { INT i; - - if (nLast < nFirst || min(nFirst, nLast) < 0 || - max(nFirst, nLast) >= infoPtr->nItemCount) - return FALSE; - - for (i = nFirst; i <= nLast; i++) + + for (i = max(nFirst, 0); i <= min(nLast, infoPtr->nItemCount - 1); i++) LISTVIEW_InvalidateItem(infoPtr, i); return TRUE; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6d21b05..f497673 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5529,6 +5529,43 @@ static void test_LVM_SETITEMTEXT(void) DestroyWindow(hwnd); } +static void test_LVM_REDRAWITEMS(void) +{ + HWND list; + DWORD ret; + + list = create_listview_control(LVS_ICON); + ok(list != NULL, "failed to create listview window\n"); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, 0); + expect(TRUE, ret); + + insert_item(list, 0); + + ret = SendMessageA(list, LVM_REDRAWITEMS, -1, 0); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, -1); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, 0); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, 1); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, 2); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 1, 0); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 2, 3); + expect(TRUE, ret); + + DestroyWindow(list); +} + static void test_imagelists(void) { HWND hwnd, header; @@ -5903,6 +5940,7 @@ START_TEST(listview) test_createdragimage(); test_dispinfo(); test_LVM_SETITEMTEXT(); + test_LVM_REDRAWITEMS(); test_imagelists(); test_deleteitem(); test_insertitem();

1 0

Jacek Caban : msvcrt: Added lldiv implementation.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: 60c98caa94465799d0868b69149bce29cf767de4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c98caa94465799d0868b691… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 20 17:43:32 2017 +0100 msvcrt: Added lldiv implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-utility-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 13 +++++++++++++ dlls/msvcrt/msvcrt.h | 5 +++++ dlls/ucrtbase/tests/misc.c | 17 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec index 12586d8..fe3d04d 100644 --- a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec +++ b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec @@ -22,7 +22,7 @@ @ cdecl labs(long) ucrtbase.labs @ cdecl ldiv(long long) ucrtbase.ldiv @ cdecl -ret64 llabs(int64) ucrtbase.llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) ucrtbase.lldiv @ cdecl qsort(ptr long long ptr) ucrtbase.qsort @ cdecl qsort_s(ptr long long ptr ptr) ucrtbase.qsort_s @ cdecl rand() ucrtbase.rand diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 258463d..8604767 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1733,7 +1733,7 @@ @ cdecl ldexp(double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv @ cdecl -ret64 llabs(int64) MSVCRT_llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) MSVCRT_lldiv @ cdecl localeconv() MSVCRT_localeconv @ cdecl log(double) MSVCRT_log @ cdecl -arch=arm,x86_64 logf(float) MSVCRT_logf diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a95b39c..143eccc 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2091,7 +2091,7 @@ @ cdecl ldexp(double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv @ cdecl -ret64 llabs(int64) MSVCRT_llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) MSVCRT_lldiv @ cdecl localeconv() MSVCRT_localeconv @ cdecl log(double) MSVCRT_log @ cdecl -arch=arm,x86_64 logf(float) MSVCRT_logf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index db2ae9c..cc38421 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2247,7 +2247,7 @@ @ cdecl lgammaf(float) MSVCR120_lgammaf @ cdecl lgammal(double) MSVCR120_lgammal @ cdecl -ret64 llabs(int64) MSVCRT_llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) MSVCRT_lldiv @ cdecl -ret64 llrint(double) MSVCR120_llrint @ cdecl -ret64 llrintf(float) MSVCR120_llrintf @ cdecl -ret64 llrintl(double) MSVCR120_llrintl diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 849e135..90fdd97 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1910,7 +1910,7 @@ @ cdecl lgammaf(float) msvcr120.lgammaf @ cdecl lgammal(double) msvcr120.lgammal @ cdecl -ret64 llabs(int64) msvcr120.llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) msvcr120.lldiv @ cdecl -ret64 llrint(double) msvcr120.llrint @ cdecl -ret64 llrintf(float) msvcr120.llrintf @ cdecl -ret64 llrintl(double) msvcr120.llrintl diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 857561b..af3aa2a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1844,6 +1844,19 @@ MSVCRT_ldiv_t CDECL MSVCRT_ldiv(MSVCRT_long num, MSVCRT_long denom) } #endif /* ifdef __i386__ */ +/********************************************************************* + * lldiv (MSVCRT.@) + */ +MSVCRT_lldiv_t CDECL MSVCRT_lldiv(MSVCRT_longlong num, MSVCRT_longlong denom) +{ + MSVCRT_lldiv_t ret; + + ret.quot = num / denom; + ret.rem = num % denom; + + return ret; +} + #ifdef __i386__ /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 71d80c9..1a2c750 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -448,6 +448,11 @@ typedef struct MSVCRT__ldiv_t { MSVCRT_long rem; /* remainder */ } MSVCRT_ldiv_t; +typedef struct MSVCRT__lldiv_t { + MSVCRT_longlong quot; /* quotient */ + MSVCRT_longlong rem; /* remainder */ +} MSVCRT_lldiv_t; + struct MSVCRT__heapinfo { int* _pentry; MSVCRT_size_t _size; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index d8075cc..5f1d2a1 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -67,6 +67,11 @@ typedef struct MSVCRT__onexit_table_t MSVCRT__onexit_t *_end; } MSVCRT__onexit_table_t; +typedef struct MSVCRT__lldiv_t { + LONGLONG quot; /* quotient */ + LONGLONG rem; /* remainder */ +} MSVCRT_lldiv_t; + 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); @@ -80,6 +85,7 @@ static int (CDECL *p__ltoa_s)(LONG, char*, size_t, int); static char* (CDECL *p__get_narrow_winmain_command_line)(void); static int (CDECL *p_sopen_dispatch)(const char *, int, int, int, int *, int); static int (CDECL *p_sopen_s)(int *, const char *, int, int, int); +static MSVCRT_lldiv_t (CDECL *p_lldiv)(LONGLONG,LONGLONG); static void test__initialize_onexit_table(void) { @@ -373,6 +379,7 @@ static BOOL init(void) p__get_narrow_winmain_command_line = (void*)GetProcAddress(GetModuleHandleA("ucrtbase.dll"), "_get_narrow_winmain_command_line"); p_sopen_dispatch = (void*)GetProcAddress(module, "_sopen_dispatch"); p_sopen_s = (void*)GetProcAddress(module, "_sopen_s"); + p_lldiv = (void*)GetProcAddress(module, "lldiv"); return TRUE; } @@ -444,6 +451,15 @@ static void test__sopen_s(void) free(tempf); } +static void test_lldiv(void) +{ + MSVCRT_lldiv_t r; + + r = p_lldiv((LONGLONG)0x111 << 32 | 0x222, (LONGLONG)1 << 32); + ok(r.quot == 0x111, "quot = %x%08x\n", (INT32)(r.quot >> 32), (UINT32)r.quot); + ok(r.rem == 0x222, "rem = %x%08x\n", (INT32)(r.rem >> 32), (UINT32)r.rem); +} + START_TEST(misc) { int arg_c; @@ -466,4 +482,5 @@ START_TEST(misc) test__get_narrow_winmain_command_line(arg_v[0]); test__sopen_dispatch(); test__sopen_s(); + test_lldiv(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 5c97d8b..2f733c3 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2381,7 +2381,7 @@ @ cdecl lgammaf(float) MSVCR120_lgammaf @ cdecl lgammal(double) MSVCR120_lgammal @ cdecl -ret64 llabs(int64) MSVCRT_llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) MSVCRT_lldiv @ cdecl -ret64 llrint(double) MSVCR120_llrint @ cdecl -ret64 llrintf(float) MSVCR120_llrintf @ cdecl -ret64 llrintl(double) MSVCR120_llrintl

1 0

Józef Kucia : d3d11: Implement CheckFeatureSupport() for D3D11_FEATURE_DOUBLES.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: 0cf4728d01038426231ef9daab408a7ec734755e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf4728d01038426231ef9daa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 20 13:12:15 2017 +0100 d3d11: Implement CheckFeatureSupport() for D3D11_FEATURE_DOUBLES. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 27 +++++++++++++++++++++++++++ include/d3d11.idl | 5 +++++ 2 files changed, 32 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 731a0e1..95b11e6 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2864,6 +2864,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckCounter(ID3D11Device *iface, static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device *iface, D3D11_FEATURE feature, void *feature_support_data, UINT feature_support_data_size) { + struct d3d_device *device = impl_from_ID3D11Device(iface); + WINED3DCAPS wined3d_caps; + HRESULT hr; + TRACE("iface %p, feature %u, feature_support_data %p, feature_support_data_size %u.\n", iface, feature, feature_support_data, feature_support_data_size); @@ -2885,6 +2889,29 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device * threading_data->DriverCommandLists = TRUE; return S_OK; } + + case D3D11_FEATURE_DOUBLES: + { + D3D11_FEATURE_DATA_DOUBLES *doubles_data = feature_support_data; + if (feature_support_data_size != sizeof(*doubles_data)) + { + WARN("Invalid data size.\n"); + return E_INVALIDARG; + } + + wined3d_mutex_lock(); + hr = wined3d_device_get_device_caps(device->wined3d_device, &wined3d_caps); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to get device caps, hr %#x.\n", hr); + return hr; + } + + doubles_data->DoublePrecisionFloatShaderOps = wined3d_caps.shader_double_precision; + return S_OK; + } + case D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS: { D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS *options = feature_support_data; diff --git a/include/d3d11.idl b/include/d3d11.idl index ad676c7..371ff2f 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -497,6 +497,11 @@ typedef struct D3D11_FEATURE_DATA_THREADING BOOL DriverCommandLists; } D3D11_FEATURE_DATA_THREADING; +typedef struct D3D11_FEATURE_DATA_DOUBLES +{ + BOOL DoublePrecisionFloatShaderOps; +} D3D11_FEATURE_DATA_DOUBLES; + typedef struct D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS { BOOL ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x;

1 0

Fabian Maurer : user32: Send WM_NCPAINT and WM_ERASEBKGND when window is shown.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: 997d4ef44f0f9e2284f99d7ce9ec135d68b30c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=997d4ef44f0f9e2284f99d7ce… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Feb 13 16:58:29 2017 +0100 user32: Send WM_NCPAINT and WM_ERASEBKGND when window is shown. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 26 +++++++++++++------------- dlls/user32/winpos.c | 33 +++++++++++++++++++++++---------- 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0d5aec7..ea5980e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4651,7 +4651,7 @@ static void test_showwindow(void) flush_sequence(); ShowWindow(hwnd, SW_SHOWMAXIMIZED); ok_sequence(WmShowMaxPopupResizedSeq_todo, - "ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO", FALSE); + "ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO", TRUE); DestroyWindow(hwnd); flush_sequence(); @@ -5135,7 +5135,7 @@ static void test_messages(void) 10, 10, 100, 100, NULL, 0, 0, NULL ); ok (hwnd != 0, "Failed to create popup window\n"); RedrawWindow(hwnd, NULL, NULL, RDW_UPDATENOW); - ok_sequence(WmShowPopupFirstDrawSeq_1, "RedrawWindow:show_popup_first_draw_visible", TRUE); + ok_sequence(WmShowPopupFirstDrawSeq_1, "RedrawWindow:show_popup_first_draw_visible", FALSE); DestroyWindow(hwnd); /* Invisible, show, message */ @@ -5146,7 +5146,7 @@ static void test_messages(void) ok (hwnd != 0, "Failed to create popup window\n"); ShowWindow(hwnd, SW_SHOW); SendMessageW(hwnd, WM_PAINT, 0, 0); - ok_sequence(WmShowPopupFirstDrawSeq_1, "RedrawWindow:show_popup_first_draw_show", TRUE); + ok_sequence(WmShowPopupFirstDrawSeq_1, "RedrawWindow:show_popup_first_draw_show", FALSE); DestroyWindow(hwnd); /* Invisible, show maximized, redraw */ @@ -5157,20 +5157,20 @@ static void test_messages(void) ok (hwnd != 0, "Failed to create popup window\n"); ShowWindow(hwnd, SW_SHOWMAXIMIZED); RedrawWindow(hwnd, NULL, NULL, RDW_UPDATENOW); - ok_sequence(WmShowPopupFirstDrawSeq_2, "RedrawWindow:show_popup_first_draw_show_maximized", TRUE); + ok_sequence(WmShowPopupFirstDrawSeq_2, "RedrawWindow:show_popup_first_draw_show_maximized", FALSE); DestroyWindow(hwnd); /* Test SetWindowPos */ - test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, 0, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOSIZE, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq4, SWP_SHOWWINDOW | SWP_NOMOVE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOSIZE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq4, SWP_SHOWWINDOW | SWP_NOMOVE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCLIENTSIZE, TRUE); test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCLIENTMOVE, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOZORDER, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOZORDER, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_DEFERERASE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOCLIENTMOVE, TRUE); @@ -5179,12 +5179,12 @@ static void test_messages(void) test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOSIZE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOZORDER, FALSE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOCLIENTMOVE, TRUE); test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOCLIENTSIZE, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq4, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOMOVE, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOSIZE, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOZORDER, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq4, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOMOVE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOSIZE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOZORDER, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_NOREDRAW, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOCLIENTMOVE, TRUE); @@ -5220,7 +5220,7 @@ static void test_messages(void) flush_sequence(); SetWindowPos(hparent, NULL, 0, 0, 100, 100, SWP_SHOWWINDOW); ok_sequence(WmFirstDrawChildSeq2, /* Expect child to be redrawn */ - "SetWindowPos:show_popup_first_show_window_child2", TRUE); + "SetWindowPos:show_popup_first_show_window_child2", FALSE); DestroyWindow(hchild); DestroyWindow(hparent); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index d94f5a3..6ed2d95 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER) #define SWP_AGG_STATUSFLAGS \ (SWP_AGG_NOPOSCHANGE | SWP_FRAMECHANGED | SWP_HIDEWINDOW | SWP_SHOWWINDOW) +#define SWP_AGG_NOCLIENTCHANGE \ + (SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE) #define HAS_DLGFRAME(style,exStyle) \ (((exStyle) & WS_EX_DLGMODALFRAME) || \ @@ -2229,16 +2231,7 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos ) &newWindowRect, &newClientRect, valid_rects )) return FALSE; - /* erase parent when hiding or resizing child */ - if (!(orig_flags & SWP_DEFERERASE) && - ((orig_flags & SWP_HIDEWINDOW) || - (!(orig_flags & SWP_SHOWWINDOW) && - (winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOGEOMETRYCHANGE))) - { - HWND parent = GetAncestor( winpos->hwnd, GA_PARENT ); - if (!parent || parent == GetDesktopWindow()) parent = winpos->hwnd; - erase_now( parent, 0 ); - } + if( winpos->flags & SWP_HIDEWINDOW ) HideCaret(winpos->hwnd); @@ -2254,6 +2247,26 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos ) SetForegroundWindow( winpos->hwnd ); } + if(!(orig_flags & SWP_DEFERERASE)) + { + /* erase parent when hiding or resizing child */ + if ((orig_flags & SWP_HIDEWINDOW) || + (!(orig_flags & SWP_SHOWWINDOW) && + (winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOGEOMETRYCHANGE)) + { + HWND parent = GetAncestor( winpos->hwnd, GA_PARENT ); + if (!parent || parent == GetDesktopWindow()) parent = winpos->hwnd; + erase_now( parent, 0 ); + } + + /* Give newly shown windows a chance to redraw */ + if(((winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE) + && !(orig_flags & SWP_AGG_NOCLIENTCHANGE) && (orig_flags & SWP_SHOWWINDOW)) + { + erase_now(winpos->hwnd, 0); + } + } + /* And last, send the WM_WINDOWPOSCHANGED message */ TRACE("\tstatus flags = %04x\n", winpos->flags & SWP_AGG_STATUSFLAGS);

1 0

Stefan Dösinger : d3d8/tests: Allow a higher slop for test_updatetexture.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: cec8021179ff899442b60f8b54ad0d89e6f543d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cec8021179ff899442b60f8b5… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Feb 19 11:47:53 2017 +0000 d3d8/tests: Allow a higher slop for test_updatetexture. My Radeon X1600 returns 0x007c7c00. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index b477ab7..a7177d3 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -6740,7 +6740,7 @@ static void test_updatetexture(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - ok (color_match(color, 0x007f7f00, 2) || broken(tests[i].broken) + ok (color_match(color, 0x007f7f00, 3) || broken(tests[i].broken) || broken(color == 0x00adbeef), /* WARP device often just breaks down. */ "Got unexpected color 0x%08x, case %u, %u.\n", color, t, i); }

1 0

Nikolay Sivov : comctl32/tests: Some tests for property page initialization.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: ad7a1a0e3dacb553e3facfa6ed4c10a60bddd345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad7a1a0e3dacb553e3facfa6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 19 22:26:27 2017 +0300 comctl32/tests: Some tests for property page initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/propsheet.c | 142 ++++++++++++++++++++++++++++++++++++++++ include/prsht.h | 1 + 2 files changed, 143 insertions(+) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 7547e79..0b1c45c 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -987,6 +987,147 @@ if (0) DestroyWindow(hdlg); } +struct custom_proppage +{ + union + { + PROPSHEETPAGEA pageA; + PROPSHEETPAGEW pageW; + } u; + unsigned int addref_called; + unsigned int release_called; +}; + +static UINT CALLBACK proppage_callback_a(HWND hwnd, UINT msg, PROPSHEETPAGEA *psp) +{ + struct custom_proppage *cpage = (struct custom_proppage *)psp->lParam; + PROPSHEETPAGEA *psp_orig = &cpage->u.pageA; + + ok(hwnd == NULL, "Expected NULL hwnd, got %p\n", hwnd); + + ok(psp->lParam && psp->lParam != (LPARAM)psp, "Expected newly allocated page description, got %lx, %p\n", + psp->lParam, psp); + ok(psp_orig->pszTitle == psp->pszTitle, "Expected same page title pointer\n"); + ok(!lstrcmpA(psp_orig->pszTitle, psp->pszTitle), "Expected same page title string\n"); + + switch (msg) + { + case PSPCB_ADDREF: + ok(psp->dwSize > PROPSHEETPAGEA_V1_SIZE, "Expected ADDREF for V2+ only, got size %u\n", psp->dwSize); + cpage->addref_called++; + break; + case PSPCB_RELEASE: + ok(psp->dwSize >= PROPSHEETPAGEA_V1_SIZE, "Unexpected RELEASE, got size %u\n", psp->dwSize); + cpage->release_called++; + break; + default: + ok(0, "Unexpected message %u\n", msg); + } + + return 1; +} + +static UINT CALLBACK proppage_callback_w(HWND hwnd, UINT msg, PROPSHEETPAGEW *psp) +{ + struct custom_proppage *cpage = (struct custom_proppage *)psp->lParam; + PROPSHEETPAGEW *psp_orig = &cpage->u.pageW; + + ok(hwnd == NULL, "Expected NULL hwnd, got %p\n", hwnd); + ok(psp->lParam && psp->lParam != (LPARAM)psp, "Expected newly allocated page description, got %lx, %p\n", + psp->lParam, psp); + ok(psp_orig->pszTitle == psp->pszTitle, "Expected same page title pointer\n"); + ok(!lstrcmpW(psp_orig->pszTitle, psp->pszTitle), "Expected same page title string\n"); + + switch (msg) + { + case PSPCB_ADDREF: + ok(psp->dwSize > PROPSHEETPAGEW_V1_SIZE, "Expected ADDREF for V2+ only, got size %u\n", psp->dwSize); + cpage->addref_called++; + break; + case PSPCB_RELEASE: + ok(psp->dwSize >= PROPSHEETPAGEW_V1_SIZE, "Unexpected RELEASE, got size %u\n", psp->dwSize); + cpage->release_called++; + break; + default: + ok(0, "Unexpected message %u\n", msg); + } + + return 1; +} + +static void test_CreatePropertySheetPage(void) +{ + static const WCHAR titleW[] = {'T','i','t','l','e',0}; + struct custom_proppage page; + HPROPSHEETPAGE hpsp; + BOOL ret; + + memset(&page.u.pageA, 0, sizeof(page.u.pageA)); + page.u.pageA.dwFlags = PSP_USECALLBACK; + page.u.pageA.pfnDlgProc = page_dlg_proc_messages; + page.u.pageA.pfnCallback = proppage_callback_a; + page.u.pageA.lParam = (LPARAM)&page; + page.u.pageA.pszTitle = "Title"; + + /* Only minimal size validation is performed */ + for (page.u.pageA.dwSize = PROPSHEETPAGEA_V1_SIZE - 1; page.u.pageA.dwSize <= PROPSHEETPAGEA_V4_SIZE + 1; page.u.pageA.dwSize++) + { + page.addref_called = 0; + hpsp = CreatePropertySheetPageA(&page.u.pageA); + + if (page.u.pageA.dwSize < PROPSHEETPAGEA_V1_SIZE) + todo_wine + ok(hpsp == NULL, "Expected failure, size %u\n", page.u.pageA.dwSize); + else + { + ok(hpsp != NULL, "Failed to create a page, size %u\n", page.u.pageA.dwSize); + todo_wine_if(page.u.pageA.dwSize > PROPSHEETPAGEA_V1_SIZE) + ok(page.addref_called == (page.u.pageA.dwSize > PROPSHEETPAGEA_V1_SIZE) ? 1 : 0, "Expected ADDREF callback message\n"); + } + + if (hpsp) + { + page.release_called = 0; + ret = DestroyPropertySheetPage(hpsp); + ok(ret, "Failed to destroy a page\n"); + todo_wine + ok(page.release_called == 1, "Expected RELEASE callback message\n"); + } + } + + memset(&page.u.pageW, 0, sizeof(page.u.pageW)); + page.u.pageW.dwFlags = PSP_USECALLBACK; + page.u.pageW.pfnDlgProc = page_dlg_proc_messages; + page.u.pageW.pfnCallback = proppage_callback_w; + page.u.pageW.lParam = (LPARAM)&page; + page.u.pageW.pszTitle = titleW; + + for (page.u.pageW.dwSize = PROPSHEETPAGEW_V1_SIZE - 1; page.u.pageW.dwSize <= PROPSHEETPAGEW_V4_SIZE + 1; page.u.pageW.dwSize++) + { + page.addref_called = 0; + hpsp = CreatePropertySheetPageW(&page.u.pageW); + + if (page.u.pageW.dwSize < PROPSHEETPAGEW_V1_SIZE) + todo_wine + ok(hpsp == NULL, "Expected failure, size %u\n", page.u.pageW.dwSize); + else + { + ok(hpsp != NULL, "Failed to create a page, size %u\n", page.u.pageW.dwSize); + todo_wine_if(page.u.pageW.dwSize > PROPSHEETPAGEW_V1_SIZE) + ok(page.addref_called == (page.u.pageW.dwSize > PROPSHEETPAGEW_V1_SIZE) ? 1 : 0, "Expected ADDREF callback message\n"); + } + + if (hpsp) + { + page.release_called = 0; + ret = DestroyPropertySheetPage(hpsp); + ok(ret, "Failed to destroy a page\n"); + todo_wine + ok(page.release_called == 1, "Expected RELEASE callback message\n"); + } + } +} + START_TEST(propsheet) { test_title(); @@ -998,4 +1139,5 @@ START_TEST(propsheet) test_messages(); test_PSM_ADDPAGE(); test_PSM_INSERTPAGE(); + test_CreatePropertySheetPage(); } diff --git a/include/prsht.h b/include/prsht.h index f12f402..2b2a3e18 100644 --- a/include/prsht.h +++ b/include/prsht.h @@ -293,6 +293,7 @@ DECL_PRSHT_TYPE_AW(LPCPROPSHEETPAGE, LATEST) #define PSP_USEFUSIONCONTEXT 0x00004000 #define PSP_COMMANDLINKS 0x00040000 +#define PSPCB_ADDREF 0 #define PSPCB_RELEASE 1 #define PSPCB_CREATE 2

1 0

Zebediah Figura : storage.dll16: Fix an error in a comment.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: 68c095302f0a8e73cc25c3d4271d7f14112c93c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c095302f0a8e73cc25c3d42… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 11 15:56:04 2017 -0600 storage.dll16: Fix an error in a comment. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/storage.dll16/storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index cac616c..5969333 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -70,7 +70,7 @@ struct storage_pps_entry { GUID pps_guid; /* 50: class ID */ DWORD pps_unknown1; /* 60: unknown */ FILETIME pps_ft1; /* 64: filetime1 */ - FILETIME pps_ft2; /* 70: filetime2 */ + FILETIME pps_ft2; /* 6C: filetime2 */ DWORD pps_sb; /* 74: data startblock */ DWORD pps_size; /* 78: datalength. (<0x1000)?small:big blocks*/ DWORD pps_unknown2; /* 7C: unknown */

1 0

Józef Kucia : wined3d: Expose double precision shader capability in WINED3DCAPS.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: def13f3f810bf19018cba6f93b1fafaa7f72e1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=def13f3f810bf19018cba6f93… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 20 13:12:14 2017 +0100 wined3d: Expose double precision shader capability in WINED3DCAPS. None of shader backends supports double precision yet. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 8 ++++++-- dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d.h | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0f44e09..0df4b58 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4029,6 +4029,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD adapter->d3d_info.limits.vs_uniform_count = shader_caps.vs_uniform_count; adapter->d3d_info.limits.ps_uniform_count = shader_caps.ps_uniform_count; adapter->d3d_info.limits.varying_count = shader_caps.varying_count; + adapter->d3d_info.shader_double_precision = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION; adapter->vertex_pipe->vp_get_caps(gl_info, &vertex_caps); adapter->d3d_info.xyzrhw = vertex_caps.xyzrhw; @@ -5331,11 +5332,12 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte enum wined3d_device_type device_type, WINED3DCAPS *caps) { const struct wined3d_adapter *adapter = &wined3d->adapters[adapter_idx]; + const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; const struct wined3d_gl_info *gl_info = &adapter->gl_info; - struct shader_caps shader_caps; - struct fragment_caps fragment_caps; struct wined3d_vertex_caps vertex_caps; DWORD ckey_caps, blit_caps, fx_caps; + struct fragment_caps fragment_caps; + struct shader_caps shader_caps; TRACE("wined3d %p, adapter_idx %u, device_type %s, caps %p.\n", wined3d, adapter_idx, debug_d3ddevicetype(device_type), caps); @@ -5903,6 +5905,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->ddraw_caps.caps |= WINEDDCAPS_3D; } + caps->shader_double_precision = d3d_info->shader_double_precision; + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3190d87..c518bda 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1097,6 +1097,7 @@ typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); #define WINED3D_SHADER_CAP_VS_CLIPPING 0x00000001 #define WINED3D_SHADER_CAP_SRGB_WRITE 0x00000002 +#define WINED3D_SHADER_CAP_DOUBLE_PRECISION 0x00000004 struct shader_caps { @@ -2299,6 +2300,7 @@ struct wined3d_d3d_info BOOL shader_color_key; DWORD valid_rt_mask; DWORD wined3d_creation_flags; + BOOL shader_double_precision; }; /* The adapter structure */ diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 17343f6..e216520 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1888,6 +1888,8 @@ typedef struct _WINED3DCAPS DWORD Reserved3; struct wined3d_ddraw_caps ddraw_caps; + + BOOL shader_double_precision; } WINED3DCAPS; struct wined3d_color_key

1 0

Józef Kucia : d3d11/tests: Properly check if raw buffers are supported.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: ce0a60e1c793a334bdcc2c79a040c52832d47b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0a60e1c793a334bdcc2c79a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 20 13:12:10 2017 +0100 d3d11/tests: Properly check if raw buffers are supported. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 64 ++++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 24 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9a36a1f..47e7961 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11557,7 +11557,8 @@ static void test_fl9_draw(const D3D_FEATURE_LEVEL feature_level) release_test_context(&test_context); } -static void run_for_each_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) +static void run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL begin, + D3D_FEATURE_LEVEL end, void (*test_func)(const D3D_FEATURE_LEVEL fl)) { static const D3D_FEATURE_LEVEL feature_levels[] = { @@ -11571,22 +11572,24 @@ static void run_for_each_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL }; unsigned int i; + assert(begin <= end); for (i = 0; i < sizeof(feature_levels) / sizeof(*feature_levels); ++i) - test_func(feature_levels[i]); + { + if (begin <= feature_levels[i] && feature_levels[i] <= end) + test_func(feature_levels[i]); + } } -static void run_for_each_9_x_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) +static void run_for_each_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) { - static const D3D_FEATURE_LEVEL feature_levels[] = - { - D3D_FEATURE_LEVEL_9_3, - D3D_FEATURE_LEVEL_9_2, - D3D_FEATURE_LEVEL_9_1, - }; - unsigned int i; + run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, + D3D_FEATURE_LEVEL_11_1, test_func); +} - for (i = 0; i < sizeof(feature_levels) / sizeof(*feature_levels); ++i) - test_func(feature_levels[i]); +static void run_for_each_9_x_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) +{ + run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, + D3D_FEATURE_LEVEL_9_3, test_func); } static void test_ddy(void) @@ -14329,14 +14332,23 @@ static void test_buffer_srv(void) release_test_context(&test_context); } -static void test_unaligned_raw_buffer_access(void) +static BOOL check_compute_shaders_via_sm4_support(ID3D11Device *device) +{ + D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS options; + + if (FAILED(ID3D11Device_CheckFeatureSupport(device, + D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &options, sizeof(options)))) + return FALSE; + return options.ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x; +} + +static void test_unaligned_raw_buffer_access(const D3D_FEATURE_LEVEL feature_level) { D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; struct d3d11_test_context test_context; D3D11_SUBRESOURCE_DATA resource_data; D3D11_TEXTURE2D_DESC texture_desc; - D3D_FEATURE_LEVEL feature_level; ID3D11UnorderedAccessView *uav; ID3D11ShaderResourceView *srv; D3D11_BUFFER_DESC buffer_desc; @@ -14399,12 +14411,22 @@ static void test_unaligned_raw_buffer_access(void) }; static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; - if (!init_test_context(&test_context, NULL)) + if (!init_test_context(&test_context, &feature_level)) return; device = test_context.device; context = test_context.immediate_context; - feature_level = ID3D11Device_GetFeatureLevel(device); + + if (feature_level < D3D_FEATURE_LEVEL_11_0 && !check_compute_shaders_via_sm4_support(device)) + { + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D11PixelShader_Release(ps); + skip("Raw buffers are not supported.\n"); + release_test_context(&test_context); + return; + } if (is_intel_device(device)) { @@ -14417,13 +14439,6 @@ static void test_unaligned_raw_buffer_access(void) } hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); - if (hr == E_INVALIDARG) - { - /* This skips the test on testbot Win Vista and Win 2008 VMs. */ - win_skip("Failed to create pixel shader.\n"); - release_test_context(&test_context); - return; - } ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); memset(&offset, 0, sizeof(offset)); @@ -14686,5 +14701,6 @@ START_TEST(d3d11) test_sm5_bufinfo_instruction(); test_render_target_device_mismatch(); test_buffer_srv(); - test_unaligned_raw_buffer_access(); + run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_10_0, D3D_FEATURE_LEVEL_11_0, + test_unaligned_raw_buffer_access); }

1 0

Józef Kucia : d3d9: Allocate WINED3DCAPS on stack.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: 9d0fb20228772e0e441de065714967b14f8296bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0fb20228772e0e441de0657… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 20 13:12:13 2017 +0100 d3d9: Allocate WINED3DCAPS on stack. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 150 +++++++++++++++++++++++------------------------ dlls/d3d9/device.c | 10 +--- dlls/d3d9/directx.c | 9 +-- 3 files changed, 81 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d0fb20228772e0e441de…

1 0