January 2013 - Wine-commits

Stefan Dösinger : wined3d: Shadow buffers in sysmem when software vertexprocessing is used.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 151407e5bfbd393ed83526649e1b2a62878c7690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=151407e5bfbd393ed83526649… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 15 14:03:18 2013 +0100 wined3d: Shadow buffers in sysmem when software vertexprocessing is used. --- dlls/wined3d/buffer.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c8217e6..415b5e5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1207,6 +1207,15 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.allocatedMemory, buffer); + if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING) + { + /* SWvp always returns the same pointer in buffer maps and retains data in DISCARD maps. + * Keep a system memory copy of the buffer to provide the same behavior to the application. + * Still use a VBO to support OpenGL 3 core contexts. */ + TRACE("Using doublebuffer mode because of software vertex processing\n"); + buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; + } + dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE] || gl_info->supported[ARB_MAP_BUFFER_RANGE]; /* Observations show that drawStridedSlow is faster on dynamic VBs than converting +

1 0

Stefan Dösinger : d3d9/tests: Add a software vertexprocessing buffer discard test.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 4d5c8b6fe71519f42c8e1980d5b8f45aaebd0db6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d5c8b6fe71519f42c8e1980d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 15 14:03:19 2013 +0100 d3d9/tests: Add a software vertexprocessing buffer discard test. --- dlls/d3d9/tests/device.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 7e7fe40..a0997d6 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6030,6 +6030,101 @@ static void test_set_palette(void) DestroyWindow(window); } +static void test_swvp_buffer(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + UINT refcount; + HWND window; + HRESULT hr; + unsigned int i; + IDirect3DVertexBuffer9 *buffer; + static const unsigned int bufsize = 1024; + D3DVERTEXBUFFER_DESC desc; + D3DPRESENT_PARAMETERS present_parameters = {0}; + struct + { + float x, y, z; + } *ptr, *ptr2; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = window; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferWidth = screen_width; + present_parameters.BackBufferHeight = screen_height; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.EnableAutoDepthStencil = FALSE; + if (FAILED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + IDirect3D9_Release(d3d9); + return; + } + + hr = IDirect3DDevice9_CreateVertexBuffer(device, bufsize * sizeof(*ptr), D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, + D3DPOOL_DEFAULT, &buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer9_GetDesc(buffer, &desc); + ok(SUCCEEDED(hr), "Failed to get desc, hr %#x.\n", hr); + ok(desc.Pool == D3DPOOL_DEFAULT, "Got pool %u, expected D3DPOOL_DEFAULT\n", desc.Pool); + ok(desc.Usage == (D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY), + "Got usage %u, expected D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY\n", desc.Usage); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, bufsize * sizeof(*ptr), (void **)&ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + for (i = 0; i < bufsize; i++) + { + ptr[i].x = i * 1.0f; + ptr[i].y = i * 2.0f; + ptr[i].z = i * 3.0f; + } + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(*ptr)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, bufsize * sizeof(*ptr2), (void **)&ptr2, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + ok(ptr == ptr2, "Lock returned two different pointers: %p, %p\n", ptr, ptr2); + for (i = 0; i < bufsize; i++) + { + if (ptr2[i].x != i * 1.0f || ptr2[i].y != i * 2.0f || ptr2[i].z != i * 3.0f) + { + ok(FALSE, "Vertex %u is %f,%f,%f, expected %f,%f,%f\n", i, + ptr2[i].x, ptr2[i].y, ptr2[i].z, i * 1.0f, i * 2.0f, i * 3.0f); + break; + } + } + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + IDirect3DVertexBuffer9_Release(buffer); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -6116,6 +6211,7 @@ START_TEST(device) test_surface_double_unlock(); test_surface_lockrect_blocks(); test_set_palette(); + test_swvp_buffer(); } out:

1 0

Stefan Dösinger : d3d8/tests: Add a software vertexprocessing buffer discard test.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: f30b6d0b4af97e2deafeae4b3872d09af0c026d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f30b6d0b4af97e2deafeae4b3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 15 14:03:20 2013 +0100 d3d8/tests: Add a software vertexprocessing buffer discard test. --- dlls/d3d8/tests/device.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 17c3443..87d3f9e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4532,6 +4532,101 @@ static void test_set_palette(void) DestroyWindow(window); } +static void test_swvp_buffer(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d8; + UINT refcount; + HWND window; + HRESULT hr; + unsigned int i; + IDirect3DVertexBuffer8 *buffer; + static const unsigned int bufsize = 1024; + D3DVERTEXBUFFER_DESC desc; + D3DPRESENT_PARAMETERS present_parameters = {0}; + struct + { + float x, y, z; + } *ptr, *ptr2; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create d3d8 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = window; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferWidth = screen_width; + present_parameters.BackBufferHeight = screen_height; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.EnableAutoDepthStencil = FALSE; + if (FAILED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, bufsize * sizeof(*ptr), D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, + D3DPOOL_DEFAULT, &buffer); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_GetDesc(buffer, &desc); + ok(SUCCEEDED(hr), "Failed to get desc, hr %#x.\n", hr); + ok(desc.Pool == D3DPOOL_DEFAULT, "Got pool %u, expected D3DPOOL_DEFAULT\n", desc.Pool); + ok(desc.Usage == (D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY), + "Got usage %u, expected D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY\n", desc.Usage); + + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, bufsize * sizeof(*ptr), (BYTE **)&ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + for (i = 0; i < bufsize; i++) + { + ptr[i].x = i * 1.0f; + ptr[i].y = i * 2.0f; + ptr[i].z = i * 3.0f; + } + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(*ptr)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, bufsize * sizeof(*ptr2), (BYTE **)&ptr2, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + ok(ptr == ptr2, "Lock returned two different pointers: %p, %p\n", ptr, ptr2); + for (i = 0; i < bufsize; i++) + { + if (ptr2[i].x != i * 1.0f || ptr2[i].y != i * 2.0f || ptr2[i].z != i * 3.0f) + { + ok(FALSE, "Vertex %u is %f,%f,%f, expected %f,%f,%f\n", i, + ptr2[i].x, ptr2[i].y, ptr2[i].z, i * 1.0f, i * 2.0f, i * 3.0f); + break; + } + } + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + IDirect3DVertexBuffer8_Release(buffer); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -4606,6 +4701,7 @@ START_TEST(device) test_surface_double_unlock(); test_surface_lockrect_blocks(); test_set_palette(); + test_swvp_buffer(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Jacek Caban : vbscript: Added support for more constants.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: a71443a8840be9e80b4778815ead3170fa7a5168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71443a8840be9e80b4778815… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 14 17:42:48 2013 +0100 vbscript: Added support for more constants. --- dlls/vbscript/global.c | 56 +++++------------------------------------- dlls/vbscript/tests/api.vbs | 7 +++++ 2 files changed, 14 insertions(+), 49 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5b28e8a..6886ff7 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1548,48 +1548,6 @@ static HRESULT Global_GetRef(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; } -static HRESULT Global_vbUseSystem(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbUseSystemDayOfWeek(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbFirstJan1(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbFirstFourDays(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbFirstFullWeek(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbTrue(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbFalse(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Global_vbUseDefault(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -1777,8 +1735,8 @@ static HRESULT Global_vbMsgBoxRtlReading(vbdisp_t *This, VARIANT *arg, unsigned } static const builtin_prop_t global_props[] = { - {DISPID_GLOBAL_VBUSESYSTEM, Global_vbUseSystem, BP_GET}, - {DISPID_GLOBAL_USESYSTEMDAYOFWEEK, Global_vbUseSystemDayOfWeek, BP_GET}, + {DISPID_GLOBAL_VBUSESYSTEM, NULL, BP_GET, 0}, + {DISPID_GLOBAL_USESYSTEMDAYOFWEEK, NULL, BP_GET, 0}, {DISPID_GLOBAL_VBSUNDAY, NULL, BP_GET, 1}, {DISPID_GLOBAL_VBMONDAY, NULL, BP_GET, 2}, {DISPID_GLOBAL_VBTUESDAY, NULL, BP_GET, 3}, @@ -1786,9 +1744,9 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBTHURSDAY, NULL, BP_GET, 5}, {DISPID_GLOBAL_VBFRIDAY, NULL, BP_GET, 6}, {DISPID_GLOBAL_VBSATURDAY, NULL, BP_GET, 7}, - {DISPID_GLOBAL_VBFIRSTJAN1, Global_vbFirstJan1, BP_GET}, - {DISPID_GLOBAL_VBFIRSTFOURDAYS, Global_vbFirstFourDays, BP_GET}, - {DISPID_GLOBAL_VBFIRSTFULLWEEK, Global_vbFirstFullWeek, BP_GET}, + {DISPID_GLOBAL_VBFIRSTJAN1, NULL, BP_GET, 1}, + {DISPID_GLOBAL_VBFIRSTFOURDAYS, NULL, BP_GET, 2}, + {DISPID_GLOBAL_VBFIRSTFULLWEEK, NULL, BP_GET, 3}, {DISPID_GLOBAL_VBOKONLY, NULL, BP_GET, MB_OK}, {DISPID_GLOBAL_VBOKCANCEL, NULL, BP_GET, MB_OKCANCEL}, {DISPID_GLOBAL_VBABORTRETRYIGNORE, NULL, BP_GET, MB_ABORTRETRYIGNORE}, @@ -1829,8 +1787,8 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBDECIMAL, NULL, BP_GET, VT_DECIMAL}, {DISPID_GLOBAL_VBBYTE, NULL, BP_GET, VT_UI1}, {DISPID_GLOBAL_VBARRAY, NULL, BP_GET, VT_ARRAY}, - {DISPID_GLOBAL_VBTRUE, Global_vbTrue, BP_GET}, - {DISPID_GLOBAL_VBFALSE, Global_vbFalse, BP_GET}, + {DISPID_GLOBAL_VBTRUE, NULL, BP_GET, VARIANT_TRUE}, + {DISPID_GLOBAL_VBFALSE, NULL, BP_GET, VARIANT_FALSE}, {DISPID_GLOBAL_VBUSEDEFAULT, Global_vbUseDefault, BP_GET}, {DISPID_GLOBAL_VBBINARYCOMPARE, Global_vbBinaryCompare, BP_GET}, {DISPID_GLOBAL_VBTEXTCOMPARE, Global_vbTextCompare, BP_GET}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 4f8c544..966b256 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -69,6 +69,13 @@ TestConstant "vbDefaultButton3", vbDefaultButton3, 512 TestConstant "vbDefaultButton4", vbDefaultButton4, 768 TestConstant "vbApplicationModal", vbApplicationModal, 0 TestConstant "vbSystemModal", vbSystemModal, 4096 +TestConstant "vbUseSystem", vbUseSystem, 0 +TestConstant "vbUseSystemDayOfWeek", vbUseSystemDayOfWeek, 0 +TestConstant "vbFirstJan1", vbFirstJan1, 1 +TestConstant "vbFirstFourDays", vbFirstFourDays, 2 +TestConstant "vbFirstFullWeek", vbFirstFullWeek, 3 +TestConstant "vbTrue", vbTrue, -1 +TestConstant "vbFalse", vbFalse, 0 Sub TestCStr(arg, exval) dim x

1 0

Vincent Povirk : winex11.drv: Don' t join INCR data until the transfer finishes.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 9dcc21e3e79bf4b3dcfab233fb57348112de31d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dcc21e3e79bf4b3dcfab233f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 14 13:35:53 2013 -0600 winex11.drv: Don't join INCR data until the transfer finishes. --- dlls/winex11.drv/clipboard.c | 68 +++++++++++++++++++++++++++++++++-------- 1 files changed, 54 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 0df355a..730b6c9 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2347,6 +2347,12 @@ static BOOL X11DRV_CLIPBOARD_GetProperty(Display *display, Window w, Atom prop, } +struct clipboard_data_packet { + struct list entry; + unsigned long size; + unsigned char *data; +}; + /************************************************************************** * X11DRV_CLIPBOARD_ReadProperty * Reads the contents of the X selection property. @@ -2368,13 +2374,21 @@ static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, if (atype == x11drv_atom(INCR)) { - unsigned char *buf = *data; + unsigned char *buf; unsigned long bufsize = 0; + struct list packets; + struct clipboard_data_packet *packet, *packet2; + BOOL res; + + HeapFree(GetProcessHeap(), 0, *data); + *data = NULL; + + list_init(&packets); for (;;) { int i; - unsigned char *prop_data, *tmp; + unsigned char *prop_data; unsigned long prop_size; /* Wait until PropertyNotify is received */ @@ -2392,32 +2406,58 @@ static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, if (i >= SELECTION_RETRIES || !X11DRV_CLIPBOARD_GetProperty(display, w, prop, &atype, &prop_data, &prop_size)) { - HeapFree(GetProcessHeap(), 0, buf); - return FALSE; + res = FALSE; + break; } /* Retrieved entire data. */ if (prop_size == 0) { HeapFree(GetProcessHeap(), 0, prop_data); - *data = buf; - *datasize = bufsize; - return TRUE; + res = TRUE; + break; } - tmp = HeapReAlloc(GetProcessHeap(), 0, buf, bufsize + prop_size + 1); - if (!tmp) + packet = HeapAlloc(GetProcessHeap(), 0, sizeof(*packet)); + if (!packet) { - HeapFree(GetProcessHeap(), 0, buf); HeapFree(GetProcessHeap(), 0, prop_data); - return FALSE; + res = FALSE; + break; } - buf = tmp; - memcpy(buf + bufsize, prop_data, prop_size + 1); + packet->size = prop_size; + packet->data = prop_data; + list_add_tail(&packets, &packet->entry); bufsize += prop_size; - HeapFree(GetProcessHeap(), 0, prop_data); } + + if (res) + { + buf = HeapAlloc(GetProcessHeap(), 0, bufsize + 1); + if (buf) + { + unsigned long bytes_copied = 0; + *datasize = bufsize; + LIST_FOR_EACH_ENTRY( packet, &packets, struct clipboard_data_packet, entry) + { + memcpy(&buf[bytes_copied], packet->data, packet->size); + bytes_copied += packet->size; + } + buf[bufsize] = 0; + *data = buf; + } + else + res = FALSE; + } + + LIST_FOR_EACH_ENTRY_SAFE( packet, packet2, &packets, struct clipboard_data_packet, entry) + { + HeapFree(GetProcessHeap(), 0, packet->data); + HeapFree(GetProcessHeap(), 0, packet); + } + + return res; } return TRUE;

1 0

Dmitry Timoshkov : qcap: Fix compilation on older systems.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 98166a59804971b06a851abc68ea5546cdadbcee URL: http://source.winehq.org/git/wine.git/?a=commit;h=98166a59804971b06a851abc6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 15 12:47:00 2013 +0800 qcap: Fix compilation on older systems. --- dlls/qcap/v4l.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index f5baaeb..2562c48 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -47,7 +47,8 @@ #endif #ifdef HAVE_LIBV4L1_H #include <libv4l1.h> -#elif defined(HAVE_LINUX_VIDEODEV_H) +#endif +#ifdef HAVE_LINUX_VIDEODEV_H #include <linux/videodev.h> #endif #ifdef HAVE_UNISTD_H

1 0

Dmitry Timoshkov : windowscodecs: Fix reading the mask bits in CreateBitmapFromHICON.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 0df1742307b7aafec611feddec9c049eae0d938a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df1742307b7aafec611fedde… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 15 12:47:47 2013 +0800 windowscodecs: Fix reading the mask bits in CreateBitmapFromHICON. --- dlls/windowscodecs/imgfactory.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 8762c81..3e574d5 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -642,7 +642,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromHICON(IWICComponentFactor memset(&bi, 0, sizeof(bi)); bi.bmiHeader.biSize = sizeof(bi.bmiHeader); bi.bmiHeader.biWidth = width; - bi.bmiHeader.biHeight = -height; + bi.bmiHeader.biHeight = info.hbmColor ? -height: -height * 2; bi.bmiHeader.biPlanes = 1; bi.bmiHeader.biBitCount = 32; bi.bmiHeader.biCompression = BI_RGB; @@ -701,8 +701,6 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromHICON(IWICComponentFactor for (x = 0; x < width; x++, rgba++, bits++) { - if (!info.hbmColor) *rgba = ~*rgba; - if (*bits) *rgba = 0; else

1 0

Dmitry Timoshkov : gdiplus: Fix reading the mask bits in GdipCreateBitmapFromHICON.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 34ef07fda20a5fdd92961a016d0e7465b2316da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ef07fda20a5fdd92961a016… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 15 12:48:08 2013 +0800 gdiplus: Fix reading the mask bits in GdipCreateBitmapFromHICON. --- dlls/gdiplus/image.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9d88629..558e300 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1691,7 +1691,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) bih.biSize = sizeof(bih); bih.biWidth = width; - bih.biHeight = -height; + bih.biHeight = iinfo.hbmColor ? -height: -height * 2; bih.biPlanes = 1; bih.biBitCount = 32; bih.biCompression = BI_RGB;

1 0

Dmitry Timoshkov : gdiplus: Avoid not necessary memory allocation for palette entries.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 44e554b744edd4e241118caada0972d7d2f163f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44e554b744edd4e241118caad… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 15 12:48:34 2013 +0800 gdiplus: Avoid not necessary memory allocation for palette entries. --- dlls/gdiplus/image.c | 31 +++++++++---------------------- 1 files changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 558e300..377cab1 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4724,28 +4724,17 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi if (retval == Ok && hpal) { - WORD num_palette_entries; - PALETTEENTRY *palette_entries=NULL; + PALETTEENTRY entry[256]; ColorPalette *palette=NULL; - int i; + int i, num_palette_entries; - if (!GetObjectW(hpal, sizeof(num_palette_entries), &num_palette_entries)) + num_palette_entries = GetPaletteEntries(hpal, 0, 256, entry); + if (!num_palette_entries) retval = GenericError; - if (retval == Ok) - { - palette_entries = GdipAlloc(sizeof(PALETTEENTRY) * num_palette_entries); - palette = GdipAlloc(sizeof(ColorPalette) + sizeof(ARGB) * (num_palette_entries-1)); - - if (!palette_entries || !palette) - retval = OutOfMemory; - } - - if (retval == Ok) - { - if (!GetPaletteEntries(hpal, 0, num_palette_entries, palette_entries)) - retval = GenericError; - } + palette = GdipAlloc(sizeof(ColorPalette) + sizeof(ARGB) * (num_palette_entries-1)); + if (!palette) + retval = OutOfMemory; if (retval == Ok) { @@ -4754,15 +4743,13 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi for (i=0; i<num_palette_entries; i++) { - PALETTEENTRY * entry = &palette_entries[i]; - palette->Entries[i] = 0xff000000 | entry->peRed << 16 | - entry->peGreen << 8 | entry->peBlue; + palette->Entries[i] = 0xff000000 | entry[i].peRed << 16 | + entry[i].peGreen << 8 | entry[i].peBlue; } retval = GdipSetImagePalette((GpImage*)*bitmap, palette); } - GdipFree(palette_entries); GdipFree(palette); }

1 0

Dmitry Timoshkov : gdiplus: Avoid not necessary memory allocation for BITMAPINFO.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: bd601f9950c9d89e9c205f86e399dc283652392a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd601f9950c9d89e9c205f86e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 15 12:48:56 2013 +0800 gdiplus: Avoid not necessary memory allocation for BITMAPINFO. --- dlls/gdiplus/image.c | 23 ++++++++--------------- 1 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 377cab1..b182405 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4694,28 +4694,21 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi if (retval == Ok) { HDC hdc; - BITMAPINFO *pbmi; + char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *pbmi = (BITMAPINFO *)bmibuf; INT src_height; hdc = CreateCompatibleDC(NULL); - pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - if (pbmi) - { - pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - pbmi->bmiHeader.biBitCount = 0; - - GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biBitCount = 0; - src_height = abs(pbmi->bmiHeader.biHeight); - pbmi->bmiHeader.biHeight = -src_height; + GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); - GetDIBits(hdc, hbm, 0, src_height, lockeddata.Scan0, pbmi, DIB_RGB_COLORS); + src_height = abs(pbmi->bmiHeader.biHeight); + pbmi->bmiHeader.biHeight = -src_height; - GdipFree(pbmi); - } - else - retval = OutOfMemory; + GetDIBits(hdc, hbm, 0, src_height, lockeddata.Scan0, pbmi, DIB_RGB_COLORS); DeleteDC(hdc);

1 0