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

Alistair Leslie-Hughes : ole32/tests: Assign a default value (clang).
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: d764b5188edb5187f736a3708679222f3b496dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d764b5188edb5187f736a3708… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 31 20:00:39 2012 +1100 ole32/tests: Assign a default value (clang). --- dlls/ole32/tests/ole2.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 6641683..7b4f36a 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -914,6 +914,7 @@ static void test_OleCreate(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); trace("end\n"); + g_expected_fetc = NULL; } static void test_OleLoad(IStorage *pStorage)

1 0

Alistair Leslie-Hughes : advapi32: Assign a default value (clang).
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: 77b9d585562154b6b810b8e1ac0738f84bb826f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b9d585562154b6b810b8e1a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 31 20:14:42 2012 +1100 advapi32: Assign a default value (clang). --- dlls/advapi32/service.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index bdebc91..025d6c9 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -755,7 +755,7 @@ SC_HANDLE WINAPI OpenSCManagerA( LPCSTR lpMachineName, LPCSTR lpDatabaseName, SC_HANDLE WINAPI OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, DWORD dwDesiredAccess ) { - SC_HANDLE handle; + SC_HANDLE handle = 0; LONG r; TRACE("(%s,%s,0x%08x)\n", debugstr_w(lpMachineName), @@ -899,7 +899,7 @@ SC_HANDLE WINAPI OpenServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName, SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, DWORD dwDesiredAccess) { - SC_HANDLE handle; + SC_HANDLE handle = 0; DWORD err; TRACE("%p %s %d\n", hSCManager, debugstr_w(lpServiceName), dwDesiredAccess); @@ -942,7 +942,7 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, LPCWSTR lpDependencies, LPCWSTR lpServiceStartName, LPCWSTR lpPassword ) { - SC_HANDLE handle; + SC_HANDLE handle = 0; DWORD err; SIZE_T passwdlen;

1 0

André Hentschel : windowscodecs: Add stub for DllCanUnloadNow.
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: 10cd34db38d7b982294e123d0bcdfa67ab1af193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10cd34db38d7b982294e123d0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 10 20:17:42 2012 +0100 windowscodecs: Add stub for DllCanUnloadNow. --- dlls/windowscodecs/main.c | 5 +++++ dlls/windowscodecs/windowscodecs.spec | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index a6588fd..8dd847e 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -49,6 +49,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return WIC_DllMain(hinstDLL, fdwReason, lpvReserved); } +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, UINT srcwidth, UINT srcheight, INT srcstride, const WICRect *rc, UINT dststride, UINT dstbuffersize, BYTE *dstbuffer) diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index d0b6a7e..71022cb 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -1,3 +1,4 @@ +@ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer()

1 0

Christian Costa : d3drm: If there is no texture coordinates in loaded mesh, generate default texture coordinates for each vertex.
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: b89c32b2a12f78572da336d982aa53b8c8bb99d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b89c32b2a12f78572da336d98… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 16 08:16:18 2012 +0100 d3drm: If there is no texture coordinates in loaded mesh, generate default texture coordinates for each vertex. --- dlls/d3drm/meshbuilder.c | 14 +++++++++++- dlls/d3drm/tests/d3drm.c | 54 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index e9d0e67..43ce2d6 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1272,6 +1272,18 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* /* Set size (in number of DWORD) of all faces data */ This->face_data_size = faces_data_size; + /* If there is no texture coordinates, generate default texture coordinates (0.0f, 0.0f) for each vertex */ + if (!This->pCoords2d) + { + This->nb_coords2d = This->nb_vertices; + This->pCoords2d = HeapAlloc(GetProcessHeap(), 0, This->nb_coords2d * sizeof(Coords2d)); + for (i = 0; i < This->nb_coords2d; i++) + { + This->pCoords2d[i].u = 0.0f; + This->pCoords2d[i].v = 0.0f; + } + } + ret = D3DRM_OK; end: @@ -1603,7 +1615,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetTextureCoordinates(IDirect3 TRACE("(%p)->(%d,%p,%p)\n", This, index, u, v); if (index >= This->nb_coords2d) - return D3DRMERR_NOTFOUND; + return D3DRMERR_BADVALUE; *u = This->pCoords2d[index].u; *v = This->pCoords2d[index].v; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1732db6..341519b 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -180,12 +180,33 @@ static void test_MeshBuilder(void) todo_wine ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2); ok(val3 == 22, "Wrong number of face data bytes %d (must be 22)\n", val3); + /* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */ + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 0, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); valu = 1.23f; valv = 3.21f; hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 1, &valu, &valv); - todo_wine ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); - todo_wine ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); - todo_wine ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 2, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 3, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 4, &valu, &valv); + ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr); valu = 1.23f; valv = 3.21f; @@ -302,12 +323,33 @@ static void test_MeshBuilder3(void) ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1); + /* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */ + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 0, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); valu = 1.23f; valv = 3.21f; hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 1, &valu, &valv); - todo_wine ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); - todo_wine ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); - todo_wine ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 2, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 3, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 4, &valu, &valv); + ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr); valu = 1.23f; valv = 3.21f;

1 0

Christian Costa : d3drm: Add refcount info to AddRef and Release traces.
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: ea532f633c6af03c642537cce2925da22c2fdf9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea532f633c6af03c642537cce… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 16 08:16:10 2012 +0100 d3drm: Add refcount info to AddRef and Release traces. --- dlls/d3drm/d3drm.c | 7 ++++--- dlls/d3drm/device.c | 7 ++++--- dlls/d3drm/frame.c | 7 ++++--- dlls/d3drm/meshbuilder.c | 7 ++++--- dlls/d3drm/viewport.c | 7 ++++--- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 879d8b0..d140c08 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -87,10 +87,11 @@ static HRESULT WINAPI IDirect3DRMImpl_QueryInterface(IDirect3DRM* iface, REFIID static ULONG WINAPI IDirect3DRMImpl_AddRef(IDirect3DRM* iface) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p)\n", iface, This); + TRACE("(%p/%p)->(): new ref = %d\n", iface, This, ref); - return InterlockedIncrement(&This->ref); + return ref; } static ULONG WINAPI IDirect3DRMImpl_Release(IDirect3DRM* iface) @@ -98,7 +99,7 @@ static ULONG WINAPI IDirect3DRMImpl_Release(IDirect3DRM* iface) IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p)\n", iface, This); + TRACE("(%p/%p)->(): new ref = %d\n", iface, This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 559128e..e6d1036 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -93,10 +93,11 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_QueryInterface(IDirect3DRMDevice2* static ULONG WINAPI IDirect3DRMDevice2Impl_AddRef(IDirect3DRMDevice2* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(): new ref = %d\n", iface, ref); - return InterlockedIncrement(&This->ref); + return ref; } static ULONG WINAPI IDirect3DRMDevice2Impl_Release(IDirect3DRMDevice2* iface) @@ -104,7 +105,7 @@ static ULONG WINAPI IDirect3DRMDevice2Impl_Release(IDirect3DRMDevice2* iface) IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(): new ref = %d\n", iface, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index d91def8..5d5427f 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -78,10 +78,11 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_QueryInterface(IDirect3DRMFrame2* if static ULONG WINAPI IDirect3DRMFrame2Impl_AddRef(IDirect3DRMFrame2* iface) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(): new ref = %d\n", This, ref); - return InterlockedIncrement(&This->ref); + return ref; } static ULONG WINAPI IDirect3DRMFrame2Impl_Release(IDirect3DRMFrame2* iface) @@ -89,7 +90,7 @@ static ULONG WINAPI IDirect3DRMFrame2Impl_Release(IDirect3DRMFrame2* iface) IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(): new ref = %d\n", This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 6f5451b..e9d0e67 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -322,10 +322,11 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_QueryInterface(IDirect3DRMMesh static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_AddRef(IDirect3DRMMeshBuilder2* iface) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(): new ref = %d\n", This, ref); - return InterlockedIncrement(&This->ref); + return ref; } static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2* iface) @@ -333,7 +334,7 @@ static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2* IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(): new ref = %d\n", This, ref); if (!ref) { diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 16e812a..5122140 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -80,10 +80,11 @@ static HRESULT WINAPI IDirect3DRMViewportImpl_QueryInterface(IDirect3DRMViewport static ULONG WINAPI IDirect3DRMViewportImpl_AddRef(IDirect3DRMViewport* iface) { IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(): new ref = %d\n", This, ref); - return InterlockedIncrement(&This->ref); + return ref; } static ULONG WINAPI IDirect3DRMViewportImpl_Release(IDirect3DRMViewport* iface) @@ -91,7 +92,7 @@ static ULONG WINAPI IDirect3DRMViewportImpl_Release(IDirect3DRMViewport* iface) IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(): new ref = %d\n", This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This);

1 0

Carlo Bramini : shlwapi: Implemented StrToInt64ExA/W.
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: a1af8395165a85c086745dd224f105c07c983fdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1af8395165a85c086745dd22… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Thu Mar 8 14:35:56 2012 +0100 shlwapi: Implemented StrToInt64ExA/W. --- dlls/shlwapi/shlwapi.spec | 2 + dlls/shlwapi/string.c | 42 ++++++++++++++++-- dlls/shlwapi/tests/string.c | 99 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 133 insertions(+), 10 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index deb8a48..40e2ee9 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -804,6 +804,8 @@ @ stdcall StrStrNW(wstr wstr long) @ stdcall StrStrNIW(wstr wstr long) @ stdcall StrStrW(wstr wstr) +@ stdcall StrToInt64ExA(str long ptr) +@ stdcall StrToInt64ExW(wstr long ptr) @ stdcall StrToIntA(str) @ stdcall StrToIntExA(str long ptr) @ stdcall StrToIntExW(wstr long ptr) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 903c981..c65d576 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -91,7 +91,7 @@ static void FillNumberFmt(NUMBERFMTW *fmt, LPWSTR decimal_buffer, int decimal_bu * Format an integer according to the current locale * * RETURNS - * The number of bytes written on success or 0 on failure + * The number of characters written on success or 0 on failure */ static int FormatInt(LONGLONG qdwValue, LPWSTR pszBuf, int cchBuf) { @@ -124,7 +124,7 @@ static int FormatInt(LONGLONG qdwValue, LPWSTR pszBuf, int cchBuf) * after the decimal point * * RETURNS - * The number of bytes written on success or 0 on failure + * The number of characters written on success or 0 on failure */ static int FormatDouble(double value, int decimals, LPWSTR pszBuf, int cchBuf) { @@ -855,8 +855,25 @@ int WINAPI StrToIntW(LPCWSTR lpszStr) */ BOOL WINAPI StrToIntExA(LPCSTR lpszStr, DWORD dwFlags, LPINT lpiRet) { + LONGLONG li; + BOOL bRes; + + TRACE("(%s,%08X,%p)\n", debugstr_a(lpszStr), dwFlags, lpiRet); + + bRes = StrToInt64ExA(lpszStr, dwFlags, &li); + if (bRes) *lpiRet = li; + return bRes; +} + +/************************************************************************* + * StrToInt64ExA [SHLWAPI.@] + * + * See StrToIntExA. + */ +BOOL WINAPI StrToInt64ExA(LPCSTR lpszStr, DWORD dwFlags, LONGLONG *lpiRet) +{ BOOL bNegative = FALSE; - int iRet = 0; + LONGLONG iRet = 0; TRACE("(%s,%08X,%p)\n", debugstr_a(lpszStr), dwFlags, lpiRet); @@ -922,8 +939,25 @@ BOOL WINAPI StrToIntExA(LPCSTR lpszStr, DWORD dwFlags, LPINT lpiRet) */ BOOL WINAPI StrToIntExW(LPCWSTR lpszStr, DWORD dwFlags, LPINT lpiRet) { + LONGLONG li; + BOOL bRes; + + TRACE("(%s,%08X,%p)\n", debugstr_w(lpszStr), dwFlags, lpiRet); + + bRes = StrToInt64ExW(lpszStr, dwFlags, &li); + if (bRes) *lpiRet = li; + return bRes; +} + +/************************************************************************* + * StrToInt64ExW [SHLWAPI.@] + * + * See StrToIntExA. + */ +BOOL WINAPI StrToInt64ExW(LPCWSTR lpszStr, DWORD dwFlags, LONGLONG *lpiRet) +{ BOOL bNegative = FALSE; - int iRet = 0; + LONGLONG iRet = 0; TRACE("(%s,%08X,%p)\n", debugstr_w(lpszStr), dwFlags, lpiRet); diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 5522137..c918bcc 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -65,6 +65,8 @@ static LPWSTR (WINAPI *pStrStrNIW)(LPCWSTR,LPCWSTR,UINT); static INT (WINAPIV *pwnsprintfA)(LPSTR,INT,LPCSTR, ...); static INT (WINAPIV *pwnsprintfW)(LPWSTR,INT,LPCWSTR, ...); static LPWSTR (WINAPI *pStrChrNW)(LPWSTR,WCHAR,UINT); +static BOOL (WINAPI *pStrToInt64ExA)(LPCSTR,DWORD,LONGLONG*); +static BOOL (WINAPI *pStrToInt64ExW)(LPCWSTR,DWORD,LONGLONG*); static int strcmpW(const WCHAR *str1, const WCHAR *str2) { @@ -77,17 +79,19 @@ typedef struct tagStrToIntResult { const char* string; int str_to_int; - int str_to_int_ex; - int str_to_int_hex; + LONGLONG str_to_int64_ex; + LONGLONG str_to_int64_hex; } StrToIntResult; static const StrToIntResult StrToInt_results[] = { { "1099", 1099, 1099, 1099 }, + { "4294967319", 23, ((LONGLONG)1 << 32) | 23, ((LONGLONG)1 << 32) | 23 }, { "+88987", 0, 88987, 88987 }, { "012", 12, 12, 12 }, { "-55", -55, -55, -55 }, { "-0", 0, 0, 0 }, { "0x44ff", 0, 0, 0x44ff }, + { "0x2bdc546291f4b1", 0, 0, ((LONGLONG)0x2bdc54 << 32) | 0x6291f4b1 }, { "+0x44f4", 0, 0, 0x44f4 }, { "-0x44fd", 0, 0, 0x44fd }, { "+ 88987", 0, 0, 0 }, @@ -480,7 +484,7 @@ static void test_StrToIntExA(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int_ex, "converted '%s' wrong (%d)\n", + ok(return_val == (int)result->str_to_int64_ex, "converted '%s' wrong (%d)\n", result->string, return_val); result++; } @@ -493,7 +497,7 @@ static void test_StrToIntExA(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int_hex, "converted '%s' wrong (%d)\n", + ok(return_val == (int)result->str_to_int64_hex, "converted '%s' wrong (%d)\n", result->string, return_val); result++; } @@ -514,7 +518,7 @@ static void test_StrToIntExW(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int_ex, "converted '%s' wrong (%d)\n", + ok(return_val == (int)result->str_to_int64_ex, "converted '%s' wrong (%d)\n", result->string, return_val); result++; } @@ -528,12 +532,91 @@ static void test_StrToIntExW(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int_hex, "converted '%s' wrong (%d)\n", + ok(return_val == (int)result->str_to_int64_hex, "converted '%s' wrong (%d)\n", result->string, return_val); result++; } } +static void test_StrToInt64ExA(void) +{ + const StrToIntResult *result = StrToInt_results; + LONGLONG return_val; + BOOL bRet; + + if (!pStrToInt64ExA) + { + win_skip("StrToInt64ExA() is not available\n"); + return; + } + + while (result->string) + { + return_val = -1; + bRet = pStrToInt64ExA(result->string,0,&return_val); + ok(!bRet || return_val != -1, "No result returned from '%s'\n", + result->string); + if (bRet) + ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%08x%08x)\n", + result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + result++; + } + + result = StrToInt_results; + while (result->string) + { + return_val = -1; + bRet = pStrToInt64ExA(result->string,STIF_SUPPORT_HEX,&return_val); + ok(!bRet || return_val != -1, "No result returned from '%s'\n", + result->string); + if (bRet) + ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%08x%08x)\n", + result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + result++; + } +} + +static void test_StrToInt64ExW(void) +{ + WCHAR szBuff[256]; + const StrToIntResult *result = StrToInt_results; + LONGLONG return_val; + BOOL bRet; + + if (!pStrToInt64ExW) + { + win_skip("StrToInt64ExW() is not available\n"); + return; + } + + while (result->string) + { + return_val = -1; + MultiByteToWideChar(0,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR)); + bRet = pStrToInt64ExW(szBuff, 0, &return_val); + ok(!bRet || return_val != -1, "No result returned from '%s'\n", + result->string); + if (bRet) + ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%08x%08x)\n", + result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + result++; + } + + result = StrToInt_results; + while (result->string) + { + return_val = -1; + MultiByteToWideChar(0,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR)); + bRet = pStrToInt64ExW(szBuff, STIF_SUPPORT_HEX, &return_val); + ok(!bRet || return_val != -1, "No result returned from '%s'\n", + result->string); + if (bRet) + ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%08x%08x)\n", + result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + result++; + } +} + static void test_StrDupA(void) { LPSTR lpszStr; @@ -1422,6 +1505,8 @@ START_TEST(string) pStrStrNIW = (void *)GetProcAddress(hShlwapi, "StrStrNIW"); pwnsprintfA = (void *)GetProcAddress(hShlwapi, "wnsprintfA"); pwnsprintfW = (void *)GetProcAddress(hShlwapi, "wnsprintfW"); + pStrToInt64ExA = (void *)GetProcAddress(hShlwapi, "StrToInt64ExA"); + pStrToInt64ExW = (void *)GetProcAddress(hShlwapi, "StrToInt64ExW"); test_StrChrA(); test_StrChrW(); @@ -1435,6 +1520,8 @@ START_TEST(string) test_StrToIntW(); test_StrToIntExA(); test_StrToIntExW(); + test_StrToInt64ExA(); + test_StrToInt64ExW(); test_StrDupA(); /* language-dependent test */

1 0

Francois Gouget : mssign32: Add a trailing '\n' to a few FIXME() messages.
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: a364a2f06799ac02aac25a769e30795fbfda619c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a364a2f06799ac02aac25a769… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 16 10:16:05 2012 +0100 mssign32: Add a trailing '\n' to a few FIXME() messages. --- dlls/mssign32/mssign32_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c index c58c1f0..ef1065f 100644 --- a/dlls/mssign32/mssign32_main.c +++ b/dlls/mssign32/mssign32_main.c @@ -50,7 +50,7 @@ HRESULT WINAPI PvkGetCryptProv(HWND hwnd, LPCWSTR pwszCaption, LPCWSTR pwszCapiP DWORD dwProviderType, LPCWSTR pwszPvkFile, LPCWSTR pwszKeyContainerName, DWORD *pdwKeySpec, LPWSTR *ppwszTmpContainer, HCRYPTPROV *phCryptProv) { - FIXME("%p %s %s %d %s %s %p %p %p stub", hwnd, debugstr_w(pwszCaption), debugstr_w(pwszCapiProvider), + FIXME("%p %s %s %d %s %s %p %p %p stub\n", hwnd, debugstr_w(pwszCaption), debugstr_w(pwszCapiProvider), dwProviderType, debugstr_w(pwszPvkFile), debugstr_w(pwszKeyContainerName), pdwKeySpec, ppwszTmpContainer, phCryptProv); @@ -61,7 +61,7 @@ BOOL WINAPI PvkPrivateKeyAcquireContextFromMemory(LPCWSTR pwszProvName, DWORD dw BYTE *pbData, DWORD cbData, HWND hwndOwner, LPCWSTR pwszKeyName, DWORD *pdwKeySpec, HCRYPTPROV *phCryptProv, LPWSTR *ppwszTmpContainer) { - FIXME("%s %d %p %d %p %s %p %p %p stub", debugstr_w(pwszProvName), dwProvType, + FIXME("%s %d %p %d %p %s %p %p %p stub\n", debugstr_w(pwszProvName), dwProvType, pbData, cbData, hwndOwner, debugstr_w(pwszKeyName), pdwKeySpec, phCryptProv, ppwszTmpContainer); @@ -71,6 +71,6 @@ BOOL WINAPI PvkPrivateKeyAcquireContextFromMemory(LPCWSTR pwszProvName, DWORD dw void WINAPI PvkFreeCryptProv(HCRYPTPROV hProv, LPCWSTR pwszCapiProvider, DWORD dwProviderType, LPWSTR pwszTmpContainer) { - FIXME("%08lx %s %d %s stub", hProv, debugstr_w(pwszCapiProvider), dwProviderType, + FIXME("%08lx %s %d %s stub\n", hProv, debugstr_w(pwszCapiProvider), dwProviderType, debugstr_w(pwszTmpContainer)); }

1 0

Akihiro Sagawa : msvcrt: Implement _mbcjmstojis.
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: c9f1489cab159c882b7110fa8475d86a5b849124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f1489cab159c882b7110fa8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 15 23:41:33 2012 +0900 msvcrt: Implement _mbcjmstojis. --- dlls/msvcrt/mbcs.c | 18 +++++++++++++++++- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/tests/string.c | 8 ++------ 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index cde1e06..6d3e3fb 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -474,7 +474,23 @@ unsigned int CDECL _mbcjmstojis(unsigned int c) In all other cases, c is returned unchanged */ if(get_mbcinfo()->mbcodepage == 932) { - FIXME("(%x): stub\n", c); + if(_ismbclegal(c) && HIBYTE(c) < 0xf0) + { + if(HIBYTE(c) >= 0xe0) + c -= 0x4000; + + c = (((HIBYTE(c) - 0x81)*2 + 0x21) << 8) | LOBYTE(c); + + if(LOBYTE(c) > 0x7f) + c -= 0x1; + + if(LOBYTE(c) > 0x9d) + c += 0x83; + else + c -= 0x1f; + } + else + return 0; /* Codepage is 932, but c can't be converted */ } return c; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 76f558c..6103c1e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -913,6 +913,7 @@ int _setmbcp_l(int, LCID, MSVCRT_pthreadmbcinfo) DECLSPEC_HIDDEN; int __cdecl MSVCRT__write(int,const void*,unsigned int); int __cdecl _getch(void); int __cdecl _ismbblead(unsigned int); +int __cdecl _ismbclegal(unsigned int c); int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); MSVCRT_size_t __cdecl MSVCRT_mbstowcs(MSVCRT_wchar_t*,const char*,MSVCRT_size_t); MSVCRT_intptr_t __cdecl MSVCRT__spawnve(int,const char*,const char* const *,const char* const *); diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 659afc2..c40451c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -901,12 +901,8 @@ static void test_mbcjmsjis(void) unsigned int ret, exp; ret = _mbcjmstojis(jmsjis[j][0]); exp = (cp[i] == 932) ? jmsjis[j][1] : jmsjis[j][0]; - if (cp[i] == 932) - todo_wine ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n", - exp, ret, jmsjis[j][0], cp[i]); - else - ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n", - exp, ret, jmsjis[j][0], cp[i]); + ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n", + exp, ret, jmsjis[j][0], cp[i]); } } _setmbcp(prev_cp);

1 0

Henri Verbeet : wined3d: Introduce a separate function for parsing the GL extension string.
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: 00ba167c71b63bc356e05cdfef87108a688b13a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ba167c71b63bc356e05cdfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 15 21:49:55 2012 +0100 wined3d: Introduce a separate function for parsing the GL extension string. --- dlls/wined3d/directx.c | 66 ++++++++++++++++++++++++++++------------------- 1 files changed, 39 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 92a2298..d63abf5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -72,13 +72,14 @@ enum wined3d_gl_vendor static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } }; /* Extension detection */ -static const struct +struct wined3d_extension_map { const char *extension_string; enum wined3d_gl_extension extension; DWORD version; -} -EXTENSION_MAP[] = +}; + +static const struct wined3d_extension_map EXTENSION_MAP[] = { /* APPLE */ {"GL_APPLE_client_storage", APPLE_CLIENT_STORAGE, 0 }, @@ -2277,6 +2278,40 @@ static const struct blit_shader *select_blit_implementation(const struct wined3d else return &ffp_blit; } +static void parse_extension_string(struct wined3d_gl_info *gl_info, const char *extensions, + const struct wined3d_extension_map *map, UINT entry_count) +{ + while (*extensions) + { + const char *start; + size_t len; + UINT i; + + while (isspace(*extensions)) + ++extensions; + start = extensions; + while (!isspace(*extensions) && *extensions) + ++extensions; + + len = extensions - start; + if (!len) + continue; + + TRACE_(d3d_caps)("- %s\n", debugstr_an(start, len)); + + for (i = 0; i < entry_count; ++i) + { + if (len == strlen(map[i].extension_string) + && !memcmp(start, map[i].extension_string, len)) + { + TRACE_(d3d_caps)(" FOUND: %s support.\n", map[i].extension_string); + gl_info->supported[map[i].extension] = TRUE; + break; + } + } + } +} + static void load_gl_funcs(struct wined3d_gl_info *gl_info, DWORD gl_version) { DWORD ver; @@ -2404,30 +2439,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->supported[WINED3D_GL_EXT_NONE] = TRUE; - while (*GL_Extensions) - { - const char *start; - - while (isspace(*GL_Extensions)) ++GL_Extensions; - start = GL_Extensions; - while (!isspace(*GL_Extensions) && *GL_Extensions) ++GL_Extensions; - - len = GL_Extensions - start; - if (!len) continue; - - TRACE_(d3d_caps)("- %s\n", debugstr_an(start, len)); - - for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) - { - if (len == strlen(EXTENSION_MAP[i].extension_string) - && !memcmp(start, EXTENSION_MAP[i].extension_string, len)) - { - TRACE_(d3d_caps)(" FOUND: %s support.\n", EXTENSION_MAP[i].extension_string); - gl_info->supported[EXTENSION_MAP[i].extension] = TRUE; - break; - } - } - } + parse_extension_string(gl_info, GL_Extensions, EXTENSION_MAP, sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); /* Now work out what GL support this card really has */ load_gl_funcs( gl_info, gl_version );

1 0

Henri Verbeet : wined3d: The current WGL DC should never be NULL in wined3d_adapter_init_gl_caps().
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: 02ae22d984b95b0f25ba83821030d37f1a7bd968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ae22d984b95b0f25ba83821… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 15 21:49:54 2012 +0100 wined3d: The current WGL DC should never be NULL in wined3d_adapter_init_gl_caps(). --- dlls/wined3d/directx.c | 73 +++++++++++++++++++++++------------------------ 1 files changed, 36 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5c46d07..92a2298 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2823,49 +2823,48 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP] = gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; - /* Make sure there's an active HDC else the WGL extensions will fail */ hdc = pwglGetCurrentDC(); - if (hdc) { - /* Not all GL drivers might offer WGL extensions e.g. VirtualBox */ - if(GL_EXTCALL(wglGetExtensionsStringARB)) - WGL_Extensions = GL_EXTCALL(wglGetExtensionsStringARB(hdc)); - - if (!WGL_Extensions) - { - ERR(" WGL_Extensions returns NULL\n"); - } - else + /* Not all GL drivers might offer WGL extensions e.g. VirtualBox. */ + if (GL_EXTCALL(wglGetExtensionsStringARB)) + WGL_Extensions = GL_EXTCALL(wglGetExtensionsStringARB(hdc)); + if (!WGL_Extensions) + WARN_(d3d_caps)("WGL extensions not supported.\n"); + else + { + TRACE_(d3d_caps)("WGL_Extensions reported:\n"); + while (*WGL_Extensions) { - TRACE_(d3d_caps)("WGL_Extensions reported:\n"); - while (*WGL_Extensions) - { - const char *Start; - char ThisExtn[256]; + const char *start; + char current_ext[256]; - while (isspace(*WGL_Extensions)) WGL_Extensions++; - Start = WGL_Extensions; - while (!isspace(*WGL_Extensions) && *WGL_Extensions) ++WGL_Extensions; + while (isspace(*WGL_Extensions)) + ++WGL_Extensions; + start = WGL_Extensions; + while (!isspace(*WGL_Extensions) && *WGL_Extensions) + ++WGL_Extensions; - len = WGL_Extensions - Start; - if (!len || len >= sizeof(ThisExtn)) - continue; + len = WGL_Extensions - start; + if (!len || len >= sizeof(current_ext)) + continue; - memcpy(ThisExtn, Start, len); - ThisExtn[len] = '\0'; - TRACE_(d3d_caps)("- %s\n", debugstr_a(ThisExtn)); + memcpy(current_ext, start, len); + current_ext[len] = '\0'; + TRACE_(d3d_caps)("- %s\n", debugstr_a(current_ext)); - if (!strcmp(ThisExtn, "WGL_ARB_pixel_format")) { - gl_info->supported[WGL_ARB_PIXEL_FORMAT] = TRUE; - TRACE_(d3d_caps)("FOUND: WGL_ARB_pixel_format support\n"); - } - if (!strcmp(ThisExtn, "WGL_EXT_swap_control")) { - gl_info->supported[WGL_EXT_SWAP_CONTROL] = TRUE; - TRACE_(d3d_caps)("FOUND: WGL_EXT_swap_control support\n"); - } - if (!strcmp(ThisExtn, "WGL_WINE_pixel_format_passthrough")) { - gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH] = TRUE; - TRACE_(d3d_caps)("FOUND: WGL_WINE_pixel_format_passthrough support\n"); - } + if (!strcmp(current_ext, "WGL_ARB_pixel_format")) + { + gl_info->supported[WGL_ARB_PIXEL_FORMAT] = TRUE; + TRACE_(d3d_caps)("FOUND: WGL_ARB_pixel_format support\n"); + } + if (!strcmp(current_ext, "WGL_EXT_swap_control")) + { + gl_info->supported[WGL_EXT_SWAP_CONTROL] = TRUE; + TRACE_(d3d_caps)("FOUND: WGL_EXT_swap_control support\n"); + } + if (!strcmp(current_ext, "WGL_WINE_pixel_format_passthrough")) + { + gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH] = TRUE; + TRACE_(d3d_caps)("FOUND: WGL_WINE_pixel_format_passthrough support\n"); } } }

1 0