October 2007 - Wine-commits

David Adam : d3dx8: Implement D3DX8Vec2Length with a test.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: e4ba8eb4508cca3fe35ed175ae15c23645742305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4ba8eb4508cca3fe35ed175a… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sun Oct 14 00:39:54 2007 +0200 d3dx8: Implement D3DX8Vec2Length with a test. --- .gitignore | 4 +++ Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/d3dx8/tests/Makefile.in | 13 +++++++++++ dlls/d3dx8/tests/math.c | 46 +++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/d3dx8math.h | 2 + include/d3dx8math.inl | 28 +++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 ++ programs/winetest/winetest.rc | 1 + 12 files changed, 105 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 90e166e..43ee7d8 100644 --- a/.gitignore +++ b/.gitignore @@ -94,6 +94,9 @@ dlls/d3drm/tests/d3drm_crosstest.exe dlls/d3drm/tests/testlist.c dlls/d3drm/version.res dlls/d3dx8/libd3dx8.def +dlls/d3dx8/tests/*.ok +dlls/d3dx8/tests/d3dx8_crosstest.exe +dlls/d3dx8/tests/testlist.c dlls/d3dxof/libd3dxof.def dlls/d3dxof/version.res dlls/dbghelp/libdbghelp.def @@ -687,6 +690,7 @@ programs/winetest/crypt32_test.exe programs/winetest/d3d8_test.exe programs/winetest/d3d9_test.exe programs/winetest/d3drm_test.exe +programs/winetest/d3dx8_test.exe programs/winetest/ddraw_test.exe programs/winetest/dinput_test.exe programs/winetest/dnsapi_test.exe diff --git a/Makefile.in b/Makefile.in index de3da4b..46f330c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -198,6 +198,7 @@ ALL_MAKEFILES = \ dlls/d3drm/Makefile \ dlls/d3drm/tests/Makefile \ dlls/d3dx8/Makefile \ + dlls/d3dx8/tests/Makefile \ dlls/d3dxof/Makefile \ dlls/dbghelp/Makefile \ dlls/dciman32/Makefile \ @@ -570,6 +571,7 @@ dlls/d3dim/Makefile: dlls/d3dim/Makefile.in dlls/Makedll.rules dlls/d3drm/Makefile: dlls/d3drm/Makefile.in dlls/Makedll.rules dlls/d3drm/tests/Makefile: dlls/d3drm/tests/Makefile.in dlls/Maketest.rules dlls/d3dx8/Makefile: dlls/d3dx8/Makefile.in dlls/Makedll.rules +dlls/d3dx8/tests/Makefile: dlls/d3dx8/tests/Makefile.in dlls/Maketest.rules dlls/d3dxof/Makefile: dlls/d3dxof/Makefile.in dlls/Makedll.rules dlls/dbghelp/Makefile: dlls/dbghelp/Makefile.in dlls/Makedll.rules dlls/dciman32/Makefile: dlls/dciman32/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 1153f74..fe57f3c 100755 --- a/configure +++ b/configure @@ -20356,6 +20356,8 @@ ac_config_files="$ac_config_files dlls/d3drm/tests/Makefile" ac_config_files="$ac_config_files dlls/d3dx8/Makefile" +ac_config_files="$ac_config_files dlls/d3dx8/tests/Makefile" + ac_config_files="$ac_config_files dlls/d3dxof/Makefile" ac_config_files="$ac_config_files dlls/dbghelp/Makefile" @@ -21596,6 +21598,7 @@ do "dlls/d3drm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3drm/Makefile" ;; "dlls/d3drm/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3drm/tests/Makefile" ;; "dlls/d3dx8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx8/Makefile" ;; + "dlls/d3dx8/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx8/tests/Makefile" ;; "dlls/d3dxof/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dxof/Makefile" ;; "dlls/dbghelp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dbghelp/Makefile" ;; "dlls/dciman32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dciman32/Makefile" ;; diff --git a/configure.ac b/configure.ac index b453dc6..1550d34 100644 --- a/configure.ac +++ b/configure.ac @@ -1598,6 +1598,7 @@ AC_CONFIG_FILES([dlls/d3dim/Makefile]) AC_CONFIG_FILES([dlls/d3drm/Makefile]) AC_CONFIG_FILES([dlls/d3drm/tests/Makefile]) AC_CONFIG_FILES([dlls/d3dx8/Makefile]) +AC_CONFIG_FILES([dlls/d3dx8/tests/Makefile]) AC_CONFIG_FILES([dlls/d3dxof/Makefile]) AC_CONFIG_FILES([dlls/dbghelp/Makefile]) AC_CONFIG_FILES([dlls/dciman32/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index c08e25a..1672d6a 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -255,6 +255,7 @@ TESTSUBDIRS = \ d3d8/tests \ d3d9/tests \ d3drm/tests \ + d3dx8/tests \ ddraw/tests \ dinput/tests \ dnsapi/tests \ diff --git a/dlls/d3dx8/tests/Makefile.in b/dlls/d3dx8/tests/Makefile.in new file mode 100644 index 0000000..1cf5740 --- /dev/null +++ b/dlls/d3dx8/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = d3dx8.dll +IMPORTS = kernel32 +EXTRALIBS = -ldxguid + +CTESTS = math.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c new file mode 100644 index 0000000..e9afd60 --- /dev/null +++ b/dlls/d3dx8/tests/math.c @@ -0,0 +1,46 @@ +/* + * Copyright 2007 David Adam + * + * 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 + */ + +#include <assert.h> +#include "d3dx8math.h" +#include "d3dx8math.inl" + +#include "wine/test.h" + +#define admitted_error 0.00001f + +static void D3X8Vector2Test(void) +{ + D3DXVECTOR2 u; + FLOAT expected, got; + + u.x=3.0f; u.y=4.0f; + +/*_______________D3DXVec2Length__________________________*/ + expected = 5.0f; + got = D3DXVec2Length(&u); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + /* Tests the case NULL */ + expected=0.0f; + got= D3DXVec2Length(NULL); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); +} +START_TEST(math) +{ + D3X8Vector2Test(); +} diff --git a/include/Makefile.in b/include/Makefile.in index 9ac664f..7ae17d7 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -108,6 +108,7 @@ SRCDIR_INCLUDES = \ d3dx8.h \ d3dx8core.h \ d3dx8math.h \ + d3dx8math.inl \ dbghelp.h \ dbinit.idl \ dbprop.idl \ diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 71de014..aa561ed 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -58,4 +58,6 @@ typedef struct D3DXCOLOR FLOAT r, g, b, a; } D3DXCOLOR, *LPD3DXCOLOR; +FLOAT D3DXVec2Length(CONST D3DXVECTOR2 *pv); + #endif /* __D3DX8MATH_H__ */ diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl new file mode 100644 index 0000000..e9b1b6d --- /dev/null +++ b/include/d3dx8math.inl @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2007 David Adam + * + * 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 __D3DX8MATH_INL__ +#define __D3DX8MATH_INL__ + +extern inline FLOAT D3DXVec2Length(CONST D3DXVECTOR2 *pv) +{ + if (!pv) return 0.0f; + return sqrt( (pv->x) * (pv->x) + (pv->y) * (pv->y) ); +} + +#endif diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index a6ac69d..8858a88 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -31,6 +31,7 @@ TESTBINS = \ d3d8_test.exe \ d3d9_test.exe \ d3drm_test.exe \ + d3dx8_test.exe \ ddraw_test.exe \ dinput_test.exe \ dnsapi_test.exe \ @@ -111,6 +112,8 @@ d3d9_test.exe: $(DLLDIR)/d3d9/tests/d3d9_test.exe$(DLLEXT) cp $(DLLDIR)/d3d9/tests/d3d9_test.exe$(DLLEXT) $@ && $(STRIP) $@ d3drm_test.exe: $(DLLDIR)/d3drm/tests/d3drm_test.exe$(DLLEXT) cp $(DLLDIR)/d3drm/tests/d3drm_test.exe$(DLLEXT) $@ && $(STRIP) $@ +d3dx8_test.exe: $(DLLDIR)/d3dx8/tests/d3dx8_test.exe$(DLLEXT) + cp $(DLLDIR)/d3dx8/tests/d3dx8_test.exe$(DLLEXT) $@ && $(STRIP) $@ ddraw_test.exe: $(DLLDIR)/ddraw/tests/ddraw_test.exe$(DLLEXT) cp $(DLLDIR)/ddraw/tests/ddraw_test.exe$(DLLEXT) $@ && $(STRIP) $@ dinput_test.exe: $(DLLDIR)/dinput/tests/dinput_test.exe$(DLLEXT) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index aee8c2a..fb8cee2 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -89,6 +89,7 @@ crypt32_test.exe TESTRES "crypt32_test.exe" d3d8_test.exe TESTRES "d3d8_test.exe" d3d9_test.exe TESTRES "d3d9_test.exe" d3drm_test.exe TESTRES "d3drm_test.exe" +d3dx8_test.exe TESTRES "d3dx8_test.exe" ddraw_test.exe TESTRES "ddraw_test.exe" dinput_test.exe TESTRES "dinput_test.exe" dnsapi_test.exe TESTRES "dnsapi_test.exe"

1 0

David Adam : d3dx8: Implement D3DX8Vec2LengthSq with a test.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: d404ec8c4b77499c8276858ae24044996109f071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d404ec8c4b77499c8276858ae… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sun Oct 14 01:15:30 2007 +0200 d3dx8: Implement D3DX8Vec2LengthSq with a test. --- dlls/d3dx8/tests/math.c | 12 ++++++++++++ include/d3dx8math.h | 1 + include/d3dx8math.inl | 6 ++++++ 3 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index e9afd60..a8d80a3 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -39,7 +39,19 @@ static void D3X8Vector2Test(void) expected=0.0f; got= D3DXVec2Length(NULL); ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + + +/*_______________D3DXVec2LengthSq________________________*/ + expected = 25.0f; + got = D3DXVec2LengthSq(&u); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + /* Tests the case NULL */ + expected=0.0f; + got= D3DXVec2LengthSq(NULL); + ok(fabs( got - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + } + START_TEST(math) { D3X8Vector2Test(); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index aa561ed..2a98e00 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -59,5 +59,6 @@ typedef struct D3DXCOLOR } D3DXCOLOR, *LPD3DXCOLOR; FLOAT D3DXVec2Length(CONST D3DXVECTOR2 *pv); +FLOAT D3DXVec2LengthSq(CONST D3DXVECTOR2 *pv); #endif /* __D3DX8MATH_H__ */ diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index e9b1b6d..e5ced8d 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -25,4 +25,10 @@ extern inline FLOAT D3DXVec2Length(CONST D3DXVECTOR2 *pv) return sqrt( (pv->x) * (pv->x) + (pv->y) * (pv->y) ); } +extern inline FLOAT D3DXVec2LengthSq(CONST D3DXVECTOR2 *pv) +{ + if (!pv) return 0.0f; + return( (pv->x) * (pv->x) + (pv->y) * (pv->y) ); +} + #endif

1 0

Detlef Riekenberg : wininet/tests: Test NULL pointer for InternetCanonicalizeUrlA.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: a53df53f2b3cdbb63c24f3113083a2e02a284735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a53df53f2b3cdbb63c24f3113… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 12 09:38:15 2007 +0200 wininet/tests: Test NULL pointer for InternetCanonicalizeUrlA. --- dlls/wininet/tests/internet.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index f04c399..9fac11e 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -83,6 +83,36 @@ static void test_InternetCanonicalizeUrlA(void) ok( res && (dwSize == urllen) && (lstrcmpA(url, buffer) == 0), "got %u and %u with size %u for '%s' (%d)\n", res, GetLastError(), dwSize, buffer, lstrlenA(buffer)); + + + /* check NULL pointers */ + memset(buffer, '#', urllen + 4); + buffer[urllen + 4] = '\0'; + dwSize = urllen+1; + SetLastError(0xdeadbeef); + res = InternetCanonicalizeUrlA(NULL, buffer, &dwSize, 0); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "got %u and %u with size %u for '%s' (%d)\n", + res, GetLastError(), dwSize, buffer, lstrlenA(buffer)); + + memset(buffer, '#', urllen + 4); + buffer[urllen + 4] = '\0'; + dwSize = urllen+1; + SetLastError(0xdeadbeef); + res = InternetCanonicalizeUrlA(url, NULL, &dwSize, 0); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "got %u and %u with size %u for '%s' (%d)\n", + res, GetLastError(), dwSize, buffer, lstrlenA(buffer)); + + memset(buffer, '#', urllen + 4); + buffer[urllen + 4] = '\0'; + dwSize = urllen+1; + SetLastError(0xdeadbeef); + res = InternetCanonicalizeUrlA(url, buffer, NULL, 0); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "got %u and %u with size %u for '%s' (%d)\n", + res, GetLastError(), dwSize, buffer, lstrlenA(buffer)); + } /* ############################### */

1 0

Detlef Riekenberg : shlwapi/tests: Move URL testing functions from path. c to url.c.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: d9a33f3c17218a393959534ce656f4abbe3cbf28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a33f3c17218a393959534ce… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 12 09:46:19 2007 +0200 shlwapi/tests: Move URL testing functions from path.c to url.c. --- dlls/shlwapi/tests/Makefile.in | 3 +- dlls/shlwapi/tests/path.c | 588 +---------------------------------- dlls/shlwapi/tests/url.c | 686 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 695 insertions(+), 582 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9a33f3c17218a3939595…

1 0

Detlef Riekenberg : shlwapi/test: Test dwSize for UrlCanonicalizeA/W.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: f05b840ac4cc4681db04b0b9d11326f67adfb8da URL: http://source.winehq.org/git/wine.git/?a=commit;h=f05b840ac4cc4681db04b0b9d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 12 09:52:08 2007 +0200 shlwapi/test: Test dwSize for UrlCanonicalizeA/W. --- dlls/shlwapi/tests/url.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 8bfe074..b73b872 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -1,6 +1,7 @@ /* Unit test suite for Path functions * * Copyright 2002 Matthew Mastracci + * Copyright 2007 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,10 +29,14 @@ #include "wininet.h" /* ################ */ +static HMODULE hShlwapi; +static HRESULT (WINAPI *pUrlCanonicalizeW)(LPCWSTR, LPWSTR, LPDWORD, DWORD); const char* TEST_URL_1 = "http://www.winehq.org/tests?date=10/10/1923"; const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%2010/10/1923"; const char* TEST_URL_3 = "http://foo:bar(a)localhost:21/internal.php?query=x&return=y"; +const WCHAR winehqW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0}; +const CHAR winehqA[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0}; /* ################ */ @@ -469,8 +474,51 @@ static void test_UrlCanonicalizeA(void) unsigned int i; CHAR szReturnUrl[INTERNET_MAX_URL_LENGTH]; DWORD dwSize; + DWORD urllen; HRESULT hr; + urllen = lstrlenA(winehqA); + + /* buffer has no space for the result */ + dwSize=urllen-1; + memset(szReturnUrl, '#', urllen+4); + szReturnUrl[urllen+4] = '\0'; + SetLastError(0xdeadbeef); + hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + ok( (hr == E_POINTER) && (dwSize == (urllen + 1)), + "got 0x%x with %u and size %u for '%s' and %u (expected 'E_POINTER' and size %u)\n", + hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), urllen+1); + + /* buffer has no space for the terminating '\0' */ + dwSize=urllen; + memset(szReturnUrl, '#', urllen+4); + szReturnUrl[urllen+4] = '\0'; + SetLastError(0xdeadbeef); + hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + ok( (hr == E_POINTER) && (dwSize == (urllen + 1)), + "got 0x%x with %u and size %u for '%s' and %u (expected 'E_POINTER' and size %u)\n", + hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), urllen+1); + + /* buffer has the required size */ + dwSize=urllen+1; + memset(szReturnUrl, '#', urllen+4); + szReturnUrl[urllen+4] = '\0'; + SetLastError(0xdeadbeef); + hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + ok( (hr == S_OK) && (dwSize == urllen), + "got 0x%x with %u and size %u for '%s' and %u (expected 'S_OK' and size %u)\n", + hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), urllen); + + /* buffer is larger as the required size */ + dwSize=urllen+2; + memset(szReturnUrl, '#', urllen+4); + szReturnUrl[urllen+4] = '\0'; + SetLastError(0xdeadbeef); + hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + ok( (hr == S_OK) && (dwSize == urllen), + "got 0x%x with %u and size %u for '%s' and %u (expected 'S_OK' and size %u)\n", + hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), urllen); + /* test url-modification */ for(i=0; i<sizeof(TEST_CANONICALIZE)/sizeof(TEST_CANONICALIZE[0]); i++) { @@ -491,6 +539,65 @@ static void test_UrlCanonicalizeA(void) /* ########################### */ +static void test_UrlCanonicalizeW(void) +{ + WCHAR szReturnUrl[INTERNET_MAX_URL_LENGTH]; + DWORD dwSize; + DWORD urllen; + HRESULT hr; + + + if (!pUrlCanonicalizeW) { + skip("UrlCanonicalizeW\n"); + return; + } + urllen = lstrlenW(winehqW); + + /* buffer has no space for the result */ + dwSize = (urllen-1); + memset(szReturnUrl, '#', (urllen+4) * sizeof(WCHAR)); + szReturnUrl[urllen+4] = '\0'; + SetLastError(0xdeadbeef); + hr = pUrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + ok( (hr == E_POINTER) && (dwSize == (urllen + 1)), + "got 0x%x with %u and size %u for %u (expected 'E_POINTER' and size %u)\n", + hr, GetLastError(), dwSize, lstrlenW(szReturnUrl), urllen+1); + + + /* buffer has no space for the terminating '\0' */ + dwSize = urllen; + memset(szReturnUrl, '#', (urllen+4) * sizeof(WCHAR)); + szReturnUrl[urllen+4] = '\0'; + SetLastError(0xdeadbeef); + hr = pUrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + ok( (hr == E_POINTER) && (dwSize == (urllen + 1)), + "got 0x%x with %u and size %u for %u (expected 'E_POINTER' and size %u)\n", + hr, GetLastError(), dwSize, lstrlenW(szReturnUrl), urllen+1); + + /* buffer has the required size */ + dwSize = urllen +1; + memset(szReturnUrl, '#', (urllen+4) * sizeof(WCHAR)); + szReturnUrl[urllen+4] = '\0'; + SetLastError(0xdeadbeef); + hr = pUrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + ok( (hr == S_OK) && (dwSize == urllen), + "got 0x%x with %u and size %u for %u (expected 'S_OK' and size %u)\n", + hr, GetLastError(), dwSize, lstrlenW(szReturnUrl), urllen); + + /* buffer is larger as the required size */ + dwSize = (urllen+2); + memset(szReturnUrl, '#', (urllen+4) * sizeof(WCHAR)); + szReturnUrl[urllen+4] = '\0'; + SetLastError(0xdeadbeef); + hr = pUrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + ok( (hr == S_OK) && (dwSize == urllen), + "got 0x%x with %u and size %u for %u (expected 'S_OK' and size %u)\n", + hr, GetLastError(), dwSize, lstrlenW(szReturnUrl), urllen); + +} + +/* ########################### */ + static void test_url_combine(const char *szUrl1, const char *szUrl2, DWORD dwFlags, HRESULT dwExpectReturn, const char *szExpectUrl) { HRESULT hr; @@ -674,9 +781,13 @@ static void test_UrlUnescape(void) START_TEST(url) { + hShlwapi = GetModuleHandleA("shlwapi.dll"); + pUrlCanonicalizeW = (void *) GetProcAddress(hShlwapi, "UrlCanonicalizeW"); + test_UrlHash(); test_UrlGetPart(); test_UrlCanonicalizeA(); + test_UrlCanonicalizeW(); test_UrlEscape(); test_UrlCombine(); test_UrlCreateFromPath();

1 0

Maarten Lankhorst : dsound: Only warn for unsupported channels (or bits) when volume adjustment is done.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 80192b93ebd832570d6af97b80a3f29fb854627c URL: http://source.winehq.org/git/wine.git/?a=commit;h=80192b93ebd832570d6af97b8… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Sat Oct 13 20:29:40 2007 +0200 dsound: Only warn for unsupported channels (or bits) when volume adjustment is done. --- dlls/dsound/mixer.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 2486e72..daa4e97 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -435,6 +435,11 @@ static LPBYTE DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, DWORD writepos, TRACE("left = %x, right = %x\n", dsb->volpan.dwTotalLeftAmpFactor, dsb->volpan.dwTotalRightAmpFactor); + if ((!(dsb->dsbd.dwFlags & DSBCAPS_CTRLPAN) || (dsb->volpan.lPan == 0)) && + (!(dsb->dsbd.dwFlags & DSBCAPS_CTRLVOLUME) || (dsb->volpan.lVolume == 0)) && + !(dsb->dsbd.dwFlags & DSBCAPS_CTRL3D)) + return NULL; /* Nothing to do */ + if (nChannels != 1 && nChannels != 2) { FIXME("There is no support for %d channels\n", nChannels); @@ -447,11 +452,6 @@ static LPBYTE DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, DWORD writepos, return NULL; } - if ((!(dsb->dsbd.dwFlags & DSBCAPS_CTRLPAN) || (dsb->volpan.lPan == 0)) && - (!(dsb->dsbd.dwFlags & DSBCAPS_CTRLVOLUME) || (dsb->volpan.lVolume == 0)) && - !(dsb->dsbd.dwFlags & DSBCAPS_CTRL3D)) - return NULL; /* Nothing to do */ - if (dsb->device->tmp_buffer_len < len || !dsb->device->tmp_buffer) { dsb->device->tmp_buffer_len = len;

1 0

Detlef Riekenberg : shlwapi: Fix returned result code and size in UrlCanonicalizeA.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 1d87649f3c5d689fccb23ef6a6430f10e2d1542b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d87649f3c5d689fccb23ef6a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 12 09:31:55 2007 +0200 shlwapi: Fix returned result code and size in UrlCanonicalizeA. --- dlls/shlwapi/url.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index e7701da..d1f64fe 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -268,11 +268,11 @@ HRESULT WINAPI UrlCanonicalizeA(LPCSTR pszUrl, LPSTR pszCanonicalized, LPDWORD pcchCanonicalized, DWORD dwFlags) { LPWSTR base, canonical; - DWORD ret, len, len2; + HRESULT ret; + DWORD len, len2; - TRACE("(%s %p %p 0x%08x) using W version\n", - debugstr_a(pszUrl), pszCanonicalized, - pcchCanonicalized, dwFlags); + TRACE("(%s, %p, %p, 0x%08x) *pcchCanonicalized: %d\n", debugstr_a(pszUrl), pszCanonicalized, + pcchCanonicalized, dwFlags, pcchCanonicalized ? *pcchCanonicalized : -1); if(!pszUrl || !pszCanonicalized || !pcchCanonicalized) return E_INVALIDARG; @@ -286,19 +286,19 @@ HRESULT WINAPI UrlCanonicalizeA(LPCSTR pszUrl, LPSTR pszCanonicalized, ret = UrlCanonicalizeW(base, canonical, &len, dwFlags); if (ret != S_OK) { - HeapFree(GetProcessHeap(), 0, base); - return ret; + *pcchCanonicalized = len * 2; + HeapFree(GetProcessHeap(), 0, base); + return ret; } - len2 = WideCharToMultiByte(0, 0, canonical, len, 0, 0, 0, 0); + len2 = WideCharToMultiByte(0, 0, canonical, -1, 0, 0, 0, 0); if (len2 > *pcchCanonicalized) { - *pcchCanonicalized = len; - HeapFree(GetProcessHeap(), 0, base); - return E_POINTER; + *pcchCanonicalized = len2; + HeapFree(GetProcessHeap(), 0, base); + return E_POINTER; } - WideCharToMultiByte(0, 0, canonical, len+1, pszCanonicalized, - *pcchCanonicalized, 0, 0); - *pcchCanonicalized = len2; + WideCharToMultiByte(0, 0, canonical, -1, pszCanonicalized, *pcchCanonicalized, 0, 0); + *pcchCanonicalized = len; HeapFree(GetProcessHeap(), 0, base); return S_OK; } @@ -320,8 +320,8 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, static const WCHAR wszFile[] = {'f','i','l','e',':'}; - TRACE("(%s %p %p 0x%08x)\n", debugstr_w(pszUrl), pszCanonicalized, - pcchCanonicalized, dwFlags); + TRACE("(%s, %p, %p, 0x%08x) *pcchCanonicalized: %d\n", debugstr_w(pszUrl), pszCanonicalized, + pcchCanonicalized, dwFlags, pcchCanonicalized ? *pcchCanonicalized : -1); if(!pszUrl || !pszCanonicalized || !pcchCanonicalized) return E_INVALIDARG;

1 0

Detlef Riekenberg : wininet: Fix flags and SetLastError for InternetCanonicalizeUrlA/W.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 9b43174f3f1b4db98d0ddb67c2b6ba6362ba4112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b43174f3f1b4db98d0ddb67c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 12 09:36:54 2007 +0200 wininet: Fix flags and SetLastError for InternetCanonicalizeUrlA/W. --- dlls/wininet/internet.c | 64 +++++++++++++++++++++++++++-------------- dlls/wininet/tests/internet.c | 2 - 2 files changed, 42 insertions(+), 24 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 0edca74..4c1472c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1506,32 +1506,41 @@ BOOL WINAPI InternetCanonicalizeUrlA(LPCSTR lpszUrl, LPSTR lpszBuffer, LPDWORD lpdwBufferLength, DWORD dwFlags) { HRESULT hr; - DWORD dwURLFlags= 0x80000000; /* Don't know what this means */ + DWORD dwURLFlags = URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE; + + TRACE("(%s, %p, %p, 0x%08x) bufferlength: %d\n", debugstr_a(lpszUrl), lpszBuffer, + lpdwBufferLength, lpdwBufferLength ? *lpdwBufferLength : -1, dwFlags); + if(dwFlags & ICU_DECODE) { - dwURLFlags |= URL_UNESCAPE; - dwFlags &= ~ICU_DECODE; + dwURLFlags |= URL_UNESCAPE; + dwFlags &= ~ICU_DECODE; } if(dwFlags & ICU_ESCAPE) { - dwURLFlags |= URL_UNESCAPE; - dwFlags &= ~ICU_ESCAPE; + dwURLFlags |= URL_UNESCAPE; + dwFlags &= ~ICU_ESCAPE; } + if(dwFlags & ICU_BROWSER_MODE) { dwURLFlags |= URL_BROWSER_MODE; dwFlags &= ~ICU_BROWSER_MODE; } - if(dwFlags) - FIXME("Unhandled flags 0x%08x\n", dwFlags); - TRACE("%s %p %p %08x\n", debugstr_a(lpszUrl), lpszBuffer, - lpdwBufferLength, dwURLFlags); - /* Flip this bit to correspond to URL_ESCAPE_UNSAFE */ - dwFlags ^= ICU_NO_ENCODE; + if(dwFlags & ICU_NO_ENCODE) + { + /* Flip this bit to correspond to URL_ESCAPE_UNSAFE */ + dwURLFlags ^= URL_ESCAPE_UNSAFE; + dwFlags &= ~ICU_NO_ENCODE; + } + + if (dwFlags) FIXME("Unhandled flags 0x%08x\n", dwFlags); hr = UrlCanonicalizeA(lpszUrl, lpszBuffer, lpdwBufferLength, dwURLFlags); + if (hr == E_POINTER) SetLastError(ERROR_INSUFFICIENT_BUFFER); + if (hr == E_INVALIDARG) SetLastError(ERROR_INVALID_PARAMETER); return (hr == S_OK) ? TRUE : FALSE; } @@ -1550,36 +1559,47 @@ BOOL WINAPI InternetCanonicalizeUrlW(LPCWSTR lpszUrl, LPWSTR lpszBuffer, LPDWORD lpdwBufferLength, DWORD dwFlags) { HRESULT hr; - DWORD dwURLFlags= 0x80000000; /* Don't know what this means */ + DWORD dwURLFlags = URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE; + + TRACE("(%s, %p, %p, 0x%08x) bufferlength: %d\n", debugstr_w(lpszUrl), lpszBuffer, + lpdwBufferLength, lpdwBufferLength ? *lpdwBufferLength : -1, dwFlags); + if(dwFlags & ICU_DECODE) { - dwURLFlags |= URL_UNESCAPE; - dwFlags &= ~ICU_DECODE; + dwURLFlags |= URL_UNESCAPE; + dwFlags &= ~ICU_DECODE; } if(dwFlags & ICU_ESCAPE) { - dwURLFlags |= URL_UNESCAPE; - dwFlags &= ~ICU_ESCAPE; + dwURLFlags |= URL_UNESCAPE; + dwFlags &= ~ICU_ESCAPE; } + if(dwFlags & ICU_BROWSER_MODE) { dwURLFlags |= URL_BROWSER_MODE; dwFlags &= ~ICU_BROWSER_MODE; } - if(dwFlags) - FIXME("Unhandled flags 0x%08x\n", dwFlags); - TRACE("%s %p %p %08x\n", debugstr_w(lpszUrl), lpszBuffer, - lpdwBufferLength, dwURLFlags); - /* Flip this bit to correspond to URL_ESCAPE_UNSAFE */ - dwFlags ^= ICU_NO_ENCODE; + if(dwFlags & ICU_NO_ENCODE) + { + /* Flip this bit to correspond to URL_ESCAPE_UNSAFE */ + dwURLFlags ^= URL_ESCAPE_UNSAFE; + dwFlags &= ~ICU_NO_ENCODE; + } + + if (dwFlags) FIXME("Unhandled flags 0x%08x\n", dwFlags); hr = UrlCanonicalizeW(lpszUrl, lpszBuffer, lpdwBufferLength, dwURLFlags); + if (hr == E_POINTER) SetLastError(ERROR_INSUFFICIENT_BUFFER); + if (hr == E_INVALIDARG) SetLastError(ERROR_INVALID_PARAMETER); return (hr == S_OK) ? TRUE : FALSE; } +/* #################################################### */ + static INTERNET_STATUS_CALLBACK set_status_callback( LPWININETHANDLEHEADER lpwh, INTERNET_STATUS_CALLBACK callback, BOOL unicode) { diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 2869cd1..f04c399 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -46,7 +46,6 @@ static void test_InternetCanonicalizeUrlA(void) dwSize = 1; /* Acrobat Updater use this size */ SetLastError(0xdeadbeef); res = InternetCanonicalizeUrlA(url, buffer, &dwSize, 0); - todo_wine ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER) && (dwSize == (urllen+1)), "got %u and %u with size %u for '%s' (%d)\n", res, GetLastError(), dwSize, buffer, lstrlenA(buffer)); @@ -59,7 +58,6 @@ static void test_InternetCanonicalizeUrlA(void) SetLastError(0xdeadbeef); res = InternetCanonicalizeUrlA(url, buffer, &dwSize, 0); /* dwSize is nr. of needed bytes with the terminating '\0' */ - todo_wine ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER) && (dwSize == (urllen+1)), "got %u and %u with size %u for '%s' (%d)\n", res, GetLastError(), dwSize, buffer, lstrlenA(buffer));

1 0

Rob Shearman : server: Fix token_access_check to allow full access to security descriptors with present but NULL DACLs .
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 12e44bf29974743d3ca9819817657c785e3c49e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e44bf29974743d3ca981981… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 16 09:50:50 2007 +0100 server: Fix token_access_check to allow full access to security descriptors with present but NULL DACLs. --- dlls/advapi32/tests/security.c | 1 - server/token.c | 8 +------- 2 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 0fbd3f9..b9a12ce 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -798,7 +798,6 @@ static void test_AccessCheck(void) ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); ok(ret, "AccessCheck failed with error %d\n", GetLastError()); - todo_wine ok(AccessStatus && (Access == KEY_READ), "AccessCheck failed to grant access with error %d\n", GetLastError()); diff --git a/server/token.c b/server/token.c index bbb293a..38877fe 100644 --- a/server/token.c +++ b/server/token.c @@ -811,18 +811,12 @@ static unsigned int token_access_check( struct token *token, } /* 1: Grant desired access if the object is unprotected */ - if (!dacl_present) + if (!dacl_present || !dacl) { *priv_count = 0; *granted_access = desired_access; return *status = STATUS_SUCCESS; } - if (!dacl) - { - *priv_count = 0; - *status = STATUS_ACCESS_DENIED; - return STATUS_SUCCESS; - } /* 2: Check if caller wants access to system security part. Note: access * is only granted if specifically asked for */

1 0

Rob Shearman : advapi32: Don' t link to CreateWellKnownSid at compile time in the security tests.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 2cecc630b646e4e79dd561807c8940119cfd9bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cecc630b646e4e79dd561807… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 16 09:51:00 2007 +0100 advapi32: Don't link to CreateWellKnownSid at compile time in the security tests. It isn't available on some Windows platforms. --- dlls/advapi32/tests/security.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b9a12ce..1a0e191 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2012,6 +2012,11 @@ static void test_ConvertSecurityDescriptorToString() skip("ConvertSecurityDescriptorToStringSecurityDescriptor is not available\n"); return; } + if (!pCreateWellKnownSid) + { + skip("CreateWellKnownSid is not available\n"); + return; + } /* It seems Windows XP adds an extra character to the length of the string for each ACE in an ACL. We * don't replicate this feature so we only test len >= strlen+1. */ @@ -2025,7 +2030,7 @@ static void test_ConvertSecurityDescriptorToString() CHECK_RESULT_AND_FREE(""); size = 4096; - CreateWellKnownSid(WinLocalSid, NULL, sid_buf, &size); + pCreateWellKnownSid(WinLocalSid, NULL, sid_buf, &size); SetSecurityDescriptorOwner(&desc, (PSID)sid_buf, FALSE); ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:S-1-2-0"); @@ -2035,7 +2040,7 @@ static void test_ConvertSecurityDescriptorToString() CHECK_RESULT_AND_FREE("O:S-1-2-0"); size = sizeof(sid_buf); - CreateWellKnownSid(WinLocalSystemSid, NULL, sid_buf, &size); + pCreateWellKnownSid(WinLocalSystemSid, NULL, sid_buf, &size); SetSecurityDescriptorOwner(&desc, (PSID)sid_buf, TRUE); ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:SY");

1 0