June 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : rpcrt4: Add support for float parameters in client calls on x86_64.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: ffb8f4bedf709dd63f6f9ec1569dc99873021a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb8f4bedf709dd63f6f9ec15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 13 13:39:21 2011 +0200 rpcrt4: Add support for float parameters in client calls on x86_64. --- dlls/rpcrt4/cproxy.c | 12 ++++++--- dlls/rpcrt4/ndr_stubless.c | 54 +++++++++++++++++++++++++++++++------------- dlls/rpcrt4/ndr_stubless.h | 2 +- 3 files changed, 47 insertions(+), 21 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index b5be7ae..b1acbb0 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -131,11 +131,15 @@ __ASM_GLOBAL_FUNC(call_stubless_func, "movzwq (%rdx,%r10,2),%rdx\n\t" /* FormatStringOffset[index] */ "addq 8(%rcx),%rdx\n\t" /* info->ProcFormatString + offset */ "movq (%rcx),%rcx\n\t" /* info->pStubDesc */ - "subq $0x28,%rsp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") + "subq $0x38,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 0x38\n\t") + "movq %xmm1,0x20(%rsp)\n\t" + "movq %xmm2,0x28(%rsp)\n\t" + "movq %xmm3,0x30(%rsp)\n\t" + "leaq 0x18(%rsp),%r9\n\t" /* fpu_args */ "call " __ASM_NAME("ndr_client_call") "\n\t" - "addq $0x28,%rsp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t") + "addq $0x38,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -0x38\n\t") "ret" ); #include "pshpack1.h" diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 7fd7e6a..1f34b76 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -285,8 +285,8 @@ static void client_free_handle( } static void client_do_args(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, - int phase, unsigned char *args, unsigned short number_of_params, - unsigned char *pRetVal) + int phase, unsigned char *args, void **fpu_args, + unsigned short number_of_params, unsigned char *pRetVal) { /* current format string offset */ int current_offset = 0; @@ -314,6 +314,14 @@ static void client_do_args(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, const unsigned char * pTypeFormat = &pParam->type_format_char; +#ifdef __x86_64__ /* floats are passed as doubles through varargs functions */ + float f; + if (*pTypeFormat == RPC_FC_FLOAT && !pParam->param_attributes.IsSimpleRef && !fpu_args) + { + f = *(double *)pArg; + pArg = (unsigned char *)&f; + } +#endif if (pParam->param_attributes.IsSimpleRef) { pArg = *(unsigned char **)pArg; @@ -565,7 +573,8 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, } } -LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, void **stack_top ) +LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, + void **stack_top, void **fpu_stack ) { /* pointer to start of stack where arguments start */ RPC_MESSAGE rpcMsg; @@ -652,16 +661,28 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma number_of_params = pOIFHeader->number_of_params; pFormat += sizeof(NDR_PROC_PARTIAL_OIF_HEADER); - } - TRACE("Oif_flags = "); dump_INTERPRETER_OPT_FLAGS(Oif_flags); + TRACE("Oif_flags = "); dump_INTERPRETER_OPT_FLAGS(Oif_flags); - if (Oif_flags.HasExtensions) - { - const NDR_PROC_HEADER_EXTS *pExtensions = - (const NDR_PROC_HEADER_EXTS *)pFormat; - ext_flags = pExtensions->Flags2; - pFormat += pExtensions->Size; + if (Oif_flags.HasExtensions) + { + const NDR_PROC_HEADER_EXTS *pExtensions = (const NDR_PROC_HEADER_EXTS *)pFormat; + ext_flags = pExtensions->Flags2; + pFormat += pExtensions->Size; +#ifdef __x86_64__ + if (pExtensions->Size > sizeof(*pExtensions) && fpu_stack) + { + int i; + unsigned short fpu_mask = *(unsigned short *)(pExtensions + 1); + for (i = 0; i < 4; i++, fpu_mask >>= 2) + switch (fpu_mask & 3) + { + case 1: *(float *)&stack_top[i] = *(float *)&fpu_stack[i]; break; + case 2: *(double *)&stack_top[i] = *(double *)&fpu_stack[i]; break; + } + } +#endif + } } stubMsg.BufferLength = 0; @@ -766,7 +787,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma case PROXY_MARSHAL: case PROXY_UNMARSHAL: if (bV2Format) - client_do_args(&stubMsg, pFormat, phase, stubMsg.StackTop, + client_do_args(&stubMsg, pFormat, phase, stubMsg.StackTop, fpu_stack, number_of_params, (unsigned char *)&RetVal); else client_do_args_old_format(&stubMsg, pFormat, phase, @@ -870,7 +891,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma case PROXY_MARSHAL: case PROXY_UNMARSHAL: if (bV2Format) - client_do_args(&stubMsg, pFormat, phase, stubMsg.StackTop, + client_do_args(&stubMsg, pFormat, phase, stubMsg.StackTop, fpu_stack, number_of_params, (unsigned char *)&RetVal); else client_do_args_old_format(&stubMsg, pFormat, phase, @@ -919,6 +940,7 @@ __ASM_GLOBAL_FUNC( NdrClientCall2, "movq %r8,0x18(%rsp)\n\t" "movq %r9,0x20(%rsp)\n\t" "leaq 0x18(%rsp),%r8\n\t" + "xorq %r9,%r9\n\t" "subq $0x28,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") "call " __ASM_NAME("ndr_client_call") "\n\t" @@ -937,7 +959,7 @@ CLIENT_CALL_RETURN WINAPIV NdrClientCall2( PMIDL_STUB_DESC desc, PFORMAT_STRING LONG_PTR ret; __ms_va_start( args, format ); - ret = ndr_client_call( desc, format, va_arg( args, void ** )); + ret = ndr_client_call( desc, format, va_arg( args, void ** ), NULL ); __ms_va_end( args ); return *(CLIENT_CALL_RETURN *)&ret; } @@ -1947,7 +1969,7 @@ CLIENT_CALL_RETURN WINAPIV NdrAsyncClientCall(PMIDL_STUB_DESC pStubDesc, case PROXY_CALCSIZE: case PROXY_MARSHAL: if (bV2Format) - client_do_args(pStubMsg, pFormat, phase, pStubMsg->StackTop, + client_do_args(pStubMsg, pFormat, phase, pStubMsg->StackTop, NULL, async_call_data->number_of_params, NULL); else client_do_args_old_format(pStubMsg, pFormat, phase, @@ -2032,7 +2054,7 @@ RPC_STATUS NdrpCompleteAsyncClientCall(RPC_ASYNC_STATE *pAsync, void *Reply) case PROXY_UNMARSHAL: if (bV2Format) client_do_args(pStubMsg, async_call_data->pParamFormat, phase, pStubMsg->StackTop, - async_call_data->number_of_params, Reply); + NULL, async_call_data->number_of_params, Reply); else client_do_args_old_format(pStubMsg, async_call_data->pParamFormat, phase, pStubMsg->StackTop, async_call_data->stack_size, Reply, FALSE, FALSE); diff --git a/dlls/rpcrt4/ndr_stubless.h b/dlls/rpcrt4/ndr_stubless.h index baa1f3e..3fa0922 100644 --- a/dlls/rpcrt4/ndr_stubless.h +++ b/dlls/rpcrt4/ndr_stubless.h @@ -237,7 +237,7 @@ typedef struct _NDR_EHD_CONTEXT #include "poppack.h" LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, - void **stack_top ) DECLSPEC_HIDDEN; + void **stack_top, void **fpu_stack ) DECLSPEC_HIDDEN; void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, int phase, unsigned char *args, unsigned short stack_size, unsigned char *pRetVal, BOOL object_proc,

1 0

Alexandre Julliard : rpcrt4: Add a wrapper for NdrAsyncClientCall too.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: a75402af9643065b648e906ca9a5301e276864fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a75402af9643065b648e906ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 15 17:30:49 2011 +0200 rpcrt4: Add a wrapper for NdrAsyncClientCall too. --- dlls/rpcrt4/ndr_stubless.c | 43 ++++++++++++++++++++++++++++++++++--------- dlls/rpcrt4/ndr_stubless.h | 2 ++ 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 1f34b76..bbc9c19 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1773,8 +1773,7 @@ struct async_call_data ULONG_PTR NdrCorrCache[256]; }; -CLIENT_CALL_RETURN WINAPIV NdrAsyncClientCall(PMIDL_STUB_DESC pStubDesc, - PFORMAT_STRING pFormat, ...) +LONG_PTR CDECL ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, void **stack_top ) { /* pointer to start of stack where arguments start */ PRPC_MESSAGE pRpcMsg; @@ -1793,8 +1792,6 @@ CLIENT_CALL_RETURN WINAPIV NdrAsyncClientCall(PMIDL_STUB_DESC pStubDesc, const NDR_PROC_HEADER * pProcHeader = (const NDR_PROC_HEADER *)&pFormat[0]; /* -Oif or -Oicf generated format */ BOOL bV2Format = FALSE; - LONG_PTR RetVal; - __ms_va_list args; TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat); @@ -1847,9 +1844,7 @@ CLIENT_CALL_RETURN WINAPIV NdrAsyncClientCall(PMIDL_STUB_DESC pStubDesc, /* needed for conformance of top-level objects */ pStubMsg->StackTop = I_RpcAllocate(async_call_data->stack_size); - __ms_va_start( args, pFormat ); - memcpy(pStubMsg->StackTop, va_arg( args, unsigned char * ), async_call_data->stack_size); - __ms_va_end( args ); + memcpy(pStubMsg->StackTop, stack_top, async_call_data->stack_size); pAsync = *(RPC_ASYNC_STATE **)pStubMsg->StackTop; pAsync->StubInfo = async_call_data; @@ -1984,8 +1979,7 @@ CLIENT_CALL_RETURN WINAPIV NdrAsyncClientCall(PMIDL_STUB_DESC pStubDesc, done: TRACE("returning 0\n"); - RetVal = 0; - return *(CLIENT_CALL_RETURN *)&RetVal; + return 0; } RPC_STATUS NdrpCompleteAsyncClientCall(RPC_ASYNC_STATE *pAsync, void *Reply) @@ -2087,6 +2081,37 @@ cleanup: return status; } +#ifdef __x86_64__ + +__ASM_GLOBAL_FUNC( NdrAsyncClientCall, + "movq %r8,0x18(%rsp)\n\t" + "movq %r9,0x20(%rsp)\n\t" + "leaq 0x18(%rsp),%r8\n\t" + "subq $0x28,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") + "call " __ASM_NAME("ndr_async_client_call") "\n\t" + "addq $0x28,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t") + "ret" ); + +#else /* __x86_64__ */ + +/*********************************************************************** + * NdrAsyncClientCall [RPCRT4.@] + */ +CLIENT_CALL_RETURN WINAPIV NdrAsyncClientCall( PMIDL_STUB_DESC desc, PFORMAT_STRING format, ... ) +{ + __ms_va_list args; + LONG_PTR ret; + + __ms_va_start( args, format ); + ret = ndr_async_client_call( desc, format, va_arg( args, void ** )); + __ms_va_end( args ); + return *(CLIENT_CALL_RETURN *)&ret; +} + +#endif /* __x86_64__ */ + RPCRTAPI LONG RPC_ENTRY NdrAsyncStubCall(struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel, PRPC_MESSAGE pRpcMsg, DWORD * pdwStubPhase) diff --git a/dlls/rpcrt4/ndr_stubless.h b/dlls/rpcrt4/ndr_stubless.h index 3fa0922..942c007 100644 --- a/dlls/rpcrt4/ndr_stubless.h +++ b/dlls/rpcrt4/ndr_stubless.h @@ -238,6 +238,8 @@ typedef struct _NDR_EHD_CONTEXT LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, void **stack_top, void **fpu_stack ) DECLSPEC_HIDDEN; +LONG_PTR CDECL ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, + void **stack_top ) DECLSPEC_HIDDEN; void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, int phase, unsigned char *args, unsigned short stack_size, unsigned char *pRetVal, BOOL object_proc,

1 0

Marcus Meissner : ws2_32: Fixed select() number of fds (Coverity).
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: f50b8b8ac1daff210ebc0749875be801d51d3801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50b8b8ac1daff210ebc07498… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jun 16 13:58:12 2011 +0200 ws2_32: Fixed select() number of fds (Coverity). --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index de9c400..29c97e2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2958,7 +2958,7 @@ static DWORD WINAPI drain_socket_thread(LPVOID arg) fd_set readset; FD_ZERO(&readset); FD_SET(sock, &readset); - select(0, &readset, NULL, NULL, NULL); + select(sock+1, &readset, NULL, NULL, NULL); while (drain_pause) Sleep(100); }

1 0

Adam Martinson : msxml3: Create CLSID_XMLHTTP when requested.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 0132645ec3c08a1ac0c87ea8a1274ef3e46b3f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0132645ec3c08a1ac0c87ea8a… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Thu Jun 16 09:17:35 2011 -0500 msxml3: Create CLSID_XMLHTTP when requested. --- dlls/msxml3/factory.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 7c39b39..d3d2692 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -272,6 +272,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) cf = &saxreadcf.IClassFactory_iface; } else if( IsEqualCLSID( rclsid, &CLSID_XMLHTTPRequest ) || + IsEqualCLSID( rclsid, &CLSID_XMLHTTP) || IsEqualCLSID( rclsid, &CLSID_XMLHTTP26 ) || IsEqualCLSID( rclsid, &CLSID_XMLHTTP30 ) || IsEqualCLSID( rclsid, &CLSID_XMLHTTP40 ) ||

1 0

Henri Verbeet : d3d9/tests: Add some tests for IDirect3DDevice9:: UpdateSurface().
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 11bf170ce0795869f238473614a0b13206073d4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=11bf170ce0795869f23847361… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 16 00:40:29 2011 +0200 d3d9/tests: Add some tests for IDirect3DDevice9::UpdateSurface(). --- dlls/d3d9/tests/visual.c | 188 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 188 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 3773ad7..98a658b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12128,6 +12128,193 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(ps); } +static void update_surface_test(IDirect3DDevice9 *device) +{ + static const BYTE blocks[][8] = + { + {0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00}, /* White */ + {0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00}, /* Red */ + {0xe0, 0xff, 0xe0, 0xff, 0x00, 0x00, 0x00, 0x00}, /* Yellow */ + {0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00}, /* Green */ + {0xff, 0x07, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00}, /* Cyan */ + {0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00}, /* Blue */ + {0x1f, 0xf8, 0x1f, 0xf8, 0x00, 0x00, 0x00, 0x00}, /* Magenta */ + }; + static const struct + { + UINT x, y; + D3DCOLOR color; + } + expected_colors[] = + { + { 18, 240, D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0xff)}, + { 57, 240, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0xff)}, + {109, 240, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0xff)}, + {184, 240, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00)}, + {290, 240, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0x00)}, + {440, 240, D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x00)}, + {584, 240, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff)}, + }; + static const struct + { + float x, y, z, w; + float u, v; + } + tri[] = + { + { 0.0f, 480.0f, 0.0f, 1.0f, 0.0f, 0.0f}, + { 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f}, + {640.0f, 240.0f, 0.0f, 10.0f, 100.0f, 0.5f}, + }; + static const RECT rect_2x2 = {0, 0, 2, 2}; + static const struct + { + UINT src_level; + UINT dst_level; + const RECT *r; + HRESULT hr; + } + block_size_tests[] = + { + {1, 0, NULL, D3D_OK}, + {0, 1, NULL, D3DERR_INVALIDCALL}, + {5, 4, NULL, D3DERR_INVALIDCALL}, + {4, 5, NULL, D3DERR_INVALIDCALL}, + {4, 5, &rect_2x2, D3DERR_INVALIDCALL}, + {5, 5, &rect_2x2, D3D_OK}, + }; + + IDirect3DSurface9 *src_surface, *dst_surface; + IDirect3DTexture9 *src_tex, *dst_tex; + IDirect3D9 *d3d; + UINT count, i; + HRESULT hr; + + hr = IDirect3DDevice9_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "GetDirect3D failed, hr %#x.\n", hr); + + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_DXT1); + IDirect3D9_Release(d3d); + if (FAILED(hr)) + { + skip("DXT1 not supported, skipping test.\n"); + return; + } + + IDirect3D9_Release(d3d); + + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, 0, D3DFMT_DXT1, D3DPOOL_SYSTEMMEM, &src_tex, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, 0, D3DFMT_DXT1, D3DPOOL_DEFAULT, &dst_tex, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + count = IDirect3DTexture9_GetLevelCount(src_tex); + ok(count == 7, "Got level count %u, expected 7.\n", count); + + for (i = 0; i < count; ++i) + { + UINT row_count, block_count, x, y; + D3DSURFACE_DESC desc; + BYTE *row, *block; + D3DLOCKED_RECT r; + + hr = IDirect3DTexture9_GetLevelDesc(src_tex, i, &desc); + ok(SUCCEEDED(hr), "Failed to get level desc, hr %#x.\n", hr); + + hr = IDirect3DTexture9_LockRect(src_tex, i, &r, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr); + + row_count = ((desc.Height + 3) & ~3) / 4; + block_count = ((desc.Width + 3) & ~3) / 4; + row = r.pBits; + + for (y = 0; y < row_count; ++y) + { + block = row; + for (x = 0; x < block_count; ++x) + { + memcpy(block, blocks[i], sizeof(blocks[i])); + block += sizeof(blocks[i]); + } + row += r.Pitch; + } + + hr = IDirect3DTexture9_UnlockRect(src_tex, i); + ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); + } + + for (i = 0; i < sizeof(block_size_tests) / sizeof(*block_size_tests); ++i) + { + hr = IDirect3DTexture9_GetSurfaceLevel(src_tex, block_size_tests[i].src_level, &src_surface); + ok(SUCCEEDED(hr), "Failed to get texture surface, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(dst_tex, block_size_tests[i].dst_level, &dst_surface); + ok(SUCCEEDED(hr), "Failed to get texture surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_UpdateSurface(device, src_surface, block_size_tests[i].r, dst_surface, NULL); + ok(hr == block_size_tests[i].hr, "Update surface returned %#x for test %u, expected %#x.\n", + hr, i, block_size_tests[i].hr); + + IDirect3DSurface9_Release(dst_surface); + IDirect3DSurface9_Release(src_surface); + } + + for (i = 0; i < count; ++i) + { + hr = IDirect3DTexture9_GetSurfaceLevel(src_tex, i, &src_surface); + ok(SUCCEEDED(hr), "Failed to get texture surface, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(dst_tex, i, &dst_surface); + ok(SUCCEEDED(hr), "Failed to get texture surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_UpdateSurface(device, src_surface, NULL, dst_surface, NULL); + ok(SUCCEEDED(hr), "Failed to update surface at level %u, hr %#x.\n", i, hr); + + IDirect3DSurface9_Release(dst_surface); + IDirect3DSurface9_Release(src_surface); + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "SetSamplerState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_TEX1); + ok(SUCCEEDED(hr), "SetFVF failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)dst_tex); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "SetTextureStageState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(SUCCEEDED(hr), "SetTextureStageState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 1, tri, sizeof(*tri)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + { + D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + ok(color_match(color, expected_colors[i].color, 0), + "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", + expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(SUCCEEDED(hr), "SetTextureStageState failed, hr %#x.\n", hr); + IDirect3DTexture9_Release(dst_tex); + IDirect3DTexture9_Release(src_tex); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -12301,6 +12488,7 @@ START_TEST(visual) depth_bounds_test(device_ptr); srgbwrite_format_test(device_ptr); clip_planes_test(device_ptr); + update_surface_test(device_ptr); cleanup: if(device_ptr) {

1 0

Henri Verbeet : wined3d: Require ARB_shader_texture_lod for SM3.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: c51db63ba4eda7e2cb565ebadf5ede8fe6e1a9dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51db63ba4eda7e2cb565ebad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 16 00:40:30 2011 +0200 wined3d: Require ARB_shader_texture_lod for SM3. --- dlls/wined3d/glsl_shader.c | 22 +++------------------- 1 files changed, 3 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1cf7f22..b2e6c00 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4927,25 +4927,9 @@ static BOOL shader_glsl_dirty_const(void) static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) { - /* NVIDIA GeForce 6 / 7 or ATI R4xx / R5xx cards with GLSL support - * support SM3, but older NVIDIA / ATI models with GLSL support only - * support SM2. In case of NVIDIA we can detect SM3 support based on the - * version of NV_vertex_program / NV_fragment_program. For other cards we - * try to detect SM3 based on the maximum number of native fragment - * program instructions. PS2.0 requires at least 96 instructions, 2.0a/b - * goes up to 512. Assume that if the number of instructions is 512 or - * less we have to do with SM2 hardware. NOTE: SM3 requires 512 or more - * instructions but ATI and NVIDIA offer more than that (1024 vs 4096) on - * their most basic SM3 hardware. - * - * ARB_shader_texture_lod is a requirement for SM3 (texldd). Ideally we'd - * make this a hard requirement, but the extension is still somewhat new, - * and relatively few SM3 shaders actually depend on it. For the moment - * just use it to enable SM3 (20110423). */ - if ((gl_info->supported[NV_VERTEX_PROGRAM3] && gl_info->supported[NV_FRAGMENT_PROGRAM2]) - || gl_info->limits.arb_ps_instructions > 512 - || gl_info->supported[ARB_SHADER_TEXTURE_LOD] - || gl_info->supported[EXT_GPU_SHADER4]) + /* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3 + * texldd and texldl instructions. */ + if (gl_info->supported[ARB_SHADER_TEXTURE_LOD] || gl_info->supported[EXT_GPU_SHADER4]) { caps->VertexShaderVersion = WINED3DVS_VERSION(3,0); caps->PixelShaderVersion = WINED3DPS_VERSION(3,0);

1 0

Henri Verbeet : wined3d: Only invert viewport y for onscreen destinations in surface_depth_blt().
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 46215689221aa820b94d2ce288613d6e0b373f77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46215689221aa820b94d2ce28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 16 00:40:31 2011 +0200 wined3d: Only invert viewport y for onscreen destinations in surface_depth_blt(). This fixes a regression introduced by 032f8702edc769ba42e23034ef9dcc3854efd928. --- dlls/wined3d/surface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 132a98a..2bf1436 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5579,7 +5579,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa /* GL locking is done by the caller */ static void surface_depth_blt(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, - GLuint texture, GLsizei w, GLsizei h, GLenum target) + GLuint texture, GLint x, GLint y, GLsizei w, GLsizei h, GLenum target) { struct wined3d_device *device = surface->resource.device; GLint compare_mode = GL_NONE; @@ -5598,7 +5598,7 @@ static void surface_depth_blt(struct wined3d_surface *surface, const struct wine glDepthFunc(GL_ALWAYS); glDepthMask(GL_TRUE); glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); - glViewport(0, surface->pow2Height - h, w, h); + glViewport(x, y, w, h); SetRect(&rect, 0, h, w, 0); surface_get_blt_info(target, &rect, surface->pow2Width, surface->pow2Height, &info); @@ -5773,7 +5773,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, surface, FALSE); /* Do the actual blit */ - surface_depth_blt(surface, gl_info, device->depth_blt_texture, w, h, bind_target); + surface_depth_blt(surface, gl_info, device->depth_blt_texture, 0, 0, w, h, bind_target); checkGLcall("depth_blt"); if (context->current_fbo) context_bind_fbo(context, GL_FRAMEBUFFER, &context->current_fbo->id); @@ -5791,7 +5791,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co context_bind_fbo(context, GL_FRAMEBUFFER, NULL); surface_depth_blt(surface, gl_info, surface->texture_name, - w, h, surface->texture_target); + 0, surface->pow2Height - h, w, h, surface->texture_target); checkGLcall("depth_blt"); if (context->current_fbo) context_bind_fbo(context, GL_FRAMEBUFFER, &context->current_fbo->id);

1 0

Henri Verbeet : wined3d: Check the correct debug class in checkGLcall.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 26eb6c8eeae6ba8c24f001edb94b2e6e9cf7c4a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26eb6c8eeae6ba8c24f001edb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 16 00:40:32 2011 +0200 wined3d: Check the correct debug class in checkGLcall. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d20800a..52af441 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -816,7 +816,7 @@ extern int num_lock DECLSPEC_HIDDEN; #define checkGLcall(A) \ do { \ GLint err; \ - if(!__WINE_IS_DEBUG_ON(_FIXME, __wine_dbch___default)) break; \ + if (!__WINE_IS_DEBUG_ON(_ERR, __wine_dbch___default)) break; \ err = glGetError(); \ if (err == GL_NO_ERROR) { \ TRACE("%s call ok %s / %d\n", A, __FILE__, __LINE__); \

1 0

Andrew Eikum : msacm32: Also load ACM drivers from key values.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: e532c55995989f9ad4625e876fe93b71d6b476f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e532c55995989f9ad4625e876… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 15 15:22:39 2011 -0500 msacm32: Also load ACM drivers from key values. --- dlls/msacm32/internal.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index feb6e9cb..239f4d3 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -360,8 +360,8 @@ void MSACM_RegisterAllDrivers(void) 'W','i','n','d','o','w','s',' ','N','T','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'D','r','i','v','e','r','s','3','2','\0'}; - DWORD i, cnt = 0, bufLen, lRet; - WCHAR buf[2048], *name, *s; + DWORD i, cnt, bufLen, lRet, type; + WCHAR buf[2048], valname[64], *name, *s; FILETIME lastWrite; HKEY hKey; @@ -381,6 +381,15 @@ void MSACM_RegisterAllDrivers(void) *name = 0; MSACM_RegisterDriver(buf, name + 1, 0); } + i = 0; + cnt = sizeof(valname) / sizeof(*valname); + bufLen = sizeof(buf); + while(RegEnumValueW(hKey, i, valname, &cnt, 0, + &type, (BYTE*)buf, &bufLen) == ERROR_SUCCESS){ + if(!strncmpiW(valname, msacmW, sizeof(msacmW) / sizeof(*msacmW))) + MSACM_RegisterDriver(valname, buf, 0); + ++i; + } RegCloseKey( hKey ); }

1 0

Gerald Pfeifer : d3dx9_36: Fix the return value in error cases in d3dx9_parse_resource.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: c69331c84a8951fcb13494fc01525f355cb022ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69331c84a8951fcb13494fc0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Jun 15 13:01:22 2011 -0600 d3dx9_36: Fix the return value in error cases in d3dx9_parse_resource. --- dlls/d3dx9_36/effect.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 271594c..3265037 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4733,12 +4733,14 @@ static HRESULT d3dx9_parse_resource(struct ID3DXBaseEffectImpl *base, const char default: FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); + hr=E_FAIL; break; } break; default: FIXME("Unknown usage %x\n", usage); + hr=E_FAIL; break; }

1 0