wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Aurimas Fišeras : appwiz.cpl: Update Lithuanian translation.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: d5558b63cdc27936b7a37e43741d6df17884747f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5558b63cdc27936b7a37e437… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jun 24 18:34:15 2009 +0300 appwiz.cpl: Update Lithuanian translation. --- dlls/appwiz.cpl/Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Lt.rc b/dlls/appwiz.cpl/Lt.rc index 6f524ac..a738828 100644 --- a/dlls/appwiz.cpl/Lt.rc +++ b/dlls/appwiz.cpl/Lt.rc @@ -36,6 +36,7 @@ STRINGTABLE IDS_COLUMN_NAME, "Vardas" IDS_COLUMN_PUBLISHER, "Leidėjas" IDS_COLUMN_VERSION, "Versija" + IDS_INSTALL_FILTER, "Diegimo programos\0*instal*.exe;*setup*.exe;*.msi\0Programos (*.exe)\0*.exe\0Visi failai (*.*)\0*.*\0\0" } IDD_MAIN DIALOG 0, 0, 320, 220

1 0

Aurimas Fišeras : taskmgr: Add missing resource.
by Alexandre Julliard 25 Jun '09

25 Jun '09

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

Aurimas Fišeras : taskmgr: Add Lithuanian translation.
by Alexandre Julliard 25 Jun '09

25 Jun '09

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: Make MessageBoxes translatable.
by Alexandre Julliard 25 Jun '09

25 Jun '09

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

Paul Vriens : transl: Fix DIALOGEX parsing.
by Alexandre Julliard 24 Jun '09

24 Jun '09

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 24 Jun '09

24 Jun '09

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

André Hentschel : appwiz: Add function for installer button.
by Alexandre Julliard 24 Jun '09

24 Jun '09

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

Anders Jonsson : crypt32: Add CryptRegisterOIDInfo stub.
by Alexandre Julliard 24 Jun '09

24 Jun '09

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

Paul Chitescu : avifil32: Romanian translation.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 508270b5332ea19b745185db556b3c10647424d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=508270b5332ea19b745185db5… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Jun 24 15:08:18 2009 +0300 avifil32: Romanian translation. --- dlls/avifil32/avifile_Ro.rc | 57 +++++++++++++++++++++++++++++++++++++++++++ dlls/avifil32/rsrc.rc | 1 + 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/avifil32/avifile_Ro.rc b/dlls/avifil32/avifile_Ro.rc new file mode 100644 index 0000000..d46e3ea --- /dev/null +++ b/dlls/avifil32/avifile_Ro.rc @@ -0,0 +1,57 @@ +/* + * avifil32.dll (Romanian resources) + * + * Copyright 2009 Paul Chitescu + * + * 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_ROMANIAN, SUBLANG_NEUTRAL + +IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Opțiuni de compresie" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Alegeți un flux:",-1,2,5,154,10 + COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "&Opțiuni...",IDC_OPTIONS,170,17,50,14 + AUTOCHECKBOX "Ȋ&ntrețese fiecare",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP + EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL + LTEXT "cadre",-1,129,43,36,9 + LTEXT "Formatul curent:",-1,3,56,73,9 + LTEXT "This space for rent",IDC_FORMATTEXT,75,56,90,26 + DEFPUSHBUTTON "OK",IDOK,170,42,50,14 + PUSHBUTTON "Renunță",IDCANCEL,170,61,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_WAVESTREAMFORMAT "Forma de undă: %s" + IDS_WAVEFILETYPE "Formă de undă" + IDS_ALLMULTIMEDIA "Toate fișierele multimedia" + IDS_ALLFILES "Toate fișierele (*.*)(a)*.*" + IDS_VIDEO "video" + IDS_AUDIO "audio" + IDS_AVISTREAMFORMAT "%s %s #%d" + IDS_AVIFILETYPE "Tratare implicită Wine pentru AVI" + IDS_UNCOMPRESSED "necomprimat" +} + +#pragma code_page(default) diff --git a/dlls/avifil32/rsrc.rc b/dlls/avifil32/rsrc.rc index 5eda656..e4363a7 100644 --- a/dlls/avifil32/rsrc.rc +++ b/dlls/avifil32/rsrc.rc @@ -53,6 +53,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "avifile_No.rc" #include "avifile_Pl.rc" #include "avifile_Pt.rc" +#include "avifile_Ro.rc" #include "avifile_Ru.rc" #include "avifile_Si.rc" #include "avifile_Sv.rc"

1 0

Huw Davies : gdi32: Add tests for GetTransform.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 4b9c22d66bfcc884074b14f9a50030b405dac191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9c22d66bfcc884074b14f9a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 24 11:51:06 2009 +0100 gdi32: Add tests for GetTransform. --- dlls/gdi32/tests/mapping.c | 126 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 126 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index cb8160d..8c53e2f 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -433,10 +433,136 @@ static void test_setvirtualresolution(void) DeleteDC(hdc); } + +static inline void expect_identity(int line, XFORM *xf) +{ + ok(xf->eM11 == 1.0, "%d: got %f\n", line, xf->eM11); + ok(xf->eM12 == 0.0, "%d: got %f\n", line, xf->eM12); + ok(xf->eM21 == 0.0, "%d: got %f\n", line, xf->eM21); + ok(xf->eM22 == 1.0, "%d: got %f\n", line, xf->eM22); + ok(xf->eDx == 0.0, "%d: got %f\n", line, xf->eDx); + ok(xf->eDy == 0.0, "%d: got %f\n", line, xf->eDy); +} + +static inline void xform_near_match(int line, XFORM *got, XFORM *expect) +{ + ok(fabs(got->eM11 - expect->eM11) < 0.001, "%d: got %f expect %f\n", line, got->eM11, expect->eM11); + ok(fabs(got->eM12 - expect->eM12) < 0.001, "%d: got %f expect %f\n", line, got->eM12, expect->eM12); + ok(fabs(got->eM21 - expect->eM21) < 0.001, "%d: got %f expect %f\n", line, got->eM21, expect->eM21); + ok(fabs(got->eM22 - expect->eM22) < 0.001, "%d: got %f expect %f\n", line, got->eM22, expect->eM22); + ok(fabs(got->eDx - expect->eDx) < 0.001, "%d: got %f expect %f\n", line, got->eDx, expect->eDx); + ok(fabs(got->eDy - expect->eDy) < 0.001, "%d: got %f expect %f\n", line, got->eDy, expect->eDy); +} + + +static void test_gettransform(void) +{ + HDC hdc = CreateICA("DISPLAY", NULL, NULL, NULL); + BOOL (WINAPI *pGetTransform)(HDC, DWORD, XFORM *); + XFORM xform, expect; + BOOL r; + SIZE lometric_vp, lometric_wnd; + + pGetTransform = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetTransform"); + + if(!pGetTransform) + { + win_skip("Don't have GetTransform\n"); + return; + } + + r = pGetTransform(hdc, 0x203, &xform); /* World -> Page */ + ok(r == TRUE, "got %d\n", r); + expect_identity(__LINE__, &xform); + r = pGetTransform(hdc, 0x304, &xform); /* Page -> Device */ + ok(r == TRUE, "got %d\n", r); + expect_identity(__LINE__, &xform); + r = pGetTransform(hdc, 0x204, &xform); /* World -> Device */ + ok(r == TRUE, "got %d\n", r); + expect_identity(__LINE__, &xform); + r = pGetTransform(hdc, 0x402, &xform); /* Device -> World */ + ok(r == TRUE, "got %d\n", r); + expect_identity(__LINE__, &xform); + + SetMapMode(hdc, MM_LOMETRIC); + GetViewportExtEx(hdc, &lometric_vp); + GetWindowExtEx(hdc, &lometric_wnd); + + r = pGetTransform(hdc, 0x203, &xform); /* World -> Page */ + ok(r == TRUE, "got %d\n", r); + expect_identity(__LINE__, &xform); + + r = pGetTransform(hdc, 0x304, &xform); /* Page -> Device */ + ok(r == TRUE, "got %d\n", r); + expect.eM11 = (FLOAT) lometric_vp.cx / lometric_wnd.cx; + expect.eM12 = expect.eM21 = 0.0; + expect.eM22 = (FLOAT) lometric_vp.cy / lometric_wnd.cy; + expect.eDx = expect.eDy = 0.0; + xform_near_match(__LINE__, &xform, &expect); + + r = pGetTransform(hdc, 0x204, &xform); /* World -> Device */ + ok(r == TRUE, "got %d\n", r); + xform_near_match(__LINE__, &xform, &expect); + + r = pGetTransform(hdc, 0x402, &xform); /* Device -> World */ + ok(r == TRUE, "got %d\n", r); + expect.eM11 = (FLOAT) lometric_wnd.cx / lometric_vp.cx; + expect.eM22 = (FLOAT) lometric_wnd.cy / lometric_vp.cy; + xform_near_match(__LINE__, &xform, &expect); + + + SetGraphicsMode(hdc, GM_ADVANCED); + + expect.eM11 = 10.0; + expect.eM22 = 20.0; + SetWorldTransform(hdc, &expect); + r = pGetTransform(hdc, 0x203, &xform); /* World -> Page */ + ok(r == TRUE, "got %d\n", r); + xform_near_match(__LINE__, &xform, &expect); + + r = pGetTransform(hdc, 0x304, &xform); /* Page -> Device */ + ok(r == TRUE, "got %d\n", r); + expect.eM11 = (FLOAT) lometric_vp.cx / lometric_wnd.cx; + expect.eM22 = (FLOAT) lometric_vp.cy / lometric_wnd.cy; + xform_near_match(__LINE__, &xform, &expect); + + r = pGetTransform(hdc, 0x204, &xform); /* World -> Device */ + ok(r == TRUE, "got %d\n", r); + expect.eM11 *= 10.0; + expect.eM22 *= 20.0; + xform_near_match(__LINE__, &xform, &expect); + + r = pGetTransform(hdc, 0x402, &xform); /* Device -> World */ + ok(r == TRUE, "got %d\n", r); + expect.eM11 = 1 / expect.eM11; + expect.eM22 = 1 / expect.eM22; + xform_near_match(__LINE__, &xform, &expect); + + r = pGetTransform(hdc, 0x102, &xform); + ok(r == FALSE, "got %d\n", r); + r = pGetTransform(hdc, 0x103, &xform); + ok(r == FALSE, "got %d\n", r); + r = pGetTransform(hdc, 0x104, &xform); + ok(r == FALSE, "got %d\n", r); + r = pGetTransform(hdc, 0x202, &xform); + ok(r == FALSE, "got %d\n", r); + r = pGetTransform(hdc, 0x302, &xform); + ok(r == FALSE, "got %d\n", r); + r = pGetTransform(hdc, 0x303, &xform); + ok(r == FALSE, "got %d\n", r); + r = pGetTransform(hdc, 0x403, &xform); + ok(r == FALSE, "got %d\n", r); + r = pGetTransform(hdc, 0x404, &xform); + ok(r == FALSE, "got %d\n", r); + r = pGetTransform(hdc, 0xffff, &xform); + ok(r == FALSE, "got %d\n", r); +} + START_TEST(mapping) { test_modify_world_transform(); test_world_transform(); test_isotropic_mapping(); test_setvirtualresolution(); + test_gettransform(); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009