June 2017 - Wine-Commits - list.winehq.org

Can Taşan : po: Update Turkish translation.
by Alexandre Julliard June 9, 2017

June 9, 2017

Module: wine Branch: master Commit: 1a1850afb8e64d6843a7d09fef9da05070236be5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a1850afb8e64d6843a7d09fe… Author: Can Taşan <betax34(a)hotmail.com> Date: Fri Jun 9 09:25:45 2017 +0200 po: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 83 ++++++++++++++++++++++------------------------------------------ 1 file changed, 28 insertions(+), 55 deletions(-) diff --git a/po/tr.po b/po/tr.po index e2dcbb1..c985c23 100644 --- a/po/tr.po +++ b/po/tr.po @@ -508,7 +508,7 @@ msgstr "Yazıcı" #: comdlg32.rc:228 msgid "&Default Printer" -msgstr "&Öntanımlı Yazıcı" +msgstr "&Varsayılan Yazıcı" #: comdlg32.rc:229 msgid "[none]" @@ -1003,7 +1003,7 @@ msgstr "Bir yazıcı hatası oluştu." #: comdlg32.rc:68 msgid "No default printer defined." -msgstr "Öntanımlı yazıcı tanımlanmamış." +msgstr "Varsayılan yazıcı tanımlanmamış." #: comdlg32.rc:69 msgid "Cannot find the printer." @@ -1163,7 +1163,7 @@ msgstr "Güç tasarruf kipi; " #: comdlg32.rc:77 msgid "Default Printer; " -msgstr "Öntanımlı Yazıcı; " +msgstr "Varsayılan Yazıcı; " #: comdlg32.rc:78 msgid "There are %d documents in the queue" @@ -9691,7 +9691,7 @@ msgstr "" "ECHO ON bir toplu işlem dosyasında tüm komutların çalıştırılmadan önce\n" "uçbirim aygıtında görüntülenmesini sağlar\n" "\n" -"ECHO OFF bir önceki ECHO ON (ECHO öntanımlı olarak kapalıdır)komutunun\n" +"ECHO OFF bir önceki ECHO ON (ECHO varsayılan olarak kapalıdır)komutunun\n" "tersini yapar. ECHO OFF çıktısının görüntülenmesini başına @ işareti\n" "getirerek engelleyebilirsiniz.\n" @@ -9874,7 +9874,7 @@ msgstr "" "$q Eşittir işareti $t Geçerli saat $v cmd sürümü\n" "\n" "Sadece PROMPT komutunu girerseniz komut istemi geçerli dizini (sürücü harfi\n" -"dahil) ve onu izleyen büyüktür (>) işareti içeren öntanımlı değerlere\n" +"dahil) ve onu izleyen büyüktür (>) işareti içeren varsayılan değerlere\n" "dönecektir.\n" "(PROMPT $p$g komutu gibi).\n" "\n" @@ -10208,7 +10208,7 @@ msgstr "" "ASSOC\t\tDosya uzantı ilişkilerini göster veya düzenle\n" "ATTRIB\t\tDOS dosya özelliklerini göster veya değiştir\n" "CALL\t\tToplu işlem dosyası içerisinden bir diğerini çalıştır\n" -"CD (CHDIR)\tGeçerli dizini değiştir\n" +"CD (CHDIR)\tŞimdiki dizini değiştir\n" "CHOICE\t\tSeçilebilir listeden bir tuşa basılmasını bekle\n" "CLS\t\tKonsol ekranını temizle\n" "COPY\t\tDosya kopyala\n" @@ -10233,7 +10233,7 @@ msgstr "" "REN (RENAME)\tDosyayı yeniden adlandır\n" "RD (RMDIR)\tAlt dizini sil\n" "SET\t\tÇevre değişkenlerini düzenle veya göster\n" -"SETLOCAL\tOrtam değişiklikleri yerelleştirmesini bir toply dosyada başlat\n" +"SETLOCAL\tOrtam değişiklikleri yerelleştirmesini bir toplu dosyada başlat\n" "START\t\tİlişkili programda bir program başlat veya bir belge aç\n" "TIME\t\tŞimdiki sistem saatini düzenle veya göster\n" "TITLE\t\tKomut istemi oturumu için pencere başlığını belirle\n" @@ -10265,7 +10265,7 @@ msgstr "%1 uzantısı için dosya ilişkilendirmesi eksik\n" #: cmd.rc:357 msgid "No open command associated with file type '%1'\n" -msgstr "'%1' dosya türü için ilişkilendirilmiş bir aç komutu yok\n" +msgstr "'%1' dosya türü için ilişkilendirilmiş bir açma komutu yok\n" #: cmd.rc:358 msgid "Overwrite %1?" @@ -10527,7 +10527,7 @@ msgstr "DHCP etkin" #: ipconfig.rc:49 msgid "Default gateway" -msgstr "Öntanımlı ağ geçidi" +msgstr "Varsayılan ağ geçidi" #: ipconfig.rc:50 msgid "IPv6 address" @@ -11141,7 +11141,7 @@ msgstr "" #: oleview.rc:180 msgid "Default Interface Viewer" -msgstr "Öntanımlı Arayüz Gösterici" +msgstr "Varsayılan Arayüz Gösterici" #: oleview.rc:183 msgid "Interface" @@ -11774,17 +11774,12 @@ msgid "&About Registry Editor" msgstr "Kayıt Defteri Düzenleyicisi &Hakkında" #: regedit.rc:89 regedit.rc:96 regedit.rc:229 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "genişletilmiş" +msgstr "Genişlet" #: regedit.rc:134 regedit.rc:232 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "İkili Değeri Değiştir..." +msgstr "İkili &Değeri Değiştir..." #: regedit.rc:266 msgid "Export registry" @@ -11883,14 +11878,11 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Sık kullanılan anahtarlara erişmek için komutları içerir" #: regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" -"Kayıt düzenleyici hakkında yardım ve bilgi göstermek için komutları içerir" +"Kayıt Defteri Düzenleyicisi hakkında yardım ve bilgi göstermek için " +"komutları içerir" #: regedit.rc:164 msgid "Contains commands for creating new keys or values" @@ -11902,7 +11894,7 @@ msgstr "Veri" #: regedit.rc:154 msgid "Registry Editor" -msgstr "Kayıt Düzenleyici" +msgstr "Kayıt Defteri Düzenleyicisi" #: regedit.rc:220 msgid "Import Registry File" @@ -12136,16 +12128,12 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: '%1' kayıt sınıfı silinemiyor.\n" #: regedit.rc:430 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: '%1' satırı bilinmiyor.\n" +msgstr "regedit: Satır sözdizimi geçersiz.\n" #: regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" -msgstr "Kayıt düzenleyicisinden çıkar" +msgstr "Kayıt Defteri Düzenleyicisinden çıkar" #: regedit.rc:188 msgid "Adds keys to the favorites list" @@ -12160,8 +12148,6 @@ msgid "Shows or hides the status bar" msgstr "Durum çubuğunu gösterir veya gizler" #: regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" msgstr "İki panel arasındaki ayracın konumunu değiştirir" @@ -12206,10 +12192,8 @@ msgid "Adds a new binary value" msgstr "Yeni bir ikili değer ekler" #: regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Yeni bir ikili değer ekler" +msgstr "Yeni bir 32-bit değer ekler" #: regedit.rc:177 msgid "Imports a text file into the registry" @@ -12224,10 +12208,8 @@ msgid "Prints all or part of the registry" msgstr "Sistem kaydının bir kısmını veya tümünü yazdırır" #: regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Kayıt Düzenleyici" +msgstr "Kayıt Defteri Düzenleyicisi Yardımını açar" #: regedit.rc:182 msgid "Displays program information, version number and copyright" @@ -12270,26 +12252,20 @@ msgid "Unable to query the registry key '%1'." msgstr "'%1' kayıt anahtarı sorgulanamıyor." #: regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Değer verisini değiştirir" +msgstr "Değer verisini ikili biçimde değiştirir" #: regedit.rc:175 msgid "Adds a new multi-string value" msgstr "Yeni bir çoklu dize değeri ekler" #: regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Sistem kaydının seçilen kısmını metin dosyasına aktarır" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Yeni bir dize değeri ekler" +msgstr "Yeni bir genişletilebilir dize değeri ekler" #: regedit.rc:211 msgid "Confirm Key Delete" @@ -12303,11 +12279,8 @@ msgstr "" "istediğinizden emin misiniz?" #: regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "daraltılmış" +msgstr "Daralt" #: regsvr32.rc:32 msgid "" @@ -13744,7 +13717,7 @@ msgstr "devre dışı" #: winecfg.rc:61 msgid "Default Settings" -msgstr "Öntanımlı Ayarlar" +msgstr "Varsayılan Ayarlar" #: winecfg.rc:62 msgid "Wine Programs (*.exe; *.exe.so)" @@ -13787,7 +13760,7 @@ msgstr "" "Daha fazla sürücü ekleyemezsiniz.\n" "\n" "Her sürücünün A-Z aralığında bir harfi olmalıdır. Dolayısıyla 26'dan fazla " -"tanımlayamazsınız." +"sürücü tanımlayamazsınız." #: winecfg.rc:75 msgid "System drive" @@ -14064,7 +14037,7 @@ msgstr "Sadece geçerli oturuma uygula" #: wineconsole.rc:29 msgid "Set &Defaults" -msgstr "&Öntanımlı Ayarlar" +msgstr "&Varsayılan Ayarlar" #: wineconsole.rc:31 msgid "&Mark" @@ -14084,7 +14057,7 @@ msgstr "A&ra" #: wineconsole.rc:39 msgid "Setup - Default settings" -msgstr "Ayarla - Öntanımlı ayarlar" +msgstr "Ayarla - Vatsayılan ayarlar" #: wineconsole.rc:40 msgid "Setup - Current settings" @@ -14200,11 +14173,11 @@ msgstr "" #: winedbg.rc:61 msgid "Show &Details" -msgstr "Detayları &Göster" +msgstr "Ayrıntıları &Göster" #: winedbg.rc:66 msgid "Program Error Details" -msgstr "Program Hata Detayları" +msgstr "Program Hata Ayrıntıları" #: winedbg.rc:73 msgid ""

1 0

Josh DuBois : wineandroid: Implement GetKeyNameText.
by Alexandre Julliard June 9, 2017

June 9, 2017

Module: wine Branch: master Commit: 86534e0dd55d972b35ccecf2e9a2b3f53059d3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86534e0dd55d972b35ccecf2e… Author: Josh DuBois <duboisj(a)codeweavers.com> Date: Fri Jun 9 09:19:42 2017 +0200 wineandroid: Implement GetKeyNameText. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 172 ++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 173 insertions(+) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index b3ac76f..9afb73a 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -522,6 +522,118 @@ static const WORD vkey_to_scancode[] = 0, /* 0xff undefined */ }; +static const struct +{ + DWORD vkey; + const char *name; +} vkey_names[] = { + { VK_ADD, "Num +" }, + { VK_BACK, "Backspace" }, + { VK_CAPITAL, "Caps Lock" }, + { VK_CONTROL, "Ctrl" }, + { VK_DECIMAL, "Num Del" }, + { VK_DELETE | 0x100, "Delete" }, + { VK_DIVIDE | 0x100, "Num /" }, + { VK_DOWN | 0x100, "Down" }, + { VK_END | 0x100, "End" }, + { VK_ESCAPE, "Esc" }, + { VK_F1, "F1" }, + { VK_F2, "F2" }, + { VK_F3, "F3" }, + { VK_F4, "F4" }, + { VK_F5, "F5" }, + { VK_F6, "F6" }, + { VK_F7, "F7" }, + { VK_F8, "F8" }, + { VK_F9, "F9" }, + { VK_F10, "F10" }, + { VK_F11, "F11" }, + { VK_F12, "F12" }, + { VK_F13, "F13" }, + { VK_F14, "F14" }, + { VK_F15, "F15" }, + { VK_F16, "F16" }, + { VK_F17, "F17" }, + { VK_F18, "F18" }, + { VK_F19, "F19" }, + { VK_F20, "F20" }, + { VK_F21, "F21" }, + { VK_F22, "F22" }, + { VK_F23, "F23" }, + { VK_F24, "F24" }, + { VK_HELP | 0x100, "Help" }, + { VK_HOME | 0x100, "Home" }, + { VK_INSERT | 0x100, "Insert" }, + { VK_LCONTROL, "Ctrl" }, + { VK_LEFT | 0x100, "Left" }, + { VK_LMENU, "Alt" }, + { VK_LSHIFT, "Shift" }, + { VK_LWIN | 0x100, "Win" }, + { VK_MENU, "Alt" }, + { VK_MULTIPLY, "Num *" }, + { VK_NEXT | 0x100, "Page Down" }, + { VK_NUMLOCK | 0x100, "Num Lock" }, + { VK_NUMPAD0, "Num 0" }, + { VK_NUMPAD1, "Num 1" }, + { VK_NUMPAD2, "Num 2" }, + { VK_NUMPAD3, "Num 3" }, + { VK_NUMPAD4, "Num 4" }, + { VK_NUMPAD5, "Num 5" }, + { VK_NUMPAD6, "Num 6" }, + { VK_NUMPAD7, "Num 7" }, + { VK_NUMPAD8, "Num 8" }, + { VK_NUMPAD9, "Num 9" }, + { VK_OEM_CLEAR, "Num Clear" }, + { VK_OEM_NEC_EQUAL | 0x100, "Num =" }, + { VK_PRIOR | 0x100, "Page Up" }, + { VK_RCONTROL | 0x100, "Right Ctrl" }, + { VK_RETURN, "Return" }, + { VK_RETURN | 0x100, "Num Enter" }, + { VK_RIGHT | 0x100, "Right" }, + { VK_RMENU | 0x100, "Right Alt" }, + { VK_RSHIFT, "Right Shift" }, + { VK_RWIN | 0x100, "Right Win" }, + { VK_SEPARATOR, "Num ," }, + { VK_SHIFT, "Shift" }, + { VK_SPACE, "Space" }, + { VK_SUBTRACT, "Num -" }, + { VK_TAB, "Tab" }, + { VK_UP | 0x100, "Up" }, + { VK_VOLUME_DOWN | 0x100, "Volume Down" }, + { VK_VOLUME_MUTE | 0x100, "Mute" }, + { VK_VOLUME_UP | 0x100, "Volume Up" }, + { VK_OEM_MINUS, "-" }, + { VK_OEM_PLUS, "=" }, + { VK_OEM_1, ";" }, + { VK_OEM_2, "/" }, + { VK_OEM_3, "`" }, + { VK_OEM_4, "[" }, + { VK_OEM_5, "\\" }, + { VK_OEM_6, "]" }, + { VK_OEM_7, "'" }, + { VK_OEM_COMMA, "," }, + { VK_OEM_PERIOD, "." }, +}; + +static UINT scancode_to_vkey( UINT scan ) +{ + UINT j; + + for (j = 0; j < sizeof(vkey_to_scancode)/sizeof(vkey_to_scancode[0]); j++) + if (vkey_to_scancode[j] == scan) + return j; + return 0; +} + +static const char* vkey_to_name( UINT vkey ) +{ + UINT j; + + for (j = 0; j < sizeof(vkey_names)/sizeof(vkey_names[0]); j++) + if (vkey_names[j].vkey == vkey) + return vkey_names[j].name; + return NULL; +} /*********************************************************************** * keyboard_event @@ -649,3 +761,63 @@ INT CDECL ANDROID_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, TRACE( "returning %d / %s\n", strlenW( buffer ), debugstr_wn(buf, strlenW( buffer ))); return strlenW( buffer ); } + + +/*********************************************************************** + * ANDROID_GetKeyNameText + */ +INT CDECL ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) +{ + int scancode, vkey, len; + const char *name; + char key[2]; + + scancode = (lparam >> 16) & 0x1FF; + vkey = scancode_to_vkey( scancode ); + + if (lparam & (1 << 25)) + { + /* Caller doesn't care about distinctions between left and + right keys. */ + switch (vkey) + { + case VK_LSHIFT: + case VK_RSHIFT: + vkey = VK_SHIFT; break; + case VK_LCONTROL: + case VK_RCONTROL: + vkey = VK_CONTROL; break; + case VK_LMENU: + case VK_RMENU: + vkey = VK_MENU; break; + } + } + + if (scancode & 0x100) vkey |= 0x100; + + if ((vkey >= 0x30 && vkey <= 0x39) || (vkey >= 0x41 && vkey <= 0x5a)) + { + key[0] = vkey; + if (vkey >= 0x41) + key[0] += 0x20; + key[1] = 0; + name = key; + } + else + { + name = vkey_to_name( vkey ); + } + + len = MultiByteToWideChar( CP_UTF8, 0, name, -1, buffer, size ); + if (len) len--; + + if (!len) + { + static const WCHAR format[] = {'K','e','y',' ','0','x','%','0','2','x',0}; + snprintfW( buffer, size, format, vkey ); + len = strlenW( buffer ); + } + + TRACE( "lparam 0x%08x -> %s\n", lparam, debugstr_w( buffer )); + return len; +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 1a74624..4e7815a 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -4,6 +4,7 @@ # USER driver +@ cdecl GetKeyNameText(long ptr long) ANDROID_GetKeyNameText @ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo

1 0

Nikolay Sivov : d3drm: Make it possible to create mesh builder with CreateObject().
by Alexandre Julliard June 9, 2017

June 9, 2017

Module: wine Branch: master Commit: a22e4647462a7b4068f8eb180a44bcaccfbf0a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a22e4647462a7b4068f8eb180… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 9 02:36:49 2017 +0300 d3drm: Make it possible to create mesh builder with CreateObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 40 ++++++++++++++++++++++++++--- dlls/d3drm/d3drm_private.h | 29 ++++++++++++++++++++- dlls/d3drm/meshbuilder.c | 63 +++++++++++++++++----------------------------- dlls/d3drm/tests/d3drm.c | 21 +++++++++++++--- 4 files changed, 106 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a22e4647462a7b4068f8e…

1 0

Hans Leidekker : wineandroid: Implement GetKeyboardLayout.
by Alexandre Julliard June 9, 2017

June 9, 2017

Module: wine Branch: master Commit: e545a85351ad72f9c6c7f9abdfdfebe621b1509b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e545a85351ad72f9c6c7f9abd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 9 09:20:49 2017 +0200 wineandroid: Implement GetKeyboardLayout. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 19 +++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 20 insertions(+) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index fb70445..81af8e3 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -885,3 +885,22 @@ UINT CDECL ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) TRACE_(key)( "returning 0x%04x\n", ret ); return ret; } + + +/*********************************************************************** + * ANDROID_GetKeyboardLayout + */ +HKL CDECL ANDROID_GetKeyboardLayout( DWORD thread_id ) +{ + ULONG_PTR layout = GetUserDefaultLCID(); + LANGID langid; + + langid = PRIMARYLANGID(LANGIDFROMLCID( layout )); + if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) + layout = MAKELONG( layout, 0xe001 ); /* IME */ + else + layout |= layout << 16; + + FIXME( "returning %lx\n", layout ); + return (HKL)layout; +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 89ec528..bd42cb1 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -5,6 +5,7 @@ # USER driver @ cdecl GetKeyNameText(long ptr long) ANDROID_GetKeyNameText +@ cdecl GetKeyboardLayout(long) ANDROID_GetKeyboardLayout @ cdecl MapVirtualKeyEx(long long long) ANDROID_MapVirtualKeyEx @ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors

1 0

Zebediah Figura : msacm32: Check correct variable.
by Alexandre Julliard June 9, 2017

June 9, 2017

Module: wine Branch: master Commit: 7493364b4bffa3563b4f36124b12a29bc59f4e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7493364b4bffa3563b4f36124… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 8 17:57:12 2017 -0500 msacm32: Check correct variable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index f3c5155..e7eab56 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -424,7 +424,7 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD if (pafd->fdwSupport) return MMSYSERR_INVALPARAM; - if (pafd->pwfx->wFormatTag == WAVE_FORMAT_UNKNOWN) + if (pafd->dwFormatTag == WAVE_FORMAT_UNKNOWN) return MMSYSERR_INVALPARAM; switch (fdwDetails) {

1 0

Hugh McMaster : regedit/tests: Remove an un-needed tab character from a key in the key deletion tests.
by Alexandre Julliard June 9, 2017

June 9, 2017

Module: wine Branch: master Commit: 8096e2379883ad5f2caf2fdf3cd2088c76f863db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8096e2379883ad5f2caf2fdf3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 9 00:38:04 2017 +0000 regedit/tests: Remove an un-needed tab character from a key in the key deletion tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 550c22b..b2e65a8 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1197,7 +1197,7 @@ static void test_key_creation_and_deletion(void) verify_key_exist(hkey, "Subkey2a"); exec_import_str("REGEDIT4\n\n" - "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b\t]\n"); + "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n"); verify_key_exist(hkey, "Subkey2b"); exec_import_str("REGEDIT4\n\n"

1 0

Nikolay Sivov : shell32: Use IS_INTRESOURCE() to test context menu verb kind.
by Alexandre Julliard June 9, 2017

June 9, 2017

Module: wine Branch: master Commit: 8499ace1ffbd3ffc795fb52047cceae6290e78d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8499ace1ffbd3ffc795fb5204… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 9 02:36:16 2017 +0300 shell32: Use IS_INTRESOURCE() to test context menu verb kind. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlmenu.c | 25 ++++++++++++++----------- dlls/shell32/shlview_cmenu.c | 6 +++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 7a960ad..39ab4c6 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -1114,25 +1114,28 @@ static HRESULT WINAPI CompositeCMenu_GetCommandString(IContextMenu3* iface, UINT static HRESULT WINAPI CompositeCMenu_InvokeCommand(IContextMenu3* iface,LPCMINVOKECOMMANDINFO pici) { CompositeCMenu *This = impl_from_IContextMenu3(iface); - TRACE("(%p)->(%p)\n",iface,pici); - if(HIWORD(pici->lpVerb)) + + TRACE("(%p)->(%p)\n", iface, pici); + + if (IS_INTRESOURCE(pici->lpVerb)) + { + UINT id = (UINT_PTR)pici->lpVerb; + UINT index = CompositeCMenu_GetIndexForCommandId(This, id); + return IContextMenu_InvokeCommand(This->menus[index], pici); + } + else { /*call each handler until one of them succeeds*/ - UINT i=0; - for(;i<This->menu_count;i++) + UINT i; + + for (i = 0; i < This->menu_count; i++) { HRESULT hres; - if(SUCCEEDED(hres=IContextMenu_InvokeCommand(This->menus[i],pici))) + if (SUCCEEDED(hres = IContextMenu_InvokeCommand(This->menus[i], pici))) return hres; } return E_FAIL; } - else - { - UINT id = (UINT_PTR)pici->lpVerb; - UINT index = CompositeCMenu_GetIndexForCommandId(This,id); - return IContextMenu_InvokeCommand(This->menus[index],pici); - } } static HRESULT WINAPI CompositeCMenu_QueryContextMenu(IContextMenu3 *iface, HMENU hmenu,UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 099f5bc..5c5ba1b 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -397,13 +397,13 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd); - if( HIWORD(lpcmi->lpVerb)==0 && LOWORD(lpcmi->lpVerb) > FCIDM_SHVIEWLAST) + if (IS_INTRESOURCE(lpcmi->lpVerb) && LOWORD(lpcmi->lpVerb) > FCIDM_SHVIEWLAST) { - TRACE("Invalid Verb %x\n",LOWORD(lpcmi->lpVerb)); + TRACE("Invalid Verb %x\n", LOWORD(lpcmi->lpVerb)); return E_INVALIDARG; } - if (HIWORD(lpcmi->lpVerb) == 0) + if (IS_INTRESOURCE(lpcmi->lpVerb)) { switch(LOWORD(lpcmi->lpVerb)) {

1 0

Hugh McMaster : reg/tests: Remove un-needed tab characters from some keys in the key deletion tests.
by Alexandre Julliard June 9, 2017

June 9, 2017

Module: wine Branch: master Commit: 8834968d02f9b7c30264623dc4835f17fe934315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8834968d02f9b7c30264623dc… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 9 00:37:56 2017 +0000 reg/tests: Remove un-needed tab characters from some keys in the key deletion tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 58e003a..cc8dc10 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1676,7 +1676,7 @@ static void test_import(void) todo_wine verify_key_exist(hkey, "Subkey2a"); test_import_str("REGEDIT4\n\n" - "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b\t]\n", &r); + "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_key_exist(hkey, "Subkey2b"); @@ -2564,7 +2564,7 @@ static void test_import(void) todo_wine verify_key_exist(hkey, "Subkey2a"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" - "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b\t]\n", &r); + "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_key_exist(hkey, "Subkey2b");

1 0

Andrey Gusev : shell32: Add IApplicationDestinations stub.
by Alexandre Julliard June 8, 2017

June 8, 2017

Module: wine Branch: master Commit: 8ea9c3382961fa28a84a60e56be22cbfa3571c70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea9c3382961fa28a84a60e56… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jun 7 16:20:33 2017 +0300 shell32: Add IApplicationDestinations stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_classes.idl | 6 ++ dlls/shell32/shell32_main.h | 2 + dlls/shell32/shellole.c | 1 + dlls/shell32/shellpath.c | 119 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 128 insertions(+) diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index cc57b2b..6ed497f 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -69,6 +69,12 @@ coclass KnownFolderManager { interface IKnownFolderManager; } ] coclass ApplicationAssociationRegistration { interface IApplicationAssociationRegistration; } [ + helpstring("Application Destination List"), + threading(apartment), + uuid(86c14003-4d6b-4ef3-a7b4-0506663b2e68) +] coclass ApplicationDestinations { interface IApplicationDestinations; } + +[ helpstring("Shell Drag and Drop Helper"), threading(apartment), uuid(4657278a-411b-11d2-839a-00c04fd918d0) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index fc2a5ba..368c0e0 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -109,6 +109,8 @@ HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIco HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT WINAPI ApplicationAssociationRegistration_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI ApplicationDestinations_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; + HRESULT IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, IUnknown **ppv) DECLSPEC_HIDDEN; LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index d3d972b..7b6ee92 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -67,6 +67,7 @@ static const struct { } InterfaceTable[] = { {&CLSID_ApplicationAssociationRegistration, ApplicationAssociationRegistration_Constructor}, + {&CLSID_ApplicationDestinations, ApplicationDestinations_Constructor}, {&CLSID_AutoComplete, IAutoComplete_Constructor}, {&CLSID_ControlPanel, IControlPanel_Constructor}, {&CLSID_DragDropHelper, IDropTargetHelper_Constructor}, diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 8569b53..d2ebc66 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1021,6 +1021,125 @@ typedef enum _CSIDL_Type { typedef struct { + IApplicationDestinations IApplicationDestinations_iface; + LONG ref; +} IApplicationDestinationsImpl; + +static inline IApplicationDestinationsImpl *impl_from_IApplicationDestinations( IApplicationDestinations *iface ) +{ + return CONTAINING_RECORD(iface, IApplicationDestinationsImpl, IApplicationDestinations_iface); +} + +static HRESULT WINAPI ApplicationDestinations_QueryInterface(IApplicationDestinations *iface, REFIID riid, + LPVOID *ppv) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppv); + + if (ppv == NULL) + return E_POINTER; + + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IApplicationDestinations, riid)) + { + *ppv = &This->IApplicationDestinations_iface; + IUnknown_AddRef((IUnknown*)*ppv); + + TRACE("Returning IApplicationDestinations: %p\n", *ppv); + return S_OK; + } + + *ppv = NULL; + FIXME("(%p)->(%s, %p) interface not supported.\n", This, debugstr_guid(riid), ppv); + + return E_NOINTERFACE; +} + +static ULONG WINAPI ApplicationDestinations_AddRef(IApplicationDestinations *iface) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", This, ref); + + return ref; +} + +static ULONG WINAPI ApplicationDestinations_Release(IApplicationDestinations *iface) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", This, ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI ApplicationDestinations_SetAppID(IApplicationDestinations *iface, const WCHAR *appid) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + + FIXME("(%p, %s) stub!\n", This, debugstr_w(appid)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationDestinations_RemoveDestination(IApplicationDestinations *iface, IUnknown *punk) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + + FIXME("(%p, %p) stub!\n", This, punk); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationDestinations_RemoveAllDestinations(IApplicationDestinations *iface) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + + FIXME("(%p) stub!\n", This); + + return E_NOTIMPL; +} + +static const IApplicationDestinationsVtbl ApplicationDestinationsVtbl = +{ + ApplicationDestinations_QueryInterface, + ApplicationDestinations_AddRef, + ApplicationDestinations_Release, + ApplicationDestinations_SetAppID, + ApplicationDestinations_RemoveDestination, + ApplicationDestinations_RemoveAllDestinations +}; + +HRESULT WINAPI ApplicationDestinations_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) +{ + IApplicationDestinationsImpl *This; + HRESULT hr; + + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(riid), ppv); + + if (outer) + return CLASS_E_NOAGGREGATION; + + if (!(This = SHAlloc(sizeof(*This)))) + return E_OUTOFMEMORY; + + This->IApplicationDestinations_iface.lpVtbl = &ApplicationDestinationsVtbl; + This->ref = 0; + + hr = IUnknown_QueryInterface(&This->IApplicationDestinations_iface, riid, ppv); + if (FAILED(hr)) + SHFree(This); + + return hr; +} + +typedef struct +{ const KNOWNFOLDERID *id; CSIDL_Type type; LPCWSTR szValueName;

1 0

Hugh McMaster : reg/tests: Add tests for deleting registry values during the import operation.
by Alexandre Julliard June 8, 2017

June 8, 2017

Module: wine Branch: master Commit: 80d248c5f989f9ce3319ffbab4ac8d2d1e016fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d248c5f989f9ce3319ffbab… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 8 09:04:12 2017 +0000 reg/tests: Add tests for deleting registry values during the import operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 4dd8817..58e003a 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1687,6 +1687,40 @@ static void test_import(void) todo_wine verify_key_nonexist(hkey, "Subkey2a"); todo_wine verify_key_nonexist(hkey, "Subkey2b"); + /* Test value deletion. We start by creating some registry values. */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=\"Test Value\"\n" + "\"Wine46b\"=dword:00000008\n" + "\"Wine46c\"=hex:11,22,33,44\n" + "\"Wine46d\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine46e\"=hex(2):25,50,41,54,48,25,00\n" + "\"Wine46f\"=hex(0):56,00,61,00,6c,00,75,00,65,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine46a", REG_SZ, "Test Value", 11, 0); + todo_wine verify_reg(hkey, "Wine46b", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine46c", REG_BINARY, hex, 4, 0); + todo_wine verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "Wine46e", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=-\n" + "\"Wine46b\"= -\n" + "\"Wine46c\"= \t-\t \n" + "\"Wine46d\"=-\"Test\"\n" + "\"Wine46e\"=- ;comment\n" + "\"Wine46f\"=- #comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine46a"); + todo_wine verify_reg_nonexist(hkey, "Wine46b"); + todo_wine verify_reg_nonexist(hkey, "Wine46c"); + todo_wine verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg_nonexist(hkey, "Wine46e"); + todo_wine verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2541,6 +2575,41 @@ static void test_import(void) todo_wine verify_key_nonexist(hkey, "Subkey2a"); todo_wine verify_key_nonexist(hkey, "Subkey2b"); + /* Test value deletion. We start by creating some registry values. */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=\"Test Value\"\n" + "\"Wine46b\"=dword:00000008\n" + "\"Wine46c\"=hex:11,22,33,44\n" + "\"Wine46d\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine46e\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine46f\"=hex(0):56,00,61,00,6c,00,75,00,65,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine46a", REG_SZ, "Test Value", 11, 0); + todo_wine verify_reg(hkey, "Wine46b", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine46c", REG_BINARY, hex, 4, 0); + todo_wine verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "Wine46e", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=-\n" + "\"Wine46b\"= -\n" + "\"Wine46c\"= \t-\t \n" + "\"Wine46d\"=-\"Test\"\n" + "\"Wine46e\"=- ;comment\n" + "\"Wine46f\"=- #comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine46a"); + todo_wine verify_reg_nonexist(hkey, "Wine46b"); + todo_wine verify_reg_nonexist(hkey, "Wine46c"); + todo_wine verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg_nonexist(hkey, "Wine46e"); + todo_wine verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0