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

Andrew Nguyen : ddraw: Extend the lifetime of the EnumDevices strings beyond function scope.
by Alexandre Julliard June 1, 2011

June 1, 2011

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

Marko Nikolic : comctl32/tests: Removed sign comparison warning in tooltip tests.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: 2dd0d8ab2a200e74fca6a32ecec93a1811770e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd0d8ab2a200e74fca6a32ec… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Tue May 31 23:38:47 2011 +0200 comctl32/tests: Removed sign comparison warning in tooltip tests. --- dlls/comctl32/tests/tooltips.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 8ca3f7b..596598f 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -148,7 +148,7 @@ static void test_customdraw(void) { {CDRF_NEWFONT, TEST_CDDS_PREPAINT} }; - int iterationNumber; + DWORD iterationNumber; WNDCLASSA wc; LRESULT lResult; @@ -435,7 +435,7 @@ static void test_ttm_gettoolinfo(void) ti.uFlags = 0; ti.uId = 0x1234ABCD; ti.lpszText = NULL; - ti.lParam = 0xdeadbeef; + ti.lParam = 0x1abe11ed; GetClientRect(hwnd, &ti.rect); r = SendMessageA(hwnd, TTM_ADDTOOLA, 0, (LPARAM)&ti); ok(r, "Adding the tool to the tooltip failed\n"); @@ -444,9 +444,9 @@ static void test_ttm_gettoolinfo(void) ti.lParam = 0xaaaaaaaa; r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&ti); ok(r, "Getting tooltip info failed\n"); - ok(0xdeadbeef == ti.lParam || - broken(0xdeadbeef != ti.lParam), /* comctl32 < 5.81 */ - "Expected 0xdeadbeef, got %lx\n", ti.lParam); + ok(0x1abe11ed == ti.lParam || + broken(0x1abe11ed != ti.lParam), /* comctl32 < 5.81 */ + "Expected 0x1abe11ed, got %lx\n", ti.lParam); tiW.cbSize = TTTOOLINFOW_V2_SIZE; tiW.hwnd = NULL; @@ -454,22 +454,22 @@ static void test_ttm_gettoolinfo(void) tiW.lParam = 0xaaaaaaaa; r = SendMessageA(hwnd, TTM_GETTOOLINFOW, 0, (LPARAM)&tiW); ok(r, "Getting tooltip info failed\n"); - ok(0xdeadbeef == tiW.lParam || - broken(0xdeadbeef != tiW.lParam), /* comctl32 < 5.81 */ - "Expected 0xdeadbeef, got %lx\n", tiW.lParam); + ok(0x1abe11ed == tiW.lParam || + broken(0x1abe11ed != tiW.lParam), /* comctl32 < 5.81 */ + "Expected 0x1abe11ed, got %lx\n", tiW.lParam); ti.cbSize = TTTOOLINFOA_V2_SIZE; ti.uId = 0x1234ABCD; - ti.lParam = 0xaaaaaaaa; + ti.lParam = 0x55555555; SendMessageA(hwnd, TTM_SETTOOLINFOA, 0, (LPARAM)&ti); ti.cbSize = TTTOOLINFOA_V2_SIZE; ti.lParam = 0xdeadbeef; r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&ti); ok(r, "Getting tooltip info failed\n"); - ok(0xaaaaaaaa == ti.lParam || - broken(0xaaaaaaaa != ti.lParam), /* comctl32 < 5.81 */ - "Expected 0xaaaaaaaa, got %lx\n", ti.lParam); + ok(0x55555555 == ti.lParam || + broken(0x55555555 != ti.lParam), /* comctl32 < 5.81 */ + "Expected 0x55555555, got %lx\n", ti.lParam); DestroyWindow(hwnd);

1 0

Marko Nikolic : comctl32/tests: Use unsigned constants to remove sign comparison warning.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: 8c13dcc2e9f20165a27244d212ea4a8933449d98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c13dcc2e9f20165a27244d21… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Tue May 31 23:38:46 2011 +0200 comctl32/tests: Use unsigned constants to remove sign comparison warning. --- dlls/comctl32/tests/treeview.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 5fd26a0..324473d 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -634,7 +634,7 @@ static void test_get_set_bkcolor(void) /* If the value is -1, the control is using the system color for the background color. */ crColor = (COLORREF)SendMessage( hTree, TVM_GETBKCOLOR, 0, 0 ); - ok(crColor == -1, "Default background color reported as 0x%.8x\n", crColor); + ok(crColor == ~0u, "Default background color reported as 0x%.8x\n", crColor); /* Test for black background */ SendMessage( hTree, TVM_SETBKCOLOR, 0, RGB(0,0,0) ); @@ -873,7 +873,7 @@ static void test_get_set_textcolor(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); crColor = (COLORREF)SendMessage( hTree, TVM_GETTEXTCOLOR, 0, 0 ); - ok(crColor == -1, "Default text color reported as 0x%.8x\n", crColor); + ok(crColor == ~0u, "Default text color reported as 0x%.8x\n", crColor); /* Test for black text */ SendMessage( hTree, TVM_SETTEXTCOLOR, 0, RGB(0,0,0) ); @@ -1453,7 +1453,7 @@ static void test_WM_PAINT(void) hTree = create_treeview_control(0); clr = SendMessageA(hTree, TVM_SETBKCOLOR, 0, RGB(255, 0, 0)); - ok(clr == -1, "got %d, expected -1\n", clr); + ok(clr == ~0u, "got %d, expected -1\n", clr); hdc = GetDC(hMainWnd);

1 0

André Hentschel : winedbg: Increase buffer for function names.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: 3ea13c9c49fa738b97b9614884d8cfaea357932b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea13c9c49fa738b97b961488… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 31 20:17:34 2011 +0200 winedbg: Increase buffer for function names. --- programs/winedbg/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 51cf207..bc59eed 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -833,7 +833,7 @@ void info_win32_exception(void) break; case EXCEPTION_WINE_STUB: { - char dll[32], name[64]; + char dll[32], name[256]; memory_get_string(dbg_curr_process, (void*)rec->ExceptionInformation[0], TRUE, FALSE, dll, sizeof(dll));

1 0

Huw Davies : gdi32: Add support for 24 bpp brushes.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: 146ad997ba8e29c9f3ff0cd0db1489c3a1d65691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=146ad997ba8e29c9f3ff0cd0d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 1 09:41:41 2011 +0100 gdi32: Add support for 24 bpp brushes. --- dlls/gdi32/dibdrv/primitives.c | 174 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 174 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index b7270e9..4711a65 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -626,6 +626,29 @@ static BOOL convert_to_8888(dib_info *dst, const dib_info *src, const RECT *src_ break; } + case 24: + { + BYTE *src_start = get_pixel_ptr_24(src, src_rect->left, src_rect->top), *src_pixel; + + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + rgb.rgbBlue = *src_pixel++; + rgb.rgbGreen = *src_pixel++; + rgb.rgbRed = *src_pixel++; + + *dst_pixel++ = ((rgb.rgbRed << 16) & 0xff0000) | ((rgb.rgbGreen << 8) & 0x00ff00) | (rgb.rgbBlue & 0x0000ff); + } + dst_start += dst->stride / 4; + src_start += src->stride; + } + break; + } + case 16: { WORD *src_start = get_pixel_ptr_16(src, src_rect->left, src_rect->top), *src_pixel; @@ -743,6 +766,31 @@ static BOOL convert_to_32(dib_info *dst, const dib_info *src, const RECT *src_re break; } + case 24: + { + BYTE *src_start = get_pixel_ptr_24(src, src_rect->left, src_rect->top), *src_pixel; + + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + rgb.rgbBlue = *src_pixel++; + rgb.rgbGreen = *src_pixel++; + rgb.rgbRed = *src_pixel++; + + *dst_pixel++ = put_field(rgb.rgbRed, dst->red_shift, dst->red_len) | + put_field(rgb.rgbGreen, dst->green_shift, dst->green_len) | + put_field(rgb.rgbBlue, dst->blue_shift, dst->blue_len); + } + dst_start += dst->stride / 4; + src_start += src->stride; + } + break; + } + case 16: { WORD *src_start = get_pixel_ptr_16(src, src_rect->left, src_rect->top), *src_pixel; @@ -864,6 +912,24 @@ static BOOL convert_to_24(dib_info *dst, const dib_info *src, const RECT *src_re break; } + case 24: + { + BYTE *src_start = get_pixel_ptr_24(src, src_rect->left, src_rect->top); + + if(src->stride > 0 && dst->stride > 0 && src_rect->left == 0 && src_rect->right == src->width) + memcpy(dst->bits, src_start, (src_rect->bottom - src_rect->top) * src->stride); + else + { + for(y = src_rect->top; y < src_rect->bottom; y++) + { + memcpy(dst_start, src_start, (src_rect->right - src_rect->left) * 3); + dst_start += dst->stride; + src_start += src->stride; + } + } + break; + } + case 16: { WORD *src_start = get_pixel_ptr_16(src, src_rect->left, src_rect->top), *src_pixel; @@ -986,6 +1052,31 @@ static BOOL convert_to_555(dib_info *dst, const dib_info *src, const RECT *src_r break; } + case 24: + { + BYTE *src_start = get_pixel_ptr_24(src, src_rect->left, src_rect->top), *src_pixel; + + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + rgb.rgbBlue = *src_pixel++; + rgb.rgbGreen = *src_pixel++; + rgb.rgbRed = *src_pixel++; + + *dst_pixel++ = ((rgb.rgbRed << 7) & 0x7c00) | + ((rgb.rgbGreen << 2) & 0x03e0) | + ((rgb.rgbBlue >> 3) & 0x001f); + } + dst_start += dst->stride / 2; + src_start += src->stride; + } + break; + } + case 16: { WORD *src_start = get_pixel_ptr_16(src, src_rect->left, src_rect->top); @@ -1105,6 +1196,31 @@ static BOOL convert_to_16(dib_info *dst, const dib_info *src, const RECT *src_re break; } + case 24: + { + BYTE *src_start = get_pixel_ptr_24(src, src_rect->left, src_rect->top), *src_pixel; + + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + rgb.rgbBlue = *src_pixel++; + rgb.rgbGreen = *src_pixel++; + rgb.rgbRed = *src_pixel++; + + *dst_pixel++ = put_field(rgb.rgbRed, dst->red_shift, dst->red_len) | + put_field(rgb.rgbGreen, dst->green_shift, dst->green_len) | + put_field(rgb.rgbBlue, dst->blue_shift, dst->blue_len); + } + dst_start += dst->stride / 2; + src_start += src->stride; + } + break; + } + case 16: { WORD *src_start = get_pixel_ptr_16(src, src_rect->left, src_rect->top), *src_pixel; @@ -1235,6 +1351,31 @@ static BOOL convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec break; } + case 24: + { + BYTE *src_start = get_pixel_ptr_24(src, src_rect->left, src_rect->top), *src_pixel; + + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + rgb.rgbBlue = *src_pixel++; + rgb.rgbGreen = *src_pixel++; + rgb.rgbRed = *src_pixel++; + + *dst_pixel++ = colorref_to_pixel_colortable(dst, ( rgb.rgbRed & 0x0000ff) | + ((rgb.rgbGreen << 8) & 0x00ff00) | + ((rgb.rgbBlue << 16) & 0xff0000)); + } + dst_start += dst->stride; + src_start += src->stride; + } + break; + } + case 16: { WORD *src_start = get_pixel_ptr_16(src, src_rect->left, src_rect->top), *src_pixel; @@ -1378,6 +1519,39 @@ static BOOL convert_to_4(dib_info *dst, const dib_info *src, const RECT *src_rec break; } + case 24: + { + BYTE *src_start = get_pixel_ptr_24(src, src_rect->left, src_rect->top), *src_pixel; + + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + rgb.rgbBlue = *src_pixel++; + rgb.rgbGreen = *src_pixel++; + rgb.rgbRed = *src_pixel++; + + dst_val = colorref_to_pixel_colortable(dst, ( rgb.rgbRed & 0x0000ff) | + ((rgb.rgbGreen << 8) & 0x00ff00) | + ((rgb.rgbBlue << 16) & 0xff0000)); + + if((x - src_rect->left) & 1) + { + *dst_pixel = (dst_val & 0x0f) | (*dst_pixel & 0xf0); + dst_pixel++; + } + else + *dst_pixel = (dst_val << 4) & 0xf0; + } + dst_start += dst->stride; + src_start += src->stride; + } + break; + } + case 16: { WORD *src_start = get_pixel_ptr_16(src, src_rect->left, src_rect->top), *src_pixel;

1 0

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10GeometryShader iface.
by Alexandre Julliard June 1, 2011

June 1, 2011

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 ID3D10ShaderResourceView iface.
by Alexandre Julliard June 1, 2011

June 1, 2011

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 ID3D10DepthStencilView iface.
by Alexandre Julliard June 1, 2011

June 1, 2011

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

Hans Leidekker : wininet: Don' t change the verb if the server response is HTTP_STATUS_REDIRECT_KEEP_VERB.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: 14d4d1957d599ca4f1ad269a04a3c9f5c14261f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14d4d1957d599ca4f1ad269a0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 1 11:50:32 2011 +0200 wininet: Don't change the verb if the server response is HTTP_STATUS_REDIRECT_KEEP_VERB. --- dlls/wininet/http.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a8dbd3d..cc9d480 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4734,7 +4734,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, dwStatusCode == HTTP_STATUS_REDIRECT_METHOD) && HTTP_HttpQueryInfoW(request,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL) == ERROR_SUCCESS) { - if (strcmpW(request->verb, szGET) && strcmpW(request->verb, szHEAD)) + if (strcmpW(request->verb, szGET) && strcmpW(request->verb, szHEAD) && + dwStatusCode != HTTP_STATUS_REDIRECT_KEEP_VERB) { HeapFree(GetProcessHeap(), 0, request->verb); request->verb = heap_strdupW(szGET); @@ -4904,7 +4905,8 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ dwBufferSize=sizeof(szNewLocation); if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_LOCATION, szNewLocation, &dwBufferSize, NULL) == ERROR_SUCCESS) { - if (strcmpW(request->verb, szGET) && strcmpW(request->verb, szHEAD)) + if (strcmpW(request->verb, szGET) && strcmpW(request->verb, szHEAD) && + dwCode != HTTP_STATUS_REDIRECT_KEEP_VERB) { HeapFree(GetProcessHeap(), 0, request->verb); request->verb = heap_strdupW(szGET);

1 0

Hans Leidekker : winhttp: Don' t change the verb if the server response is HTTP_STATUS_REDIRECT_KEEP_VERB.
by Alexandre Julliard June 1, 2011

June 1, 2011

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