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

Andrew Nguyen : ddraw: Extend the lifetime of the EnumDevices strings beyond function scope.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: f2f529ae38b378b12935d2f7489a1a8f6a7a7a7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2f529ae38b378b12935d2f74… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 1 07:12:45 2011 -0500 ddraw: Extend the lifetime of the EnumDevices strings beyond function scope. --- dlls/ddraw/ddraw.c | 48 +++++++++++++++++------ dlls/ddraw/tests/d3d.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 3365c35..65e70dd 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -39,6 +39,35 @@ static const DDDEVICEIDENTIFIER2 deviceidentifier = 0 }; +static struct enum_device_entry +{ + char interface_name[100]; + char device_name[100]; + const GUID *device_guid; +} device_list7[] = +{ + /* T&L HAL device */ + { + "WINE Direct3D7 Hardware Transform and Lighting acceleration using WineD3D", + "Wine D3D7 T&L HAL", + &IID_IDirect3DTnLHalDevice, + }, + + /* HAL device */ + { + "WINE Direct3D7 Hardware acceleration using WineD3D", + "Wine D3D7 HAL", + &IID_IDirect3DHALDevice, + }, + + /* RGB device */ + { + "WINE Direct3D7 RGB Software Emulation using WineD3D", + "Wine D3D7 RGB", + &IID_IDirect3DRGBDevice, + }, +}; + static void STDMETHODCALLTYPE ddraw_null_wined3d_object_destroyed(void *parent) {} const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops = @@ -4220,17 +4249,11 @@ static HRESULT WINAPI ddraw1_DuplicateSurface(IDirectDraw *iface, IDirectDrawSur *****************************************************************************/ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBACK7 callback, void *context) { - char interface_name_tnl[] = "WINE Direct3D7 Hardware Transform and Lighting acceleration using WineD3D"; - char device_name_tnl[] = "Wine D3D7 T&L HAL"; - char interface_name_hal[] = "WINE Direct3D7 Hardware acceleration using WineD3D"; - char device_name_hal[] = "Wine D3D7 HAL"; - char interface_name_rgb[] = "WINE Direct3D7 RGB Software Emulation using WineD3D"; - char device_name_rgb[] = "Wine D3D7 RGB"; - IDirectDrawImpl *This = impl_from_IDirect3D7(iface); D3DDEVICEDESC7 device_desc7; D3DDEVICEDESC device_desc1; HRESULT hr; + size_t i; TRACE("iface %p, callback %p, context %p.\n", iface, callback, context); @@ -4245,13 +4268,12 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA LeaveCriticalSection(&ddraw_cs); return hr; } - callback(interface_name_tnl, device_name_tnl, &device_desc7, context); - device_desc7.deviceGUID = IID_IDirect3DHALDevice; - callback(interface_name_hal, device_name_hal, &device_desc7, context); - - device_desc7.deviceGUID = IID_IDirect3DRGBDevice; - callback(interface_name_rgb, device_name_rgb, &device_desc7, context); + for (i = 0; i < sizeof(device_list7)/sizeof(device_list7[0]); i++) + { + device_desc7.deviceGUID = *device_list7[i].device_guid; + callback(device_list7[i].interface_name, device_list7[i].device_name, &device_desc7, context); + } TRACE("End of enumeration.\n"); diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 4dc2a20..d6b8fb8 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -54,6 +54,16 @@ typedef struct { int unk; } D3D7ETest; +#define MAX_ENUMERATION_COUNT 10 +typedef struct +{ + unsigned int count; + char *callback_description_ptrs[MAX_ENUMERATION_COUNT]; + char callback_description_strings[MAX_ENUMERATION_COUNT][100]; + char *callback_name_ptrs[MAX_ENUMERATION_COUNT]; + char callback_name_strings[MAX_ENUMERATION_COUNT][100]; +} D3D7ELifetimeTest; + /* To compare bad floating point numbers. Not the ideal way to do it, * but it should be enough for here */ #define comparefloat(a, b) ( (((a) - (b)) < 0.0001) && (((a) - (b)) > -0.0001) ) @@ -860,6 +870,24 @@ static HRESULT WINAPI enumDevicesCallbackTest7(LPSTR DeviceDescription, LPSTR De return DDENUMRET_OK; } +static HRESULT WINAPI enumDevicesLifetimeTest7(LPSTR DeviceDescription, LPSTR DeviceName, LPD3DDEVICEDESC7 lpdd7, LPVOID Context) +{ + D3D7ELifetimeTest *ctx = Context; + + if (ctx->count == MAX_ENUMERATION_COUNT) + { + ok(0, "Enumerated too many devices for context in callback\n"); + return DDENUMRET_CANCEL; + } + + ctx->callback_description_ptrs[ctx->count] = DeviceDescription; + strcpy(ctx->callback_description_strings[ctx->count], DeviceDescription); + ctx->callback_name_ptrs[ctx->count] = DeviceName; + strcpy(ctx->callback_name_strings[ctx->count], DeviceName); + + ctx->count++; + return DDENUMRET_OK; +} /* Check the deviceGUID of devices enumerated by IDirect3D7_EnumDevices. */ @@ -884,6 +912,75 @@ static void D3D7EnumTest(void) ok(d3d7et.hal, "TnLHal device enumerated, but no Hal device found.\n"); } +static void D3D7EnumLifetimeTest(void) +{ + D3D7ELifetimeTest ctx, ctx2; + HRESULT hr; + unsigned int i; + + ctx.count = 0; + hr = IDirect3D7_EnumDevices(lpD3D, enumDevicesLifetimeTest7, &ctx); + ok(hr == D3D_OK, "IDirect3D7_EnumDevices returned 0x%08x\n", hr); + + /* The enumeration strings remain valid even after IDirect3D7_EnumDevices finishes. */ + for (i = 0; i < ctx.count; i++) + { + ok(!strcmp(ctx.callback_description_ptrs[i], ctx.callback_description_strings[i]), + "Got '%s' and '%s'\n", ctx.callback_description_ptrs[i], ctx.callback_description_strings[i]); + ok(!strcmp(ctx.callback_name_ptrs[i], ctx.callback_name_strings[i]), + "Got '%s' and '%s'\n", ctx.callback_name_ptrs[i], ctx.callback_name_strings[i]); + } + + ctx2.count = 0; + hr = IDirect3D7_EnumDevices(lpD3D, enumDevicesLifetimeTest7, &ctx2); + ok(hr == D3D_OK, "IDirect3D7_EnumDevices returned 0x%08x\n", hr); + + /* The enumeration strings and their order are identical across enumerations. */ + ok(ctx.count == ctx2.count, "Enumerated %u and %u devices\n", ctx.count, ctx2.count); + if (ctx.count == ctx2.count) + { + for (i = 0; i < ctx.count; i++) + { + ok(ctx.callback_description_ptrs[i] == ctx2.callback_description_ptrs[i], + "Unequal description pointers %p and %p\n", ctx.callback_description_ptrs[i], ctx2.callback_description_ptrs[i]); + ok(!strcmp(ctx.callback_description_strings[i], ctx2.callback_description_strings[i]), + "Got '%s' and '%s'\n", ctx.callback_description_strings[i], ctx2.callback_description_strings[i]); + ok(ctx.callback_name_ptrs[i] == ctx2.callback_name_ptrs[i], + "Unequal name pointers %p and %p\n", ctx.callback_name_ptrs[i], ctx2.callback_name_ptrs[i]); + ok(!strcmp(ctx.callback_name_strings[i], ctx2.callback_name_strings[i]), + "Got '%s' and '%s'\n", ctx.callback_name_strings[i], ctx2.callback_name_strings[i]); + } + } + + /* Try altering the contents of the enumeration strings. */ + for (i = 0; i < ctx2.count; i++) + { + strcpy(ctx2.callback_description_ptrs[i], "Fake Description"); + strcpy(ctx2.callback_name_ptrs[i], "Fake Device"); + } + + ctx2.count = 0; + hr = IDirect3D7_EnumDevices(lpD3D, enumDevicesLifetimeTest7, &ctx2); + ok(hr == D3D_OK, "IDirect3D7_EnumDevices returned 0x%08x\n", hr); + + /* The original contents of the enumeration strings are not restored. */ + ok(ctx.count == ctx2.count, "Enumerated %u and %u devices\n", ctx.count, ctx2.count); + if (ctx.count == ctx2.count) + { + for (i = 0; i < ctx.count; i++) + { + ok(ctx.callback_description_ptrs[i] == ctx2.callback_description_ptrs[i], + "Unequal description pointers %p and %p\n", ctx.callback_description_ptrs[i], ctx2.callback_description_ptrs[i]); + ok(strcmp(ctx.callback_description_strings[i], ctx2.callback_description_strings[i]) != 0, + "Got '%s' and '%s'\n", ctx.callback_description_strings[i], ctx2.callback_description_strings[i]); + ok(ctx.callback_name_ptrs[i] == ctx2.callback_name_ptrs[i], + "Unequal name pointers %p and %p\n", ctx.callback_name_ptrs[i], ctx2.callback_name_ptrs[i]); + ok(strcmp(ctx.callback_name_strings[i], ctx2.callback_name_strings[i]) != 0, + "Got '%s' and '%s'\n", ctx.callback_name_strings[i], ctx2.callback_name_strings[i]); + } + } +} + static void CapsTest(void) { IDirect3D3 *d3d3; @@ -4093,6 +4190,7 @@ START_TEST(d3d) SceneTest(); LimitTest(); D3D7EnumTest(); + D3D7EnumLifetimeTest(); SetMaterialTest(); ComputeSphereVisibility(); CapsTest();

1 0

Andrew Nguyen : ddraw: Handle a callback cancellation attempt in d3d7_EnumDevices.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: a90b698e0cbcdf4f2b0d67e2a35788b66e1baf58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90b698e0cbcdf4f2b0d67e2a… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 1 07:13:03 2011 -0500 ddraw: Handle a callback cancellation attempt in d3d7_EnumDevices. --- dlls/ddraw/ddraw.c | 10 +++++++++- dlls/ddraw/tests/d3d.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 65e70dd..8fb2ce0 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4271,8 +4271,16 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA for (i = 0; i < sizeof(device_list7)/sizeof(device_list7[0]); i++) { + HRESULT ret; + device_desc7.deviceGUID = *device_list7[i].device_guid; - callback(device_list7[i].interface_name, device_list7[i].device_name, &device_desc7, context); + ret = callback(device_list7[i].interface_name, device_list7[i].device_name, &device_desc7, context); + if (ret != DDENUMRET_OK) + { + TRACE("Application cancelled the enumeration.\n"); + LeaveCriticalSection(&ddraw_cs); + return D3D_OK; + } } TRACE("End of enumeration.\n"); diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index d6b8fb8..f975612 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -54,6 +54,11 @@ typedef struct { int unk; } D3D7ETest; +typedef struct { + HRESULT desired_ret; + int total; +} D3D7ECancelTest; + #define MAX_ENUMERATION_COUNT 10 typedef struct { @@ -870,6 +875,15 @@ static HRESULT WINAPI enumDevicesCallbackTest7(LPSTR DeviceDescription, LPSTR De return DDENUMRET_OK; } +static HRESULT WINAPI enumDevicesCancelTest7(LPSTR DeviceDescription, LPSTR DeviceName, LPD3DDEVICEDESC7 lpdd7, LPVOID Context) +{ + D3D7ECancelTest *d3d7et = Context; + + d3d7et->total++; + + return d3d7et->desired_ret; +} + static HRESULT WINAPI enumDevicesLifetimeTest7(LPSTR DeviceDescription, LPSTR DeviceName, LPD3DDEVICEDESC7 lpdd7, LPVOID Context) { D3D7ELifetimeTest *ctx = Context; @@ -895,12 +909,14 @@ static void D3D7EnumTest(void) { HRESULT hr; D3D7ETest d3d7et; + D3D7ECancelTest d3d7_cancel_test; hr = IDirect3D7_EnumDevices(lpD3D, NULL, NULL); ok(hr == DDERR_INVALIDPARAMS, "IDirect3D7_EnumDevices returned 0x%08x\n", hr); memset(&d3d7et, 0, sizeof(d3d7et)); - IDirect3D7_EnumDevices(lpD3D, enumDevicesCallbackTest7, &d3d7et); + hr = IDirect3D7_EnumDevices(lpD3D, enumDevicesCallbackTest7, &d3d7et); + ok(hr == D3D_OK, "IDirect3D7_EnumDevices returned 0x%08x\n", hr); /* A couple of games (Delta Force LW and TFD) rely on this behaviour */ ok(d3d7et.tnlhal < d3d7et.total, "TnLHal device enumerated as only device.\n"); @@ -910,6 +926,23 @@ static void D3D7EnumTest(void) if(d3d7et.tnlhal) ok(d3d7et.hal, "TnLHal device enumerated, but no Hal device found.\n"); + + d3d7_cancel_test.desired_ret = DDENUMRET_CANCEL; + d3d7_cancel_test.total = 0; + hr = IDirect3D7_EnumDevices(lpD3D, enumDevicesCancelTest7, &d3d7_cancel_test); + ok(hr == D3D_OK, "IDirect3D7_EnumDevices returned 0x%08x\n", hr); + + ok(d3d7_cancel_test.total == 1, "Enumerated a total of %u devices\n", + d3d7_cancel_test.total); + + /* An enumeration callback can return any value besides DDENUMRET_OK to stop enumeration. */ + d3d7_cancel_test.desired_ret = E_INVALIDARG; + d3d7_cancel_test.total = 0; + hr = IDirect3D7_EnumDevices(lpD3D, enumDevicesCancelTest7, &d3d7_cancel_test); + ok(hr == D3D_OK, "IDirect3D7_EnumDevices returned 0x%08x\n", hr); + + ok(d3d7_cancel_test.total == 1, "Enumerated a total of %u devices\n", + d3d7_cancel_test.total); } static void D3D7EnumLifetimeTest(void)

1 0

Andrew Nguyen : hostname: Output a CRLF newline with the hostname string.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: c8ea11c0d8d6e0e22463715abb5a2c5843a5cb2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8ea11c0d8d6e0e22463715ab… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 1 07:13:21 2011 -0500 hostname: Output a CRLF newline with the hostname string. --- programs/hostname/hostname.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/hostname/hostname.c b/programs/hostname/hostname.c index 003bbba..77ff23b 100644 --- a/programs/hostname/hostname.c +++ b/programs/hostname/hostname.c @@ -109,7 +109,7 @@ static int hostname_message(int msg) static void display_computer_name(void) { - static const WCHAR fmtW[] = {'%','s','\n',0}; + static const WCHAR fmtW[] = {'%','s','\r','\n',0}; char nameA[256]; WCHAR nameW[256];

1 0

Andrew Nguyen : advapi32: Fix last error value of GetUserNameA/ W and output buffer handling in GetUserNameA.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: c0b7345e386ac1ccc1e99577cc85093f05c55631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b7345e386ac1ccc1e99577c… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 1 07:13:57 2011 -0500 advapi32: Fix last error value of GetUserNameA/W and output buffer handling in GetUserNameA. --- dlls/advapi32/advapi.c | 18 +++++++----------- dlls/advapi32/tests/security.c | 10 ---------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 47286a1..e135fa5 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -55,24 +55,20 @@ GetUserNameA( LPSTR lpszName, LPDWORD lpSize ) { WCHAR *buffer; BOOL ret; - DWORD sizeW = *lpSize * 2; + DWORD sizeW = *lpSize; if (!(buffer = HeapAlloc( GetProcessHeap(), 0, sizeW * sizeof(WCHAR) ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; } + ret = GetUserNameW( buffer, &sizeW ); if (ret) - { - if (!(*lpSize = WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpszName, *lpSize, NULL, NULL ))) - { - *lpSize = WideCharToMultiByte( CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL ); - SetLastError( ERROR_MORE_DATA ); - ret = FALSE; - } - } - else *lpSize = sizeW * 2; + WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpszName, *lpSize, NULL, NULL ); + else + *lpSize = sizeW; + HeapFree( GetProcessHeap(), 0, buffer ); return ret; } @@ -91,7 +87,7 @@ GetUserNameW( LPWSTR lpszName, LPDWORD lpSize ) if (len > *lpSize) { - SetLastError(ERROR_MORE_DATA); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); *lpSize = len; return FALSE; } diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 1d677ac..6a9a1d2 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3741,7 +3741,6 @@ static void test_GetUserNameA(void) ret = GetUserNameA(NULL, &required_len); ok(ret == FALSE, "GetUserNameA returned %d\n", ret); ok(required_len != 0, "Outputted buffer length was %u\n", required_len); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -3749,7 +3748,6 @@ static void test_GetUserNameA(void) ret = GetUserNameA(NULL, &required_len); ok(ret == FALSE, "GetUserNameA returned %d\n", ret); ok(required_len != 0 && required_len != 1, "Outputted buffer length was %u\n", required_len); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); /* Tests crashes on Windows. */ @@ -3774,7 +3772,6 @@ static void test_GetUserNameA(void) ok(ret == FALSE, "GetUserNameA returned %d\n", ret); ok(!memcmp(buffer, filler, sizeof(filler)), "Output buffer was altered\n"); ok(required_len != 0, "Outputted buffer length was %u\n", required_len); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -3783,7 +3780,6 @@ static void test_GetUserNameA(void) ret = GetUserNameA(buffer, &buffer_len); ok(ret == TRUE, "GetUserNameA returned %d, last error %u\n", ret, GetLastError()); ok(memcmp(buffer, filler, sizeof(filler)) != 0, "Output buffer was untouched\n"); - todo_wine ok(buffer_len == required_len || broken(buffer_len == required_len / sizeof(WCHAR)), /* XP+ */ "Outputted buffer length was %u\n", buffer_len); @@ -3795,11 +3791,9 @@ static void test_GetUserNameA(void) buffer_len--; ret = GetUserNameA(buffer, &buffer_len); ok(ret == FALSE, "GetUserNameA returned %d\n", ret); - todo_wine { ok(!memcmp(buffer, filler, sizeof(filler)), "Output buffer was untouched\n"); ok(buffer_len == required_len, "Outputted buffer length was %u\n", buffer_len); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); - } } static void test_GetUserNameW(void) @@ -3820,7 +3814,6 @@ static void test_GetUserNameW(void) ret = GetUserNameW(NULL, &required_len); ok(ret == FALSE, "GetUserNameW returned %d\n", ret); ok(required_len != 0, "Outputted buffer length was %u\n", required_len); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -3828,7 +3821,6 @@ static void test_GetUserNameW(void) ret = GetUserNameW(NULL, &required_len); ok(ret == FALSE, "GetUserNameW returned %d\n", ret); ok(required_len != 0 && required_len != 1, "Outputted buffer length was %u\n", required_len); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); /* Tests crash on Windows. */ @@ -3851,7 +3843,6 @@ static void test_GetUserNameW(void) ok(ret == FALSE, "GetUserNameW returned %d\n", ret); ok(!memcmp(buffer, filler, sizeof(filler)), "Output buffer was altered\n"); ok(required_len != 0, "Outputted buffer length was %u\n", required_len); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -3872,7 +3863,6 @@ static void test_GetUserNameW(void) broken(memcmp(buffer, filler, sizeof(filler)) != 0), /* XP+ */ "Output buffer was altered\n"); ok(buffer_len == required_len, "Outputted buffer length was %u\n", buffer_len); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); }

1 0

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10Texture3D iface.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: a8712d5522676116b16a1908974ec1a36b9ce6fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8712d5522676116b16a19089… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 1 10:16:55 2011 +0200 d3d10core: COM cleanup for the ID3D10Texture3D iface. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/texture.c | 17 +++++++++++------ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 0ddf7f3..c6f13b1 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -98,7 +98,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic /* ID3D10Texture3D */ struct d3d10_texture3d { - const struct ID3D10Texture3DVtbl *vtbl; + ID3D10Texture3D ID3D10Texture3D_iface; LONG refcount; struct wined3d_texture *wined3d_texture; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 9ac8638..f1ba7de 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -713,7 +713,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device *ifac } TRACE("Created 3D texture %p.\n", object); - *texture = (ID3D10Texture3D *)object; + *texture = &object->ID3D10Texture3D_iface; return S_OK; } diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 0f8d750..16de150 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -251,6 +251,11 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic return S_OK; } +static inline struct d3d10_texture3d *impl_from_ID3D10Texture3D(ID3D10Texture3D *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_texture3d, ID3D10Texture3D_iface); +} + static HRESULT STDMETHODCALLTYPE d3d10_texture3d_QueryInterface(ID3D10Texture3D *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -273,7 +278,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_QueryInterface(ID3D10Texture3D static ULONG STDMETHODCALLTYPE d3d10_texture3d_AddRef(ID3D10Texture3D *iface) { - struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; + struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); ULONG refcount = InterlockedIncrement(&texture->refcount); TRACE("%p increasing refcount to %u.\n", texture, refcount); @@ -291,7 +296,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_wined3d_object_released(void *pare static ULONG STDMETHODCALLTYPE d3d10_texture3d_Release(ID3D10Texture3D *iface) { - struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; + struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); ULONG refcount = InterlockedDecrement(&texture->refcount); TRACE("%p decreasing refcount to %u.\n", texture, refcount); @@ -356,7 +361,7 @@ static UINT STDMETHODCALLTYPE d3d10_texture3d_GetEvictionPriority(ID3D10Texture3 static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UINT sub_resource_idx, D3D10_MAP map_type, UINT map_flags, D3D10_MAPPED_TEXTURE3D *mapped_texture) { - struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; + struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); struct wined3d_resource *sub_resource; WINED3DLOCKED_BOX wined3d_map_desc; HRESULT hr; @@ -384,7 +389,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT sub_resource_idx) { - struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; + struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); struct wined3d_resource *sub_resource; TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); @@ -397,7 +402,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT static void STDMETHODCALLTYPE d3d10_texture3d_GetDesc(ID3D10Texture3D *iface, D3D10_TEXTURE3D_DESC *desc) { - struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; + struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); TRACE("iface %p, desc %p.\n", iface, desc); @@ -435,7 +440,7 @@ HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_devic { HRESULT hr; - texture->vtbl = &d3d10_texture3d_vtbl; + texture->ID3D10Texture3D_iface.lpVtbl = &d3d10_texture3d_vtbl; texture->refcount = 1; texture->desc = *desc;

1 0

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10DepthStencilView iface.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: 7aff686ea11945bfde7ff67963cd95949bef0030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aff686ea11945bfde7ff6796… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 1 10:37:49 2011 +0200 d3d10core: COM cleanup for the ID3D10DepthStencilView iface. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/view.c | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index c6f13b1..ba6103e 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -123,7 +123,7 @@ HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *devi /* ID3D10DepthStencilView */ struct d3d10_depthstencil_view { - const struct ID3D10DepthStencilViewVtbl *vtbl; + ID3D10DepthStencilView ID3D10DepthStencilView_iface; LONG refcount; }; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index f1ba7de..42dcfd3 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -800,7 +800,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Devic } TRACE("Created depthstencil view %p.\n", object); - *view = (ID3D10DepthStencilView *)object; + *view = &object->ID3D10DepthStencilView_iface; return S_OK; } diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index d469ae5..282bc24 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -164,6 +164,11 @@ static HRESULT set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3 } } +static inline struct d3d10_depthstencil_view *impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_depthstencil_view, ID3D10DepthStencilView_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_QueryInterface(ID3D10DepthStencilView *iface, @@ -189,7 +194,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_QueryInterface(ID3D10De static ULONG STDMETHODCALLTYPE d3d10_depthstencil_view_AddRef(ID3D10DepthStencilView *iface) { - struct d3d10_depthstencil_view *This = (struct d3d10_depthstencil_view *)iface; + struct d3d10_depthstencil_view *This = impl_from_ID3D10DepthStencilView(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -199,7 +204,7 @@ static ULONG STDMETHODCALLTYPE d3d10_depthstencil_view_AddRef(ID3D10DepthStencil static ULONG STDMETHODCALLTYPE d3d10_depthstencil_view_Release(ID3D10DepthStencilView *iface) { - struct d3d10_depthstencil_view *This = (struct d3d10_depthstencil_view *)iface; + struct d3d10_depthstencil_view *This = impl_from_ID3D10DepthStencilView(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u.\n", This, refcount); @@ -280,7 +285,7 @@ static const struct ID3D10DepthStencilViewVtbl d3d10_depthstencil_view_vtbl = HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view) { - view->vtbl = &d3d10_depthstencil_view_vtbl; + view->ID3D10DepthStencilView_iface.lpVtbl = &d3d10_depthstencil_view_vtbl; view->refcount = 1; return S_OK;

1 0

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10ShaderResourceView iface.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: 36de21b3a1ed854bc2d9929c4b9eebaffb2bf0ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=36de21b3a1ed854bc2d9929c4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 1 10:46:00 2011 +0200 d3d10core: COM cleanup for the ID3D10ShaderResourceView iface. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/view.c | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index ba6103e..0640556 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -145,7 +145,7 @@ HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, /* ID3D10ShaderResourceView */ struct d3d10_shader_resource_view { - const struct ID3D10ShaderResourceViewVtbl *vtbl; + ID3D10ShaderResourceView ID3D10ShaderResourceView_iface; LONG refcount; }; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 42dcfd3..bc8d31f 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -742,7 +742,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev } TRACE("Created shader resource view %p.\n", object); - *view = (ID3D10ShaderResourceView *)object; + *view = &object->ID3D10ShaderResourceView_iface; return S_OK; } diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 282bc24..fb289a6 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -468,6 +468,11 @@ HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, return S_OK; } +static inline struct d3d10_shader_resource_view *impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_shader_resource_view, ID3D10ShaderResourceView_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_QueryInterface(ID3D10ShaderResourceView *iface, @@ -493,7 +498,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_QueryInterface(ID3D1 static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_AddRef(ID3D10ShaderResourceView *iface) { - struct d3d10_shader_resource_view *This = (struct d3d10_shader_resource_view *)iface; + struct d3d10_shader_resource_view *This = impl_from_ID3D10ShaderResourceView(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -503,7 +508,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_AddRef(ID3D10ShaderRes static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_Release(ID3D10ShaderResourceView *iface) { - struct d3d10_shader_resource_view *This = (struct d3d10_shader_resource_view *)iface; + struct d3d10_shader_resource_view *This = impl_from_ID3D10ShaderResourceView(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u.\n", This, refcount); @@ -585,7 +590,7 @@ static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view) { - view->vtbl = &d3d10_shader_resource_view_vtbl; + view->ID3D10ShaderResourceView_iface.lpVtbl = &d3d10_shader_resource_view_vtbl; view->refcount = 1; return S_OK;

1 0

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10GeometryShader iface.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: 2b1001907f25b1462368803106e3b03d15588862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1001907f25b146236880310… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 1 10:59:33 2011 +0200 d3d10core: COM cleanup for the ID3D10GeometryShader iface. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/shader.c | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 0640556..12af282 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -180,7 +180,7 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d1 /* ID3D10GeometryShader */ struct d3d10_geometry_shader { - const struct ID3D10GeometryShaderVtbl *vtbl; + ID3D10GeometryShader ID3D10GeometryShader_iface; LONG refcount; struct wined3d_shader *wined3d_shader; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index bc8d31f..59a3b60 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -896,7 +896,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device } TRACE("Created geometry shader %p.\n", object); - *shader = (ID3D10GeometryShader *)object; + *shader = &object->ID3D10GeometryShader_iface; return S_OK; } diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index eec420c..a7a40d5 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -267,6 +267,11 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d1 return S_OK; } +static inline struct d3d10_geometry_shader *impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_geometry_shader, ID3D10GeometryShader_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_QueryInterface(ID3D10GeometryShader *iface, @@ -291,7 +296,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_QueryInterface(ID3D10Geom static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_AddRef(ID3D10GeometryShader *iface) { - struct d3d10_geometry_shader *This = (struct d3d10_geometry_shader *)iface; + struct d3d10_geometry_shader *This = impl_from_ID3D10GeometryShader(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -301,7 +306,7 @@ static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_AddRef(ID3D10GeometryShader static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_Release(ID3D10GeometryShader *iface) { - struct d3d10_geometry_shader *This = (struct d3d10_geometry_shader *)iface; + struct d3d10_geometry_shader *This = impl_from_ID3D10GeometryShader(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -376,7 +381,7 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct struct d3d10_shader_info shader_info; HRESULT hr; - shader->vtbl = &d3d10_geometry_shader_vtbl; + shader->ID3D10GeometryShader_iface.lpVtbl = &d3d10_geometry_shader_vtbl; shader->refcount = 1; shader_info.output_signature = &shader->output_signature;

1 0

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10BlendState iface.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: a4a4a420f8fd66b96b2447e1d3203c224174f323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4a4a420f8fd66b96b2447e1d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 1 11:02:35 2011 +0200 d3d10core: COM cleanup for the ID3D10BlendState iface. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/state.c | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 12af282..d3be62b 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -209,7 +209,7 @@ void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; /* ID3D10BlendState */ struct d3d10_blend_state { - const struct ID3D10BlendStateVtbl *vtbl; + ID3D10BlendState ID3D10BlendState_iface; LONG refcount; }; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 59a3b60..bec59ce 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -968,7 +968,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device *ifa } TRACE("Created blend state %p.\n", object); - *blend_state = (ID3D10BlendState *)object; + *blend_state = &object->ID3D10BlendState_iface; return S_OK; } diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 2eaa652..5051f11 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -24,6 +24,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); +static inline struct d3d10_blend_state *impl_from_ID3D10BlendState(ID3D10BlendState *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_blend_state, ID3D10BlendState_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendState *iface, @@ -48,7 +53,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendSta static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) { - struct d3d10_blend_state *This = (struct d3d10_blend_state *)iface; + struct d3d10_blend_state *This = impl_from_ID3D10BlendState(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -58,7 +63,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface) { - struct d3d10_blend_state *This = (struct d3d10_blend_state *)iface; + struct d3d10_blend_state *This = impl_from_ID3D10BlendState(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u.\n", This, refcount); @@ -129,7 +134,7 @@ static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl = HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) { - state->vtbl = &d3d10_blend_state_vtbl; + state->ID3D10BlendState_iface.lpVtbl = &d3d10_blend_state_vtbl; state->refcount = 1; return S_OK;

1 0

Hans Leidekker : winhttp: Don' t change the verb if the server response is HTTP_STATUS_REDIRECT_KEEP_VERB.
by Alexandre Julliard 01 Jun '11

01 Jun '11

Module: wine Branch: master Commit: b7df063fde8628d94dca56ece3f830f75d1fcddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7df063fde8628d94dca56ece… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 1 11:50:11 2011 +0200 winhttp: Don't change the verb if the server response is HTTP_STATUS_REDIRECT_KEEP_VERB. --- dlls/winhttp/request.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 8a21ab5..c8eca75 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1544,7 +1544,7 @@ end: return TRUE; } -static BOOL handle_redirect( request_t *request ) +static BOOL handle_redirect( request_t *request, DWORD status ) { BOOL ret = FALSE; DWORD size, len; @@ -1626,9 +1626,11 @@ static BOOL handle_redirect( request_t *request ) if ((index = get_header_index( request, attr_content_type, 0, TRUE )) >= 0) delete_header( request, index ); if ((index = get_header_index( request, attr_content_length, 0, TRUE )) >= 0 ) delete_header( request, index ); - /* redirects are always GET requests */ - heap_free( request->verb ); - request->verb = strdupW( getW ); + if (status != HTTP_STATUS_REDIRECT_KEEP_VERB) + { + heap_free( request->verb ); + request->verb = strdupW( getW ); + } ret = TRUE; end: @@ -1840,7 +1842,7 @@ static BOOL receive_response( request_t *request, BOOL async ) if (request->hdr.disable_flags & WINHTTP_DISABLE_REDIRECTS) break; drain_content( request ); - if (!(ret = handle_redirect( request ))) break; + if (!(ret = handle_redirect( request, status ))) break; clear_response_headers( request ); ret = send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); /* recurse synchronously */

1 0