June 2006 - Wine-Commits - list.winehq.org

H. Verbeet : wined3d: Fix compilation (VBO constants).
by Alexandre Julliard June 27, 2006

June 27, 2006

Module: wine Branch: refs/heads/master Commit: f460b3861216cd123e2ee6eb53b441e46943cd6a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f460b3861216cd123e2ee6e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 27 00:32:25 2006 +0200 wined3d: Fix compilation (VBO constants). --- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/vertexbuffer.c | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 755cb19..9e0f00f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5012,7 +5012,7 @@ process_vertices_strided(IWineD3DDeviceI void *src; GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, dest->vbo)); checkGLcall("glBindBufferARB"); - src = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_READ_ONLY)); + src = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_READ_ONLY_ARB)); if(src) { memcpy(dest->resource.allocatedMemory, src, dest->resource.size); } @@ -5030,7 +5030,7 @@ process_vertices_strided(IWineD3DDeviceI if(dest->vbo) { GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, dest->vbo)); - dest_conv = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_WRITE_ONLY)); + dest_conv = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_WRITE_ONLY_ARB)); if(!dest_conv) { ERR("glMapBuffer failed\n"); /* Continue without storing converted vertices */ @@ -5349,7 +5349,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, SrcImpl->vbo)); checkGLcall("glBindBufferARB"); - src = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_READ_ONLY)); + src = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_READ_ONLY_ARB)); if(src) { memcpy(SrcImpl->resource.allocatedMemory, src, SrcImpl->resource.size); } diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 1d8c0cf..c669a6b 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -142,9 +142,9 @@ static void WINAPI IWineD3DVertexBuf /* Using shaders? No conversion needed, the shaders handle this */ TRACE("Using vertex shaders, not doing any vertex conversion\n"); ENTER_GL(); - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER, This->vbo)); + GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, This->vbo)); checkGLcall("glBindBufferARB"); - GL_EXTCALL(glBufferSubDataARB(GL_ARRAY_BUFFER, 0, This->resource.size, This->resource.allocatedMemory)); + GL_EXTCALL(glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, This->resource.size, This->resource.allocatedMemory)); checkGLcall("glUnmapBuffer glBufferSubDataARB"); LEAVE_GL(); HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); @@ -299,9 +299,9 @@ static void WINAPI IWineD3DVertexBuf } ENTER_GL(); - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER, This->vbo)); + GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, This->vbo)); checkGLcall("glBindBufferARB"); - GL_EXTCALL(glBufferSubDataARB(GL_ARRAY_BUFFER, start, end - start, data)); + GL_EXTCALL(glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, start, end - start, data)); checkGLcall("glBufferSubDataARB"); LEAVE_GL(); @@ -346,21 +346,21 @@ static HRESULT WINAPI IWineD3DVertexBuf data = This->resource.allocatedMemory; This->Flags |= VBFLAG_DIRTY; } else { - GLenum mode = GL_READ_WRITE; + GLenum mode = GL_READ_WRITE_ARB; /* Return data to the VBO */ TRACE("Locking directly into the buffer\n"); if((This->resource.usage & WINED3DUSAGE_WRITEONLY) || ( Flags & D3DLOCK_DISCARD) ) { - mode = GL_WRITE_ONLY; + mode = GL_WRITE_ONLY_ARB; } else if( Flags & (D3DLOCK_READONLY | D3DLOCK_NO_DIRTY_UPDATE) ) { - mode = GL_READ_ONLY; + mode = GL_READ_ONLY_ARB; } ENTER_GL(); - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER, This->vbo)); + GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, This->vbo)); checkGLcall("glBindBufferARB"); - data = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER, mode)); + data = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, mode)); LEAVE_GL(); if(!data) { ERR("glMapBuffer failed\n"); @@ -378,9 +378,9 @@ HRESULT WINAPI IWineD3DVertexBufferImpl TRACE("(%p)\n", This); if(!This->resource.allocatedMemory) { ENTER_GL(); - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER, This->vbo)); + GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, This->vbo)); checkGLcall("glBindBufferARB"); - GL_EXTCALL(glUnmapBufferARB(GL_ARRAY_BUFFER)); + GL_EXTCALL(glUnmapBufferARB(GL_ARRAY_BUFFER_ARB)); checkGLcall("glUnmapBufferARB"); LEAVE_GL(); } else {

1 0

James Hawkins : shlwapi: Add tests for PathAddBackslash.
by Alexandre Julliard June 27, 2006

June 27, 2006

Module: wine Branch: refs/heads/master Commit: 251d76888d70133d3afa2cb8c43a45420175d8c2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=251d76888d70133d3afa2cb… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jun 26 14:41:22 2006 -0700 shlwapi: Add tests for PathAddBackslash. --- dlls/shlwapi/tests/path.c | 63 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 6c116c9..e931d81 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1072,6 +1072,68 @@ static void test_PathCombineA(void) ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); } +static void test_PathAddBackslash(void) +{ + LPSTR str; + char path[MAX_PATH]; + char too_long[LONG_LEN]; + + /* try a NULL path */ + SetLastError(0xdeadbeef); + str = PathAddBackslashA(NULL); + ok(str == NULL, "Expected str == NULL, got %p\n", str); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + + /* try an empty path */ + path[0] = '\0'; + SetLastError(0xdeadbeef); + str = PathAddBackslashA(path); + ok(str == (path + lstrlenA(path)), "Expected str to point to end of path, got %p\n", str); + ok(lstrlenA(path) == 0, "Expected empty string, got %i\n", lstrlenA(path)); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + + /* try a relative path */ + lstrcpyA(path, "one\\two"); + SetLastError(0xdeadbeef); + str = PathAddBackslashA(path); + ok(str == (path + lstrlenA(path)), "Expected str to point to end of path, got %p\n", str); + ok(!lstrcmp(path, "one\\two\\"), "Expected one\\two\\, got %s\n", path); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + + /* try periods */ + lstrcpyA(path, "one\\..\\two"); + SetLastError(0xdeadbeef); + str = PathAddBackslashA(path); + ok(str == (path + lstrlenA(path)), "Expected str to point to end of path, got %p\n", str); + ok(!lstrcmp(path, "one\\..\\two\\"), "Expected one\\..\\two\\, got %s\n", path); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + + /* try just a space */ + lstrcpyA(path, " "); + SetLastError(0xdeadbeef); + str = PathAddBackslashA(path); + ok(str == (path + lstrlenA(path)), "Expected str to point to end of path, got %p\n", str); + ok(!lstrcmp(path, " \\"), "Expected \\, got %s\n", path); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + + /* path already has backslash */ + lstrcpyA(path, "C:\\one\\"); + SetLastError(0xdeadbeef); + str = PathAddBackslashA(path); + ok(str == (path + lstrlenA(path)), "Expected str to point to end of path, got %p\n", str); + ok(!lstrcmp(path, "C:\\one\\"), "Expected C:\\one\\, got %s\n", path); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + + memset(too_long, 'a', LONG_LEN); + too_long[LONG_LEN - 1] = '\0'; + + /* path is longer than MAX_PATH */ + SetLastError(0xdeadbeef); + str = PathAddBackslashA(too_long); + ok(str == NULL, "Expected str == NULL, got %p\n", str); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); +} + START_TEST(path) { hShlwapi = LoadLibraryA("shlwapi.dll"); @@ -1090,6 +1152,7 @@ START_TEST(path) test_PathCreateFromUrl(); test_PathIsUrl(); + test_PathAddBackslash(); test_PathMakePretty(); test_PathMatchSpec();

1 0

James Hawkins : shlwapi: Add tests for PathCombineA.
by Alexandre Julliard June 27, 2006

June 27, 2006

Module: wine Branch: refs/heads/master Commit: 7412bddd363b22186d14e13e373bbf64cc116751 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7412bddd363b22186d14e13… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jun 26 14:37:45 2006 -0700 shlwapi: Add tests for PathCombineA. --- dlls/shlwapi/path.c | 2 dlls/shlwapi/tests/path.c | 218 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 201 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=7412bddd363b22186d1…

1 0

Stefan Dösinger : ddraw: Assign the surface descriptions height to the height.
by Alexandre Julliard June 27, 2006

June 27, 2006

Module: wine Branch: refs/heads/master Commit: 92e48bcea5d368c67bf8f65df6588b138bdc0b08 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=92e48bcea5d368c67bf8f65… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jun 26 17:20:57 2006 +0200 ddraw: Assign the surface descriptions height to the height. --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8e4aac7..b9e7f32 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1319,7 +1319,7 @@ IDirectDrawImpl_EnumDisplayModes(IDirect if (DDSD->dwFlags & DDSD_WIDTH) Width = DDSD->dwWidth; if (DDSD->dwFlags & DDSD_HEIGHT) - Width = DDSD->dwHeight; + Height = DDSD->dwHeight; if ((DDSD->dwFlags & DDSD_PIXELFORMAT) && (DDSD->u4.ddpfPixelFormat.dwFlags & DDPF_RGB) ) pixelformat = PixelFormat_DD2WineD3D(&DDSD->u4.ddpfPixelFormat); }

1 0

James Hawkins : shdocvw: Upgrade the version to 5.50.4134.599.
by Alexandre Julliard June 27, 2006

June 27, 2006

Module: wine Branch: refs/heads/master Commit: e391387c9acc68ea84b8966f635d46be5d7b0134 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e391387c9acc68ea84b8966… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jun 26 13:57:58 2006 -0700 shdocvw: Upgrade the version to 5.50.4134.599. --- dlls/shdocvw/version.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/version.rc b/dlls/shdocvw/version.rc index 62d8865..66d9f8b 100644 --- a/dlls/shdocvw/version.rc +++ b/dlls/shdocvw/version.rc @@ -19,9 +19,9 @@ #define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine core dll" #define WINE_FILENAME_STR "shdocvw.dll" -#define WINE_FILEVERSION 5,50,0,0 -#define WINE_FILEVERSION_STR "5.50.0.0" -#define WINE_PRODUCTVERSION 5,50,0,0 +#define WINE_FILEVERSION 5,50,4134,599 +#define WINE_FILEVERSION_STR "5.50.4134.599" +#define WINE_PRODUCTVERSION 5,50,4134,599 #define WINE_PRODUCTVERSION_STR "5.50" #include "wine/wine_common_ver.rc"

1 0

Stefan Dösinger : ddraw: Fix some compiler warnings.
by Alexandre Julliard June 27, 2006

June 27, 2006

Module: wine Branch: refs/heads/master Commit: 53fc3f6acc032884a9d450396b3635172074b123 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=53fc3f6acc032884a9d4503… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jun 26 23:15:55 2006 +0200 ddraw: Fix some compiler warnings. --- dlls/ddraw/device.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9dfe344..a3436d9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1833,7 +1833,8 @@ Thunk_IDirect3DDeviceImpl_2_Begin(IDirec case D3DVT_LVERTEX: FVF = D3DFVF_LVERTEX; break; case D3DVT_TLVERTEX: FVF = D3DFVF_TLVERTEX; break; default: - assert(0); /* Should never happen */ + ERR("Unexpected vertex type %d\n", dwVertexTypeDesc); + return DDERR_INVALIDPARAMS; /* Should never happen */ }; return IDirect3DDevice3_Begin(ICOM_INTERFACE(This, IDirect3DDevice3), @@ -1893,7 +1894,8 @@ Thunk_IDirect3DDeviceImpl_2_BeginIndexed case D3DVT_LVERTEX: FVF = D3DFVF_LVERTEX; break; case D3DVT_TLVERTEX: FVF = D3DFVF_TLVERTEX; break; default: - assert(0); /* Should never happen */ + ERR("Unexpected vertex type %d\n", d3dvtVertexType); + return DDERR_INVALIDPARAMS; /* Should never happen */ }; return IDirect3DDevice3_BeginIndexed(ICOM_INTERFACE(This,IDirect3DDevice3), @@ -2758,7 +2760,8 @@ Thunk_IDirect3DDeviceImpl_2_DrawPrimitiv case D3DVT_LVERTEX: FVF = D3DFVF_LVERTEX; break; case D3DVT_TLVERTEX: FVF = D3DFVF_TLVERTEX; break; default: - assert(0); /* Should never happen */ + ERR("Unexpected vertex type %d\n", VertexType); + return DDERR_INVALIDPARAMS; /* Should never happen */ } return IDirect3DDevice7_DrawPrimitive(ICOM_INTERFACE(This, IDirect3DDevice7), @@ -2898,7 +2901,8 @@ Thunk_IDirect3DDeviceImpl_2_DrawIndexedP case D3DVT_LVERTEX: FVF = D3DFVF_LVERTEX; break; case D3DVT_TLVERTEX: FVF = D3DFVF_TLVERTEX; break; default: - assert(0); /* Should never happen */ + ERR("Unexpected vertex type %d\n", VertexType); + return DDERR_INVALIDPARAMS; /* Should never happen */ } return IDirect3DDevice7_DrawIndexedPrimitive(ICOM_INTERFACE(This, IDirect3DDevice7),

1 0

Paul Vriens : uxtheme/tests: Added a bit more functional tests to OpenThemeData.
by Alexandre Julliard June 27, 2006

June 27, 2006

Module: wine Branch: refs/heads/master Commit: 5ca8bbd20cdab6956e6f749bac23295e6ef4ba88 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ca8bbd20cdab6956e6f749… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Jun 22 17:14:18 2006 +0200 uxtheme/tests: Added a bit more functional tests to OpenThemeData. --- dlls/uxtheme/tests/system.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 9a1c558..e2f0edd 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -166,9 +166,10 @@ static void test_SetWindowTheme(void) static void test_OpenThemeData(void) { - HTHEME hTheme; + HTHEME hTheme, hTheme2; HWND hWnd; BOOL bThemeActive; + HRESULT hRes; BOOL bDestroyed; WCHAR szInvalidClassList[] = {'D','E','A','D','B','E','E','F', 0 }; @@ -275,6 +276,40 @@ static void test_OpenThemeData(void) "Expected ERROR_SUCCESS, got 0x%08lx\n", GetLastError()); + /* GetWindowTheme should return the last handle opened by OpenThemeData */ + SetLastError(0xdeadbeef); + hTheme2 = pGetWindowTheme(hWnd); + ok( hTheme == hTheme2, "Expected the same HTHEME handle (%p<->%p)\n", + hTheme, hTheme2); + ok( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08lx\n", + GetLastError()); + + SetLastError(0xdeadbeef); + hRes = pCloseThemeData(hTheme); + ok( hRes == S_OK, "Expected S_OK, got 0x%08lx\n", hRes); + ok( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08lx\n", + GetLastError()); + + /* Close a second time */ + SetLastError(0xdeadbeef); + hRes = pCloseThemeData(hTheme); + ok( hRes == S_OK, "Expected S_OK, got 0x%08lx\n", hRes); + ok( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08lx\n", + GetLastError()); + + /* See if closing makes a difference for GetWindowTheme */ + SetLastError(0xdeadbeef); + hTheme2 = NULL; + hTheme2 = pGetWindowTheme(hWnd); + ok( hTheme == hTheme2, "Expected the same HTHEME handle (%p<->%p)\n", + hTheme, hTheme2); + ok( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08lx\n", + GetLastError()); + bDestroyed = DestroyWindow(hWnd); if (!bDestroyed) trace("Window %p couldn't be destroyed : 0x%08lx\n", @@ -314,7 +349,7 @@ START_TEST(system) trace("Starting test_SetWindowTheme()\n"); test_SetWindowTheme(); - /* OpenThemeData */ + /* OpenThemeData, a bit more functional now */ trace("Starting test_OpenThemeData()\n"); test_OpenThemeData();

1 0

Paul Vriens : imagehlp: Fixed typo (Coverity).
by Alexandre Julliard June 27, 2006

June 27, 2006

Module: wine Branch: refs/heads/master Commit: 47c3663bec1211b7ec8b3d3a18061e6e789037a8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=47c3663bec1211b7ec8b3d3… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Jun 26 15:30:06 2006 +0200 imagehlp: Fixed typo (Coverity). --- dlls/imagehlp/modify.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c index ee21ddd..035c6ef 100644 --- a/dlls/imagehlp/modify.c +++ b/dlls/imagehlp/modify.c @@ -246,7 +246,7 @@ DWORD WINAPI MapFileAndCheckSumW( 0, 0, 0); - if (hMapping == 0) + if (BaseAddress == 0) { CloseHandle(hMapping); CloseHandle(hFile);

1 0

Paul Vriens : uxtheme/tests: Add tests for GetCurrentThemeName.
by Alexandre Julliard June 27, 2006

June 27, 2006

Module: wine Branch: refs/heads/master Commit: d599dec16c5c5bc4948aac5bd5aa1926435a427f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d599dec16c5c5bc4948aac5… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Jun 26 13:41:02 2006 +0200 uxtheme/tests: Add tests for GetCurrentThemeName. --- dlls/uxtheme/tests/system.c | 130 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 129 insertions(+), 1 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index e2f0edd..ccf10e8 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -26,6 +26,7 @@ #include "uxtheme.h" #include "wine/test.h" static HRESULT (WINAPI * pCloseThemeData)(HTHEME); +static HRESULT (WINAPI * pGetCurrentThemeName)(LPWSTR, int, LPWSTR, int, LPWSTR, int); static HTHEME (WINAPI * pGetWindowTheme)(HWND); static BOOL (WINAPI * pIsAppThemed)(VOID); static BOOL (WINAPI * pIsThemeActive)(VOID); @@ -52,6 +53,7 @@ static BOOL InitFunctionPtrs(void) if (hUxtheme) { UXTHEME_GET_PROC(CloseThemeData) + UXTHEME_GET_PROC(GetCurrentThemeName) UXTHEME_GET_PROC(GetWindowTheme) UXTHEME_GET_PROC(IsAppThemed) UXTHEME_GET_PROC(IsThemeActive) @@ -64,7 +66,8 @@ static BOOL InitFunctionPtrs(void) */ if (!pCloseThemeData || !pGetWindowTheme || !pIsAppThemed || !pIsThemeActive || - !pOpenThemeData || !pSetWindowTheme) + !pOpenThemeData || !pSetWindowTheme || + !pGetCurrentThemeName) return FALSE; return TRUE; @@ -316,6 +319,127 @@ static void test_OpenThemeData(void) hWnd, GetLastError()); } +static void test_GetCurrentThemeName(void) +{ + BOOL bThemeActive; + HRESULT hRes; + WCHAR currentTheme[MAX_PATH]; + WCHAR currentColor[MAX_PATH]; + WCHAR currentSize[MAX_PATH]; + + bThemeActive = pIsThemeActive(); + + /* All NULLs */ + SetLastError(0xdeadbeef); + hRes = pGetCurrentThemeName(NULL, 0, NULL, 0, NULL, 0); + if (bThemeActive) + ok( hRes == S_OK, "Expected S_OK, got 0x%08lx\n", hRes); + else + ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08lx\n", hRes); + ok( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08lx\n", + GetLastError()); + + /* Number of characters given is 0 */ + SetLastError(0xdeadbeef); + hRes = pGetCurrentThemeName(currentTheme, 0, NULL, 0, NULL, 0); + if (bThemeActive) + ok( hRes == S_OK, "Expected S_OK, got 0x%08lx\n", hRes); + else + ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08lx\n", hRes); + ok( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08lx\n", + GetLastError()); + + /* When the number of characters given is too small (not 0, see above), GetCurrentThemeName returns 0x8007007a. + * The only definition I found was in strsafe.h: + * + * #define STRSAFE_E_INSUFFICIENT_BUFFER ((HRESULT)0x8007007AL) // 0x7A = 122L = ERROR_INSUFFICIENT_BUFFER + */ + SetLastError(0xdeadbeef); + hRes = pGetCurrentThemeName(currentTheme, 2, NULL, 0, NULL, 0); + if (bThemeActive) + todo_wine + ok( LOWORD(hRes) == ERROR_INSUFFICIENT_BUFFER, "Expected 0x8007007A, got 0x%08lx\n", hRes); + else + ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08lx\n", hRes); + ok( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08lx\n", + GetLastError()); + + /* The same is true if the number of characters is too small for Color and/or Size */ + SetLastError(0xdeadbeef); + hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), + currentColor, 2, + currentSize, sizeof(currentSize) / sizeof(WCHAR)); + if (bThemeActive) + todo_wine + ok( LOWORD(hRes) == ERROR_INSUFFICIENT_BUFFER, "Expected 0x8007007A, got 0x%08lx\n", hRes); + else + ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08lx\n", hRes); + ok( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08lx\n", + GetLastError()); + + /* Given number of characters is correct */ + SetLastError(0xdeadbeef); + hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), NULL, 0, NULL, 0); + if (bThemeActive) + ok( hRes == S_OK, "Expected S_OK, got 0x%08lx\n", hRes); + else + ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08lx\n", hRes); + ok( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08lx\n", + GetLastError()); + + /* Given number of characters for the theme name is too large */ + SetLastError(0xdeadbeef); + hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme), NULL, 0, NULL, 0); + todo_wine + ok( hRes == E_POINTER, "Expected E_POINTER, got 0x%08lx\n", hRes); + ok( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08lx\n", + GetLastError()); + + /* The too large case is only for the theme name, not for color name or size name */ + SetLastError(0xdeadbeef); + hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), + currentColor, sizeof(currentTheme), + currentSize, sizeof(currentSize) / sizeof(WCHAR)); + if (bThemeActive) + ok( hRes == S_OK, "Expected S_OK, got 0x%08lx\n", hRes); + else + ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08lx\n", hRes); + ok( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08lx\n", + GetLastError()); + + SetLastError(0xdeadbeef); + hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), + currentColor, sizeof(currentTheme) / sizeof(WCHAR), + currentSize, sizeof(currentSize)); + if (bThemeActive) + ok( hRes == S_OK, "Expected S_OK, got 0x%08lx\n", hRes); + else + ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08lx\n", hRes); + ok( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08lx\n", + GetLastError()); + + /* Correct call */ + SetLastError(0xdeadbeef); + hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), + currentColor, sizeof(currentColor) / sizeof(WCHAR), + currentSize, sizeof(currentSize) / sizeof(WCHAR)); + if (bThemeActive) + ok( hRes == S_OK, "Expected S_OK, got 0x%08lx\n", hRes); + else + ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08lx\n", hRes); + ok( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08lx\n", + GetLastError()); +} + static void test_CloseThemeData(void) { HRESULT hRes; @@ -353,6 +477,10 @@ START_TEST(system) trace("Starting test_OpenThemeData()\n"); test_OpenThemeData(); + /* GetCurrentThemeName */ + trace("Starting test_GetCurrentThemeName()\n"); + test_GetCurrentThemeName(); + /* CloseThemeData */ trace("Starting test_CloseThemeData()\n"); test_CloseThemeData();

1 0

appdb/include testResults.php
by WineHQ June 27, 2006

June 27, 2006

ChangeSet ID: 26057 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/27 00:44:24 Modified files: include : testResults.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Don't allow empty "what works", "what was tested" and "what was not" fields Patch: http://cvs.winehq.org/patch.py?id=26057 Old revision New revision Changes Path 1.21 1.22 +3 -4 appdb/include/testResults.php Index: appdb/include/testResults.php diff -u -p appdb/include/testResults.php:1.21 appdb/include/testResults.php:1.22 --- appdb/include/testResults.php:1.21 27 Jun 2006 5:44:24 -0000 +++ appdb/include/testResults.php 27 Jun 2006 5:44:24 -0000 @@ -511,9 +511,9 @@ class testData{ { $aClean = array(); //array of filtered user input - $aClean['sWhatWorks'] = makeSafe($_REQUEST['sWhatWorks']); - $aClean['sWhatDoesnt'] = makeSafe($_REQUEST['sWhatDoesnt']); - $aClean['sWhatNotTested'] = makeSafe($_REQUEST['sWhatNotTested']); + $aClean['sWhatWorks'] = trim(makeSafe($_REQUEST['sWhatWorks'])); + $aClean['sWhatDoesnt'] = trim(makeSafe($_REQUEST['sWhatDoesnt'])); + $aClean['sWhatNotTested'] = trim(makeSafe($_REQUEST['sWhatNotTested'])); $aClean['sDistribution'] = makeSafe($_REQUEST['sDistribution']); $aClean['sTestedDate'] = makeSafe($_REQUEST['sTestedDate']); $aClean['sTestedRelease'] = makeSafe($_REQUEST['sTestedRelease']); @@ -523,7 +523,6 @@ class testData{ $aClean['sTestedRating'] = makeSafe($_REQUEST['sTestedRating']); $errors = ""; - if (empty($aClean['sWhatWorks'])) $errors .= "<li>Please enter what worked.</li>\n";

1 0