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

Christian Costa : d3dx9_36: Implement stubbed ID3DXConstantTable interface.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 66d66f2e22b7624617f551a49380ea9bfb50e5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d66f2e22b7624617f551a49… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:39:18 2010 +0100 d3dx9_36: Implement stubbed ID3DXConstantTable interface. --- dlls/d3dx9_36/shader.c | 325 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 323 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66d66f2e22b7624617f55…

1 0

Christian Costa : d3dx9_36: Implement D3DXFindShaderComment ( based on code from Luis Busquets) + tests.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: ea50ef8e080e5fcf3c637fb9af4de2149239f4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea50ef8e080e5fcf3c637fb9a… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:39:24 2010 +0100 d3dx9_36: Implement D3DXFindShaderComment (based on code from Luis Busquets) + tests. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/shader.c | 33 +++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/shader.c | 38 ++++++++++++++++++++++++++++++++++++++ include/d3dx9shader.h | 1 + 4 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index d22ab5f..7924081 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -129,7 +129,7 @@ @ stub D3DXFillVolumeTexture @ stub D3DXFillVolumeTextureTX @ stub D3DXFilterTexture -@ stub D3DXFindShaderComment +@ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stub D3DXFloat16To32Array @ stub D3DXFloat32To16Array @ stub D3DXFrameAppendChild diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 1106594..22c297e 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -135,6 +135,39 @@ LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device) return NULL; } +HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVOID* data, UINT* size) +{ + CONST DWORD *ptr = byte_code; + + TRACE("(%p, %x, %p, %p)", byte_code, fourcc, data, size); + + if (!byte_code) + return D3DERR_INVALIDCALL; + + while (*++ptr != D3DSIO_END) + { + /* Check if it is a comment */ + if ((*ptr & D3DSI_OPCODE_MASK) == D3DSIO_COMMENT) + { + DWORD comment_size = (*ptr & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; + + /* Check if this is the comment we are looking for */ + if (*(ptr + 1) == fourcc) + { + if (size) + *size = (comment_size - 1) * sizeof(DWORD); + if (data) + *data = ptr + 2; + TRACE("Returning comment data at %p with size %d\n", *data, *size); + return D3D_OK; + } + ptr += comment_size; + } + } + + return S_FALSE; +} + HRESULT WINAPI D3DXAssembleShader(LPCSTR data, UINT data_len, CONST D3DXMACRO* defines, diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index b13fed1..03c77c2 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -37,6 +37,16 @@ static const DWORD simple_ps[] = { 0x00000005, 0x800f0000, 0xb0e40000, 0x80e40000, /* mul r0, t0, r0 */ 0x0000ffff}; /* END */ +#define FCC_TEXT MAKEFOURCC('T','E','X','T') +#define FCC_CTAB MAKEFOURCC('C','T','A','B') + +static const DWORD shader_with_ctab[] = { + 0xfffe0300, /* vs_3_0 */ + 0x0002fffe, FCC_TEXT, 0x00000000, /* TEXT comment */ + 0x0006fffe, FCC_CTAB, 0x0000001c, 0x00000000, 0xfffe0300, 0x00000000, /* CTAB comment */ + 0x00000000, + 0x0004fffe, FCC_TEXT, 0x00000000, 0x00000000, 0x00000000, /* TEXT comment */ + 0x0000ffff}; /* END */ static void test_get_shader_size(void) { @@ -70,8 +80,36 @@ static void test_get_shader_version(void) ok(shader_version == 0, "Got shader version 0x%08x, expected 0\n", shader_version); } +static void test_find_shader_comment(void) +{ + HRESULT hr; + LPCVOID data; + UINT size; + + hr = D3DXFindShaderComment(NULL, MAKEFOURCC('C','T','A','B'), &data, &size); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), NULL, &size); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), &data, NULL); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + hr = D3DXFindShaderComment(shader_with_ctab, 0, &data, &size); + ok(hr == S_FALSE, "Got result %x, expected 1 (S_FALSE)\n", hr); + + hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('X','X','X','X'), &data, &size); + ok(hr == S_FALSE, "Got result %x, expected 1 (S_FALSE)\n", hr); + + hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), &data, &size); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(data == (LPCVOID)(shader_with_ctab + 6), "Got result %p, expected %p\n", data, shader_with_ctab + 6); + ok(size == 20, "Got result %d, expected 20\n", size); +} + START_TEST(shader) { test_get_shader_size(); test_get_shader_version(); + test_find_shader_comment(); } diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index a0df2a8..6d11b3d 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -248,6 +248,7 @@ LPCSTR WINAPI D3DXGetPixelShaderProfile(LPDIRECT3DDEVICE9 device); UINT WINAPI D3DXGetShaderSize(const DWORD *byte_code); DWORD WINAPI D3DXGetShaderVersion(const DWORD *byte_code); LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device); +HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVOID* data, UINT* size); HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename, CONST D3DXMACRO* defines,

1 0

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

01 Mar '10

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

Henri Verbeet : winex11.drv: Store if a bitmap is top-down in X_PHYSBITMAP.
by Alexandre Julliard 01 Mar '10

01 Mar '10

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

Henri Verbeet : winex11.drv: Use the bitmap's "topdown" field in X11DRV_SetDIBits().
by Alexandre Julliard 01 Mar '10

01 Mar '10

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

Henri Verbeet : winex11.drv: Use the bitmap's "topdown" field in X11DRV_AlphaBlend().
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: ba38340cdbf4d925bd9f63450468d73df294aac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba38340cdbf4d925bd9f63450… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 1 12:39:53 2010 +0100 winex11.drv: Use the bitmap's "topdown" field in X11DRV_AlphaBlend(). --- dlls/winex11.drv/xrender.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 041e151..0ff434f 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1969,7 +1969,7 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid } dstbits = data = HeapAlloc(GetProcessHeap(), 0, heightSrc * widthSrc * 4); - if(dib.dsBmih.biHeight < 0) { /* top-down dib */ + if (devSrc->bitmap->topdown) { /* top-down dib */ top_down = TRUE; dstbits += widthSrc * (heightSrc - 1); y2 = ySrc;

1 0

Nikolay Sivov : kernel32/lcformat: Get rid of back jumps on errors.
by Alexandre Julliard 01 Mar '10

01 Mar '10

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

Alexandre Julliard : kernel32: Move shared heap creation to krnl386 and load it by default on Win9x versions .
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 00ac7074df65a0abd7e0ee962c570e2da30349e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ac7074df65a0abd7e0ee962… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 1 11:34:34 2010 +0100 kernel32: Move shared heap creation to krnl386 and load it by default on Win9x versions. --- dlls/kernel32/kernel_main.c | 8 +------- dlls/krnl386.exe16/kernel.c | 3 +++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index cf73052..2308d60 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -123,13 +123,7 @@ static BOOL process_attach( HMODULE module ) /* Securom checks for this one when version is NT */ set_entry_point( module, "FT_Thunk", 0 ); } -#ifdef __i386__ - else - { - /* create the shared heap for broken win95 native dlls */ - HeapCreate( HEAP_SHARED, 0, 0 ); - } -#endif + else LoadLibraryA( "krnl386.exe16" ); /* finish the process initialisation for console bits, if needed */ __wine_set_signal_handler(SIGINT, CONSOLE_HandleCtrlC); diff --git a/dlls/krnl386.exe16/kernel.c b/dlls/krnl386.exe16/kernel.c index b6fbbcb..7658549 100644 --- a/dlls/krnl386.exe16/kernel.c +++ b/dlls/krnl386.exe16/kernel.c @@ -95,6 +95,9 @@ BOOL WINAPI KERNEL_DllEntryPoint( DWORD reasion, HINSTANCE16 inst, WORD ds, if (done) return TRUE; done = 1; + /* create the shared heap for broken win95 native dlls */ + HeapCreate( HEAP_SHARED, 0, 0 ); + /* setup emulation of protected instructions from 32-bit code */ if (GetVersion() & 0x80000000) RtlAddVectoredExceptionHandler( TRUE, INSTR_vectored_handler );

1 0

Alexandre Julliard : makefiles: Fix makedep dependency now that we explicitly to make depend when creating makefiles .
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 877e31c10f9d5fc74fb4eb613ee259874e5249a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=877e31c10f9d5fc74fb4eb613… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 1 11:35:37 2010 +0100 makefiles: Fix makedep dependency now that we explicitly to make depend when creating makefiles. --- tools/Makefile.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index 2f6eaca..1f48cbc 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -83,6 +83,6 @@ uninstall:: $(RM) $(DESTDIR)$(bindir)/winemaker $(DESTDIR)$(bindir)/wineprefixcreate $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(mandir)/man$(prog_manext)/wineprefixcreate.$(prog_manext) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/applications/wine.desktop -$(UPDATE_DESKTOP_DATABASE) -(a)DEPENDENCIES@ # everything below this line is overwritten by make depend +depend: makedep$(EXEEXT) -Makefile: makedep$(EXEEXT) +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend

1 0

Maarten Lankhorst : include: Fix IsEqualPropertyKey definition.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: f6efdd40d8846ea7cc5dd2040bc8c97fad09b90b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6efdd40d8846ea7cc5dd2040… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jan 29 21:51:41 2010 +0100 include: Fix IsEqualPropertyKey definition. --- include/propkeydef.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/propkeydef.h b/include/propkeydef.h index 2a45984..b3a2559 100644 --- a/include/propkeydef.h +++ b/include/propkeydef.h @@ -48,7 +48,11 @@ #endif #ifndef IsEqualPropertyKey +#ifdef __cplusplus #define IsEqualPropertyKey(a,b) (((a).pid == (b).pid) && IsEqualIID((a).fmtid,(b).fmtid)) +#else +#define IsEqualPropertyKey(a,b) (((a).pid == (b).pid) && IsEqualIID(&(a).fmtid,&(b).fmtid)) +#endif #endif #ifndef _PROPERTYKEY_EQUALITY_OPERATORS_

1 0