December 2012 - Wine-Commits

Alexandre Julliard : widl: Fix a typo in the man page.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 50835b415160e677c81ffa6dbfcbdf1581d5d6e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50835b415160e677c81ffa6db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 10 11:27:33 2012 +0100 widl: Fix a typo in the man page. --- tools/widl/widl.man.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 5b6e0de..0e4baa5 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -114,7 +114,7 @@ prefixed with \fB0x\fR, it will be interpreted as an hexadecimal number. For the meaning of values, see the \fBDebug\fR section. .PP .B Miscellaneous options: -.IP "\fB-app_config\f" +.IP "\fB-app_config\fR" Ignored, present for midl compatibility. .IP "\fB--local-stubs=\fIfile\fR" Generate empty stubs for call_as/local methods in an object interface and

1 0

Nikolay Sivov : oledb32: Fix DBPROPSET and DBPROPINFOSET cleanup.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 25e996bd6c3b50421d0bd9caa4f5c7f08aa7a86f URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e996bd6c3b50421d0bd9caa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 8 13:57:03 2012 +0400 oledb32: Fix DBPROPSET and DBPROPINFOSET cleanup. --- dlls/oledb32/datainit.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index a191c88..78a005d 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -351,10 +351,9 @@ static void free_dbpropset(ULONG count, DBPROPSET *propset) int p; for (p = 0; p < propset[i].cProperties; p++) - { VariantClear(&propset[i].rgProperties[p].vValue); - CoTaskMemFree(&propset[i].rgProperties[p]); - } + + CoTaskMemFree(propset[i].rgProperties); } CoTaskMemFree(propset); } @@ -368,10 +367,9 @@ static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset) int p; for (p = 0; p < propinfoset[i].cPropertyInfos; p++) - { VariantClear(&propinfoset[i].rgPropertyInfos[p].vValues); - CoTaskMemFree(&propinfoset[i].rgPropertyInfos[p]); - } + + CoTaskMemFree(propinfoset[i].rgPropertyInfos); } CoTaskMemFree(propinfoset); }

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_PSGetSamplers().
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 9fbd3bbed6ec070eea7a912bd044882a871a54b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fbd3bbed6ec070eea7a912bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 9 21:22:07 2012 +0100 d3d10core: Implement d3d10_device_PSGetSamplers(). --- dlls/d3d10core/device.c | 21 ++++++++++++++++++++- dlls/wined3d/device.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 8944491..7e909a9 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -607,8 +607,27 @@ static void STDMETHODCALLTYPE d3d10_device_PSGetShader(ID3D10Device *iface, ID3D static void STDMETHODCALLTYPE d3d10_device_PSGetSamplers(ID3D10Device *iface, UINT start_slot, UINT sampler_count, ID3D10SamplerState **samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + for (i = 0; i < sampler_count; ++i) + { + struct d3d10_sampler_state *sampler_impl; + struct wined3d_sampler *wined3d_sampler; + + if (!(wined3d_sampler = wined3d_device_get_ps_sampler(device->wined3d_device, start_slot + i))) + { + samplers[i] = NULL; + continue; + } + + sampler_impl = wined3d_sampler_get_parent(wined3d_sampler); + samplers[i] = &sampler_impl->ID3D10SamplerState_iface; + ID3D10SamplerState_AddRef(samplers[i]); + } } static void STDMETHODCALLTYPE d3d10_device_VSGetShader(ID3D10Device *iface, ID3D10VertexShader **shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c74498a..0d35b17 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3073,6 +3073,19 @@ void CDECL wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx wined3d_sampler_decref(prev); } +struct wined3d_sampler * CDECL wined3d_device_get_ps_sampler(const struct wined3d_device *device, UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_SAMPLER_OBJECTS) + { + WARN("Invalid sampler index %u.\n", idx); + return NULL; + } + + return device->stateBlock->state.ps_sampler[idx]; +} + HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, UINT start_register, const BOOL *constants, UINT bool_count) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 231b958..1d6e2b3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -79,6 +79,7 @@ @ cdecl wined3d_device_get_ps_consts_b(ptr long ptr long) @ cdecl wined3d_device_get_ps_consts_f(ptr long ptr long) @ cdecl wined3d_device_get_ps_consts_i(ptr long ptr long) +@ cdecl wined3d_device_get_ps_sampler(ptr long) @ cdecl wined3d_device_get_raster_status(ptr long ptr) @ cdecl wined3d_device_get_render_state(ptr long) @ cdecl wined3d_device_get_render_target(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2dd9a1a..0b07328 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2147,6 +2147,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *devi UINT start_register, float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); +struct wined3d_sampler * __cdecl wined3d_device_get_ps_sampler(const struct wined3d_device *device, UINT idx); HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_raster_status *raster_status); DWORD __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state);

1 0

Michael Stefaniuc : dwrite: Don't overallocate memory for a BITMAPINFO.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 034b8d5c3c99ba90c533e37615ed3ff651c65a15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=034b8d5c3c99ba90c533e3761… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 10 10:19:59 2012 +0100 dwrite: Don't overallocate memory for a BITMAPINFO. --- dlls/dwrite/gdiinterop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index d41af81..496f099 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -165,7 +165,7 @@ static const IDWriteBitmapRenderTargetVtbl rendertargetvtbl = { static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **target) { - char bmibuf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; + char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; BITMAPINFO *bmi = (BITMAPINFO*)bmibuf; struct rendertarget *This; HBITMAP dib;

1 0

Michael Stefaniuc : iphlpapi: Simplify size calculation of structs with var length array.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 61a029355ec2865c3f83accfa9f1cfb5e5641173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a029355ec2865c3f83accfa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 10 10:22:25 2012 +0100 iphlpapi: Simplify size calculation of structs with var length array. --- dlls/iphlpapi/ifenum.c | 10 ++-------- dlls/iphlpapi/iphlpapi_main.c | 4 +--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index aff88cd..d8eebca 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -211,13 +211,10 @@ InterfaceIndexTable *getInterfaceIndexTable(void) if (indexes) { struct if_nameindex *p; - DWORD size = sizeof(InterfaceIndexTable); for (p = indexes, numInterfaces = 0; p && p->if_name; p++) numInterfaces++; - if (numInterfaces > 1) - size += (numInterfaces - 1) * sizeof(DWORD); - ret = HeapAlloc(GetProcessHeap(), 0, size); + ret = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceIndexTable, indexes[numInterfaces])); if (ret) { ret->numIndexes = 0; for (p = indexes; p && p->if_name; p++) @@ -241,14 +238,11 @@ InterfaceIndexTable *getNonLoopbackInterfaceIndexTable(void) if (indexes) { struct if_nameindex *p; - DWORD size = sizeof(InterfaceIndexTable); for (p = indexes, numInterfaces = 0; p && p->if_name; p++) if (!isLoopbackInterface(fd, p->if_name)) numInterfaces++; - if (numInterfaces > 1) - size += (numInterfaces - 1) * sizeof(DWORD); - ret = HeapAlloc(GetProcessHeap(), 0, size); + ret = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceIndexTable, indexes[numInterfaces])); if (ret) { ret->numIndexes = 0; for (p = indexes; p && p->if_name; p++) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 16f138c..9cffe06 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1505,10 +1505,8 @@ DWORD WINAPI GetIpAddrTable(PMIB_IPADDRTABLE pIpAddrTable, PULONG pdwSize, BOOL ret = getIPAddrTable(&table, GetProcessHeap(), 0); if (ret == NO_ERROR) { - ULONG size = sizeof(MIB_IPADDRTABLE); + ULONG size = FIELD_OFFSET(MIB_IPADDRTABLE, table[table->dwNumEntries]); - if (table->dwNumEntries > 1) - size += (table->dwNumEntries - 1) * sizeof(MIB_IPADDRROW); if (!pIpAddrTable || *pdwSize < size) { *pdwSize = size; ret = ERROR_INSUFFICIENT_BUFFER;

1 0

Alexandre Julliard : gdi32: Add ref counting to the font objects and simplify the cache management.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 75fff47f945dd2b5855c863383c82ff6ba4221ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fff47f945dd2b5855c86338… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 10 12:32:17 2012 +0100 gdi32: Add ref counting to the font objects and simplify the cache management. --- dlls/gdi32/font.c | 2 - dlls/gdi32/freetype.c | 168 +++++++++++++++------------------------------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 53 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75fff47f945dd2b5855c8…

1 0

Alexandre Julliard : gdiplus/tests: Tweak some metrics to make the tests pass on Wine.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: fa664b548ee96dafdfc8c186ab43300a679bd5b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa664b548ee96dafdfc8c186a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 10 11:54:58 2012 +0100 gdiplus/tests: Tweak some metrics to make the tests pass on Wine. --- dlls/gdiplus/tests/graphics.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 42612dd..fdea646 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3055,7 +3055,7 @@ static void test_string_functions(void) expect(3, linesfilled); /* Cut off everything including the first space. */ - rc.Width = char_bounds.Width + char_width * 1.5; + rc.Width = char_bounds.Width + char_width * 1.7; status = GdipMeasureString(graphics, teststring, 6, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); expect(Ok, status); @@ -3067,7 +3067,7 @@ static void test_string_functions(void) expect(3, linesfilled); /* Cut off everything after the first character. */ - rc.Width = char_bounds.Width + char_width * 0.5; + rc.Width = char_bounds.Width + char_width * 0.8; status = GdipMeasureString(graphics, teststring, 6, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); expect(Ok, status);

1 0

Nikolay Sivov : comctl32: Fix a ranges leak on error.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 9ed808e340cd7aa1e36993b0d55f751335896e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed808e340cd7aa1e36993b0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 8 20:25:06 2012 +0400 comctl32: Fix a ranges leak on error. --- dlls/comctl32/listview.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4bac508..918faa8 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4954,6 +4954,8 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) SelectObject( hdc, hOldPen ); DeleteObject( hPen ); } + else + ranges_destroy(colRanges); } /***

1 0

Michael Stefaniuc : itss: Don' t over-allocate memory for a ITSS_IStorageImpl.
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 27adacc577a95f5e426d4aab858212654dbb9292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27adacc577a95f5e426d4aab8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 10 10:31:41 2012 +0100 itss: Don't over-allocate memory for a ITSS_IStorageImpl. --- dlls/itss/storage.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index c53b0c2..60e452d 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -616,13 +616,11 @@ static HRESULT ITSS_create_chm_storage( struct chmFile *chmfile, const WCHAR *dir, IStorage** ppstgOpen ) { ITSS_IStorageImpl *stg; - DWORD len; TRACE("%p %s\n", chmfile, debugstr_w( dir ) ); - len = strlenW( dir ) + 1; - stg = HeapAlloc( GetProcessHeap(), 0, - sizeof (ITSS_IStorageImpl) + len*sizeof(WCHAR) ); + stg = HeapAlloc( GetProcessHeap(), 0, + FIELD_OFFSET( ITSS_IStorageImpl, dir[strlenW( dir ) + 1] )); stg->IStorage_iface.lpVtbl = &ITSS_IStorageImpl_Vtbl; stg->ref = 1; stg->chmfile = chmfile;

1 0

Nikolay Sivov : oleaut32: Use correct allocation length (Coverity).
by Alexandre Julliard Dec. 10, 2012

Dec. 10, 2012

Module: wine Branch: master Commit: 61ad275e82bf38248e7de2fb7131a65f94213712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ad275e82bf38248e7de2fb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 8 14:21:12 2012 +0400 oleaut32: Use correct allocation length (Coverity). --- dlls/oleaut32/recinfo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index f6f5653..04cd377 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -616,7 +616,7 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo ret->name = NULL; } - ret->fields = HeapAlloc(GetProcessHeap(), 0, ret->n_vars*sizeof(VARDESC)); + ret->fields = HeapAlloc(GetProcessHeap(), 0, ret->n_vars*sizeof(fieldstr)); for(i = 0; i<ret->n_vars; i++) { VARDESC *vardesc; hres = ITypeInfo_GetVarDesc(pTypeInfo, i, &vardesc);

1 0