November 2010 - Wine-Commits

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

Nov. 23, 2010

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

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

Nov. 23, 2010

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

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 Nov. 23, 2010

Nov. 23, 2010

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

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

Nov. 23, 2010

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 Nov. 23, 2010

Nov. 23, 2010

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: Remove an unneeded test.
by Alexandre Julliard Nov. 23, 2010

Nov. 23, 2010

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

Luca Bennati : cmd: Fix Italian translation.
by Alexandre Julliard Nov. 23, 2010

Nov. 23, 2010

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

Greg Geldorp : winetest: Add "-u" command line option so TestBot can include a URL in the report.
by Alexandre Julliard Nov. 23, 2010

Nov. 23, 2010

Module: wine Branch: master Commit: 5d7cc36dd9f3b00b22ea8580548ff46c1493c2b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7cc36dd9f3b00b22ea85805… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Nov 21 16:43:18 2010 +0100 winetest: Add "-u" command line option so TestBot can include a URL in the report. --- programs/winetest/main.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 021ec96..883006c 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -49,6 +49,7 @@ struct wine_test char *tag = NULL; char *description = NULL; +char *url = NULL; char *email = NULL; BOOL aborting = FALSE; static struct wine_test *wine_tests; @@ -250,6 +251,8 @@ static void print_version (void) xprintf (" Submitter=%s\n", email ); if (description) xprintf (" Description=%s\n", description ); + if (url) + xprintf (" URL=%s\n", url ); xprintf (" dwMajorVersion=%u\n dwMinorVersion=%u\n" " dwBuildNumber=%u\n PlatformId=%u\n szCSDVersion=%s\n", ver.dwMajorVersion, ver.dwMinorVersion, ver.dwBuildNumber, @@ -1015,6 +1018,7 @@ usage (void) " -o FILE put report into FILE, do not submit\n" " -s FILE submit FILE, do not run tests\n" " -t TAG include TAG of characters [-.0-9a-zA-Z] in the report\n" +" -u URL include TestBot URL in the report\n" " -x DIR Extract tests to DIR (default: .\\wct) and exit\n"); } @@ -1117,6 +1121,13 @@ int main( int argc, char *argv[] ) exit (2); } break; + case 'u': + if (!(url = argv[++i])) + { + usage(); + exit( 2 ); + } + break; case 'x': report (R_TEXTMODE); if (!(extract = argv[++i]))

1 0

Eric Pouech : winedbg: Rename 'info exception' into 'info frame' ( which is somehow closer to what it does).
by Alexandre Julliard Nov. 23, 2010

Nov. 23, 2010

Module: wine Branch: master Commit: 9261ef2d0a5d9fa31aa304c53d73f814900547e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9261ef2d0a5d9fa31aa304c53… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 21 22:19:34 2010 +0100 winedbg: Rename 'info exception' into 'info frame' (which is somehow closer to what it does). --- programs/winedbg/dbg.y | 4 ++-- programs/winedbg/debug.l | 2 +- programs/winedbg/debugger.h | 2 +- programs/winedbg/info.c | 4 ++-- programs/winedbg/winedbg.man.in | 6 ++++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 336f993..3fec9b7 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -287,8 +287,8 @@ info_command: | tINFO '*' tWND expr_rvalue { info_win32_window((HWND)$4, TRUE); } | tINFO tPROCESS { info_win32_processes(); } | tINFO tTHREAD { info_win32_threads(); } - | tINFO tEXCEPTION { info_win32_exceptions(dbg_curr_tid); } - | tINFO tEXCEPTION expr_rvalue { info_win32_exceptions($3); } + | tINFO tFRAME { info_win32_frame_exceptions(dbg_curr_tid); } + | tINFO tFRAME expr_rvalue { info_win32_frame_exceptions($3); } | tINFO tMAPS { info_win32_virtual(dbg_curr_pid); } | tINFO tMAPS expr_rvalue { info_win32_virtual($3); } ; diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 2e87ddb..4348140 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -166,7 +166,7 @@ STRING \"[^\n"]+\" <INITIAL,NOPROCESS>info|inf|in { BEGIN(INFO_CMD); return tINFO; } <INITIAL>up { BEGIN(NOCMD); return tUP; } <INITIAL>down|dow|do { BEGIN(NOCMD); return tDOWN; } -<INITIAL>frame|fram|fra|fr { BEGIN(NOCMD); return tFRAME; } +<INITIAL,INFO_CMD>frame|fram|fra|fr { BEGIN(NOCMD); return tFRAME; } <INITIAL>list|lis|li|l { BEGIN(PATH_ACCEPTED); return tLIST; } <INITIAL>enable|enabl|enab|ena { BEGIN(BD_CMD); return tENABLE;} <INITIAL>disable|disabl|disab|disa|dis { BEGIN(BD_CMD); return tDISABLE; } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index ae949f2..807a341 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -351,7 +351,7 @@ extern void info_win32_class(HWND hWnd, const char* clsName); extern void info_win32_window(HWND hWnd, BOOL detailed); extern void info_win32_processes(void); extern void info_win32_threads(void); -extern void info_win32_exceptions(DWORD tid); +extern void info_win32_frame_exceptions(DWORD tid); extern void info_win32_virtual(DWORD pid); extern void info_win32_segments(DWORD start, int length); extern void info_wine_dbg_channel(BOOL add, const char* chnl, const char* name); diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index a09af5d..844bcbc 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -543,11 +543,11 @@ void info_win32_threads(void) } /*********************************************************************** - * info_win32_exceptions + * info_win32_frame_exceptions * * Get info on the exception frames of a given thread. */ -void info_win32_exceptions(DWORD tid) +void info_win32_frame_exceptions(DWORD tid) { struct dbg_thread* thread; void* next_frame; diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index fb91d6b..8b26e32 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -366,8 +366,10 @@ Prints information of Window of handle \fBN\fR Lists all w-processes in Wine session .IP \fBinfo\ thread\fR Lists all w-threads in Wine session -.IP \fBinfo\ exception\fR -Lists the exception frames (starting from current stack frame) +.IP \fBinfo\ frame\fR +Lists the exception frames (starting from current stack frame). You +can also pass, as optional argument, a thread id (instead of current +thread) to examine its exception frames. .PP Debug messages can be turned on and off as you are debugging using the \fBset\fR command, but only for channels initialized with the

1 0

Vijay Kiran Kamuju : include: Add missing clsids in d3drmobj.h.
by Alexandre Julliard Nov. 23, 2010

Nov. 23, 2010

Module: wine Branch: master Commit: 06563403944222fe1b6299566b4e259e41265a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06563403944222fe1b6299566… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Nov 6 14:03:00 2010 -0400 include: Add missing clsids in d3drmobj.h. --- include/d3drmobj.h | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 insertions(+), 3 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index d0c8367..f272ba5 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -29,9 +29,32 @@ extern "C" { #endif -/***************************************************************************** - * Predeclare the interfaces - */ +/* Direct3DRM object CLSIDs */ + +DEFINE_GUID(CLSID_CDirect3DRMDevice, 0x4fa3568e, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMViewport, 0x4fa3568f, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMFrame, 0x4fa35690, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMMesh, 0x4fa35691, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMMeshBuilder, 0x4fa35692, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMFace, 0x4fa35693, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMLight, 0x4fa35694, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMTexture, 0x4fa35695, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMWrap, 0x4fa35696, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMMaterial, 0x4fa35697, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMAnimation, 0x4fa35698, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMAnimationSet, 0x4fa35699, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMUserVisual, 0x4fa3569a, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMShadow, 0x4fa3569b, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMViewportInterpolator, 0xde9eaa1, 0x3b84, 0x11d0, 0x9b, 0x6d, 0x0, 0x0, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(CLSID_CDirect3DRMFrameInterpolator, 0xde9eaa2, 0x3b84, 0x11d0, 0x9b, 0x6d, 0x0, 0x0, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(CLSID_CDirect3DRMMeshInterpolator, 0xde9eaa3, 0x3b84, 0x11d0, 0x9b, 0x6d, 0x0, 0x0, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(CLSID_CDirect3DRMLightInterpolator, 0xde9eaa6, 0x3b84, 0x11d0, 0x9b, 0x6d, 0x0, 0x0, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(CLSID_CDirect3DRMMaterialInterpolator, 0xde9eaa7, 0x3b84, 0x11d0, 0x9b, 0x6d, 0x0, 0x0, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(CLSID_CDirect3DRMTextureInterpolator, 0xde9eaa8, 0x3b84, 0x11d0, 0x9b, 0x6d, 0x0, 0x0, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(CLSID_CDirect3DRMProgressiveMesh, 0x4516ec40, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(CLSID_CDirect3DRMClippedVisual, 0x5434e72d, 0x6d66, 0x11d1, 0xbb, 0xb, 0x0, 0x0, 0xf8, 0x75, 0x86, 0x5a); + +/* Direct3DRM object interface GUIDs */ DEFINE_GUID(IID_IDirect3DRMObject, 0xeb16cb00, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); DEFINE_GUID(IID_IDirect3DRMObject2, 0x4516ec7c, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); @@ -78,6 +101,10 @@ DEFINE_GUID(IID_IDirect3DRMProgressiveMesh, 0x4516ec79, 0x8f20, 0x11d0, 0x9b, 0x DEFINE_GUID(IID_IDirect3DRMPicked2Array, 0x4516ec7b, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); DEFINE_GUID(IID_IDirect3DRMClippedVisual, 0x5434e733, 0x6d66, 0x11d1, 0xbb, 0x0b, 0x00, 0x00, 0xf8, 0x75, 0x86, 0x5a); +/***************************************************************************** + * Predeclare the interfaces + */ + typedef struct IDirect3DRMObject *LPDIRECT3DRMOBJECT, **LPLPDIRECT3DRMOBJECT; typedef struct IDirect3DRMObject2 *LPDIRECT3DRMOBJECT2, **LPLPDIRECT3DRMOBJECT2; typedef struct IDirect3DRMDevice *LPDIRECT3DRMDEVICE, **LPLPDIRECT3DRMDEVICE;

1 0