December 2011 - Wine-Commits

Alexandre Julliard : Wine release 1.3.36
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: website Branch: master Commit: d2a0af9dfe2a60efac46ab48cb45494504562d17 URL: http://source.winehq.org/git/website.git/?a=commit;h=d2a0af9dfe2a60efac46ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 30 19:54:52 2011 +0100 Wine release 1.3.36 --- news/en/2011123001.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2011123001.xml b/news/en/2011123001.xml new file mode 100644 index 0000000..5ceace6 --- /dev/null +++ b/news/en/2011123001.xml @@ -0,0 +1,18 @@ +<news> +<date>December 30, 2011</date> +<title>Wine 1.3.36 Released</title> +<body> + The Wine development release 1.3.36 is now available. + <a href="{$root}/announce/1.3.36">What's new</a> in this release: +<ul> + <li>UDisks backend for the dynamic device support.</li> + <li>Polygons and geometric pens implemented in the DIB engine.</li> + <li>JScript now compiles entire functions.</li> + <li>Improved support for vertical fonts.</li> + <li>A few more scripts in UniScribe.</li> + <li>A bunch of ctype functions implemented in MSVCP.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.36.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: master Commit: 2b9d2d1072e4d2e6b9eec3c1609967cc75d177de URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9d2d1072e4d2e6b9eec3c16… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Dec 2 19:06:48 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 42 +++++++++++++++--------------------------- 1 files changed, 15 insertions(+), 27 deletions(-) diff --git a/po/lt.po b/po/lt.po index a116a03..6345f02 100644 --- a/po/lt.po +++ b/po/lt.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: 2011-12-29 20:49+0300\n" +"PO-Revision-Date: 2011-12-30 19:55+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -3527,11 +3527,11 @@ msgstr "Nebaigta eilutės konstanta" #: jscript.rc:38 msgid "Can't have 'break' outside of loop" -msgstr "" +msgstr "Negalima turėti „break“ ne cikle" #: jscript.rc:39 msgid "Can't have 'continue' outside of loop" -msgstr "" +msgstr "Negalima turėti „continue“ ne cikle" #: jscript.rc:40 msgid "Conditional compilation is turned off" @@ -12493,9 +12493,8 @@ msgstr "" "(Jūsų pasirinkimu) bet kurios vėlesnės licencijos versijos sąlygomis." #: winecfg.rc:140 -#, fuzzy msgid "Windows registration information" -msgstr " Windows registracijos informacija " +msgstr "Windows registracijos informacija" #: winecfg.rc:141 msgid "&Owner:" @@ -12506,9 +12505,8 @@ msgid "Organi&zation:" msgstr "Organizacija:" #: winecfg.rc:151 -#, fuzzy msgid "Application settings" -msgstr " Programos nuostatos " +msgstr "Programų nuostatos" #: winecfg.rc:152 msgid "" @@ -12534,9 +12532,8 @@ msgid "&Windows Version:" msgstr "Windows &versija:" #: winecfg.rc:166 -#, fuzzy msgid "Window settings" -msgstr " Langų nuostatos " +msgstr "Langų nuostatos" #: winecfg.rc:167 msgid "Automatically capture the &mouse in full-screen windows" @@ -12559,9 +12556,8 @@ msgid "Desktop &size:" msgstr "Darbalaukio d&ydis:" #: winecfg.rc:177 -#, fuzzy msgid "Direct3D" -msgstr " Direct3D " +msgstr "Direct3D" #: winecfg.rc:178 msgid "&Vertex Shader Support: " @@ -12572,18 +12568,16 @@ msgid "Allow &Pixel Shader (if supported by hardware)" msgstr "Leisti &Pixel Shader (jei palaiko aparatinė įranga)" #: winecfg.rc:182 -#, fuzzy msgid "Screen resolution" -msgstr " Ekrano &skiriamoji geba " +msgstr "Ekrano skiriamoji geba" #: winecfg.rc:186 msgid "This is a sample text using 10 point Tahoma" msgstr "Tai yra pavyzdinis tekstas naudojantis 10 taškų Tahoma" #: winecfg.rc:193 -#, fuzzy msgid "DLL overrides" -msgstr " DLL nustelbimai " +msgstr "DLL nustelbimai" #: winecfg.rc:194 msgid "" @@ -12615,9 +12609,8 @@ msgid "Edit Override" msgstr "Redaguoti nustelbimą" #: winecfg.rc:210 -#, fuzzy msgid "Load order" -msgstr " Įkėlimo tvarka " +msgstr "Įkėlimo tvarka" #: winecfg.rc:211 msgid "&Builtin (Wine)" @@ -12644,9 +12637,8 @@ msgid "Select Drive Letter" msgstr "Parinkite disko raidę" #: winecfg.rc:234 -#, fuzzy msgid "Drive mappings" -msgstr " Diskų atvai&zdavimas " +msgstr "Diskų atvaizdavimas" #: winecfg.rc:235 msgid "" @@ -12693,14 +12685,12 @@ msgid "Show &dot files" msgstr "Rodyti &failus su tašku" #: winecfg.rc:267 -#, fuzzy msgid "Driver diagnostics" -msgstr " Tvarkyklės diagnostika " +msgstr "Tvarkyklės diagnostika" #: winecfg.rc:269 -#, fuzzy msgid "Defaults" -msgstr " Numatytosios reikšmės " +msgstr "Numatytosios reikšmės" #: winecfg.rc:270 msgid "Output device:" @@ -12723,9 +12713,8 @@ msgid "&Test Sound" msgstr "&Testuoti garsą" #: winecfg.rc:285 -#, fuzzy msgid "Appearance" -msgstr " Išvaizda " +msgstr "Išvaizda" #: winecfg.rc:286 msgid "&Theme:" @@ -12744,9 +12733,8 @@ msgid "C&olor:" msgstr "S&palva:" #: winecfg.rc:301 -#, fuzzy msgid "Folders" -msgstr "Aplankas" +msgstr "Aplankai" #: winecfg.rc:304 msgid "&Link to:"

1 0

Alexandre Julliard : Release 1.3.36.
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: master Commit: a38a496a7c9aeecb81d577053f1c74213d4d3b99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a38a496a7c9aeecb81d577053… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 30 19:44:02 2011 +0100 Release 1.3.36. --- ANNOUNCE | 996 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 474 insertions(+), 542 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a38a496a7c9aeecb81d57…

1 0

Tag wine-1.3.36 : Alexandre Julliard : Release 1.3.36
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: refs/tags/wine-1.3.36 Tag: d99b19ed91880367cb6725169be678bdcdbdf6cc URL: http://source.winehq.org/git/wine.git/?a=tag;h=d99b19ed91880367cb6725169be6… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 30 19:44:03 2011 +0100 Release 1.3.36

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: master Commit: 6247f8fac71e1266d4d20db86dbfd9589863d981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6247f8fac71e1266d4d20db86… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Dec 29 21:51:56 2011 +0100 po: Update Italian translation. --- po/it.po | 32 +++++++++----------------------- 1 files changed, 9 insertions(+), 23 deletions(-) diff --git a/po/it.po b/po/it.po index f2e0b55..082cf7d 100644 --- a/po/it.po +++ b/po/it.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: 2011-12-21 22:04+0100\n" +"PO-Revision-Date: 2011-12-29 21:50+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -2128,9 +2128,8 @@ msgid "Certification Path" msgstr "Percorso di certificazione" #: cryptui.rc:211 -#, fuzzy msgid "Certification path" -msgstr "&Percorso di certificazione" +msgstr "Percorso di certificazione" #: cryptui.rc:214 msgid "&View Certificate" @@ -3340,9 +3339,8 @@ msgid "Asking for %s" msgstr "Richiedendo %s" #: inetcpl.rc:46 -#, fuzzy msgid "Home page" -msgstr " Pagina iniziale " +msgstr "Pagina iniziale" #: inetcpl.rc:47 msgid "You can choose the address that will be used as your home page." @@ -3361,9 +3359,8 @@ msgid "&Blank page" msgstr "Pagina &vuota" #: inetcpl.rc:53 -#, fuzzy msgid "Browsing history" -msgstr " Nella cronologia " +msgstr "Nella cronologia" #: inetcpl.rc:54 msgid "You can delete cached pages, cookies and other data." @@ -10420,9 +10417,8 @@ msgid "&Footer:" msgstr "&Note a piè di pagina:" #: notepad.rc:112 -#, fuzzy msgid "Margins (millimeters)" -msgstr "&Margini (millimetri):" +msgstr "Margini (millimetri)" #: notepad.rc:113 msgid "&Left:" @@ -11812,33 +11808,28 @@ msgid "&Show processes from all users" msgstr "&Mostra i processi di tutti gli utenti" #: taskmgr.rc:376 -#, fuzzy msgid "CPU usage" msgstr "Uso della CPU" #: taskmgr.rc:377 -#, fuzzy msgid "MEM usage" -msgstr "Uso della MEM" +msgstr "Uso della memoria" #: taskmgr.rc:378 msgid "Totals" msgstr "Totali" #: taskmgr.rc:379 -#, fuzzy msgid "Commit charge (K)" -msgstr "Carico di lavore (K)" +msgstr "Carico di lavoro (K)" #: taskmgr.rc:380 -#, fuzzy msgid "Physical memory (K)" msgstr "Memoria fisica (K)" #: taskmgr.rc:381 -#, fuzzy msgid "Kernel memory (K)" -msgstr "Memoria del Kernel (K)" +msgstr "Memoria del kernel (K)" #: taskmgr.rc:382 taskmgr.rc:290 msgid "Handles" @@ -11877,12 +11868,10 @@ msgid "Nonpaged" msgstr "Non paginata" #: taskmgr.rc:418 -#, fuzzy msgid "CPU usage history" msgstr "Grafico di uso della CPU" #: taskmgr.rc:419 -#, fuzzy msgid "Memory usage history" msgstr "Grafico di uso della memoria" @@ -13519,7 +13508,6 @@ msgid "By File Type" msgstr "Per tipo di file" #: winefile.rc:146 -#, fuzzy msgid "File type" msgstr "Tipo di file" @@ -13580,9 +13568,8 @@ msgid "&Compressed" msgstr "Co&mpresso" #: winefile.rc:184 -#, fuzzy msgid "Version information" -msgstr "&Informazioni sulla versione" +msgstr "Informazioni sulla versione" #: winefile.rc:93 msgid "Applying font settings" @@ -13688,7 +13675,6 @@ msgid "Fastest Times" msgstr "Tempi migliori" #: winemine.rc:58 -#, fuzzy msgid "Fastest times" msgstr "Tempi migliori"

1 0

Aurimas Fišeras : winecfg: Increase the size of the dpi label to fit Lithuanian translation.
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: master Commit: 2e66c614b3555c9d092c8d1330fbb58bdc3350f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e66c614b3555c9d092c8d133… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Dec 30 20:03:23 2011 +0200 winecfg: Increase the size of the dpi label to fit Lithuanian translation. --- programs/winecfg/winecfg.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 99c25ce..21ea23c 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -180,9 +180,9 @@ BEGIN CONTROL "Allow &Pixel Shader (if supported by hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,126,230,10 GROUPBOX "Screen resolution",IDC_STATIC,8,151,244,63 - CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,161,187,15 - EDITTEXT IDC_RES_DPIEDIT,204,161,23,13,ES_NUMBER|WS_TABSTOP - LTEXT "#msgctxt#unit: dots/inch#dpi",IDC_STATIC,233,163,12,8 + CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,161,171,15 + EDITTEXT IDC_RES_DPIEDIT,188,161,23,13,ES_NUMBER|WS_TABSTOP + LTEXT "#msgctxt#unit: dots/inch#dpi",IDC_STATIC,215,163,30,8 LTEXT "This is a sample text using 10 point Tahoma",IDC_RES_FONT_PREVIEW,15,180,230,28 END

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: master Commit: 84422ad196b729f0df47c033e37d1dbb53ab1ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84422ad196b729f0df47c033e… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Thu Dec 29 20:41:36 2011 +0100 po: Update Polish translation. --- po/pl.po | 64 ++++++++++++++++++++----------------------------------------- 1 files changed, 21 insertions(+), 43 deletions(-) diff --git a/po/pl.po b/po/pl.po index fb4d179..caea0e9 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,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: 2011-12-08 18:14+0100\n" +"PO-Revision-Date: 2011-12-29 20:15+0100\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: Polish\n" @@ -2131,9 +2131,8 @@ msgid "Certification Path" msgstr "Ścieżka certyfikacji" #: cryptui.rc:211 -#, fuzzy msgid "Certification path" -msgstr "Ścieżka &certyfikacji" +msgstr "Ścieżka certyfikacji" #: cryptui.rc:214 msgid "&View Certificate" @@ -2694,7 +2693,7 @@ msgstr "Plik" #: cryptui.rc:89 inetcpl.rc:105 msgid "Content" -msgstr "Zawartość" +msgstr "Treść" #: cryptui.rc:91 msgid "Certificate Revocation List" @@ -3326,29 +3325,24 @@ msgid "Address" msgstr "Adres" #: ieframe.rc:78 -#, fuzzy msgid "Searching for %s" -msgstr "Ustawienia dla %s" +msgstr "Szukanie %s" #: ieframe.rc:79 -#, fuzzy msgid "Start downloading %s" -msgstr "Pobieranie od %s..." +msgstr "Rozpocznij pobieranie %s..." #: ieframe.rc:80 -#, fuzzy msgid "Downloading %s" -msgstr "Pobieranie..." +msgstr "Pobieranie %s" #: ieframe.rc:81 -#, fuzzy msgid "Asking for %s" -msgstr "Ustawienia dla %s" +msgstr "Pytanie o %s" #: inetcpl.rc:46 -#, fuzzy msgid "Home page" -msgstr " Strona domowa " +msgstr "Strona domowa" #: inetcpl.rc:47 msgid "You can choose the address that will be used as your home page." @@ -3367,9 +3361,8 @@ msgid "&Blank page" msgstr "Użyj pu&stej" #: inetcpl.rc:53 -#, fuzzy msgid "Browsing history" -msgstr " Historia przeglądania " +msgstr "Historia przeglądania " #: inetcpl.rc:54 msgid "You can delete cached pages, cookies and other data." @@ -3505,9 +3498,8 @@ msgid "Subscript out of range" msgstr "Indeks dolny poza zakresem" #: jscript.rc:28 -#, fuzzy msgid "Object required" -msgstr "Oczekiwany obiekt" +msgstr "Wymagany obiekt" #: jscript.rc:29 msgid "Automation server can't create object" @@ -6835,9 +6827,8 @@ msgid "&Data Rate" msgstr "&Strumień" #: msvfw32.rc:52 -#, fuzzy msgid "kB/s" -msgstr "kB/sek" +msgstr "kB/s" #: msvfw32.rc:25 msgid "Full Frames (Uncompressed)" @@ -10051,13 +10042,11 @@ msgid "Parameter error\n" msgstr "Błąd parametru\n" #: cmd.rc:318 -#, fuzzy msgid "" "Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" -"Wolumenem w napędzie %1!c! jest %2\n" -"Numer seryjny wolumenu: %3!04x!-%4!04x!\n" +"Numer seryny wolumenu to %1!04x!-%2!04x!\n" "\n" #: cmd.rc:319 @@ -10090,11 +10079,11 @@ msgstr "Wpisany tekst jest zbyt długi.\n" #: cmd.rc:326 msgid "Volume in drive %1!c! is %2\n" -msgstr "" +msgstr "Wolumen w napędzie %1!c! to %2\n" #: cmd.rc:327 msgid "Volume in drive %1!c! has no label.\n" -msgstr "" +msgstr "Wolumen w napędzie %1!c! nie ma etykiety.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -10413,9 +10402,8 @@ msgid "&Footer:" msgstr "&Stopka:" #: notepad.rc:112 -#, fuzzy msgid "Margins (millimeters)" -msgstr "&Marginesy:" +msgstr "Marginesy (milimetry)" #: notepad.rc:113 msgid "&Left:" @@ -11799,12 +11787,10 @@ msgid "&Show processes from all users" msgstr "&Pokazuj procesy wszystkich użytkowników" #: taskmgr.rc:376 -#, fuzzy msgid "CPU usage" msgstr "Użycie procesora" #: taskmgr.rc:377 -#, fuzzy msgid "MEM usage" msgstr "Użycie pamięci" @@ -11813,19 +11799,16 @@ msgid "Totals" msgstr "Sumy" #: taskmgr.rc:379 -#, fuzzy msgid "Commit charge (K)" -msgstr "Pamięć zadeklarowana (KB)" +msgstr "Pamięć zadeklarowana (K)" #: taskmgr.rc:380 -#, fuzzy msgid "Physical memory (K)" msgstr "Pamięć fizyczna (KB)" #: taskmgr.rc:381 -#, fuzzy msgid "Kernel memory (K)" -msgstr "Pamięć jądra (KB)" +msgstr "Pamięć jądra (K)" #: taskmgr.rc:382 taskmgr.rc:290 msgid "Handles" @@ -11864,12 +11847,10 @@ msgid "Nonpaged" msgstr "Niestronicowana" #: taskmgr.rc:418 -#, fuzzy msgid "CPU usage history" msgstr "Historia użycia procesora" #: taskmgr.rc:419 -#, fuzzy msgid "Memory usage history" msgstr "Historia użycia pamięci" @@ -12615,7 +12596,7 @@ msgstr " Direct3D " #: winecfg.rc:178 msgid "&Vertex Shader Support: " -msgstr "Obsługa Vertex Shader: " +msgstr "Obsługa cieniowania &wierzchołków: " #: winecfg.rc:180 msgid "Allow &Pixel Shader (if supported by hardware)" @@ -13495,9 +13476,8 @@ msgid "By File Type" msgstr "Według typu pliku" #: winefile.rc:146 -#, fuzzy msgid "File type" -msgstr "Wyświetl pliki typu" +msgstr "Typ pliku" #: winefile.rc:147 msgid "&Directories" @@ -13556,9 +13536,8 @@ msgid "&Compressed" msgstr "S&kompresowany" #: winefile.rc:184 -#, fuzzy msgid "Version information" -msgstr "We&rsja" +msgstr "Informacja o wersji" #: winefile.rc:93 msgid "Applying font settings" @@ -13664,9 +13643,8 @@ msgid "Fastest Times" msgstr "Najlepsze Wyniki" #: winemine.rc:58 -#, fuzzy msgid "Fastest times" -msgstr "Najlepsze Wyniki" +msgstr "Najlepsze wyniki" #: winemine.rc:59 msgid "Beginner"

1 0

Stefan Leichter : setupapi: Add stub for SetupDiDrawMiniIcon.
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: master Commit: 8fc7a01a2c4f023672f34d907be607d6e5948f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc7a01a2c4f023672f34d907… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Dec 29 22:54:10 2011 +0100 setupapi: Add stub for SetupDiDrawMiniIcon. --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 0295532..25639f5 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -304,7 +304,7 @@ @ stdcall SetupDiDestroyClassImageList(ptr) @ stdcall SetupDiDestroyDeviceInfoList(long) @ stub SetupDiDestroyDriverInfoList -@ stub SetupDiDrawMiniIcon +@ stdcall SetupDiDrawMiniIcon(ptr int128 long long) @ stdcall SetupDiEnumDeviceInfo(long long ptr) @ stdcall SetupDiEnumDeviceInterfaces(long ptr ptr long ptr) @ stub SetupDiEnumDriverInfoA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 8a7820e..f53b3ad 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -437,6 +437,17 @@ BOOL WINAPI SetupDiDeleteDeviceInfo(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA Dev } /*********************************************************************** + * SetupDiDrawMiniIcon (SETUPAPI.@) + */ +INT WINAPI SetupDiDrawMiniIcon(HDC hdc, RECT rc, INT MiniIconIndex, DWORD Flags) +{ + FIXME("(%p, %s, %d, %x) stub\n", hdc, wine_dbgstr_rect(&rc), MiniIconIndex, Flags); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/*********************************************************************** * SetupDiGetClassBitmapIndex (SETUPAPI.@) */ BOOL WINAPI SetupDiGetClassBitmapIndex(const GUID *ClassGuid, PINT MiniIconIndex)

1 0

Nikolay Sivov : wshom.ocx: Fix IWshShell3 definition.
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: master Commit: bf0e3a58517147d8711a1a757fe4dcd2d40a068c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf0e3a58517147d8711a1a757… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 30 13:40:13 2011 +0300 wshom.ocx: Fix IWshShell3 definition. --- dlls/wshom.ocx/shell.c | 72 +++++++++++++++++- dlls/wshom.ocx/wshom.idl | 184 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 241 insertions(+), 15 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 68f14b8..857a48d 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -61,7 +61,6 @@ static ULONG WINAPI WshShell3_Release(IWshShell3 *iface) static HRESULT WINAPI WshShell3_GetTypeInfoCount(IWshShell3 *iface, UINT *pctinfo) { TRACE("(%p)\n", pctinfo); - *pctinfo = 1; return S_OK; } @@ -112,19 +111,73 @@ static HRESULT WINAPI WshShell3_Invoke(IWshShell3 *iface, DISPID dispIdMember, R static HRESULT WINAPI WshShell3_get_SpecialFolders(IWshShell3 *iface, IWshCollection **out_Folders) { - FIXME("(%p)\n", out_Folders); + FIXME("(%p): stub\n", out_Folders); return E_NOTIMPL; } static HRESULT WINAPI WshShell3_get_Environment(IWshShell3 *iface, VARIANT *Type, IWshEnvironment **out_Env) { - FIXME("(%p %p)\n", Type, out_Env); + FIXME("(%p %p): stub\n", Type, out_Env); return E_NOTIMPL; } static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR Command, VARIANT *WindowStyle, VARIANT *WaitOnReturn, int *out_ExitCode) { - FIXME("(%p %p %p)\n", WindowStyle, WaitOnReturn, out_ExitCode); + FIXME("(%p %p %p): stub\n", WindowStyle, WaitOnReturn, out_ExitCode); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_Popup(IWshShell3 *iface, BSTR Text, VARIANT* SecondsToWait, VARIANT *Title, VARIANT *Type, int *button) +{ + FIXME("(%s %p %p %p %p): stub\n", debugstr_w(Text), SecondsToWait, Title, Type, button); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_CreateShortcut(IWshShell3 *iface, BSTR PathLink, IDispatch** out_Shortcut) +{ + FIXME("(%s %p): stub\n", debugstr_w(PathLink), out_Shortcut); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_ExpandEnvironmentStrings(IWshShell3 *iface, BSTR Src, BSTR* out_Dst) +{ + FIXME("(%s %p): stub\n", debugstr_w(Src), out_Dst); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR Name, VARIANT* out_Value) +{ + FIXME("(%s %p): stub\n", debugstr_w(Name), out_Value); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR Name, VARIANT *Value, VARIANT *Type) +{ + FIXME("(%s %p %p): stub\n", debugstr_w(Name), Value, Type); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_RegDelete(IWshShell3 *iface, BSTR Name) +{ + FIXME("(%s): stub\n", debugstr_w(Name)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_LogEvent(IWshShell3 *iface, VARIANT *Type, BSTR Message, BSTR Target, VARIANT_BOOL *out_Success) +{ + FIXME("(%p %s %s %p): stub\n", Type, debugstr_w(Message), debugstr_w(Target), out_Success); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_AppActivate(IWshShell3 *iface, VARIANT *App, VARIANT *Wait, VARIANT_BOOL *out_Success) +{ + FIXME("(%p %p %p): stub\n", App, Wait, out_Success); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_SendKeys(IWshShell3 *iface, BSTR Keys, VARIANT *Wait) +{ + FIXME("(%s %p): stub\n", debugstr_w(Keys), Wait); return E_NOTIMPL; } @@ -138,7 +191,16 @@ static const IWshShell3Vtbl WshShell3Vtbl = { WshShell3_Invoke, WshShell3_get_SpecialFolders, WshShell3_get_Environment, - WshShell3_Run + WshShell3_Run, + WshShell3_Popup, + WshShell3_CreateShortcut, + WshShell3_ExpandEnvironmentStrings, + WshShell3_RegRead, + WshShell3_RegWrite, + WshShell3_RegDelete, + WshShell3_LogEvent, + WshShell3_AppActivate, + WshShell3_SendKeys }; static IWshShell3 WshShell3 = { &WshShell3Vtbl }; diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index a7dcb3a..8d0b8e1 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -17,6 +17,7 @@ */ import "oaidl.idl"; +cpp_quote("#undef ExpandEnvironmentStrings") [ helpstring("Windows Script Host Object Model"), @@ -27,6 +28,61 @@ library IWshRuntimeLibrary { importlib("stdole2.tlb"); + typedef enum { + WshRunning = 0, + WshFinished, + WshFailed + } WshExecStatus; + + [ + uuid(53bad8c1-e718-11cf-893d-00a0c9054228), + odl, + hidden, + dual, + nonextensible, + oleautomation + ] + interface ITextStream : IDispatch { + [id(0x2710), propget] + HRESULT Line([out, retval] long* Line); + + [id(0xfffffdef), propget] + HRESULT Column([out, retval] long* Column); + + [id(0x2712), propget] + HRESULT AtEndOfStream([out, retval] VARIANT_BOOL* EOS); + + [id(0x2713), propget] + HRESULT AtEndOfLine([out, retval] VARIANT_BOOL* EOL); + + [id(0x2714)] + HRESULT Read([in] long Characters, [out, retval] BSTR* Text); + + [id(0x2715)] + HRESULT ReadLine([out, retval] BSTR* Text); + + [id(0x2716)] + HRESULT ReadAll([out, retval] BSTR* Text); + + [id(0x2717)] + HRESULT Write([in] BSTR Text); + + [id(0x2718)] + HRESULT WriteLine([in, optional, defaultvalue("")] BSTR Text); + + [id(0x2719)] + HRESULT WriteBlankLines([in] long Lines); + + [id(0x271a)] + HRESULT Skip([in] long Characters); + + [id(0x271b)] + HRESULT SkipLine(); + + [id(0x271c)] + HRESULT Close(); + }; + [ uuid(f935dc27-1cf0-11d0-adb9-00c04fd58a0b), odl, @@ -80,27 +136,135 @@ library IWshRuntimeLibrary } [ - uuid(41904400-be18-11d3-a28b-00104bd35090), + uuid(08fed190-be19-11d3-a28b-00104bd35090), odl, dual, oleautomation ] - interface IWshShell3 : IDispatch { + interface IWshExec : IDispatch { + [id(0x0001), propget] + HRESULT Status([out, retval] WshExecStatus* Status); + + [id(0x0003), propget] + HRESULT StdIn([out, retval] ITextStream** stream); + + [id(0x0004), propget] + HRESULT StdOut([out, retval] ITextStream** stream); + + [id(0x0005), propget] + HRESULT StdErr([out, retval] ITextStream** stream); + + [id(0x0006), propget] + HRESULT ProcessID([out, retval] long* pid); + + [id(0x0007), propget] + HRESULT ExitCode([out, retval] long* ExitCode); + + [id(0x0008)] + HRESULT Terminate(); + }; + + [ + uuid(f935dc21-1cf0-11d0-adb9-00c04fd58a0b), + odl, + dual, + oleautomation, + hidden + ] + interface IWshShell : IDispatch { [id(0x0064), propget] - HRESULT SpecialFolders([out, retval] IWshCollection **out_Folders); + HRESULT SpecialFolders([out, retval] IWshCollection** out_Folders); [id(0x00c8), propget] HRESULT Environment( - [in, optional] VARIANT *Type, - [out, retval] IWshEnvironment **out_Env); + [in, optional] VARIANT* Type, + [out, retval] IWshEnvironment** out_Env); [id(0x03e8)] HRESULT Run( - [in] BSTR Command, - [in, optional] VARIANT *WindowStyle, - [in, optional] VARIANT *WaitOnReturn, - [out, retval] int *out_ExitCode); - } + [in] BSTR Command, + [in, optional] VARIANT* WindowStyle, + [in, optional] VARIANT* WaitOnReturn, + [out, retval] int* out_ExitCode); + + [id(0x03e9)] + HRESULT Popup( + [in] BSTR Text, + [in, optional] VARIANT* SecondsToWait, + [in, optional] VARIANT* Title, + [in, optional] VARIANT* Type, + [out, retval] int* out_Button); + + [id(0x03ea)] + HRESULT CreateShortcut( + [in] BSTR PathLink, + [out, retval] IDispatch** out_Shortcut); + + [id(0x03ee)] + HRESULT ExpandEnvironmentStrings( + [in] BSTR Src, + [out, retval] BSTR* out_Dst); + + [id(0x07d0)] + HRESULT RegRead( + [in] BSTR Name, + [out, retval] VARIANT* out_Value); + + [id(0x07d1)] + HRESULT RegWrite( + [in] BSTR Name, + [in] VARIANT* Value, + [in, optional] VARIANT* Type); + + [id(0x07d2)] + HRESULT RegDelete([in] BSTR Name); + }; + + [ + uuid(24be5a30-edfe-11d2-b933-00104b365c9f), + odl, + dual, + oleautomation, + hidden + ] + interface IWshShell2 : IWshShell { + [id(0x0bb8)] + HRESULT LogEvent( + [in] VARIANT* Type, + [in] BSTR Message, + [in, optional, defaultvalue("")] BSTR Target, + [out, retval] VARIANT_BOOL* out_Success); + + [id(0x0bc2)] + HRESULT AppActivate( + [in] VARIANT* App, + [in, optional] VARIANT* Wait, + [out, retval] VARIANT_BOOL* out_Success); + + [id(0x0bc3)] + HRESULT SendKeys( + [in] BSTR Keys, + [in, optional] VARIANT* Wait); + }; + + [ + uuid(41904400-be18-11d3-a28b-00104bd35090), + odl, + dual, + oleautomation + ] + interface IWshShell3 : IWshShell2 { + [id(0x0bc4)] + HRESULT Exec( + [in] BSTR Command, + [out, retval] IWshExec** out_Exec); + + [id(0x0bc5), propget] + HRESULT CurrentDirectory([out, retval] BSTR* out_Directory); + + [id(0x0bc5), propput] + HRESULT CurrentDirectory([in] BSTR out_Directory); + }; [ uuid(24be5a31-edfe-11d2-b933-00104b365c9f),

1 0

Nikolay Sivov : wshom.ocx: Added IWshCollection stub and some tests.
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: master Commit: 9fc38b723055ccc0faa490861dc8f8ee29743f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fc38b723055ccc0faa490861… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 30 16:13:40 2011 +0300 wshom.ocx: Added IWshCollection stub and some tests. --- .gitignore | 1 + dlls/wshom.ocx/shell.c | 182 +++++++++++- dlls/wshom.ocx/tests/Makefile.in | 2 + dlls/wshom.ocx/tests/wshom.c | 51 +++- dlls/wshom.ocx/tests/wshom.idl | 602 ++++++++++++++++++++++++++++++++++++++ dlls/wshom.ocx/wshom.idl | 279 ++++++++++++++++++ dlls/wshom.ocx/wshom_main.c | 3 +- dlls/wshom.ocx/wshom_private.h | 1 + 8 files changed, 1096 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9fc38b723055ccc0faa49…

1 0