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

Aurimas Fišeras : taskmgr: Make MessageBoxes translatable.
by Alexandre Julliard June 25, 2009

June 25, 2009

Module: wine Branch: master Commit: 282dac432b8ba702f48807669c35e206b5c784a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=282dac432b8ba702f48807669… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jun 24 15:39:19 2009 +0300 taskmgr: Make MessageBoxes translatable. --- programs/taskmgr/En.rc | 21 +++++++++++++++++++++ programs/taskmgr/affinity.c | 18 ++++++++---------- programs/taskmgr/debug.c | 18 ++++++++---------- programs/taskmgr/endproc.c | 17 ++++++++++++++--- programs/taskmgr/priority.c | 11 +++++++---- programs/taskmgr/resource.h | 10 ++++++++++ 6 files changed, 68 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=282dac432b8ba702f4880…

1 0

Davide Pizzetti : progman: Update Italian translation.
by Alexandre Julliard June 25, 2009

June 25, 2009

Module: wine Branch: master Commit: b64e07b540043cb27e3c7015f549f155012b08f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b64e07b540043cb27e3c7015f… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Wed Jun 24 18:48:34 2009 +0200 progman: Update Italian translation. --- programs/progman/It.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/progman/It.rc b/programs/progman/It.rc index 0da544c..0c280f5 100644 --- a/programs/progman/It.rc +++ b/programs/progman/It.rc @@ -55,7 +55,7 @@ POPUP "&Aiuto" { MENUITEM "&Tutorial", PM_TUTORIAL MENUITEM SEPARATOR - POPUP "&Informazioni sul Program Manager" { + POPUP "&Informazioni sul Gestore Del Programma" { MENUITEM "&Licenza", PM_LICENSE MENUITEM "&Garanzia", PM_NO_WARRANTY MENUITEM "&Informazioni su WINE", PM_ABOUT_WINE @@ -84,7 +84,7 @@ PUSHBUTTON "&Aiuto", PM_HELP, 105, 45, 60, 15, WS_TABSTOP DIALOG_MOVE DIALOG 0, 0, 250, 65 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Move Program" +CAPTION "Sposta Programma" { LTEXT "Sposta programma:", -1, 5, 5, 90, 15 LTEXT "", PM_PROGRAM, 95, 5, 90, 15 @@ -108,7 +108,7 @@ LTEXT "Copia programma:", -1, 5, 5, 90, 15 LTEXT "", PM_PROGRAM, 95, 5, 90, 15 LTEXT "Dal gruppo:", -1, 5, 13, 90, 15 LTEXT "", PM_FROM_GROUP, 95, 13, 90, 15 -LTEXT "&Al grouppo:", PM_TO_GROUP_TXT, 5, 28, 140, 15 +LTEXT "&Al gruppo:", PM_TO_GROUP_TXT, 5, 28, 140, 15 COMBOBOX PM_TO_GROUP, 5, 38, 140, 50, WS_TABSTOP | CBS_DROPDOWNLIST DEFPUSHBUTTON "OK", IDOK, 185, 5, 60, 15, WS_TABSTOP PUSHBUTTON "Annulla", IDCANCEL, 185, 25, 60, 15, WS_TABSTOP @@ -195,9 +195,9 @@ PUSHBUTTON "&Aiuto", PM_HELP, 135, 65, 60, 15, WS_TABSTOP STRINGTABLE DISCARDABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL { -IDS_PROGRAM_MANAGER, "Program Manager" +IDS_PROGRAM_MANAGER, "Gestore Programma" IDS_ERROR, "ERRORE" -IDS_WARNING, "ATTENZONE" +IDS_WARNING, "ATTENZIONE" IDS_INFO, "Informazioni" IDS_DELETE, "Elimina" IDS_DELETE_GROUP_s, "Eliminare il gruppo `%s' ?"

1 0

Aurimas Fišeras : taskmgr: Add Lithuanian translation.
by Alexandre Julliard June 25, 2009

June 25, 2009

Module: wine Branch: master Commit: 619c377fd78f69590fd53084a77ca03607450438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=619c377fd78f69590fd53084a… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jun 24 15:54:17 2009 +0300 taskmgr: Add Lithuanian translation. --- programs/taskmgr/Lt.rc | 550 +++++++++++++++++++++++++++++++++++++++++++ programs/taskmgr/taskmgr.rc | 1 + 2 files changed, 551 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=619c377fd78f69590fd53…

1 0

Aurimas Fišeras : taskmgr: Add missing resource.
by Alexandre Julliard June 25, 2009

June 25, 2009

Module: wine Branch: master Commit: 6c977e477a2aec17aca7331735d34d78689b6822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c977e477a2aec17aca733173… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jun 24 17:40:40 2009 +0300 taskmgr: Add missing resource. --- programs/taskmgr/En.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/taskmgr/En.rc b/programs/taskmgr/En.rc index fc99c31..425f44e 100644 --- a/programs/taskmgr/En.rc +++ b/programs/taskmgr/En.rc @@ -483,6 +483,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Sets process to the BELOW NORMAL priority class" ID_PROCESS_PAGE_SETPRIORITY_LOW "Sets process to the LOW priority class" + ID_PROCESS_PAGE_DEBUGCHANNELS + "Controls Debug Channels" END STRINGTABLE DISCARDABLE

1 0

Paul Vriens : transl: Fix DIALOGEX parsing.
by Alexandre Julliard June 24, 2009

June 24, 2009

Module: tools Branch: master Commit: d847d39f7c6152072364e96f4802a5f027722818 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d847d39f7c6152072364e96f… Author: Paul Vriens <paul(a)acer.famvriens.nl> Date: Wed Jun 24 14:17:33 2009 +0200 transl: Fix DIALOGEX parsing. --- transl/php/lib_res.php | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/transl/php/lib_res.php b/transl/php/lib_res.php index 0f963ed..ff877b0 100644 --- a/transl/php/lib_res.php +++ b/transl/php/lib_res.php @@ -638,16 +638,19 @@ class DialogResource extends Resource $this->Resource($header); $this->items = array(); - $signature = get_dword($data); - $this->extended = ($signature == 0xffff0001); + $temp = substr($data, 0, 4); + $signature = get_word($temp); + $dlgver = get_word($temp); + $this->extended = ($signature == 1 && $dlgver == 0xffff); if ($this->extended) /* DIALOGEX resource*/ { + $dummy = get_dword($data); $this->dwHelpId = get_dword($data); $this->exStyle = get_dword($data); $this->style = get_dword($data); } else /* DIALOG resource*/ { - $this->style = $signature; + $this->style = get_dword($data); $this->exStyle = get_dword($data); $this->dwHelpId = 0; }

1 0

André Hentschel : transl: Sync style with test.winehq. org.
by Alexandre Julliard June 24, 2009

June 24, 2009

Module: tools Branch: master Commit: 58a40abc68a1edd8f748df05bb0ae931ffbf14cb URL: http://source.winehq.org/git/tools.git/?a=commit;h=58a40abc68a1edd8f748df05… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 23 19:29:38 2009 +0200 transl: Sync style with test.winehq.org. --- transl/php/index.php | 5 ++- transl/php/lang.php | 15 ++++++-- transl/php/resfile.php | 3 +- transl/php/resource.php | 2 + transl/php/style.css | 78 ++++++++++++++++++++++++++++++++++++++++------ 5 files changed, 85 insertions(+), 18 deletions(-) diff --git a/transl/php/index.php b/transl/php/index.php index 2993994..76ed5a8 100644 --- a/transl/php/index.php +++ b/transl/php/index.php @@ -24,6 +24,7 @@ while ($line = fgets($summary, 1024)) <link rel="stylesheet" href="style.css" type="text/css"/> <title>Wine translation statistics <?php echo $TITLE_APPENDIX ?></title> </head> +<div class="main"> <h1>Wine translation statistics <?php echo $TITLE_APPENDIX ?></h1> <?php echo $TITLE_DESCR ?> @@ -35,7 +36,7 @@ it needs to be found manually by the translators. If you would like to read abou improve Wine translations check <?php echo $WINE_WIKI_TRANSLATIONS ?>. </p> -<table border="1" class="index"> +<table class="index"> <tr><th></th><th>Language</th><th>Translated</th><th>Missing</th><th>Errors</th><th> </th></tr> <?php function draw_bar($tr, $err, $sum) @@ -97,7 +98,7 @@ for ($i = 0; $i < count($transl); $i++) <td><?php echo $errors_sum ?></td> <?php draw_bar($transl_sum, $errors_sum, ($nr-1)*$sum) ?> </table> - +</div> <?php if ($time = filemtime("$DATAROOT/langs/summary")) { diff --git a/transl/php/lang.php b/transl/php/lang.php index 9d79d91..bb46261 100644 --- a/transl/php/lang.php +++ b/transl/php/lang.php @@ -63,7 +63,7 @@ function dump_table($table) echo "none"; return; } - echo "<table border=\"1\">\n"; + echo "<table>\n"; echo "<tr><th>name</th><th>translated</th><th>missing</th><th>errors</th></tr>\n"; foreach ($table as $key => $value) { @@ -81,20 +81,27 @@ function dump_table($table) ?> <p><?php dump_menu_root() ?> > <?php dump_menu_lang($lang, FALSE)?> </p> +<div class="main"> <h1><?php echo "Language: ".get_lang_name($lang) ?></h1> <?php warn_if_lang_hidden($lang) ?> +<div class="group"> <h2>Partially translated modules</h2> <?php dump_table($partial) ?> - +</div> +<div class="group"> <h2>Modules not translated</h2> <?php dump_table($notransl) ?> - +</div> +<div class="group"> <h2>Locales data</h2> <?php dump_table($locale) ?> - +</div> +<div class="group"> <h2>Fully translated modules</h2> <?php dump_table($transl) ?> +</div> +</div> </html> diff --git a/transl/php/resfile.php b/transl/php/resfile.php index af5f118..685f80e 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -15,7 +15,7 @@ $msgs = array(); </head> <?php dump_menu_root() ?> &gt <?php dump_menu_lang($lang) ?> &gt <?php dump_menu_resfile($lang, $resfile, FALSE) ?> - +<div class="main"> <h1>Module <?php echo $resfile?></h1> <?php @@ -93,4 +93,5 @@ foreach ($msgs as $value) echo "</td><td>".$value."</td></tr>\n"; } ?> +</div> </html> diff --git a/transl/php/resource.php b/transl/php/resource.php index 3a7eb72..1b9b404 100644 --- a/transl/php/resource.php +++ b/transl/php/resource.php @@ -18,6 +18,7 @@ $compare = isset($_REQUEST['compare']); <body> <?php dump_menu_root() ?> &gt <?php dump_menu_lang($lang) ?> &gt <?php dump_menu_resfile($lang, $resfile) ?> &gt <?php dump_menu_resource($lang, $resfile, $type, $id) ?> +<div class="main"> <h1>Dump of <?php echo get_resource_name($type, $id) ?></h1> <?php @@ -83,5 +84,6 @@ $res->dump($master_res); ?> </table> +</div> </body> </html> diff --git a/transl/php/style.css b/transl/php/style.css index 808597a..ee17ee3 100644 --- a/transl/php/style.css +++ b/transl/php/style.css @@ -1,7 +1,68 @@ +body { + background-color: #E2E2E2; + color: #000000; + font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif; + margin: 10px; + font-size: small; +} + +a:link { color: #A50D0D; text-decoration: none; } +a:visited { color: #FF0000; } +a:hover { color: #FF6666; text-decoration: underline; } +a:active { color: #FF0000; } +a.hidden { text-decoration: none; color: #000000; } + +h1 { font-size: 180%; } +h2 { font-size: 150%; } + +:link, :visited { + text-decoration: none; +} + +h1, h2 { + text-align: center; + background-color: #601919; + color: #ffffff; + padding: 4px; + margin: 0; +} + +h1 :link { + color: #ffe0e0; +} + +div.main { + margin: 10px 0 0 0; + background-color: white; + width: 100%; + border: 1px solid #601919; +} + +div.group { + margin: 10px 20% 10px 20%; + background-color: white; + border: 1px solid #601919; +} + +td { + font-family: monospace; + font-size: medium; + padding-left: 5px; + padding-right: 5px; +} + +th { + vertical-align: text-top; + border-top-width: thin; + border-bottom-width: thin; + border-bottom-style: solid; + border-bottom-color: #601919; +} + /* used to mark resource parts that are not literaly in the string, like \0, \n etc*/ .resmeta { - color: #7f7fff; + color: #c34b4b; font-style: italic; } @@ -22,30 +83,25 @@ p.note padding: 2px; } -/* summary table on index page, bars column*/ -table.index td.bar -{ - background-color: #d1daf9; -} - /* table with a standard resource dump */ table.resource { - background-color: #f0f0ff; + margin: 10px; + background-color: #f7e8e8; } table.resource tr.header { - background-color: #e0e0ff; + background-color: #f0d2d2; } table.resource tr.subheader { - background-color: #e8e8ff; + background-color: #f3dcdc; } /* rows are different (in resource comparision mode) */ table.resource tr.diff { - background-color: #ffb8d0; + background-color: #e3acac; }

1 0

Aurimas Fišeras : oledlg: Add Lithuanian translation.
by Alexandre Julliard June 24, 2009

June 24, 2009

Module: wine Branch: master Commit: 3df02ab51540e6c3544072767f12491d60bc122f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3df02ab51540e6c3544072767… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jun 24 13:47:22 2009 +0300 oledlg: Add Lithuanian translation. --- dlls/oledlg/oledlg_Lt.rc | 100 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/oledlg/rsrc.rc | 1 + 2 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/oledlg_Lt.rc b/dlls/oledlg/oledlg_Lt.rc new file mode 100644 index 0000000..d2e239b --- /dev/null +++ b/dlls/oledlg/oledlg_Lt.rc @@ -0,0 +1,100 @@ +/* + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Įterpti objektą" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Objekto tipas:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "Gerai",IDOK,221,7,66,14 + PUSHBUTTON "Atsisakyti",IDCANCEL,221,24,66,14 + GROUPBOX "Rezultatas",IDC_RESULT,7,103,208,41 + CONTROL "Sukurti naują",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "Sukurti valdiklį",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "Sukurti iš failo",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "&Pridėti valdiklį...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "Rodyti kaip piktogramą",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + BS_MULTILINE | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,20 + PUSHBUTTON "Parinkti...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "Failas:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "Įterpia naują objektą '%s' į jūsų dokumentą" + IDS_RESULTFILEOBJDESC "Įterpia failo turinį kaip objektą į jūsų dokumentą, kad galėtumėte jį aktyvuoti naudodami programą, kuri jį sukūrė." + IDS_BROWSE "Parinkti" + IDS_NOTOLEMOD "Panašu, kad failas nėra galiojantis OLE modulis. Nepavyko užregistruoti OLE valdiklio." + IDS_NOTOLEMODCAPTION "Pridėti valdiklį" +} + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Įdėti kaip" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Šaltinis:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "Į&dėti", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "Įdėti &saitą", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&Kaip:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "Gerai", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "Atsisakyti", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "&Žinynas", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "&Rodyti kaip piktogramą", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 20 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 81, 66, 44 + CONTROL "Keisti &piktogramą...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< čia pateikiamas rezultato tekstas >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "Rezultatas", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Įterpia iškarpinės turinį į jūsų dokumentą kaip %s." + IDS_PS_PASTE_OBJECT "Įterpia iškarpinės turinį į jūsų dokumentą, kad galėtumėte jį aktyvuoti naudodami %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Įterpia iškarpinės turinį į jūsų dokumentą, kad galėtumėte jį aktyvuoti naudodami %s. Jis bus rodomas kaip piktograma." + IDS_PS_PASTE_LINK_DATA "Įterpia iškarpinės turinį į jūsų dokumentą kaip %s. Duomenys yra susieti su šaltinio failu, todėl failo pakeitimai bus atspindėti jūsų dokumente." + IDS_PS_PASTE_LINK_OBJECT "Įterpia iškarpinės turinio paveikslą į jūsų dokumentą. Paveikslas yra susietas su šaltinio failu, todėl failo pakeitimai bus atspindėti jūsų dokumente." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Įterpia nuorodą, kuri rodo į iškarpinės turinį. Nuoroda yra susieta su šaltinio failu, todėl failo pakeitimai bus atspindėti jūsų dokumente." + IDS_PS_NON_OLE "Įterpia iškarpinės turinį į jūsų dokumentą." + IDS_PS_UNKNOWN_TYPE "Nežinomas tipas" + IDS_PS_UNKNOWN_SRC "Nežinomas šaltinis" + IDS_PS_UNKNOWN_APP "programa, kuri jį sukūrė" +} + +#pragma code_page(default) diff --git a/dlls/oledlg/rsrc.rc b/dlls/oledlg/rsrc.rc index 6379efc..ee433af 100644 --- a/dlls/oledlg/rsrc.rc +++ b/dlls/oledlg/rsrc.rc @@ -43,6 +43,7 @@ #include "oledlg_It.rc" #include "oledlg_Ja.rc" #include "oledlg_Ko.rc" +#include "oledlg_Lt.rc" #include "oledlg_Nl.rc" #include "oledlg_No.rc" #include "oledlg_Pl.rc"

1 0

André Hentschel : appwiz: Add function for installer button.
by Alexandre Julliard June 24, 2009

June 24, 2009

Module: wine Branch: master Commit: ee9baf28d2391a7607468d52d6abed1abeb4dcb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee9baf28d2391a7607468d52d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 21 17:05:41 2009 +0200 appwiz: Add function for installer button. --- dlls/appwiz.cpl/De.rc | 1 + dlls/appwiz.cpl/En.rc | 1 + dlls/appwiz.cpl/Makefile.in | 2 +- dlls/appwiz.cpl/appwiz.c | 50 +++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/res.h | 1 + 5 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/De.rc b/dlls/appwiz.cpl/De.rc index b85d43e..47263f3 100644 --- a/dlls/appwiz.cpl/De.rc +++ b/dlls/appwiz.cpl/De.rc @@ -35,6 +35,7 @@ STRINGTABLE IDS_COLUMN_NAME, "Name" IDS_COLUMN_PUBLISHER, "Herausgeber" IDS_COLUMN_VERSION, "Version" + IDS_INSTALL_FILTER, "Setup-Programme\0*instal*.exe;*setup*.exe;*.msi\0Programme (*.exe)\0*.exe\0Alle Dateien (*.*)\0*.*\0\0" } IDD_MAIN DIALOG 0, 0, 320, 220 diff --git a/dlls/appwiz.cpl/En.rc b/dlls/appwiz.cpl/En.rc index d0b4de3..3463b2e 100644 --- a/dlls/appwiz.cpl/En.rc +++ b/dlls/appwiz.cpl/En.rc @@ -33,6 +33,7 @@ STRINGTABLE IDS_COLUMN_NAME, "Name" IDS_COLUMN_PUBLISHER, "Publisher" IDS_COLUMN_VERSION, "Version" + IDS_INSTALL_FILTER, "Installation Programs\0*instal*.exe;*setup*.exe;*.msi\0Programs (*.exe)\0*.exe\0All Files (*.*)\0*.*\0\0" } IDD_MAIN DIALOG 0, 0, 320, 220 diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index 141715d..8fc65f1 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = appwiz.cpl -IMPORTS = kernel32 comctl32 advapi32 shell32 user32 +IMPORTS = kernel32 comctl32 advapi32 shell32 user32 comdlg32 C_SRCS = \ appwiz.c diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 892c635..daf3e82 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -41,6 +41,7 @@ #include <winreg.h> #include <shellapi.h> #include <commctrl.h> +#include <commdlg.h> #include <cpl.h> #include "res.h" @@ -71,6 +72,8 @@ typedef struct APPINFO { static struct APPINFO *AppInfo = NULL; static HINSTANCE hInst; +static const WCHAR openW[] = {'o','p','e','n',0}; + /* names of registry keys */ static const WCHAR BackSlashW[] = { '\\', 0 }; static const WCHAR DisplayNameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; @@ -372,6 +375,49 @@ static void UpdateButtons(HWND hWnd) } /****************************************************************************** + * Name : InstallProgram + * Description: Search for potential Installer and execute it. + * Parameters : hWnd - Handle of the dialog box + */ +static void InstallProgram(HWND hWnd) +{ + OPENFILENAMEW ofn; + WCHAR titleW[MAX_STRING_LEN]; + WCHAR FilterBufferW[MAX_STRING_LEN]; + WCHAR FileNameBufferW[MAX_PATH]; + + LoadStringW(hInst, IDS_CPL_TITLE, titleW, sizeof(titleW)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_INSTALL_FILTER, FilterBufferW, sizeof(FilterBufferW)/sizeof(WCHAR)); + + memset(&ofn, 0, sizeof(OPENFILENAMEW)); + ofn.lStructSize = sizeof(OPENFILENAMEW); + ofn.hwndOwner = hWnd; + ofn.hInstance = hInst; + ofn.lpstrFilter = FilterBufferW; + ofn.nFilterIndex = 0; + ofn.lpstrFile = FileNameBufferW; + ofn.nMaxFile = MAX_PATH; + ofn.lpstrFileTitle = NULL; + ofn.nMaxFileTitle = 0; + ofn.lpstrTitle = titleW; + ofn.Flags = OFN_HIDEREADONLY | OFN_ENABLESIZING; + FileNameBufferW[0] = 0; + + if (GetOpenFileNameW(&ofn)) + { + SHELLEXECUTEINFOW sei; + memset(&sei, 0, sizeof(sei)); + sei.cbSize = sizeof(sei); + sei.lpVerb = openW; + sei.nShow = SW_SHOWDEFAULT; + sei.fMask = SEE_MASK_NO_CONSOLE; + sei.lpFile = ofn.lpstrFile; + + ShellExecuteExW(&sei); + } +} + +/****************************************************************************** * Name : UninstallProgram * Description: Executes the specified program's installer. * Parameters : id - the internal ID of the installer to remove @@ -737,6 +783,10 @@ static BOOL CALLBACK MainDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar case WM_COMMAND: switch (LOWORD(wParam)) { + case IDC_INSTALL: + InstallProgram(hWnd); + break; + case IDC_ADDREMOVE: selitem = SendDlgItemMessageW(hWnd, IDL_PROGRAMS, LVM_GETNEXTITEM, -1, LVNI_FOCUSED|LVNI_SELECTED); diff --git a/dlls/appwiz.cpl/res.h b/dlls/appwiz.cpl/res.h index 34129c4..5efcee2 100644 --- a/dlls/appwiz.cpl/res.h +++ b/dlls/appwiz.cpl/res.h @@ -53,3 +53,4 @@ #define IDS_COLUMN_NAME 6 #define IDS_COLUMN_PUBLISHER 7 #define IDS_COLUMN_VERSION 8 +#define IDS_INSTALL_FILTER 9

1 0

Huw Davies : gdi32: Implement GetTransform for the other valid transform types.
by Alexandre Julliard June 24, 2009

June 24, 2009

Module: wine Branch: master Commit: 6260af2a7cceb77ce240d48b7b9eec44f2ec39cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6260af2a7cceb77ce240d48b7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 24 11:42:51 2009 +0100 gdi32: Implement GetTransform for the other valid transform types. --- dlls/gdi32/dc.c | 75 +++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 59 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 30bd7a4..db8a91b 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -284,6 +284,20 @@ static BOOL DC_InvertXform( const XFORM *xformSrc, XFORM *xformDest ) return TRUE; } +/* Construct a transformation to do the window-to-viewport conversion */ +static void construct_window_to_viewport(DC *dc, XFORM *xform) +{ + double scaleX, scaleY; + scaleX = (double)dc->vportExtX / (double)dc->wndExtX; + scaleY = (double)dc->vportExtY / (double)dc->wndExtY; + + xform->eM11 = scaleX; + xform->eM12 = 0.0; + xform->eM21 = 0.0; + xform->eM22 = scaleY; + xform->eDx = (double)dc->vportOrgX - scaleX * (double)dc->wndOrgX; + xform->eDy = (double)dc->vportOrgY - scaleY * (double)dc->wndOrgY; +} /*********************************************************************** * DC_UpdateXforms @@ -298,19 +312,8 @@ static BOOL DC_InvertXform( const XFORM *xformSrc, XFORM *xformDest ) void DC_UpdateXforms( DC *dc ) { XFORM xformWnd2Vport, oldworld2vport; - double scaleX, scaleY; - /* Construct a transformation to do the window-to-viewport conversion */ - scaleX = (double)dc->vportExtX / (double)dc->wndExtX; - scaleY = (double)dc->vportExtY / (double)dc->wndExtY; - xformWnd2Vport.eM11 = scaleX; - xformWnd2Vport.eM12 = 0.0; - xformWnd2Vport.eM21 = 0.0; - xformWnd2Vport.eM22 = scaleY; - xformWnd2Vport.eDx = (double)dc->vportOrgX - - scaleX * (double)dc->wndOrgX; - xformWnd2Vport.eDy = (double)dc->vportOrgY - - scaleY * (double)dc->wndOrgY; + construct_window_to_viewport(dc, &xformWnd2Vport); oldworld2vport = dc->xformWorld2Vport; /* Combine with the world transformation */ @@ -1164,12 +1167,52 @@ BOOL WINAPI GetWorldTransform( HDC hdc, LPXFORM xform ) /*********************************************************************** * GetTransform (GDI32.@) + * + * Undocumented + * + * Returns one of the co-ordinate space transforms + * + * PARAMS + * hdc [I] Device context. + * which [I] Which xform to return: + * 0x203 World -> Page transform (that set by SetWorldTransform). + * 0x304 Page -> Device transform (the mapping mode transform). + * 0x204 World -> Device transform (the combination of the above two). + * 0x402 Device -> World transform (the inversion of the above). + * xform [O] The xform. + * */ -BOOL WINAPI GetTransform( HDC hdc, DWORD unknown, LPXFORM xform ) +BOOL WINAPI GetTransform( HDC hdc, DWORD which, XFORM *xform ) { - if (unknown == 0x0203) return GetWorldTransform( hdc, xform ); - FIXME("stub: don't know what to do for code %x\n", unknown ); - return FALSE; + BOOL ret = TRUE; + DC *dc = get_dc_ptr( hdc ); + if (!dc) return FALSE; + + switch(which) + { + case 0x203: + *xform = dc->xformWorld2Wnd; + break; + + case 0x304: + construct_window_to_viewport(dc, xform); + break; + + case 0x204: + *xform = dc->xformWorld2Vport; + break; + + case 0x402: + *xform = dc->xformVport2World; + break; + + default: + FIXME("Unknown code %x\n", which); + ret = FALSE; + } + + release_dc_ptr( dc ); + return ret; }

1 0

Anders Jonsson : crypt32: Add CryptRegisterOIDInfo stub.
by Alexandre Julliard June 24, 2009

June 24, 2009

Module: wine Branch: master Commit: d9972cb4b409cedfd9cb049630f75f79d046eb34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9972cb4b409cedfd9cb04963… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sat Jun 20 10:08:46 2009 +0200 crypt32: Add CryptRegisterOIDInfo stub. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/oid.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index f271b62..534bee7 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -163,7 +163,7 @@ @ stdcall CryptQueryObject(long ptr long long long ptr ptr ptr ptr ptr ptr) @ stdcall CryptRegisterDefaultOIDFunction(long str long wstr) @ stdcall CryptRegisterOIDFunction(long str str wstr str) -@ stub CryptRegisterOIDInfo +@ stdcall CryptRegisterOIDInfo(ptr long) @ stdcall CryptSIPAddProvider(ptr) @ stdcall CryptSIPCreateIndirectData(ptr ptr ptr) @ stdcall CryptSIPGetSignedDataMsg(ptr ptr long ptr ptr) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 927481f..f0ea8ea 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -665,6 +665,16 @@ error_close_key: } /*********************************************************************** + * CryptRegisterOIDInfo (CRYPT32.@) + */ +BOOL WINAPI CryptRegisterOIDInfo(PCCRYPT_OID_INFO pInfo, DWORD dwFlags) +{ + FIXME("(%p, %x): stub\n", pInfo, dwFlags ); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * CryptUnregisterOIDFunction (CRYPT32.@) */ BOOL WINAPI CryptUnregisterOIDFunction(DWORD dwEncodingType, LPCSTR pszFuncName,

1 0