March 2010 - Wine-Commits - list.winehq.org

Christian Costa : d3dx9_36: Find, store and enable retreival of CTAB comment data in shader ( based on code from Luis Busquets).
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 4072edc11111be5d26ca442862d021f5cd53e779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4072edc11111be5d26ca44286… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:39:29 2010 +0100 d3dx9_36: Find, store and enable retreival of CTAB comment data in shader (based on code from Luis Busquets). --- dlls/d3dx9_36/shader.c | 30 ++++++++++++++++++++++++++---- dlls/d3dx9_36/tests/shader.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/d3dx9shader.h | 7 +++++++ 3 files changed, 75 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 22c297e..5de3cad 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -277,6 +277,8 @@ static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl; typedef struct ID3DXConstantTableImpl { const ID3DXConstantTableVtbl *lpVtbl; LONG ref; + LPVOID ctab; + DWORD size; } ID3DXConstantTableImpl; /*** IUnknown methods ***/ @@ -316,7 +318,10 @@ static ULONG WINAPI ID3DXConstantTableImpl_Release(ID3DXConstantTable* iface) TRACE("(%p)->(): Release from %d\n", This, ref + 1); if (!ref) + { + HeapFree(GetProcessHeap(), 0, This->ctab); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -326,18 +331,18 @@ static LPVOID WINAPI ID3DXConstantTableImpl_GetBufferPointer(ID3DXConstantTable* { ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface; - FIXME("(%p)->(): stub\n", This); + TRACE("(%p)->()\n", This); - return NULL; + return This->ctab; } static DWORD WINAPI ID3DXConstantTableImpl_GetBufferSize(ID3DXConstantTable* iface) { ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface; - FIXME("(%p)->(): stub\n", This); + TRACE("(%p)->()\n", This); - return 0; + return This->size; } /*** ID3DXConstantTable methods ***/ @@ -583,12 +588,19 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* pFunction, LPD3DXCONSTANTTABLE* ppConstantTable) { ID3DXConstantTableImpl* object; + HRESULT hr; + LPCVOID data; + UINT size; FIXME("(%p, %x, %p): semi-stub\n", pFunction, flags, ppConstantTable); if (!pFunction || !ppConstantTable) return D3DERR_INVALIDCALL; + hr = D3DXFindShaderComment(pFunction, MAKEFOURCC('C','T','A','B'), &data, &size); + if (hr != D3D_OK) + return D3DXERR_INVALIDDATA; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXConstantTableImpl)); if (!object) { @@ -599,6 +611,16 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* pFunction, object->lpVtbl = &ID3DXConstantTable_Vtbl; object->ref = 1; + object->ctab = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (!object->ctab) + { + HeapFree(GetProcessHeap(), 0, object); + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + object->size = size; + memcpy(object->ctab, data, object->size); + *ppConstantTable = (LPD3DXCONSTANTTABLE)object; return D3D_OK; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 03c77c2..8a2a5b1 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -48,6 +48,13 @@ static const DWORD shader_with_ctab[] = { 0x0004fffe, FCC_TEXT, 0x00000000, 0x00000000, 0x00000000, /* TEXT comment */ 0x0000ffff}; /* END */ +static const DWORD shader_with_invalid_ctab[] = { + 0xfffe0300, /* vs_3_0 */ + 0x0005fffe, FCC_CTAB, /* CTAB comment */ + 0x0000001c, 0x000000a9, 0xfffe0300, + 0x00000000, 0x00000000, + 0x0000ffff}; /* END */ + static void test_get_shader_size(void) { UINT shader_size, expected; @@ -107,9 +114,44 @@ static void test_find_shader_comment(void) ok(size == 20, "Got result %d, expected 20\n", size); } +static void test_get_shader_constant_table_ex(void) +{ + LPD3DXCONSTANTTABLE constant_table = NULL; + HRESULT hr; + LPVOID data; + DWORD size; + + hr = D3DXGetShaderConstantTableEx(NULL, 0, &constant_table); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + /* No CTAB data */ + hr = D3DXGetShaderConstantTableEx(simple_ps, 0, &constant_table); + ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DXERR_INVALIDDATA); + + /* With invalid CTAB data */ + hr = D3DXGetShaderConstantTableEx(shader_with_invalid_ctab, 0, &constant_table); + todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); + if (constant_table) ID3DXConstantTable_Release(constant_table); + + hr = D3DXGetShaderConstantTableEx(shader_with_ctab, 0, &constant_table); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + if (constant_table) + { + size = ID3DXConstantTable_GetBufferSize(constant_table); + ok(size == 20, "Got result %x, expected 20\n", size); + + data = ID3DXConstantTable_GetBufferPointer(constant_table); + ok(!memcmp(data, shader_with_ctab + 6, size), "Retreived wrong CTAB data\n"); + + ID3DXConstantTable_Release(constant_table); + } +} + START_TEST(shader) { test_get_shader_size(); test_get_shader_version(); test_find_shader_comment(); + test_get_shader_constant_table_ex(); } diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index 6d11b3d..766d4ca 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -288,6 +288,13 @@ HRESULT WINAPI D3DXAssembleShader(LPCSTR data, LPD3DXBUFFER* shader, LPD3DXBUFFER* error_messages); +HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, + DWORD flags, + LPD3DXCONSTANTTABLE* constant_table); + +HRESULT WINAPI D3DXGetShaderConstantTable(CONST DWORD* byte_code, + LPD3DXCONSTANTTABLE* constant_table); + #ifdef __cplusplus } #endif

1 0

Christian Costa : d3dxof: Use proper macro for AddRef.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: feaf2904bf1f3525f44484ead29ffff840885239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feaf2904bf1f3525f44484ead… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:36:37 2010 +0100 d3dxof: Use proper macro for AddRef. --- dlls/d3dxof/d3dxof.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index d385e0d..88a9e52 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -97,7 +97,7 @@ static HRESULT WINAPI IDirectXFileImpl_QueryInterface(IDirectXFile* iface, REFII if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectXFile)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; } @@ -482,7 +482,7 @@ static HRESULT WINAPI IDirectXFileBinaryImpl_QueryInterface(IDirectXFileBinary* || IsEqualGUID(riid, &IID_IDirectXFileObject) || IsEqualGUID(riid, &IID_IDirectXFileBinary)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; } @@ -610,7 +610,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_QueryInterface(IDirectXFileData* ifac || IsEqualGUID(riid, &IID_IDirectXFileObject) || IsEqualGUID(riid, &IID_IDirectXFileData)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; } @@ -853,7 +853,7 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_QueryInterface(IDirectXFileD || IsEqualGUID(riid, &IID_IDirectXFileObject) || IsEqualGUID(riid, &IID_IDirectXFileDataReference)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; } @@ -985,7 +985,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_QueryInterface(IDirectXFileEnum if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectXFileEnumObject)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; } @@ -1195,7 +1195,7 @@ static HRESULT WINAPI IDirectXFileSaveObjectImpl_QueryInterface(IDirectXFileSave if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectXFileSaveObject)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; }

1 0

Christian Costa : ddraw/tests: Fix typos.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 2e48bdd14410c0422dc485d61a0c4178b6759404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e48bdd14410c0422dc485d61… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:38:32 2010 +0100 ddraw/tests: Fix typos. --- dlls/ddraw/tests/d3d.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index e922f5d..6d58c67 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3184,8 +3184,8 @@ static void SetRenderTargetTest(void) ok(vp.dwY == 10, "vp.dwY is %u, expected 10\n", vp.dwY); ok(vp.dwWidth == 246, "vp.dwWidth is %u, expected 246\n", vp.dwWidth); ok(vp.dwHeight == 246, "vp.dwHeight is %u, expected 246\n", vp.dwHeight); - ok(vp.dvMinZ == 0.25, "vp.dvMinZ is %f, expected 0.1\n", vp.dvMinZ); - ok(vp.dvMaxZ == 0.75, "vp.dvMaxZ is %f, expected 0.9\n", vp.dvMaxZ); + ok(vp.dvMinZ == 0.25, "vp.dvMinZ is %f, expected 0.25\n", vp.dvMinZ); + ok(vp.dvMaxZ == 0.75, "vp.dvMaxZ is %f, expected 0.75\n", vp.dvMaxZ); memset(&vp, 0, sizeof(vp)); vp.dwX = 0;

1 0

Henri Verbeet : winex11.drv: Use the bitmap's "topdown" field in X11DRV_SetDIBits().
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: a2d569a0e61eaf56dc127db4db56ab80b1bc42f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2d569a0e61eaf56dc127db4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 1 12:39:52 2010 +0100 winex11.drv: Use the bitmap's "topdown" field in X11DRV_SetDIBits(). --- dlls/winex11.drv/dib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 7608b38..755c9d8 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4054,7 +4054,7 @@ INT CDECL X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start UINT y; TRACE("syncing compatible set bits to app bits\n"); - if ((tmpheight < 0) ^ (ds.dsBmih.biHeight < 0)) + if ((tmpheight < 0) ^ physBitmap->topdown) { dbits += dstwidthb * (lines-1); dstwidthb = -dstwidthb;

1 0

Christian Costa : d3drm: Use proper macro for AddRef.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: edb9fad0a828c351fa81d1b87b6fb75de1afe750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb9fad0a828c351fa81d1b87… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:38:58 2010 +0100 d3drm: Use proper macro for AddRef. --- dlls/d3drm/d3drm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 72eb864..a14226c 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -68,7 +68,7 @@ static HRESULT WINAPI IDirect3DRMImpl_QueryInterface(IDirect3DRM* iface, REFIID if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DRM)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; }

1 0

Henri Verbeet : winex11.drv: Store if a bitmap is top-down in X_PHYSBITMAP.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: f331fe4c2721efb40df1bc6b8ad0a25778beb80c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f331fe4c2721efb40df1bc6b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 1 12:39:51 2010 +0100 winex11.drv: Store if a bitmap is top-down in X_PHYSBITMAP. GetObject() is supposed to return the absolute height, and there's no other way to retrieve this information after the bitmap is created. --- dlls/winex11.drv/bitblt.c | 4 ++-- dlls/winex11.drv/dib.c | 5 +++++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 50a5a2f..ff90564 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1308,7 +1308,7 @@ static BOOL client_side_dib_copy( X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc bytesToCopy = width * bytesPerPixel; - if (srcDib.dsBmih.biHeight < 0) + if (physDevSrc->bitmap->topdown) { srcPtr = &physDevSrc->bitmap->base[ySrc*srcDib.dsBm.bmWidthBytes + xSrc*bytesPerPixel]; srcRowOffset = srcDib.dsBm.bmWidthBytes; @@ -1319,7 +1319,7 @@ static BOOL client_side_dib_copy( X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc + xSrc*bytesPerPixel]; srcRowOffset = -srcDib.dsBm.bmWidthBytes; } - if (dstDib.dsBmih.biHeight < 0) + if (physDevDst->bitmap->topdown) { dstPtr = &physDevDst->bitmap->base[yDst*dstDib.dsBm.bmWidthBytes + xDst*bytesPerPixel]; dstRowOffset = dstDib.dsBm.bmWidthBytes; diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index bf18519..7608b38 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4726,12 +4726,17 @@ HBITMAP CDECL X11DRV_CreateDIBSection( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, { X_PHYSBITMAP *physBitmap; DIBSECTION dib; + WORD bpp, compr; + LONG w, h; #ifdef HAVE_LIBXXSHM int major, minor; Bool pixmaps; #endif + DIB_GetBitmapInfo( &bmi->bmiHeader, &w, &h, &bpp, &compr ); + if (!(physBitmap = X11DRV_init_phys_bitmap( hbitmap ))) return 0; + if (h < 0) physBitmap->topdown = TRUE; physBitmap->status = DIB_Status_None; GetObjectW( hbitmap, sizeof(dib), &dib ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 001836f..13d67e6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -127,6 +127,7 @@ typedef struct int *colorMap; /* color map info */ int nColorMap; BOOL trueColor; + BOOL topdown; CRITICAL_SECTION lock; /* GDI access lock */ enum x11drv_shm_mode shm_mode; #ifdef HAVE_LIBXXSHM

1 0

Maarten Lankhorst : include: Add devpropdev.h.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: ae9f9fa25ea1e1a600bfb059fc6b04c8306151e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9f9fa25ea1e1a600bfb059f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jan 31 20:27:46 2010 +0100 include: Add devpropdev.h. --- include/Makefile.in | 1 + include/devpropdef.h | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 514cebe..8849b52 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -204,6 +204,7 @@ SRCDIR_INCLUDES = \ ddrawi.h \ devenum.idl \ devguid.h \ + devpropdef.h \ digitalv.h \ dinput.h \ dispdib.h \ diff --git a/include/devpropdef.h b/include/devpropdef.h new file mode 100644 index 0000000..5eed9e7 --- /dev/null +++ b/include/devpropdef.h @@ -0,0 +1,105 @@ +/* + * Copyright (C) 2010 Maarten Lankhorst for Codeweavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _DEVPROPDEF_H_ +#define _DEVPROPDEF_H_ + +typedef ULONG DEVPROPTYPE, *PDEVPROPTYPE; + +#define DEVPROP_TYPEMOD_ARRAY 0x1000 +#define DEVPROP_TYPEMOD_LIST 0x2000 +#define MAX_DEVPROP_TYPEMOD DEVPROP_TYPEMOD_LIST + +#define DEVPROP_TYPE_EMPTY 0x00 +#define DEVPROP_TYPE_NULL 0x01 +#define DEVPROP_TYPE_SBYTE 0x02 +#define DEVPROP_TYPE_BYTE 0x03 +#define DEVPROP_TYPE_INT16 0x04 +#define DEVPROP_TYPE_UINT16 0x05 +#define DEVPROP_TYPE_INT32 0x06 +#define DEVPROP_TYPE_UINT32 0x07 +#define DEVPROP_TYPE_INT64 0x08 +#define DEVPROP_TYPE_UINT64 0x09 +#define DEVPROP_TYPE_FLOAT 0x0a +#define DEVPROP_TYPE_DOUBLE 0x0b +#define DEVPROP_TYPE_DECIMAL 0x0c +#define DEVPROP_TYPE_GUID 0x0d +#define DEVPROP_TYPE_CURRENCY 0x0e +#define DEVPROP_TYPE_DATE 0x0f +#define DEVPROP_TYPE_FILETIME 0x10 +#define DEVPROP_TYPE_BOOLEAN 0x11 +#define DEVPROP_TYPE_STRING 0x12 +#define DEVPROP_TYPE_STRING_LIST (DEVPROP_TYPE_STRING|DEVPROP_TYPEMOD_LIST) +#define DEVPROP_TYPE_SECURITY_DESCRIPTOR 0x13 +#define DEVPROP_TYPE_SECURITY_DESCRIPTOR_STRING 0x14 +#define DEVPROP_TYPE_DEVPROPKEY 0x15 +#define DEVPROP_TYPE_DEVPROPTYPE 0x16 +#define DEVPROP_TYPE_BINARY (DEVPROP_TYPE_BYTE|DEVPROP_TYPEMOD_ARRAY) +#define DEVPROP_TYPE_ERROR 0x17 +#define DEVPROP_TYPE_NTSTATUS 0x18 +#define DEVPROP_TYPE_STRING_INDIRECT 0x19 +#define MAX_DEVPROP_TYPE DEVPROP_TYPE_STRING_INDIRECT + +#define DEVPROP_MASK_TYPE 0x0fff +#define DEVPROP_MASK_TYPEMOD 0xf000 + +typedef CHAR DEVPROP_BOOLEAN, *PDEVPROP_BOOLEAN; +#define DEVPROP_TRUE ((DEVPROP_BOOLEAN)-1) +#define DEVPROP_FALSE ((DEVPROP_BOOLEAN)0) + +#ifndef DEVPROPKEY_DEFINED +#define DEVPROPKEY_DEFINED +typedef GUID DEVPROPGUID, *PDEVPROPGUID; +typedef ULONG DEVPROPID, *PDEVPROPID; + +typedef struct _DEVPROPKEY { + DEVPROPGUID fmtid; + DEVPROPID pid; +} DEVPROPKEY, *PDEVPROPKEY; + +#define DEVPROPID_FIRST_USABLE 2 + +#endif /*DEVPROPKEY_DEFINED*/ + +#endif /*_DEVPROPDEF_H_*/ + +#undef DEFINE_DEVPROPKEY +#ifdef INITGUID +#ifdef __cplusplus +#define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ + EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY; \ + EXTERN_C const DEVPROPKEY name = \ + { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } +#else +#define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ + const DEVPROPKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY; \ + const DEVPROPKEY name = \ + { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } +#endif +#else +#define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ + EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY +#endif + +#ifndef IsEqualDevPropKey +#ifdef __cplusplus +#define IsEqualDevPropKey(a,b) (((a).pid == (b).pid) && IsEqualIID((a).fmtid,(b).fmtid)) +#else +#define IsEqualDevPropKey(a,b) (((a).pid == (b).pid) && IsEqualIID(&(a).fmtid,&(b).fmtid)) +#endif +#endif

1 0

Jeff Latimer : usp10: Fix trace to remove an incorrect assignment.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: d970ea7fd72f729c0203a3c83258e4cb1586480f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d970ea7fd72f729c0203a3c83… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sun Feb 28 22:58:44 2010 +1100 usp10: Fix trace to remove an incorrect assignment. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 523bd4f..a8ae4ce 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -604,7 +604,7 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem * checks the n+1 structure */ memset(&pItems[index+1].a, 0, sizeof(SCRIPT_ANALYSIS)); - TRACE("index=%d cnt=%d iCharPos=%d\n", index+1, cnt, pItems[index+1].iCharPos = cnt); + TRACE("index=%d cnt=%d iCharPos=%d\n", index+1, cnt, pItems[index+1].iCharPos); /* Set one SCRIPT_STATE item being returned */ if (pcItems) *pcItems = index + 1;

1 0

Christian Costa : d3dxof: Allow templates to be defined anywhere in objects file.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 074465b6751189bf61cefc77850bb03f919b8a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=074465b6751189bf61cefc778… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:36:19 2010 +0100 d3dxof: Allow templates to be defined anywhere in objects file. --- dlls/d3dxof/d3dxof.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 0f800bf..eccdf98 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1034,6 +1034,23 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE return DXFILEERR_NOMOREOBJECTS; } + /* Check if there are templates defined before the object */ + while (This->buf.rem_bytes && is_template_available(&This->buf)) + { + if (!parse_template(&This->buf)) + { + TRACE("Template is not correct\n"); + hr = DXFILEERR_BADVALUE; + goto error; + } + else + { + TRACE("Template successfully parsed:\n"); + if (TRACE_ON(d3dxof)) + dump_template(This->pDirectXFile->xtemplates, &This->pDirectXFile->xtemplates[This->pDirectXFile->nb_xtemplates - 1]); + } + } + if (!This->buf.rem_bytes) return DXFILEERR_NOMOREOBJECTS;

1 0

Nikolay Sivov : kernel32/lcformat: Get rid of back jumps on errors.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 464ece6474c4c06404b2ca80f6538f3c6edf55cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=464ece6474c4c06404b2ca80f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 1 01:22:28 2010 +0300 kernel32/lcformat: Get rid of back jumps on errors. --- dlls/kernel32/lcformat.c | 68 +++++++++++++++++++++++++++------------------ 1 files changed, 41 insertions(+), 27 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 99d1c46..b6432f8 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -756,7 +756,6 @@ static INT NLS_GetDateTimeFormatA(LCID lcid, DWORD dwFlags, if (NLS_IsUnicodeOnlyLcid(lcid)) { -GetDateTimeFormatA_InvalidParameter: SetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -765,7 +764,11 @@ GetDateTimeFormatA_InvalidParameter: { const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); if (!node) - goto GetDateTimeFormatA_InvalidParameter; + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + cp = node->dwCodePage; } @@ -967,7 +970,6 @@ INT WINAPI GetNumberFormatA(LCID lcid, DWORD dwFlags, if (NLS_IsUnicodeOnlyLcid(lcid)) { -GetNumberFormatA_InvalidParameter: SetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -976,7 +978,11 @@ GetNumberFormatA_InvalidParameter: { const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); if (!node) - goto GetNumberFormatA_InvalidParameter; + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + cp = node->dwCodePage; } @@ -1048,9 +1054,7 @@ INT WINAPI GetNumberFormatW(LCID lcid, DWORD dwFlags, !IsValidLocale(lcid, 0) || (lpFormat && (dwFlags || !lpFormat->lpDecimalSep || !lpFormat->lpThousandSep))) { -GetNumberFormatW_Error: - SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); - return 0; + goto error; } if (!lpFormat) @@ -1058,7 +1062,7 @@ GetNumberFormatW_Error: const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); if (!node) - goto GetNumberFormatW_Error; + goto error; lpFormat = &node->fmt; lpszNegStart = lpszNeg = GetNegative(node); } @@ -1089,23 +1093,23 @@ GetNumberFormatW_Error: else if (*szSrc == '-') { if (dwState) - goto GetNumberFormatW_Error; /* '-' not first character */ + goto error; /* '-' not first character */ dwState |= NF_ISNEGATIVE; } else if (*szSrc == '.') { if (dwState & NF_ISREAL) - goto GetNumberFormatW_Error; /* More than one '.' */ + goto error; /* More than one '.' */ dwState |= NF_ISREAL; } else - goto GetNumberFormatW_Error; /* Invalid char */ + goto error; /* Invalid char */ szSrc++; } szSrc--; /* Point to last character */ if (!(dwState & NF_DIGITS)) - goto GetNumberFormatW_Error; /* No digits */ + goto error; /* No digits */ /* Add any trailing negative sign */ if (dwState & NF_ISNEGATIVE) @@ -1263,6 +1267,10 @@ GetNumberFormatW_Error: } } return iRet; + +error: + SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); + return 0; } /************************************************************************** @@ -1307,7 +1315,6 @@ INT WINAPI GetCurrencyFormatA(LCID lcid, DWORD dwFlags, if (NLS_IsUnicodeOnlyLcid(lcid)) { -GetCurrencyFormatA_InvalidParameter: SetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -1316,7 +1323,11 @@ GetCurrencyFormatA_InvalidParameter: { const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); if (!node) - goto GetCurrencyFormatA_InvalidParameter; + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + cp = node->dwCodePage; } @@ -1416,9 +1427,7 @@ INT WINAPI GetCurrencyFormatW(LCID lcid, DWORD dwFlags, !lpFormat->lpCurrencySymbol || lpFormat->NegativeOrder > 15 || lpFormat->PositiveOrder > 3))) { -GetCurrencyFormatW_Error: - SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); - return 0; + goto error; } if (!lpFormat) @@ -1426,7 +1435,8 @@ GetCurrencyFormatW_Error: const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); if (!node) - goto GetCurrencyFormatW_Error; + goto error; + lpFormat = &node->cyfmt; lpszNegStart = lpszNeg = GetNegative(node); } @@ -1459,23 +1469,23 @@ GetCurrencyFormatW_Error: else if (*szSrc == '-') { if (dwState) - goto GetCurrencyFormatW_Error; /* '-' not first character */ + goto error; /* '-' not first character */ dwState |= NF_ISNEGATIVE; } else if (*szSrc == '.') { if (dwState & NF_ISREAL) - goto GetCurrencyFormatW_Error; /* More than one '.' */ + goto error; /* More than one '.' */ dwState |= NF_ISREAL; } else - goto GetCurrencyFormatW_Error; /* Invalid char */ + goto error; /* Invalid char */ szSrc++; } szSrc--; /* Point to last character */ if (!(dwState & NF_DIGITS)) - goto GetCurrencyFormatW_Error; /* No digits */ + goto error; /* No digits */ if (dwState & NF_ISNEGATIVE) dwFmt = NLS_NegCyFormats[lpFormat->NegativeOrder]; @@ -1650,6 +1660,10 @@ GetCurrencyFormatW_Error: } } return iRet; + +error: + SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); + return 0; } /* FIXME: Everything below here needs to move somewhere else along with the @@ -1949,7 +1963,7 @@ static BOOL NLS_EnumCalendarInfoAW(void *calinfoproc, LCID locale, if (opt == NULL) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto NLS_EnumCalendarInfoAW_Cleanup; + goto cleanup; } if (GetLocaleInfoW(locale, LOCALE_IOPTIONALCALENDAR, opt, optSz)) iter = opt; @@ -1976,14 +1990,14 @@ static BOOL NLS_EnumCalendarInfoAW(void *calinfoproc, LCID locale, if (bufSz >= newSz) { ERR("Buffer resizing disorder: was %d, requested %d.\n", bufSz, newSz); - goto NLS_EnumCalendarInfoAW_Cleanup; + goto cleanup; } bufSz = newSz; WARN("Buffer too small; resizing to %d bytes.\n", bufSz); buf = HeapReAlloc(GetProcessHeap(), 0, buf, bufSz); if (buf == NULL) - goto NLS_EnumCalendarInfoAW_Cleanup; - } else goto NLS_EnumCalendarInfoAW_Cleanup; + goto cleanup; + } else goto cleanup; } } while (!ret); @@ -2017,7 +2031,7 @@ static BOOL NLS_EnumCalendarInfoAW(void *calinfoproc, LCID locale, } } -NLS_EnumCalendarInfoAW_Cleanup: +cleanup: HeapFree(GetProcessHeap(), 0, opt); HeapFree(GetProcessHeap(), 0, buf); return ret;

1 0