wine-commits March 2014

wine-commits@winehq.org

2 participants
530 discussions

Stefan Dösinger : ddraw/tests: Show that a failing SetPrivateData call does not clear the old contents.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: f6e0e1815b8be1ba502550f3ccdfca1dbf20573c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6e0e1815b8be1ba502550f3c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 10 23:43:11 2014 +0100 ddraw/tests: Show that a failing SetPrivateData call does not clear the old contents. --- dlls/ddraw/tests/ddraw4.c | 17 +++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 5a2dba1..3b1f8d4 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6072,6 +6072,23 @@ static void test_private_data(void) sizeof(ddraw) * 2, DDSPD_IUNKNOWNPOINTER); ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + /* Note that with a size != 0 and size != sizeof(IUnknown *) and + * DDSPD_IUNKNOWNPOINTER set SetPrivateData in ddraw4 and ddraw7 + * erases the old content and returns an error. This behavior has + * been fixed in d3d8 and d3d9. Unless an application is found + * that depends on this we don't care about this behavior. */ + hr = IDirectDrawSurface4_SetPrivateData(surface, &IID_IDirect3D, ddraw, + sizeof(ddraw), DDSPD_IUNKNOWNPOINTER); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + hr = IDirectDrawSurface4_SetPrivateData(surface, &IID_IDirect3D, ddraw, + 0, DDSPD_IUNKNOWNPOINTER); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + size = sizeof(ptr); + hr = IDirectDrawSurface4_GetPrivateData(surface, &IID_IDirect3D, &ptr, &size); + ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); + hr = IDirectDrawSurface4_FreePrivateData(surface, &IID_IDirect3D); + ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)ddraw); hr = IDirectDrawSurface4_SetPrivateData(surface, &IID_IDirect3D, ddraw, sizeof(ddraw), DDSPD_IUNKNOWNPOINTER); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1218a21..b4570af 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5927,6 +5927,23 @@ static void test_private_data(void) sizeof(ddraw) * 2, DDSPD_IUNKNOWNPOINTER); ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + /* Note that with a size != 0 and size != sizeof(IUnknown *) and + * DDSPD_IUNKNOWNPOINTER set SetPrivateData in ddraw4 and ddraw7 + * erases the old content and returns an error. This behavior has + * been fixed in d3d8 and d3d9. Unless an application is found + * that depends on this we don't care about this behavior. */ + hr = IDirectDrawSurface7_SetPrivateData(surface, &IID_IDirect3D, ddraw, + sizeof(ddraw), DDSPD_IUNKNOWNPOINTER); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + hr = IDirectDrawSurface7_SetPrivateData(surface, &IID_IDirect3D, ddraw, + 0, DDSPD_IUNKNOWNPOINTER); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + size = sizeof(ptr); + hr = IDirectDrawSurface7_GetPrivateData(surface, &IID_IDirect3D, &ptr, &size); + ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); + hr = IDirectDrawSurface7_FreePrivateData(surface, &IID_IDirect3D); + ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)ddraw); hr = IDirectDrawSurface7_SetPrivateData(surface, &IID_IDirect3D, ddraw, sizeof(ddraw), DDSPD_IUNKNOWNPOINTER);

1 0

Stefan Dösinger : d3d8/tests: Show that a failing SetPrivateData call does not clear the old contents.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: b71c4f000b4d7356c0118b981492b5ba241ba013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b71c4f000b4d7356c0118b981… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 10 23:43:10 2014 +0100 d3d8/tests: Show that a failing SetPrivateData call does not clear the old contents. --- dlls/d3d8/tests/device.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index fa370b0..2bac6fd 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3915,6 +3915,20 @@ static void test_private_data(void) device, sizeof(IUnknown *) * 2, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + /* A failing SetPrivateData call does not clear the old data with the same tag. */ + hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DVertexBuffer8, device, + sizeof(device), D3DSPD_IUNKNOWN); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DVertexBuffer8, device, + sizeof(device) * 2, D3DSPD_IUNKNOWN); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + size = sizeof(ptr); + hr = IDirect3DSurface8_GetPrivateData(surface, &IID_IDirect3DVertexBuffer8, &ptr, &size); + ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); + IUnknown_Release(ptr); + hr = IDirect3DSurface8_FreePrivateData(surface, &IID_IDirect3DVertexBuffer8); + ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DSurface8 /* Abuse this tag */, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN);

1 0

Stefan Dösinger : d3d9/tests: Show that a failing SetPrivateData call does not clear the old contents.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: 379c6564dbb024c45f6cc7ce1063885988cdd7ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=379c6564dbb024c45f6cc7ce1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 10 23:43:09 2014 +0100 d3d9/tests: Show that a failing SetPrivateData call does not clear the old contents. --- dlls/d3d9/tests/device.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 08a5be4..93f43fa 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5109,6 +5109,20 @@ static void test_private_data(void) device, sizeof(IUnknown *) * 2, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + /* A failing SetPrivateData call does not clear the old data with the same tag. */ + hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DVertexBuffer9, device, + sizeof(device), D3DSPD_IUNKNOWN); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DVertexBuffer9, device, + sizeof(device) * 2, D3DSPD_IUNKNOWN); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + size = sizeof(ptr); + hr = IDirect3DSurface9_GetPrivateData(surface, &IID_IDirect3DVertexBuffer9, &ptr, &size); + ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); + IUnknown_Release(ptr); + hr = IDirect3DSurface9_FreePrivateData(surface, &IID_IDirect3DVertexBuffer9); + ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN); @@ -5176,6 +5190,7 @@ static void test_private_data(void) ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); hr = IDirect3DSurface9_GetPrivateData(surface2, &IID_IDirect3DVertexBuffer9, data, &size); ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DSurface9_FreePrivateData(surface, &IID_IDirect3DVertexBuffer9); ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr);

1 0

Stefan Dösinger : wined3d: Don' t modify existing data if set_private_data fails.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: ab6368b6e8a6aa202f7c2aa34eef5c3307b54d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab6368b6e8a6aa202f7c2aa34… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 10 23:43:08 2014 +0100 wined3d: Don't modify existing data if set_private_data fails. --- dlls/wined3d/resource.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 177d23e..04c3af4 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -211,7 +211,11 @@ HRESULT CDECL wined3d_resource_set_private_data(struct wined3d_resource *resourc TRACE("resource %p, riid %s, data %p, data_size %u, flags %#x.\n", resource, debugstr_guid(guid), data, data_size, flags); - wined3d_resource_free_private_data(resource, guid); + if (flags & WINED3DSPD_IUNKNOWN && data_size != sizeof(IUnknown *)) + { + WARN("IUnknown data with size %u, returning WINED3DERR_INVALIDCALL.\n", data_size); + return WINED3DERR_INVALIDCALL; + } d = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d)); if (!d) return E_OUTOFMEMORY; @@ -221,12 +225,6 @@ HRESULT CDECL wined3d_resource_set_private_data(struct wined3d_resource *resourc if (flags & WINED3DSPD_IUNKNOWN) { - if (data_size != sizeof(IUnknown *)) - { - WARN("IUnknown data with size %u, returning WINED3DERR_INVALIDCALL.\n", data_size); - HeapFree(GetProcessHeap(), 0, d); - return WINED3DERR_INVALIDCALL; - } d->ptr.object = (IUnknown *)data; d->size = sizeof(IUnknown *); IUnknown_AddRef(d->ptr.object); @@ -242,6 +240,7 @@ HRESULT CDECL wined3d_resource_set_private_data(struct wined3d_resource *resourc d->size = data_size; memcpy(d->ptr.data, data, data_size); } + wined3d_resource_free_private_data(resource, guid); list_add_tail(&resource->privateData, &d->entry); return WINED3D_OK;

1 0

Sebastian Lackner : ntdll: Fix possible race-condition in iocp poller code.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: 9277fcfdb4ff787bbf63e640bb7ed67567ed330d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9277fcfdb4ff787bbf63e640b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 10 18:51:21 2014 +0100 ntdll: Fix possible race-condition in iocp poller code. --- dlls/ntdll/threadpool.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 5bf3385..e2fc6a5 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -235,12 +235,14 @@ NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE Function, PVOID Context, */ static DWORD CALLBACK iocp_poller(LPVOID Arg) { + HANDLE cport = Arg; + while( TRUE ) { PRTL_OVERLAPPED_COMPLETION_ROUTINE callback; LPVOID overlapped; IO_STATUS_BLOCK iosb; - NTSTATUS res = NtRemoveIoCompletion( compl_port, (PULONG_PTR)&callback, (PULONG_PTR)&overlapped, &iosb, NULL ); + NTSTATUS res = NtRemoveIoCompletion( cport, (PULONG_PTR)&callback, (PULONG_PTR)&overlapped, &iosb, NULL ); if (res) { ERR("NtRemoveIoCompletion failed: 0x%x\n", res); @@ -297,7 +299,7 @@ NTSTATUS WINAPI RtlSetIoCompletionCallback(HANDLE FileHandle, PRTL_OVERLAPPED_CO if (!res) { /* FIXME native can start additional threads in case of e.g. hung callback function. */ - res = RtlQueueWorkItem( iocp_poller, NULL, WT_EXECUTEDEFAULT ); + res = RtlQueueWorkItem( iocp_poller, cport, WT_EXECUTEDEFAULT ); if (!res) compl_port = cport; else

1 0

Hans Leidekker : shlwapi/tests: Fix test failures on Windows 8.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: 3a72922e7f5427ea7ae2647fa32545aab9f6b32b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a72922e7f5427ea7ae2647fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 11 13:24:42 2014 +0100 shlwapi/tests: Fix test failures on Windows 8. --- dlls/shlwapi/tests/assoc.c | 50 +++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index 389a9f5..cbc40ce 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -39,6 +39,8 @@ static const WCHAR invalid[] = { 'i','n','v','a','l','i','d',0 }; static void test_getstring_bad(void) { + static const WCHAR openwith[] = {'O','p','e','n','W','i','t','h','.','e','x','e',0}; + WCHAR buf[MAX_PATH]; HRESULT hr; DWORD len; @@ -48,47 +50,71 @@ static void test_getstring_bad(void) return; } + len = 0xdeadbeef; hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, NULL, open, NULL, &len); expect_hr(E_INVALIDARG, hr); + ok(len == 0xdeadbeef, "got %u\n", len); + + len = 0xdeadbeef; hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, badBad, open, NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr); - hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotBad, open, NULL, &len); + ok(len == 0xdeadbeef, "got %u\n", len); + + len = sizeof(buf)/sizeof(buf[0]); + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotBad, open, buf, &len); ok(hr == E_FAIL || - hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ + hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ || + hr == S_OK /* Win8 */, "Unexpected result : %08x\n", hr); - hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, invalid, NULL, - &len); + if (hr == S_OK) + { + ok(len < sizeof(buf)/sizeof(buf[0]), "got %u\n", len); + ok(!lstrcmpiW(buf + len - sizeof(openwith)/sizeof(openwith[0]), openwith), "wrong data\n"); + } + + len = 0xdeadbeef; + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, invalid, NULL, &len); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr); + ok(len == 0xdeadbeef, "got %u\n", len); + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, NULL, NULL); ok(hr == E_UNEXPECTED || hr == E_INVALIDARG, /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr); + len = 0xdeadbeef; hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, NULL, open, NULL, &len); expect_hr(E_INVALIDARG, hr); - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, badBad, open, NULL, - &len); + ok(len == 0xdeadbeef, "got %u\n", len); + + len = 0xdeadbeef; + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, badBad, open, NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr); - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, - &len); + ok(len == 0xdeadbeef, "got %u\n", len); + + len = 0xdeadbeef; + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ || hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), /* Win8 */ "Unexpected result : %08x\n", hr); - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, - &len); + ok(len == 0xdeadbeef, "got %u\n", len); + + len = 0xdeadbeef; + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, &len); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) || /* W2K/Vista/W2K8 */ hr == E_FAIL, /* Win9x/WinMe/NT4 */ "Unexpected result : %08x\n", hr); - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, - NULL); + ok(len == 0xdeadbeef, "got %u\n", len); + + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, NULL); ok(hr == E_UNEXPECTED || hr == E_INVALIDARG, /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr);

1 0

Nikolay Sivov : wbemdisp: Specify default value for method arguments.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: a8a753b49a65fd3938cf1582066cfe15f1803d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8a753b49a65fd3938cf15820… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 11 16:07:29 2014 +0400 wbemdisp: Specify default value for method arguments. --- include/wbemdisp.idl | 430 +++++++++++++++++++++++++++++--------------------- 1 file changed, 254 insertions(+), 176 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8a753b49a65fd3938cf1…

1 0

Rico Schüller : d3dx9/tests: Check if D3DFMT_X1R5G5B5 is supported.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: 9809a3670c50723e9b5a63fbd05b1cf06408eb4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9809a3670c50723e9b5a63fbd… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Mar 10 19:47:36 2014 +0100 d3dx9/tests: Check if D3DFMT_X1R5G5B5 is supported. --- dlls/d3dx9_36/tests/texture.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 631a658..aea09d5 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -304,14 +304,14 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_R3G3B2))) expected = D3DFMT_R3G3B2; + else if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, + mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_X4R4G4B4))) + expected = D3DFMT_X4R4G4B4; + else if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, + mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_X1R5G5B5))) + expected = D3DFMT_X1R5G5B5; else - { - if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, - mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_X4R4G4B4))) - expected = D3DFMT_X4R4G4B4; - else - expected = D3DFMT_X1R5G5B5; - } + expected = D3DFMT_R5G6B5; format = D3DFMT_R3G3B2; hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, &format, D3DPOOL_DEFAULT);

1 0

Alexandre Julliard : configure: Always run makedep on the top-level makefile.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: 25084233d4d23d3bd66ac9f6f130a50ae8fb03e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25084233d4d23d3bd66ac9f6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 11 11:23:35 2014 +0100 configure: Always run makedep on the top-level makefile. --- configure | 7 +++++-- configure.ac | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/configure b/configure index b82130e..b802bc2 100755 --- a/configure +++ b/configure @@ -4846,13 +4846,16 @@ else fi fi if test -z "$wine_cv_toolsdir"; then + wine_makedep=tools/makedep wine_cv_toolsdir="\$(top_builddir)" elif test -d "$wine_cv_toolsdir/tools/winebuild"; then + wine_makedep=$wine_cv_toolsdir/tools/makedep case "$wine_cv_toolsdir" in /*) ;; *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;; esac enable_tools=${enable_tools:-no} + test -f "$wine_makedep" || as_fn_error $? "the Wine tools have not yet been built in $wine_cv_toolsdir" "$LINENO" 5 else as_fn_error $? "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5 fi @@ -16578,7 +16581,7 @@ CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c .MAKEFILEDEPS: all: Makefile Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP) - @./config.status Make.tmp Makefile && \$(MAKEDEP) ." + @./config.status Make.tmp Makefile" test "$srcdir" = . && wine_fn_append_rule "all: .gitignore .gitignore: config.status @@ -18236,7 +18239,7 @@ wine_fn_output_makedep () } wine_fn_output_makefile () { - cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$1 && rm -f Make.tmp && return + cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$1 && rm -f Make.tmp && "$wine_makedep" . && return `cat $wine_rules_file` _WINE_EOF as_fn_error $? "could not create Makefile" "$LINENO" 5 diff --git a/configure.ac b/configure.ac index ee8cd1a..a7b90ac 100644 --- a/configure.ac +++ b/configure.ac @@ -215,13 +215,16 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir, fi fi if test -z "$wine_cv_toolsdir"; then + wine_makedep=tools/makedep wine_cv_toolsdir="\$(top_builddir)" elif test -d "$wine_cv_toolsdir/tools/winebuild"; then + wine_makedep=$wine_cv_toolsdir/tools/makedep case "$wine_cv_toolsdir" in /*) ;; *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;; esac enable_tools=${enable_tools:-no} + test -f "$wine_makedep" || AC_MSG_ERROR([the Wine tools have not yet been built in $wine_cv_toolsdir]) else AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir]) fi]) @@ -2593,7 +2596,7 @@ CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[[ch]] *.yy.c .MAKEFILEDEPS: all: Makefile Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP) - @./config.status Make.tmp Makefile && \$(MAKEDEP) .]) + @./config.status Make.tmp Makefile]) test "$srcdir" = . && WINE_APPEND_RULE( [all: .gitignore @@ -3461,7 +3464,7 @@ fi AC_CONFIG_COMMANDS([Makefile], [wine_fn_output_makefile Makefile], [wine_fn_output_makefile () { - cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$[]1 && rm -f Make.tmp && return + cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$[]1 && rm -f Make.tmp && "$wine_makedep" . && return `cat $wine_rules_file` _WINE_EOF AS_ERROR([could not create Makefile])

1 0

Nikolay Sivov : scrrun: Initialize find handle for file collection.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: 1e46f605c5f4d40f6eeb3839a75be7c40c75016a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e46f605c5f4d40f6eeb3839a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 11 08:13:53 2014 +0400 scrrun: Initialize find handle for file collection. --- dlls/scrrun/filesystem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 5daa5ce..a48b630 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1062,6 +1062,7 @@ static HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown This->IEnumVARIANT_iface.lpVtbl = &filecollenumvariantvtbl; This->ref = 1; + This->data.u.filecoll.find = NULL; This->data.u.filecoll.coll = collection; IFileCollection_AddRef(&collection->IFileCollection_iface);

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2014