December 2012 - Wine-commits

Henri Verbeet : d3d10core: Implement d3d10_device_PSGetSamplers().
by Alexandre Julliard 10 Dec '12

10 Dec '12

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

Dmitry Timoshkov : windowscodecs: GetThumbnail of the PNG decoder should return NULL interface.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: 03c9c3ce44efadcdc641e326fa891cf62568d4c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c9c3ce44efadcdc641e326f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 10 11:44:12 2012 +0800 windowscodecs: GetThumbnail of the PNG decoder should return NULL interface. --- dlls/windowscodecs/pngformat.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 009532d..051c60c 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -645,6 +645,10 @@ static HRESULT WINAPI PngDecoder_GetThumbnail(IWICBitmapDecoder *iface, IWICBitmapSource **ppIThumbnail) { TRACE("(%p,%p)\n", iface, ppIThumbnail); + + if (!ppIThumbnail) return E_INVALIDARG; + + *ppIThumbnail = NULL; return WINCODEC_ERR_CODECNOTHUMBNAIL; }

1 0

Dmitry Timoshkov : windowscodecs: Implement GetPreview in the PNG decoder.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: 560cfedcba6cce24691eb55438ccc4e47a6916db URL: http://source.winehq.org/git/wine.git/?a=commit;h=560cfedcba6cce24691eb5543… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 10 11:44:37 2012 +0800 windowscodecs: Implement GetPreview in the PNG decoder. --- dlls/windowscodecs/pngformat.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 051c60c..fb45804 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -630,8 +630,12 @@ static HRESULT WINAPI PngDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface static HRESULT WINAPI PngDecoder_GetPreview(IWICBitmapDecoder *iface, IWICBitmapSource **ppIBitmapSource) { - FIXME("(%p,%p): stub\n", iface, ppIBitmapSource); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIBitmapSource); + + if (!ppIBitmapSource) return E_INVALIDARG; + + *ppIBitmapSource = NULL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI PngDecoder_GetColorContexts(IWICBitmapDecoder *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement GetThumbnail in the PNG frame decoder.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: f52f910f8be9edafd77e3d91764a19cedc771e01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52f910f8be9edafd77e3d917… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 10 11:45:04 2012 +0800 windowscodecs: Implement GetThumbnail in the PNG frame decoder. --- dlls/windowscodecs/pngformat.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index fb45804..4183d8e 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -903,8 +903,12 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i static HRESULT WINAPI PngDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface, IWICBitmapSource **ppIThumbnail) { - FIXME("(%p,%p): stub\n", iface, ppIThumbnail); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIThumbnail); + + if (!ppIThumbnail) return E_INVALIDARG; + + *ppIThumbnail = NULL; + return WINCODEC_ERR_CODECNOTHUMBNAIL; } static const IWICBitmapFrameDecodeVtbl PngDecoder_FrameVtbl = {

1 0

Michael Stefaniuc : dnsapi: Use FIELD_OFFSET for the size of a struct with var length array.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: c0092bcd7602b95fde2ca34be9a6dc02bca1f83a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0092bcd7602b95fde2ca34be… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 10 10:17:02 2012 +0100 dnsapi: Use FIELD_OFFSET for the size of a struct with var length array. --- dlls/dnsapi/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 72490c5..2116b11 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -563,7 +563,7 @@ static DNS_STATUS dns_get_serverlist( PIP4_ARRAY addrs, PDWORD len ) unsigned int size; int i; - size = sizeof(IP4_ARRAY) + sizeof(IP4_ADDRESS) * (_res.nscount - 1); + size = FIELD_OFFSET(IP4_ARRAY, AddrArray[_res.nscount]); if (!addrs || *len < size) { *len = size;

1 0

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

10 Dec '12

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 10 Dec '12

10 Dec '12

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

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

10 Dec '12

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

Jacek Caban : wininet: Fixed handling empty HTTP version string in HttpOpenRequest.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: bfad905bd8a60658a29660b5e84bb03b5b5d6209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfad905bd8a60658a29660b5e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 10 10:59:24 2012 +0100 wininet: Fixed handling empty HTTP version string in HttpOpenRequest. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 383b907..f890363 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3141,7 +3141,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, } request->verb = heap_strdupW(lpszVerb && *lpszVerb ? lpszVerb : szGET); - request->version = heap_strdupW(lpszVersion ? lpszVersion : g_szHttp1_1); + request->version = heap_strdupW(lpszVersion && *lpszVersion ? lpszVersion : g_szHttp1_1); HTTP_ProcessHeader(request, hostW, request->server->canon_host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ);

1 0

Alexandre Julliard : widl: Fix a typo in the man page.
by Alexandre Julliard 10 Dec '12

10 Dec '12

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