November 2010 - Wine-commits

Paul Vriens : mscoree/tests: Remove an unneeded test.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: d360b6f913a4d44e3d0d621e3bef9d8b90ae1470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d360b6f913a4d44e3d0d621e3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 22 20:02:40 2010 +0100 mscoree/tests: Remove an unneeded test. --- dlls/mscoree/tests/mscoree.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 2f03166..0155fdd 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -149,7 +149,6 @@ static void test_loadlibraryshim(void) const WCHAR fusion[] = {'f','u','s','i','o','n',0}; const WCHAR fusiondll[] = {'f','u','s','i','o','n','.','d','l','l',0}; const WCHAR nosuchdll[] = {'j','n','v','n','l','.','d','l','l',0}; - const WCHAR gdipdll[] = {'g','d','i','p','l','u','s','.','d','l','l',0}; const WCHAR gdidll[] = {'g','d','i','3','2','.','d','l','l',0}; HRESULT hr; const WCHAR *latest = NULL; @@ -239,11 +238,6 @@ static void test_loadlibraryshim(void) if (SUCCEEDED(hr)) FreeLibrary(hdll); - hr = pLoadLibraryShim(gdipdll, latest, NULL, &hdll); - todo_wine ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); - if (SUCCEEDED(hr)) - FreeLibrary(hdll); - hr = pLoadLibraryShim(gdidll, latest, NULL, &hdll); todo_wine ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); if (SUCCEEDED(hr))

1 0

Eric Pouech : winedbg: Moved into a common function all code dealing with printing information about an exception , and use this function to implement new 'info exception' command.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 78cf0961e903b91c8e8825d589d4130cb0a0a40b URL: http://source.winehq.org/git/wine.git/?a=commit;h=78cf0961e903b91c8e8825d58… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 21 22:19:40 2010 +0100 winedbg: Moved into a common function all code dealing with printing information about an exception, and use this function to implement new 'info exception' command. --- programs/winedbg/dbg.y | 1 + programs/winedbg/debugger.h | 4 + programs/winedbg/info.c | 157 ++++++++++++++++++++++++++++++++++++++++ programs/winedbg/tgt_active.c | 160 +++-------------------------------------- 4 files changed, 173 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78cf0961e903b91c8e882…

1 0

Luca Bennati : cmd: Fix Italian translation.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 12099f3d9ecf964022d4022eed11d816eef767f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12099f3d9ecf964022d4022ee… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun Nov 21 16:50:08 2010 +0100 cmd: Fix Italian translation. --- programs/cmd/It.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/cmd/It.rc b/programs/cmd/It.rc index 7648f24..2254350 100644 --- a/programs/cmd/It.rc +++ b/programs/cmd/It.rc @@ -74,9 +74,9 @@ esiste nel cmd di wine.\n" "Il comando GOTO trasferisce l'esecuzione ad un'altra istruzione dentro un\n\ file batch.\n\ \n\ -L'etichetta che è l'obiettivo di un GOTO può essere lunga fino a 255 caratteri\n\ +L'etichetta di destinazione di un GOTO può essere lunga fino a 255 caratteri\n\ ma non può includere spazi (questo è differente da altri sistemi\n\ -operativi). Se esistono due o più etichette identiche esistono in un file batch, la\n\ +operativi). Se esistono due o più etichette identiche in un file batch, la\n\ prima sarà sempre eseguita. Tentare un GOTO verso un'etichetta\n\ inesistente termina l'esecuzione del file batch.\n\ \n\ @@ -257,7 +257,7 @@ Inserisci HELP <comando> per maggiori informazioni su ciascuno dei comandi sopra WCMD_SYNTAXERR, "Errore di sintassi\n" WCMD_FILENOTFOUND, "%s : File non trovato\n" WCMD_NOCMDHELP, "Nessun aiuto disponibile per %s\n" - WCMD_NOTARGET, "Obiettivo del GOTO non trovato\n" + WCMD_NOTARGET, "Destinazione del GOTO non trovata\n" WCMD_CURRENTDATE, "La data attuale è %s\n" WCMD_CURRENTTIME, "L'ora attuale è %s\n" WCMD_NEWDATE, "Inserisci una nuova data: "

1 0

Paul Vriens : mscoree/tests: Use the correct wide string compare to cope with Win9x.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: dff72b0c667f81275d6d909c1c4d9377ff735d04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff72b0c667f81275d6d909c1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 22 11:41:13 2010 +0100 mscoree/tests: Use the correct wide string compare to cope with Win9x. --- dlls/mscoree/tests/mscoree.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 1b3cd77..01515b6 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -149,12 +149,12 @@ static void test_versioninfo(void) memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, NULL, MAX_PATH, &path_len, version, MAX_PATH, &size); ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); - ok(!lstrcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); /* With NULL-pointer for bufferlength, the buffer itsself still gets filled with correct string */ memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); - ok(!lstrcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); } static void test_loadlibraryshim(void)

1 0

Paul Vriens : mscoree/tests: Use StrStrIW from shlwapi.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 167ab75f4e4178a7add95bbf01e7cc703b175e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=167ab75f4e4178a7add95bbf0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 22 12:01:11 2010 +0100 mscoree/tests: Use StrStrIW from shlwapi. --- dlls/mscoree/tests/Makefile.in | 1 + dlls/mscoree/tests/mscoree.c | 39 +++++++++++---------------------------- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/dlls/mscoree/tests/Makefile.in b/dlls/mscoree/tests/Makefile.in index 0ff1e2b..e336f0d 100644 --- a/dlls/mscoree/tests/Makefile.in +++ b/dlls/mscoree/tests/Makefile.in @@ -1,4 +1,5 @@ TESTDLL = mscoree.dll +IMPORTS = shlwapi C_SRCS = \ metahost.c \ diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 01515b6..d05a2f1 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -18,6 +18,7 @@ #include "corerror.h" #include "mscoree.h" +#include "shlwapi.h" #include "wine/test.h" static HMODULE hmscoree; @@ -27,24 +28,6 @@ static HRESULT (WINAPI *pGetCORSystemDirectory)(LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pGetRequestedRuntimeInfo)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, DWORD, LPWSTR, DWORD, DWORD*, LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR, LPCWSTR, LPVOID, HMODULE*); -static WCHAR tolowerW( WCHAR ch ) -{ - if (ch >= 'A' && ch <= 'Z') return ch|32; - else return ch; -} - -static WCHAR *strstriW( const WCHAR *str, const WCHAR *sub ) -{ - while (*str) - { - const WCHAR *p1 = str, *p2 = sub; - while (*p1 && *p2 && tolowerW(*p1) == tolowerW(*p2)) { p1++; p2++; } - if (!*p2) return (WCHAR *)str; - str++; - } - return NULL; -} - static BOOL init_functionpointers(void) { hmscoree = LoadLibraryA("mscoree.dll"); @@ -181,8 +164,8 @@ static void test_loadlibraryshim(void) GetModuleFileNameW(hdll, dllpath, MAX_PATH); - todo_wine ok(strstriW(dllpath, v1_1) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); - ok(strstriW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + todo_wine ok(StrStrIW(dllpath, v1_1) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + ok(StrStrIW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); FreeLibrary(hdll); } @@ -195,8 +178,8 @@ static void test_loadlibraryshim(void) GetModuleFileNameW(hdll, dllpath, MAX_PATH); - todo_wine ok(strstriW(dllpath, v2_0) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); - ok(strstriW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + todo_wine ok(StrStrIW(dllpath, v2_0) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + ok(StrStrIW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); FreeLibrary(hdll); } @@ -211,8 +194,8 @@ static void test_loadlibraryshim(void) GetModuleFileNameW(hdll, dllpath, MAX_PATH); - todo_wine ok(strstriW(dllpath, v4_0) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); - ok(strstriW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + todo_wine ok(StrStrIW(dllpath, v4_0) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + ok(StrStrIW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); FreeLibrary(hdll); } @@ -229,8 +212,8 @@ static void test_loadlibraryshim(void) GetModuleFileNameW(hdll, dllpath, MAX_PATH); if (latest) - todo_wine ok(strstriW(dllpath, latest) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); - ok(strstriW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + todo_wine ok(StrStrIW(dllpath, latest) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + ok(StrStrIW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); FreeLibrary(hdll); } @@ -242,8 +225,8 @@ static void test_loadlibraryshim(void) GetModuleFileNameW(hdll, dllpath, MAX_PATH); if (latest) - todo_wine ok(strstriW(dllpath, latest) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); - ok(strstriW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + todo_wine ok(StrStrIW(dllpath, latest) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + ok(StrStrIW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); FreeLibrary(hdll); }

1 0

Paul Vriens : mscoree/tests: Use more A-functions to fix test failures on Win9x.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 759f12c187c1aea79d4b7f8bf1aa608568b0d8d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=759f12c187c1aea79d4b7f8bf… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 22 13:31:53 2010 +0100 mscoree/tests: Use more A-functions to fix test failures on Win9x. --- dlls/mscoree/tests/mscoree.c | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index d05a2f1..2f03166 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -153,8 +153,9 @@ static void test_loadlibraryshim(void) const WCHAR gdidll[] = {'g','d','i','3','2','.','d','l','l',0}; HRESULT hr; const WCHAR *latest = NULL; + CHAR latestA[MAX_PATH]; HMODULE hdll; - WCHAR dllpath[MAX_PATH]; + CHAR dllpath[MAX_PATH]; hr = pLoadLibraryShim(fusion, v1_1, NULL, &hdll); ok(hr == S_OK || hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); @@ -162,10 +163,10 @@ static void test_loadlibraryshim(void) { latest = v1_1; - GetModuleFileNameW(hdll, dllpath, MAX_PATH); + GetModuleFileNameA(hdll, dllpath, MAX_PATH); - todo_wine ok(StrStrIW(dllpath, v1_1) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); - ok(StrStrIW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + todo_wine ok(StrStrIA(dllpath, "v1.1.4322") != 0, "incorrect fusion.dll path %s\n", dllpath); + ok(StrStrIA(dllpath, "fusion.dll") != 0, "incorrect fusion.dll path %s\n", dllpath); FreeLibrary(hdll); } @@ -176,10 +177,10 @@ static void test_loadlibraryshim(void) { latest = v2_0; - GetModuleFileNameW(hdll, dllpath, MAX_PATH); + GetModuleFileNameA(hdll, dllpath, MAX_PATH); - todo_wine ok(StrStrIW(dllpath, v2_0) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); - ok(StrStrIW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + todo_wine ok(StrStrIA(dllpath, "v2.0.50727") != 0, "incorrect fusion.dll path %s\n", dllpath); + ok(StrStrIA(dllpath, "fusion.dll") != 0, "incorrect fusion.dll path %s\n", dllpath); FreeLibrary(hdll); } @@ -192,10 +193,10 @@ static void test_loadlibraryshim(void) if (!latest) latest = v4_0; - GetModuleFileNameW(hdll, dllpath, MAX_PATH); + GetModuleFileNameA(hdll, dllpath, MAX_PATH); - todo_wine ok(StrStrIW(dllpath, v4_0) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); - ok(StrStrIW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + todo_wine ok(StrStrIA(dllpath, "v4.0.30319") != 0, "incorrect fusion.dll path %s\n", dllpath); + ok(StrStrIA(dllpath, "fusion.dll") != 0, "incorrect fusion.dll path %s\n", dllpath); FreeLibrary(hdll); } @@ -205,15 +206,17 @@ static void test_loadlibraryshim(void) if (SUCCEEDED(hr)) FreeLibrary(hdll); + WideCharToMultiByte(CP_ACP, 0, latest, -1, latestA, MAX_PATH, NULL, NULL); + hr = pLoadLibraryShim(fusion, NULL, NULL, &hdll); ok(hr == S_OK, "LoadLibraryShim failed, hr=%x\n", hr); if (SUCCEEDED(hr)) { - GetModuleFileNameW(hdll, dllpath, MAX_PATH); + GetModuleFileNameA(hdll, dllpath, MAX_PATH); if (latest) - todo_wine ok(StrStrIW(dllpath, latest) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); - ok(StrStrIW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + todo_wine ok(StrStrIA(dllpath, latestA) != 0, "incorrect fusion.dll path %s\n", dllpath); + ok(StrStrIA(dllpath, "fusion.dll") != 0, "incorrect fusion.dll path %s\n", dllpath); FreeLibrary(hdll); } @@ -222,11 +225,11 @@ static void test_loadlibraryshim(void) ok(hr == S_OK, "LoadLibraryShim failed, hr=%x\n", hr); if (SUCCEEDED(hr)) { - GetModuleFileNameW(hdll, dllpath, MAX_PATH); + GetModuleFileNameA(hdll, dllpath, MAX_PATH); if (latest) - todo_wine ok(StrStrIW(dllpath, latest) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); - ok(StrStrIW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + todo_wine ok(StrStrIA(dllpath, latestA) != 0, "incorrect fusion.dll path %s\n", dllpath); + ok(StrStrIA(dllpath, "fusion.dll") != 0, "incorrect fusion.dll path %s\n", dllpath); FreeLibrary(hdll); }

1 0

Louis Lenders : ntdll/tests: Add tests for NtQueryVolumeInformationFile with FileFsVolumeInformation class .
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 5eac14f11c51bee988ea05cf1cac94ea0b8ec81a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eac14f11c51bee988ea05cf1… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Nov 22 21:24:42 2010 +0100 ntdll/tests: Add tests for NtQueryVolumeInformationFile with FileFsVolumeInformation class. --- dlls/ntdll/tests/file.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 99a608b..1b73dd9 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -35,6 +35,7 @@ #include "wine/test.h" #include "winternl.h" #include "winuser.h" +#include "winioctl.h" #ifndef IO_COMPLETION_ALL_ACCESS #define IO_COMPLETION_ALL_ACCESS 0x001F0003 @@ -75,6 +76,7 @@ static NTSTATUS (WINAPI *pNtSetInformationFile)(HANDLE, PIO_STATUS_BLOCK, PVOID, static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, FILE_INFORMATION_CLASS); static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK, PVOID,ULONG,FILE_INFORMATION_CLASS,BOOLEAN,PUNICODE_STRING,BOOLEAN); +static NTSTATUS (WINAPI *pNtQueryVolumeInformationFile)(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); static inline BOOL is_signaled( HANDLE obj ) { @@ -1458,6 +1460,61 @@ static void test_file_all_name_information(void) HeapFree( GetProcessHeap(), 0, file_name ); } +static void test_query_volume_information_file(void) +{ + NTSTATUS status; + HANDLE dir; + WCHAR path[MAX_PATH]; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + UNICODE_STRING nameW; + UINT len; + FILE_FS_VOLUME_INFORMATION *ffvi; + BYTE buf[sizeof(FILE_FS_VOLUME_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; + + len = GetWindowsDirectoryW( path, MAX_PATH ); + pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + status = pNtOpenFile( &dir, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + pRtlFreeUnicodeString( &nameW ); + + ZeroMemory( buf, sizeof(buf) ); + U(io).Status = 0xdadadada; + io.Information = 0xcacacaca; + + status = pNtQueryVolumeInformationFile( dir, &io, buf, sizeof(buf), FileFsVolumeInformation ); + + ffvi = (FILE_FS_VOLUME_INFORMATION *)buf; + +todo_wine +{ + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", status); + ok(U(io).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", U(io).Status); + + ok(io.Information == (FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel) + ffvi->VolumeLabelLength), + "expected %d, got %lu\n", (FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel) + ffvi->VolumeLabelLength), + io.Information); + + ok(ffvi->VolumeCreationTime.QuadPart != 0, "Missing VolumeCreationTime\n"); + ok(ffvi->VolumeSerialNumber != 0, "Missing VolumeSerialNumber\n"); + ok(ffvi->SupportsObjects == 1,"expected 1, got %d\n", ffvi->SupportsObjects); +} + ok(ffvi->VolumeLabelLength == lstrlenW(ffvi->VolumeLabel) * sizeof(WCHAR), "expected %d, got %d", + lstrlenW(ffvi->VolumeLabel) * sizeof(WCHAR), ffvi->VolumeLabelLength); + + trace("VolumeSerialNumber: %x VolumeLabelName: %s\n", ffvi->VolumeSerialNumber, wine_dbgstr_w(ffvi->VolumeLabel)); + + CloseHandle( dir ); +} + START_TEST(file) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); @@ -1492,6 +1549,7 @@ START_TEST(file) pNtSetInformationFile = (void *)GetProcAddress(hntdll, "NtSetInformationFile"); pNtQueryInformationFile = (void *)GetProcAddress(hntdll, "NtQueryInformationFile"); pNtQueryDirectoryFile = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile"); + pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile"); create_file_test(); open_file_test(); @@ -1504,4 +1562,5 @@ START_TEST(file) test_file_both_information(); test_file_name_information(); test_file_all_name_information(); + test_query_volume_information_file(); }

1 0

Austin English : mmdevapi/tests: Increase timeout in capture tests.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: aba65017d79221735cea1866bddb43e2a6375ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba65017d79221735cea1866b… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 22 22:23:44 2010 -0800 mmdevapi/tests: Increase timeout in capture tests. --- dlls/mmdevapi/tests/capture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index a1d36e6..ed497df 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -87,7 +87,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) hr = IAudioCaptureClient_GetNextPacketSize(acc, NULL); ok(hr == E_POINTER, "IAudioCaptureClient_GetNextPacketSize(NULL) returns %08x\n", hr); - ok(WaitForSingleObject(handle, 1000) == WAIT_OBJECT_0, "Waiting on event handle failed!\n"); + ok(WaitForSingleObject(handle, 2000) == WAIT_OBJECT_0, "Waiting on event handle failed!\n"); /* frames can be 0 if no data is available yet.. */ hr = IAudioCaptureClient_GetNextPacketSize(acc, &frames);

1 0

Damjan Jovanovic : iexplore: Use a better file description.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 01ab7df67f0ccc54deb69ae89a647110f4997992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ab7df67f0ccc54deb69ae89… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 23 11:06:11 2010 +0200 iexplore: Use a better file description. --- programs/iexplore/iexplore.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/iexplore/iexplore.rc b/programs/iexplore/iexplore.rc index f37481a..acf7959 100644 --- a/programs/iexplore/iexplore.rc +++ b/programs/iexplore/iexplore.rc @@ -17,7 +17,7 @@ */ #define WINE_OLESELFREGISTER -#define WINE_FILEDESCRIPTION_STR "Wine core exe" +#define WINE_FILEDESCRIPTION_STR "Wine Internet Explorer" #define WINE_FILENAME_STR "iexplore.exe" #define WINE_FILEVERSION 6,0,2900,2180 #define WINE_FILEVERSION_STR "6.0.2900.2180"

1 0

Eryk Wieliczko : msvcrt: Implement _ctime32/64_s.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 504e68ac2491e5743b257337633a383e11fa05d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=504e68ac2491e5743b2573376… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Sat Nov 20 14:49:53 2010 +0100 msvcrt: Implement _ctime32/64_s. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvcrt/time.c | 44 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6e860e8..a305cb2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -560,9 +560,9 @@ @ varargs _cscanf_s(str) msvcrt._cscanf_s @ varargs _cscanf_s_l(str ptr) msvcrt._cscanf_s_l @ cdecl _ctime32(ptr) msvcrt._ctime32 -@ stub _ctime32_s +@ cdecl _ctime32_s(str long ptr) msvcrt._ctime32_s @ cdecl _ctime64(ptr) msvcrt._ctime64 -@ stub _ctime64_s +@ cdecl _ctime64_s(str long ptr) msvcrt._ctime64_s @ cdecl _cwait(ptr long long) msvcrt._cwait @ varargs _cwprintf(wstr) msvcrt._cwprintf @ stub _cwprintf_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 17785be..36f522c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -399,9 +399,9 @@ @ varargs _cscanf_s(str) msvcrt._cscanf_s @ varargs _cscanf_s_l(str ptr) msvcrt._cscanf_s_l @ cdecl _ctime32(ptr) msvcrt._ctime32 -@ stub _ctime32_s +@ cdecl _ctime32_s(str ptr long) msvcrt._ctime32_s @ cdecl _ctime64(ptr) msvcrt._ctime64 -@ stub _ctime64_s +@ cdecl _ctime64_s(str ptr long) msvcrt._ctime64_s @ cdecl _cwait(ptr long long) msvcrt._cwait @ varargs _cwprintf(wstr) msvcrt._cwprintf @ stub _cwprintf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 663e1b7..33bfb33 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -391,9 +391,9 @@ @ varargs _cscanf_s(str) msvcrt._cscanf_s @ varargs _cscanf_s_l(str ptr) msvcrt._cscanf_s_l @ cdecl _ctime32(ptr) msvcrt._ctime32 -@ stub _ctime32_s +@ cdecl _ctime32_s(str long ptr) msvcrt._ctime32_s @ cdecl _ctime64(ptr) msvcrt._ctime64 -@ stub _ctime64_s +@ cdecl _ctime64_s(str long ptr) msvcrt._ctime64_s @ cdecl _cwait(ptr long long) msvcrt._cwait @ varargs _cwprintf(wstr) msvcrt._cwprintf @ stub _cwprintf_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3db6fa4..e65c152 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -356,9 +356,9 @@ @ varargs _cscanf_s(str) @ varargs _cscanf_s_l(str ptr) @ cdecl _ctime32(ptr) MSVCRT__ctime32 -# stub _ctime32_s +@ cdecl _ctime32_s(str long ptr) MSVCRT__ctime32_s @ cdecl _ctime64(ptr) MSVCRT__ctime64 -# stub _ctime64_s +@ cdecl _ctime64_s(str long ptr) MSVCRT__ctime64_s @ extern _ctype MSVCRT__ctype @ cdecl _cwait(ptr long long) @ varargs _cwprintf(wstr) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b345a7f..7ccdc7d 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -902,6 +902,28 @@ char * CDECL MSVCRT__ctime64(const MSVCRT___time64_t *time) } /********************************************************************* + * _ctime64_s (MSVCRT.@) + */ +int CDECL MSVCRT__ctime64_s(char *res, MSVCRT_size_t len, const MSVCRT___time64_t *time) +{ + struct MSVCRT_tm *t; + if( !MSVCRT_CHECK_PMT( res != NULL ) || !MSVCRT_CHECK_PMT( len >= 26 ) ) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + res[0] = '\0'; + if( !MSVCRT_CHECK_PMT( time != NULL ) || !MSVCRT_CHECK_PMT( time > 0 ) ) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + t = MSVCRT__localtime64( time ); + strcpy( res, MSVCRT_asctime( t ) ); + return 0; +} + +/********************************************************************* * _ctime32 (MSVCRT.@) */ char * CDECL MSVCRT__ctime32(const MSVCRT___time32_t *time) @@ -913,6 +935,28 @@ char * CDECL MSVCRT__ctime32(const MSVCRT___time32_t *time) } /********************************************************************* + * _ctime32_s (MSVCRT.@) + */ +int CDECL MSVCRT__ctime32_s(char *res, MSVCRT_size_t len, const MSVCRT___time32_t *time) +{ + struct MSVCRT_tm *t; + if( !MSVCRT_CHECK_PMT( res != NULL ) || !MSVCRT_CHECK_PMT( len >= 26 ) ) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + res[0] = '\0'; + if( !MSVCRT_CHECK_PMT( time != NULL ) || !MSVCRT_CHECK_PMT( time > 0 ) ) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + t = MSVCRT__localtime32( time ); + strcpy( res, MSVCRT_asctime( t ) ); + return 0; +} + +/********************************************************************* * ctime (MSVCRT.@) */ #ifdef _WIN64

1 0