wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Akihiro Sagawa : cryptui: Update Japanese translation.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 365e7244af7d49a0b7c0e6acc65809ee699e2734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=365e7244af7d49a0b7c0e6acc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Oct 16 22:58:29 2010 +0900 cryptui: Update Japanese translation. --- dlls/cryptui/cryptui_Ja.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/cryptui_Ja.rc b/dlls/cryptui/cryptui_Ja.rc index bd14ad6..f708476 100644 --- a/dlls/cryptui/cryptui_Ja.rc +++ b/dlls/cryptui/cryptui_Ja.rc @@ -418,6 +418,7 @@ BEGIN END IDD_EXPORT_FORMAT DIALOG 0,0,317,143 +CAPTION "証明書エクスポートウィザード" FONT 8, "MS Shell Dlg" BEGIN LTEXT "形式を選択してください:", -1, 21,1,195,10

1 0

Trygve Vea : oleaut32: Updated Norwegian translation.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: c6cd67cad448581f595571bc4569fb75f341a9a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6cd67cad448581f595571bc4… Author: Trygve Vea <trygve.vea(a)gmail.com> Date: Sat Oct 16 09:22:23 2010 +0200 oleaut32: Updated Norwegian translation. --- dlls/oleaut32/oleaut32_No.rc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut32_No.rc b/dlls/oleaut32/oleaut32_No.rc index f1b6d63..8dbd0ef 100644 --- a/dlls/oleaut32/oleaut32_No.rc +++ b/dlls/oleaut32/oleaut32_No.rc @@ -20,6 +20,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE @@ -28,6 +30,6 @@ STRINGTABLE IDS_FALSE "Usann" IDS_YES "Ja" IDS_NO "Nei" - IDS_ON "P�" + IDS_ON "På" IDS_OFF "Av" }

1 0

Trygve Vea : oledlg: Updated Norwegian translation.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: fa485ccd12f94dc880bbb5e0652472e03cfa7f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa485ccd12f94dc880bbb5e06… Author: Trygve Vea <trygve.vea(a)gmail.com> Date: Sat Oct 16 09:14:16 2010 +0200 oledlg: Updated Norwegian translation. --- dlls/oledlg/oledlg_No.rc | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/oledlg/oledlg_No.rc b/dlls/oledlg/oledlg_No.rc index fc3aea6..ef1d430 100644 --- a/dlls/oledlg/oledlg_No.rc +++ b/dlls/oledlg/oledlg_No.rc @@ -1,5 +1,6 @@ /* - * Copyright 2005-2008 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2008 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2010 Trygve Vea <trygve.vea(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 @@ -18,6 +19,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL UIINSERTOBJECT DIALOG 0, 0, 294, 151 @@ -28,7 +31,7 @@ BEGIN LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "Objekttypee:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + LTEXT "Objekttype:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE DEFPUSHBUTTON "OK",IDOK,221,7,66,14 PUSHBUTTON "Avbryt",IDCANCEL,221,24,66,14 GROUPBOX "Resultat",IDC_RESULT,7,103,208,41 @@ -50,9 +53,9 @@ END STRINGTABLE { IDS_RESULTOBJDESC "Sett inn et nytt %s-objekt i dokumentet" - IDS_RESULTFILEOBJDESC "Sett filens innhold inn som et objekt i dokumentet, s�nn at du kan aktivere det ved hjelp av programmet som laget den." - IDS_BROWSE "Bla" - IDS_NOTOLEMOD "Filen ser ikke ut til � v�re en gyldig OLE-modul. Kunne ikke registrere OLE-kontroller." + IDS_RESULTFILEOBJDESC "Sett filens innhold inn som et objekt i dokumentet, slik at du kan aktivere det ved hjelp av programmet som laget den." + IDS_BROWSE "Bla gjennom" + IDS_NOTOLEMOD "Filen ser ikke ut til å være en gyldig OLE-modul. Kunne ikke registrere OLE-kontroller." IDS_NOTOLEMODCAPTION "Legg til kontroller" } @@ -85,11 +88,11 @@ END STRINGTABLE { IDS_PS_PASTE_DATA "Setter innholdet fra utklippstavlen inn i dokumentet som %s." - IDS_PS_PASTE_OBJECT "Setter innholdet fra utklippstavlen inn i dokumentet s� du kan aktivere det med %s." - IDS_PS_PASTE_OBJECT_AS_ICON "Setter innholdet fra utklippstavlen inn i dokumentet s� du kan aktivere det med %s. Det vises som et ikon." - IDS_PS_PASTE_LINK_DATA "Setter innholdet fra utklippstavlen inn i dokumentet som %s. Det kobles til kildefilen s� endrer i denne ogs� skjer i dokumentet." - IDS_PS_PASTE_LINK_OBJECT "Setter inn et bilde av utklippstavleinnholdet i dokumentet. Bildet kobles til kildefilen s� endringer i denne ogs� skjer i dokumentet ." - IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Setter inn en snarvei som peker til plasseringen av innholdet p� utklippstavlen. Snarveien kobles til kildefilen s� endringer i denne ogs� skjer i dokumentet." + IDS_PS_PASTE_OBJECT "Setter innholdet fra utklippstavlen inn i dokumentet så du kan aktivere det med %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Setter innholdet fra utklippstavlen inn i dokumentet så du kan aktivere det med %s. Det vises som et ikon." + IDS_PS_PASTE_LINK_DATA "Setter innholdet fra utklippstavlen inn i dokumentet som %s. Det kobles til kildefilen så endringer i denne også skjer i dokumentet." + IDS_PS_PASTE_LINK_OBJECT "Setter inn et bilde av utklippstavleinnholdet i dokumentet. Bildet kobles til kildefilen så endringer i denne også skjer i dokumentet." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Setter inn en snarvei som peker til plasseringen av innholdet på utklippstavlen. Snarveien kobles til kildefilen så endringer i denne også skjer i dokumentet." IDS_PS_NON_OLE "Setter innholdet fra utklippstavlen inn i dokumentet." IDS_PS_UNKNOWN_TYPE "Ukjent type" IDS_PS_UNKNOWN_SRC "Ukjent kilde"

1 0

Trygve Vea : shell32: Updated Norwegian translation.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 9211eddb173664e7a9a32fbcfcc62d1d70bc5faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9211eddb173664e7a9a32fbcf… Author: Trygve Vea <trygve.vea(a)gmail.com> Date: Sat Oct 16 00:43:57 2010 +0200 shell32: Updated Norwegian translation. --- dlls/shell32/shell32_No.rc | 41 +++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shell32_No.rc b/dlls/shell32/shell32_No.rc index 0e2aa85..f2ec05a 100644 --- a/dlls/shell32/shell32_No.rc +++ b/dlls/shell32/shell32_No.rc @@ -1,5 +1,6 @@ /* * Copyright 2005-2009 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2010 Trygve Vea <trygve.vea(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 @@ -25,7 +26,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL MENU_001 MENU BEGIN MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON - MENUITEM "&Små ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "S&må ikoner", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END @@ -105,7 +106,7 @@ BEGIN POPUP "&Vis" BEGIN MENUITEM "&Store ikoner", FCIDM_SHVIEW_BIGICON - MENUITEM "&Små ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "S&må ikoner", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END @@ -182,13 +183,13 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" FONT 8, "MS Shell Dlg" { - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Skriv inn navnet på programmet, mappen, dokumentet etter Internett-ressursen du ønsker å åpne.", 12289, 36, 11, 182, 18 - LTEXT "&Åpne:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE + LTEXT "Skriv inn navnet på programmet, mappen, dokumentet, eller Internett-ressursen du ønsker å åpne.", IDC_RUNDLG_DESCRIPTION, 36, 11, 182, 18 + LTEXT "&Åpne:", IDC_RUNDLG_LABEL, 7, 39, 24, 10 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Avbryt", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Bla...", 12288, 170, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "&Bla gjennom...", IDC_RUNDLG_BROWSE, 170, 63, 50, 14, WS_TABSTOP } STRINGTABLE @@ -230,19 +231,19 @@ STRINGTABLE IDS_CREATEFOLDER_CAPTION "Klarte ikke opprette ny mappe" IDS_DELETEITEM_CAPTION "Bekreft filsletting" IDS_DELETEFOLDER_CAPTION "Bekreft sletting av mappe" - IDS_DELETEITEM_TEXT "Virkelig slette «%1»?" - IDS_DELETEMULTIPLE_TEXT "Virkelig slette disse %1 elementene?" - IDS_DELETESELECTED_TEXT "Virkelig slette valgte element(er)??" - IDS_TRASHITEM_TEXT "Virkelig legge «%1» i papirkurven?" - IDS_TRASHFOLDER_TEXT "Virkelig legge «%1» og alt innholdet i papirkurven?" - IDS_TRASHMULTIPLE_TEXT "Virkelig legge disse %1 valgte elementene i papirkurven?" + IDS_DELETEITEM_TEXT "Vil du virkelig slette «%1»?" + IDS_DELETEMULTIPLE_TEXT "Vil du virkelig slette disse %1 elementene?" + IDS_DELETESELECTED_TEXT "Vil du virkelig slette valgte element(er)??" + IDS_TRASHITEM_TEXT "Vil du virkelig legge «%1» i papirkurven?" + IDS_TRASHFOLDER_TEXT "Vil du virkelig legge «%1» og alt innholdet i papirkurven?" + IDS_TRASHMULTIPLE_TEXT "Vil du virkelig legge disse %1 valgte elementene i papirkurven?" IDS_CANTTRASH_TEXT "Elementet «%1» kan ikke legges i papirkurven. Vil du slette det i stedet?" - IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" + IDS_OVERWRITEFILE_TEXT "Denne mappen inneholder allerede en fil med navn «%1».\n\nVil du erstatte den?" IDS_OVERWRITEFILE_CAPTION "Bekreft overskriving av fil" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "Denne mappen inneholder allerede en mappe med navn «%1».\n\n"\ + "Hvis filene i mappen du kopierer til heter det samme som filene i mappen du\n"\ + "kopierer fra, vil disse bli erstattet. Ønsker du fortsatt å flytte eller kopiere\n"\ + "denne mappen?" /* message box strings */ IDS_RESTART_TITLE "Starte på nytt" @@ -252,8 +253,8 @@ STRINGTABLE /* Run File dialog */ IDS_RUNDLG_ERROR "Klarte ikke vise Kjør-vinduet (intern feil)" - IDS_RUNDLG_BROWSE_ERROR "Klarte ikke vise Bla-vinduet (intern feil)" - IDS_RUNDLG_BROWSE_CAPTION "Bla" + IDS_RUNDLG_BROWSE_ERROR "Klarte ikke vise Bla gjennom-vinduet (intern feil)" + IDS_RUNDLG_BROWSE_CAPTION "Bla gjennom" IDS_RUNDLG_BROWSE_FILTER "Programfiler\0*.exe\0Alle filer\0*.*\0\0" /* shell folder path default values */

1 0

Trygve Vea : wineconsole: Updated Norwegian translation.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 6f5502bed1123bd9cad2e9e5595609c1e27b9d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f5502bed1123bd9cad2e9e55… Author: Trygve Vea <trygve.vea(a)gmail.com> Date: Fri Oct 15 23:56:06 2010 +0200 wineconsole: Updated Norwegian translation. --- programs/wineconsole/wineconsole_No.rc | 59 +++++++++++++++++--------------- 1 files changed, 31 insertions(+), 28 deletions(-) diff --git a/programs/wineconsole/wineconsole_No.rc b/programs/wineconsole/wineconsole_No.rc index 64fd5b3..6accaef 100644 --- a/programs/wineconsole/wineconsole_No.rc +++ b/programs/wineconsole/wineconsole_No.rc @@ -1,5 +1,6 @@ /* - * Copyright 2005-2006 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2006 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2010 Trygve Vea <trygve.vea(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 @@ -18,6 +19,8 @@ #include "wineconsole_res.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE @@ -30,25 +33,25 @@ IDS_COPY, "&Kopier" IDS_PASTE, "&Lim inn" IDS_SELECTALL, "Merk &alt" IDS_SCROLL, "&Rull" -IDS_SEARCH, "&S�k" -IDS_FNT_DISPLAY, "Hvert tegn er %ld piksler bredt og %ld piksler h�yt" +IDS_SEARCH, "&Søk" +IDS_FNT_DISPLAY, "Hvert tegn er %ld piksler bredt og %ld piksler høyt" IDS_FNT_PREVIEW, "Dette er en test" -IDS_DLG_TIT_DEFAULT, "Standardinnstillinger" -IDS_DLG_TIT_CURRENT, "Gjeldende innstillinger" -IDS_DLG_TIT_ERROR, "Oppsettsfeil" -IDS_DLG_ERR_SBWINSIZE, "Skjermens hurtigminnest�rrelse m� v�re st�rre eller lik vinduets" +IDS_DLG_TIT_DEFAULT, "Oppsett - Standardinnstillinger" +IDS_DLG_TIT_CURRENT, "Oppsett - Gjeldende innstillinger" +IDS_DLG_TIT_ERROR, "Konfigurasjonsfeil" +IDS_DLG_ERR_SBWINSIZE, "Skjermens hurtigminnestørrelse må være større eller lik vinduets" -IDS_CMD_INVALID_EVENT_ID "wineconsole: Klarte ikke lese hendelses-id\n" +IDS_CMD_INVALID_EVENT_ID "wineconsole: Klarte ikke lese hendelse-id\n" IDS_CMD_INVALID_BACKEND "wineconsole: Ugyldig motor\n" -IDS_CMD_INVALID_OPTION "wineconsole: Ukjent kommandolinjevalg\n" +IDS_CMD_INVALID_OPTION "wineconsole: Ukjent kommandolinjeopsjon\n" IDS_CMD_ABOUT "Starter et program i en Wine-konsoll\n" -IDS_CMD_LAUNCH_FAILED "wineconsole: Klarte ikke starte programmet �%sx.\n"\ - "Kommandoen er ugyldig.\n" +IDS_CMD_LAUNCH_FAILED "wineconsole: Klarte ikke å starte programmet %s.\n"\ + "Ugyldig kommando.\n" IDS_USAGE_HEADER "\nBruk:\n wineconsole [alternativer] <kommando>\n\nAlternativer:\n" -IDS_USAGE_BACKEND " --backend={user|curses} �user� lager et nyttt vindu, mens �curses�\n"\ - " pr�ve � bruke gjeldende terminal som Wine-konsoll\n" -IDS_USAGE_COMMAND " <kommando> Wine-programmet som skal kj�res i konsollet\n" +IDS_USAGE_BACKEND " --backend={user|curses} «user» lager et nytt vindu, mens «curses»\n"\ + " prøve å bruke gjeldende terminal som Wine-konsoll\n" +IDS_USAGE_COMMAND " <kommando> Wine-programmet som skal kjøres i konsollet\n" IDS_USAGE_FOOTER "\nEksempel:\n wineconsole cmd\nStarter Wine-ledeteksten i et Wine-konsoll\n\n" END @@ -58,20 +61,20 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION " Innstillinger " FONT 8, "MS Shell Dlg" { - GROUPBOX "Pekerst�rrelse", -1, 10, 11, 60, 44, BS_GROUPBOX + GROUPBOX "Pekerstørrelse", -1, 10, 11, 60, 44, BS_GROUPBOX AUTORADIOBUTTON "&Liten", IDC_OPT_CURSOR_SMALL, 14, 23, 44, 10, WS_TABSTOP AUTORADIOBUTTON "&Middels", IDC_OPT_CURSOR_MEDIUM, 14, 33, 44, 10, WS_TABSTOP AUTORADIOBUTTON "&Stor", IDC_OPT_CURSOR_LARGE, 14, 43, 44, 10, WS_TABSTOP - GROUPBOX "Control", -1, 75, 11, 125, 44, BS_GROUPBOX - LTEXT "Popup menu", -1, 79, 23, 40, 10 - AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 129, 23, 60, 10, WS_TABSTOP - AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 129, 33, 60, 10, WS_TABSTOP + GROUPBOX "Kontroll", -1, 75, 11, 125, 44, BS_GROUPBOX + LTEXT "Hurtigmeny", -1, 79, 23, 40, 10 + AUTOCHECKBOX "&Kontroll", IDC_OPT_CONF_CTRL, 129, 23, 60, 10, WS_TABSTOP + AUTOCHECKBOX "S&kift", IDC_OPT_CONF_SHIFT, 129, 33, 60, 10, WS_TABSTOP LTEXT "Rask redigering", -1, 79, 43, 50, 10 - AUTOCHECKBOX "Aktiv&er", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP + AUTOCHECKBOX "aktiv&er", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP GROUPBOX "Kommandohistorikk", -1, 10, 57, 190, 35, BS_GROUPBOX - LTEXT "A&ntall huskete kommandoer:", -1, 14, 67, 78, 18 + LTEXT "A&ntall huskede kommandoer:", -1, 14, 67, 78, 18 EDITTEXT IDC_OPT_HIST_SIZE, 92, 69, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 AUTOCHECKBOX "Fje&rn doble", IDC_OPT_HIST_NODOUBLE, 130, 67, 50, 18, WS_TABSTOP|BS_MULTILINE @@ -87,7 +90,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Farg&e", -1, 100, 5, 50, 8 CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16 CONTROL "", IDC_FNT_COLOR_BK, "WineConColorPreview", 0L, 100, 40, 48, 16 - LTEXT "&St�rrelse", -1, 158, 5, 40, 8 + LTEXT "&Størrelse", -1, 158, 5, 40, 8 LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 60, WS_VSCROLL CONTROL "", IDC_FNT_PREVIEW, "WineConFontPreview", 0L, 5, 60, 109, 40 LTEXT "", IDC_FNT_FONT_INFO, 128, 76, 80, 18 @@ -102,19 +105,19 @@ FONT 8, "MS Shell Dlg" LTEXT "&Bredde:", -1, 14, 25, 54, 9 EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - LTEXT "&H�yde:", -1, 14, 39, 54, 9 + LTEXT "&Høyde:", -1, 14, 39, 54, 9 EDITTEXT IDC_CNF_SB_HEIGHT, 68, 37, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - GROUPBOX "Vindust�rrelse", -1, 10, 55, 100, 42 + GROUPBOX "Vindustørrelse", -1, 10, 55, 100, 42 LTEXT "&Bredde:", -1, 14, 69, 54, 9 EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - LTEXT "H�yd&e:", -1, 14, 83, 54, 9 + LTEXT "Høyd&e:", -1, 14, 83, 54, 9 EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - GROUPBOX "Slutt p� program", -1, 115, 11, 80, 42, BS_GROUPBOX + GROUPBOX "Ved programslutt", -1, 115, 11, 80, 42, BS_GROUPBOX AUTOCHECKBOX "&Lukk konsoll", IDC_CNF_CLOSE_EXIT, 119, 25, 75, 20, WS_TABSTOP GROUPBOX "Utgave", -1, 115, 55, 80, 42 @@ -127,8 +130,8 @@ CAPTION "Konsoll-parametere" FONT 8, "MS Shell Dlg" { GROUPBOX "", -1, 10, 10, 120, 31, BS_GROUPBOX - AUTORADIOBUTTON "Behold disse innstillingene for kommende �kter", IDC_SAV_SAVE, 14, 15, 110, 10, WS_TABSTOP - AUTORADIOBUTTON "Endre kun gjeldende �kt", IDC_SAV_SESSION, 14, 27, 110, 10, WS_TABSTOP + AUTORADIOBUTTON "Behold disse innstillingene for kommende økter", IDC_SAV_SAVE, 14, 15, 110, 10, WS_TABSTOP + AUTORADIOBUTTON "Endre kun for gjeldende økt", IDC_SAV_SESSION, 14, 27, 110, 10, WS_TABSTOP PUSHBUTTON "OK", IDOK, 20, 45, 35, 12 PUSHBUTTON "Avbryt", IDCANCEL, 65, 45, 35, 12

1 0

Trygve Vea : msi: Updated Norwegian translation.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 6cb9f6ff2bca114fd282e46583f7fa5b76680cf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cb9f6ff2bca114fd282e4658… Author: Trygve Vea <trygve.vea(a)gmail.com> Date: Fri Oct 15 22:21:00 2010 +0200 msi: Updated Norwegian translation. --- dlls/msi/msi_No.rc | 55 +++++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 26 deletions(-) diff --git a/dlls/msi/msi_No.rc b/dlls/msi/msi_No.rc index d9e5938..4655957 100644 --- a/dlls/msi/msi_No.rc +++ b/dlls/msi/msi_No.rc @@ -1,7 +1,8 @@ /* - * Norwegian Bokm�l resources for MSI + * Norwegian Bokmål resources for MSI * - * Copyright 2005-2007 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2007 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2010 Trygve Vea <trygve.vea(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 @@ -20,38 +21,40 @@ #include "windef.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE { - 4 "Klarte ikke �pne den oppgitte installasjonspakken. Kontroller filbanen og pr�v igjen." - 5 "Fant ikke stien '%s'." - 9 "Sett i disk '%s'" + 4 "Klarte ikke å åpne den oppgitte installasjonspakken. Kontroller filbanen og prøv igjen." + 5 "fant ikke stien '%s'." + 9 "sett inn disk '%s'" 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ + "Bruk:\n" \ + "msiexec kommando {obligatorisk parameter} [valgfritt parameter]\n\n" \ + "Installere et produkt:\n" \ + "\t/i {pakke|produktkode} [egenskap]\n" \ + "\t/package {pakke|produktkode} [egenskap]\n" \ + "\t/a pakke [egenskap]\n" \ + "Reparere en installasjon:\n" \ + "\t/f[p|o|e|d|c|a|u|m|s|v] {pakke|produktkode}\n" \ + "Avinstallere et produkt:\n" \ + "\t/uninstall {pakke|produktkode} [egenskap]\n" \ + "\t/x {pakke|produktkode} [egenskap]\n" \ + "Annonsere et produkt:\n" \ + "\t/j[u|m] pakke [/t transformere] [/g språk-ID]\n" \ + "Installer patch:\n" \ + "\t/p patchpakke [egenskap]\n" \ + "\t/p patchpakke /a pakke [egenskap]\n" \ + "Logg og brukergrensesnitt-modifikatorer for overnevnte kommandoer:\n" \ + "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] loggfil\n" \ "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ + "Registrer MSI-tjeneste:\n" \ "\t/y\n" \ - "Unregister MSI Service:\n" \ + "Avregistrer MSI-tjeneste:\n" \ "\t/z\n" \ - "Display this help:\n" \ + "Vis denne hjelpeteksten:\n" \ "\t/help\n" \ "\t/?\n" 11 "Oppgi katalogen som inneholder '%s'."

1 0

Matteo Bruni : d3dx9: Report usage of unsupported sprite flags.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 454dce9162cf1493b5b483c9b7f82d4450b41698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=454dce9162cf1493b5b483c9b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 7 18:08:48 2010 +0200 d3dx9: Report usage of unsupported sprite flags. --- dlls/d3dx9_36/sprite.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index c7b4240..341efc1 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -219,7 +219,6 @@ static HRESULT WINAPI ID3DXSpriteImpl_Begin(LPD3DXSPRITE iface, DWORD flags) if(flags>D3DXSPRITE_FLAGLIMIT || This->ready) return D3DERR_INVALIDCALL; /* TODO: Implement flags: -D3DXSPRITE_ALPHABLEND: enables alpha blending D3DXSPRITE_BILLBOARD: makes the sprite always face the camera D3DXSPRITE_DONOTMODIFY_RENDERSTATE: name says it all D3DXSPRITE_OBJECTSPACE: do not change device transforms @@ -227,6 +226,15 @@ D3DXSPRITE_SORT_DEPTH_BACKTOFRONT: sort by position D3DXSPRITE_SORT_DEPTH_FRONTTOBACK: sort by position D3DXSPRITE_SORT_TEXTURE: sort by texture (so that it doesn't change too often) */ +/* Seems like alpha blending is always enabled, regardless of D3DXSPRITE_ALPHABLEND flag */ + if(flags & (D3DXSPRITE_BILLBOARD | + D3DXSPRITE_DONOTMODIFY_RENDERSTATE | D3DXSPRITE_OBJECTSPACE | + D3DXSPRITE_SORT_DEPTH_BACKTOFRONT)) + FIXME("Flags unsupported: %#x\n", flags); + /* These flags should only matter to performances */ + else if(flags & (D3DXSPRITE_SORT_DEPTH_FRONTTOBACK | D3DXSPRITE_SORT_TEXTURE)) + TRACE("Flags unsupported: %#x\n", flags); + if(This->vdecl==NULL) { static const D3DVERTEXELEMENT9 elements[] = {

1 0

Matteo Bruni : d3dx9: Store transform matrix per-sprite.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 40d57b70ed91d3aa6e4a693b231170481a61675e URL: http://source.winehq.org/git/wine.git/?a=commit;h=40d57b70ed91d3aa6e4a693b2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 5 23:06:15 2010 +0200 d3dx9: Store transform matrix per-sprite. --- dlls/d3dx9_36/d3dx9_36_private.h | 1 + dlls/d3dx9_36/sprite.c | 96 +++++++++++++++++++------------------ 2 files changed, 50 insertions(+), 47 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 6857196..b452a8f 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -119,6 +119,7 @@ typedef struct _SPRITE { D3DXVECTOR3 center; D3DXVECTOR3 pos; D3DCOLOR color; + D3DXMATRIX transform; } SPRITE; typedef struct ID3DXSpriteImpl diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index 1a0038e..c7b4240 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -204,7 +204,7 @@ static void set_states(ID3DXSpriteImpl *object) /* Matrices */ D3DXMatrixIdentity(&mat); IDirect3DDevice9_SetTransform(object->device, D3DTS_WORLD, &mat); - IDirect3DDevice9_SetTransform(object->device, D3DTS_VIEW, &mat); + IDirect3DDevice9_SetTransform(object->device, D3DTS_VIEW, &object->view); IDirect3DDevice9_GetViewport(object->device, &vp); D3DXMatrixOrthoOffCenterLH(&mat, vp.X+0.5f, (float)vp.Width+vp.X+0.5f, (float)vp.Height+vp.Y+0.5f, vp.Y+0.5f, vp.MinZ, vp.MaxZ); IDirect3DDevice9_SetTransform(object->device, D3DTS_PROJECTION, &mat); @@ -259,9 +259,6 @@ D3DXSPRITE_SORT_TEXTURE: sort by texture (so that it doesn't change too often) /* Apply device state */ set_states(This); - D3DXMatrixIdentity(&This->transform); - D3DXMatrixIdentity(&This->view); - This->flags=flags; This->ready=TRUE; @@ -323,6 +320,7 @@ static HRESULT WINAPI ID3DXSpriteImpl_Draw(LPD3DXSPRITE iface, LPDIRECT3DTEXTURE } else This->sprites[This->sprite_count].pos=*position; This->sprites[This->sprite_count].color=color; + This->sprites[This->sprite_count].transform=This->transform; This->sprite_count++; return D3D_OK; @@ -332,57 +330,61 @@ static HRESULT WINAPI ID3DXSpriteImpl_Flush(LPD3DXSPRITE iface) { ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; SPRITEVERTEX *vertices; - int i; + int i, count, start; TRACE("(%p)->(): relay\n", This); if(!This->ready) return D3DERR_INVALIDCALL; if(!This->sprite_count) return D3D_OK; /* TODO: use of a vertex buffer here */ - vertices=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SPRITEVERTEX)*4*This->sprite_count); - - for(i=0;i<This->sprite_count;i++) { - float spritewidth=(float)This->sprites[i].rect.right-(float)This->sprites[i].rect.left; - float spriteheight=(float)This->sprites[i].rect.bottom-(float)This->sprites[i].rect.top; - - vertices[4*i ].pos.x = This->sprites[i].pos.x - This->sprites[i].center.x; - vertices[4*i ].pos.y = This->sprites[i].pos.y - This->sprites[i].center.y; - vertices[4*i ].pos.z = This->sprites[i].pos.z - This->sprites[i].center.z; - vertices[4*i+1].pos.x = spritewidth + This->sprites[i].pos.x - This->sprites[i].center.x; - vertices[4*i+1].pos.y = This->sprites[i].pos.y - This->sprites[i].center.y; - vertices[4*i+1].pos.z = This->sprites[i].pos.z - This->sprites[i].center.z; - vertices[4*i+2].pos.x = spritewidth + This->sprites[i].pos.x - This->sprites[i].center.x; - vertices[4*i+2].pos.y = spriteheight + This->sprites[i].pos.y - This->sprites[i].center.y; - vertices[4*i+2].pos.z = This->sprites[i].pos.z - This->sprites[i].center.z; - vertices[4*i+3].pos.x = This->sprites[i].pos.x - This->sprites[i].center.x; - vertices[4*i+3].pos.y = spriteheight + This->sprites[i].pos.y - This->sprites[i].center.y; - vertices[4*i+3].pos.z = This->sprites[i].pos.z - This->sprites[i].center.z; - vertices[4*i ].col = This->sprites[i].color; - vertices[4*i+1].col = This->sprites[i].color; - vertices[4*i+2].col = This->sprites[i].color; - vertices[4*i+3].col = This->sprites[i].color; - vertices[4*i ].tex.x = (float)This->sprites[i].rect.left / (float)This->sprites[i].texw; - vertices[4*i ].tex.y = (float)This->sprites[i].rect.top / (float)This->sprites[i].texh; - vertices[4*i+1].tex.x = (float)This->sprites[i].rect.right / (float)This->sprites[i].texw; - vertices[4*i+1].tex.y = (float)This->sprites[i].rect.top / (float)This->sprites[i].texh; - vertices[4*i+2].tex.x = (float)This->sprites[i].rect.right / (float)This->sprites[i].texw; - vertices[4*i+2].tex.y = (float)This->sprites[i].rect.bottom / (float)This->sprites[i].texh; - vertices[4*i+3].tex.x = (float)This->sprites[i].rect.left / (float)This->sprites[i].texw; - vertices[4*i+3].tex.y = (float)This->sprites[i].rect.bottom / (float)This->sprites[i].texh; - } - - D3DXVec3TransformCoordArray(&vertices[0].pos, sizeof(SPRITEVERTEX), &vertices[0].pos, sizeof(SPRITEVERTEX), &This->transform, 4*This->sprite_count); - D3DXVec3TransformCoordArray(&vertices[0].pos, sizeof(SPRITEVERTEX), &vertices[0].pos, sizeof(SPRITEVERTEX), &This->view, 4*This->sprite_count); - - IDirect3DDevice9_SetVertexDeclaration(This->device, This->vdecl); + vertices=HeapAlloc(GetProcessHeap(), 0, sizeof(SPRITEVERTEX)*6*This->sprite_count); + + for(start=0;start<This->sprite_count;start+=count,count=0) { + i=start; + while(i<This->sprite_count && + (count==0 || This->sprites[i].texture==This->sprites[i-1].texture)) { + float spritewidth=(float)This->sprites[i].rect.right-(float)This->sprites[i].rect.left; + float spriteheight=(float)This->sprites[i].rect.bottom-(float)This->sprites[i].rect.top; + + vertices[6*i ].pos.x = This->sprites[i].pos.x - This->sprites[i].center.x; + vertices[6*i ].pos.y = This->sprites[i].pos.y - This->sprites[i].center.y; + vertices[6*i ].pos.z = This->sprites[i].pos.z - This->sprites[i].center.z; + vertices[6*i+1].pos.x = spritewidth + This->sprites[i].pos.x - This->sprites[i].center.x; + vertices[6*i+1].pos.y = This->sprites[i].pos.y - This->sprites[i].center.y; + vertices[6*i+1].pos.z = This->sprites[i].pos.z - This->sprites[i].center.z; + vertices[6*i+2].pos.x = spritewidth + This->sprites[i].pos.x - This->sprites[i].center.x; + vertices[6*i+2].pos.y = spriteheight + This->sprites[i].pos.y - This->sprites[i].center.y; + vertices[6*i+2].pos.z = This->sprites[i].pos.z - This->sprites[i].center.z; + vertices[6*i+3].pos.x = This->sprites[i].pos.x - This->sprites[i].center.x; + vertices[6*i+3].pos.y = spriteheight + This->sprites[i].pos.y - This->sprites[i].center.y; + vertices[6*i+3].pos.z = This->sprites[i].pos.z - This->sprites[i].center.z; + vertices[6*i ].col = This->sprites[i].color; + vertices[6*i+1].col = This->sprites[i].color; + vertices[6*i+2].col = This->sprites[i].color; + vertices[6*i+3].col = This->sprites[i].color; + vertices[6*i ].tex.x = (float)This->sprites[i].rect.left / (float)This->sprites[i].texw; + vertices[6*i ].tex.y = (float)This->sprites[i].rect.top / (float)This->sprites[i].texh; + vertices[6*i+1].tex.x = (float)This->sprites[i].rect.right / (float)This->sprites[i].texw; + vertices[6*i+1].tex.y = (float)This->sprites[i].rect.top / (float)This->sprites[i].texh; + vertices[6*i+2].tex.x = (float)This->sprites[i].rect.right / (float)This->sprites[i].texw; + vertices[6*i+2].tex.y = (float)This->sprites[i].rect.bottom / (float)This->sprites[i].texh; + vertices[6*i+3].tex.x = (float)This->sprites[i].rect.left / (float)This->sprites[i].texw; + vertices[6*i+3].tex.y = (float)This->sprites[i].rect.bottom / (float)This->sprites[i].texh; + + vertices[6*i+4]=vertices[6*i]; + vertices[6*i+5]=vertices[6*i+2]; + + D3DXVec3TransformCoordArray(&vertices[6*i].pos, sizeof(SPRITEVERTEX), + &vertices[6*i].pos, sizeof(SPRITEVERTEX), + &This->sprites[i].transform, 6); + count++; + i++; + } - for(i=0;i<This->sprite_count;i++) { - if(!i) - IDirect3DDevice9_SetTexture(This->device, 0, (LPDIRECT3DBASETEXTURE9)(This->sprites[i].texture)); - else if(This->sprites[i].texture!=This->sprites[i-1].texture) - IDirect3DDevice9_SetTexture(This->device, 0, (LPDIRECT3DBASETEXTURE9)(This->sprites[i].texture)); + IDirect3DDevice9_SetTexture(This->device, 0, (LPDIRECT3DBASETEXTURE9)(This->sprites[start].texture)); + IDirect3DDevice9_SetVertexDeclaration(This->device, This->vdecl); - IDirect3DDevice9_DrawPrimitiveUP(This->device, D3DPT_TRIANGLEFAN, 2, vertices+4*i, sizeof(SPRITEVERTEX)); + IDirect3DDevice9_DrawPrimitiveUP(This->device, D3DPT_TRIANGLELIST, 2*count, vertices+6*start, sizeof(SPRITEVERTEX)); } HeapFree(GetProcessHeap(), 0, vertices);

1 0

Matteo Bruni : d3dx9: Fix D3DXFilterTexture return value.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 550abd41a28ed0421c5975a419e9762c8c9eaadd URL: http://source.winehq.org/git/wine.git/?a=commit;h=550abd41a28ed0421c5975a41… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 6 19:27:11 2010 +0200 d3dx9: Fix D3DXFilterTexture return value. --- dlls/d3dx9_36/tests/texture.c | 20 +++++++------------- dlls/d3dx9_36/texture.c | 3 --- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 05ccec4..6f6c43d 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -359,11 +359,10 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) hr = D3DXCreateTextureFromResourceA(device, NULL, MAKEINTRESOURCEA(IDB_BITMAP_1x1), &texture); ok(hr == D3D_OK, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); - - hr = D3DXCreateTextureFromResourceA(device, NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), &texture); - ok(hr == D3D_OK, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3D_OK); - if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); } + hr = D3DXCreateTextureFromResourceA(device, NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); hr = D3DXCreateTextureFromResourceA(device, NULL, MAKEINTRESOURCEA(IDS_STRING), &texture); ok(hr == D3DXERR_INVALIDDATA, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); @@ -379,11 +378,9 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) /* D3DXCreateTextureFromResourceEx */ - todo_wine { - hr = D3DXCreateTextureFromResourceExA(device, NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); - ok(hr == D3D_OK, "D3DXCreateTextureFromResourceEx returned %#x, expected %#x\n", hr, D3D_OK); - if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); - } + hr = D3DXCreateTextureFromResourceExA(device, NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromResourceEx returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); hr = D3DXCreateTextureFromResourceExA(device, NULL, MAKEINTRESOURCEA(IDS_STRING), D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); ok(hr == D3DXERR_INVALIDDATA, "D3DXCreateTextureFromResourceEx returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); @@ -413,10 +410,7 @@ static void test_D3DXFilterTexture(IDirect3DDevice9 *device) hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 0, D3DX_FILTER_BOX + 1); /* Invalid filter */ ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 5, D3DX_FILTER_NONE); /* Last miplevel */ - ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - - hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 20, D3DX_FILTER_NONE); /* Invalid miplevel */ + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 5, D3DX_FILTER_NONE); /* Invalid miplevel */ ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); } else diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 4f7c284..2ae818f 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -99,9 +99,6 @@ HRESULT WINAPI D3DXFilterTexture(LPDIRECT3DBASETEXTURE9 texture, IDirect3DSurface9_Release(topsurf); - if (level == srclevel + 1) - return D3DERR_INVALIDCALL; - return D3D_OK; }

1 0

Matteo Bruni : d3dx9: Search for a compatible pixel format in D3DXCheckTextureRequirements.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: ebbf519b782d1523f90c3e6e5bbb9161733daf18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebbf519b782d1523f90c3e6e5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 5 21:58:59 2010 +0200 d3dx9: Search for a compatible pixel format in D3DXCheckTextureRequirements. --- dlls/d3dx9_36/d3dx9_36_private.h | 2 +- dlls/d3dx9_36/tests/texture.c | 43 +++++++++++++- dlls/d3dx9_36/texture.c | 116 ++++++++++++++++++++++++++++++-------- dlls/d3dx9_36/util.c | 9 +++ 4 files changed, 143 insertions(+), 27 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 9598090..6857196 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -48,7 +48,7 @@ HRESULT map_view_of_file(LPCWSTR filename, LPVOID *buffer, DWORD *length); HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, DWORD *length); const PixelFormatDesc *get_format_info(D3DFORMAT format); - +const PixelFormatDesc *get_format_info_idx(int idx); extern const ID3DXBufferVtbl D3DXBuffer_Vtbl; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 3764089..05ccec4 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -27,9 +27,12 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) { UINT width, height, mipmaps; - D3DFORMAT format; + D3DFORMAT format, expected; D3DCAPS9 caps; HRESULT hr; + IDirect3D9 *d3d; + D3DDEVICE_CREATION_PARAMETERS params; + D3DDISPLAYMODE mode; IDirect3DDevice9_GetDeviceCaps(device, &caps); @@ -145,15 +148,51 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(hr == D3DERR_INVALIDCALL, "D3DXCheckTextureRequirements succeeded, but should've failed.\n"); /* format */ + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + format = D3DFMT_UNKNOWN; hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, &format, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", format, D3DFMT_A8R8G8B8); - format = 0; + format = D3DX_DEFAULT; hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, &format, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", format, D3DFMT_A8R8G8B8); + + format = D3DFMT_R8G8B8; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(format == D3DFMT_X8R8G8B8, "Returned format %u, expected %u\n", format, D3DFMT_X8R8G8B8); + + IDirect3DDevice9_GetDirect3D(device, &d3d); + IDirect3DDevice9_GetCreationParameters(device, &params); + IDirect3DDevice9_GetDisplayMode(device, 0, &mode); + + if(SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, + mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_R3G3B2))) + expected = D3DFMT_R3G3B2; + else + expected = D3DFMT_X4R4G4B4; + + format = D3DFMT_R3G3B2; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(format == expected, "Returned format %u, expected %u\n", format, expected); + + if(SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, + mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_A8R3G3B2))) + expected = D3DFMT_A8R3G3B2; + else + expected = D3DFMT_A8R8G8B8; + + format = D3DFMT_A8R3G3B2; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(format == expected, "Returned format %u, expected %u\n", format, expected); + + IDirect3D9_Release(d3d); } static void test_D3DXCreateTexture(IDirect3DDevice9 *device) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 2ebc85a..4f7c284 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -122,6 +122,11 @@ HRESULT WINAPI D3DXCheckTextureRequirements(LPDIRECT3DDEVICE9 device, UINT w = (width && *width) ? *width : 1; UINT h = (height && *height) ? *height : 1; D3DCAPS9 caps; + D3DDEVICE_CREATION_PARAMETERS params; + IDirect3D9 *d3d = NULL; + D3DDISPLAYMODE mode; + HRESULT hr; + D3DFORMAT usedformat = D3DFMT_UNKNOWN; TRACE("(%p, %p, %p, %p, %u, %p, %u)\n", device, width, height, miplevels, usage, format, pool); @@ -129,8 +134,9 @@ HRESULT WINAPI D3DXCheckTextureRequirements(LPDIRECT3DDEVICE9 device, return D3DERR_INVALIDCALL; /* usage */ - if ((usage != D3DX_DEFAULT) && - (usage & (D3DUSAGE_WRITEONLY | D3DUSAGE_DONOTCLIP | D3DUSAGE_POINTS | D3DUSAGE_RTPATCHES | D3DUSAGE_NPATCHES))) + if (usage == D3DX_DEFAULT) + usage = 0; + if (usage & (D3DUSAGE_WRITEONLY | D3DUSAGE_DONOTCLIP | D3DUSAGE_POINTS | D3DUSAGE_RTPATCHES | D3DUSAGE_NPATCHES)) return D3DERR_INVALIDCALL; /* pool */ @@ -202,44 +208,106 @@ HRESULT WINAPI D3DXCheckTextureRequirements(LPDIRECT3DDEVICE9 device, /* format */ if (format) { - D3DDEVICE_CREATION_PARAMETERS params; - IDirect3D9 *d3d = NULL; - D3DDISPLAYMODE mode; - HRESULT hr; + TRACE("Requested format %x\n", *format); + usedformat = *format; + } - hr = IDirect3DDevice9_GetDirect3D(device, &d3d); + hr = IDirect3DDevice9_GetDirect3D(device, &d3d); - if (FAILED(hr)) - goto cleanup; + if (FAILED(hr)) + goto cleanup; - hr = IDirect3DDevice9_GetCreationParameters(device, &params); + hr = IDirect3DDevice9_GetCreationParameters(device, &params); - if (FAILED(hr)) - goto cleanup; + if (FAILED(hr)) + goto cleanup; - hr = IDirect3DDevice9_GetDisplayMode(device, 0, &mode); + hr = IDirect3DDevice9_GetDisplayMode(device, 0, &mode); - if (FAILED(hr)) + if (FAILED(hr)) + goto cleanup; + + if ((usedformat == D3DFMT_UNKNOWN) || (usedformat == D3DX_DEFAULT)) + usedformat = D3DFMT_A8R8G8B8; + + hr = IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, mode.Format, + usage, D3DRTYPE_TEXTURE, usedformat); + + if (FAILED(hr)) + { + /* Heuristic to choose the fallback format */ + const PixelFormatDesc *fmt = get_format_info(usedformat); + BOOL allow_24bits; + int bestscore = INT_MIN, i = 0, j; + unsigned int channels; + const PixelFormatDesc *curfmt; + + if (!fmt) + { + FIXME("Pixel format %x not handled\n", usedformat); goto cleanup; + } - if ((*format == D3DFMT_UNKNOWN) || (*format == D3DX_DEFAULT)) - *format = D3DFMT_A8R8G8B8; + allow_24bits = fmt->bytes_per_pixel == 3; + channels = (fmt->bits[0] ? 1 : 0) + (fmt->bits[1] ? 1 : 0) + + (fmt->bits[2] ? 1 : 0) + (fmt->bits[3] ? 1 : 0); + usedformat = D3DFMT_UNKNOWN; - hr = IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, mode.Format, usage, - D3DRTYPE_TEXTURE, *format); + while ((curfmt = get_format_info_idx(i))) + { + unsigned int curchannels = (curfmt->bits[0] ? 1 : 0) + (curfmt->bits[1] ? 1 : 0) + + (curfmt->bits[2] ? 1 : 0) + (curfmt->bits[3] ? 1 : 0); + int score; - if (FAILED(hr)) - FIXME("Pixel format adjustment not implemented yet\n"); + i++; + + if (curchannels < channels) + continue; + if (curfmt->bytes_per_pixel == 3 && !allow_24bits) + continue; + + hr = IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, + mode.Format, usage, D3DRTYPE_TEXTURE, curfmt->format); + if (FAILED(hr)) + continue; + + /* This format can be used, let's evaluate it. + Weights chosen quite arbitrarily... */ + score = 16 - 4 * (curchannels - channels); + + for (j = 0; j < 4; j++) + { + int diff = curfmt->bits[j] - fmt->bits[j]; + score += 16 - (diff < 0 ? -diff * 4 : diff); + } + + if (score > bestscore) + { + bestscore = score; + usedformat = curfmt->format; + } + } + hr = D3D_OK; + } cleanup: - if (d3d) - IDirect3D9_Release(d3d); + if (d3d) + IDirect3D9_Release(d3d); - if (FAILED(hr)) - return D3DERR_INVALIDCALL; + if (FAILED(hr)) + return hr; + + if (usedformat == D3DFMT_UNKNOWN) + { + WARN("Couldn't find a suitable pixel format\n"); + return D3DERR_NOTAVAILABLE; } + TRACE("Format chosen: %x\n", usedformat); + if (format) + *format = usedformat; + return D3D_OK; } diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 748e6d1..dc8e820 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -152,3 +152,12 @@ const PixelFormatDesc *get_format_info(D3DFORMAT format) while(formats[i].format != format && formats[i].format != D3DFMT_UNKNOWN) i++; return &formats[i]; } + +const PixelFormatDesc *get_format_info_idx(int idx) +{ + if(idx >= sizeof(formats) / sizeof(formats[0])) + return NULL; + if(formats[idx].format == D3DFMT_UNKNOWN) + return NULL; + return &formats[idx]; +}

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 October 2010