December 2010 - Wine-Commits

Alexandre Julliard : ntdll: Don' t call vectored exception handlers under the critical section.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: ac8680b2ad320f9904b6f72736165697f312fe09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac8680b2ad320f9904b6f7273… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 10 20:55:07 2010 +0100 ntdll: Don't call vectored exception handlers under the critical section. (cherry picked from commit 11e71ede147491381bba4762163803f540c7eb5b) --- dlls/ntdll/exception.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 63fd281..33868c7 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -44,6 +44,7 @@ typedef struct { struct list entry; PVECTORED_EXCEPTION_HANDLER func; + ULONG count; } VECTORED_HANDLER; static struct list vectored_handlers = LIST_INIT(vectored_handlers); @@ -158,21 +159,37 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) struct list *ptr; LONG ret = EXCEPTION_CONTINUE_SEARCH; EXCEPTION_POINTERS except_ptrs; + VECTORED_HANDLER *handler, *to_free = NULL; except_ptrs.ExceptionRecord = rec; except_ptrs.ContextRecord = context; RtlEnterCriticalSection( &vectored_handlers_section ); - LIST_FOR_EACH( ptr, &vectored_handlers ) + ptr = list_head( &vectored_handlers ); + while (ptr) { - VECTORED_HANDLER *handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); + handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); + handler->count++; + RtlLeaveCriticalSection( &vectored_handlers_section ); + RtlFreeHeap( GetProcessHeap(), 0, to_free ); + to_free = NULL; + TRACE( "calling handler at %p code=%x flags=%x\n", handler->func, rec->ExceptionCode, rec->ExceptionFlags ); ret = handler->func( &except_ptrs ); TRACE( "handler at %p returned %x\n", handler->func, ret ); + + RtlEnterCriticalSection( &vectored_handlers_section ); + ptr = list_next( &vectored_handlers, ptr ); + if (!--handler->count) /* removed during execution */ + { + list_remove( &handler->entry ); + to_free = handler; + } if (ret == EXCEPTION_CONTINUE_EXECUTION) break; } RtlLeaveCriticalSection( &vectored_handlers_section ); + RtlFreeHeap( GetProcessHeap(), 0, to_free ); return ret; } @@ -214,6 +231,7 @@ PVOID WINAPI RtlAddVectoredExceptionHandler( ULONG first, PVECTORED_EXCEPTION_HA if (handler) { handler->func = func; + handler->count = 1; RtlEnterCriticalSection( &vectored_handlers_section ); if (first) list_add_head( &vectored_handlers, &handler->entry ); else list_add_tail( &vectored_handlers, &handler->entry ); @@ -237,7 +255,8 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) VECTORED_HANDLER *curr_handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); if (curr_handler == handler) { - list_remove( ptr ); + if (!--curr_handler->count) list_remove( ptr ); + else handler = NULL; /* don't free it yet */ ret = TRUE; break; }

1 0

André Hentschel : user32: Don' t paint new button styles instead of crashing.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: a15c44910ecbff3a30f6038793acc1ddf730d0fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15c44910ecbff3a30f603879… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 3 21:15:42 2010 +0100 user32: Don't paint new button styles instead of crashing. (cherry picked from commit e054fc23100f347ae3ed026d24f183aa85b8c802) --- dlls/user32/button.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 54d54dc..463c37f 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -114,7 +114,7 @@ static void UB_Paint( HWND hwnd, HDC hDC, UINT action ); static void OB_Paint( HWND hwnd, HDC hDC, UINT action ); static void BUTTON_CheckAutoRadioButton( HWND hwnd ); -#define MAX_BTN_TYPE 12 +#define MAX_BTN_TYPE 16 static const WORD maxCheckState[MAX_BTN_TYPE] = { @@ -128,7 +128,7 @@ static const WORD maxCheckState[MAX_BTN_TYPE] = BUTTON_UNCHECKED, /* BS_GROUPBOX */ BUTTON_UNCHECKED, /* BS_USERBUTTON */ BUTTON_CHECKED, /* BS_AUTORADIOBUTTON */ - BUTTON_UNCHECKED, /* Not defined */ + BUTTON_UNCHECKED, /* BS_PUSHBOX */ BUTTON_UNCHECKED /* BS_OWNERDRAW */ }; @@ -146,7 +146,7 @@ static const pfPaint btnPaintFunc[MAX_BTN_TYPE] = GB_Paint, /* BS_GROUPBOX */ UB_Paint, /* BS_USERBUTTON */ CB_Paint, /* BS_AUTORADIOBUTTON */ - NULL, /* Not defined */ + NULL, /* BS_PUSHBOX */ OB_Paint /* BS_OWNERDRAW */ };

1 0

Louis Lenders : rpcrt4: Add stub for NdrMesTypeEncode2.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 1cbc5852bea3176cda18976ba7510cf92864f4d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cbc5852bea3176cda18976ba… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Oct 26 22:56:11 2010 +0200 rpcrt4: Add stub for NdrMesTypeEncode2. (cherry picked from commit 92f41c56f7397f1763d90bee41e6ec1c04804595) --- dlls/rpcrt4/ndr_es.c | 6 ++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index 52200dc..c3456ca 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -446,6 +446,12 @@ void RPC_ENTRY NdrMesTypeDecode2(handle_t Handle, const MIDL_TYPE_PICKLING_INFO FIXME("(%p, %p, %p, %p, %p)\n", Handle, pPicklingInfo, pStubDesc, pFormatString, pObject); } +void RPC_ENTRY NdrMesTypeEncode2(handle_t Handle, const MIDL_TYPE_PICKLING_INFO *pPicklingInfo, + const MIDL_STUB_DESC *pStubDesc, PFORMAT_STRING pFormatString, const void *pObject) +{ + FIXME("(%p, %p, %p, %p, %p)\n", Handle, pPicklingInfo, pStubDesc, pFormatString, pObject); +} + void RPC_ENTRY NdrMesTypeFree2(handle_t Handle, const MIDL_TYPE_PICKLING_INFO *pPicklingInfo, const MIDL_STUB_DESC *pStubDesc, PFORMAT_STRING pFormatString, void *pObject) { diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 477b3f0..e0c6c11 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -227,7 +227,7 @@ @ stub NdrMesTypeAlignSize @ stdcall NdrMesTypeDecode2(ptr ptr ptr ptr ptr) @ stub NdrMesTypeDecode -@ stub NdrMesTypeEncode2 +@ stdcall NdrMesTypeEncode2(ptr ptr ptr ptr ptr) @ stub NdrMesTypeEncode @ stdcall NdrMesTypeFree2(ptr ptr ptr ptr ptr) @ stdcall NdrNonConformantStringBufferSize(ptr ptr ptr)

1 0

Vladimir Panteleev : user32: Update last active popup for all parents.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 3f9aed869d04d9773bea54155ef6560e04dc7552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9aed869d04d9773bea54155… Author: Vladimir Panteleev <vladimir(a)thecybershadow.net> Date: Sat Oct 16 20:22:58 2010 +0300 user32: Update last active popup for all parents. (cherry picked from commit 824c5089d2f0e7257111a65d65e8db94b113c5fa) --- server/window.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/server/window.c b/server/window.c index 5fdfd13..4975bfe 100644 --- a/server/window.c +++ b/server/window.c @@ -569,9 +569,13 @@ int make_window_active( user_handle_t window ) if (!win) return 0; - /* set last active for window and its owner */ - win->last_active = win->handle; - if ((owner = get_user_object( win->owner, USER_WINDOW ))) owner->last_active = win->handle; + /* set last active for window and its owners */ + owner = win; + while (owner) + { + owner->last_active = win->handle; + owner = get_user_object( owner->owner, USER_WINDOW ); + } return 1; }

1 0

Eryk Wieliczko : comdlg32: GetSaveFileName: Don't append .* extension.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 276b83559f87dbc834c6e0c0ac57a995d48e5c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=276b83559f87dbc834c6e0c0a… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Mon Nov 1 12:35:43 2010 +0100 comdlg32: GetSaveFileName: Don't append .* extension. (cherry picked from commit bd0fe7d26bafebc2e51ec54d354bf1e41bc3892e) --- dlls/comdlg32/filedlg.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index c689584..6778f17 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2256,14 +2256,11 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) /* if no extension is specified with file name, then */ /* attach the extension from file filter or default one */ - WCHAR *filterExt = NULL; + const WCHAR *filterExt = NULL; LPWSTR lpstrFilter = NULL; static const WCHAR szwDot[] = {'.',0}; int PathLength = lstrlenW(lpstrPathAndFile); - /* Attach the dot*/ - lstrcatW(lpstrPathAndFile, szwDot); - /*Get the file extension from file type filter*/ lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, fodInfos->ofnInfos->nFilterIndex-1); @@ -2272,9 +2269,18 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) filterExt = PathFindExtensionW(lpstrFilter); if ( filterExt && *filterExt ) /* attach the file extension from file type filter*/ - lstrcatW(lpstrPathAndFile, filterExt + 1); + filterExt = filterExt + 1; else if ( fodInfos->defext ) /* attach the default file extension*/ - lstrcatW(lpstrPathAndFile, fodInfos->defext); + filterExt = fodInfos->defext; + + /* If extension is .*, ignore it */ + if (filterExt[0] != '*') + { + /* Attach the dot*/ + lstrcatW(lpstrPathAndFile, szwDot); + /* Attach the extension */ + lstrcatW(lpstrPathAndFile, filterExt ); + } /* In Open dialog: if file does not exist try without extension */ if (!(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) && !PathFileExistsW(lpstrPathAndFile))

1 0

Henri Verbeet : krnl386.exe: Return the default value if the section wasn' t found in GetPrivateProfileString16().
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 59129ad1cd740b3575c593b6bf0ca5f97f38c0fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=59129ad1cd740b3575c593b6b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 4 10:37:33 2010 +0100 krnl386.exe: Return the default value if the section wasn't found in GetPrivateProfileString16(). Using GetPrivateProfileStringA() for removing trailing spaces etc. This restores behaviour from before 86c6021c71a563af88c1a8cc23ea489e92c8ca70. (cherry picked from commit c4c091d4b7c67487fbd332e7e606ec272d232f4f) --- dlls/krnl386.exe16/file.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 507b28d..0a1098f 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -555,9 +555,8 @@ INT16 WINAPI GetPrivateProfileString16( LPCSTR section, LPCSTR entry, ret = GetPrivateProfileSectionA( section, data, size, filename ); if (!ret) { - if (len) *buffer = 0; HeapFree( GetProcessHeap(), 0, data ); - return 0; + return GetPrivateProfileStringA( section, entry, def_val, buffer, len, filename ); } if (ret != size - 2) break; /* overflow, try again */

1 0

Louis Lenders : ws2_32: Return SOCKET_ERROR in stubbed WSALookupServiceNext , to prevent apps from looping forever.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 7c595bc74e0394fd8d6649f16531097d7bf9ac05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c595bc74e0394fd8d6649f16… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Oct 27 23:02:46 2010 +0200 ws2_32: Return SOCKET_ERROR in stubbed WSALookupServiceNext, to prevent apps from looping forever. (cherry picked from commit cb65dbf3d84f64d8275d853bb75e17fbf64b23c7) --- dlls/ws2_32/socket.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8dffeeb..713dab4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5802,7 +5802,8 @@ INT WINAPI WSALookupServiceEnd( HANDLE lookup ) INT WINAPI WSALookupServiceNextA( HANDLE lookup, DWORD flags, LPDWORD len, LPWSAQUERYSETA results ) { FIXME( "(%p 0x%08x %p %p) Stub!\n", lookup, flags, len, results ); - return 0; + WSASetLastError(WSA_E_NO_MORE); + return SOCKET_ERROR; } /*********************************************************************** @@ -5811,7 +5812,8 @@ INT WINAPI WSALookupServiceNextA( HANDLE lookup, DWORD flags, LPDWORD len, LPWSA INT WINAPI WSALookupServiceNextW( HANDLE lookup, DWORD flags, LPDWORD len, LPWSAQUERYSETW results ) { FIXME( "(%p 0x%08x %p %p) Stub!\n", lookup, flags, len, results ); - return 0; + WSASetLastError(WSA_E_NO_MORE); + return SOCKET_ERROR; } /***********************************************************************

1 0

Marcus Meissner : winspool.drv: Check return value of EnumPrintersA.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 61a19597ff3c506014d36a16295b41841275dc53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a19597ff3c506014d36a162… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 24 11:09:42 2010 +0100 winspool.drv: Check return value of EnumPrintersA. (cherry picked from commit c7f158824f41f37168222cb09a12c385d98315c3) --- dlls/winspool.drv/info.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8c6486b..407bb2e 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1010,8 +1010,7 @@ void WINSPOOL_LoadSystemPrinters(void) printers AddPrinter takes a while. So we'll tag all printers that were automatically added last time around, if they still exist we'll leave them be otherwise we'll delete them. */ - EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num); - if(needed) { + if (EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num) && needed) { PRINTER_INFO_5A* pi = HeapAlloc(GetProcessHeap(), 0, needed); if(EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, (LPBYTE)pi, needed, &needed, &num)) { for(i = 0; i < num; i++) {

1 0

Dmitry Timoshkov : user32: FindWindow() should treat an empty title same way as NULL.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 9d0eda9f67506fef6e481a61c3f00d29eb3e2fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0eda9f67506fef6e481a61c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 19 14:22:53 2010 +0900 user32: FindWindow() should treat an empty title same way as NULL. (cherry picked from commit 2f0b9dd3bfa3820abd89846d45eb78578b627b3b) --- dlls/user32/win.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index cbc949c..aee81cd 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1694,7 +1694,14 @@ HWND WINAPI FindWindowExW( HWND parent, HWND child, LPCWSTR className, LPCWSTR t { while (list[i]) { - if (GetWindowTextW( list[i], buffer, len + 1 ) && !strcmpiW( buffer, title )) break; + if (GetWindowTextW( list[i], buffer, len + 1 )) + { + if (!strcmpiW( buffer, title )) break; + } + else + { + if (!title[0]) break; + } i++; } }

1 0

Alexandre Julliard : kernel32: Use RtlDosPathNameToNtPathName_U to validate the path in GetVolumeInformationW .
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 56c2c8c75c6819a8654453b17738964094ede701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c2c8c75c6819a8654453b17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 12:17:35 2010 +0200 kernel32: Use RtlDosPathNameToNtPathName_U to validate the path in GetVolumeInformationW. (cherry picked from commit ee0f0da69b3a99ce6b682b38fc6910a253ca23f8) --- dlls/kernel32/tests/volume.c | 9 ++++----- dlls/kernel32/volume.c | 35 +++++++++++++++++++++-------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index f52c592..534f0e3 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -324,7 +324,6 @@ static void test_GetVolumeInformationA(void) ok(ret, "SetCurrentDirectory: error %d\n", GetLastError()); ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL, NULL, NULL, fs_name_buf, fs_name_len); - todo_wine ok(ret, "GetVolumeInformationA root failed, last error %u\n", GetLastError()); /* check for error on no trailing \ when current dir is subdir (windows) of queried drive */ @@ -392,7 +391,7 @@ static void test_GetVolumeInformationA(void) /* \ is current on root drive, call succeeds */ ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL, NULL, NULL, fs_name_buf, fs_name_len); - todo_wine ok(ret, "GetVolumeInformationA failed, last error %u\n", GetLastError()); + ok(ret, "GetVolumeInformationA failed, last error %u\n", GetLastError()); /* again, SetCurrentDirectory on another drive does not matter */ ret = SetCurrentDirectory(Root_Slash); @@ -403,7 +402,7 @@ static void test_GetVolumeInformationA(void) /* \ is current on root drive, call succeeds */ ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL, NULL, NULL, fs_name_buf, fs_name_len); - todo_wine ok(ret, "GetVolumeInformationA failed, last error %u\n", GetLastError()); + ok(ret, "GetVolumeInformationA failed, last error %u\n", GetLastError()); } /* try null root directory to return "root of the current directory" */ @@ -420,7 +419,7 @@ static void test_GetVolumeInformationA(void) SetLastError(0xdeadbeef); ret = pGetVolumeInformationA(Root_UNC, vol_name_buf, vol_name_size, &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); - todo_wine ok(ret || broken(!ret /* win9x */ && GetLastError()==ERROR_BAD_NETPATH), + ok(ret || broken(!ret /* win9x */ && GetLastError()==ERROR_BAD_NETPATH), "GetVolumeInformationA did%s fail, root=%s, last error=%u\n", ret ? " not":"", Root_UNC, GetLastError()); /* try again with device name space */ @@ -428,7 +427,7 @@ static void test_GetVolumeInformationA(void) SetLastError(0xdeadbeef); ret = pGetVolumeInformationA(Root_UNC, vol_name_buf, vol_name_size, &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); - todo_wine ok(ret || broken(!ret /* win9x */ && GetLastError()==ERROR_BAD_NETPATH), + ok(ret || broken(!ret /* win9x */ && GetLastError()==ERROR_BAD_NETPATH), "GetVolumeInformationA did%s fail, root=%s, last error=%u\n", ret ? " not":"", Root_UNC, GetLastError()); /* try again with a directory off the root - should generate error */ diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 7596864..002a7e6 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -513,26 +513,29 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, static const WCHAR fat32W[] = {'F','A','T','3','2',0}; static const WCHAR ntfsW[] = {'N','T','F','S',0}; static const WCHAR cdfsW[] = {'C','D','F','S',0}; + static const WCHAR default_rootW[] = {'\\',0}; WCHAR device[] = {'\\','\\','.','\\','A',':',0}; HANDLE handle; + UNICODE_STRING nt_name; + WCHAR *p; enum fs_type type = FS_UNKNOWN; + BOOL ret = FALSE; - if (!root) + if (!root) root = default_rootW; + if (!RtlDosPathNameToNtPathName_U( root, &nt_name, NULL, NULL )) { - WCHAR path[MAX_PATH]; - GetCurrentDirectoryW( MAX_PATH, path ); - device[4] = path[0]; + SetLastError( ERROR_PATH_NOT_FOUND ); + return FALSE; } - else + /* there must be exactly one backslash in the name, at the end */ + p = memchrW( nt_name.Buffer + 4, '\\', (nt_name.Length - 4) / sizeof(WCHAR) ); + if (p != nt_name.Buffer + nt_name.Length / sizeof(WCHAR) - 1) { - if (!root[0] || root[1] != ':' || root[lstrlenW(root)-1] != '\\' ) - { - SetLastError( ERROR_INVALID_NAME ); - return FALSE; - } - device[4] = root[0]; + SetLastError( ERROR_INVALID_NAME ); + goto done; } + device[4] = nt_name.Buffer[4]; /* try to open the device */ @@ -566,7 +569,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, } CloseHandle( handle ); TRACE( "%s: found fs type %d\n", debugstr_w(device), type ); - if (type == FS_ERROR) return FALSE; + if (type == FS_ERROR) goto done; if (label && label_len) VOLUME_GetSuperblockLabel( device, type, superblock, label, label_len ); if (serial) *serial = VOLUME_GetSuperblockSerial( device, type, superblock ); @@ -581,7 +584,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, case DRIVE_UNKNOWN: case DRIVE_NO_ROOT_DIR: SetLastError( ERROR_NOT_READY ); - return FALSE; + goto done; case DRIVE_REMOVABLE: case DRIVE_FIXED: case DRIVE_REMOTE: @@ -618,7 +621,11 @@ fill_fs_info: /* now fill in the information that depends on the file system ty if (flags) *flags = FILE_CASE_PRESERVED_NAMES; break; } - return TRUE; + ret = TRUE; + +done: + RtlFreeUnicodeString( &nt_name ); + return ret; }

1 0