July 2008 - Wine-Commits - list.winehq.org

Huw Davies : gdiplus: Remove incorrect test.
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: 94a20f8b7ea4b1aeb07a0f001f549584c5923d66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a20f8b7ea4b1aeb07a0f001… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 21 12:35:58 2008 +0100 gdiplus: Remove incorrect test. --- dlls/gdiplus/tests/font.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 5f6494b..ab0f814 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -168,8 +168,6 @@ static void test_fontfamily (void) */ stat = GdipCreateFontFamilyFromName (nonexistent, NULL, &family); expect (FontFamilyNotFound, stat); - ok ((lstrcmpiW(itsName, nonexistent) != 0), - "Expected a non-zero value for nonexistent font!\n"); /* Bitmap fonts are not found */ todo_wine

1 0

Huw Davies : user32: Don't access pConv after it's been freed.
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: bce23d7edbc83e5a5170f2f9d46fbb801c8750d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce23d7edbc83e5a5170f2f9d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 21 11:15:49 2008 +0100 user32: Don't access pConv after it's been freed. --- dlls/user32/dde_misc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index 049deae..d99cdcf 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -1658,9 +1658,10 @@ void WDML_RemoveServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic) pConvNext = pConv->next; if (DdeCmpStringHandles(pConv->hszService, hszService) == 0) { + HWND client = pConv->hwndClient, server = pConv->hwndServer; WDML_RemoveConv(pConv, WDML_SERVER_SIDE); /* don't care about return code (whether client window is present or not) */ - PostMessageW(pConv->hwndClient, WM_DDE_TERMINATE, (WPARAM)pConv->hwndServer, 0); + PostMessageW(client, WM_DDE_TERMINATE, (WPARAM)server, 0); } } if (pServer == pInstance->servers)

1 0

Alexandre Julliard : Avoid exporting common symbols since that' s broken on Mac OS X.
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: 9c29dbd9873b41f5334a858d8806a256bf00f880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c29dbd9873b41f5334a858d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 21 14:47:55 2008 +0200 Avoid exporting common symbols since that's broken on Mac OS X. --- dlls/crtdll/crtdll_main.c | 16 ++++++------ dlls/msvcrt/data.c | 56 +++++++++++++++++++++--------------------- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/locale.c | 10 +++--- dlls/msvcrt/mbcs.c | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 4 +- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/dlls/crtdll/crtdll_main.c b/dlls/crtdll/crtdll_main.c index 8e5cc18..60c4264 100644 --- a/dlls/crtdll/crtdll_main.c +++ b/dlls/crtdll/crtdll_main.c @@ -37,14 +37,14 @@ extern void CDECL __getmainargs( int *argc, char ***argv, char ***envp, int expand_wildcards, int *new_mode ); /* The following data items are not exported from msvcrt */ -unsigned int CRTDLL__basemajor_dll; -unsigned int CRTDLL__baseminor_dll; -unsigned int CRTDLL__baseversion_dll; -unsigned int CRTDLL__cpumode_dll; -unsigned int CRTDLL__osmajor_dll; -unsigned int CRTDLL__osminor_dll; -unsigned int CRTDLL__osmode_dll; -unsigned int CRTDLL__osversion_dll; +unsigned int CRTDLL__basemajor_dll = 0; +unsigned int CRTDLL__baseminor_dll = 0; +unsigned int CRTDLL__baseversion_dll = 0; +unsigned int CRTDLL__cpumode_dll = 0; +unsigned int CRTDLL__osmajor_dll = 0; +unsigned int CRTDLL__osminor_dll = 0; +unsigned int CRTDLL__osmode_dll = 0; +unsigned int CRTDLL__osversion_dll = 0; /* dev_t is a short in crtdll but an unsigned int in msvcrt */ typedef short crtdll_dev_t; diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index b0f78d5..fd80210 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -29,34 +29,34 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -int MSVCRT___argc; -unsigned int MSVCRT_basemajor;/* FIXME: */ -unsigned int MSVCRT_baseminor;/* FIXME: */ -unsigned int MSVCRT_baseversion; /* FIXME: */ -unsigned int MSVCRT__commode; -unsigned int MSVCRT__fmode; -unsigned int MSVCRT_osmajor;/* FIXME: */ -unsigned int MSVCRT_osminor;/* FIXME: */ -unsigned int MSVCRT_osmode;/* FIXME: */ -unsigned int MSVCRT__osver; -unsigned int MSVCRT_osversion; /* FIXME: */ -unsigned int MSVCRT__winmajor; -unsigned int MSVCRT__winminor; -unsigned int MSVCRT__winver; -unsigned int MSVCRT___setlc_active; -unsigned int MSVCRT___unguarded_readlc_active; -double MSVCRT__HUGE; -char **MSVCRT___argv; -MSVCRT_wchar_t **MSVCRT___wargv; -char *MSVCRT__acmdln; -MSVCRT_wchar_t *MSVCRT__wcmdln; -char **MSVCRT__environ = 0; -MSVCRT_wchar_t **_wenviron = 0; -char **MSVCRT___initenv = 0; -MSVCRT_wchar_t **MSVCRT___winitenv = 0; -int MSVCRT_app_type; -char* MSVCRT__pgmptr = 0; -WCHAR* MSVCRT__wpgmptr = 0; +int MSVCRT___argc = 0; +unsigned int MSVCRT_basemajor = 0;/* FIXME: */ +unsigned int MSVCRT_baseminor = 0;/* FIXME: */ +unsigned int MSVCRT_baseversion = 0; /* FIXME: */ +unsigned int MSVCRT__commode = 0; +unsigned int MSVCRT__fmode = 0; +unsigned int MSVCRT_osmajor = 0;/* FIXME: */ +unsigned int MSVCRT_osminor = 0;/* FIXME: */ +unsigned int MSVCRT_osmode = 0;/* FIXME: */ +unsigned int MSVCRT__osver = 0; +unsigned int MSVCRT_osversion = 0; /* FIXME: */ +unsigned int MSVCRT__winmajor = 0; +unsigned int MSVCRT__winminor = 0; +unsigned int MSVCRT__winver = 0; +unsigned int MSVCRT___setlc_active = 0; +unsigned int MSVCRT___unguarded_readlc_active = 0; +double MSVCRT__HUGE = 0; +char **MSVCRT___argv = NULL; +MSVCRT_wchar_t **MSVCRT___wargv = NULL; +char *MSVCRT__acmdln = NULL; +MSVCRT_wchar_t *MSVCRT__wcmdln = NULL; +char **MSVCRT__environ = NULL; +MSVCRT_wchar_t **_wenviron = NULL; +char **MSVCRT___initenv = NULL; +MSVCRT_wchar_t **MSVCRT___winitenv = NULL; +int MSVCRT_app_type = 0; +char* MSVCRT__pgmptr = NULL; +WCHAR* MSVCRT__wpgmptr = NULL; /* Get a snapshot of the current environment * and construct the __p__environ array diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index f85afd3..cd15e40 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -75,7 +75,7 @@ typedef struct { static ioinfo MSVCRT_fdesc[MSVCRT_MAX_FILES]; -MSVCRT_FILE MSVCRT__iob[3]; +MSVCRT_FILE MSVCRT__iob[3] = { { 0 } }; static int MSVCRT_fdstart = 3; /* first unallocated fd */ static int MSVCRT_fdend = 3; /* highest allocated fd */ diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index e679a28..6447436 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -43,11 +43,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); */ #define MAX_ELEM_LEN 64 /* Max length of country/language/CP string */ #define MAX_LOCALE_LENGTH 256 -char MSVCRT_current_lc_all[MAX_LOCALE_LENGTH]; -LCID MSVCRT_current_lc_all_lcid; -int MSVCRT___lc_codepage; -int MSVCRT___lc_collate_cp; -HANDLE MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1]; +char MSVCRT_current_lc_all[MAX_LOCALE_LENGTH] = { 0 }; +LCID MSVCRT_current_lc_all_lcid = 0; +int MSVCRT___lc_codepage = 0; +int MSVCRT___lc_collate_cp = 0; +HANDLE MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1] = { 0 }; /* MT */ #define LOCK_LOCALE _mlock(_SETLOCALE_LOCK); diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 4acc52f..c99d167 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -unsigned char MSVCRT_mbctype[257]; +unsigned char MSVCRT_mbctype[257] = { 0 }; static int g_mbcp_is_multibyte = 0; int MSVCRT___mb_cur_max = 1; diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index cda3476..564c55b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); WINE_DECLARE_DEBUG_CHANNEL(relay); -KSYSTEM_TIME KeTickCount; +KSYSTEM_TIME KeTickCount = { 0, 0, 0 }; typedef struct _KSERVICE_TABLE_DESCRIPTOR { @@ -50,7 +50,7 @@ typedef struct _KSERVICE_TABLE_DESCRIPTOR PUCHAR Number; } KSERVICE_TABLE_DESCRIPTOR, *PKSERVICE_TABLE_DESCRIPTOR; -KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4]; +KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4] = { { 0 } }; typedef void (WINAPI *PCREATE_PROCESS_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN);

1 0

Detlef Riekenberg : oleaut32/tests: Fix tmarshal tests on win9x.
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: c81b2b2c74cc13396e947daba05a61994d601258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c81b2b2c74cc13396e947daba… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jul 21 00:07:53 2008 +0200 oleaut32/tests: Fix tmarshal tests on win9x. --- dlls/oleaut32/tests/tmarshal.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 7ddbe75..f705722 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -701,10 +701,12 @@ typedef struct KindaEnum static HRESULT register_current_module_typelib(void) { WCHAR path[MAX_PATH]; + CHAR pathA[MAX_PATH]; HRESULT hr; ITypeLib *typelib; - GetModuleFileNameW(NULL, path, MAX_PATH); + GetModuleFileNameA(NULL, pathA, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); hr = LoadTypeLib(path, &typelib); if (SUCCEEDED(hr))

1 0

Detlef Riekenberg : oleaut32/tests: Run more typelib tests on win9x.
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: b4f2c5068790f0615609bce27e2f6f936608a390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4f2c5068790f0615609bce27… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jul 21 00:17:55 2008 +0200 oleaut32/tests: Run more typelib tests on win9x. --- dlls/oleaut32/tests/typelib.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 3479c18..868470d 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -672,11 +672,13 @@ static void test_inheritance(void) HREFTYPE href; FUNCDESC *pFD; WCHAR path[MAX_PATH]; + CHAR pathA[MAX_PATH]; static const WCHAR tl_path[] = {'.','\\','m','i','d','l','_','t','m','a','r','s','h','a','l','.','t','l','b',0}; BOOL use_midl_tlb = 0; - GetModuleFileNameW(NULL, path, MAX_PATH); + GetModuleFileNameA(NULL, pathA, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); if(use_midl_tlb) memcpy(path, tl_path, sizeof(tl_path));

1 0

Reece Dunn : comctl32: Fixed the MRU tests on Vista.
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: a7794bcb5083fa6621d0ab71c97ba22705e3402a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7794bcb5083fa6621d0ab71c… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Jul 20 15:04:28 2008 +0100 comctl32: Fixed the MRU tests on Vista. --- dlls/comctl32/tests/mru.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index d5e1d8a..1e55425 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -353,15 +353,15 @@ static void test_MRUListA(void) /* NULL buffer = get list size */ iRet = pEnumMRUList(hMRU, 0, NULL, 0); - ok(iRet == 3, "EnumMRUList expected %d, got %d\n", LIST_SIZE, iRet); + ok(iRet == 3 || iRet == -1 /* Vista */, "EnumMRUList expected %d or -1, got %d\n", LIST_SIZE, iRet); /* negative item pos = get list size */ iRet = pEnumMRUList(hMRU, -1, NULL, 0); - ok(iRet == 3, "EnumMRUList expected %d, got %d\n", LIST_SIZE, iRet); + ok(iRet == 3 || iRet == -1 /* Vista */, "EnumMRUList expected %d or -1, got %d\n", LIST_SIZE, iRet); /* negative item pos = get list size */ iRet = pEnumMRUList(hMRU, -5, NULL, 0); - ok(iRet == 3, "EnumMRUList expected %d, got %d\n", LIST_SIZE, iRet); + ok(iRet == 3 || iRet == -1 /* Vista */, "EnumMRUList expected %d or -1, got %d\n", LIST_SIZE, iRet); /* negative item pos = get list size */ iRet = pEnumMRUList(hMRU, -1, buffer, 255);

1 0

Reece Dunn : shell32/tests: Vista returns E_INVALIDARG if the path sent to SetPath is invalid.
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: de08ba8332844c1edfa89a873b759a3f9240d15b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de08ba8332844c1edfa89a873… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Jul 20 14:41:48 2008 +0100 shell32/tests: Vista returns E_INVALIDARG if the path sent to SetPath is invalid. --- dlls/shell32/tests/shelllink.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index fb258aa..710920d 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -226,19 +226,19 @@ static void test_get_set(void) ok(!lstrcmp(buffer, "C:\\nonexistent\\file"), "case doesn't match\n"); r = IShellLinkA_SetPath(sl, "\"c:\\foo"); - ok(r==S_FALSE || r == S_OK, "SetPath failed (0x%08x)\n", r); + ok(r==S_FALSE || r == S_OK || r == E_INVALIDARG /* Vista */, "SetPath failed (0x%08x)\n", r); r = IShellLinkA_SetPath(sl, "\"\"c:\\foo"); - ok(r==S_FALSE || r == S_OK, "SetPath failed (0x%08x)\n", r); + ok(r==S_FALSE || r == S_OK || r == E_INVALIDARG /* Vista */, "SetPath failed (0x%08x)\n", r); r = IShellLinkA_SetPath(sl, "c:\\foo\""); - ok(r==S_FALSE || r == S_OK, "SetPath failed (0x%08x)\n", r); + ok(r==S_FALSE || r == S_OK || r == E_INVALIDARG /* Vista */, "SetPath failed (0x%08x)\n", r); r = IShellLinkA_SetPath(sl, "\"\"c:\\foo\""); - ok(r==S_FALSE || r == S_OK, "SetPath failed (0x%08x)\n", r); + ok(r==S_FALSE || r == S_OK || r == E_INVALIDARG /* Vista */, "SetPath failed (0x%08x)\n", r); r = IShellLinkA_SetPath(sl, "\"\"c:\\foo\"\""); - ok(r==S_FALSE || r == S_OK, "SetPath failed (0x%08x)\n", r); + ok(r==S_FALSE || r == S_OK || r == E_INVALIDARG /* Vista */, "SetPath failed (0x%08x)\n", r); /* Test Getting / Setting the arguments */ strcpy(buffer,"garbage");

1 0

Reece Dunn : oleaut32: Fix the vartype tests on Vista.
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: 4140801e2d1342f85a01707aebd26112d9a132f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4140801e2d1342f85a01707ae… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Jul 20 11:23:17 2008 +0100 oleaut32: Fix the vartype tests on Vista. --- dlls/oleaut32/tests/vartype.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 19e33bc..e2db519 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5202,7 +5202,8 @@ static void test_SysReAllocString(void) changed = SysReAllocString(&str, szSmaller); ok (changed == 1, "Expected 1, got %d\n", changed); - ok (str == oldstr, "Created new string\n"); + /* Vista creates a new string, but older versions reuse the existing string. */ + /*ok (str == oldstr, "Created new string\n");*/ bstr = Get(str); ok (bstr->dwLen == 2, "Expected 2, got %d\n", bstr->dwLen); ok (!lstrcmpW(bstr->szString, szSmaller), "String different\n"); @@ -5241,7 +5242,8 @@ static void test_SysReAllocStringLen(void) changed = SysReAllocStringLen(&str, szSmaller, 1); ok (changed == 1, "Expected 1, got %d\n", changed); - ok (str == oldstr, "Created new string\n"); + /* Vista creates a new string, but older versions reuse the existing string. */ + /*ok (str == oldstr, "Created new string\n");*/ bstr = Get(str); ok (bstr->dwLen == 2, "Expected 2, got %d\n", bstr->dwLen); ok (!lstrcmpW(bstr->szString, szSmaller), "String different\n");

1 0

Reece Dunn : shell32: Make the tests build with the Vista SDK.
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: 811a809b0a95f600e7e08fa432031ac2272fcf21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=811a809b0a95f600e7e08fa43… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Jul 20 13:54:14 2008 +0100 shell32: Make the tests build with the Vista SDK. --- dlls/shell32/tests/shelllink.c | 3 +++ dlls/shell32/tests/shlexec.c | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 44e314d..fb258aa 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -33,6 +33,9 @@ #include "shell32_test.h" +#ifndef SLDF_HAS_LOGO3ID +# define SLDF_HAS_LOGO3ID 0x00000800 /* not available in the Vista SDK */ +#endif typedef void (WINAPI *fnILFree)(LPITEMIDLIST); typedef BOOL (WINAPI *fnILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 4b1bf1b..a60c4ad 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -38,6 +38,7 @@ /* Needed to get SEE_MASK_NOZONECHECKS with the PSDK */ #define NTDDI_WINXPSP1 0x05010100 #define NTDDI_VERSION NTDDI_WINXPSP1 +#define _WIN32_WINNT 0x0501 #include "wtypes.h" #include "winbase.h"

1 0

Reece Dunn : shell32: Do not use a fixed path in the shelllink tests.
by Alexandre Julliard July 21, 2008

July 21, 2008

Module: wine Branch: master Commit: 29c66b3a9e87e477c7b5fa897492452230c15166 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c66b3a9e87e477c7b5fa897… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Jul 20 14:40:19 2008 +0100 shell32: Do not use a fixed path in the shelllink tests. --- dlls/shell32/tests/shelllink.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 5b905b4..44e314d 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -49,7 +49,6 @@ static const GUID _IID_IShellLinkDataList = { { 0xb9, 0x2f, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1 } }; -static const WCHAR lnkfile[]= { 'C',':','\\','t','e','s','t','.','l','n','k',0 }; static const WCHAR notafile[]= { 'C',':','\\','n','o','n','e','x','i','s','t','e','n','t','\\','f','i','l','e',0 }; @@ -494,6 +493,12 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) static void test_load_save(void) { + WCHAR lnkfile[MAX_PATH]; + static const WCHAR lnkfile_name[] = { '\\', 't', 'e', 's', 't', '.', 'l', 'n', 'k', '\0' }; + + char lnkfileA[MAX_PATH]; + static const char lnkfileA_name[] = "\\test.lnk"; + lnk_desc_t desc; char mypath[MAX_PATH]; char mydir[MAX_PATH]; @@ -508,6 +513,12 @@ static void test_load_save(void) return; } + /* Don't used a fixed path for the test.lnk file */ + GetTempPathW(MAX_PATH, lnkfile); + lstrcatW(lnkfile, lnkfile_name); + GetTempPathA(MAX_PATH, lnkfileA); + lstrcatA(lnkfileA, lnkfileA_name); + /* Save an empty .lnk file */ memset(&desc, 0, sizeof(desc)); create_lnk(lnkfile, &desc, 0); @@ -608,8 +619,8 @@ static void test_load_save(void) */ /* DeleteFileW is not implemented on Win9x */ - r=DeleteFileA("c:\\test.lnk"); - ok(r, "failed to delete link (%d)\n", GetLastError()); + r=DeleteFileA(lnkfileA); + ok(r, "failed to delete link '%s' (%d)\n", lnkfileA, GetLastError()); } static void test_datalink(void)

1 0