July 2013 - Wine-commits - list.winehq.org

George Stephanos : advapi32/tests: RegDeleteKey tests for merged view of HKCR.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 16bd3ffc8777b9681bfdb777bcf5ad5fd99dec27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16bd3ffc8777b9681bfdb777b… Author: George Stephanos <gaf.stephanos(a)gmail.com> Date: Sun Jun 30 23:13:06 2013 +0200 advapi32/tests: RegDeleteKey tests for merged view of HKCR. --- dlls/advapi32/tests/registry.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 1784118..1a98f91 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2341,6 +2341,29 @@ static void test_classesroot(void) ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); + /* cleanup */ + RegCloseKey( hkeysub1 ); + RegCloseKey( hklmsub1 ); + + /* delete subkey1 from hkcr (should point at user's classes) */ + res = RegDeleteKey(hkcr, "subkey1"); + ok(res == ERROR_SUCCESS, "RegDeleteKey failed: %d\n", res); + + /* confirm key was removed in hkey but not hklm */ + res = RegOpenKeyExA(hkey, "subkey1", 0, KEY_READ, &hkeysub1); + ok(res == ERROR_FILE_NOT_FOUND, "test key found in user's classes: %d\n", res); + res = RegOpenKeyExA(hklm, "subkey1", 0, KEY_READ, &hklmsub1); + ok(res == ERROR_SUCCESS, "test key not found in hklm: %d\n", res); + + /* delete subkey1 from hkcr again (which should now point at hklm) */ + res = RegDeleteKey(hkcr, "subkey1"); + ok(res == ERROR_SUCCESS, "RegDeleteKey failed: %d\n", res); + + /* confirm hkey was removed in hklm */ + RegCloseKey( hklmsub1 ); + res = RegOpenKeyExA(hklm, "subkey1", 0, KEY_READ, &hklmsub1); + ok(res == ERROR_FILE_NOT_FOUND, "test key found in hklm: %d\n", res); + /* final cleanup */ delete_key( hkey ); delete_key( hklm );

1 0

Michael Stefaniuc : atl/tests: Mark a WinNT result as broken.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 4785c5865bf3357387f195dbc802d0805b24573a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4785c5865bf3357387f195dbc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 1 00:18:18 2013 +0200 atl/tests: Mark a WinNT result as broken. --- dlls/atl/tests/registrar.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c index 1b1c797..68a8dd8 100644 --- a/dlls/atl/tests/registrar.c +++ b/dlls/atl/tests/registrar.c @@ -142,8 +142,9 @@ static void test_aggregation(void) hres = CoCreateInstance(&CLSID_Registrar, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)&unk); - ok(hres == CLASS_E_NOAGGREGATION, "CoCreateInstance failed: %08x, expected CLASS_E_NOAGGREGATION\n", hres); - ok(!unk, "unk = %p\n", unk); + ok(hres == CLASS_E_NOAGGREGATION || broken(hres == E_INVALIDARG), + "CoCreateInstance failed: %08x, expected CLASS_E_NOAGGREGATION\n", hres); + ok(!unk || unk == (IUnknown*)0xdeadbeef, "unk = %p\n", unk); } START_TEST(registrar)

1 0

Michael Stefaniuc : po: Fix some errors in the Romanian translation.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 74064de7a17763f950a7e1a88ce167c45f28fad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74064de7a17763f950a7e1a88… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 1 00:16:02 2013 +0200 po: Fix some errors in the Romanian translation. --- po/ro.po | 98 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 49 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74064de7a17763f950a7e…

1 0

Pavel Borecki : po: Update Czech translation.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 2b4e893d64fbfcd73c8e62f50e8e446edd3c5bf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b4e893d64fbfcd73c8e62f50… Author: Pavel Borecki <pavel.borecki(a)gmail.com> Date: Sun Jun 30 09:54:16 2013 +0200 po: Update Czech translation. --- po/cs.po | 2676 +++++++++++++++++++++++++++++--------------------------------- 1 files changed, 1257 insertions(+), 1419 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b4e893d64fbfcd73c8e6…

1 0

Akira Nakagawa : wine.desktop: Add Japanese title.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 32184615faec8848c5dc57619e80e496d6c43c12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32184615faec8848c5dc57619… Author: Akira Nakagawa <matyapiro31(a)gmail.com> Date: Mon Jun 24 20:11:08 2013 +0900 wine.desktop: Add Japanese title. --- tools/wine.desktop | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index c90753f..234e7e2 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -22,6 +22,7 @@ Name[sr]=Wine - дизач Windows програма Name[sr(a)latin]=Wine - dizač Windows programa Name[hr]=Wine - dizač Windows programa Name[he]=Wine — מריץ תכניות Windows +Name[ja]=Wine Windowsプログラムローダー Exec=wine start /unix %f MimeType=application/x-ms-dos-executable;application/x-msi;application/x-ms-shortcut; Icon=wine

1 0

Alexandre Julliard : winebuild: Pass the -mcpu option to the C compiler also.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 3dfe94cfbdcd4e8f6815d125d162bc008439ed3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dfe94cfbdcd4e8f6815d125d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 1 12:54:32 2013 +0200 winebuild: Pass the -mcpu option to the C compiler also. --- tools/winebuild/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 2028b05..9c497ed 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -381,6 +381,7 @@ struct strarray *get_as_command(void) strarray_add( args, "-xassembler", "-c", NULL ); if (force_pointer_size) strarray_add_one( args, (force_pointer_size == 8) ? "-m64" : "-m32" ); + if (cpu_option) strarray_add_one( args, strmake("-mcpu=%s", cpu_option) ); return args; }

1 0

Alexandre Julliard : gdi32: Fix off-by-one error in the extent of arcs when the size is even.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: a973df332457ed97abacf52e11ff9eabf19acd30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a973df332457ed97abacf52e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 1 12:55:00 2013 +0200 gdi32: Fix off-by-one error in the extent of arcs when the size is even. --- dlls/gdi32/dibdrv/graphics.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index f9ed4c0..d91ef11 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -267,16 +267,16 @@ static int get_arc_points( PHYSDEV dev, const RECT *rect, POINT start, POINT end points[pos].y = rect->top + height/2 + points[i % count].y; break; case 1: - points[pos].x = rect->left + width/2 - points[count - 1 - i % count].x; + points[pos].x = rect->right-1 - width/2 - points[count - 1 - i % count].x; points[pos].y = rect->top + height/2 + points[count - 1 - i % count].y; break; case 2: - points[pos].x = rect->left + width/2 - points[i % count].x; - points[pos].y = rect->top + height/2 - points[i % count].y; + points[pos].x = rect->right-1 - width/2 - points[i % count].x; + points[pos].y = rect->bottom-1 - height/2 - points[i % count].y; break; case 3: points[pos].x = rect->left + width/2 + points[count - 1 - i % count].x; - points[pos].y = rect->top + height/2 - points[count - 1 - i % count].y; + points[pos].y = rect->bottom-1 - height/2 - points[count - 1 - i % count].y; break; } } @@ -289,14 +289,14 @@ static int get_arc_points( PHYSDEV dev, const RECT *rect, POINT start, POINT end { case 0: points[pos].x = rect->left + width/2 + points[i % count].x; - points[pos].y = rect->top + height/2 - points[i % count].y; + points[pos].y = rect->bottom-1 - height/2 - points[i % count].y; break; case 1: - points[pos].x = rect->left + width/2 - points[count - 1 - i % count].x; - points[pos].y = rect->top + height/2 - points[count - 1 - i % count].y; + points[pos].x = rect->right-1 - width/2 - points[count - 1 - i % count].x; + points[pos].y = rect->bottom-1 - height/2 - points[count - 1 - i % count].y; break; case 2: - points[pos].x = rect->left + width/2 - points[i % count].x; + points[pos].x = rect->right-1 - width/2 - points[i % count].x; points[pos].y = rect->top + height/2 + points[i % count].y; break; case 3:

1 0

Alexandre Julliard : gdi32: Don' t load linked fonts only to look up control characters.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 60d29d1d0d478f94e4375f8fac4fca1d30e843fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=60d29d1d0d478f94e4375f8fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 1 14:13:07 2013 +0200 gdi32: Don't load linked fonts only to look up control characters. --- dlls/gdi32/freetype.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index bdd6df7..72d8377 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7605,6 +7605,8 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, return TRUE; } + if (c < 32) goto done; /* don't check linked fonts for control characters */ + LIST_FOR_EACH_ENTRY(child_font, &font->child_fonts, CHILD_FONT, entry) { if(!child_font->font) @@ -7624,6 +7626,8 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, return TRUE; } } + +done: *glyph = get_default_char_index(font); *vert = FALSE; return FALSE;

1 0

Alexandre Julliard : ntdll: Leave NtQueryDirectoryFile early when a non-wildcard mask is used in the getdirentries case .
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 96b7c71cfe5acb9b319697dcff93b2e814c8b00f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96b7c71cfe5acb9b319697dcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 1 19:49:46 2013 +0200 ntdll: Leave NtQueryDirectoryFile early when a non-wildcard mask is used in the getdirentries case. This avoids having to retry the getdirentries call which may fail if the buffer size is too small. --- dlls/ntdll/directory.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index c552a8b..1a84537 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -247,6 +247,13 @@ static inline unsigned int max_dir_info_size( FILE_INFORMATION_CLASS class ) return dir_info_size( class, MAX_DIR_ENTRY_LEN ); } +static inline BOOL has_wildcard( const UNICODE_STRING *mask ) +{ + return (!mask || + memchrW( mask->Buffer, '*', mask->Length / sizeof(WCHAR) ) || + memchrW( mask->Buffer, '?', mask->Length / sizeof(WCHAR) )); +} + /* support for a directory queue for filesystem searches */ @@ -1823,6 +1830,7 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff last_info = NULL; goto restart; } + if (!has_wildcard( mask )) break; /* if we have to return but the buffer contains more data, restart with a smaller size */ if (res > 0 && (single_entry || io->Information + max_dir_info_size(class) > length)) { @@ -2000,13 +2008,6 @@ done: } -static inline WCHAR *mempbrkW( const WCHAR *ptr, const WCHAR *accept, size_t n ) -{ - const WCHAR *end; - for (end = ptr + n; ptr < end; ptr++) if (strchrW( accept, *ptr )) return (WCHAR *)ptr; - return NULL; -} - /****************************************************************************** * NtQueryDirectoryFile [NTDLL.@] * ZwQueryDirectoryFile [NTDLL.@] @@ -2021,7 +2022,6 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, BOOLEAN restart_scan ) { int cwd, fd, needs_close; - static const WCHAR wszWildcards[] = { '*','?',0 }; TRACE("(%p %p %p %p %p %p 0x%08x 0x%08x 0x%08x %s 0x%08x\n", handle, event, apc_routine, apc_context, io, buffer, @@ -2068,7 +2068,7 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, if ((read_directory_vfat( fd, io, buffer, length, single_entry, mask, restart_scan, info_class )) != -1) goto done; #endif - if (mask && !mempbrkW( mask->Buffer, wszWildcards, mask->Length / sizeof(WCHAR) ) && + if (!has_wildcard( mask ) && read_directory_stat( fd, io, buffer, length, single_entry, mask, restart_scan, info_class ) != -1) goto done; #ifdef USE_GETDENTS

1 0

Alexandre Julliard : ntdll/tests: Add some tests for NtQueryDirectoryFile with a non-wildcard mask.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 641e1bee026f784052c79bb15e52fa111a6a2940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=641e1bee026f784052c79bb15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 1 19:50:43 2013 +0200 ntdll/tests: Add some tests for NtQueryDirectoryFile with a non-wildcard mask. --- dlls/ntdll/tests/directory.c | 51 +++++++++++++++++++++++++++++------------ 1 files changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index d6b886a..bc5d860 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -162,11 +162,12 @@ static void tally_test_file(FILE_BOTH_DIRECTORY_INFORMATION *dir_info) } static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char *testdirA, + UNICODE_STRING *mask, BOOLEAN single_entry, BOOLEAN restart_flag) { HANDLE dirh; IO_STATUS_BLOCK io; - UINT data_pos; + UINT data_pos, data_size; UINT data_len; /* length of dir data */ BYTE data[8192]; /* directory data */ FILE_BOTH_DIRECTORY_INFORMATION *dir_info; @@ -176,6 +177,8 @@ static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char reset_found_files(); + data_size = mask ? offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[256] ) : sizeof(data); + /* Read the directory and note which files are found */ status = pNtOpenFile( &dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, attr, &io, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT|FILE_OPEN_FOR_BACKUP_INTENT|FILE_DIRECTORY_FILE); @@ -185,9 +188,9 @@ static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char return; } - pNtQueryDirectoryFile( dirh, NULL, NULL, NULL, &io, data, sizeof(data), - FileBothDirectoryInformation, single_entry, NULL, restart_flag ); - ok (U(io).Status == STATUS_SUCCESS, "filed to query directory; status %x\n", U(io).Status); + pNtQueryDirectoryFile( dirh, NULL, NULL, NULL, &io, data, data_size, + FileBothDirectoryInformation, single_entry, mask, restart_flag ); + ok (U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status); data_len = io.Information; ok (data_len >= sizeof(FILE_BOTH_DIRECTORY_INFORMATION), "not enough data in directory\n"); @@ -199,11 +202,11 @@ static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char tally_test_file(dir_info); if (dir_info->NextEntryOffset == 0) { - pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, sizeof(data), - FileBothDirectoryInformation, single_entry, NULL, FALSE ); + pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, data_size, + FileBothDirectoryInformation, single_entry, mask, FALSE ); if (U(io).Status == STATUS_NO_MORE_FILES) break; - ok (U(io).Status == STATUS_SUCCESS, "filed to query directory; status %x\n", U(io).Status); + ok (U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status); data_len = io.Information; if (data_len < sizeof(FILE_BOTH_DIRECTORY_INFORMATION)) break; @@ -215,10 +218,16 @@ static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char } ok(numfiles < max_test_dir_size, "too many loops\n"); - for (i=0; testfiles[i].name; i++) - ok(testfiles[i].nfound == 1, "Wrong number %d of %s files found (ReturnSingleEntry=%d,RestartScan=%d)\n", - testfiles[i].nfound, testfiles[i].description, single_entry, restart_flag); - + if (mask) + for (i=0; testfiles[i].name; i++) + ok(testfiles[i].nfound == (testfiles[i].nameW == mask->Buffer), + "Wrong number %d of %s files found (single_entry=%d,mask=%s)\n", + testfiles[i].nfound, testfiles[i].description, single_entry, + wine_dbgstr_wn(mask->Buffer, mask->Length/sizeof(WCHAR) )); + else + for (i=0; testfiles[i].name; i++) + ok(testfiles[i].nfound == 1, "Wrong number %d of %s files found (single_entry=%d,restart=%d)\n", + testfiles[i].nfound, testfiles[i].description, single_entry, restart_flag); pNtClose(dirh); } @@ -228,6 +237,7 @@ static void test_NtQueryDirectoryFile(void) UNICODE_STRING ntdirname; char testdirA[MAX_PATH]; WCHAR testdirW[MAX_PATH]; + int i; /* Clean up from prior aborted run, if any, then set up test files */ ok(GetTempPathA(MAX_PATH, testdirA), "couldn't get temp dir\n"); @@ -243,10 +253,21 @@ static void test_NtQueryDirectoryFile(void) } InitializeObjectAttributes(&attr, &ntdirname, OBJ_CASE_INSENSITIVE, 0, NULL); - test_flags_NtQueryDirectoryFile(&attr, testdirA, FALSE, TRUE); - test_flags_NtQueryDirectoryFile(&attr, testdirA, FALSE, FALSE); - test_flags_NtQueryDirectoryFile(&attr, testdirA, TRUE, TRUE); - test_flags_NtQueryDirectoryFile(&attr, testdirA, TRUE, FALSE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, NULL, FALSE, TRUE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, NULL, FALSE, FALSE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, NULL, TRUE, TRUE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, NULL, TRUE, FALSE); + + for (i = 0; testfiles[i].name; i++) + { + UNICODE_STRING mask; + mask.Buffer = testfiles[i].nameW; + mask.Length = mask.MaximumLength = lstrlenW(testfiles[i].nameW) * sizeof(WCHAR); + test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, FALSE, TRUE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, FALSE, FALSE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, TRUE, TRUE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, TRUE, FALSE); + } done: tear_down_attribute_test(testdirA);

1 0