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

André Hentschel : Add WWN 393
by Jeremy Newman June 23, 2015

June 23, 2015

Module: website Branch: master Commit: 7f5189e45fffb01be3298a985d4a2eb23df286e4 URL: http://source.winehq.org/git/website.git/?a=commit;h=7f5189e45fffb01be3298a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 23 21:25:32 2015 +0200 Add WWN 393 --- news/de/2015062301.xml | 10 + news/en/2015062301.xml | 10 + wwn/en/wn20150623_393.xml | 627 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 647 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=7f5189e45fffb01be3…

1 0

Nikolay Sivov : qmgr: Simplify string duplication using a helper.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: 8ae201548fb5be2975bfaa0978b9635adc7ef1cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ae201548fb5be2975bfaa097… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 23 15:14:53 2015 +0300 qmgr: Simplify string duplication using a helper. --- dlls/qmgr/file.c | 9 ++------- dlls/qmgr/job.c | 5 +---- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 0321ab6..b92e52f 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -166,7 +166,6 @@ HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, BackgroundCopyFileImpl **file) { BackgroundCopyFileImpl *This; - int n; TRACE("(%s, %s, %p)\n", debugstr_w(remoteName), debugstr_w(localName), file); @@ -174,24 +173,20 @@ HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, if (!This) return E_OUTOFMEMORY; - n = (lstrlenW(remoteName) + 1) * sizeof(WCHAR); - This->info.RemoteName = HeapAlloc(GetProcessHeap(), 0, n); + This->info.RemoteName = strdupW(remoteName); if (!This->info.RemoteName) { HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; } - memcpy(This->info.RemoteName, remoteName, n); - n = (lstrlenW(localName) + 1) * sizeof(WCHAR); - This->info.LocalName = HeapAlloc(GetProcessHeap(), 0, n); + This->info.LocalName = strdupW(localName); if (!This->info.LocalName) { HeapFree(GetProcessHeap(), 0, This->info.RemoteName); HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; } - memcpy(This->info.LocalName, localName, n); This->IBackgroundCopyFile2_iface.lpVtbl = &BackgroundCopyFile2Vtbl; This->ref = 1; diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 8ca04ad..fda7a01 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -1194,7 +1194,6 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID { HRESULT hr; BackgroundCopyJobImpl *This; - int n; TRACE("(%s,%d,%p)\n", debugstr_w(displayName), type, job); @@ -1210,8 +1209,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID This->ref = 1; This->type = type; - n = (strlenW(displayName) + 1) * sizeof *displayName; - This->displayName = HeapAlloc(GetProcessHeap(), 0, n); + This->displayName = strdupW(displayName); if (!This->displayName) { This->cs.DebugInfo->Spare[0] = 0; @@ -1219,7 +1217,6 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; } - memcpy(This->displayName, displayName, n); hr = CoCreateGuid(&This->jobId); if (FAILED(hr))

1 0

Jacek Caban : msscript.ocx: Added stub DLL.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: 74e37bc301f23d01c0240e25a054d948bdcd8462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74e37bc301f23d01c0240e25a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 23 13:09:32 2015 +0200 msscript.ocx: Added stub DLL. --- configure | 2 + configure.ac | 1 + dlls/msscript.ocx/Makefile.in | 4 ++ dlls/msscript.ocx/msscript.c | 77 +++++++++++++++++++++++++++++++++++++ dlls/msscript.ocx/msscript.ocx.spec | 5 +++ 5 files changed, 89 insertions(+) diff --git a/configure b/configure index 33dd534..e9f08ba 100755 --- a/configure +++ b/configure @@ -1152,6 +1152,7 @@ enable_msls31 enable_msnet32 enable_mspatcha enable_msrle32 +enable_msscript_ocx enable_mssign32 enable_mssip32 enable_mstask @@ -17426,6 +17427,7 @@ wine_fn_config_dll msnet32 enable_msnet32 wine_fn_config_dll mspatcha enable_mspatcha implib wine_fn_config_dll msrle32 enable_msrle32 po wine_fn_config_test dlls/msrle32/tests msrle32_test +wine_fn_config_dll msscript.ocx enable_msscript_ocx wine_fn_config_dll mssign32 enable_mssign32 wine_fn_config_dll mssip32 enable_mssip32 wine_fn_config_dll mstask enable_mstask clean diff --git a/configure.ac b/configure.ac index f56b6f6..bfc4f3f 100644 --- a/configure.ac +++ b/configure.ac @@ -3101,6 +3101,7 @@ WINE_CONFIG_DLL(msnet32) WINE_CONFIG_DLL(mspatcha,,[implib]) WINE_CONFIG_DLL(msrle32,,[po]) WINE_CONFIG_TEST(dlls/msrle32/tests) +WINE_CONFIG_DLL(msscript.ocx) WINE_CONFIG_DLL(mssign32) WINE_CONFIG_DLL(mssip32) WINE_CONFIG_DLL(mstask,,[clean]) diff --git a/dlls/msscript.ocx/Makefile.in b/dlls/msscript.ocx/Makefile.in new file mode 100644 index 0000000..13cd926 --- /dev/null +++ b/dlls/msscript.ocx/Makefile.in @@ -0,0 +1,4 @@ +MODULE = msscript.ocx + +C_SRCS = \ + msscript.c diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c new file mode 100644 index 0000000..330ad76 --- /dev/null +++ b/dlls/msscript.ocx/msscript.c @@ -0,0 +1,77 @@ +/* + * Copyright 2015 Jacek Caban for CodeWeavers + * + * 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 "windows.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msscript); + +/****************************************************************** + * DllMain (msscript.ocx.@) + */ +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID lpv) +{ + TRACE("(%p %d %p)\n", instance, reason, lpv); + + switch(reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject (msscript.ocx.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow (msscript.ocx.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + TRACE("\n"); + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (msscript.ocx.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("()\n"); + return E_NOTIMPL; +} + +/*********************************************************************** + * DllUnregisterServer (msscript.ocx.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + TRACE("()\n"); + return E_NOTIMPL; +} diff --git a/dlls/msscript.ocx/msscript.ocx.spec b/dlls/msscript.ocx/msscript.ocx.spec new file mode 100644 index 0000000..861d893 --- /dev/null +++ b/dlls/msscript.ocx/msscript.ocx.spec @@ -0,0 +1,5 @@ +@ stub DLLGetDocumentation +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Erich E. Hoover : kernel32: Handle device paths in GetVolumePathName.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: ed151a5efcc3f4c8d8da567f8692c8eff6fb7bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed151a5efcc3f4c8d8da567f8… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Mon Jun 15 22:20:03 2015 -0600 kernel32: Handle device paths in GetVolumePathName. NT-style paths that have a device prefix (\??\) also return the drive of the current working directory (even if they're valid devices). --- dlls/kernel32/tests/volume.c | 8 ++++++++ dlls/kernel32/volume.c | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 7ed55d7..4349ec4 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -675,6 +675,14 @@ static void test_GetVolumePathNameA(void) "InvalidDrive:\\AnInvalidFolder", "%CurrentDrive%\\", sizeof(volume_path), NO_ERROR, NO_ERROR }, + { /* test 18: a reasonable device path */ + "\\??\\CdRom0", "%CurrentDrive%\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, + { /* test 19: an unreasonable device path */ + "\\??\\ReallyBogus", "%CurrentDrive%\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, }; BOOL ret, success; DWORD error; diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 5e3b148..7cb245a 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1817,6 +1817,7 @@ BOOL WINAPI GetVolumePathNameA(LPCSTR filename, LPSTR volumepathname, DWORD bufl */ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD buflen) { + static const WCHAR deviceprefixW[] = { '\\','?','?','\\',0 }; static const WCHAR ntprefixW[] = { '\\','\\','?','\\',0 }; WCHAR fallbackpathW[] = { 'C',':','\\',0 }; NTSTATUS status = STATUS_SUCCESS; @@ -1892,9 +1893,9 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu WCHAR cwdW[MAX_PATH]; /* the path was completely invalid */ - if (filename[0] == '\\') + if (filename[0] == '\\' && strncmpW(deviceprefixW, filename, strlenW(deviceprefixW)) != 0) { - /* NT-style paths fail */ + /* NT-style paths (that are not device paths) fail */ status = STATUS_OBJECT_NAME_INVALID; goto cleanup; }

1 0

Erich E. Hoover : kernel32: Handle semi-DOS paths in GetVolumePathName.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: e8e13308eae427a88394abaab28dfb5ab7f149b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8e13308eae427a88394abaab… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Tue Jun 16 08:17:23 2015 -0600 kernel32: Handle semi-DOS paths in GetVolumePathName. Add support for "semi-DOS" paths, these paths revert to the drive letter specified in the first character. --- dlls/kernel32/tests/volume.c | 8 ++++++++ dlls/kernel32/volume.c | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 3eb7fed..5b117b8 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -663,6 +663,14 @@ static void test_GetVolumePathNameA(void) "\\\\ReallyBogus\\InvalidDrive:\\" /* win2k, winxp */, sizeof(volume_path), ERROR_INVALID_NAME, NO_ERROR }, + { /* test 15: poor quality input, valid output, valid output length, different drive */ + "D::", "D:\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, + { /* test 16: unused drive letter */ + "M::", "C:\\", 4, + ERROR_FILE_NOT_FOUND, ERROR_MORE_DATA + }, }; BOOL ret, success; DWORD error; diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index a6b2b3d..ac6aa48 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1818,7 +1818,7 @@ BOOL WINAPI GetVolumePathNameA(LPCSTR filename, LPSTR volumepathname, DWORD bufl BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD buflen) { static const WCHAR ntprefixW[] = { '\\','\\','?','\\',0 }; - static const WCHAR fallbackpathW[] = { 'C',':','\\',0 }; + WCHAR fallbackpathW[] = { 'C',':','\\',0 }; NTSTATUS status = STATUS_SUCCESS; WCHAR *volumenameW = NULL, *c; int pos, last_pos, stop_pos; @@ -1897,7 +1897,17 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu goto cleanup; } - /* DOS-style paths revert to C:\ (anything not beginning with a slash) */ + /* DOS-style paths (anything not beginning with a slash) have fallback replies */ + if (filename[1] == ':') + { + /* if the path is semi-sane (X:) then use the given drive letter (if it is mounted) */ + fallbackpathW[0] = filename[0]; + if (!isalphaW(filename[0]) || GetDriveTypeW( fallbackpathW ) == DRIVE_NO_ROOT_DIR) + { + status = STATUS_OBJECT_NAME_NOT_FOUND; + goto cleanup; + } + } last_pos = strlenW(fallbackpathW) - 1; /* points to \\ */ filename = fallbackpathW; status = STATUS_SUCCESS;

1 0

Huw Davies : shell32/tests: Don't leave behind open explorer windows.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: da5151fd54c2679b9cd10a7a4d2933f727266bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5151fd54c2679b9cd10a7a4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 23 13:40:30 2015 +0100 shell32/tests: Don't leave behind open explorer windows. --- dlls/shell32/tests/progman_dde.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 5b22387..a3faa83 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -363,7 +363,7 @@ static void DdeExecuteCommand(DWORD instance, HCONV hConv, const char *strCmd, H * window creation happened were not encouraging (not including * SetWindowsHookEx). */ -static void CheckWindowCreated(const char *winName, BOOL closeWindow, int testParams) +static HWND CheckWindowCreated(const char *winName, BOOL closeWindow, int testParams) { HWND window = NULL; int i; @@ -381,7 +381,9 @@ static void CheckWindowCreated(const char *winName, BOOL closeWindow, int testPa if (window != NULL && closeWindow) { SendMessageA(window, WM_SYSCOMMAND, SC_CLOSE, 0); + window = NULL; } + return window; } /* Check for Existence (or non-existence) of a file or group @@ -468,11 +470,12 @@ static void CreateGroupTest(DWORD instance, HCONV hConv, const char *command, UI * if expected_result is DMLERR_NO_ERROR, test * 1. window is open */ -static void ShowGroupTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, +static HWND ShowGroupTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, const char *groupName, const char *windowTitle, BOOL closeAfterShowing, int testParams) { HDDEDATA hData; UINT error; + HWND hwnd = 0; DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams); /* todo_wine... Is expected to fail, wine stubbed functions DO fail */ @@ -494,8 +497,9 @@ static void ShowGroupTest(DWORD instance, HCONV hConv, const char *command, UINT if (error == DMLERR_NO_ERROR) { /* Check if Window is Open (polling) */ - CheckWindowCreated(windowTitle, closeAfterShowing, testParams); + hwnd = CheckWindowCreated(windowTitle, closeAfterShowing, testParams); } + return hwnd; } /* Delete Group Test. @@ -582,12 +586,13 @@ static void DeleteItemTest(DWORD instance, HCONV hConv, const char *command, UIN * All samples I've seen using Compound were of this form (CreateGroup, * AddItems) so this covers minimum expected functionality. */ -static void CompoundCommandTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, +static HWND CompoundCommandTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, const char *groupName, const char *windowTitle, const char *fileName1, const char *fileName2, int testParams) { HDDEDATA hData; UINT error; + HWND hwnd = 0; DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams); todo_wine @@ -601,10 +606,11 @@ static void CompoundCommandTest(DWORD instance, HCONV hConv, const char *command { /* Check that File exists */ CheckFileExistsInProgramGroups(groupName, TRUE, TRUE, NULL, testParams); - CheckWindowCreated(windowTitle, FALSE, testParams); + hwnd = CheckWindowCreated(windowTitle, FALSE, testParams); CheckFileExistsInProgramGroups(fileName1, TRUE, FALSE, groupName, testParams); CheckFileExistsInProgramGroups(fileName2, TRUE, FALSE, groupName, testParams); } + return hwnd; } static void CreateAddItemText(char *itemtext, const char *cmdline, const char *name) @@ -626,6 +632,7 @@ static int DdeTestProgman(DWORD instance, HCONV hConv) char f1g1[MAX_PATH], f2g1[MAX_PATH], f3g1[MAX_PATH], f1g3[MAX_PATH], f2g3[MAX_PATH]; char itemtext[MAX_PATH + 20]; char comptext[2 * (MAX_PATH + 20) + 21]; + HWND hwnd; testnum = 1; /* Invalid Command */ @@ -658,10 +665,11 @@ static int DdeTestProgman(DWORD instance, HCONV hConv) ShowGroupTest(instance, hConv, "[ShowGroup(Group1)]", DMLERR_NOTPROCESSED, "Group1", Group1Title, TRUE, DDE_TEST_SHOWGROUP|testnum++); DeleteItemTest(instance, hConv, "[DeleteItem(f3g1Name)]", DMLERR_NO_ERROR, "f3g1Name.lnk", "Group1", DDE_TEST_DELETEITEM|testnum++); ShowGroupTest(instance, hConv, "[ShowGroup(Startup,0)]", DMLERR_NO_ERROR, "Startup", StartupTitle, TRUE, DDE_TEST_SHOWGROUP|testnum++); - ShowGroupTest(instance, hConv, "[ShowGroup(Group1,0)]", DMLERR_NO_ERROR, "Group1", Group1Title, FALSE, DDE_TEST_SHOWGROUP|testnum++); + hwnd = ShowGroupTest(instance, hConv, "[ShowGroup(Group1,0)]", DMLERR_NO_ERROR, "Group1", Group1Title, FALSE, DDE_TEST_SHOWGROUP|testnum++); /* DeleteGroup Test - Note that Window is Open for this test */ DeleteGroupTest(instance, hConv, "[DeleteGroup(Group1)]", DMLERR_NO_ERROR, "Group1", DDE_TEST_DELETEGROUP|testnum++); + if (hwnd) SendMessageA(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); /* Compound Execute String Command */ lstrcpyA(comptext, "[CreateGroup(Group3)]"); @@ -669,9 +677,10 @@ static int DdeTestProgman(DWORD instance, HCONV hConv) lstrcatA(comptext, itemtext); CreateAddItemText(itemtext, f2g3, "f2g3Name"); lstrcatA(comptext, itemtext); - CompoundCommandTest(instance, hConv, comptext, DMLERR_NO_ERROR, "Group3", Group3Title, "f1g3Name.lnk", "f2g3Name.lnk", DDE_TEST_COMPOUND|testnum++); + hwnd = CompoundCommandTest(instance, hConv, comptext, DMLERR_NO_ERROR, "Group3", Group3Title, "f1g3Name.lnk", "f2g3Name.lnk", DDE_TEST_COMPOUND|testnum++); DeleteGroupTest(instance, hConv, "[DeleteGroup(Group3)]", DMLERR_NO_ERROR, "Group3", DDE_TEST_DELETEGROUP|testnum++); + if (hwnd) SendMessageA(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); /* Full Parameters of Add Item */ /* AddItem(CmdLine[,Name[,IconPath[,IconIndex[,xPos,yPos[,DefDir[,HotKey[,fMinimize[fSeparateSpace]]]]]]]) */

1 0

Sebastian Lackner : kernel32/tests: Add a lot of picky GetVolumePathName tests.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: d01c135aed362556fdfd79fd5e4403d7dfb5d90c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d01c135aed362556fdfd79fd5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 2 05:23:37 2014 +0200 kernel32/tests: Add a lot of picky GetVolumePathName tests. --- dlls/kernel32/tests/volume.c | 95 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 4349ec4..b7369a6 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -683,6 +683,94 @@ static void test_GetVolumePathNameA(void) "\\??\\ReallyBogus", "%CurrentDrive%\\", sizeof(volume_path), NO_ERROR, NO_ERROR }, + { /* test 20 */ + "C:", "C:", 2, + ERROR_FILENAME_EXCED_RANGE, NO_ERROR + }, + { /* test 21 */ + "C:", "C:", 3, + NO_ERROR, ERROR_FILENAME_EXCED_RANGE + }, + { /* test 22 */ + "C:\\", "C:", 2, + ERROR_FILENAME_EXCED_RANGE, NO_ERROR + }, + { /* test 23 */ + "C:\\", "C:", 3, + NO_ERROR, ERROR_FILENAME_EXCED_RANGE + }, + { /* test 24 */ + "C::", "C:", 2, + ERROR_FILENAME_EXCED_RANGE, NO_ERROR + }, + { /* test 25 */ + "C::", "C:", 3, + NO_ERROR, ERROR_FILENAME_EXCED_RANGE + }, + { /* test 26 */ + "C::", "C:\\", 4, + NO_ERROR, ERROR_MORE_DATA + }, + { /* test 27 */ + "C:\\windows\\system32\\AnInvalidFolder", "C:", 3, + NO_ERROR, ERROR_FILENAME_EXCED_RANGE + }, + { /* test 28 */ + "\\\\?\\C:\\AnInvalidFolder", "\\\\?\\C:", 3, + ERROR_FILENAME_EXCED_RANGE, NO_ERROR + }, + { /* test 29 */ + "\\\\?\\C:\\AnInvalidFolder", "\\\\?\\C:", 6, + ERROR_FILENAME_EXCED_RANGE, NO_ERROR + }, + { /* test 30 */ + "\\\\?\\C:\\AnInvalidFolder", "\\\\?\\C:", 7, + NO_ERROR, ERROR_FILENAME_EXCED_RANGE + }, + { /* test 31 */ + "\\\\?\\c:\\AnInvalidFolder", "\\\\?\\c:", 7, + NO_ERROR, ERROR_FILENAME_EXCED_RANGE + }, + { /* test 32 */ + "C:/", "C:\\", 4, + NO_ERROR, ERROR_MORE_DATA + }, + { /* test 33 */ + "M:/", "", 4, + ERROR_FILE_NOT_FOUND, ERROR_MORE_DATA + }, + { /* test 34 */ + "C:ABC:DEF:\\AnInvalidFolder", "C:\\", 4, + NO_ERROR, ERROR_MORE_DATA + }, + { /* test 35 */ + "?:ABC:DEF:\\AnInvalidFolder", "?:\\" /* win2k, winxp */, sizeof(volume_path), + ERROR_FILE_NOT_FOUND, NO_ERROR + }, + { /* test 36 */ + "relative/path", "%CurrentDrive%\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, + { /* test 37 */ + "/unix-style/absolute/path", "%CurrentDrive%\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, + { /* test 38 */ + "\\??\\C:\\NonExistent", "%CurrentDrive%\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, + { /* test 39 */ + "\\??\\M:\\NonExistent", "%CurrentDrive%\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, + { /* test 40 */ + "somefile:def", "%CurrentDrive%\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, + { /* test 41 */ + "s:omefile", "S:\\" /* win2k, winxp */, sizeof(volume_path), + ERROR_FILE_NOT_FOUND, NO_ERROR + }, }; BOOL ret, success; DWORD error; @@ -709,6 +797,9 @@ static void test_GetVolumePathNameA(void) BOOL expected_ret = test_paths[i].error == NO_ERROR ? TRUE : FALSE; volume_path[0] = 0; + if (test_paths[i].path_len < sizeof(volume_path)) + volume_path[ test_paths[i].path_len ] = 0x11; + SetLastError( 0xdeadbeef ); ret = pGetVolumePathNameA( test_paths[i].file_name, output, test_paths[i].path_len ); error = GetLastError(); @@ -734,6 +825,10 @@ static void test_GetVolumePathNameA(void) ok(success, "GetVolumePathName test %d unexpectedly returned error 0x%x (expected 0x%x).\n", i, error, test_paths[i].error); } + + if (test_paths[i].path_len < sizeof(volume_path)) + ok(volume_path[ test_paths[i].path_len ] == 0x11, + "GetVolumePathName test %d corrupted byte after end of buffer.\n", i); } }

1 0

Erich E. Hoover : kernel32: Handle bogus DOS paths in GetVolumePathName.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: 5a84969f39693ffce1f83a78ae153a1f83e20d60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a84969f39693ffce1f83a78a… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Mon Jun 15 22:20:03 2015 -0600 kernel32: Handle bogus DOS paths in GetVolumePathName. Paths that are not NT and not even close to DOS don't actually fail catastrophically. Even though MSDN suggests that it returns the boot drive in this case, tests indicate that it returns the drive of the current working directory. --- dlls/kernel32/tests/volume.c | 22 ++++++++++++++++++---- dlls/kernel32/volume.c | 12 ++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 5b117b8..7ed55d7 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -591,7 +591,7 @@ static void test_disk_extents(void) static void test_GetVolumePathNameA(void) { - char volume_path[MAX_PATH]; + char volume_path[MAX_PATH], cwd[MAX_PATH]; struct { const char *file_name; const char *path_name; @@ -671,6 +671,10 @@ static void test_GetVolumePathNameA(void) "M::", "C:\\", 4, ERROR_FILE_NOT_FOUND, ERROR_MORE_DATA }, + { /* test 17: an unreasonable DOS path */ + "InvalidDrive:\\AnInvalidFolder", "%CurrentDrive%\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, }; BOOL ret, success; DWORD error; @@ -683,6 +687,13 @@ static void test_GetVolumePathNameA(void) return; } + /* Obtain the drive of the working directory */ + ret = GetCurrentDirectoryA( sizeof(cwd), cwd ); + ok( ret, "Failed to obtain the current working directory.\n" ); + cwd[2] = 0; + ret = SetEnvironmentVariableA( "CurrentDrive", cwd ); + ok( ret, "Failed to set an environment variable for the current working drive.\n" ); + for (i=0; i<sizeof(test_paths)/sizeof(test_paths[0]); i++) { BOOL broken_ret = test_paths[i].broken_error == NO_ERROR ? TRUE : FALSE; @@ -699,11 +710,14 @@ static void test_GetVolumePathNameA(void) if (ret) { + char path_name[MAX_PATH]; + + ExpandEnvironmentStringsA( test_paths[i].path_name, path_name, MAX_PATH); /* If we succeeded then make sure the path is correct */ - success = (strcmp( volume_path, test_paths[i].path_name ) == 0) - || broken(strcasecmp( volume_path, test_paths[i].path_name ) == 0) /* XP */; + success = (strcmp( volume_path, path_name ) == 0) + || broken(strcasecmp( volume_path, path_name ) == 0) /* XP */; ok(success, "GetVolumePathName test %d unexpectedly returned path %s (expected %s).\n", - i, volume_path, test_paths[i].path_name); + i, volume_path, path_name); } else { diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index ac6aa48..5e3b148 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1889,6 +1889,8 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu if (status != STATUS_SUCCESS) { + WCHAR cwdW[MAX_PATH]; + /* the path was completely invalid */ if (filename[0] == '\\') { @@ -1908,6 +1910,16 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu goto cleanup; } } + else if (GetCurrentDirectoryW( sizeof(cwdW), cwdW )) + { + /* if the path is completely bogus then revert to the drive of the working directory */ + fallbackpathW[0] = cwdW[0]; + } + else + { + status = STATUS_OBJECT_NAME_INVALID; + goto cleanup; + } last_pos = strlenW(fallbackpathW) - 1; /* points to \\ */ filename = fallbackpathW; status = STATUS_SUCCESS;

1 0

Erich E. Hoover : kernel32/tests: Convert GetVolumePathName tests into a list.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: b29b0d2cff2bff0b148fc2d63499f4f97ee947ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29b0d2cff2bff0b148fc2d63… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Wed Jun 17 19:28:54 2015 -0600 kernel32/tests: Convert GetVolumePathName tests into a list. --- dlls/kernel32/tests/volume.c | 137 +++++++++++++++++++++++-------------------- 1 file changed, 74 insertions(+), 63 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 2243da9..2bb2603 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -591,79 +591,90 @@ static void test_disk_extents(void) static void test_GetVolumePathNameA(void) { - BOOL ret; - char volume[MAX_PATH]; - char expected[] = "C:\\", pathC1[] = "C:\\", pathC2[] = "C::"; + char volume_path[MAX_PATH]; + struct { + const char *file_name; + const char *path_name; + DWORD path_len; + DWORD error; + DWORD broken_error; + } test_paths[] = { + { /* test 0: NULL parameters, 0 output length */ + NULL, NULL, 0, + ERROR_INVALID_PARAMETER, 0xdeadbeef /* winxp */ + }, + { /* test 1: empty input, NULL output, 0 output length */ + "", NULL, 0, + ERROR_INVALID_PARAMETER, 0xdeadbeef /* winxp */ + }, + { /* test 2: valid input, NULL output, 0 output length */ + "C:\\", NULL, 0, + ERROR_INVALID_PARAMETER, ERROR_FILENAME_EXCED_RANGE /* winxp */ + }, + { /* test 3: valid input, valid output, 0 output length */ + "C:\\", "C:\\", 0, + ERROR_INVALID_PARAMETER, ERROR_FILENAME_EXCED_RANGE /* winxp */ + }, + { /* test 4: valid input, valid output, 1 output length */ + "C:\\", "C:\\", 1, + ERROR_FILENAME_EXCED_RANGE, NO_ERROR + }, + { /* test 5: valid input, valid output, valid output length */ + "C:\\", "C:\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, + { /* test 6: lowercase input, uppercase output, valid output length */ + "c:\\", "C:\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, + { /* test 7: poor quality input, valid output, valid output length */ + "C::", "C:\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, + { /* test 8: really bogus input, valid output, 1 output length */ + "\\\\$$$", "C:\\", 1, + ERROR_INVALID_NAME, ERROR_FILENAME_EXCED_RANGE + }, + }; + BOOL ret, success; DWORD error; + UINT i; + /* GetVolumePathNameA is not present before w2k */ if (!pGetVolumePathNameA) { win_skip("required functions not found\n"); return; } - SetLastError( 0xdeadbeef ); - ret = pGetVolumePathNameA(NULL, NULL, 0); - error = GetLastError(); - ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER - || broken( error == 0xdeadbeef) /* <=XP */, - "expected ERROR_INVALID_PARAMETER got %u\n", error); - - SetLastError( 0xdeadbeef ); - ret = pGetVolumePathNameA("", NULL, 0); - error = GetLastError(); - ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER - || broken( error == 0xdeadbeef) /* <=XP */, - "expected ERROR_INVALID_PARAMETER got %u\n", error); + for (i=0; i<sizeof(test_paths)/sizeof(test_paths[0]); i++) + { + char *output = (test_paths[i].path_name != NULL ? volume_path : NULL); + BOOL expected_ret = test_paths[i].error == NO_ERROR ? TRUE : FALSE; - SetLastError( 0xdeadbeef ); - ret = pGetVolumePathNameA(pathC1, NULL, 0); - error = GetLastError(); - ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER - || broken(error == ERROR_FILENAME_EXCED_RANGE) /* <=XP */, - "expected ERROR_INVALID_PARAMETER got %u\n", error); + volume_path[0] = 0; + SetLastError( 0xdeadbeef ); + ret = pGetVolumePathNameA( test_paths[i].file_name, output, test_paths[i].path_len ); + error = GetLastError(); + ok(ret == expected_ret, "GetVolumePathName test %d %s unexpectedly.\n", + i, test_paths[i].error == NO_ERROR ? "failed" : "succeeded"); - SetLastError( 0xdeadbeef ); - ret = pGetVolumePathNameA(pathC1, volume, 0); - error = GetLastError(); - ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER - || broken(error == ERROR_FILENAME_EXCED_RANGE ) /* <=XP */, - "expected ERROR_INVALID_PARAMETER got %u\n", error); - - SetLastError( 0xdeadbeef ); - ret = pGetVolumePathNameA(pathC1, volume, 1); - error = GetLastError(); - ok(!ret, "expected failure\n"); - ok(error == ERROR_FILENAME_EXCED_RANGE, "expected ERROR_FILENAME_EXCED_RANGE got %u\n", error); - - volume[0] = '\0'; - ret = pGetVolumePathNameA(pathC1, volume, sizeof(volume)); - ok(ret, "expected success\n"); - ok(!strcmp(expected, volume), "expected name '%s', returned '%s'\n", pathC1, volume); - - pathC1[0] = tolower(pathC1[0]); - volume[0] = '\0'; - ret = pGetVolumePathNameA(pathC1, volume, sizeof(volume)); - ok(ret, "expected success\n"); - ok(!strcmp(expected, volume) || broken(!strcasecmp(expected, volume)) /* <=XP */, - "expected name '%s', returned '%s'\n", expected, volume); - - volume[0] = '\0'; - ret = pGetVolumePathNameA(pathC2, volume, sizeof(volume)); - ok(ret, "expected success\n"); - ok(!strcmp(expected, volume), "expected name '%s', returned '%s'\n", expected, volume); - - /* test an invalid path */ - SetLastError( 0xdeadbeef ); - ret = pGetVolumePathNameA("\\\\$$$", volume, 1); - error = GetLastError(); - ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_NAME || broken(ERROR_FILENAME_EXCED_RANGE) /* <=2000 */, - "expected ERROR_INVALID_NAME got %u\n", error); + if (ret) + { + /* If we succeeded then make sure the path is correct */ + success = (strcmp( volume_path, test_paths[i].path_name ) == 0) + || broken(strcasecmp( volume_path, test_paths[i].path_name ) == 0) /* XP */; + ok(success, "GetVolumePathName test %d unexpectedly returned path %s (expected %s).\n", + i, volume_path, test_paths[i].path_name); + } + else + { + /* On success Windows always returns ERROR_MORE_DATA, so only worry about failure */ + success = (error == test_paths[i].error || broken(error == test_paths[i].broken_error)); + ok(success, "GetVolumePathName test %d unexpectedly returned error 0x%x (expected 0x%x).\n", + i, error, test_paths[i].error); + } + } } static void test_GetVolumePathNamesForVolumeNameA(void)

1 0

Sebastian Lackner : kernel32/tests: Add GetVolumePathNameW tests.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: b80bbd59861b95a6b95beed3c48ac3c8af3fb2ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=b80bbd59861b95a6b95beed3c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jun 17 22:36:39 2015 -0600 kernel32/tests: Add GetVolumePathNameW tests. --- dlls/kernel32/tests/volume.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index b7369a6..b41f8ac 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -54,6 +54,7 @@ static UINT (WINAPI *pGetLogicalDriveStringsA)(UINT,LPSTR); static UINT (WINAPI *pGetLogicalDriveStringsW)(UINT,LPWSTR); static BOOL (WINAPI *pGetVolumeInformationA)(LPCSTR, LPSTR, DWORD, LPDWORD, LPDWORD, LPDWORD, LPSTR, DWORD); static BOOL (WINAPI *pGetVolumePathNameA)(LPCSTR, LPSTR, DWORD); +static BOOL (WINAPI *pGetVolumePathNameW)(LPWSTR, LPWSTR, DWORD); static BOOL (WINAPI *pGetVolumePathNamesForVolumeNameA)(LPCSTR, LPSTR, DWORD, LPDWORD); static BOOL (WINAPI *pGetVolumePathNamesForVolumeNameW)(LPCWSTR, LPWSTR, DWORD, LPDWORD); @@ -832,6 +833,52 @@ static void test_GetVolumePathNameA(void) } } +static void test_GetVolumePathNameW(void) +{ + static WCHAR drive_c1[] = {'C',':',0}; + static WCHAR drive_c2[] = {'C',':','\\',0}; + WCHAR volume_path[MAX_PATH]; + BOOL ret; + + if (!pGetVolumePathNameW) + { + win_skip("required functions not found\n"); + return; + } + + volume_path[0] = 0; + volume_path[1] = 0x11; + ret = pGetVolumePathNameW( drive_c1, volume_path, 1 ); + ok(!ret, "GetVolumePathNameW test succeeded unexpectedly.\n"); + ok(GetLastError() == ERROR_FILENAME_EXCED_RANGE, "GetVolumePathNameW unexpectedly returned error 0x%x (expected 0x%x).\n", + GetLastError(), ERROR_FILENAME_EXCED_RANGE); + ok(volume_path[1] == 0x11, "GetVolumePathW corrupted byte after end of buffer.\n"); + + volume_path[0] = 0; + volume_path[2] = 0x11; + ret = pGetVolumePathNameW( drive_c1, volume_path, 2 ); + ok(!ret, "GetVolumePathNameW test succeeded unexpectedly.\n"); + ok(GetLastError() == ERROR_FILENAME_EXCED_RANGE, "GetVolumePathNameW unexpectedly returned error 0x%x (expected 0x%x).\n", + GetLastError(), ERROR_FILENAME_EXCED_RANGE); + ok(volume_path[2] == 0x11, "GetVolumePathW corrupted byte after end of buffer.\n"); + + volume_path[0] = 0; + volume_path[3] = 0x11; + ret = pGetVolumePathNameW( drive_c1, volume_path, 3 ); + ok(ret || broken(!ret) /* win2k */, "GetVolumePathNameW test failed unexpectedly.\n"); + ok(memcmp(volume_path, drive_c1, sizeof(drive_c1)) == 0 + || broken(volume_path[0] == 0) /* win2k */, + "GetVolumePathNameW unexpectedly returned wrong path.\n"); + ok(volume_path[3] == 0x11, "GetVolumePathW corrupted byte after end of buffer.\n"); + + volume_path[0] = 0; + volume_path[4] = 0x11; + ret = pGetVolumePathNameW( drive_c1, volume_path, 4 ); + ok(ret, "GetVolumePathNameW test failed unexpectedly.\n"); + ok(memcmp(volume_path, drive_c2, sizeof(drive_c2)) == 0, "GetVolumePathNameW unexpectedly returned wrong path.\n"); + ok(volume_path[4] == 0x11, "GetVolumePathW corrupted byte after end of buffer.\n"); +} + static void test_GetVolumePathNamesForVolumeNameA(void) { BOOL ret; @@ -1171,6 +1218,7 @@ START_TEST(volume) pGetLogicalDriveStringsW = (void *) GetProcAddress(hdll, "GetLogicalDriveStringsW"); pGetVolumeInformationA = (void *) GetProcAddress(hdll, "GetVolumeInformationA"); pGetVolumePathNameA = (void *) GetProcAddress(hdll, "GetVolumePathNameA"); + pGetVolumePathNameW = (void *) GetProcAddress(hdll, "GetVolumePathNameW"); pGetVolumePathNamesForVolumeNameA = (void *) GetProcAddress(hdll, "GetVolumePathNamesForVolumeNameA"); pGetVolumePathNamesForVolumeNameW = (void *) GetProcAddress(hdll, "GetVolumePathNamesForVolumeNameW"); @@ -1178,6 +1226,7 @@ START_TEST(volume) test_define_dos_deviceA(); test_FindFirstVolume(); test_GetVolumePathNameA(); + test_GetVolumePathNameW(); test_GetVolumeNameForVolumeMountPointA(); test_GetVolumeNameForVolumeMountPointW(); test_GetLogicalDriveStringsA();

1 0