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

Alasdair Sinclair : setupapi: Fix magic comparison on x64.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: 3928f57658e43357f92e16292ee76032f0679a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3928f57658e43357f92e16292… Author: Alasdair Sinclair <alasdairsinc(a)gmail.com> Date: Sun Aug 28 19:57:53 2011 +0100 setupapi: Fix magic comparison on x64. --- dlls/setupapi/setupcab.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index f4c6600..66cf792 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -287,7 +287,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p TRACE("(fdint == %d, pfdin == ^%p)\n", fdint, pfdin); - if (pfdin && pfdin->pv && (*((void **) pfdin->pv) == (void *)SC_HSC_A_MAGIC)) + if (pfdin && pfdin->pv && (((PSC_HSC_A) pfdin->pv)->magic == SC_HSC_A_MAGIC)) phsc = pfdin->pv; else { ERR("pv %p is not an SC_HSC_A.\n", (pfdin) ? pfdin->pv : NULL);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_swapchain_count() const.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: a3f23541c1b3f9d54863c0680e17bb774150b648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f23541c1b3f9d54863c0680… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 28 23:27:47 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_swapchain_count() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8afa2d8..8f7b35d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -879,7 +879,7 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) return refcount; } -UINT CDECL wined3d_device_get_swapchain_count(struct wined3d_device *device) +UINT CDECL wined3d_device_get_swapchain_count(const struct wined3d_device *device) { TRACE("device %p.\n", device); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bfc1b39..1ea6857 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2254,7 +2254,7 @@ HRESULT __cdecl wined3d_device_get_surface_from_dc(struct wined3d_device *device HDC dc, struct wined3d_surface **surface); HRESULT __cdecl wined3d_device_get_swapchain(struct wined3d_device *device, UINT swapchain_idx, struct wined3d_swapchain **swapchain); -UINT __cdecl wined3d_device_get_swapchain_count(struct wined3d_device *device); +UINT __cdecl wined3d_device_get_swapchain_count(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_texture(struct wined3d_device *device, UINT stage, struct wined3d_texture **texture); HRESULT __cdecl wined3d_device_get_texture_stage_state(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Make the target parameter to is_full_clear() const .
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: d5c2ba6d624f1d6703222e0aa30dba0a26f06c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c2ba6d624f1d6703222e0aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 28 23:27:46 2011 +0200 wined3d: Make the target parameter to is_full_clear() const. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 91d8dd9..8afa2d8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -581,7 +581,7 @@ void device_switch_onscreen_ds(struct wined3d_device *device, wined3d_surface_incref(device->onscreen_depth_stencil); } -static BOOL is_full_clear(struct wined3d_surface *target, const RECT *draw_rect, const RECT *clear_rect) +static BOOL is_full_clear(const struct wined3d_surface *target, const RECT *draw_rect, const RECT *clear_rect) { /* partial draw rect */ if (draw_rect->left || draw_rect->top

1 0

Nikolay Sivov : msxml3: Respect string length returned from ISAXAttributes.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: 9ae103f7f71a89d4b7cb07f85cb1d521af0f41bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae103f7f71a89d4b7cb07f85… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 27 15:01:57 2011 +0400 msxml3: Respect string length returned from ISAXAttributes. --- dlls/msxml3/mxwriter.c | 7 ++++--- dlls/msxml3/tests/saxreader.c | 12 ++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 31b8505..bf2411e 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -782,7 +782,7 @@ static HRESULT WINAPI mxwriter_saxcontent_startElement( for (i = 0; i < length; i++) { const WCHAR *str; - INT len; + INT len = 0; hr = ISAXAttributes_getQName(attr, i, &str, &len); if (FAILED(hr)) return hr; @@ -790,16 +790,17 @@ static HRESULT WINAPI mxwriter_saxcontent_startElement( /* space separator in front of every attribute */ xmlOutputBufferWriteString(This->buffer, " "); - s = xmlchar_from_wchar(str); + s = xmlchar_from_wcharn(str, len); xmlOutputBufferWriteString(This->buffer, (char*)s); heap_free(s); xmlOutputBufferWriteString(This->buffer, "=\""); + len = 0; hr = ISAXAttributes_getValue(attr, i, &str, &len); if (FAILED(hr)) return hr; - s = xmlchar_from_wchar(str); + s = xmlchar_from_wcharn(str, len); xmlOutputBufferWriteString(This->buffer, (char*)s); heap_free(s); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 7419fe2..99a08c2 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -567,13 +567,13 @@ static HRESULT WINAPI isaxattributes_getQName( const WCHAR **pQName, int *pQNameLength) { - static const WCHAR attr1W[] = {'a',':','a','t','t','r','1',0}; - static const WCHAR attr2W[] = {'a','t','t','r','2',0}; + static const WCHAR attr1W[] = {'a',':','a','t','t','r','1','j','u','n','k',0}; + static const WCHAR attr2W[] = {'a','t','t','r','2','j','u','n','k',0}; ok(nIndex == 0 || nIndex == 1, "invalid index received %d\n", nIndex); *pQName = (nIndex == 0) ? attr1W : attr2W; - *pQNameLength = lstrlenW(*pQName); + *pQNameLength = (nIndex == 0) ? 7 : 5; return S_OK; } @@ -654,13 +654,13 @@ static HRESULT WINAPI isaxattributes_getValue( const WCHAR ** pValue, int * nValue) { - static const WCHAR attrval1W[] = {'a','1',0}; - static const WCHAR attrval2W[] = {'a','2',0}; + static const WCHAR attrval1W[] = {'a','1','j','u','n','k',0}; + static const WCHAR attrval2W[] = {'a','2','j','u','n','k',0}; ok(nIndex == 0 || nIndex == 1, "invalid index received %d\n", nIndex); *pValue = (nIndex == 0) ? attrval1W : attrval2W; - *nValue = lstrlenW(*pValue); + *nValue = 2; return S_OK; }

1 0

Andrew Talbot : d3dx9_36: Fix a logical operator typo.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: 8e9fabfa872dddf2a8a0b8782638bbea39adfe3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9fabfa872dddf2a8a0b8782… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 27 17:42:33 2011 +0100 d3dx9_36: Fix a logical operator typo. --- dlls/d3dx9_36/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 82e3612..fea7f1e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -328,7 +328,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(LPDIRECT3DSURFACE9 pDestSurface, TRACE("(%p, %p, %p, %p, %d, %p, %d, %x, %p)\n", pDestSurface, pDestPalette, pDestRect, pSrcData, SrcDataSize, pSrcRect, dwFilter, Colorkey, pSrcInfo); - if (!pDestSurface || !pSrcData | !SrcDataSize) + if (!pDestSurface || !pSrcData || !SrcDataSize) return D3DERR_INVALIDCALL; hr = D3DXGetImageInfoFromFileInMemory(pSrcData, SrcDataSize, &imginfo);

1 0

Andrew Talbot : winspool.drv: Fix a logical operator typo.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: f2e922c726bc2586388e46ab1677e2f935c7a653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e922c726bc2586388e46ab1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 27 17:42:48 2011 +0100 winspool.drv: Fix a logical operator typo. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 5201e30..cb74482 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -503,7 +503,7 @@ static BOOL CUPS_LoadPrinters(void) haddefault = TRUE; } } - if (hadprinter & !haddefault) { + if (hadprinter && !haddefault) { MultiByteToWideChar(CP_UNIXCP, 0, dests[0].name, -1, nameW, sizeof(nameW) / sizeof(WCHAR)); SetDefaultPrinterW(nameW); }

1 0

Nikolay Sivov : msxml3: Fix empty elements output.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: d0413fd476535e6afd76807cda72e71d553ad52d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0413fd476535e6afd76807cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 27 14:19:22 2011 +0400 msxml3: Fix empty elements output. --- dlls/msxml3/mxwriter.c | 48 ++++++++++++++++-- dlls/msxml3/tests/saxreader.c | 109 ++++++++++++++++++++++++++-------------- 2 files changed, 114 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0413fd476535e6afd768…

1 0

Andrew Talbot : include: Fix a typo.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: a43aa90d5b6e7aeaf51580aa35885739cbc47021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a43aa90d5b6e7aeaf51580aa3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 27 21:28:00 2011 +0100 include: Fix a typo. --- include/guiddef.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index ba8e8cf..b70175e 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -83,7 +83,7 @@ extern "C++" { #define _GUIDDEF_H_ #ifndef __LPGUID_DEFINED__ -#define __LPGUID_DEFINED___ +#define __LPGUID_DEFINED__ typedef GUID *LPGUID; #endif

1 0

Andrew Talbot : dnsapi: Void functions should not return a value.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: 60e7523353ee73e406d8c27eadf16a1bf4ae3c45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e7523353ee73e406d8c27ea… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 27 18:47:39 2011 +0100 dnsapi: Void functions should not return a value. --- dlls/dnsapi/record.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index e9252ef..ae31316 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -645,7 +645,7 @@ VOID WINAPI DnsRecordListFree( PDNS_RECORD list, DNS_FREE_TYPE type ) */ void WINAPI DnsFree( PVOID data, DNS_FREE_TYPE type ) { - return DnsRecordListFree( data, type ); + DnsRecordListFree( data, type ); } /******************************************************************************

1 0

Andrew Talbot : windowscodecs: Remove extern from function definition.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: 568d9ccde8ecce3769decc51b338324e18782000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=568d9ccde8ecce3769decc51b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 27 18:33:40 2011 +0100 windowscodecs: Remove extern from function definition. --- dlls/windowscodecs/propertybag.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/propertybag.c b/dlls/windowscodecs/propertybag.c index 43c88c7..128cf24 100644 --- a/dlls/windowscodecs/propertybag.c +++ b/dlls/windowscodecs/propertybag.c @@ -136,7 +136,7 @@ static const IPropertyBag2Vtbl PropertyBag_Vtbl = { PropertyBag_LoadObject }; -extern HRESULT CreatePropertyBag2(IPropertyBag2 **ppPropertyBag2) +HRESULT CreatePropertyBag2(IPropertyBag2 **ppPropertyBag2) { PropertyBag *This;

1 0