October 2013 - Wine-commits

Vijay Kiran Kamuju : wininet: Implement setting INTERNET_PER_CONN_PROXY_BYPASS.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: ebe121e360c4118c5263c20717a3fc25ebbcd9b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebe121e360c4118c5263c2071… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Oct 27 22:01:22 2013 +0000 wininet: Implement setting INTERNET_PER_CONN_PROXY_BYPASS. --- dlls/wininet/internet.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 954e891..73fdfe4 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2912,13 +2912,17 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, } break; + case INTERNET_PER_CONN_PROXY_BYPASS: + heap_free(pi.proxyBypass); + pi.proxyBypass = heap_strdupW(option->Value.pszValue); + break; + case INTERNET_PER_CONN_AUTOCONFIG_URL: case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: - case INTERNET_PER_CONN_PROXY_BYPASS: FIXME("Unhandled dwOption %d\n", option->dwOption); break;

1 0

Alistair Leslie-Hughes : mscoree: Display the privatePath when parsing the .config file.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: 45109f45df19c1cf7f9390056b64c147348dd93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45109f45df19c1cf7f9390056… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 28 11:24:37 2013 +1100 mscoree: Display the privatePath when parsing the .config file. --- dlls/mscoree/config.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index c5e3cec..5da1102 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -41,8 +41,11 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); enum parse_state { + STATE_ASSEMBLY_BINDING, STATE_ROOT, STATE_CONFIGURATION, + STATE_PROBING, + STATE_RUNTIME, STATE_STARTUP, STATE_UNKNOWN }; @@ -147,6 +150,23 @@ static HRESULT parse_startup(ConfigFileHandler *This, ISAXAttributes *pAttr) return hr; } +static HRESULT parse_probing(ConfigFileHandler *This, ISAXAttributes *pAttr) +{ + static const WCHAR privatePath[] = {'p','r','i','v','a','t','e','P','a','t','h',0}; + static const WCHAR empty[] = {0}; + LPCWSTR value; + int value_size; + HRESULT hr; + + hr = ISAXAttributes_getValueFromName(pAttr, empty, 0, privatePath, lstrlenW(privatePath), &value, &value_size); + if (SUCCEEDED(hr)) + FIXME("privatePath=%s not implemented\n", debugstr_wn(value, value_size)); + hr = S_OK; + + return hr; +} + + static HRESULT parse_supported_runtime(ConfigFileHandler *This, ISAXAttributes *pAttr) { static const WCHAR version[] = {'v','e','r','s','i','o','n',0}; @@ -199,8 +219,12 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, { ConfigFileHandler *This = impl_from_ISAXContentHandler(iface); static const WCHAR configuration[] = {'c','o','n','f','i','g','u','r','a','t','i','o','n',0}; + static const WCHAR assemblyBinding[] = {'a','s','s','e','m','b','l','y','B','i','n','d','i','n','g',0}; + static const WCHAR probing[] = {'p','r','o','b','i','n','g',0}; + static const WCHAR runtime[] = {'r','u','n','t','i','m','e',0}; static const WCHAR startup[] = {'s','t','a','r','t','u','p',0}; static const WCHAR supportedRuntime[] = {'s','u','p','p','o','r','t','e','d','R','u','n','t','i','m','e',0}; + HRESULT hr = S_OK; TRACE("%s %s %s\n", debugstr_wn(pNamespaceUri,nNamespaceUri), @@ -231,6 +255,31 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, This->states[++This->statenum] = STATE_STARTUP; break; } + else if (nLocalName == sizeof(runtime)/sizeof(WCHAR)-1 && + lstrcmpW(pLocalName, runtime) == 0) + { + This->states[++This->statenum] = STATE_RUNTIME; + break; + } + else + goto unknown; + case STATE_RUNTIME: + if (nLocalName == sizeof(assemblyBinding)/sizeof(WCHAR)-1 && + lstrcmpW(pLocalName, assemblyBinding) == 0) + { + This->states[++This->statenum] = STATE_ASSEMBLY_BINDING; + break; + } + else + goto unknown; + case STATE_ASSEMBLY_BINDING: + if (nLocalName == sizeof(probing)/sizeof(WCHAR)-1 && + lstrcmpW(pLocalName, probing) == 0) + { + hr = parse_probing(This, pAttr); + This->states[++This->statenum] = STATE_PROBING; + break; + } else goto unknown; case STATE_STARTUP:

1 0

Alistair Leslie-Hughes : mscoree: Rename function to match its use.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: 2d899505d7717a8e99d33ee28fcc577c8a7616de URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d899505d7717a8e99d33ee28… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 30 08:14:49 2013 +1100 mscoree: Rename function to match its use. --- dlls/mscoree/metahost.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 7e99bbe..6d87b25 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -110,7 +110,7 @@ void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly); static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path); -static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data); +static MonoAssembly* mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data); static void mono_shutdown_callback_fn(MonoProfiler *prof); @@ -236,7 +236,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This) mono_config_parse(NULL); - mono_install_assembly_preload_hook(mono_assembly_search_hook_fn, NULL); + mono_install_assembly_preload_hook(mono_assembly_preload_hook_fn, NULL); trace_size = GetEnvironmentVariableA("WINE_MONO_TRACE", trace_setting, sizeof(trace_setting)); @@ -1253,7 +1253,7 @@ HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int return hr; } -static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) +static MonoAssembly* mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) { HRESULT hr; MonoAssembly *result=NULL;

1 0

Henri Verbeet : ddraw: Use GET_MODULE_HANDLE_EX_FLAG_PIN.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: ff3014221eeb9acb608274f307395b7912fa90a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3014221eeb9acb608274f30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 30 10:17:52 2013 +0100 ddraw: Use GET_MODULE_HANDLE_EX_FLAG_PIN. --- dlls/ddraw/main.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 79033fc..e613126 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -872,10 +872,9 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) * exclusive mode, we replace the window proc of the ddraw window. If * an application would unload ddraw from the WM_DESTROY handler for * that window, it would return to unmapped memory and die. Apparently - * this is supposed to work on Windows. We should probably use - * GET_MODULE_HANDLE_EX_FLAG_PIN for this, but that's not currently - * implemented. */ - if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)&ddraw_self, &ddraw_self)) + * this is supposed to work on Windows. */ + if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_PIN, + (const WCHAR *)&ddraw_self, &ddraw_self)) ERR("Failed to get own module handle.\n"); instance = inst;

1 0

Henri Verbeet : d3d9/tests: Avoid windowsx.h.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: 3528393d642b1c9fb1d589b53de3208d2d87819a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3528393d642b1c9fb1d589b53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 30 10:17:53 2013 +0100 d3d9/tests: Avoid windowsx.h. --- dlls/d3d9/tests/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 37fb8fe..0691429 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -22,10 +22,12 @@ */ #define COBJMACROS -#include <windowsx.h> #include <d3d9.h> #include "wine/test.h" +#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) +#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) + static INT screen_width; static INT screen_height;

1 0

Stefan Dösinger : ddraw/tests: Allow some flags to fail surface creation in test_rt_caps.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 3fafd37905e0f26b3c5d96c321ef8fb1d20828b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fafd37905e0f26b3c5d96c32… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 28 23:35:47 2013 +0100 ddraw/tests: Allow some flags to fail surface creation in test_rt_caps. --- dlls/ddraw/tests/ddraw1.c | 26 +++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 26 +++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3fafd37905e0f26b3c5d9…

1 0

Stefan Dösinger : ddraw/tests: Make caps checking in test_rt_caps() less strict.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 4b39c46fa2faf922083dc95bc33624901ea42f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b39c46fa2faf922083dc95bc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 28 23:35:48 2013 +0100 ddraw/tests: Make caps checking in test_rt_caps() less strict. R200 creates P8 3DDEVICE surfaces in video memory, and consequently returns a different error message when trying to create a device. --- dlls/ddraw/tests/ddraw1.c | 13 ++++++++----- dlls/ddraw/tests/ddraw2.c | 13 ++++++++----- dlls/ddraw/tests/ddraw4.c | 9 ++++++--- dlls/ddraw/tests/ddraw7.c | 9 ++++++--- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index de4947b..685b9cd 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3162,7 +3162,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, + ~0U /* AMD r200 */ , DDERR_NOPALETTEATTACHED, FALSE, }, @@ -3197,14 +3197,14 @@ static void test_rt_caps(void) { NULL, DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER, - DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + ~0U /* AMD Evergreen */, DDERR_INVALIDCAPS, FALSE, }, { NULL, DDSCAPS_ZBUFFER, - DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + ~0U /* AMD Evergreen */, DDERR_INVALIDCAPS, FALSE, }, @@ -3286,7 +3286,7 @@ static void test_rt_caps(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(SUCCEEDED(hr), "Test %u: Failed to get surface desc, hr %#x.\n", i, hr); - ok(surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, + ok(test_data[i].caps_out == ~0U || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, "Test %u: Got unexpected caps %#x, expected %#x.\n", i, surface_desc.ddsCaps.dwCaps, test_data[i].caps_out); @@ -3298,7 +3298,10 @@ static void test_rt_caps(void) hr = IDirectDrawSurface_SetPalette(surface, palette); ok(SUCCEEDED(hr), "Test %u: Failed to set palette, hr %#x.\n", i, hr); hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirect3DHALDevice, (void **)&device); - ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) + ok(hr == DDERR_INVALIDPIXELFORMAT, "Test %u: Got unexpected hr %#x.\n", i, hr); + else + ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); } if (SUCCEEDED(hr)) { diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ae498d4..6bb8ffa 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -3770,7 +3770,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, + ~0U /* AMD r200 */, DDERR_NOPALETTEATTACHED, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, @@ -3815,7 +3815,7 @@ static void test_rt_caps(void) { NULL, DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER, - DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + ~0U /* AMD Evergreen */, DDERR_INVALIDCAPS, DDERR_INVALIDPIXELFORMAT, DDERR_INVALIDCAPS, @@ -3824,7 +3824,7 @@ static void test_rt_caps(void) { NULL, DDSCAPS_ZBUFFER, - DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + ~0U /* AMD Evergreen */, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, @@ -3912,7 +3912,7 @@ static void test_rt_caps(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(SUCCEEDED(hr), "Test %u: Failed to get surface desc, hr %#x.\n", i, hr); - ok(surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, + ok(test_data[i].caps_out == ~0U || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, "Test %u: Got unexpected caps %#x, expected %#x.\n", i, surface_desc.ddsCaps.dwCaps, test_data[i].caps_out); @@ -3926,7 +3926,10 @@ static void test_rt_caps(void) hr = IDirectDrawSurface_SetPalette(surface, palette); ok(SUCCEEDED(hr), "Test %u: Failed to set palette, hr %#x.\n", i, hr); hr = IDirect3D2_CreateDevice(d3d, &IID_IDirect3DHALDevice, surface, &device); - ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) + ok(hr == DDERR_INVALIDPIXELFORMAT, "Test %u: Got unexpected hr %#x.\n", i, hr); + else + ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); } IDirectDrawSurface_Release(surface); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index ac885b4..f880f8e 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4353,7 +4353,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, + ~0U /* AMD r200 */, DDERR_NOPALETTEATTACHED, DDERR_INVALIDCAPS, }, @@ -4470,7 +4470,7 @@ static void test_rt_caps(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &surface_desc); ok(SUCCEEDED(hr), "Test %u: Failed to get surface desc, hr %#x.\n", i, hr); - ok(surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, + ok(test_data[i].caps_out == ~0U || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, "Test %u: Got unexpected caps %#x, expected %#x.\n", i, surface_desc.ddsCaps.dwCaps, test_data[i].caps_out); @@ -4484,7 +4484,10 @@ static void test_rt_caps(void) hr = IDirectDrawSurface4_SetPalette(surface, palette); ok(SUCCEEDED(hr), "Test %u: Failed to set palette, hr %#x.\n", i, hr); hr = IDirect3D3_CreateDevice(d3d, &IID_IDirect3DHALDevice, surface, &device, NULL); - ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) + ok(hr == DDERR_INVALIDPIXELFORMAT, "Test %u: Got unexpected hr %#x.\n", i, hr); + else + ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); } IDirectDrawSurface4_Release(surface); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 27555fb..cf69cf9 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4179,7 +4179,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, + ~0U /* AMD r200 */, DDERR_NOPALETTEATTACHED, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, @@ -4310,7 +4310,7 @@ static void test_rt_caps(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); ok(SUCCEEDED(hr), "Test %u: Failed to get surface desc, hr %#x.\n", i, hr); - ok(surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, + ok(test_data[i].caps_out == ~0U || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, "Test %u: Got unexpected caps %#x, expected %#x.\n", i, surface_desc.ddsCaps.dwCaps, test_data[i].caps_out); @@ -4324,7 +4324,10 @@ static void test_rt_caps(void) hr = IDirectDrawSurface7_SetPalette(surface, palette); ok(SUCCEEDED(hr), "Test %u: Failed to set palette, hr %#x.\n", i, hr); hr = IDirect3D7_CreateDevice(d3d, devtype, surface, &device); - ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) + ok(hr == DDERR_INVALIDPIXELFORMAT, "Test %u: Got unexpected hr %#x.\n", i, hr); + else + ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); } IDirectDrawSurface7_Release(surface);

1 0

Stefan Dösinger : ddraw/tests: r200 accepts 3DDEVICE | ZBUFFER render targets in ddraw4.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 7899850d60f43a25ee4d5c1f3bad674c1f1033cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7899850d60f43a25ee4d5c1f3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 28 23:35:49 2013 +0100 ddraw/tests: r200 accepts 3DDEVICE | ZBUFFER render targets in ddraw4. It doesn't in ddraw2 and 7. --- dlls/ddraw/tests/ddraw4.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index f880f8e..f56c4e7 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4269,7 +4269,7 @@ static void test_rt_caps(void) DWORD caps_in; DWORD caps_out; HRESULT create_device_hr; - HRESULT set_rt_hr; + HRESULT set_rt_hr, alternative_set_rt_hr; } test_data[] = { @@ -4279,6 +4279,7 @@ static void test_rt_caps(void) DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, D3D_OK, D3D_OK, + D3D_OK, }, { NULL, @@ -4286,6 +4287,7 @@ static void test_rt_caps(void) DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, D3D_OK, D3D_OK, + D3D_OK, }, { NULL, @@ -4293,6 +4295,7 @@ static void test_rt_caps(void) DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { NULL, @@ -4300,6 +4303,7 @@ static void test_rt_caps(void) DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, D3DERR_SURFACENOTINVIDMEM, D3D_OK, + D3D_OK, }, { NULL, @@ -4307,6 +4311,7 @@ static void test_rt_caps(void) DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { NULL, @@ -4314,6 +4319,7 @@ static void test_rt_caps(void) DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, D3D_OK, D3D_OK, + D3D_OK, }, { NULL, @@ -4321,6 +4327,7 @@ static void test_rt_caps(void) DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, D3D_OK, D3D_OK, + D3D_OK, }, { NULL, @@ -4328,6 +4335,7 @@ static void test_rt_caps(void) DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { NULL, @@ -4335,6 +4343,7 @@ static void test_rt_caps(void) DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, D3DERR_SURFACENOTINVIDMEM, D3D_OK, + D3D_OK, }, { NULL, @@ -4342,6 +4351,7 @@ static void test_rt_caps(void) DDSCAPS_SYSTEMMEMORY, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { &p8_fmt, @@ -4349,6 +4359,7 @@ static void test_rt_caps(void) DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { &p8_fmt, @@ -4356,6 +4367,7 @@ static void test_rt_caps(void) ~0U /* AMD r200 */, DDERR_NOPALETTEATTACHED, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { &p8_fmt, @@ -4363,6 +4375,7 @@ static void test_rt_caps(void) DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { &p8_fmt, @@ -4370,6 +4383,7 @@ static void test_rt_caps(void) DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, DDERR_NOPALETTEATTACHED, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { &p8_fmt, @@ -4377,6 +4391,7 @@ static void test_rt_caps(void) DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { &z_fmt, @@ -4384,6 +4399,7 @@ static void test_rt_caps(void) DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, DDERR_INVALIDCAPS, DDERR_INVALIDPIXELFORMAT, + D3D_OK /* r200 */, }, { &z_fmt, @@ -4391,6 +4407,7 @@ static void test_rt_caps(void) DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, DDERR_INVALIDCAPS, DDERR_INVALIDPIXELFORMAT, + D3D_OK /* r200 */, }, { &z_fmt, @@ -4398,6 +4415,7 @@ static void test_rt_caps(void) DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, { &z_fmt, @@ -4405,6 +4423,7 @@ static void test_rt_caps(void) DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER, DDERR_INVALIDCAPS, DDERR_INVALIDPIXELFORMAT, + D3D_OK /* r200 */, }, { &z_fmt, @@ -4412,6 +4431,7 @@ static void test_rt_caps(void) DDSCAPS_SYSTEMMEMORY | DDSCAPS_ZBUFFER, DDERR_INVALIDCAPS, DDERR_INVALIDCAPS, + DDERR_INVALIDCAPS, }, }; @@ -4520,7 +4540,8 @@ static void test_rt_caps(void) i, test_data[i].caps_in, hr); hr = IDirect3DDevice3_SetRenderTarget(device, rt, 0); - ok(hr == test_data[i].set_rt_hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", + ok(hr == test_data[i].set_rt_hr || broken(hr == test_data[i].alternative_set_rt_hr), + "Test %u: Got unexpected hr %#x, expected %#x.\n", i, hr, test_data[i].set_rt_hr); if (SUCCEEDED(hr) || hr == DDERR_INVALIDPIXELFORMAT) expected_rt = rt;

1 0

Nikolay Sivov : setupapi/tests: Enable compilation with -D__WINESRC__.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 9d03aa328f7a298102f983fa535dc4930e76ec3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d03aa328f7a298102f983fa5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 29 07:53:23 2013 +0400 setupapi/tests: Enable compilation with -D__WINESRC__. --- dlls/setupapi/tests/Makefile.in | 1 - dlls/setupapi/tests/devinst.c | 10 ++-- dlls/setupapi/tests/install.c | 80 +++++++++++++++++++------------------- dlls/setupapi/tests/misc.c | 60 ++++++++++++++-------------- dlls/setupapi/tests/parser.c | 6 +- dlls/setupapi/tests/query.c | 4 +- dlls/setupapi/tests/setupcab.c | 4 +- 7 files changed, 82 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d03aa328f7a298102f98…

1 0

Stefan Dösinger : d3d9/tests: Give stencil_cull_test its own device.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 60f62f4d48508909d140400921a65f8a2baadad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f62f4d48508909d14040092… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 28 23:35:50 2013 +0100 d3d9/tests: Give stencil_cull_test its own device. After drawing a quad with cullmode != none, the r500's Windows driver's ability to clip clear rectangles to the viewport is permanently broken. This shows up as a test failure in depth_buffer_test(). --- dlls/d3d9/tests/visual.c | 102 +++++++++++++++++++++++++++------------------- 1 files changed, 60 insertions(+), 42 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d010043..0b9c712 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -168,12 +168,35 @@ out: return ret; } +static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DDevice9 *device; + HRESULT hr; + + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = create_window(); + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + + hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, + "Failed to create a device, hr %#x.\n", hr); + if (FAILED(hr)) + DestroyWindow(present_parameters.hDeviceWindow); + + return device; +} + static IDirect3DDevice9 *init_d3d9(void) { IDirect3D9 * (__stdcall * d3d9_create)(UINT SDKVersion) = 0; IDirect3D9 *d3d9_ptr = 0; - IDirect3DDevice9 *device_ptr = 0; - D3DPRESENT_PARAMETERS present_parameters; HRESULT hr; D3DADAPTER_IDENTIFIER9 identifier; @@ -188,16 +211,6 @@ static IDirect3DDevice9 *init_d3d9(void) return NULL; } - ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = create_window(); - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferWidth = 640; - present_parameters.BackBufferHeight = 480; - present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; - present_parameters.EnableAutoDepthStencil = TRUE; - present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; - memset(&identifier, 0, sizeof(identifier)); hr = IDirect3D9_GetAdapterIdentifier(d3d9_ptr, 0, 0, &identifier); ok(hr == D3D_OK, "Failed to get adapter identifier description\n"); @@ -210,12 +223,7 @@ static IDirect3DDevice9 *init_d3d9(void) HIWORD(U(identifier.DriverVersion).HighPart), LOWORD(U(identifier.DriverVersion).HighPart), HIWORD(U(identifier.DriverVersion).LowPart), LOWORD(U(identifier.DriverVersion).LowPart)); - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, - "Failed to create a device, hr %#x.\n", hr); - - return device_ptr; + return create_device(d3d9_ptr); } static void cleanup_device(IDirect3DDevice9 *device) @@ -8741,56 +8749,63 @@ cleanup: IDirect3DVertexDeclaration9_Release(vertex_declaration); } -static void stencil_cull_test(IDirect3DDevice9 *device) { +static void stencil_cull_test(IDirect3D9 *d3d9) +{ + IDirect3DDevice9 *device; + D3DCAPS9 caps; HRESULT hr; - IDirect3DSurface9 *depthstencil = NULL; - D3DSURFACE_DESC desc; - float quad1[] = { + static const float quad1[] = + { -1.0, -1.0, 0.1, 0.0, -1.0, 0.1, -1.0, 0.0, 0.1, 0.0, 0.0, 0.1, }; - float quad2[] = { + static const float quad2[] = + { 0.0, -1.0, 0.1, 1.0, -1.0, 0.1, 0.0, 0.0, 0.1, 1.0, 0.0, 0.1, }; - float quad3[] = { + static const float quad3[] = + { 0.0, 0.0, 0.1, 1.0, 0.0, 0.1, 0.0, 1.0, 0.1, 1.0, 1.0, 0.1, }; - float quad4[] = { + static const float quad4[] = + { -1.0, 0.0, 0.1, 0.0, 0.0, 0.1, -1.0, 1.0, 0.1, 0.0, 1.0, 0.1, }; - struct vertex painter[] = { + struct vertex painter[] = + { {-1.0, -1.0, 0.0, 0x00000000}, { 1.0, -1.0, 0.0, 0x00000000}, {-1.0, 1.0, 0.0, 0x00000000}, { 1.0, 1.0, 0.0, 0x00000000}, }; - WORD indices_cw[] = {0, 1, 3}; - WORD indices_ccw[] = {0, 2, 3}; + static const WORD indices_cw[] = {0, 1, 3}; + static const WORD indices_ccw[] = {0, 2, 3}; unsigned int i; DWORD color; - IDirect3DDevice9_GetDepthStencilSurface(device, &depthstencil); - if(depthstencil == NULL) { - skip("No depth stencil buffer\n"); + device = create_device(d3d9); + if (!device) + { + skip("Cannot create a device with a D24S8 stencil buffer.\n"); return; } - hr = IDirect3DSurface9_GetDesc(depthstencil, &desc); - ok(hr == D3D_OK, "IDirect3DSurface9_GetDesc failed with %08x\n", hr); - IDirect3DSurface9_Release(depthstencil); - if(desc.Format != D3DFMT_D24S8 && desc.Format != D3DFMT_D24X4S4) { - skip("No 4 or 8 bit stencil surface\n"); - return; + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if (!(caps.StencilCaps & D3DSTENCILCAPS_TWOSIDED)) + { + skip("No two sided stencil support\n"); + goto cleanup; } hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_STENCIL, 0x00ff0000, 0.0, 0x8); @@ -8798,6 +8813,10 @@ static void stencil_cull_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); ok(SUCCEEDED(hr), "Failed to set FVF,hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); + ok(hr == D3D_OK, "Failed to disable Z test, %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Failed to disable lighting, %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFAIL, D3DSTENCILOP_INCR); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILZFAIL, D3DSTENCILOP_DECR); @@ -8927,6 +8946,9 @@ static void stencil_cull_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + +cleanup: + cleanup_device(device); } static void vpos_register_test(IDirect3DDevice9 *device) @@ -14872,11 +14894,6 @@ START_TEST(visual) fixed_function_decl_test(device_ptr); conditional_np2_repeat_test(device_ptr); fixed_function_bumpmap_test(device_ptr); - if(caps.StencilCaps & D3DSTENCILCAPS_TWOSIDED) { - stencil_cull_test(device_ptr); - } else { - skip("No two sided stencil support\n"); - } pointsize_test(device_ptr); tssargtemp_test(device_ptr); np2_stretch_rect_test(device_ptr); @@ -14970,6 +14987,7 @@ START_TEST(visual) multisampled_depth_buffer_test(d3d9); resz_test(d3d9); + stencil_cull_test(d3d9); IDirect3D9_Release(d3d9);

1 0