wine-commits June 2010

wine-commits@winehq.org

3 participants
663 discussions

Paul Vriens : wininet: Update the Danish translation and convert to UTF-8.
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: e7eb9175318073f6d20093eda911d575ede2151b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7eb9175318073f6d20093eda… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 19:07:57 2010 +0200 wininet: Update the Danish translation and convert to UTF-8. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- dlls/wininet/wininet_Da.rc | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/wininet_Da.rc b/dlls/wininet/wininet_Da.rc index 6b37857..46efeb6 100644 --- a/dlls/wininet/wininet_Da.rc +++ b/dlls/wininet/wininet_Da.rc @@ -1,5 +1,6 @@ /* * Copyright 2008 Jens Albretsen + * 2010 Thomas Larsen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,11 +19,13 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Skriv netv�rkskodeord" +CAPTION "Skriv netværkskodeord" FONT 8, "MS Shell Dlg" { LTEXT "Skriv dit brugernavn og kodeord:", -1, 40, 6, 150, 15 @@ -40,7 +43,27 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Annuller", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Godkendelse Påkrævet" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Indtast venligst, dit brugernavn og adgangskode:", -1, 40, 6, 150, 15 + LTEXT "Server", -1, 40, 26, 50, 10 + LTEXT "Domæne", -1, 40, 46, 50, 10 + LTEXT "Bruger", -1, 40, 66, 50, 10 + LTEXT "Adgangskode", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Gem denne adgangskode (usikker)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Annuller", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { - IDS_LANCONNECTION "Lokal netv�rksforbindelse" + IDS_LANCONNECTION "Lokal netværksforbindelse" }

1 0

Paul Vriens : kernel32: Fix the Korean resources.
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: dda58216eae4bd13f4d40fb263eb441f60121ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dda58216eae4bd13f4d40fb26… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 18:57:24 2010 +0200 kernel32: Fix the Korean resources. --- dlls/kernel32/nls/winerr_kor.mc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/nls/winerr_kor.mc b/dlls/kernel32/nls/winerr_kor.mc index 95082e4..289b17e 100644 --- a/dlls/kernel32/nls/winerr_kor.mc +++ b/dlls/kernel32/nls/winerr_kor.mc @@ -664,7 +664,7 @@ MessageId=160 SymbolicName=ERROR_BAD_ARGUMENTS Language=KOR DosExecPgm�� - +. MessageId=161 SymbolicName=ERROR_BAD_PATHNAME Language=KOR @@ -974,7 +974,7 @@ MessageId=534 SymbolicName=ERROR_ARITHMETIC_OVERFLOW Language=KOR Arithmetic ��÷ο� - +. MessageId=535 SymbolicName=ERROR_PIPE_CONNECTED Language=KOR @@ -3109,7 +3109,7 @@ MessageId=1739 SymbolicName=RPC_S_UUID_NO_ADDRESS Language=KOR ��Ʈ��ũ �ּҰ� ��ϴ�. - +. MessageId=1740 SymbolicName=RPC_S_DUPLICATE_ENDPOINT Language=KOR @@ -3489,7 +3489,7 @@ MessageId=1816 SymbolicName=ERROR_NOT_ENOUGH_QUOTA Language=KOR ��Ͱ� �� ʽ��ϴ� - +. MessageId=1817 SymbolicName=RPC_S_NO_INTERFACES Language=KOR @@ -3579,7 +3579,7 @@ MessageId=1899 SymbolicName=EPT_S_CANT_CREATE Language=KOR ��Ʈ �� DB�� ϴ� - +. MessageId=1900 SymbolicName=RPC_S_INVALID_OBJECT Language=KOR

1 0

André Hentschel : wine.man: There is no configuration file.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: 4ae53250161dd762b6ba289e4a58c90db06380c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae53250161dd762b6ba289e4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 31 19:17:09 2010 +0200 wine.man: There is no configuration file. --- loader/wine.de.man.in | 3 +-- loader/wine.fr.man.in | 5 ++--- loader/wine.man.in | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/loader/wine.de.man.in b/loader/wine.de.man.in index ebcb744..1dd2d78 100644 --- a/loader/wine.de.man.in +++ b/loader/wine.de.man.in @@ -160,8 +160,7 @@ gesucht. .TP .I WINEDLLOVERRIDES Definiert die Bibliotheksüberschreibung und Ladereihenfolge der DLLs, -die beim Laden jeder DLL berücksichtigt wird. Die Standardwerte sind -in der Konfigurationsdatei enthalten. Derzeit gibt es zwei Typen von +die beim Laden jeder DLL berücksichtigt wird. Derzeit gibt es zwei Typen von DLLs, die in den Speicher eines Prozesses geladen werden können: Native Windows-DLLs .RI ( native ), diff --git a/loader/wine.fr.man.in b/loader/wine.fr.man.in index acced60..6096a08 100644 --- a/loader/wine.fr.man.in +++ b/loader/wine.fr.man.in @@ -158,9 +158,8 @@ Wine utilisera aussi le répertoire .TP .I WINEDLLOVERRIDES Définit le type de remplacement et l'ordre de chargement des DLL utilisées lors du -processus de chargement d'une DLL. Le comportement par défaut est spécifié dans le -fichier de configuration. Deux types de bibliothèques peuvent actuellement être chargés -dans l'espace d'adressage d'un processus : les DLL natives de +processus de chargement d'une DLL. Deux types de bibliothèques peuvent actuellement +être chargés dans l'espace d'adressage d'un processus : les DLL natives de Windows .RI ( native ), et les DLL fournies par diff --git a/loader/wine.man.in b/loader/wine.man.in index 879c36a..7d6953c 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -160,8 +160,7 @@ Wine will also look in .TP .I WINEDLLOVERRIDES Defines the override type and load order of dlls used in the loading -process for any dll. The default is set in the configuration -file. There are currently two types of libraries that can be loaded +process for any dll. There are currently two types of libraries that can be loaded into a process' address space: native windows dlls .RI ( native ), .B wine

1 0

Paul Vriens : reg: Update the Danish translation and convert to UTF-8.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: 9c02314d7e60f5c8476cf982fde627a581e240e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c02314d7e60f5c8476cf982f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 15:54:14 2010 +0200 reg: Update the Danish translation and convert to UTF-8. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- programs/reg/Da.rc | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/reg/Da.rc b/programs/reg/Da.rc index 353b94d..ccdcf4c 100644 --- a/programs/reg/Da.rc +++ b/programs/reg/Da.rc @@ -3,6 +3,7 @@ * Danish language support * * Copyright 2008 Jens Albretsen <jens(a)albretsen.dk> + * 2010 Thomas Larsen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,12 +22,19 @@ #include "reg.h" +#pragma code_page(65001) + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE { STRING_USAGE, "Syntaksen for dette kommando er:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n" - STRING_ADD_USAGE, "REG ADD n�gle_navn [/v v�rdi | /ve] [/t type] [/s separator] [/d data] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE n�gle_navn [/v v�rdi | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY n�gle_navn [/v v�rdi | /ve] [/s]\n" + STRING_ADD_USAGE, "REG ADD nøgle_navn [/v værdi | /ve] [/t type] [/s separator] [/d data] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE nøgle_navn [/v værdi | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY nøgle_navn [/v værdi | /ve] [/s]\n" + STRING_SUCCESS, "Operationen blev afsluttet med succes\n" + STRING_INVALID_KEY, "Fejl: Ugyldigt nøgle navn\n" + STRING_INVALID_CMDLINE, "Fejl: Ugyldige kommando linje parametre\n" + STRING_NO_REMOTE, "Fejl: Kunne ikke tilføje nøgler til fjern maskinen\n" + STRING_CANNOT_FIND, "Fejl: Systemet kunne ikke finde, den angivet registrerings nøgle eller værdi\n" }

1 0

Paul Vriens : setupapi: Update the Danish translation.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: f7db14b2fcfc909527569fc8bed3f9e8f5eda907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7db14b2fcfc909527569fc8b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 14:48:05 2010 +0200 setupapi: Update the Danish translation. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- dlls/setupapi/Da.rc | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Da.rc b/dlls/setupapi/Da.rc index 7a83816..00bb261 100644 --- a/dlls/setupapi/Da.rc +++ b/dlls/setupapi/Da.rc @@ -2,6 +2,7 @@ * Danish language support * * Copyright (C) 2008 Jens Albretsen <jens(a)albretsen.dk> + * 2010 Thomas Larsen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,8 +21,18 @@ #include "setupapi_private.h" +#pragma code_page(65001) + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "Filen '%s' fra %s mangler" + IDS_UNKNOWN "Ukendt" + IDS_COPYFROM "Kopiere filer fra:" + IDS_INFO "Skriv den sti, hvor filen er placeret, og klik derefter på OK." +} + COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Kopierer filer..." @@ -34,3 +45,17 @@ BEGIN LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Mangler Filer" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Indsæt fabrikantens installation disk, og\nsørg derefter for at korrekte drev er valgt nedenfor", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Kopiere fabrikantens filer fra:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Annuller", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Gennemse...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END

1 0

Paul Vriens : notepad: Update the Danish translation and convert to UTF-8.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: dd243b7fcf8a676be30db43c3b6f34d3cca72a35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd243b7fcf8a676be30db43c3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 14:30:13 2010 +0200 notepad: Update the Danish translation and convert to UTF-8. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- programs/notepad/Da.rc | 59 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 40 insertions(+), 19 deletions(-) diff --git a/programs/notepad/Da.rc b/programs/notepad/Da.rc index d152cfe..1068b87 100644 --- a/programs/notepad/Da.rc +++ b/programs/notepad/Da.rc @@ -4,6 +4,7 @@ * Copyright 1998 Henrik Olsen <henrik(a)iaeste.dk> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2008 Jens Albretsen <jens(a)albretsen.dk> + * 2010 Thomas Larsen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,18 +23,20 @@ #include "notepad_res.h" +#pragma code_page(65001) + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT MAIN_MENU MENU { POPUP "&Filer" { MENUITEM "&Ny\tCtrl+N", CMD_NEW - MENUITEM "�&bn...\tCtrl+O", CMD_OPEN + MENUITEM "Å&bn...\tCtrl+O", CMD_OPEN MENUITEM "&Gem\tCtrl+S", CMD_SAVE MENUITEM "Gem so&m...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "&Udskriv...\tCtrl+P", CMD_PRINT - MENUITEM "Side&ops�tning...", CMD_PAGE_SETUP + MENUITEM "Side&opsætning...", CMD_PAGE_SETUP MENUITEM "&Indstil printer...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "&Afslut", CMD_EXIT @@ -43,7 +46,7 @@ POPUP "&Rediger" { MENUITEM SEPARATOR MENUITEM "&Klip\tCtrl+X", CMD_CUT MENUITEM "K&opier\tCtrl+C", CMD_COPY - MENUITEM "&Inds�t\tCtrl+V", CMD_PASTE + MENUITEM "&Indsæt\tCtrl+V", CMD_PASTE MENUITEM "&Slet\tDel", CMD_DELETE MENUITEM SEPARATOR MENUITEM "Marker &alt", CMD_SELECT_ALL @@ -52,14 +55,15 @@ POPUP "&Rediger" { MENUITEM "Automatisk &linjeskift", CMD_WRAP MENUITEM "&Font...", CMD_FONT } -POPUP "&S�g" { - MENUITEM "&S�g...", CMD_SEARCH - MENUITEM "&Find n�ste\tF3", CMD_SEARCH_NEXT +POPUP "&Søg" { + MENUITEM "&Søg...", CMD_SEARCH + MENUITEM "&Find næste\tF3", CMD_SEARCH_NEXT + MENUITEM "&Erstat...\tCtrl+H", CMD_REPLACE } -POPUP "&Hj�lp" { +POPUP "&Hjælp" { MENUITEM "&Indhold", CMD_HELP_CONTENTS - MENUITEM "&S�g efter hj�lp om...", CMD_HELP_SEARCH - MENUITEM "&Brug af Hj�lp", CMD_HELP_ON_HELP + MENUITEM "&Søg efter hjælp om...", CMD_HELP_SEARCH + MENUITEM "&Brug af Hjælp", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Om Notepad", CMD_HELP_ABOUT_NOTEPAD } @@ -70,7 +74,7 @@ POPUP "&Hj DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Sideops�tning" +CAPTION "Sideopsætning" { LTEXT "&Sidehoved:", 0x140, 10, 07, 40, 15 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP @@ -82,16 +86,24 @@ LTEXT "&Venstre:", 0x145, 20, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP LTEXT "&Top:", 0x148, 20, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&H�jre:", 0x14B, 100, 55, 30, 10, WS_CHILD +LTEXT "&Højre:", 0x14B, 100, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP LTEXT "&Bund:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP PUSHBUTTON "Annuller", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Hj�lp", IDHELP, 180, 39, 40, 15, WS_TABSTOP +PUSHBUTTON "&Hjælp", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Kodning:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" @@ -110,14 +122,23 @@ STRING_TEXT_FILES_TXT, "Tekst filer (*.txt)" STRING_TOOLARGE, "Filen '%s' er for stor til Notesblok. \ \nBrug en anden editor til at redigere filen." STRING_NOTEXT, "Du har ikke skrevet noget tekst. \ -\nSkriv noget tekst, og pr�v s� igen" +\nSkriv noget tekst, og prøv så igen" STRING_DOESNOTEXIST, "Filen '%s'\nfindes ikke\n\n \ -�nsker du at oprette en ny fil ?" -STRING_NOTSAVED, "Filen '%s'\ner blevet �ndret\n\n \ -Vil du gemme �ndringerne ?" +Ønsker du at oprette en ny fil ?" +STRING_NOTSAVED, "Filen '%s'\ner blevet ændret\n\n \ +Vil du gemme ændringerne ?" STRING_NOTFOUND, "Kan ikke finde '%s'." -STRING_OUT_OF_MEMORY, "Der er ikke nok hukommelse til at udf�re \ -denne operation.\nAfslut et eller flere aktive programmer for at frig�re \ -hukommelse, og pr�v igen." +STRING_OUT_OF_MEMORY, "Der er ikke nok hukommelse til at udføre \ +denne operation.\nAfslut et eller flere aktive programmer for at frigøre \ +hukommelse, og prøv igen." + +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Denne fil indeholder Unicode-tegn, som vil gå tabt, hvis\n\ +du gemmer denne fil med %s som kodning.\n\ +For at beholde disse tegn, skal du klikke på Annuller og derefter vælge\n\ +en af Unicode mulighederne i Kodnings rullelisten.\n\ +Fortsæt?" }

1 0

Andrew Nguyen : gdi32: Fix parameter handling of GetBoundsRect.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: 9d5a848df103e2cb594a259e31897d5f355595bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5a848df103e2cb594a259e3… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 1 08:03:24 2010 -0500 gdi32: Fix parameter handling of GetBoundsRect. --- dlls/gdi32/dc.c | 10 +++++-- dlls/gdi32/tests/dc.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 5f304a2..f3a62bd 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1534,9 +1534,13 @@ UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags) if ( !dc ) return 0; - if (rect) *rect = dc->BoundsRect; - - ret = ((dc->flags & DC_BOUNDS_SET) ? DCB_SET : DCB_RESET); + if (rect) + { + *rect = dc->BoundsRect; + ret = ((dc->flags & DC_BOUNDS_SET) ? DCB_SET : DCB_RESET); + } + else + ret = 0; if (flags & DCB_RESET) { diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 687a98f..b081376 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -494,6 +494,68 @@ todo_wine ok(ret, "UnregisterClassA failed\n"); } +static void test_boundsrect_invalid(void) +{ + HDC hdc; + RECT rect, expect; + UINT ret; + + hdc = GetDC(NULL); + ok(hdc != NULL, "GetDC failed\n"); + + ret = GetBoundsRect(hdc, NULL, 0); + ok(ret == 0 || + broken(ret == DCB_RESET), /* Win9x */ + "Expected GetBoundsRect to return 0, got %u\n", ret); + + ret = GetBoundsRect(hdc, NULL, ~0U); + ok(ret == 0 || + broken(ret == DCB_RESET), /* Win9x */ + "Expected GetBoundsRect to return 0, got %u\n", ret); + + if (GetBoundsRect(hdc, NULL, 0) == DCB_RESET) + win_skip("Win9x fails catastrophically with first GetBoundsRect call\n"); + else + { + /* Test parameter handling order. */ + SetRect(&rect, 0, 0, 50, 50); + ret = SetBoundsRect(hdc, &rect, DCB_SET); + ok(ret & DCB_RESET, + "Expected return flag DCB_RESET to be set, got %u\n", ret); + + ret = GetBoundsRect(hdc, NULL, DCB_RESET); + ok(ret == 0, + "Expected GetBoundsRect to return 0, got %u\n", ret); + + ret = GetBoundsRect(hdc, &rect, 0); + ok(ret == DCB_RESET, + "Expected GetBoundsRect to return DCB_RESET, got %u\n", ret); + SetRect(&expect, 0, 0, 0, 0); + ok(EqualRect(&rect, &expect), + "Expected output rectangle (0,0)-(0,0), got (%d,%d)-(%d,%d)\n", + rect.left, rect.top, rect.right, rect.bottom); + } + + if (GetBoundsRect(hdc, NULL, 0) == DCB_RESET) + win_skip("Win9x fails catastrophically with NULL device context parameter\n"); + else + { + ret = GetBoundsRect(NULL, NULL, 0); + ok(ret == 0, "Expected GetBoundsRect to return 0, got %u\n", ret); + + ret = GetBoundsRect(NULL, NULL, ~0U); + ok(ret == 0, "Expected GetBoundsRect to return 0, got %u\n", ret); + + ret = SetBoundsRect(NULL, NULL, 0); + ok(ret == 0, "Expected SetBoundsRect to return 0, got %u\n", ret); + + ret = SetBoundsRect(NULL, NULL, ~0U); + ok(ret == 0, "Expected SetBoundsRect to return 0, got %u\n", ret); + } + + DeleteDC(hdc); +} + START_TEST(dc) { test_savedc(); @@ -502,4 +564,5 @@ START_TEST(dc) test_CreateCompatibleDC(); test_DC_bitmap(); test_DeleteDC(); + test_boundsrect_invalid(); }

1 0

Andrew Nguyen : gdi32/tests: Uncomment and enhance a Win9x-specific Restore /SaveDC test.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: 682f0dcf1a8e121461dd98af7d04285ead067812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=682f0dcf1a8e121461dd98af7… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 1 08:03:11 2010 -0500 gdi32/tests: Uncomment and enhance a Win9x-specific Restore/SaveDC test. --- dlls/gdi32/tests/dc.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 193832c..687a98f 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -162,15 +162,35 @@ static void test_savedc(void) ret = RestoreDC(hdc, 3); ok(!ret, "ret = %d\n", ret); - /* Under win98 the following two succeed and both clear the save stack + /* Under Win9x the following RestoreDC call succeeds and clears the save stack. */ + ret = RestoreDC(hdc, -3); + ok(!ret || + broken(ret), /* Win9x */ + "ret = %d\n", ret); + + /* Trying to clear an empty save stack fails. */ ret = RestoreDC(hdc, -3); ok(!ret, "ret = %d\n", ret); + + ret = SaveDC(hdc); + ok(ret == 3 || + broken(ret == 1), /* Win9x */ + "ret = %d\n", ret); + + /* Under Win9x the following RestoreDC call succeeds and clears the save stack. */ + ret = RestoreDC(hdc, 0); + ok(!ret || + broken(ret), /* Win9x */ + "ret = %d\n", ret); + + /* Trying to clear an empty save stack fails. */ ret = RestoreDC(hdc, 0); ok(!ret, "ret = %d\n", ret); - */ ret = RestoreDC(hdc, 1); - ok(ret, "ret = %d\n", ret); + ok(ret || + broken(!ret), /* Win9x */ + "ret = %d\n", ret); DeleteDC(hdc); }

1 0

Matteo Bruni : d3dx9: Make D3DXCompileShader stub more verbose.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: bc4221740170dbacbda7f27c560e16eb2678ee56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc4221740170dbacbda7f27c5… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Mon May 31 20:01:12 2010 +0200 d3dx9: Make D3DXCompileShader stub more verbose. --- dlls/d3dx9_36/shader.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 3aeaf78..b226fa6 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -644,9 +644,13 @@ HRESULT WINAPI D3DXCompileShader(LPCSTR pSrcData, LPD3DXBUFFER* ppErrorMsgs, LPD3DXCONSTANTTABLE * ppConstantTable) { - FIXME("(%p, %d, %p, %p, %p, %p, %d, %p, %p, %p): stub\n", - pSrcData, srcDataLen, pDefines, pInclude, pFunctionName, - pProfile, Flags, ppShader, ppErrorMsgs, ppConstantTable); + FIXME("(%p, %d, %p, %p, %s, %s, %x, %p, %p, %p): stub\n", + pSrcData, srcDataLen, pDefines, pInclude, debugstr_a(pFunctionName), + debugstr_a(pProfile), Flags, ppShader, ppErrorMsgs, ppConstantTable); + + TRACE("Shader source:\n"); + TRACE("%s\n", debugstr_an(pSrcData, srcDataLen)); + return D3DERR_INVALIDCALL; }

1 0

Matteo Bruni : d3dx9: Remove stray debug trace.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: b45a17c7b3abf98ae7584ac7d892d14a4e3662bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45a17c7b3abf98ae7584ac7d… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Jun 1 01:33:36 2010 +0200 d3dx9: Remove stray debug trace. --- dlls/d3dx9_36/bytecodewriter.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c index 84fefee..7e7cace 100644 --- a/dlls/d3dx9_36/bytecodewriter.c +++ b/dlls/d3dx9_36/bytecodewriter.c @@ -829,7 +829,6 @@ static void instr_handler(struct bc_writer *This, const struct instruction *instr, struct bytecode_buffer *buffer) { DWORD token = d3d9_opcode(instr->opcode); - TRACE("token: %x\n", token); This->funcs->opcode(This, instr, token, buffer); if(instr->has_dst) This->funcs->dstreg(This, &instr->dst, buffer, instr->shift, instr->dstmod);

1 0

← Newer
1
...
60
61
62
63
64
65
66
67
Older →

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 2010