From c74a791a0deac7ca4fc594d89434e89b51fb5d85 Mon Sep 17 00:00:00 2001 From: Juergen Schmied Date: Thu, 9 May 2002 19:48:07 +0000 Subject: [PATCH] Added some tests. --- configure | 5 + configure.ac | 1 + dlls/shlwapi/Makefile.in | 6 +- dlls/shlwapi/tests/.cvsignore | 3 + dlls/shlwapi/tests/shlwapi_test.spec | 3 + dlls/shlwapi/tests/shreg.c | 192 +++++++++++++++++++++++++++ 6 files changed, 209 insertions(+), 1 deletion(-) create mode 100644 dlls/shlwapi/tests/.cvsignore create mode 100644 dlls/shlwapi/tests/shlwapi_test.spec create mode 100644 dlls/shlwapi/tests/shreg.c diff --git a/configure b/configure index 816bf65d27e..2b777b70a8d 100755 --- a/configure +++ b/configure @@ -12385,6 +12385,8 @@ ac_config_commands="$ac_config_commands dlls/kernel/tests" ac_config_commands="$ac_config_commands dlls/oleaut32/tests" +ac_config_commands="$ac_config_commands dlls/shlwapi/tests" + ac_config_commands="$ac_config_commands dlls/user/dde" ac_config_commands="$ac_config_commands dlls/user/resources" @@ -13048,6 +13050,7 @@ do "dlls/kernel/messages" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel/messages" ;; "dlls/kernel/tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel/tests" ;; "dlls/oleaut32/tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/oleaut32/tests" ;; + "dlls/shlwapi/tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/shlwapi/tests" ;; "dlls/user/dde" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/user/dde" ;; "dlls/user/resources" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/user/resources" ;; "dlls/user/tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/user/tests" ;; @@ -13716,6 +13719,8 @@ echo "$as_me: creating dlls/kernel/messages" >&6;} && mkdir "dlls/kernel/message echo "$as_me: creating dlls/kernel/tests" >&6;} && mkdir "dlls/kernel/tests") ;; dlls/oleaut32/tests ) test -d "dlls/oleaut32/tests" || ({ echo "$as_me:$LINENO: creating dlls/oleaut32/tests" >&5 echo "$as_me: creating dlls/oleaut32/tests" >&6;} && mkdir "dlls/oleaut32/tests") ;; + dlls/shlwapi/tests ) test -d "dlls/shlwapi/tests" || ({ echo "$as_me:$LINENO: creating dlls/shlwapi/tests" >&5 +echo "$as_me: creating dlls/shlwapi/tests" >&6;} && mkdir "dlls/shlwapi/tests") ;; dlls/user/dde ) test -d "dlls/user/dde" || ({ echo "$as_me:$LINENO: creating dlls/user/dde" >&5 echo "$as_me: creating dlls/user/dde" >&6;} && mkdir "dlls/user/dde") ;; dlls/user/resources ) test -d "dlls/user/resources" || ({ echo "$as_me:$LINENO: creating dlls/user/resources" >&5 diff --git a/configure.ac b/configure.ac index b2e6e4dc45f..5fb801b7ec7 100644 --- a/configure.ac +++ b/configure.ac @@ -1228,6 +1228,7 @@ WINE_CONFIG_EXTRA_DIR(dlls/gdi/win16drv) WINE_CONFIG_EXTRA_DIR(dlls/kernel/messages) WINE_CONFIG_EXTRA_DIR(dlls/kernel/tests) WINE_CONFIG_EXTRA_DIR(dlls/oleaut32/tests) +WINE_CONFIG_EXTRA_DIR(dlls/shlwapi/tests) WINE_CONFIG_EXTRA_DIR(dlls/user/dde) WINE_CONFIG_EXTRA_DIR(dlls/user/resources) WINE_CONFIG_EXTRA_DIR(dlls/user/tests) diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index 57387a432da..58565be3f3a 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in @@ -19,7 +19,11 @@ C_SRCS = \ string.c \ url.c +EXTRASUBDIRS = tests + +CTESTS = \ + tests/shreg.c + @MAKE_DLL_RULES@ ### Dependencies: - diff --git a/dlls/shlwapi/tests/.cvsignore b/dlls/shlwapi/tests/.cvsignore new file mode 100644 index 00000000000..f50663f361a --- /dev/null +++ b/dlls/shlwapi/tests/.cvsignore @@ -0,0 +1,3 @@ +shlwapi_test.spec.c +shreg.ok +testlist.c diff --git a/dlls/shlwapi/tests/shlwapi_test.spec b/dlls/shlwapi/tests/shlwapi_test.spec new file mode 100644 index 00000000000..46becfc2530 --- /dev/null +++ b/dlls/shlwapi/tests/shlwapi_test.spec @@ -0,0 +1,3 @@ +name shlwapi_test +type win32 +mode cuiexe diff --git a/dlls/shlwapi/tests/shreg.c b/dlls/shlwapi/tests/shreg.c new file mode 100644 index 00000000000..f2c01c12589 --- /dev/null +++ b/dlls/shlwapi/tests/shreg.c @@ -0,0 +1,192 @@ +/* Unit test suite for SHReg* functions + * + * Copyright 2002 Juergen Schmied + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include +#include + +#include "wine/test.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "wine/obj_base.h" +#include "wine/obj_storage.h" +#include "shlwapi.h" + +static char * sTestpath1 = "%SYSTEMROOT%\\subdir1"; +static char * sTestpath2 = "%USERPROFILE%\\subdir1"; + +static char sExpTestpath1[MAX_PATH]; +static char sExpTestpath2[MAX_PATH]; + +static char * sEmptyBuffer ="0123456789"; + +static void create_test_entrys() +{ + HKEY hKey; + + ok(!RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", &hKey), ""); + + if (hKey) + { + ok(!RegSetValueExA(hKey,"Test1",0,REG_EXPAND_SZ, sTestpath1, strlen(sTestpath1)), ""); + ok(!RegSetValueExA(hKey,"Test2",0,REG_SZ, sTestpath1, strlen(sTestpath1)), ""); + ok(!RegSetValueExA(hKey,"Test3",0,REG_EXPAND_SZ, sTestpath2, strlen(sTestpath2)), ""); + RegCloseKey(hKey); + } + + ExpandEnvironmentStringsA(sTestpath1, sExpTestpath1, sizeof(sExpTestpath1)); + ExpandEnvironmentStringsA(sTestpath2, sExpTestpath2, sizeof(sExpTestpath2)); + ok(strlen(sExpTestpath2) > 25, "%USERPROFILE% is set to a short value on this machine. we cant perform all tests."); +} + +static void test_SHGetValue(void) +{ + DWORD dwSize; + DWORD dwType; + char buf[MAX_PATH]; + + strcpy(buf, sEmptyBuffer); + dwSize = MAX_PATH; + dwType = -1; + ok(! SHGetValueA(HKEY_CURRENT_USER, "Software\\Wine\\Test", "Test1", &dwType, buf, &dwSize), ""); + ok( 0 == strcmp(sExpTestpath1, buf), "(%s,%s)", buf, sExpTestpath1); + ok( REG_SZ == dwType, "(%lx)", dwType); + + strcpy(buf, sEmptyBuffer); + dwSize = MAX_PATH; + dwType = -1; + ok(! SHGetValueA(HKEY_CURRENT_USER, "Software\\Wine\\Test", "Test2", &dwType, buf, &dwSize), ""); + ok( 0 == strcmp(sTestpath1, buf) , "(%s)", buf); + ok( REG_SZ == dwType , "(%lx)", dwType); +} + +static void test_SHGetTegPath(void) +{ + char buf[MAX_PATH]; + + strcpy(buf, sEmptyBuffer); + ok(! SHRegGetPathA(HKEY_CURRENT_USER, "Software\\Wine\\Test", "Test1", buf, 0), ""); + ok( 0 == strcmp(sExpTestpath1, buf) , "(%s)", buf); +} + +static void test_SHQUeryValueEx(void) +{ + HKEY hKey; + DWORD dwSize; + DWORD dwType; + char buf[MAX_PATH]; + DWORD dwRet; + char * sTestedFunction = ""; + int nUsedBuffer1; + int nUsedBuffer2; + + ok(! RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Wine\\Test", 0, KEY_QUERY_VALUE, &hKey), "test4 RegOpenKey"); + + /****** SHQueryValueExA ******/ + + sTestedFunction = "SHQueryValueExA"; + nUsedBuffer1 = max(strlen(sExpTestpath1)+1, strlen(sTestpath1)); + nUsedBuffer2 = max(strlen(sExpTestpath2)+1, strlen(sTestpath2)); + /* + * Case 1.1 All arguments are NULL + */ + ok(! SHQueryValueExA( hKey, "Test1", NULL, NULL, NULL, NULL), ""); + + /* + * Case 1.2 dwType is set + */ + dwType = -1; + ok(! SHQueryValueExA( hKey, "Test1", NULL, &dwType, NULL, NULL), ""); + ok( dwType == REG_SZ, "(%lu)", dwType); + + /* + * dwSize is set + * dwExpanded < dwUnExpanded + */ + dwSize = 6; + ok(! SHQueryValueExA( hKey, "Test1", NULL, NULL, NULL, &dwSize), ""); + ok( dwSize == nUsedBuffer1, "(%lu,%lu)", dwSize, nUsedBuffer1); + + /* + * dwExpanded > dwUnExpanded + */ + dwSize = 6; + ok(! SHQueryValueExA( hKey, "Test3", NULL, NULL, NULL, &dwSize), ""); + ok( dwSize == nUsedBuffer2, "(%lu,%lu)", dwSize, nUsedBuffer2); + + + /* + * Case 1 string shrinks during expanding + */ + strcpy(buf, sEmptyBuffer); + dwSize = 6; + dwType = -1; + dwRet = SHQueryValueExA( hKey, "Test1", NULL, &dwType, buf, &dwSize); + ok( dwRet == ERROR_MORE_DATA, "(%lu)", dwRet); + ok( 0 == strcmp(sEmptyBuffer, buf), "(%s)", buf); + ok( dwType == REG_SZ, "(%lu)" , dwType); + ok( dwSize == nUsedBuffer1, "(%lu,%lu)" , dwSize, nUsedBuffer1); + + /* + * string grows during expanding + */ + strcpy(buf, sEmptyBuffer); + dwSize = 6; + dwType = -1; + dwRet = SHQueryValueExA( hKey, "Test3", NULL, &dwType, buf, &dwSize); + ok( ERROR_MORE_DATA == dwRet, ""); + ok( 0 == strcmp(sEmptyBuffer, buf), "(%s)", buf); + ok( dwSize == nUsedBuffer2, "(%lu,%lu)" , dwSize, nUsedBuffer2); + ok( dwType == REG_SZ, "(%lu)" , dwType); + + /* + * if the unexpanded string fits into the buffer it can get cut when expanded + */ + strcpy(buf, sEmptyBuffer); + dwSize = 24; + dwType = -1; + ok( ERROR_MORE_DATA == SHQueryValueExA( hKey, "Test3", NULL, &dwType, buf, &dwSize), ""); + ok( 0 == strncmp(sExpTestpath2, buf, 24-1), "(%s)", buf); + ok( 24-1 == strlen(buf), "(%s)", buf); + ok( dwSize == nUsedBuffer2, "(%lu,%lu)" , dwSize, nUsedBuffer2); + ok( dwType == REG_SZ, "(%lu)" , dwType); + + /* + * The buffer is NULL but the size is set + */ + strcpy(buf, sEmptyBuffer); + dwSize = 6; + dwType = -1; + dwRet = SHQueryValueExA( hKey, "Test3", NULL, &dwType, NULL, &dwSize); + ok( ERROR_SUCCESS == dwRet, "(%lu)", dwRet); + ok( dwSize == nUsedBuffer2, "(%lu,%lu)" , dwSize, nUsedBuffer2); + ok( dwType == REG_SZ, "(%lu)" , dwType); + + + RegCloseKey(hKey); +} + +START_TEST(shreg) +{ + create_test_entrys(); + test_SHGetValue(); + test_SHQUeryValueEx(); + test_SHGetTegPath(); +}