February 2016 - Wine-commits

Francois Gouget : mscoree/tests: Add a trailing '\n' to a win_skip() call.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: fb863bc8aca01f2c2015e294019e9637f394cd0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb863bc8aca01f2c2015e2940… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 21 01:16:37 2016 +0100 mscoree/tests: Add a trailing '\n' to a win_skip() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/mscoree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 1cd9e5f..106577e 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -445,7 +445,7 @@ static void test_createdomain(void) if (!pCLRCreateInstance) { - win_skip("Function CLRCreateInstance not found."); + win_skip("Function CLRCreateInstance not found.\n"); return; }

1 0

Francois Gouget : shell32/tests: Test ShellExecute()'s URL handling.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 6e9c7adceee85b89823ba33c734c64358bc14532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e9c7adceee85b89823ba33c7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 21 11:53:03 2016 +0100 shell32/tests: Test ShellExecute()'s URL handling. Also tweak the class creation functions and add create_test_class() so one can create a class without associating it with an extension. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 200 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 162 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e9c7adceee85b89823ba…

1 0

Frédéric Delanoy : msvcr120/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: c3171f9c0c190920d7f260d39d56f08c07644cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3171f9c0c190920d7f260d39… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 19 15:23:31 2016 +0100 msvcr120/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 341aec4..54c86c6 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -253,13 +253,9 @@ static void test____lc_locale_name_func(void) lc_names = p____lc_locale_name_func(); ok(lc_names[0] == NULL, "%d - lc_names[0] = %s\n", i, wine_dbgstr_w(lc_names[0])); - if(tests[i].todo) { - todo_wine ok(!lstrcmpW(lc_names[1], tests[i].name) || broken(!lstrcmpW(lc_names[1], tests[i].broken_name)), - "%d - lc_names[1] = %s\n", i, wine_dbgstr_w(lc_names[1])); - } else { + todo_wine_if(tests[i].todo) ok(!lstrcmpW(lc_names[1], tests[i].name) || broken(!lstrcmpW(lc_names[1], tests[i].broken_name)), "%d - lc_names[1] = %s\n", i, wine_dbgstr_w(lc_names[1])); - } for(j=LC_MIN+2; j<=LC_MAX; j++) { ok(!lstrcmpW(lc_names[1], lc_names[j]), "%d - lc_names[%d] = %s, expected %s\n",

1 0

Frédéric Delanoy : msvcrt/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 0da6cca13ca6aa91772dbfcfec81987db2e68069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da6cca13ca6aa91772dbfcfe… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 19 15:49:52 2016 +0100 msvcrt/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 6 ++---- dlls/msvcrt/tests/misc.c | 6 +----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index e3f7f99..490ddee 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1109,10 +1109,8 @@ static void test_demangle_datatype(void) for (i = 0; i < num_test; i++) { name = p__unDName(0, demangle[i].mangled, 0, pmalloc, pfree, 0x2800); - if (demangle[i].test_in_wine) - ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); - else - todo_wine ok(name != NULL && !strcmp(name,demangle[i].result), "Got name %s for %d\n", name, i); + todo_wine_if (!demangle[i].test_in_wine) + ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); if(name) pfree(name); } diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 4968cbb..77f2873 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -181,14 +181,10 @@ static void test_I10_OUTPUT(void) ok(!strcmp(out.str, I10_OUTPUT_tests[i].out.str), "%d: out.str = %s\n", i, out.str); j = strlen(I10_OUTPUT_tests[i].remain); - if(j && I10_OUTPUT_tests[i].remain[j-1]=='9') - todo_wine ok(!strncmp(out.str+out.len+1, I10_OUTPUT_tests[i].remain, j), - "%d: &out.str[%d] = %.25s...\n", i, out.len+1, out.str+out.len+1); - else + todo_wine_if(j && I10_OUTPUT_tests[i].remain[j-1]=='9') ok(!strncmp(out.str+out.len+1, I10_OUTPUT_tests[i].remain, j), "%d: &out.str[%d] = %.25s...\n", i, out.len+1, out.str+out.len+1); - for(j=out.len+strlen(I10_OUTPUT_tests[i].remain)+1; j<sizeof(out.str); j++) if(out.str[j] != '#') ok(0, "%d: out.str[%d] = %c (expected \'#\')\n", i, j, out.str[j]);

1 0

Frédéric Delanoy : user32/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: fa56de2cd67c661b358e38883aba48144c28e759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa56de2cd67c661b358e38883… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 20 16:20:58 2016 +0100 user32/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/listbox.c | 3 +-- dlls/user32/tests/msg.c | 7 +------ dlls/user32/tests/win.c | 20 +++++++------------- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 9380457..ba400f9 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -125,8 +125,7 @@ keypress (HWND handle, WPARAM keycode, BYTE scancode, BOOL extended) t.s.f, got.f) #define listbox_todo_field_ok(t, s, f, got) \ - if (t.s##_todo.f) todo_wine { listbox_field_ok(t, s, f, got); } \ - else listbox_field_ok(t, s, f, got) + todo_wine_if (t.s##_todo.f) { listbox_field_ok(t, s, f, got); } #define listbox_ok(t, s, got) \ listbox_todo_field_ok(t, s, selected, got); \ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3d4bea5..94fe4cb 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13985,12 +13985,7 @@ static void test_WaitForInputIdle( char *argv0 ) broken(ret == wait_idle_expect[i].broken), "%u: WaitForInputIdle error %08x expected %08x\n", i, ret, wait_idle_expect[i].exp ); - else if (wait_idle_expect[i].todo) - todo_wine - ok( ret == wait_idle_expect[i].exp || broken(ret == wait_idle_expect[i].broken), - "%u: WaitForInputIdle error %08x expected %08x\n", - i, ret, wait_idle_expect[i].exp ); - else + else todo_wine_if (wait_idle_expect[i].todo) ok( ret == wait_idle_expect[i].exp || broken(ret == wait_idle_expect[i].broken), "%u: WaitForInputIdle error %08x expected %08x\n", i, ret, wait_idle_expect[i].exp ); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 70c07e0..71459e1 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4179,10 +4179,8 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle dwExStyleOut = dwExStyleIn & ~WS_EX_WINDOWEDGE; ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle); /* FIXME: Remove the condition below once Wine is fixed */ - if (dwActualExStyle != dwExStyleOut) - todo_wine ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); - else - ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); + todo_wine_if (dwActualExStyle != dwExStyleOut) + ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); DestroyWindow(hwnd); if (hwndParent) DestroyWindow(hwndParent); @@ -4309,10 +4307,8 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou else ex_style_out = ex_style_in & ~WS_EX_WINDOWEDGE; /* FIXME: Remove the condition below once Wine is fixed */ - if (ex_style != ex_style_out) - todo_wine ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); - else - ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); + todo_wine_if (ex_style != ex_style_out) + ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); DestroyWindow(hwnd); DestroyWindow(parent); @@ -5001,8 +4997,8 @@ static void zero_parentdc_test(struct parentdc_test *t) t.w.r.f, got.w.r.f) #define parentdc_todo_field_ok(t, w, r, f, got) \ - if (t.w##_todo.r.f) todo_wine { parentdc_field_ok(t, w, r, f, got); } \ - else parentdc_field_ok(t, w, r, f, got) + todo_wine_if (t.w##_todo.r.f) \ + parentdc_field_ok(t, w, r, f, got); #define parentdc_rect_ok(t, w, r, got) \ parentdc_todo_field_ok(t, w, r, left, got); \ @@ -6423,9 +6419,7 @@ static void run_NCRedrawLoop(UINT flags) DispatchMessageA(&msg); MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT); } - if (flags == (RDW_INVALIDATE | RDW_FRAME)) - todo_wine ok(loopcount < 100, "Detected infinite WM_PAINT loop (%x).\n", flags); - else + todo_wine_if (flags == (RDW_INVALIDATE | RDW_FRAME)) ok(loopcount < 100, "Detected infinite WM_PAINT loop (%x).\n", flags); DestroyWindow(hwnd); }

1 0

Austin English : user32: Add DisplayConfigGetDeviceInfo stub.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: c7a4b0628d7597fb0eff3e5dd589f70dbba04ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7a4b0628d7597fb0eff3e5dd… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 19 02:42:05 2016 -0600 user32: Add DisplayConfigGetDeviceInfo stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 9 +++++++++ dlls/user32/user32.spec | 1 + include/wingdi.h | 19 +++++++++++++++++++ include/winuser.h | 1 + 4 files changed, 30 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 55722c1..1787b99 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2817,6 +2817,15 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND /*********************************************************************** + * DisplayConfigGetDeviceInfo (USER32.@) + */ +LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) +{ + FIXME("stub: %p\n", packet); + return ERROR_NOT_SUPPORTED; +} + +/*********************************************************************** * EnumDisplaySettingsW (USER32.@) * * RETURNS diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 9b409df..2f5d36f 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -168,6 +168,7 @@ @ stdcall DisableProcessWindowsGhosting() @ stdcall DispatchMessageA(ptr) @ stdcall DispatchMessageW(ptr) +@ stdcall DisplayConfigGetDeviceInfo(ptr) # @ stub DisplayExitWindowsWarnings @ stdcall DlgDirListA(long str long long long) @ stdcall DlgDirListComboBoxA(long ptr long long long) diff --git a/include/wingdi.h b/include/wingdi.h index f6fd6fe..ff11406 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3278,6 +3278,25 @@ typedef struct _RGNDATA { typedef BOOL (CALLBACK *ABORTPROC)(HDC, INT); +typedef enum { + DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME = 1, + DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME = 2, + DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE = 3, + DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME = 4, + DISPLAYCONFIG_DEVICE_INFO_SET_TARGET_PERSISTENCE = 5, + DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_BASE_TYPE = 6, + DISPLAYCONFIG_DEVICE_INFO_GET_SUPPORT_VIRTUAL_RESOLUTION = 7, + DISPLAYCONFIG_DEVICE_INFO_SET_SUPPORT_VIRTUAL_RESOLUTION = 8, + DISPLAYCONFIG_DEVICE_INFO_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_DEVICE_INFO_TYPE; + +typedef struct DISPLAYCONFIG_DEVICE_INFO_HEADER { + DISPLAYCONFIG_DEVICE_INFO_TYPE type; + UINT32 size; + LUID adapterId; + UINT32 id; +} DISPLAYCONFIG_DEVICE_INFO_HEADER; + typedef struct { DWORD cb; CHAR DeviceName[32]; diff --git a/include/winuser.h b/include/winuser.h index b5f89c1..fa3e661 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3285,6 +3285,7 @@ WINUSERAPI LONG WINAPI ChangeDisplaySettingsExW(LPCWSTR,LPDEVMODEW,HWND,D WINUSERAPI HDESK WINAPI CreateDesktopA(LPCSTR,LPCSTR,LPDEVMODEA,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES); WINUSERAPI HDESK WINAPI CreateDesktopW(LPCWSTR,LPCWSTR,LPDEVMODEW,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES); #define CreateDesktop WINELIB_NAME_AW(CreateDesktop) +WINUSERAPI LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *); WINUSERAPI BOOL WINAPI EnumDisplayDevicesA(LPCSTR,DWORD,LPDISPLAY_DEVICEA,DWORD); WINUSERAPI BOOL WINAPI EnumDisplayDevicesW(LPCWSTR,DWORD,LPDISPLAY_DEVICEW,DWORD); #define EnumDisplayDevices WINELIB_NAME_AW(EnumDisplayDevices)

1 0

Frédéric Delanoy : msi/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 7ab21391918283579a16d8a7a89840291e8ad840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab21391918283579a16d8a7a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 19 15:05:53 2016 +0100 msi/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/automation.c | 9 ++------- dlls/msi/tests/package.c | 19 ++++--------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index d02e9a2..e4d2faa 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -601,10 +601,7 @@ static void test_dispid(void) while (ptr->name) { dispid = get_dispid(pInstaller, ptr->name); - if (ptr->todo) - todo_wine - ok(dispid == ptr->did, "%s: expected %d, got %d\n", ptr->name, ptr->did, dispid); - else + todo_wine_if (ptr->todo) ok(dispid == ptr->did, "%s: expected %d, got %d\n", ptr->name, ptr->did, dispid); ptr++; } @@ -885,9 +882,7 @@ static HRESULT invoke(IDispatch *pDispatch, LPCSTR szName, WORD wFlags, DISPPARA if (hr == S_OK) { - if (_invoke_todo_vtResult) todo_wine - ok(V_VT(pVarResult) == vtResult, "Variant result type is %d, expected %d\n", V_VT(pVarResult), vtResult); - else + todo_wine_if (_invoke_todo_vtResult) ok(V_VT(pVarResult) == vtResult, "Variant result type is %d, expected %d\n", V_VT(pVarResult), vtResult); if (vtResult != VT_EMPTY) { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 41f0f9f..60a08ac 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2638,19 +2638,14 @@ static void test_feature_states( UINT line, MSIHANDLE package, const char *featu { ok( state == expected_state, "%u: expected state %d got %d\n", line, expected_state, state ); - if (todo) todo_wine - ok( action == expected_action, "%u: expected action %d got %d\n", - line, expected_action, action ); - else + todo_wine_if (todo) ok( action == expected_action, "%u: expected action %d got %d\n", line, expected_action, action ); } else { ok( state == 0xdeadbee, "%u: expected state 0xdeadbee got %d\n", line, state ); - if (todo) todo_wine - ok( action == 0xdeadbee, "%u: expected action 0xdeadbee got %d\n", line, action ); - else + todo_wine_if (todo) ok( action == 0xdeadbee, "%u: expected action 0xdeadbee got %d\n", line, action ); } @@ -2669,10 +2664,7 @@ static void test_component_states( UINT line, MSIHANDLE package, const char *com { ok( state == expected_state, "%u: expected state %d got %d\n", line, expected_state, state ); - if (todo) todo_wine - ok( action == expected_action, "%u: expected action %d got %d\n", - line, expected_action, action ); - else + todo_wine_if (todo) ok( action == expected_action, "%u: expected action %d got %d\n", line, expected_action, action ); } @@ -2680,10 +2672,7 @@ static void test_component_states( UINT line, MSIHANDLE package, const char *com { ok( state == 0xdeadbee, "%u: expected state 0xdeadbee got %d\n", line, state ); - if (todo) todo_wine - ok( action == 0xdeadbee, "%u: expected action 0xdeadbee got %d\n", - line, action ); - else + todo_wine_if (todo) ok( action == 0xdeadbee, "%u: expected action 0xdeadbee got %d\n", line, action ); }

1 0

Frédéric Delanoy : msctf/tests: Use todo_wine_if () in tests.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 430556ae06281cb6c4b23baf91b9c00724f1a58d URL: http://source.winehq.org/git/wine.git/?a=commit;h=430556ae06281cb6c4b23baf9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 19 15:05:52 2016 +0100 msctf/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 58d4d26..a873345 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -117,9 +117,7 @@ static inline void _sink_fire_ok(INT *sink, const CHAR* name) *sink = (*sink & ~SINK_EXPECTED_COUNT_MASK) + (count << 16); return; default: - if (todo) - todo_wine winetest_ok(0, "Unexpected %s sink\n",name); - else + todo_wine_if (todo) winetest_ok(0, "Unexpected %s sink\n",name); } *sink = SINK_FIRED; @@ -147,9 +145,7 @@ static inline void _sink_check_ok(INT *sink, const CHAR* name) winetest_trace("optional sink %s not fired\n",name); break; default: - if (todo) - todo_wine winetest_ok(0, "%s not fired as expected, in state %x\n",name,*sink); - else + todo_wine_if (todo) winetest_ok(0, "%s not fired as expected, in state %x\n",name,*sink); } *sink = SINK_UNEXPECTED;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_3d_GetVolumeLevel().
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 03ced2e0d3f0a7898563043cd1d79149332e5e42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ced2e0d3f0a7898563043cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 19 17:28:42 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_3d_GetVolumeLevel(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index b9f5824..bef099a 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -986,19 +986,17 @@ static HRESULT WINAPI d3d8_texture_3d_GetVolumeLevel(IDirect3DVolumeTexture8 *if UINT level, IDirect3DVolume8 **volume) { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); - struct wined3d_resource *sub_resource; struct d3d8_volume *volume_impl; TRACE("iface %p, level %u, volume %p.\n", iface, level, volume); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(volume_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) { wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - volume_impl = wined3d_resource_get_parent(sub_resource); *volume = &volume_impl->IDirect3DVolume8_iface; IDirect3DVolume8_AddRef(*volume); wined3d_mutex_unlock();

1 0

Henri Verbeet : wined3d: Pass a format instead of a surface to wined3d_format_convert_from_float() .
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 0ec540276ae5b7e43e41a794a6d22f5e070571e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec540276ae5b7e43e41a794a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 19 17:28:43 2016 +0100 wined3d: Pass a format instead of a surface to wined3d_format_convert_from_float(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/utils.c | 3 +-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 88acca5..86cedb0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4685,7 +4685,7 @@ static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d static const RECT src_rect; struct wined3d_blt_fx fx; - fx.fill_color = wined3d_format_convert_from_float(surface, color); + fx.fill_color = wined3d_format_convert_from_float(view->format, color); return surface_cpu_blt(surface, rect, NULL, &src_rect, WINED3D_BLT_COLOR_FILL, &fx, WINED3D_TEXF_POINT); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b52b967..734b265 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4393,7 +4393,7 @@ void get_fog_start_end(const struct wined3d_context *context, const struct wined /* Note: It's the caller's responsibility to ensure values can be expressed * in the requested format. UNORM formats for example can only express values * in the range 0.0f -> 1.0f. */ -DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, const struct wined3d_color *color) +DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, const struct wined3d_color *color) { static const struct { @@ -4426,7 +4426,6 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, c {WINED3DFMT_R10G10B10A2_UNORM, 1023.0f, 1023.0f, 1023.0f, 3.0f, 0, 10, 20, 30}, {WINED3DFMT_P8_UINT, 0.0f, 0.0f, 0.0f, 255.0f, 0, 0, 0, 0}, }; - const struct wined3d_format *format = surface->resource.format; unsigned int i; TRACE("Converting color {%.8e %.8e %.8e %.8e} to format %s.\n", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 35ece12..4e3d779 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3354,7 +3354,7 @@ void wined3d_format_calculate_pitch(const struct wined3d_format *format, unsigne unsigned int width, unsigned int height, unsigned int *row_pitch, unsigned int *slice_pitch) DECLSPEC_HIDDEN; UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT alignment, UINT width, UINT height, UINT depth) DECLSPEC_HIDDEN; -DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, +DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, const struct wined3d_color *color) DECLSPEC_HIDDEN; BOOL wined3d_format_convert_color_to_float(const struct wined3d_format *format, const struct wined3d_palette *palette, DWORD color, struct wined3d_color *float_color) DECLSPEC_HIDDEN;

1 0