April 2015 - Wine-Commits - list.winehq.org

Andrew Eikum : dsound: Stricter validation for formats in secondary buffers.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: a9a80b56b1ab3001fe844aa3a4017c787d6464b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9a80b56b1ab3001fe844aa3a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 13 11:25:23 2015 -0500 dsound: Stricter validation for formats in secondary buffers. --- dlls/dsound/dsound.c | 24 ++- dlls/dsound/tests/dsound.c | 478 ++++++++++++++++++++++++--------------------- 2 files changed, 277 insertions(+), 225 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9a80b56b1ab3001fe844…

1 0

Alistair Leslie-Hughes : dpnet: Convert Address components to use an array.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: f2aa42de09679a6b6c016cfc88e8b329fb796dd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2aa42de09679a6b6c016cfc8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 11 16:38:59 2015 +1100 dpnet: Convert Address components to use an array. --- dlls/dpnet/address.c | 85 ++++++++++++++++++++++++++++++++++++++-------- dlls/dpnet/dpnet_private.h | 4 ++- 2 files changed, 74 insertions(+), 15 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index defd894..7e10136 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -44,6 +44,11 @@ static inline void *heap_alloc(size_t len) return HeapAlloc(GetProcessHeap(), 0, len); } +static inline void *heap_realloc(void *mem, size_t len) +{ + return HeapReAlloc( GetProcessHeap(), 0, mem, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); @@ -74,6 +79,28 @@ static char *heap_strdupA( const char *str ) return ret; } +static BOOL add_component(IDirectPlay8AddressImpl *This, struct component *item) +{ + if(This->comp_count == This->comp_array_size) + { + struct component **temp; + + temp = heap_realloc(This->components, sizeof(*temp) * This->comp_array_size * 2 ); + if(!temp) + { + return FALSE; + } + + This->comp_array_size *= 2; + This->components = temp; + } + + This->components[This->comp_count] = item; + This->comp_count++; + + return TRUE; +} + static inline IDirectPlay8AddressImpl *impl_from_IDirectPlay8Address(IDirectPlay8Address *iface) { return CONTAINING_RECORD(iface, IDirectPlay8AddressImpl, IDirectPlay8Address_iface); @@ -112,10 +139,13 @@ static ULONG WINAPI IDirectPlay8AddressImpl_Release(IDirectPlay8Address *iface) if (!ref) { - struct component *entry, *entry2; + struct component *entry; + DWORD i; - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->components, struct component, entry) + for(i=0; i < This->comp_count; i++) { + entry = This->components[i]; + switch(entry->type) { case DPNA_DATATYPE_STRING: @@ -129,10 +159,11 @@ static ULONG WINAPI IDirectPlay8AddressImpl_Release(IDirectPlay8Address *iface) break; } - HeapFree(GetProcessHeap(), 0, entry); + heap_free(entry); } - HeapFree(GetProcessHeap(), 0, This); + heap_free(This->components); + heap_free(This); } return ref; } @@ -192,13 +223,15 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_Duplicate(IDirectPlay8Address *ifa if(hr == S_OK) { IDirectPlay8AddressImpl *DupThis = impl_from_IDirectPlay8Address(dup); - struct component *entry; + DWORD i; DupThis->SP_guid = This->SP_guid; DupThis->init = This->init; - LIST_FOR_EACH_ENTRY(entry, &This->components, struct component, entry) + for(i=0; i < This->comp_count; i++) { + struct component *entry = This->components[i]; + hr = IDirectPlay8Address_AddComponent(dup, entry->name, &entry->data, entry->size, entry->type); if(hr != S_OK) ERR("Failed to copy component: %s - 0x%08x\n", debugstr_w(entry->name), hr); @@ -308,7 +341,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetNumComponents(IDirectPlay8Addre if(!pdwNumComponents) return DPNERR_INVALIDPOINTER; - *pdwNumComponents = list_count(&This->components); + *pdwNumComponents = This->comp_count; return DPN_OK; } @@ -318,14 +351,17 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByName(IDirectPlay8Add { IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); struct component *entry; + DWORD i; TRACE("(%p)->(%p %p %p %p)\n", This, pwszName, pvBuffer, pdwBufferSize, pdwDataType); if(!pwszName || !pdwBufferSize || !pdwDataType || (!pvBuffer && pdwBufferSize)) return E_POINTER; - LIST_FOR_EACH_ENTRY(entry, &This->components, struct component, entry) + for(i=0; i < This->comp_count; i++) { + entry = This->components[i]; + if (lstrcmpW(pwszName, entry->name) == 0) { TRACE("Found %s\n", debugstr_w(pwszName)); @@ -381,6 +417,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); struct component *entry; BOOL found = FALSE; + DWORD i; TRACE("(%p, %s, %p, %u, %x)\n", This, debugstr_w(pwszName), lpvData, dwDataSize, dwDataType); @@ -419,15 +456,17 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * break; } - LIST_FOR_EACH_ENTRY(entry, &This->components, struct component, entry) + for(i=0; i < This->comp_count; i++) { + entry = This->components[i]; + if (lstrcmpW(pwszName, entry->name) == 0) { TRACE("Found %s\n", debugstr_w(pwszName)); found = TRUE; if(entry->type == DPNA_DATATYPE_STRING_ANSI) - heap_free(entry->data.ansi); + heap_free(entry->data.ansi); else if(entry->type == DPNA_DATATYPE_STRING) heap_free(entry->data.string); else if(entry->type == DPNA_DATATYPE_BINARY) @@ -441,9 +480,22 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * { /* Create a new one */ entry = heap_alloc(sizeof(struct component)); + if(!entry) + return E_OUTOFMEMORY; + entry->name = heap_strdupW(pwszName); + if(!entry->name) + { + heap_free(entry); + return E_OUTOFMEMORY; + } - list_add_tail(&This->components, &entry->entry); + if(!add_component(This, entry)) + { + heap_free(entry->name); + heap_free(entry); + return E_OUTOFMEMORY; + } } switch (dwDataType) @@ -532,7 +584,7 @@ HRESULT DPNET_CreateDirectPlay8Address(IClassFactory *iface, IUnknown *pUnkOuter TRACE("(%p, %s, %p)\n", pUnkOuter, debugstr_guid(riid), ppobj); - *ppobj = NULL; + *ppobj = NULL; client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8AddressImpl)); if (!client) @@ -540,8 +592,13 @@ HRESULT DPNET_CreateDirectPlay8Address(IClassFactory *iface, IUnknown *pUnkOuter client->IDirectPlay8Address_iface.lpVtbl = &DirectPlay8Address_Vtbl; client->ref = 1; - - list_init(&client->components); + client->comp_array_size = 4; + client->components = heap_alloc( sizeof(*client->components) * client->comp_array_size ); + if(!client->components) + { + heap_free(client); + return E_OUTOFMEMORY; + } ret = IDirectPlay8AddressImpl_QueryInterface(&client->IDirectPlay8Address_iface, riid, ppobj); IDirectPlay8AddressImpl_Release(&client->IDirectPlay8Address_iface); diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 1ed4f25..f9c4400 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -91,7 +91,9 @@ struct IDirectPlay8AddressImpl GUID SP_guid; BOOL init; - struct list components; + struct component **components; + DWORD comp_count; + DWORD comp_array_size; }; /*****************************************************************************

1 0

Henri Verbeet : d3d9: Merge most of d3d9_device_Reset() and d3d9_device_ResetEx().
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: c78312ad0804e6cf82ef6bd4da2c8ba765e89054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c78312ad0804e6cf82ef6bd4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 14 10:16:01 2015 +0200 d3d9: Merge most of d3d9_device_Reset() and d3d9_device_ResetEx(). --- dlls/d3d9/device.c | 72 ++++++++++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 43 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index da462b1..97c71bb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -626,21 +626,28 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) return D3D_OK; } -static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *iface, - D3DPRESENT_PARAMETERS *present_parameters) +static HRESULT d3d9_device_reset(struct d3d9_device *device, + D3DPRESENT_PARAMETERS *present_parameters, D3DDISPLAYMODEEX *mode) { - struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_swapchain_desc swapchain_desc; + struct wined3d_display_mode wined3d_mode; HRESULT hr; - TRACE("iface %p, present_parameters %p.\n", iface, present_parameters); - if (!device->d3d_parent->extended && device->device_state == D3D9_DEVICE_STATE_LOST) { WARN("App not active, returning D3DERR_DEVICELOST.\n"); return D3DERR_DEVICELOST; } + if (mode) + { + wined3d_mode.width = mode->Width; + wined3d_mode.height = mode->Height; + wined3d_mode.refresh_rate = mode->RefreshRate; + wined3d_mode.format_id = wined3dformat_from_d3dformat(mode->Format); + wined3d_mode.scanline_ordering = mode->ScanLineOrdering; + } + wined3d_mutex_lock(); if (device->vertex_buffer) @@ -649,6 +656,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *if device->vertex_buffer = NULL; device->vertex_buffer_size = 0; } + if (device->index_buffer) { wined3d_buffer_decref(device->index_buffer); @@ -657,17 +665,27 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *if } wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); - hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, - NULL, reset_enum_callback, !device->d3d_parent->extended); - if (FAILED(hr) && !device->d3d_parent->extended) - device->device_state = D3D9_DEVICE_STATE_NOT_RESET; - else + if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, + mode ? &wined3d_mode : NULL, reset_enum_callback, !device->d3d_parent->extended))) device->device_state = D3D9_DEVICE_STATE_OK; + else if (!device->d3d_parent->extended) + device->device_state = D3D9_DEVICE_STATE_NOT_RESET; + wined3d_mutex_unlock(); return hr; } +static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *iface, + D3DPRESENT_PARAMETERS *present_parameters) +{ + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + + TRACE("iface %p, present_parameters %p.\n", iface, present_parameters); + + return d3d9_device_reset(device, present_parameters, NULL); +} + static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Present(IDirect3DDevice9Ex *iface, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region) { @@ -3253,42 +3271,10 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_ResetEx(IDirect3DDevice9Ex * D3DPRESENT_PARAMETERS *present_parameters, D3DDISPLAYMODEEX *mode) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - struct wined3d_swapchain_desc swapchain_desc; - struct wined3d_display_mode wined3d_mode; - HRESULT hr; TRACE("iface %p, present_parameters %p, mode %p.\n", iface, present_parameters, mode); - if (mode) - { - wined3d_mode.width = mode->Width; - wined3d_mode.height = mode->Height; - wined3d_mode.refresh_rate = mode->RefreshRate; - wined3d_mode.format_id = wined3dformat_from_d3dformat(mode->Format); - wined3d_mode.scanline_ordering = mode->ScanLineOrdering; - } - - wined3d_mutex_lock(); - - if (device->vertex_buffer) - { - wined3d_buffer_decref(device->vertex_buffer); - device->vertex_buffer = NULL; - device->vertex_buffer_size = 0; - } - if (device->index_buffer) - { - wined3d_buffer_decref(device->index_buffer); - device->index_buffer = NULL; - device->index_buffer_size = 0; - } - - wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); - hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, - mode ? &wined3d_mode : NULL, reset_enum_callback, FALSE); - wined3d_mutex_unlock(); - - return hr; + return d3d9_device_reset(device, present_parameters, mode); } static HRESULT WINAPI d3d9_device_GetDisplayModeEx(IDirect3DDevice9Ex *iface,

1 0

Henri Verbeet : d3d8/tests: Test D3DPRESENT_PARAMETERS after a successful reset.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: 549f7b8a9c321a919bee240ea1e013ed06a2d569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=549f7b8a9c321a919bee240ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 14 10:16:00 2015 +0200 d3d8/tests: Test D3DPRESENT_PARAMETERS after a successful reset. --- dlls/d3d8/tests/device.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 411f61a..92ec3d0 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1119,6 +1119,7 @@ static void test_reset(void) UINT height, orig_height = GetSystemMetrics(SM_CYSCREEN); IDirect3DDevice8 *device1 = NULL; IDirect3DDevice8 *device2 = NULL; + struct device_desc device_desc; D3DDISPLAYMODE d3ddm, d3ddm2; D3DSURFACE_DESC surface_desc; D3DPRESENT_PARAMETERS d3dpp; @@ -1202,20 +1203,13 @@ static void test_reset(void) i = 0; if (modes[i].w == orig_width && modes[i].h == orig_height) ++i; - memset(&d3dpp, 0, sizeof(d3dpp)); - d3dpp.Windowed = FALSE; - d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - d3dpp.BackBufferWidth = modes[i].w; - d3dpp.BackBufferHeight = modes[i].h; - d3dpp.BackBufferFormat = d3ddm.Format; - d3dpp.EnableAutoDepthStencil = TRUE; - d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; - - hr = IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device1); - if (FAILED(hr)) + device_desc.width = modes[i].w; + device_desc.height = modes[i].h; + device_desc.device_window = window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN | CREATE_DEVICE_SWVP_ONLY; + if (!(device1 = create_device(d3d8, window, &device_desc))) { - skip("Failed to create device, hr %#x.\n", hr); + skip("Failed to create a D3D device, skipping tests.\n"); goto cleanup; } hr = IDirect3DDevice8_TestCooperativeLevel(device1); @@ -1305,7 +1299,7 @@ static void test_reset(void) d3dpp.Windowed = TRUE; d3dpp.BackBufferWidth = 400; d3dpp.BackBufferHeight = 300; - d3dpp.BackBufferFormat = d3ddm.Format; + d3dpp.BackBufferFormat = D3DFMT_A8R8G8B8; hr = IDirect3DDevice8_Reset(device1, &d3dpp); ok(SUCCEEDED(hr), "Reset failed, hr %#x.\n", hr); hr = IDirect3DDevice8_TestCooperativeLevel(device1); @@ -1361,6 +1355,23 @@ static void test_reset(void) hr = IDirect3DDevice8_TestCooperativeLevel(device1); ok(SUCCEEDED(hr), "TestCooperativeLevel failed, hr %#x.\n", hr); + ok(!d3dpp.BackBufferWidth, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); + ok(!d3dpp.BackBufferHeight, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); + ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", + d3dpp.BackBufferFormat, d3ddm.Format); + todo_wine ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); + ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); + ok(d3dpp.SwapEffect == D3DSWAPEFFECT_DISCARD, "Got unexpected SwapEffect %#x.\n", d3dpp.SwapEffect); + ok(!d3dpp.hDeviceWindow, "Got unexpected hDeviceWindow %p.\n", d3dpp.hDeviceWindow); + ok(d3dpp.Windowed, "Got unexpected Windowed %#x.\n", d3dpp.Windowed); + ok(!d3dpp.EnableAutoDepthStencil, "Got unexpected EnableAutoDepthStencil %#x.\n", d3dpp.EnableAutoDepthStencil); + ok(!d3dpp.AutoDepthStencilFormat, "Got unexpected AutoDepthStencilFormat %#x.\n", d3dpp.AutoDepthStencilFormat); + ok(!d3dpp.Flags, "Got unexpected Flags %#x.\n", d3dpp.Flags); + ok(!d3dpp.FullScreen_RefreshRateInHz, "Got unexpected FullScreen_RefreshRateInHz %u.\n", + d3dpp.FullScreen_RefreshRateInHz); + ok(!d3dpp.FullScreen_PresentationInterval, "Got unexpected FullScreen_PresentationInterval %#x.\n", + d3dpp.FullScreen_PresentationInterval); + memset(&vp, 0, sizeof(vp)); hr = IDirect3DDevice8_GetViewport(device1, &vp); ok(SUCCEEDED(hr), "GetViewport failed, hr %#x.\n", hr); @@ -1378,6 +1389,9 @@ static void test_reset(void) ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); ok(hr == D3D_OK, "GetDesc failed, hr %#x.\n", hr); + ok(surface_desc.Format == d3ddm.Format, "Got unexpected Format %#x, expected %#x.\n", + surface_desc.Format, d3ddm.Format); + ok(!surface_desc.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); ok(surface_desc.Width == 200, "Back buffer width is %u, expected 200.\n", surface_desc.Width); ok(surface_desc.Height == 150, "Back buffer height is %u, expected 150.\n", surface_desc.Height); IDirect3DSurface8_Release(surface);

1 0

Henri Verbeet : d3d9/tests: Test D3DPRESENT_PARAMETERS after a successful reset.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: af438d451c1f529779acbce22107e6db40d93600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af438d451c1f529779acbce22… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 14 10:15:59 2015 +0200 d3d9/tests: Test D3DPRESENT_PARAMETERS after a successful reset. --- dlls/d3d9/tests/d3d9ex.c | 33 +++++++++++++ dlls/d3d9/tests/device.c | 125 +++++++++++++++++++++++++---------------------- 2 files changed, 100 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af438d451c1f529779acb…

1 0

Bruno Jesus : ws2_32/tests: Add one more SO_ERROR test.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: 383ed3ce9a98ff8fbd520dc418dbad68698fae23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=383ed3ce9a98ff8fbd520dc41… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Apr 14 02:02:08 2015 -0300 ws2_32/tests: Add one more SO_ERROR test. --- dlls/ws2_32/tests/sock.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c7b3ea7..aa06a08 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1387,6 +1387,16 @@ todo_wine err, WSAGetLastError()); closesocket(s); + /* Test with the closed socket */ + SetLastError(0xdeadbeef); + size = sizeof(i); + i = 1234; + err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); +todo_wine + ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAENOTSOCK), + "got %d with %d (expected SOCKET_ERROR with WSAENOTSOCK)\n", + err, WSAGetLastError()); + ok (i == 1234, "expected 1234, got %d\n", i); /* Test WS_IP_MULTICAST_TTL with 8, 16, 24 and 32 bits values */ s = socket(AF_INET, SOCK_DGRAM, 0);

1 0

Jacek Caban : mshtml: Increment ref count in QI(IID_HTMLPluginContainer) call.
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: 81c13caf375634d49dba699dd84e7bf172954297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c13caf375634d49dba699dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 13 13:26:26 2015 +0200 mshtml: Increment ref count in QI(IID_HTMLPluginContainer) call. --- dlls/mshtml/htmlobject.c | 2 ++ dlls/mshtml/script.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index e7dbe9a..2633f48 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -658,8 +658,10 @@ static HRESULT HTMLObjectElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) TRACE("(%p)->(IID_IHTMLObjectElement2 %p)\n", This, ppv); *ppv = &This->IHTMLObjectElement2_iface; }else if(IsEqualGUID(&IID_HTMLPluginContainer, riid)) { + /* Special pseudo-interface returning HTMLPluginContainse struct. */ TRACE("(%p)->(IID_HTMLPluginContainer %p)\n", This, ppv); *ppv = &This->plugin_container; + node_addref(&This->plugin_container.element.node); return S_OK; }else { HRESULT hres; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 757036c..4590854 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1509,8 +1509,11 @@ void bind_event_scripts(HTMLDocumentNode *doc) else bind_node_event(doc, event_target, target_node, event, event_disp); - if(target_node) + if(target_node) { IHTMLDOMNode_Release(&target_node->IHTMLDOMNode_iface); + if(plugin_container) + node_release(&plugin_container->element.node); + } } heap_free(event);

1 0

Joachim Priesner : wined3d: Load ModelView matrix for glLightfv calls.
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: 8fff427bc0cc13e5e081da7a90af8c660e667698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fff427bc0cc13e5e081da7a9… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Sat Apr 11 17:16:52 2015 +0200 wined3d: Load ModelView matrix for glLightfv calls. Analogous to the light() function in state.c, the correct ModelView matrix has to be loaded when glLightfv is called. --- dlls/wined3d/glsl_shader.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1a1b6b0..2422982 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7208,6 +7208,11 @@ void glsl_vertex_pipe_view(struct wined3d_context *context, const struct wined3d context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MODELVIEW; + /* Light settings are affected by the ModelView transform in OpenGL, the View transform in Direct3D. */ + gl_info->gl_ops.gl.p_glMatrixMode(GL_MODELVIEW); + gl_info->gl_ops.gl.p_glPushMatrix(); + gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_VIEW]._11); + for (k = 0; k < gl_info->limits.lights; ++k) { if (!(light = state->lights[k])) @@ -7218,6 +7223,8 @@ void glsl_vertex_pipe_view(struct wined3d_context *context, const struct wined3d checkGLcall("glLightfv dirn"); } + gl_info->gl_ops.gl.p_glPopMatrix(); + for (k = 0; k < gl_info->limits.clipplanes; ++k) { if (!isStateDirty(context, STATE_CLIPPLANE(k)))

1 0

Thomas Faber : mshtml: Remove nsIDOMWindowUtils:: SetCriticalDisplayPortForElement.
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: 3f63177204a68c4103d8f39ce4f70aea868cf769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f63177204a68c4103d8f39ce… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Apr 9 14:51:40 2015 +0200 mshtml: Remove nsIDOMWindowUtils::SetCriticalDisplayPortForElement. --- dlls/mshtml/nsiface.idl | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 054c308..7989e9a 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -2918,7 +2918,6 @@ interface nsIDOMWindowUtils : nsISupports nsresult SetDisplayPortMarginsForElement(float aLeftMargin, float aTopMargin, float aRightMargin, float aBottomMargin, uint32_t aAlignmentX, uint32_t aAlignmentY, nsIDOMElement *aElement, uint32_t aPriority); nsresult SetDisplayPortBaseForElement(int32_t aX, int32_t aY, int32_t aWidth, int32_t aHeight, nsIDOMElement *aElement); - nsresult SetCriticalDisplayPortForElement(float aXPx, float aYPx, float aWidthPx, float aHeightPx, nsIDOMElement *aElement); nsresult SetResolution(float aXResolution, float aYResolution); nsresult GetResolution(float *aXResolution, float *aYResolution); nsresult GetIsResolutionSet(bool *aIsResolutionSet);

1 0

Jacek Caban : mshtml: Use debugstr_mshtml_guid in object and embed element implementation.
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: b94dd24eafc524f2946f6ee3aede99f869800749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b94dd24eafc524f2946f6ee3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 13 13:26:32 2015 +0200 mshtml: Use debugstr_mshtml_guid in object and embed element implementation. --- dlls/mshtml/htmlembed.c | 5 ++--- dlls/mshtml/htmlobject.c | 7 ++----- dlls/mshtml/main.c | 2 ++ dlls/mshtml/pluginhost.c | 3 --- dlls/mshtml/pluginhost.h | 2 ++ 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlembed.c b/dlls/mshtml/htmlembed.c index a06f08e..54070ed 100644 --- a/dlls/mshtml/htmlembed.c +++ b/dlls/mshtml/htmlembed.c @@ -227,14 +227,13 @@ static HRESULT HTMLEmbedElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { HTMLEmbedElement *This = impl_from_HTMLDOMNode(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLEmbedElement_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLEmbedElement_iface; }else if(IsEqualGUID(&IID_IHTMLEmbedElement, riid)) { - TRACE("(%p)->(IID_IHTMLEmbedElement %p)\n", This, ppv); *ppv = &This->IHTMLEmbedElement_iface; }else { return HTMLElement_QI(&This->element.node, riid, ppv); diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 2633f48..0e2033e 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -645,21 +645,18 @@ static HRESULT HTMLObjectElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLObjectElement_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLObjectElement_iface; }else if(IsEqualGUID(&IID_IHTMLObjectElement, riid)) { - TRACE("(%p)->(IID_IHTMLObjectElement %p)\n", This, ppv); *ppv = &This->IHTMLObjectElement_iface; }else if(IsEqualGUID(&IID_IHTMLObjectElement2, riid)) { - TRACE("(%p)->(IID_IHTMLObjectElement2 %p)\n", This, ppv); *ppv = &This->IHTMLObjectElement2_iface; }else if(IsEqualGUID(&IID_HTMLPluginContainer, riid)) { /* Special pseudo-interface returning HTMLPluginContainse struct. */ - TRACE("(%p)->(IID_HTMLPluginContainer %p)\n", This, ppv); *ppv = &This->plugin_container; node_addref(&This->plugin_container.element.node); return S_OK; diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 8d9f1ac..8938f01e 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -42,6 +42,7 @@ #define INIT_GUID #include "mshtml_private.h" #include "resource.h" +#include "pluginhost.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -540,6 +541,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(DIID_HTMLDocumentEvents2); X(DIID_HTMLTableEvents); X(DIID_HTMLTextContainerEvents); + X(IID_HTMLPluginContainer); X(IID_IConnectionPoint); X(IID_IConnectionPointContainer); X(IID_ICustomDoc); diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index b6fcf72..7b1133d 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -37,9 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -const IID IID_HTMLPluginContainer = - {0xbd7a6050,0xb373,0x4f6f,{0xa4,0x93,0xdd,0x40,0xc5,0x23,0xa8,0x6a}}; - static BOOL check_load_safety(PluginHost *host) { DWORD policy_size, policy; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 0460c3c..5135c33 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -58,6 +58,8 @@ struct HTMLPluginContainer { DWORD props_len; }; +DEFINE_GUID(IID_HTMLPluginContainer, 0xbd7a6050,0xb373,0x4f6f,0xa4,0x93,0xdd,0x40,0xc5,0x23,0xa8,0x6a); + extern const IID IID_HTMLPluginContainer DECLSPEC_HIDDEN; HRESULT create_plugin_host(HTMLDocumentNode*,HTMLPluginContainer*) DECLSPEC_HIDDEN;

1 0

Julius Schwartzenberg : dwrite: Font search is case insensitive.
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: 20aee0673dcad26e86ae97d26447bc87977b9eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=20aee0673dcad26e86ae97d26… Author: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Fri Apr 10 21:08:31 2015 +0200 dwrite: Font search is case insensitive. --- dlls/dwrite/font.c | 2 +- dlls/dwrite/tests/font.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index fc067a5..c591f4e 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1431,7 +1431,7 @@ static UINT32 collection_find_family(struct dwrite_fontcollection *collection, c for (j = 0; j < IDWriteLocalizedStrings_GetCount(family_name); j++) { WCHAR buffer[255]; hr = IDWriteLocalizedStrings_GetString(family_name, j, buffer, 255); - if (SUCCEEDED(hr) && !strcmpW(buffer, name)) + if (SUCCEEDED(hr) && !strcmpiW(buffer, name)) return i; } } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 65d8bcb..126fba9 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -58,6 +58,8 @@ static inline BOOL heap_free(void *mem) static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; +static const WCHAR tahomaUppercaseW[] = {'T','A','H','O','M','A',0}; +static const WCHAR tahomaStrangecaseW[] = {'t','A','h','O','m','A',0}; static const WCHAR blahW[] = {'B','l','a','h','!',0}; static IDWriteFactory *create_factory(void) @@ -1376,6 +1378,20 @@ static void test_system_fontcollection(void) ok(ret, "got %d\n", ret); ok(i != (UINT32)-1, "got %u\n", i); + ret = FALSE; + i = (UINT32)-1; + hr = IDWriteFontCollection_FindFamilyName(collection, tahomaUppercaseW, &i, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret, "got %d\n", ret); + ok(i != (UINT32)-1, "got %u\n", i); + + ret = FALSE; + i = (UINT32)-1; + hr = IDWriteFontCollection_FindFamilyName(collection, tahomaStrangecaseW, &i, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret, "got %d\n", ret); + ok(i != (UINT32)-1, "got %u\n", i); + /* get back local file loader */ hr = IDWriteFontCollection_GetFontFamily(collection, i, &family); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Vincent Povirk : windowscodecs: Fix crash when PNG decoder is freed without successful init.
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: 27ae589d2aee548d06401153a2bdc5f9af98329d URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ae589d2aee548d06401153a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 10 11:39:34 2015 -0500 windowscodecs: Fix crash when PNG decoder is freed without successful init. --- dlls/windowscodecs/pngformat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 2aac560..f39b31a 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -442,7 +442,8 @@ static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) if (ref == 0) { - IStream_Release(This->stream); + if (This->stream) + IStream_Release(This->stream); if (This->png_ptr) ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); This->lock.DebugInfo->Spare[0] = 0; @@ -1218,6 +1219,7 @@ HRESULT PngDecoder_CreateInstance(REFIID iid, void** ppv) This->png_ptr = NULL; This->info_ptr = NULL; This->end_info = NULL; + This->stream = NULL; This->initialized = FALSE; This->image_bits = NULL; InitializeCriticalSection(&This->lock);

1 0

Bruno Jesus : ws2_32/tests: Add more select() tests.
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: 2da8f9a9dbc4b759b1deeb339a5856e44c876751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da8f9a9dbc4b759b1deeb339… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Apr 12 21:22:49 2015 -0300 ws2_32/tests: Add more select() tests. --- dlls/ws2_32/tests/sock.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8b69cf6..c7b3ea7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3368,6 +3368,14 @@ static DWORD WINAPI SelectReadThread(void *param) return 0; } +static DWORD WINAPI SelectCloseThread(void *param) +{ + SOCKET s = *(SOCKET*)param; + Sleep(500); + closesocket(s); + return 0; +} + static void test_errors(void) { SOCKET sock; @@ -3792,6 +3800,49 @@ static void test_select(void) ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); closesocket(fdWrite); + + /* Try select() on a closed socket after connection */ + ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + closesocket(fdRead); + FD_ZERO_ALL(); + FD_SET_ALL(fdWrite); + FD_SET_ALL(fdRead); + SetLastError(0xdeadbeef); + ret = select(0, &readfds, NULL, &exceptfds, &select_timeout); + ok(ret == SOCKET_ERROR, "expected 1, got %d\n", ret); +todo_wine + ok(GetLastError() == WSAENOTSOCK, "expected 10038, got %d\n", GetLastError()); + /* descriptor sets are unchanged */ + ok(readfds.fd_count == 2, "expected 2, got %d\n", readfds.fd_count); + ok(exceptfds.fd_count == 2, "expected 2, got %d\n", exceptfds.fd_count); + closesocket(fdWrite); + + /* Close the socket currently being selected in a thread - bug 38399 */ + ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + thread_handle = CreateThread(NULL, 0, SelectCloseThread, &fdWrite, 0, &id); + ok(thread_handle != NULL, "CreateThread failed unexpectedly: %d\n", GetLastError()); + FD_ZERO_ALL(); + FD_SET_ALL(fdWrite); + ret = select(0, &readfds, NULL, &exceptfds, &select_timeout); +todo_wine + ok(ret == 1, "expected 1, got %d\n", ret); + ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); + WaitForSingleObject (thread_handle, 1000); + closesocket(fdRead); + /* test again with only the except descriptor */ + ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + thread_handle = CreateThread(NULL, 0, SelectCloseThread, &fdWrite, 0, &id); + ok(thread_handle != NULL, "CreateThread failed unexpectedly: %d\n", GetLastError()); + FD_ZERO_ALL(); + FD_SET(fdWrite, &exceptfds); + SetLastError(0xdeadbeef); + ret = select(0, NULL, NULL, &exceptfds, &select_timeout); +todo_wine + ok(ret == SOCKET_ERROR, "expected 1, got %d\n", ret); +todo_wine + ok(GetLastError() == WSAENOTSOCK, "expected 10038, got %d\n", GetLastError()); + WaitForSingleObject (thread_handle, 1000); + closesocket(fdRead); } #undef FD_SET_ALL #undef FD_ZERO_ALL

1 0

Mark Harmstone : uxtheme: Fix typo making fonts italic.
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: 9f622f1fa6f34f81dd38cd5e7aef0865fe15666d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f622f1fa6f34f81dd38cd5e7… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Apr 11 20:12:04 2015 +0100 uxtheme: Fix typo making fonts italic. --- dlls/uxtheme/msstyles.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index b557314..e62b95d 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -1268,9 +1268,9 @@ static HRESULT MSSTYLES_GetFont (LPCWSTR lpCur, LPCWSTR lpEnd, pFont->lfCharSet = DEFAULT_CHARSET; while(MSSTYLES_GetNextToken(lpCur, lpEnd, &lpCur, attr, sizeof(attr)/sizeof(attr[0]))) { if(!lstrcmpiW(szBold, attr)) pFont->lfWeight = FW_BOLD; - else if(!!lstrcmpiW(szItalic, attr)) pFont->lfItalic = TRUE; - else if(!!lstrcmpiW(szUnderline, attr)) pFont->lfUnderline = TRUE; - else if(!!lstrcmpiW(szStrikeOut, attr)) pFont->lfStrikeOut = TRUE; + else if(!lstrcmpiW(szItalic, attr)) pFont->lfItalic = TRUE; + else if(!lstrcmpiW(szUnderline, attr)) pFont->lfUnderline = TRUE; + else if(!lstrcmpiW(szStrikeOut, attr)) pFont->lfStrikeOut = TRUE; } *lpValEnd = lpCur; return S_OK;

1 0

Nikolay Sivov : oleaut32/tests: Skip cache tests if it's disabled.
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: 444bc3556d57ac5b456e0ac7f245c08ee4939443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=444bc3556d57ac5b456e0ac7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 11 18:28:37 2015 +0300 oleaut32/tests: Skip cache tests if it's disabled. --- dlls/oleaut32/tests/vartype.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 774aee2..4dd77a0 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -6318,6 +6318,11 @@ static void test_bstr_cache(void) static const WCHAR testW[] = {'t','e','s','t',0}; + if (GetEnvironmentVariableA("OANOCACHE", NULL, 0)) { + skip("BSTR cache is disabled, some tests will be skipped.\n"); + return; + } + str = SysAllocString(testW); /* This should put the string into cache */ SysFreeString(str);

1 0

Nikolay Sivov : winealsa: Fix a leak of a silence buffer (Valgrind).
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: 8095210d2c60226743087de4d6c5561f8ac62248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8095210d2c60226743087de4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 11 10:34:18 2015 +0300 winealsa: Fix a leak of a silence buffer (Valgrind). --- dlls/winealsa.drv/mmdevdrv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index f0ce3a9..90894b6 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -923,6 +923,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) HeapFree(GetProcessHeap(), 0, This->vols); HeapFree(GetProcessHeap(), 0, This->local_buffer); HeapFree(GetProcessHeap(), 0, This->remapping_buf); + HeapFree(GetProcessHeap(), 0, This->silence_buf); HeapFree(GetProcessHeap(), 0, This->tmp_buffer); HeapFree(GetProcessHeap(), 0, This->hw_params); CoTaskMemFree(This->fmt);

1 0

Andrew Eikum : shell32: Add more knownfolders.
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: 96971ea36db9daf7e06b4551640a8551dcdb45d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96971ea36db9daf7e06b45516… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 10 13:10:48 2015 -0500 shell32: Add more knownfolders. --- dlls/shell32/shellpath.c | 250 ++++++++++++++++++++++++++++++++++++++--- dlls/shell32/tests/shellpath.c | 28 ++--- 2 files changed, 247 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96971ea36db9daf7e06b4…

1 0

Mark Harmstone : uxtheme: Free properties when theme file closed.
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: 7aae2d2eae5157f0fb40ace1a93a8634672d23cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aae2d2eae5157f0fb40ace1a… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Apr 11 18:51:34 2015 +0100 uxtheme: Free properties when theme file closed. --- dlls/uxtheme/msstyles.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 780751b..b557314 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -209,6 +209,13 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) tf->classes = pcls->next; while(pcls->partstate) { PTHEME_PARTSTATE ps = pcls->partstate; + + while(ps->properties) { + PTHEME_PROPERTY prop = ps->properties; + ps->properties = prop->next; + HeapFree(GetProcessHeap(), 0, prop); + } + pcls->partstate = ps->next; HeapFree(GetProcessHeap(), 0, ps); }

1 0

Nikolay Sivov : mmdevapi: Fix returned format leak (Valgrind).
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: f4096a30eac7e1344baba96c36a15a826ff469a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4096a30eac7e1344baba96c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 11 10:46:32 2015 +0300 mmdevapi: Fix returned format leak (Valgrind). --- dlls/mmdevapi/devenum.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 1a5bf00..d612ec0 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -485,6 +485,7 @@ static HRESULT set_format(MMDevice *dev) &PKEY_AudioEngine_DeviceFormat, &pv); MMDevice_SetPropValue(&dev->devguid, dev->flow, &PKEY_AudioEngine_OEMFormat, &pv); + CoTaskMemFree(fmt); return S_OK; }

1 0

Nikolay Sivov : scrrun: Fix iterating through per-bucket pair list ( Valgrind).
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: 8ff3ab8503de51c8c4bd1b10c3e9c19ce181d352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ff3ab8503de51c8c4bd1b10c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 11 09:58:48 2015 +0300 scrrun: Fix iterating through per-bucket pair list (Valgrind). --- dlls/scrrun/dictionary.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 631d0b0..844b4d1 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -154,10 +154,11 @@ static struct keyitem_pair *get_keyitem_pair(dictionary *dict, VARIANT *key) if (FAILED(hr)) return NULL; - entry = head = get_bucket_head(dict, V_I4(&hash)); + head = get_bucket_head(dict, V_I4(&hash)); if (!head->next || list_empty(head)) return NULL; + entry = list_head(head); do { pair = LIST_ENTRY(entry, struct keyitem_pair, bucket); if (is_matching_key(dict, pair, key, V_I4(&hash))) return pair;

1 0

Nikolay Sivov : shlwapi/tests: Fix uninitialized memory reads (Valgrind).
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: d6180c05b5a6fd3f0f5eae897c00d30527dc4ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6180c05b5a6fd3f0f5eae897… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 11 12:05:25 2015 +0300 shlwapi/tests: Fix uninitialized memory reads (Valgrind). --- dlls/shlwapi/tests/path.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 7ffa000..84b3f4d 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -183,13 +183,18 @@ static const struct { /* ################ */ -static LPWSTR GetWideString(const char* szString) +static LPWSTR GetWideString(const char *src) { - LPWSTR wszString = HeapAlloc(GetProcessHeap(), 0, (2*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR)); - - MultiByteToWideChar(CP_ACP, 0, szString, -1, wszString, INTERNET_MAX_URL_LENGTH); + WCHAR *ret; - return wszString; + if (!src) + return NULL; + + ret = HeapAlloc(GetProcessHeap(), 0, (2*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR)); + + MultiByteToWideChar(CP_ACP, 0, src, -1, ret, INTERNET_MAX_URL_LENGTH); + + return ret; } static void FreeWideString(LPWSTR wszString)

1 0

Nikolay Sivov : rpcrt4/tests: Fix a minor leak (Valgrind).
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: 4cf70b1418260fda95d69bcb50374a64f1ce895b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cf70b1418260fda95d69bcb5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 11 11:01:09 2015 +0300 rpcrt4/tests: Fix a minor leak (Valgrind). --- dlls/rpcrt4/tests/ndr_marshall.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 315a452..917c9e5 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1590,6 +1590,7 @@ todo_wine { "mem not pointing at buffer %p/%p\n", mem, StubMsg.BufferStart + 12 ); ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); } + HeapFree(GetProcessHeap(), 0, mem_orig); my_alloc_called = 0; mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(memsrc));

1 0

Francois Gouget : windowscodecs/tests: Fix compilation on systems that don 't support nameless unions.
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: af4324e4330c92b41e6fed20f918d4da627f0258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4324e4330c92b41e6fed20f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 11 16:28:19 2015 +0200 windowscodecs/tests: Fix compilation on systems that don't support nameless unions. --- dlls/windowscodecs/tests/metadata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 1818b26..6c2d6b7 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -451,7 +451,7 @@ static void test_metadata_gAMA(void) PropVariantClear(&id); ok(value.vt == VT_UI4, "unexpected vt: %i\n", value.vt); - ok(value.ulVal == 33333, "unexpected value: %u\n", value.ulVal); + ok(U(value).ulVal == 33333, "unexpected value: %u\n", U(value).ulVal); PropVariantClear(&value); IWICMetadataReader_Release(reader);

1 0

Hans Leidekker : msi: Add support for patching global assembly files.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: dc2228305c821897091836b4d9593551a5ff9a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc2228305c821897091836b4d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:59:01 2015 +0200 msi: Add support for patching global assembly files. --- dlls/msi/assembly.c | 71 ++++++++++++++++++++++++++++++++- dlls/msi/files.c | 110 ++++++++++++++++++++++++++++++++++++++++++---------- dlls/msi/msipriv.h | 2 + 3 files changed, 161 insertions(+), 22 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index a25b19d..7151a8b 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -38,6 +38,8 @@ static HRESULT (WINAPI *pCreateAssemblyCacheNet40)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheSxs)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); static HRESULT (WINAPI *pGetFileVersion)( LPCWSTR, LPWSTR, DWORD, DWORD * ); +static HRESULT (WINAPI *pCreateAssemblyNameObject)( IAssemblyName **, LPCWSTR, DWORD, LPVOID ); +static HRESULT (WINAPI *pCreateAssemblyEnum)( IAssemblyEnum **, IUnknown *, IAssemblyName *, DWORD, LPVOID ); static HMODULE hfusion10, hfusion11, hfusion20, hfusion40, hmscoree, hsxs; @@ -79,8 +81,11 @@ static BOOL init_function_pointers( void ) pCreateAssemblyCacheNet20 = (void *)GetProcAddress( hfusion20, "CreateAssemblyCache" ); if (!pLoadLibraryShim( szFusion, szVersion40, NULL, &hfusion40 )) + { pCreateAssemblyCacheNet40 = (void *)GetProcAddress( hfusion40, "CreateAssemblyCache" ); - + pCreateAssemblyNameObject = (void *)GetProcAddress( hfusion40, "CreateAssemblyNameObject" ); + pCreateAssemblyEnum = (void *)GetProcAddress( hfusion40, "CreateAssemblyEnum" ); + } return TRUE; } @@ -259,6 +264,70 @@ static BOOL is_assembly_installed( IAssemblyCache *cache, const WCHAR *display_n return FALSE; } +WCHAR *msi_get_assembly_path( MSIPACKAGE *package, const WCHAR *displayname ) +{ + HRESULT hr; + ASSEMBLY_INFO info; + IAssemblyCache *cache = package->cache_net[CLR_VERSION_V40]; + + if (!cache) return NULL; + + memset( &info, 0, sizeof(info) ); + info.cbAssemblyInfo = sizeof(info); + hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, displayname, &info ); + if (hr != E_NOT_SUFFICIENT_BUFFER) return NULL; + + if (!(info.pszCurrentAssemblyPathBuf = msi_alloc( info.cchBuf * sizeof(WCHAR) ))) return NULL; + + hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, displayname, &info ); + if (FAILED( hr )) + { + msi_free( info.pszCurrentAssemblyPathBuf ); + return NULL; + } + TRACE("returning %s\n", debugstr_w(info.pszCurrentAssemblyPathBuf)); + return info.pszCurrentAssemblyPathBuf; +} + +IAssemblyEnum *msi_create_assembly_enum( MSIPACKAGE *package, const WCHAR *displayname ) +{ + HRESULT hr; + IAssemblyName *name; + IAssemblyEnum *ret; + WCHAR *str; + UINT len = 0; + + if (!pCreateAssemblyNameObject || !pCreateAssemblyEnum) return NULL; + + hr = pCreateAssemblyNameObject( &name, displayname, CANOF_PARSE_DISPLAY_NAME, NULL ); + if (FAILED( hr )) return NULL; + + hr = IAssemblyName_GetName( name, &len, NULL ); + if (hr != E_NOT_SUFFICIENT_BUFFER || !(str = msi_alloc( len * sizeof(WCHAR) ))) + { + IAssemblyName_Release( name ); + return NULL; + } + + hr = IAssemblyName_GetName( name, &len, str ); + IAssemblyName_Release( name ); + if (FAILED( hr )) + { + msi_free( str ); + return NULL; + } + + hr = pCreateAssemblyNameObject( &name, str, 0, NULL ); + msi_free( str ); + if (FAILED( hr )) return NULL; + + hr = pCreateAssemblyEnum( &ret, NULL, name, ASM_CACHE_GAC, NULL ); + IAssemblyName_Release( name ); + if (FAILED( hr )) return NULL; + + return ret; +} + static const WCHAR clr_version_v10[] = {'v','1','.','0','.','3','7','0','5',0}; static const WCHAR clr_version_v11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR clr_version_v20[] = {'v','2','.','0','.','5','0','7','2','7',0}; diff --git a/dlls/msi/files.c b/dlls/msi/files.c index ca758dd..26e4cb1 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -32,6 +32,8 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -493,6 +495,78 @@ static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, return TRUE; } +static UINT patch_file( MSIPACKAGE *package, MSIFILEPATCH *patch ) +{ + UINT r = ERROR_SUCCESS; + WCHAR *tmpfile = msi_create_temp_file( package->db ); + + if (!tmpfile) return ERROR_INSTALL_FAILURE; + if (ApplyPatchToFileW( patch->path, patch->File->TargetPath, tmpfile, 0 )) + { + DeleteFileW( patch->File->TargetPath ); + MoveFileW( tmpfile, patch->File->TargetPath ); + } + else + { + WARN("failed to patch %s: %08x\n", debugstr_w(patch->File->TargetPath), GetLastError()); + r = ERROR_INSTALL_FAILURE; + } + DeleteFileW( patch->path ); + DeleteFileW( tmpfile ); + msi_free( tmpfile ); + return r; +} + +static UINT patch_assembly( MSIPACKAGE *package, MSIASSEMBLY *assembly, MSIFILEPATCH *patch ) +{ + UINT r = ERROR_FUNCTION_FAILED; + IAssemblyName *name; + IAssemblyEnum *iter; + + if (!(iter = msi_create_assembly_enum( package, assembly->display_name ))) + return ERROR_FUNCTION_FAILED; + + while ((IAssemblyEnum_GetNextAssembly( iter, NULL, &name, 0 ) == S_OK)) + { + WCHAR *displayname, *path; + UINT len = 0; + HRESULT hr; + + hr = IAssemblyName_GetDisplayName( name, NULL, &len, 0 ); + if (hr != E_NOT_SUFFICIENT_BUFFER || !(displayname = msi_alloc( len * sizeof(WCHAR) ))) + break; + + hr = IAssemblyName_GetDisplayName( name, displayname, &len, 0 ); + if (FAILED( hr )) + { + msi_free( displayname ); + break; + } + + if ((path = msi_get_assembly_path( package, displayname ))) + { + if (!CopyFileW( path, patch->File->TargetPath, FALSE )) + { + ERR("Failed to copy file %s -> %s (%u)\n", debugstr_w(path), + debugstr_w(patch->File->TargetPath), GetLastError() ); + msi_free( path ); + msi_free( displayname ); + IAssemblyName_Release( name ); + break; + } + r = patch_file( package, patch ); + msi_free( path ); + } + + msi_free( displayname ); + IAssemblyName_Release( name ); + if (r == ERROR_SUCCESS) break; + } + + IAssemblyEnum_Release( iter ); + return r; +} + UINT ACTION_PatchFiles( MSIPACKAGE *package ) { MSIFILEPATCH *patch; @@ -549,34 +623,28 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) { - WCHAR *tmpfile; - BOOL ret; + MSICOMPONENT *comp = patch->File->Component; if (!patch->path) continue; - if (!(tmpfile = msi_create_temp_file( package->db ))) - { - rc = ERROR_INSTALL_FAILURE; - goto done; - } - ret = ApplyPatchToFileW( patch->path, patch->File->TargetPath, tmpfile, 0 ); - if (ret) - { - DeleteFileW( patch->File->TargetPath ); - MoveFileW( tmpfile, patch->File->TargetPath ); - } + if (msi_is_global_assembly( comp )) + rc = patch_assembly( package, comp->assembly, patch ); else - WARN("failed to patch %s: %08x\n", debugstr_w(patch->File->TargetPath), GetLastError()); - - DeleteFileW( patch->path ); - DeleteFileW( tmpfile ); - msi_free( tmpfile ); + rc = patch_file( package, patch ); - if (!ret && !(patch->Attributes & msidbPatchAttributesNonVital)) + if (rc && !(patch->Attributes & msidbPatchAttributesNonVital)) { ERR("Failed to apply patch to file: %s\n", debugstr_w(patch->File->File)); - rc = ERROR_INSTALL_FAILURE; - goto done; + break; + } + + if (msi_is_global_assembly( comp )) + { + if ((rc = msi_install_assembly( package, comp ))) + { + ERR("Failed to install patched assembly\n"); + break; + } } } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 9bec75f..d457a54 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1042,6 +1042,8 @@ extern UINT msi_uninstall_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN extern BOOL msi_init_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern void msi_destroy_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern BOOL msi_is_global_assembly(MSICOMPONENT *) DECLSPEC_HIDDEN; +extern IAssemblyEnum *msi_create_assembly_enum(MSIPACKAGE *, const WCHAR *) DECLSPEC_HIDDEN; +extern WCHAR *msi_get_assembly_path(MSIPACKAGE *, const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR *msi_font_version_from_file(const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR **msi_split_string(const WCHAR *, WCHAR) DECLSPEC_HIDDEN; extern UINT msi_set_original_database_property(MSIDATABASE *, const WCHAR *) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msi: Don' t read past the end of the patch list in MsiApplyMultiplePatchesW.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 17b80c8ec00bba070972eefb8c9f9eafbc810034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b80c8ec00bba070972eefb8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:57:40 2015 +0200 msi: Don't read past the end of the patch list in MsiApplyMultiplePatchesW. --- dlls/msi/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 9dc30be..2c476fa 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -487,7 +487,7 @@ UINT WINAPI MsiApplyMultiplePatchesW(LPCWSTR szPatchPackages, r = MSI_ApplyPatchW(patch, szProductCode, szPropertiesList); msi_free(patch); - if (r != ERROR_SUCCESS) + if (r != ERROR_SUCCESS || !*end) break; beg = ++end;

1 0

Hans Leidekker : fusion: Fix insufficient buffer size handling in IAssemblyName::GetDisplayName.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 2eda884bd70c48605a2a857ebe7cb1c7f7ab4948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eda884bd70c48605a2a857eb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:57:15 2015 +0200 fusion: Fix insufficient buffer size handling in IAssemblyName::GetDisplayName. --- dlls/fusion/asmname.c | 16 ++++++++++------ dlls/fusion/tests/asmname.c | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index c417a23..f7a9452 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -228,12 +228,10 @@ static HRESULT WINAPI IAssemblyNameImpl_GetDisplayName(IAssemblyName *iface, LPDWORD pccDisplayName, DWORD dwDisplayFlags) { + static const WCHAR equals[] = {'=',0}; IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); - WCHAR verstr[30]; + WCHAR verstr[30], *cultureval = NULL; DWORD size; - LPWSTR cultureval = 0; - - static const WCHAR equals[] = {'=',0}; TRACE("(%p, %p, %p, %d)\n", iface, szDisplayName, pccDisplayName, dwDisplayFlags); @@ -243,9 +241,15 @@ static HRESULT WINAPI IAssemblyNameImpl_GetDisplayName(IAssemblyName *iface, if (!name->displayname || !*name->displayname) return FUSION_E_INVALID_NAME; - size = min(*pccDisplayName, lstrlenW(name->displayname) + 1); + size = strlenW(name->displayname) + 1; + + if (*pccDisplayName < size) + { + *pccDisplayName = size; + return E_NOT_SUFFICIENT_BUFFER; + } - lstrcpynW(szDisplayName, name->displayname, size); + if (szDisplayName) strcpyW(szDisplayName, name->displayname); *pccDisplayName = size; return S_OK; diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 68309f2..e415c3a9 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -508,6 +508,23 @@ static void test_CreateAssemblyNameObject(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(name != NULL, "Expected non-NULL name\n"); + size = 0; + hr = IAssemblyName_GetDisplayName(name, NULL, &size, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(size == 5, "got %u\n", size); + + size = 3; + hr = IAssemblyName_GetDisplayName(name, NULL, &size, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER || broken(hr == E_INVALIDARG), "got %08x\n", hr); + ok(size == 5 || broken(size == 3), "got %u\n", size); + + size = 3; + str[0] = 'a'; + hr = IAssemblyName_GetDisplayName(name, str, &size, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(str[0] == 'a', "got %c\n", str[0]); + ok(size == 5, "got %u\n", size); + size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);

1 0

Stefan Dösinger : wined3d: Move alpha test states to the fragment pipeline.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 5c7707dc775235ec98ada59dc196c33ca2000600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c7707dc775235ec98ada59dc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:16 2015 +0200 wined3d: Move alpha test states to the fragment pipeline. This will allow some color keying cleanups. For Core Contexts we'll have to emulate alpha testing in shaders anyway. --- dlls/wined3d/arb_program_shader.c | 4 ++++ dlls/wined3d/ati_fragment_shader.c | 4 ++++ dlls/wined3d/glsl_shader.c | 4 ++++ dlls/wined3d/nvidia_texture_shader.c | 4 ++++ dlls/wined3d/state.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 2 ++ 6 files changed, 25 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c7707dc775235ec98ada…

1 0

Hans Leidekker : msi: Assume that file patches from registered MSI patches have already been applied.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: d263c91ce28b39102770c03d65ecab0d71a97e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d263c91ce28b39102770c03d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:58:26 2015 +0200 msi: Assume that file patches from registered MSI patches have already been applied. --- dlls/msi/files.c | 14 +++++++++++++- dlls/msi/msipriv.h | 1 + dlls/msi/patch.c | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 3116754..ca758dd 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -448,6 +448,17 @@ static MSIFILEPATCH *find_filepatch( MSIPACKAGE *package, UINT disk_id, const WC return NULL; } +static BOOL is_registered_patch_media( MSIPACKAGE *package, UINT disk_id ) +{ + MSIPATCHINFO *patch; + + LIST_FOR_EACH_ENTRY( patch, &package->patches, MSIPATCHINFO, entry ) + { + if (patch->disk_id == disk_id && patch->registered) return TRUE; + } + return FALSE; +} + static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) { @@ -457,7 +468,8 @@ static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, { MSICOMPONENT *comp; - if (!(patch = find_filepatch( package, patch->disk_id, file ))) return FALSE; + if (is_registered_patch_media( package, patch->disk_id ) || + !(patch = find_filepatch( package, patch->disk_id, file ))) return FALSE; comp = patch->File->Component; comp->Action = msi_get_component_action( package, comp ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5a8c24f..9bec75f 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -193,6 +193,7 @@ typedef struct tagMSIPATCHINFO LPWSTR localfile; MSIPATCHSTATE state; BOOL delete_on_close; + BOOL registered; UINT disk_id; } MSIPATCHINFO; diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index b7bf2ef..5456359 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -918,6 +918,7 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, const WCHAR *file ) goto done; r = ERROR_OUTOFMEMORY; + patch->registered = FALSE; if (!(patch->filename = strdupW( file ))) goto done; if (!(patch->localfile = strdupW( localfile ))) goto done; @@ -1034,6 +1035,7 @@ UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) msiobj_release( &patch_db->hdr ); return r; } + patch_info->registered = TRUE; patch_info->localfile = strdupW( patch_file ); if (!patch_info->localfile) {

1 0

Hans Leidekker : msi: Take the component action into account for file patches.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: e4fd6265ebc18a152b4c24f0bd7c8d44ad8ace16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4fd6265ebc18a152b4c24f0b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:58:01 2015 +0200 msi: Take the component action into account for file patches. --- dlls/msi/files.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index d1e3ecf..3116754 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -455,8 +455,19 @@ static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, if (action == MSICABEXTRACT_BEGINEXTRACT) { + MSICOMPONENT *comp; + if (!(patch = find_filepatch( package, patch->disk_id, file ))) return FALSE; + comp = patch->File->Component; + comp->Action = msi_get_component_action( package, comp ); + if (!comp->Enabled || comp->Action != INSTALLSTATE_LOCAL) + { + TRACE("file %s component %s not installed or disabled\n", + debugstr_w(patch->File->File), debugstr_w(comp->Component)); + return FALSE; + } + patch->path = msi_create_temp_file( package->db ); *path = strdupW( patch->path ); *attrs = patch->File->Attributes;

1 0

Stefan Dösinger : wined3d: Simplify alpha test and color keying in GLSL.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: c5c713721285282c1ed466d287435a88b7b533ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5c713721285282c1ed466d28… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:17 2015 +0200 wined3d: Simplify alpha test and color keying in GLSL. --- dlls/wined3d/glsl_shader.c | 35 +++++++++++++++++++++++++++++++++-- dlls/wined3d/state.c | 3 --- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c67243f..1a1b6b0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7572,6 +7572,37 @@ static void glsl_fragment_pipe_invalidate_constants(struct wined3d_context *cont context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; } +static void glsl_fragment_pipe_alpha_test(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + int glParm; + float ref; + + TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + + if (state->render_states[WINED3D_RS_ALPHATESTENABLE]) + { + gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); + checkGLcall("glEnable GL_ALPHA_TEST"); + } + else + { + gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); + checkGLcall("glDisable GL_ALPHA_TEST"); + return; + } + + ref = ((float)state->render_states[WINED3D_RS_ALPHAREF]) / 255.0f; + glParm = wined3d_gl_compare_func(state->render_states[WINED3D_RS_ALPHAFUNC]); + + if (glParm) + { + gl_info->gl_ops.gl.p_glAlphaFunc(glParm, ref); + checkGLcall("glAlphaFunc"); + } +} + static const struct StateEntryTemplate glsl_fragment_pipe_state_template[] = { {STATE_VDECL, {STATE_VDECL, glsl_fragment_pipe_vdecl }, WINED3D_GL_EXT_NONE }, @@ -7651,8 +7682,8 @@ static const struct StateEntryTemplate glsl_fragment_pipe_state_template[] = {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), glsl_fragment_pipe_shader }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_ALPHAFUNC), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_ALPHAREF), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), state_alpha_test }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_COLORKEYENABLE), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), glsl_fragment_pipe_alpha_test }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_COLORKEYENABLE), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGENABLE), {STATE_RENDER(WINED3D_RS_FOGENABLE), glsl_fragment_pipe_fog }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGTABLEMODE), {STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGVERTEXMODE), {STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index edf1e71..b3ac4f1 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -528,9 +528,6 @@ void state_alpha_test(struct wined3d_context *context, const struct wined3d_stat context_apply_state(context, state, STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_OP)); context->last_was_ckey = enable_ckey; - if (context->d3d_info->shader_color_key) - enable_ckey = FALSE; - if (state->render_states[WINED3D_RS_ALPHATESTENABLE] || (state->render_states[WINED3D_RS_COLORKEYENABLE] && enable_ckey)) {

1 0

Hans Leidekker : fusion: Support buffer size queries in IAssemblyName:: GetName.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 382b72d729cdd3e5f61e924b9cfff2bab332b98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=382b72d729cdd3e5f61e924b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:56:48 2015 +0200 fusion: Support buffer size queries in IAssemblyName::GetName. --- dlls/fusion/asmname.c | 19 ++++++++++++------- dlls/fusion/tests/asmname.c | 35 +++++++++++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index f892f2b..c417a23 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -369,19 +369,24 @@ static HRESULT WINAPI IAssemblyNameImpl_GetName(IAssemblyName *iface, WCHAR *pwzName) { IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); + DWORD len; TRACE("(%p, %p, %p)\n", iface, lpcwBuffer, pwzName); - if (!name->name) + if (name->name) + len = strlenW(name->name) + 1; + else + len = 0; + + if (*lpcwBuffer < len) { - *pwzName = '\0'; - *lpcwBuffer = 0; - return S_OK; + *lpcwBuffer = len; + return E_NOT_SUFFICIENT_BUFFER; } + if (!name->name) lpcwBuffer[0] = 0; + else strcpyW(pwzName, name->name); - lstrcpyW(pwzName, name->name); - *lpcwBuffer = lstrlenW(pwzName) + 1; - + *lpcwBuffer = len; return S_OK; } diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index a075288..68309f2 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -421,12 +421,12 @@ static void test_CreateAssemblyNameObject(void) broken(hr == E_INVALIDARG), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); + str[0] = 'a'; size = MAX_PATH; - str[0] = '\0'; hr = IAssemblyName_GetName(name, &size, str); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!str[0], "Expected empty name\n"); - ok(size == 0, "Expected 0, got %d\n", size); + ok(hr == S_OK, "got %08x\n", hr); + ok(str[0] == 'a', "got %c\n", str[0]); + ok(!size, "got %u\n", size); hi = 0xbeefcace; lo = 0xcafebabe; @@ -457,6 +457,26 @@ static void test_CreateAssemblyNameObject(void) broken(hr == S_OK), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); + size = 0; + hr = IAssemblyName_GetName(name, &size, NULL); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(size == 1, "got %u\n", size); + + if (0) /* crash */ + { + str[0] = '\0'; + hr = IAssemblyName_GetName(name, NULL, str); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(!str[0], "got %c\n", str[0]); + } + + size = 0; + str[0] = '\0'; + hr = IAssemblyName_GetName(name, &size, str); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(!str[0], "got %c\n", str[0]); + ok(size == 1, "got %u\n", size); + size = MAX_PATH; str[0] = '\0'; hr = IAssemblyName_GetName(name, &size, str); @@ -494,6 +514,13 @@ static void test_CreateAssemblyNameObject(void) ok_aw("wine", str); ok(size == 5, "Expected 5, got %d\n", size); + size = 0; + str[0] = 0; + hr = IAssemblyName_GetName(name, &size, str); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(!str[0], "got %c\n", str[0]); + ok(size == 5, "got %u\n", size); + size = MAX_PATH; str[0] = '\0'; hr = IAssemblyName_GetName(name, &size, str);

1 0

Stefan Dösinger : wined3d: Match blitter and fragment processing color keying capabilities.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: f4b6874491df5b4d89012231cd9e7813c7d0e105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b6874491df5b4d89012231c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:15 2015 +0200 wined3d: Match blitter and fragment processing color keying capabilities. This is necessary if e.g. the nvts or ffp fragment processing pipeline is selected for debugging purposes on a GPU that otherwise supports the ARB program blitter. --- dlls/wined3d/arb_program_shader.c | 11 +++++++++-- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/surface.c | 22 +++++++++++++++------- dlls/wined3d/utils.c | 5 +++-- dlls/wined3d/wined3d_private.h | 6 ++++-- 5 files changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5d7d975..e7c5ea2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7716,7 +7716,8 @@ static void arbfp_blit_unset(const struct wined3d_gl_info *gl_info) checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); } -static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { @@ -7727,8 +7728,14 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum win switch (blit_op) { - case WINED3D_BLIT_OP_COLOR_BLIT: case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: + if (!d3d_info->shader_color_key) + { + /* The conversion modifies the alpha channel so the color key might no longer match. */ + TRACE("Color keying not supported with converted textures.\n"); + return FALSE; + } + case WINED3D_BLIT_OP_COLOR_BLIT: break; default: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1539476..01048fd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4378,7 +4378,8 @@ static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, if (CheckDepthStencilCapability(adapter, adapter_format, check_format)) return TRUE; /* If opengl can't process the format natively, the blitter may be able to convert it */ - if (adapter->blitter->blit_supported(&adapter->gl_info, WINED3D_BLIT_OP_COLOR_BLIT, + if (adapter->blitter->blit_supported(&adapter->gl_info, &adapter->d3d_info, + WINED3D_BLIT_OP_COLOR_BLIT, NULL, WINED3D_POOL_DEFAULT, 0, check_format, NULL, WINED3D_POOL_DEFAULT, 0, adapter_format)) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5bcbfd4..5094af3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1050,7 +1050,7 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const struct wined3d_device *device = resource->device; const struct blit_shader *blitter; - blitter = wined3d_select_blitter(&device->adapter->gl_info, WINED3D_BLIT_OP_DEPTH_FILL, + blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, WINED3D_BLIT_OP_DEPTH_FILL, NULL, 0, 0, NULL, rect, resource->usage, resource->pool, resource->format); if (!blitter) { @@ -3445,7 +3445,7 @@ HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const st struct wined3d_device *device = s->resource.device; const struct blit_shader *blitter; - blitter = wined3d_select_blitter(&device->adapter->gl_info, WINED3D_BLIT_OP_COLOR_FILL, + blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, WINED3D_BLIT_OP_COLOR_FILL, NULL, 0, 0, NULL, rect, s->resource.usage, s->resource.pool, s->resource.format); if (!blitter) { @@ -3463,6 +3463,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE struct wined3d_device *device = dst_surface->resource.device; const struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(device->fb.render_targets[0]); const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_swapchain *src_swapchain, *dst_swapchain; TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, blt_fx %p, filter %s.\n", @@ -3591,7 +3592,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface); - if (!device->blitter->blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, + if (!device->blitter->blit_supported(gl_info, d3d_info, WINED3D_BLIT_OP_COLOR_BLIT, src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) { @@ -4318,14 +4319,20 @@ static void ffp_blit_unset(const struct wined3d_gl_info *gl_info) } } -static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { switch (blit_op) { - case WINED3D_BLIT_OP_COLOR_BLIT: case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: + if (d3d_info->shader_color_key) + { + TRACE("Color keying requires converted textures.\n"); + return FALSE; + } + case WINED3D_BLIT_OP_COLOR_BLIT: if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) return FALSE; @@ -4447,7 +4454,8 @@ static void cpu_blit_unset(const struct wined3d_gl_info *gl_info) { } -static BOOL cpu_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +static BOOL cpu_blit_supported(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { @@ -5367,7 +5375,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC return WINED3D_OK; } - if (arbfp_blit.blit_supported(&device->adapter->gl_info, blit_op, + if (arbfp_blit.blit_supported(&device->adapter->gl_info, &device->adapter->d3d_info, blit_op, &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4d9f88a..2f21b29 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4194,7 +4194,8 @@ const struct wine_rb_functions wined3d_ffp_vertex_program_rb_functions = wined3d_ffp_vertex_program_key_compare, }; -const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { @@ -4208,7 +4209,7 @@ const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *g for (i = 0; i < sizeof(blitters) / sizeof(*blitters); ++i) { - if (blitters[i]->blit_supported(gl_info, blit_op, + if (blitters[i]->blit_supported(gl_info, d3d_info, blit_op, src_rect, src_usage, src_pool, src_format, dst_rect, dst_usage, dst_pool, dst_format)) return blitters[i]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 155b171..7747c55 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1340,7 +1340,8 @@ struct blit_shader HRESULT (*set_shader)(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface, const struct wined3d_color_key *color_key); void (*unset_shader)(const struct wined3d_gl_info *gl_info); - BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, + BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format); HRESULT (*color_fill)(struct wined3d_device *device, struct wined3d_surface *dst_surface, @@ -1353,7 +1354,8 @@ extern const struct blit_shader ffp_blit DECLSPEC_HIDDEN; extern const struct blit_shader arbfp_blit DECLSPEC_HIDDEN; extern const struct blit_shader cpu_blit DECLSPEC_HIDDEN; -const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Allow ARB blits from converted surfaces.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 439076d591fbf7f4e830be447c1abdbf6472a0a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=439076d591fbf7f4e830be447… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:12 2015 +0200 wined3d: Allow ARB blits from converted surfaces. --- dlls/wined3d/arb_program_shader.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 091ae1d..79439f5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7572,13 +7572,6 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct arbfp_blit_type type; struct arbfp_blit_desc *desc; - if (surface->container->flags & WINED3D_TEXTURE_CONVERTED) - { - gl_info->gl_ops.gl.p_glEnable(gl_texture_type); - checkGLcall("glEnable(gl_texture_type)"); - return WINED3D_OK; - } - if (is_complex_fixup(surface->resource.format->color_fixup)) fixup = get_complex_fixup(surface->resource.format->color_fixup); else @@ -7644,8 +7637,6 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, if (!shader) { FIXME("Unsupported complex fixup %#x, not setting a shader\n", fixup); - gl_info->gl_ops.gl.p_glEnable(gl_texture_type); - checkGLcall("glEnable(gl_texture_type)"); return E_NOTIMPL; } @@ -7686,18 +7677,6 @@ static void arbfp_blit_unset(const struct wined3d_gl_info *gl_info) { gl_info->gl_ops.gl.p_glDisable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D); - checkGLcall("glDisable(GL_TEXTURE_2D)"); - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_CUBE_MAP_ARB); - checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); - } - if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) - { - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_RECTANGLE_ARB); - checkGLcall("glDisable(GL_TEXTURE_RECTANGLE_ARB)"); - } } static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op,

1 0

Stefan Dösinger : wined3d: Set color keys through the command stream.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 82db5954c49d9de1db3dad200d6dc39316820698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82db5954c49d9de1db3dad200… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:11 2015 +0200 wined3d: Set color keys through the command stream. --- dlls/wined3d/cs.c | 84 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 4 +- dlls/wined3d/surface.c | 16 ++++---- dlls/wined3d/texture.c | 81 ++++++++++++++-------------------------- dlls/wined3d/utils.c | 4 +- dlls/wined3d/wined3d_private.h | 25 +++++++++---- 6 files changed, 140 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82db5954c49d9de1db3da…

1 0

Bruno Jesus : include: Update iptypes.h with the old XP IP_ADAPTER_ADDRESSES structure.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: fbde8fc0f0f6d341a8ef7eef2b30e67238a40979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbde8fc0f0f6d341a8ef7eef2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Apr 10 00:35:51 2015 -0300 include: Update iptypes.h with the old XP IP_ADAPTER_ADDRESSES structure. --- include/iptypes.h | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/include/iptypes.h b/include/iptypes.h index 997388e..fc9f860 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -199,7 +199,7 @@ typedef IP_ADAPTER_GATEWAY_ADDRESS_LH *PIP_ADAPTER_GATEWAY_ADDRESS; #define IP_ADAPTER_IPV6_ENABLED 0x100 #define IP_ADAPTER_IPV6_MANAGE_ADDRESS_CONFIG 0x200 -typedef struct _IP_ADAPTER_ADDRESSES { +typedef struct _IP_ADAPTER_ADDRESSES_LH { union { ULONGLONG Alignment; struct { @@ -207,7 +207,7 @@ typedef struct _IP_ADAPTER_ADDRESSES { DWORD IfIndex; } DUMMYSTRUCTNAME; } DUMMYUNIONNAME; - struct _IP_ADAPTER_ADDRESSES *Next; + struct _IP_ADAPTER_ADDRESSES_LH *Next; PCHAR AdapterName; PIP_ADAPTER_UNICAST_ADDRESS FirstUnicastAddress; PIP_ADAPTER_ANYCAST_ADDRESS FirstAnycastAddress; @@ -241,7 +241,38 @@ typedef struct _IP_ADAPTER_ADDRESSES { BYTE Dhcpv6ClientDuid[MAX_DHCPV6_DUID_LENGTH]; ULONG Dhcpv6ClientDuidLength; ULONG Dhcpv6Iaid; -} IP_ADAPTER_ADDRESSES, *PIP_ADAPTER_ADDRESSES; +} IP_ADAPTER_ADDRESSES_LH, *PIP_ADAPTER_ADDRESSES_LH; + +typedef struct _IP_ADAPTER_ADDRESSES_XP { + union { + ULONGLONG Alignment; + struct { + ULONG Length; + DWORD IfIndex; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + struct _IP_ADAPTER_ADDRESSES_XP *Next; + PCHAR AdapterName; + PIP_ADAPTER_UNICAST_ADDRESS FirstUnicastAddress; + PIP_ADAPTER_ANYCAST_ADDRESS FirstAnycastAddress; + PIP_ADAPTER_MULTICAST_ADDRESS FirstMulticastAddress; + PIP_ADAPTER_DNS_SERVER_ADDRESS FirstDnsServerAddress; + PWCHAR DnsSuffix; + PWCHAR Description; + PWCHAR FriendlyName; + BYTE PhysicalAddress[MAX_ADAPTER_ADDRESS_LENGTH]; + DWORD PhysicalAddressLength; + DWORD Flags; + DWORD Mtu; + DWORD IfType; + IF_OPER_STATUS OperStatus; + DWORD Ipv6IfIndex; + DWORD ZoneIndices[16]; + PIP_ADAPTER_PREFIX FirstPrefix; +} IP_ADAPTER_ADDRESSES_XP, *PIP_ADAPTER_ADDRESSES_XP; + +#define IP_ADAPTER_ADDRESSES IP_ADAPTER_ADDRESSES_LH +#define PIP_ADAPTER_ADDRESSES PIP_ADAPTER_ADDRESSES_LH #define GAA_FLAG_SKIP_UNICAST 0x00000001 #define GAA_FLAG_SKIP_ANYCAST 0x00000002

1 0

Andrew Eikum : shell32: Add more knownfolders.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: c6b999b90181744261f964ce24ae1d1870d3571e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6b999b90181744261f964ce2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Apr 9 15:28:26 2015 -0500 shell32: Add more knownfolders. --- dlls/shell32/shellpath.c | 347 ++++++++++++++++++++++++++++++++++++++--- dlls/shell32/tests/shellpath.c | 40 ++--- 2 files changed, 347 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6b999b90181744261f96…

1 0

Stefan Dösinger : wined3d: Implement color keying in the glsl fragment pipeline.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 5d51c97d07b57307912267996586d05528f652a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d51c97d07b57307912267996… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 10 12:05:54 2015 +0200 wined3d: Implement color keying in the glsl fragment pipeline. --- dlls/ddraw/tests/ddraw1.c | 22 ++++++---------------- dlls/ddraw/tests/ddraw2.c | 22 ++++++---------------- dlls/ddraw/tests/ddraw4.c | 22 ++++++---------------- dlls/ddraw/tests/ddraw7.c | 22 ++++++---------------- dlls/wined3d/arb_program_shader.c | 25 +++++++++---------------- dlls/wined3d/cs.c | 3 +++ dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 29 +++++++++++++++++++++++++++-- dlls/wined3d/state.c | 3 +++ dlls/wined3d/texture.c | 18 ++++++++++++------ dlls/wined3d/utils.c | 9 +++++++++ dlls/wined3d/wined3d_private.h | 10 +++++++--- 12 files changed, 95 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d51c97d07b5730791226…

1 0

Aaryaman Vasishta : d3drm: Add more interfaces to be queried from IDirect3DRMFrame2::QueryInterface.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 1b1d77268f725f12e175c3a919e8b981e6d199b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1d77268f725f12e175c3a91… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Apr 9 19:59:33 2015 +0530 d3drm: Add more interfaces to be queried from IDirect3DRMFrame2::QueryInterface. --- dlls/d3drm/frame.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index ea7cfc8..39c2e7b 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -472,6 +472,8 @@ static HRESULT WINAPI d3drm_frame2_QueryInterface(IDirect3DRMFrame2 *iface, REFI if (IsEqualGUID(riid, &IID_IDirect3DRMFrame2) || IsEqualGUID(riid, &IID_IDirect3DRMFrame) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) + || IsEqualGUID(riid, &IID_IDirect3DRMVisual) || IsEqualGUID(riid, &IID_IUnknown)) { *out = &frame->IDirect3DRMFrame2_iface;

1 0

Aaryaman Vasishta : d3drm: Fix IDirect3DRMFrame2:: QueryInterface returning incorrect HRESULT.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 415b7c1feca042a416120d68f356e9862dcd1ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=415b7c1feca042a416120d68f… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Apr 9 19:59:32 2015 +0530 d3drm: Fix IDirect3DRMFrame2::QueryInterface returning incorrect HRESULT. --- dlls/d3drm/frame.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 20acf56..ea7cfc8 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -483,8 +483,8 @@ static HRESULT WINAPI d3drm_frame2_QueryInterface(IDirect3DRMFrame2 *iface, REFI else { *out = NULL; - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - return E_NOINTERFACE; + WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid)); + return CLASS_E_CLASSNOTAVAILABLE; } IUnknown_AddRef((IUnknown *)*out);

1 0

Maxime Lombard : wined3d: Add support for Nvidia GTX 970M.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 086d2af6299be6fd17d2c36ddbdf120faf7fefad URL: http://source.winehq.org/git/wine.git/?a=commit;h=086d2af6299be6fd17d2c36dd… Author: Maxime Lombard <berillions(a)gmail.com> Date: Thu Apr 9 20:09:23 2015 +0200 wined3d: Add support for Nvidia GTX 970M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 13061f4..9412adb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1271,6 +1271,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970, "NVIDIA GeForce GTX 970", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1698,6 +1699,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5d736dd..f9e0100 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1575,6 +1575,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, CARD_NVIDIA_GEFORCE_GTX970 = 0x13c2, + CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Mark Harmstone : uxtheme: Fix a copy-paste error which mean that GetThemeString would always fail.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: a1c3b30f491f978206e5caa2f03f636e9c2d85d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1c3b30f491f978206e5caa2f… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Thu Apr 9 23:45:51 2015 +0100 uxtheme: Fix a copy-paste error which mean that GetThemeString would always fail. --- dlls/uxtheme/property.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/property.c b/dlls/uxtheme/property.c index 146649e..9dffbdd 100644 --- a/dlls/uxtheme/property.c +++ b/dlls/uxtheme/property.c @@ -210,7 +210,7 @@ HRESULT WINAPI GetThemeString(HTHEME hTheme, int iPartId, int iStateId, if(!hTheme) return E_HANDLE; - if(!(tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, iPropId))) + if(!(tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_STRING, iPropId))) return E_PROP_ID_UNSUPPORTED; return MSSTYLES_GetPropertyString(tp, pszBuff, cchMaxBuffChars); }

1 0

Marcus Meissner : wininet: Avoid memory leak in error exit (Coverity).
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: c1c06a9093d98c22256c649934dee0bc9c8e62bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c06a9093d98c22256c64993… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Apr 9 18:59:57 2015 +0200 wininet: Avoid memory leak in error exit (Coverity). --- dlls/wininet/cookie.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index af9dcdf..4784b33 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -341,8 +341,10 @@ static BOOL load_persistent_cookie(LPCWSTR domain, LPCWSTR path) UnlockUrlCacheEntryStream(cookie, 0); cookie_container = get_cookie_container(domain, path, TRUE); - if(!cookie_container) + if(!cookie_container) { + heap_free(str); return FALSE; + } GetSystemTimeAsFileTime(&time); for(pbeg=str; pbeg && *pbeg; name=data=NULL) {

1 0

Stefan Dösinger : wined3d: Implement color keying in arbfp_blit.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 2d56694445a58ee94d8ac46eac569bec3f53f161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d56694445a58ee94d8ac46ea… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 10 12:05:53 2015 +0200 wined3d: Implement color keying in arbfp_blit. --- dlls/wined3d/arb_program_shader.c | 68 +++++++++++++++++++++++++++++++++------ dlls/wined3d/surface.c | 51 +++++++++++++++++++---------- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 7 ++-- 4 files changed, 99 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d56694445a58ee94d8ac…

1 0

Mark Harmstone : uxtheme: Fix colour errors in UXTHEME_StretchBlt.
by Alexandre Julliard April 9, 2015

April 9, 2015

Module: wine Branch: master Commit: c6b4b4b93e6c6bccda06aacd557537a51bec836e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6b4b4b93e6c6bccda06aacd5… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Wed Apr 8 07:43:36 2015 +0100 uxtheme: Fix colour errors in UXTHEME_StretchBlt. --- dlls/uxtheme/draw.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 19df3c8..8a9397d 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -293,22 +293,33 @@ static inline BOOL UXTHEME_StretchBlt(HDC hdcDst, int nXOriginDst, int nYOriginD 255, /* SourceConstantAlpha */ AC_SRC_ALPHA /* AlphaFormat */ }; + + BOOL ret = TRUE; + int old_stretch_mode; + POINT old_brush_org; + + old_stretch_mode = SetStretchBltMode(hdcDst, HALFTONE); + SetBrushOrgEx(hdcDst, nXOriginDst, nYOriginDst, &old_brush_org); + if (transparent == ALPHABLEND_BINARY) { /* Ensure we don't pass any negative values to TransparentBlt */ - return TransparentBlt(hdcDst, nXOriginDst, nYOriginDst, abs(nWidthDst), abs(nHeightDst), + ret = TransparentBlt(hdcDst, nXOriginDst, nYOriginDst, abs(nWidthDst), abs(nHeightDst), hdcSrc, nXOriginSrc, nYOriginSrc, abs(nWidthSrc), abs(nHeightSrc), transcolor); - } - if ((transparent == ALPHABLEND_NONE) || + } else if ((transparent == ALPHABLEND_NONE) || !AlphaBlend(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, blendFunc)) { - return StretchBlt(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, + ret = StretchBlt(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, SRCCOPY); } - return TRUE; + + SetBrushOrgEx(hdcDst, old_brush_org.x, old_brush_org.y, NULL); + SetStretchBltMode(hdcDst, old_stretch_mode); + + return ret; } /***********************************************************************

1 0

Mark Harmstone : comctl32: Fix drawing of buddy background for updown controls.
by Alexandre Julliard April 9, 2015

April 9, 2015

Module: wine Branch: master Commit: b0a9fb6b0d52d2251b91b3e1d676bb65f485809b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a9fb6b0d52d2251b91b3e1d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 31 23:39:07 2015 +0100 comctl32: Fix drawing of buddy background for updown controls. --- dlls/comctl32/updown.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 28dd5e3..d188408 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -366,12 +366,18 @@ static BOOL UPDOWN_SetBuddyInt (const UPDOWN_INFO *infoPtr) */ static BOOL UPDOWN_DrawBuddyBackground (const UPDOWN_INFO *infoPtr, HDC hdc) { - RECT br; + RECT br, r; HTHEME buddyTheme = GetWindowTheme (infoPtr->Buddy); if (!buddyTheme) return FALSE; - GetClientRect (infoPtr->Buddy, &br); - MapWindowPoints (infoPtr->Buddy, infoPtr->Self, (POINT*)&br, 2); + GetWindowRect (infoPtr->Buddy, &br); + MapWindowPoints (NULL, infoPtr->Self, (POINT*)&br, 2); + GetClientRect (infoPtr->Self, &r); + + if (infoPtr->dwStyle & UDS_ALIGNLEFT) + br.left = r.left; + else if (infoPtr->dwStyle & UDS_ALIGNRIGHT) + br.right = r.right; /* FIXME: take disabled etc. into account */ DrawThemeBackground (buddyTheme, hdc, 0, 0, &br, NULL); return TRUE;

1 0

Jianqiu Zhang : include: Add declaration for FILE_FS_FULL_SIZE_INFORMATION.
by Alexandre Julliard April 9, 2015

April 9, 2015

Module: wine Branch: master Commit: 047698bf7d0d7e38dc4cf971745ef93c4b786de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=047698bf7d0d7e38dc4cf9717… Author: Jianqiu Zhang <zhangjianqiu13(a)gmail.com> Date: Mon Mar 30 11:18:17 2015 +0800 include: Add declaration for FILE_FS_FULL_SIZE_INFORMATION. --- include/winioctl.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/winioctl.h b/include/winioctl.h index fb78821..269f771 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -439,6 +439,20 @@ typedef struct _FILE_FS_ATTRIBUTE_INFORMATION { WCHAR FileSystemName[1]; } FILE_FS_ATTRIBUTE_INFORMATION, *PFILE_FS_ATTRIBUTE_INFORMATION; +/*FileFsControlInformation = 6 */ +/* + unknown + */ + +/*FileFsFullSizeInformation = 7 */ +typedef struct _FILE_FS_FULL_SIZE_INFORMATION { + LARGE_INTEGER TotalAllocationUnits; + LARGE_INTEGER CallerAvailableAllocationUnits; + LARGE_INTEGER ActualAvailableAllocationUnits; + ULONG SectorsPerAllocationUnit; + ULONG BytesPerSector; +} FILE_FS_FULL_SIZE_INFORMATION, *PFILE_FS_FULL_SIZE_INFORMATION; + typedef struct _FILE_PIPE_WAIT_FOR_BUFFER { LARGE_INTEGER Timeout; ULONG NameLength;

1 0

Andrew Eikum : shell32: Allocate returned array in IKnownFolderManager:: GetFolderIds.
by Alexandre Julliard April 9, 2015

April 9, 2015

Module: wine Branch: master Commit: e4868d563574853d40ca04adfc28db1c19ca9dbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4868d563574853d40ca04adf… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 8 10:59:33 2015 -0500 shell32: Allocate returned array in IKnownFolderManager::GetFolderIds. --- dlls/shell32/shellpath.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index d853274..731ea2f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4178,7 +4178,8 @@ static HRESULT WINAPI foldermanager_GetFolderIds( TRACE("%p, %p\n", ppKFId, pCount); - *ppKFId = fm->ids; + *ppKFId = CoTaskMemAlloc(fm->num_ids * sizeof(KNOWNFOLDERID)); + memcpy(*ppKFId, fm->ids, fm->num_ids * sizeof(KNOWNFOLDERID)); *pCount = fm->num_ids; return S_OK; }

1 0

Bruno Jesus : secur32: Don' t try to set an empty target name in schan_InitializeSecurityContextW.
by Alexandre Julliard April 9, 2015

April 9, 2015

Module: wine Branch: master Commit: 0fbbb1297d4fc14e71ff76379ba0b80382e97edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fbbb1297d4fc14e71ff76379… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Apr 8 23:54:36 2015 -0300 secur32: Don't try to set an empty target name in schan_InitializeSecurityContextW. Based on original patch by Nikos Mavrogiannopoulos. --- dlls/secur32/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 12d4c8d..c6cc4d1 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -825,7 +825,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INTERNAL_ERROR; } - if (pszTargetName) + if (pszTargetName && *pszTargetName) { UINT len = WideCharToMultiByte( CP_UNIXCP, 0, pszTargetName, -1, NULL, 0, NULL, NULL ); char *target = HeapAlloc( GetProcessHeap(), 0, len );

1 0

Mark Harmstone : include: Add SM_CXPADDEDBORDER to winuser.h.
by Alexandre Julliard April 9, 2015

April 9, 2015

Module: wine Branch: master Commit: cb8545ab98fae56e89b88be3dfdc7c717297d8ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8545ab98fae56e89b88be3d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Wed Apr 8 23:41:52 2015 +0100 include: Add SM_CXPADDEDBORDER to winuser.h. --- include/winuser.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winuser.h b/include/winuser.h index 3d9b937..e9804a9 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -982,6 +982,7 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define SM_SERVERR2 89 #define SM_CMETRICS 90 #define SM_MOUSEHORIZONTALWHEELPRESENT 91 +#define SM_CXPADDEDBORDER 92 #define SM_REMOTESESSION 0x1000 #define SM_SHUTTINGDOWN 0x2000

1 0

Bruno Jesus : ws2_32: Restore the local socket address that was bound with filter for getsockname ().
by Alexandre Julliard April 9, 2015

April 9, 2015

Module: wine Branch: master Commit: 61ed82fc8685af0cf55de4b547a38e3e5893dd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ed82fc8685af0cf55de4b54… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Apr 9 00:09:29 2015 -0300 ws2_32: Restore the local socket address that was bound with filter for getsockname(). --- dlls/ws2_32/socket.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/ws2_32/tests/sock.c | 1 - 2 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6903909..bfcc755 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3218,6 +3218,61 @@ int WINAPI WS_getpeername(SOCKET s, struct WS_sockaddr *name, int *namelen) return res; } +/* When binding to an UDP address with filter support the getsockname call on the socket + * will always return 0.0.0.0 instead of the filtered interface address. This function + * checks if the socket is interface-bound on UDP and return the correct address. + * This is required because applications often do a bind() with port zero followed by a + * getsockname() to retrieve the port and address acquired. + */ +static void interface_bind_check(int fd, struct sockaddr_in *addr) +{ +#if !defined(IP_BOUND_IF) && !defined(LINUX_BOUND_IF) + return; +#else + int ifindex; + socklen_t len = sizeof(ifindex); + + /* Check for IPv4, address 0.0.0.0 and UDP socket */ + if (addr->sin_family != AF_INET || addr->sin_addr.s_addr != 0) + return; + if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &ifindex, &len) || ifindex != SOCK_DGRAM) + return; + + ifindex = -1; + len = sizeof(ifindex); +#if defined(IP_BOUND_IF) + getsockopt(fd, IPPROTO_IP, IP_BOUND_IF, &ifindex, &len); +#elif defined(LINUX_BOUND_IF) + getsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, &len); + if (ifindex > 0) ifindex = ntohl(ifindex); +#endif + if (ifindex > 0) + { + PIP_ADAPTER_INFO adapters, adapter; + DWORD adap_size; + + if (GetAdaptersInfo(NULL, &adap_size) != ERROR_BUFFER_OVERFLOW) + return; + adapters = HeapAlloc(GetProcessHeap(), 0, adap_size); + if (adapters && GetAdaptersInfo(adapters, &adap_size) == NO_ERROR) + { + /* Search the IPv4 adapter list for the appropriate bound interface */ + for (adapter = adapters; adapter != NULL; adapter = adapter->Next) + { + in_addr_t adapter_addr; + if (adapter->Index != ifindex) continue; + + adapter_addr = inet_addr(adapter->IpAddressList.IpAddress.String); + addr->sin_addr.s_addr = adapter_addr; + TRACE("reporting interface address from adapter %d\n", ifindex); + break; + } + } + HeapFree(GetProcessHeap(), 0, adapters); + } +#endif +} + /*********************************************************************** * getsockname (WS2_32.6) */ @@ -3255,8 +3310,17 @@ int WINAPI WS_getsockname(SOCKET s, struct WS_sockaddr *name, int *namelen) } else { - res = 0; - TRACE("=> %s\n", debugstr_sockaddr(name)); + interface_bind_check(fd, (struct sockaddr_in*) &uaddr); + if (ws_sockaddr_u2ws(&uaddr.addr, name, namelen) != 0) + { + /* The buffer was too small */ + SetLastError(WSAEFAULT); + } + else + { + res = 0; + TRACE("=> %s\n", debugstr_sockaddr(name)); + } } release_sock_fd( s, fd ); } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8690579..8b69cf6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4238,7 +4238,6 @@ static void test_getsockname(void) ok(ret == 0, "getsockname failed with %d\n", GetLastError()); strcpy(ipstr, inet_ntoa(sa_get.sin_addr)); trace("testing bind on interface %s\n", ipstr); -todo_wine ok(sa_get.sin_addr.s_addr == sa_set.sin_addr.s_addr, "address does not match: %s != %s", ipstr, inet_ntoa(sa_set.sin_addr));

1 0