September 2011 - Wine-Commits

Michael Mc Donnell : d3dx9_36/tests: Fixed adjacency double free (valgrind) .
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 3ad597640772dd464a69e82e54d88c838bee79e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad597640772dd464a69e82e5… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Sat Sep 24 13:16:23 2011 +0200 d3dx9_36/tests: Fixed adjacency double free (valgrind). --- dlls/d3dx9_36/tests/mesh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 686e386..6a78e64 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -5949,6 +5949,7 @@ static void test_convert_point_reps_to_adjacency(void) } HeapFree(GetProcessHeap(), 0, adjacency); + adjacency = NULL; if (i != 0) /* First mesh will be freed during cleanup */ mesh->lpVtbl->Release(mesh); }

1 0

Stefan Dösinger : d3d9: Implement FPUSETUP for msvc.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: e1d92059ea193ad8852de737748cd69ce10a5712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1d92059ea193ad8852de7377… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 24 12:42:14 2011 +0200 d3d9: Implement FPUSETUP for msvc. --- dlls/d3d9/device.c | 5 +++++ dlls/d3d9/tests/device.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5433738..2c67391 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3306,6 +3306,11 @@ static void setup_fpu(void) __asm__ volatile ("fnstcw %0" : "=m" (cw)); cw = (cw & ~0xf3f) | 0x3f; __asm__ volatile ("fldcw %0" : : "m" (cw)); +#elif defined(__i386__) && defined(_MSC_VER) + WORD cw; + __asm fnstcw cw; + cw = (cw & ~0xf3f) | 0x3f; + __asm fldcw cw; #else FIXME("FPU setup not implemented for this platform.\n"); #endif diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 625dce9..482f5d4 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2913,8 +2913,13 @@ cleanup: static inline void set_fpu_cw(WORD cw) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#define D3D9_TEST_SET_FPU_CW 1 __asm__ volatile ("fnclex"); __asm__ volatile ("fldcw %0" : : "m" (cw)); +#elif defined(__i386__) && defined(_MSC_VER) +#define D3D9_TEST_SET_FPU_CW 1 + __asm fnclex; + __asm fldcw cw; #endif } @@ -2922,14 +2927,18 @@ static inline WORD get_fpu_cw(void) { WORD cw = 0; #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#define D3D9_TEST_GET_FPU_CW 1 __asm__ volatile ("fnstcw %0" : "=m" (cw)); +#elif defined(__i386__) && defined(_MSC_VER) +#define D3D9_TEST_GET_FPU_CW 1 + __asm fnstcw cw; #endif return cw; } static void test_fpu_setup(void) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if defined(D3D9_TEST_SET_FPU_CW) && defined(D3D9_TEST_GET_FPU_CW) D3DPRESENT_PARAMETERS present_parameters; IDirect3DDevice9 *device; HWND window = NULL;

1 0

Stefan Dösinger : d3d8: Implement FPUSETUP for msvc.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 14a245690d333ed6ee7837b4d547790d50821c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a245690d333ed6ee7837b4d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 24 12:45:37 2011 +0200 d3d8: Implement FPUSETUP for msvc. --- dlls/d3d8/device.c | 5 +++++ dlls/d3d8/tests/device.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 51c4ad7..8aeca94 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3032,6 +3032,11 @@ static void setup_fpu(void) __asm__ volatile ("fnstcw %0" : "=m" (cw)); cw = (cw & ~0xf3f) | 0x3f; __asm__ volatile ("fldcw %0" : : "m" (cw)); +#elif defined(__i386__) && defined(_MSC_VER) + WORD cw; + __asm fnstcw cw; + cw = (cw & ~0xf3f) | 0x3f; + __asm fldcw cw; #else FIXME("FPU setup not implemented for this platform.\n"); #endif diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 42726aa..42d4dd0 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2416,8 +2416,13 @@ done: static inline void set_fpu_cw(WORD cw) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#define D3D8_TEST_SET_FPU_CW 1 __asm__ volatile ("fnclex"); __asm__ volatile ("fldcw %0" : : "m" (cw)); +#elif defined(__i386__) && defined(_MSC_VER) +#define D3D8_TEST_SET_FPU_CW 1 + __asm fnclex; + __asm fldcw cw; #endif } @@ -2425,14 +2430,18 @@ static inline WORD get_fpu_cw(void) { WORD cw = 0; #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#define D3D8_TEST_GET_FPU_CW 1 __asm__ volatile ("fnstcw %0" : "=m" (cw)); +#elif defined(__i386__) && defined(_MSC_VER) +#define D3D8_TEST_GET_FPU_CW 1 + __asm fnstcw cw; #endif return cw; } static void test_fpu_setup(void) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if defined(D3D8_TEST_SET_FPU_CW) && defined(D3D8_TEST_GET_FPU_CW) D3DPRESENT_PARAMETERS present_parameters; IDirect3DDevice8 *device; D3DDISPLAYMODE d3ddm;

1 0

Jörg Höhle : winmm: Fix sum of available samples.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 38752f5bf7ab7d39846bcb5997a934aad01b3f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38752f5bf7ab7d39846bcb599… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Sep 23 10:24:13 2011 +0200 winmm: Fix sum of available samples. --- dlls/winmm/waveform.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 1152f61..8567352 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1329,8 +1329,7 @@ static void WOD_PushData(WINMM_Device *device) nloops = 0; while(queue && queue_frames < avail_frames){ queue_bytes = WINMM_HeaderLenBytes(device, queue); - queue_frames = (queue_bytes - ofs) / device->bytes_per_frame; - + queue_frames += (queue_bytes - ofs) / device->bytes_per_frame; ofs = 0; if(queue->dwFlags & WHDR_ENDLOOP && nloops < device->loop_counter){

1 0

Jörg Höhle : winmm: waveOutReset returns all buffers.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 5f9e03d1187f48a1cb25336cb04c513dd237f849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f9e03d1187f48a1cb25336cb… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Sep 22 20:47:14 2011 +0200 winmm: waveOutReset returns all buffers. --- dlls/winmm/waveform.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 1593047..3ab7976 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1670,6 +1670,7 @@ static LRESULT WINMM_Reset(HWAVE hwave) { WINMM_CBInfo cb_info; WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave); + BOOL is_out; WAVEHDR *first; HRESULT hr; @@ -1686,10 +1687,7 @@ static LRESULT WINMM_Reset(HWAVE hwave) } device->stopped = TRUE; - if(device->render) - first = WOD_MarkDoneHeaders(device); - else - first = device->first; + first = device->first; device->first = device->last = device->playing = NULL; device->ofs_bytes = 0; device->played_frames = 0; @@ -1698,6 +1696,7 @@ static LRESULT WINMM_Reset(HWAVE hwave) IAudioClient_Reset(device->client); cb_info = device->cb_info; + is_out = device->render ? TRUE : FALSE; LeaveCriticalSection(&device->lock); @@ -1705,7 +1704,7 @@ static LRESULT WINMM_Reset(HWAVE hwave) WAVEHDR *next = first->lpNext; first->dwFlags &= ~WHDR_INQUEUE; first->dwFlags |= WHDR_DONE; - if(device->render) + if(is_out) WINMM_NotifyClient(&cb_info, WOM_DONE, (DWORD_PTR)first, 0); else WINMM_NotifyClient(&cb_info, WIM_DATA, (DWORD_PTR)first, 0);

1 0

Stefan Dösinger : ddraw/tests: Use the variable instead of the type in sizeof().
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 35f2e91fcd0b529924203febf7c6ed8df6bf4247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f2e91fcd0b529924203febf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 22 13:40:01 2011 +0200 ddraw/tests: Use the variable instead of the type in sizeof(). --- dlls/ddraw/tests/visual.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index e0ba7bd..2fdfe73 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1485,8 +1485,8 @@ static void D3D1_TextureMapBlendTest(void) trace("IDirect3DExecuteBuffer_Unlock failed with %08x\n", hr); } - memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); - exdata.dwSize = sizeof(D3DEXECUTEDATA); + memset(&exdata, 0, sizeof(exdata)); + exdata.dwSize = sizeof(exdata); exdata.dwVertexCount = 8; exdata.dwInstructionOffset = sizeof(test1_quads); exdata.dwInstructionLength = exe_length; @@ -1606,8 +1606,8 @@ static void D3D1_TextureMapBlendTest(void) trace("IDirect3DExecuteBuffer_Unlock failed with %08x\n", hr); } - memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); - exdata.dwSize = sizeof(D3DEXECUTEDATA); + memset(&exdata, 0, sizeof(exdata)); + exdata.dwSize = sizeof(exdata); exdata.dwVertexCount = 8; exdata.dwInstructionOffset = sizeof(test1_quads); exdata.dwInstructionLength = exe_length; @@ -1728,8 +1728,8 @@ static void D3D1_TextureMapBlendTest(void) trace("IDirect3DExecuteBuffer_Unlock failed with %08x\n", hr); } - memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); - exdata.dwSize = sizeof(D3DEXECUTEDATA); + memset(&exdata, 0, sizeof(exdata)); + exdata.dwSize = sizeof(exdata); exdata.dwVertexCount = 8; exdata.dwInstructionOffset = sizeof(test2_quads); exdata.dwInstructionLength = exe_length; @@ -1854,8 +1854,8 @@ static void D3D1_TextureMapBlendTest(void) trace("IDirect3DExecuteBuffer_Unlock failed with %08x\n", hr); } - memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); - exdata.dwSize = sizeof(D3DEXECUTEDATA); + memset(&exdata, 0, sizeof(exdata)); + exdata.dwSize = sizeof(exdata); exdata.dwVertexCount = 8; exdata.dwInstructionOffset = sizeof(test1_quads); exdata.dwInstructionLength = exe_length; @@ -1992,8 +1992,8 @@ static void D3D1_TextureMapBlendTest(void) trace("IDirect3DExecuteBuffer_Unlock failed with %08x\n", hr); } - memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); - exdata.dwSize = sizeof(D3DEXECUTEDATA); + memset(&exdata, 0, sizeof(exdata)); + exdata.dwSize = sizeof(exdata); exdata.dwVertexCount = 8; exdata.dwInstructionOffset = sizeof(test1_quads); exdata.dwInstructionLength = exe_length;

1 0

Louis Lenders : dpnet: Fill the DPN_SP_CAPS structure in IDirectPlay8Peer_GetSPCaps with some sane values + tests .
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: fed06a562e1557a61dd8c70a038006976b48fd7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed06a562e1557a61dd8c70a0… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Sep 23 23:17:58 2011 +0200 dpnet: Fill the DPN_SP_CAPS structure in IDirectPlay8Peer_GetSPCaps with some sane values + tests. --- dlls/dpnet/peer.c | 19 +++++++++++++++++-- dlls/dpnet/tests/peer.c | 27 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 307b306..5b89fb4 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -389,9 +389,24 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_SetSPCaps(IDirectPlay8Peer *iface, co static HRESULT WINAPI IDirectPlay8PeerImpl_GetSPCaps(IDirectPlay8Peer *iface, const GUID * const pguidSP, DPN_SP_CAPS * const pdpspCaps, const DWORD dwFlags) { - FIXME("(%p)->(%p,%p,%x): stub\n", iface, pguidSP, pdpspCaps, dwFlags); + TRACE("(%p)->(%p,%p,%x)\n", iface, pguidSP, pdpspCaps, dwFlags); - return DPNERR_GENERIC; + if(pdpspCaps->dwSize != sizeof(DPN_SP_CAPS)) + { + return DPNERR_INVALIDPARAM; + } + + pdpspCaps->dwFlags = DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | + DPNSPCAPS_SUPPORTSALLADAPTERS | DPNSPCAPS_SUPPORTSTHREADPOOL; + pdpspCaps->dwNumThreads = 3; + pdpspCaps->dwDefaultEnumCount = 5; + pdpspCaps->dwDefaultEnumRetryInterval = 1500; + pdpspCaps->dwDefaultEnumTimeout = 1500; + pdpspCaps->dwMaxEnumPayloadSize = 983; + pdpspCaps->dwBuffersPerThread = 1; + pdpspCaps->dwSystemBufferSize = 8192; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8PeerImpl_GetConnectionInfo(IDirectPlay8Peer *iface, const DPNID dpnid, diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index 67e0ace..dd0b408 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -115,6 +115,32 @@ static void test_enum_service_providers(void) ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); } +static void test_get_sp_caps(void) +{ + DPN_SP_CAPS caps; + HRESULT hr; + + memset(&caps, 0, sizeof(DPN_SP_CAPS)); + + hr = IDirectPlay8Peer_GetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPNERR_INVALIDPARAM, "GetSPCaps unexpectedly returned %x\n", hr); + + caps.dwSize = sizeof(DPN_SP_CAPS); + + hr = IDirectPlay8Peer_GetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); + + ok(caps.dwFlags == (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS | + DPNSPCAPS_SUPPORTSTHREADPOOL), "provider unexpectedly misses some capability flags\n"); + ok(caps.dwNumThreads == 3, "expected 3, got %d\n", caps.dwNumThreads); + ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); + ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); + ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); + ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); + ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); + ok(caps.dwSystemBufferSize == 8192, "expected 8192, got %d\n", caps.dwSystemBufferSize); +} + static void test_cleanup_dp(void) { HRESULT hr; @@ -132,5 +158,6 @@ START_TEST(peer) { test_init_dp(); test_enum_service_providers(); + test_get_sp_caps(); test_cleanup_dp(); }

1 0

Marcus Meissner : dpnet: Fixed bad pointer addition (Coverity).
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 000258a007f51431cd1692d42799b0b1a8a7a9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=000258a007f51431cd1692d42… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 24 10:42:04 2011 +0200 dpnet: Fixed bad pointer addition (Coverity). --- dlls/dpnet/peer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 5b89fb4..b3eb9cd 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -127,7 +127,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_EnumServiceProviders(IDirectPlay8Peer return DPNERR_BUFFERTOOSMALL; } - pSPInfoBuffer->pwszName = (LPWSTR)(pSPInfoBuffer + sizeof(DPN_SERVICE_PROVIDER_INFO)); + pSPInfoBuffer->pwszName = (LPWSTR)(pSPInfoBuffer + 1); if(!pguidServiceProvider) {

1 0

Matteo Bruni : wined3d: When creating a new shader, check shader type and version.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 2a146448f40686ff75f808557b15e95ff646601a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a146448f40686ff75f808557… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 23 17:03:19 2011 +0200 wined3d: When creating a new shader, check shader type and version. --- dlls/d3d10core/shader.c | 6 +++--- dlls/d3d8/shader.c | 4 ++-- dlls/d3d9/shader.c | 4 ++-- dlls/wined3d/shader.c | 41 ++++++++++++++++++++++++++++------------- include/wine/wined3d.h | 6 +++--- 5 files changed, 38 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a146448f40686ff75f80…

1 0

Matteo Bruni : d3d10core: Fixup HRESULT in a bunch of error cases.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: d9c9b5c365daac4ad33d77da89eb7f10be03914e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c9b5c365daac4ad33d77da8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 23 17:03:20 2011 +0200 d3d10core: Fixup HRESULT in a bunch of error cases. --- dlls/d3d10core/shader.c | 7 +++++-- dlls/d3d10core/utils.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 357cda3..82ddadc 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -57,7 +57,7 @@ static HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, st memset(shader_info->output_signature, 0, sizeof(*shader_info->output_signature)); hr = parse_dxbc(dxbc, dxbc_length, shdr_handler, shader_info); - if (!shader_info->shader_code) hr = E_FAIL; + if (!shader_info->shader_code) hr = E_INVALIDARG; if (FAILED(hr)) { @@ -267,6 +267,7 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d1 { WARN("Failed to create wined3d vertex shader, hr %#x.\n", hr); shader_free_signature(&shader->output_signature); + hr = E_INVALIDARG; return hr; } @@ -411,8 +412,9 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct &shader->output_signature, shader, &d3d10_geometry_shader_wined3d_parent_ops, &shader->wined3d_shader, 4); if (FAILED(hr)) { - WARN("Failed to create wined3d vertex shader, hr %#x.\n", hr); + WARN("Failed to create wined3d geometry shader, hr %#x.\n", hr); shader_free_signature(&shader->output_signature); + hr = E_INVALIDARG; return hr; } @@ -553,6 +555,7 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_ { WARN("Failed to create wined3d pixel shader, hr %#x.\n", hr); shader_free_signature(&shader->output_signature); + hr = E_INVALIDARG; return hr; } diff --git a/dlls/d3d10core/utils.c b/dlls/d3d10core/utils.c index 97c0347..813cae6 100644 --- a/dlls/d3d10core/utils.c +++ b/dlls/d3d10core/utils.c @@ -374,7 +374,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, if (tag != TAG_DXBC) { WARN("Wrong tag.\n"); - return E_FAIL; + return E_INVALIDARG; } /* checksum? */

1 0