October 2013 - Wine-commits

Volkan Gezer : po: Updated Turkish translation.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: a90fee9f3def10a02425419fa3e4f8738d5f0546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90fee9f3def10a02425419fa… Author: Volkan Gezer <volkangezer(a)gmail.com> Date: Wed Oct 30 12:45:36 2013 +0100 po: Updated Turkish translation. --- po/tr.po | 94 +++++++++++++++++++++++++------------------------------------- 1 files changed, 38 insertions(+), 56 deletions(-) diff --git a/po/tr.po b/po/tr.po index 8e5acd6..eea67af 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-07-13 04:49+0200\n" +"PO-Revision-Date: 2013-10-30 12:44+0100\n" "Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" "Language-Team: Turkish <kde-l10n-tr(a)kde.org>\n" "Language: Turkish\n" @@ -4248,7 +4248,7 @@ msgstr "" #: winerror.mc:806 msgid "Environment variable not found.\n" -msgstr "" +msgstr "Ortam değişkeni bulunamadı.\n" #: winerror.mc:811 msgid "No signal sent.\n" @@ -4260,11 +4260,11 @@ msgstr "Dosya adı çok uzun.\n" #: winerror.mc:821 msgid "Ring 2 stack in use.\n" -msgstr "" +msgstr "Halka 2 yığını kullanımda.\n" #: winerror.mc:826 msgid "Error in use of filename wildcards.\n" -msgstr "" +msgstr "Dosya adı joker karakteri kullanımında hata.\n" #: winerror.mc:831 msgid "Invalid signal number.\n" @@ -4276,7 +4276,7 @@ msgstr "Sinyal ele alıcısı ayarlanırken hata.\n" #: winerror.mc:841 msgid "Segment locked.\n" -msgstr "" +msgstr "Bölüm kilitli.\n" #: winerror.mc:846 msgid "Too many modules.\n" @@ -4288,7 +4288,7 @@ msgstr "" #: winerror.mc:856 msgid "Machine type mismatch.\n" -msgstr "" +msgstr "Makine tür uyumsuzluğu.\n" #: winerror.mc:861 msgid "Bad pipe.\n" @@ -4364,7 +4364,7 @@ msgstr "" #: winerror.mc:951 msgid "Read/WriteProcessMemory partially completed.\n" -msgstr "" +msgstr "Read/WriteProcessMemory kısmen tamamlandı.\n" #: winerror.mc:956 msgid "The oplock wasn't granted.\n" @@ -4376,7 +4376,7 @@ msgstr "" #: winerror.mc:966 msgid "Message 0x%1 not found in file %2.\n" -msgstr "" +msgstr "0x%1 iletisi %2 dosyasında bulunamadı.\n" #: winerror.mc:971 msgid "Invalid address.\n" @@ -4384,7 +4384,7 @@ msgstr "Geçersiz adres.\n" #: winerror.mc:976 msgid "Arithmetic overflow.\n" -msgstr "" +msgstr "Aritmetik taşma.\n" #: winerror.mc:981 msgid "Pipe connected.\n" @@ -4396,11 +4396,11 @@ msgstr "İletişim tüneli dinleniyor.\n" #: winerror.mc:991 msgid "Extended attribute access denied.\n" -msgstr "" +msgstr "Uzatılmış nitelik erişimi reddedildi.\n" #: winerror.mc:996 msgid "I/O operation aborted.\n" -msgstr "" +msgstr "G/Ç işlemi iptal edildi.\n" #: winerror.mc:1001 msgid "Overlapped I/O incomplete.\n" @@ -4924,15 +4924,15 @@ msgstr "" #: winerror.mc:1651 msgid "Invalid network provider name.\n" -msgstr "" +msgstr "Geçersiz ağ sağlayıcı adı.\n" #: winerror.mc:1656 msgid "Cannot open network connection profile.\n" -msgstr "" +msgstr "Ağ bağlantı profili açılamıyor.\n" #: winerror.mc:1661 msgid "Corrupt network connection profile.\n" -msgstr "" +msgstr "Ağ bağlantı profili bozuk.\n" #: winerror.mc:1666 msgid "Not a container.\n" @@ -5004,11 +5004,11 @@ msgstr "" #: winerror.mc:1756 winerror.mc:3741 msgid "Connection refused.\n" -msgstr "" +msgstr "Bağlantı reddedildi.\n" #: winerror.mc:1761 msgid "Connection gracefully closed.\n" -msgstr "" +msgstr "Bağlantı dikkatlice kapatıldı.\n" #: winerror.mc:1766 msgid "Address already associated with transport endpoint.\n" @@ -5340,15 +5340,15 @@ msgstr "" #: winerror.mc:2176 msgid "No such domain.\n" -msgstr "" +msgstr "Böyle bir etki alanı yok.\n" #: winerror.mc:2181 msgid "Domain already exists.\n" -msgstr "" +msgstr "Etki alanı zaten mevcut.\n" #: winerror.mc:2186 msgid "Domain limit exceeded.\n" -msgstr "" +msgstr "Etki alanı sınırı aşıldı.\n" #: winerror.mc:2191 msgid "Internal database corruption.\n" @@ -5488,19 +5488,19 @@ msgstr "" #: winerror.mc:2366 msgid "Disk is corrupt.\n" -msgstr "" +msgstr "Disk bozuk.\n" #: winerror.mc:2371 msgid "No user session key.\n" -msgstr "" +msgstr "Kullanıcı oturum anahtarı yok.\n" #: winerror.mc:2376 msgid "License quota exceeded.\n" -msgstr "" +msgstr "Lisans kotası aşıldı.\n" #: winerror.mc:2381 msgid "Wrong target name.\n" -msgstr "" +msgstr "Hatalı hedef adı.\n" #: winerror.mc:2386 msgid "Mutual authentication failed.\n" @@ -5792,19 +5792,19 @@ msgstr "" #: winerror.mc:2746 msgid "Unknown product.\n" -msgstr "" +msgstr "Bilinmeyen ürün.\n" #: winerror.mc:2751 msgid "Unknown feature.\n" -msgstr "" +msgstr "Bilinmeyen özellik.\n" #: winerror.mc:2756 msgid "Unknown component.\n" -msgstr "" +msgstr "Bilinmeyen bileşen.\n" #: winerror.mc:2761 msgid "Unknown property.\n" -msgstr "" +msgstr "Bilinmeyen özellik.\n" #: winerror.mc:2766 msgid "Invalid handle state.\n" @@ -5824,11 +5824,11 @@ msgstr "" #: winerror.mc:2786 msgid "Wrong installation package version.\n" -msgstr "" +msgstr "Hatalı kurulum paket sürümü.\n" #: winerror.mc:2791 msgid "Product uninstalled.\n" -msgstr "" +msgstr "Ürün kaldırıldı.\n" #: winerror.mc:2796 msgid "Invalid query syntax.\n" @@ -8524,16 +8524,12 @@ msgstr "" "yeniden deneyin." #: winmm.rc:52 winmm.rc:125 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." msgstr "" "Geçerli MIDI Eşleyicisi kurulumu sistemde yüklü olmayan bir MIDI aygıtını " -"gösteriyor. Kurulumu düzenlemek için MIDI Eşleyicisini kullanın." +"gösteriyor." #: winmm.rc:53 msgid "" @@ -9354,22 +9350,16 @@ msgstr "" "kendisini çağıran tarafından miras alınır.\n" #: cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "" -"CD <dir> CHDIR komutunun kısa sürümüdür. Geçerli\n" -"varsayılan dizini değiştirir.\n" +"CD <dizin> CHDIR komutunun kısa sürümüdür. Geçerli\n" +"öntanımlı dizini değiştirir.\n" #: cmd.rc:41 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" -msgstr "CHDIR <dizin> geçerli varsayılan dizini değiştirir.\n" +msgstr "CHDIR <dizin> geçerli öntanımlı dizini değiştirir.\n" #: cmd.rc:43 msgid "CLS clears the console screen.\n" @@ -9420,11 +9410,6 @@ msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE <dosyaadı> bir veya birçok dosyayı siler.\n" #: cmd.rc:68 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -9435,7 +9420,9 @@ msgstr "" "FOR komutu bir dosya kümesinin her öğesi için bir komut çalıştırmada\n" "kullanılır.\n" "\n" -"Sözdizim: FOR %değişken IN (küme) DO komut\n" +"Kullanım: FOR %değişken IN (küme) DO komut\n" +"\n" +"% sembolü toplu iş dosyasında FOR kullanılırken iki kez kullanılmalıdır.\n" #: cmd.rc:80 msgid "" @@ -9626,17 +9613,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <dosyaadı> bir dosyayı yeniden adlandırır.\n" #: cmd.rc:158 -#, fuzzy -#| msgid "" -#| "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" -msgstr "MD <isim> MKDIR komutunun kısa sürümüdür. Bir alt dizin oluşturur.\n" +msgstr "RD <dizin> RMDIR komutunun kısa sürümüdür. Bir dizini siler.\n" #: cmd.rc:159 -#, fuzzy -#| msgid "MKDIR <name> creates a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" -msgstr "MKDIR <isim> bir alt dizin oluşturur.\n" +msgstr "RMDIR <dizin> bir dizini siler.\n" #: cmd.rc:203 msgid ""

1 0

Michael Stefaniuc : dinput/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: 9a263e58fdb0fedb6d21fae0956a1e3bd4d2b8ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a263e58fdb0fedb6d21fae09… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 29 23:13:02 2013 +0100 dinput/tests: Compile with -D__WINESRC__. --- dlls/dinput/tests/Makefile.in | 1 - dlls/dinput/tests/device.c | 26 +++++++++++++------------- dlls/dinput/tests/joystick.c | 39 +++++++++++++++++---------------------- dlls/dinput/tests/keyboard.c | 32 ++++++++++++++++---------------- dlls/dinput/tests/mouse.c | 28 ++++++++++++++-------------- 5 files changed, 60 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a263e58fdb0fedb6d21f…

1 0

Michael Stefaniuc : winmm/tests: Skip tests for MMSYSERR_NODRIVER too.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: ff7511cc0a5ffd410991f5563222adf45abc5663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff7511cc0a5ffd410991f5563… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 29 23:31:04 2013 +0100 winmm/tests: Skip tests for MMSYSERR_NODRIVER too. --- dlls/winmm/tests/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 8fb035a..6438dba 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -282,7 +282,7 @@ static void test_midiOut_device(UINT udev, HWND hwnd) rc = midiOutOpen(&hm, udev, (DWORD_PTR)hwnd, (DWORD_PTR)MYCBINST, CALLBACK_WINDOW); else rc = midiOutOpen(&hm, udev, (DWORD_PTR)callback_func, (DWORD_PTR)MYCBINST, CALLBACK_FUNCTION); - if (rc == MMSYSERR_NOTSUPPORTED) + if (rc == MMSYSERR_NOTSUPPORTED || rc == MMSYSERR_NODRIVER) { skip( "MIDI out not supported\n" ); return; @@ -481,7 +481,7 @@ static void test_midiStream(UINT udev, HWND hwnd) rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)hwnd, (DWORD_PTR)MYCBINST, CALLBACK_WINDOW); else rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)callback_func, (DWORD_PTR)MYCBINST, CALLBACK_FUNCTION); - if (rc == MMSYSERR_NOTSUPPORTED) + if (rc == MMSYSERR_NOTSUPPORTED || rc == MMSYSERR_NODRIVER) { skip( "MIDI stream not supported\n" ); return;

1 0

Dmitry Timoshkov : kernel32: Add special case for "." and ".." to GetShortPathName.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: d57444a62268ff6158f9c2295093b713e6400f5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57444a62268ff6158f9c2295… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 30 11:43:50 2013 +0900 kernel32: Add special case for "." and ".." to GetShortPathName. --- dlls/kernel32/path.c | 10 ++++++++++ dlls/kernel32/tests/path.c | 4 ---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 1728bfa..7ed1c61 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -489,6 +489,16 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl tmplen = p - (longpath + lp); lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); + if (tmpshortpath[sp] == '.') + { + if (tmplen == 1 || (tmplen == 2 && tmpshortpath[sp + 1] == '.')) + { + sp += tmplen; + lp += tmplen; + continue; + } + } + /* Check if the file exists and use the existing short file name */ goit = FindFirstFileW(tmpshortpath, &wfd); if (goit == INVALID_HANDLE_VALUE) goto notfound; diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index fe699b2..62236a0 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1963,7 +1963,6 @@ todo_wine strcpy(buf, "deadbeef"); ret = GetShortPathNameA(".", buf, MAX_PATH); ok(ret, "GetShortPathName error %d\n", GetLastError()); -todo_wine ok(!strcmp(buf, "."), "expected ., got %s\n", buf); strcpy(buf, "deadbeef"); @@ -1974,7 +1973,6 @@ todo_wine strcpy(buf, "deadbeef"); ret = GetShortPathNameA("..", buf, MAX_PATH); ok(ret, "GetShortPathName error %d\n", GetLastError()); -todo_wine ok(!strcmp(buf, ".."), "expected .., got %s\n", buf); strcpy(buf, "deadbeef"); @@ -1985,9 +1983,7 @@ todo_wine ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); ret = GetShortPathNameA("..\\foo\\file", buf, MAX_PATH); -todo_wine ok(ret, "GetShortPathName error %d\n", GetLastError()); -todo_wine ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); SetCurrentDirectoryA("..");

1 0

Dmitry Timoshkov : kernel32: Add special case for "." and ".." to GetLongPathName.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: eba2f4322169715b3672651a5427b718b6eafa8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba2f4322169715b3672651a5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 30 11:44:13 2013 +0900 kernel32: Add special case for "." and ".." to GetLongPathName. --- dlls/kernel32/path.c | 11 +++++++++++ dlls/kernel32/tests/path.c | 4 ---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 7ed1c61..09fb04b 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -358,6 +358,17 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen for (; *p && *p != '/' && *p != '\\'; p++); tmplen = p - (shortpath + sp); lstrcpynW(tmplongpath + lp, shortpath + sp, tmplen + 1); + + if (tmplongpath[lp] == '.') + { + if (tmplen == 1 || (tmplen == 2 && tmplongpath[lp + 1] == '.')) + { + lp += tmplen; + sp += tmplen; + continue; + } + } + /* Check if the file exists and use the existing file name */ goit = FindFirstFileW(tmplongpath, &wfd); if (goit == INVALID_HANDLE_VALUE) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 62236a0..7cfa19c 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1958,7 +1958,6 @@ static void test_relative_path(void) strcpy(buf, "deadbeef"); ret = pGetLongPathNameA(".", buf, MAX_PATH); ok(ret, "GetLongPathName error %d\n", GetLastError()); -todo_wine ok(!strcmp(buf, "."), "expected ., got %s\n", buf); strcpy(buf, "deadbeef"); ret = GetShortPathNameA(".", buf, MAX_PATH); @@ -1968,7 +1967,6 @@ todo_wine strcpy(buf, "deadbeef"); ret = pGetLongPathNameA("..", buf, MAX_PATH); ok(ret, "GetLongPathName error %d\n", GetLastError()); -todo_wine ok(!strcmp(buf, ".."), "expected .., got %s\n", buf); strcpy(buf, "deadbeef"); ret = GetShortPathNameA("..", buf, MAX_PATH); @@ -1977,9 +1975,7 @@ todo_wine strcpy(buf, "deadbeef"); ret = pGetLongPathNameA("..\\foo\\file", buf, MAX_PATH); -todo_wine ok(ret, "GetLongPathName error %d\n", GetLastError()); -todo_wine ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); ret = GetShortPathNameA("..\\foo\\file", buf, MAX_PATH);

1 0

Frédéric Delanoy : ntdll: Use BOOL type where appropriate.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: 86fdca67502d19d7432f3d41ea71d7dfc32c9b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86fdca67502d19d7432f3d41e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 29 21:54:12 2013 +0100 ntdll: Use BOOL type where appropriate. --- dlls/ntdll/cdrom.c | 22 +++++++++++----------- dlls/ntdll/directory.c | 6 +++--- dlls/ntdll/loadorder.c | 4 ++-- dlls/ntdll/misc.c | 4 ++-- dlls/ntdll/resource.c | 2 +- dlls/ntdll/signal_arm.c | 4 ++-- dlls/ntdll/signal_arm64.c | 4 ++-- dlls/ntdll/signal_powerpc.c | 4 ++-- dlls/ntdll/time.c | 4 ++-- dlls/ntdll/version.c | 2 +- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 18c7874..62c3d16 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -575,13 +575,13 @@ static void CDROM_ClearCacheEntry(int dev) * Determines the ide interface (the number after the ide), and the * number of the device on that interface for ide cdroms (*iface <= 1). * Determines the scsi information for scsi cdroms (*iface >= 2). - * Returns false if the info cannot not be obtained. + * Returns FALSE if the info cannot not be obtained. */ -static int CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* device, UCHAR* lun) +static BOOL CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* device, UCHAR* lun) { #if defined(linux) struct stat st; - if ( fstat(fd, &st) == -1 || ! S_ISBLK(st.st_mode)) return 0; + if ( fstat(fd, &st) == -1 || ! S_ISBLK(st.st_mode)) return FALSE; *port = 0; *iface = 0; *device = 0; @@ -615,10 +615,10 @@ static int CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* devi #endif { WARN("CD-ROM device (%d, %d) not supported\n", major(st.st_rdev), minor(st.st_rdev)); - return 0; + return FALSE; } } - return 1; + return TRUE; #elif defined(__NetBSD__) struct scsi_addr addr; if (ioctl(fd, SCIOCIDENTIFY, &addr) != -1) @@ -630,16 +630,16 @@ static int CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* devi *iface = addr.addr.scsi.scbus; *device = addr.addr.scsi.target; *lun = addr.addr.scsi.lun; - return 1; + return TRUE; case TYPE_ATAPI: *port = 0; *iface = addr.addr.atapi.atbus; *device = addr.addr.atapi.drive; *lun = 0; - return 1; + return TRUE; } } - return 0; + return FALSE; #elif defined(__APPLE__) dk_scsi_identify_t addr; if (ioctl(fd, DKIOCSCSIIDENTIFY, &addr) != -1) @@ -648,12 +648,12 @@ static int CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* devi *iface = addr.port; *device = addr.target; *lun = addr.lun; - return 1; + return TRUE; } - return 0; + return FALSE; #else FIXME("not implemented on this O/S\n"); - return 0; + return FALSE; #endif } diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 4af3456..0306f77 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -161,7 +161,7 @@ static BOOL show_dot_files; static RTL_RUN_ONCE init_once = RTL_RUN_ONCE_INIT; /* at some point we may want to allow Winelib apps to set this */ -static const int is_case_sensitive = FALSE; +static const BOOL is_case_sensitive = FALSE; UNICODE_STRING system_dir = { 0, 0, NULL }; /* system directory */ @@ -187,7 +187,7 @@ static inline BOOL is_invalid_dos_char( WCHAR ch ) } /* check if the device can be a mounted volume */ -static inline int is_valid_mounted_device( const struct stat *st ) +static inline BOOL is_valid_mounted_device( const struct stat *st ) { #if defined(linux) || defined(__sun__) return S_ISBLK( st->st_mode ); @@ -1184,7 +1184,7 @@ static ULONG hash_short_file_name( const UNICODE_STRING *name, LPWSTR buffer ) */ static BOOLEAN match_filename( const UNICODE_STRING *name_str, const UNICODE_STRING *mask_str ) { - int mismatch; + BOOL mismatch; const WCHAR *name = name_str->Buffer; const WCHAR *mask = mask_str->Buffer; const WCHAR *name_end = name + name_str->Length / sizeof(WCHAR); diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index ae50a4c..401d256 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -53,7 +53,7 @@ struct loadorder_list static const WCHAR separatorsW[] = {',',' ','\t',0}; -static int init_done; +static BOOL init_done; static struct loadorder_list env_list; @@ -232,7 +232,7 @@ static void init_load_order(void) UNICODE_STRING strW; WCHAR *entry, *next; - init_done = 1; + init_done = TRUE; if (!order) return; if (!strcmp( order, "help" )) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index a6b3b22..8bd4eb7 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -74,12 +74,12 @@ void CDECL NTDLL_wine_get_host_version( const char **sysname, const char **relea { #ifdef HAVE_SYS_UTSNAME_H static struct utsname buf; - static int init_done; + static BOOL init_done; if (!init_done) { uname( &buf ); - init_done = 1; + init_done = TRUE; } if (sysname) *sysname = buf.sysname; if (release) *release = buf.release; diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 0d60d96..9635bb0 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -56,7 +56,7 @@ static LANGID user_ui_language, system_ui_language; * * Check if a module handle is for a LOAD_LIBRARY_AS_DATAFILE module. */ -static inline int is_data_file_module( HMODULE hmod ) +static inline BOOL is_data_file_module( HMODULE hmod ) { return (ULONG_PTR)hmod & 1; } diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 9b0f1eb..6dbc7c8 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -876,12 +876,12 @@ void set_tpidrurw( TEB *teb ) */ void signal_init_thread( TEB *teb ) { - static int init_done; + static BOOL init_done; if (!init_done) { pthread_key_create( &teb_key, NULL ); - init_done = 1; + init_done = TRUE; } set_tpidrurw( teb ); pthread_setspecific( teb_key, teb ); diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 018d84f..2b82952 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -741,12 +741,12 @@ void signal_free_thread( TEB *teb ) */ void signal_init_thread( TEB *teb ) { - static int init_done; + static BOOL init_done; if (!init_done) { pthread_key_create( &teb_key, NULL ); - init_done = 1; + init_done = TRUE; } pthread_setspecific( teb_key, teb ); } diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index ac8095a..a457bdf 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -999,12 +999,12 @@ void signal_free_thread( TEB *teb ) */ void signal_init_thread( TEB *teb ) { - static int init_done; + static BOOL init_done; if (!init_done) { pthread_key_create( &teb_key, NULL ); - init_done = 1; + init_done = TRUE; } pthread_setspecific( teb_key, teb ); } diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 2b810d4..c398878 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -96,9 +96,9 @@ static const int MonthLengths[2][MONSPERYEAR] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } }; -static inline int IsLeapYear(int Year) +static inline BOOL IsLeapYear(int Year) { - return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0) ? 1 : 0; + return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0); } /* return a monotonic time counter, in Win32 ticks */ diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 1939c76..f4b1093 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -476,7 +476,7 @@ void version_init( const WCHAR *appname ) { static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e',0}; static const WCHAR appdefaultsW[] = {'A','p','p','D','e','f','a','u','l','t','s','\\',0}; - static const int is_win64 = (sizeof(void *) > sizeof(int)); + static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; HANDLE root, hkey, config_key;

1 0

Frédéric Delanoy : msxml3/tests: Use BOOL type where appropriate.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: cbd65f1c65deb46945d4da5fc2898185533a9683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbd65f1c65deb46945d4da5fc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 29 22:23:38 2013 +0100 msxml3/tests: Use BOOL type where appropriate. --- dlls/msxml3/tests/saxreader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index d9c3c4e..f3a6bbd 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -101,7 +101,7 @@ static void free_bstrs(void) alloced_bstrs_count = 0; } -static void test_saxstr(const char *file, unsigned line, BSTR str, const char *expected, int todo, int *failcount) +static void test_saxstr(const char *file, unsigned line, BSTR str, const char *expected, BOOL todo, int *failcount) { int len, lenexp, cmp; WCHAR buf[1024]; @@ -323,7 +323,7 @@ static const char *get_event_name(CH event) } static void compare_attributes(const struct call_entry *actual, const struct call_entry *expected, const char *context, - int todo, const char *file, int line, int *failcount) + BOOL todo, const char *file, int line, int *failcount) { int i, lenexp = 0; @@ -359,7 +359,7 @@ static void compare_attributes(const struct call_entry *actual, const struct cal } static void ok_sequence_(struct call_sequence **seq, int sequence_index, - const struct call_entry *expected, const char *context, int todo, + const struct call_entry *expected, const char *context, BOOL todo, const char *file, int line) { struct call_sequence *call_seq = seq[sequence_index];

1 0

Frédéric Delanoy : Assorted spelling fixes.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: 4473ce4db9827ca29eecd635fc10500df7be942d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4473ce4db9827ca29eecd635f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 29 15:57:31 2013 +0100 Assorted spelling fixes. --- dlls/avifil32/avifile.c | 2 +- dlls/comctl32/tests/header.c | 8 ++++---- dlls/msgsm32.acm/msgsm32.c | 2 +- dlls/mshtml/navigate.c | 2 +- dlls/msrle32/msrle32.c | 4 ++-- dlls/ole32/filemoniker.c | 10 +++++----- dlls/shell32/shfldr_unixfs.c | 2 +- dlls/urlmon/tests/uri.c | 2 +- dlls/urlmon/uri.c | 2 +- dlls/winegstreamer/glibthread.c | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 2711ba4..7c14805 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -2096,7 +2096,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This) if (This->dwMoviChunkPos == 0) AVIFILE_ComputeMoviStart(This); - /* written one record to much? */ + /* written one record too much? */ if (This->ckLastRecord.dwFlags & MMIO_DIRTY) { This->dwNextFramePos -= 3 * sizeof(DWORD); if (This->nIdxRecords > 0) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index fdde684..4ef4b5d 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1354,7 +1354,7 @@ static LRESULT customdraw_1(int n, NMCUSTOMDRAW *nm) return 0; } - ok(FALSE, "To many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); + ok(FALSE, "Too many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); return -1; } @@ -1381,7 +1381,7 @@ static LRESULT customdraw_2(int n, NMCUSTOMDRAW *nm) return 0; } - ok(FALSE, "To many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); + ok(FALSE, "Too many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); return 0; } @@ -1411,7 +1411,7 @@ static LRESULT customdraw_3(int n, NMCUSTOMDRAW *nm) return 0; } - ok(FALSE, "To many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); + ok(FALSE, "Too many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); return 0; } @@ -1439,7 +1439,7 @@ static LRESULT customdraw_4(int n, NMCUSTOMDRAW *nm) return 0; } - ok(FALSE, "To many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); + ok(FALSE, "Too many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); return 0; } diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index 8b0885f..5e7bce0 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -510,7 +510,7 @@ static LRESULT GSM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER return ACMERR_NOTPOSSIBLE; } - /* The packing algorythm writes 32 bytes, then 33 bytes, + /* The packing algorithm writes 32 bytes, then 33 bytes, * and it seems to pad to align to 65 bytes always * adding extra data where necessary */ diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index f84af32..3ef255a 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -185,7 +185,7 @@ static nsresult NSAPI nsInputStream_ReadSegments(nsIInputStream *iface, nsres = aWriter(&This->nsIInputStream_iface, aClousure, This->buf, 0, aCount, &written); if(NS_FAILED(nsres)) - TRACE("aWritter failed: %08x\n", nsres); + TRACE("aWriter failed: %08x\n", nsres); else if(written != This->buf_size) FIXME("written %d != buf_size %d\n", written, This->buf_size); diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 668701a..882b5d2 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1486,7 +1486,7 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) computeInternalFrame(pi, lpic->lpbiPrev, lpic->lpPrev); /* swap buffers for current and previous frame */ - /* Don't free and alloc new -- costs to much time and they are of equal size ! */ + /* Don't free and alloc new -- costs too much time and they are of equal size ! */ pTmp = pi->pPrevFrame; pi->pPrevFrame = pi->pCurFrame; pi->pCurFrame = pTmp; @@ -1534,7 +1534,7 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) } { /* swap buffer for current and previous frame */ - /* Don't free and alloc new -- costs to much time and they are of equal size ! */ + /* Don't free and alloc new -- costs too much time and they are of equal size ! */ LPWORD pTmp = pi->pPrevFrame; pi->pPrevFrame = pi->pCurFrame; diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 8905c55..9c542fc 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -939,7 +939,7 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p IBindCtx *pbind; DWORD mkSys; ULONG nb1,nb2,i,sameIdx; - BOOL machimeNameCase=FALSE; + BOOL machineNameCase = FALSE; if (ppmkPrefix==NULL) return E_POINTER; @@ -997,20 +997,20 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p if (sameIdx > 1 && *stringTable1[0]=='\\' && *stringTable2[1]=='\\'){ - machimeNameCase=TRUE; + machineNameCase = TRUE; for(i=2;i<sameIdx;i++) if( (*stringTable1[i]=='\\') && (i+1 < sameIdx) && (*stringTable1[i+1]=='\\') ){ - machimeNameCase=FALSE; + machineNameCase = FALSE; break; } } - if (machimeNameCase && *stringTable1[sameIdx-1]=='\\') + if (machineNameCase && *stringTable1[sameIdx-1]=='\\') sameIdx--; - if (machimeNameCase && (sameIdx<=3) && (nb1 > 3 || nb2 > 3) ) + if (machineNameCase && (sameIdx<=3) && (nb1 > 3 || nb2 > 3) ) ret = MK_E_NOPREFIX; else { diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 362d4e6..8723546 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -388,7 +388,7 @@ static inline BOOL UNIXFS_is_pidl_of_type(LPCITEMIDLIST pIDL, SHCONTF fFilter) { * * RETURNS * Success, TRUE - * Failure, FALSE - Path not existent, too long, insufficient rights, to many symlinks + * Failure, FALSE - Path not existent, too long, insufficient rights, too many symlinks */ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) { diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index ba31583..80d7741 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4595,7 +4595,7 @@ static const invalid_uri invalid_uri_tests[] = { {"*a*b*c*d://not.valid.com",0,FALSE}, /* Not allowed to have invalid % encoded data. */ {"ftp://google.co%XX/",0,FALSE}, - /* To many h16 components. */ + /* Too many h16 components. */ {"http://[1:2:3:4:5:6:7:8:9]",0,FALSE}, /* Not enough room for IPv4 address. */ {"http://[1:2:3:4:5:6:7:192.0.1.0]",0,FALSE}, diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 724d60f..dbdeaff 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1618,7 +1618,7 @@ static BOOL parse_ipv6address(const WCHAR **ptr, parse_data *data, DWORD flags) /* An IPv6 address can have no more than 8 h16 components. */ if(ip.h16_count >= 8) { *ptr = start; - TRACE("(%p %p %x): Not a IPv6 address, to many h16 components.\n", + TRACE("(%p %p %x): Not a IPv6 address, too many h16 components.\n", ptr, data, flags); return FALSE; } diff --git a/dlls/winegstreamer/glibthread.c b/dlls/winegstreamer/glibthread.c index 25eceb8..0d829a0 100644 --- a/dlls/winegstreamer/glibthread.c +++ b/dlls/winegstreamer/glibthread.c @@ -1,7 +1,7 @@ /* GLIB - Library of useful routines for C programming * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * - * Wine Gstramer integration + * Wine GStreamer integration * Copyright 2010 Aric Stewart, CodeWeavers * * gthread.c: solaris thread system implementation

1 0

Alexandre Julliard : explorer: Allow to specify the name of the graphics driver in the /desktop option.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: b23614253029c91cdf1e165bb90edb97ad5783be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23614253029c91cdf1e165bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 09:47:08 2013 +0100 explorer: Allow to specify the name of the graphics driver in the /desktop option. --- programs/explorer/desktop.c | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 35c3168..c3abe6d 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -638,7 +638,7 @@ static BOOL get_default_desktop_size( const WCHAR *name, unsigned int *width, un return found; } -static HMODULE load_graphics_driver( const GUID *guid ) +static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) { static const WCHAR device_keyW[] = { 'S','y','s','t','e','m','\\', @@ -660,15 +660,19 @@ static HMODULE load_graphics_driver( const GUID *guid ) HKEY hkey; char error[80]; - strcpyW( buffer, default_driver ); - - /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ - if (!RegOpenKeyW( HKEY_CURRENT_USER, driversW, &hkey )) + if (!driver) { - DWORD count = sizeof(buffer); - RegQueryValueExW( hkey, graphicsW, 0, NULL, (LPBYTE)buffer, &count ); - RegCloseKey( hkey ); + strcpyW( buffer, default_driver ); + + /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ + if (!RegOpenKeyW( HKEY_CURRENT_USER, driversW, &hkey )) + { + DWORD count = sizeof(buffer); + RegQueryValueExW( hkey, graphicsW, 0, NULL, (LPBYTE)buffer, &count ); + RegCloseKey( hkey ); + } } + else lstrcpynW( buffer, driver, sizeof(buffer)/sizeof(WCHAR) ); name = buffer; while (name) @@ -773,7 +777,7 @@ void manage_desktop( WCHAR *arg ) HWND hwnd, msg_hwnd; HMODULE graphics_driver; unsigned int width, height; - WCHAR *cmdline = NULL; + WCHAR *cmdline = NULL, *driver = NULL; WCHAR *p = arg; const WCHAR *name = NULL; @@ -787,12 +791,16 @@ void manage_desktop( WCHAR *arg ) } /* parse the desktop option */ - /* the option is of the form /desktop=name[,widthxheight] */ + /* the option is of the form /desktop=name[,widthxheight[,driver]] */ if (*arg == '=' || *arg == ',') { arg++; name = arg; - if ((p = strchrW( arg, ',' ))) *p++ = 0; + if ((p = strchrW( arg, ',' ))) + { + *p++ = 0; + if ((driver = strchrW( p, ',' ))) *driver++ = 0; + } if (!p || !parse_size( p, &width, &height )) get_default_desktop_size( name, &width, &height ); } @@ -813,7 +821,7 @@ void manage_desktop( WCHAR *arg ) UuidCreate( &guid ); TRACE( "display guid %s\n", debugstr_guid(&guid) ); - graphics_driver = load_graphics_driver( &guid ); + graphics_driver = load_graphics_driver( driver, &guid ); /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL,

1 0

Alexandre Julliard : gdi32: Remove no longer used default driver name.
by Alexandre Julliard 30 Oct '13

30 Oct '13

Module: wine Branch: master Commit: 3bd1e59cfbf32eefa1493ec1a50d04285670edf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd1e59cfbf32eefa1493ec1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 09:47:22 2013 +0100 gdi32: Remove no longer used default driver name. --- dlls/gdi32/driver.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 99ac146..750ef11 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -59,12 +59,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -#ifdef __APPLE__ -static const char default_driver[] = "mac,x11"; -#else -static const char default_driver[] = "x11"; -#endif - /********************************************************************** * create_driver *

1 0