September 2006 - Wine-commits

Mikołaj Zalewski : winefile: Update Polish translation .
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 4372f4c32dec398e4eac4c4bf7417a9df9eda2c7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4372f4c32dec398e4eac4c4… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Sep 25 16:26:00 2006 +0200 winefile: Update Polish translation. --- programs/winefile/Pl.rc | 97 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 89 insertions(+), 8 deletions(-) diff --git a/programs/winefile/Pl.rc b/programs/winefile/Pl.rc index cbeb58b..a4acd0e 100644 --- a/programs/winefile/Pl.rc +++ b/programs/winefile/Pl.rc @@ -35,18 +35,18 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "W s&chowku...\tF9", 118 MENUITEM "&Usu�\tDel", ID_FILE_DELETE MENUITEM "&Zmie� nazw�...", 109 - MENUITEM "Ustawie&nia...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM "W�a�c&iwo�ci...\tAlt+Enter", ID_EDIT_PROPERTIES MENUITEM SEPARATOR - MENUITEM "&Kompresja...", 119 - MENUITEM "&Dekompresja...", 120 + MENUITEM "Ko&mpresja...", 119 + MENUITEM "D&ekompresja...", 120 MENUITEM SEPARATOR - MENUITEM "&Uruchom...", ID_EXECUTE + MENUITEM "U&ruchom...", ID_EXECUTE MENUITEM "&Drukuj...", 102 MENUITEM "Skojarz...", 103 MENUITEM SEPARATOR MENUITEM "U&tw�rz folder...", 111 MENUITEM "&Szukaj...", 104 - MENUITEM "&Zaznacz pliki...", 116 + MENUITEM "Z&aznacz pliki...", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS MENUITEM "&Wyj�cie\tAlt+X", ID_FILE_EXIT @@ -95,10 +95,10 @@ #endif MENUITEM SEPARATOR MENUITEM "P&osortuj alfabetycznie", 404 MENUITEM "Posortuj po &typie", 405 - MENUITEM "Rozmie�� &po wielko�ci", 406 - MENUITEM "&Sortuj po dacie", 407 + MENUITEM "Posortuj po wie&lko�ci", 406 + MENUITEM "Po&sortuj po dacie", 407 MENUITEM SEPARATOR - MENUITEM "Sortuj po &...", ID_VIEW_FILTER + MENUITEM "Filtruj widok &...", ID_VIEW_FILTER } POPUP "&Opcje" { @@ -176,8 +176,89 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Przegl�daj", 254, 158, 43, 47, 14 } +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Wed�ug typu pliku" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Nazwa:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "Wy�wietl pliki typu",-1,7,23,87,56 + CONTROL "&Katalogi",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programy",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "Doku&menty",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Inne pliki",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "Poka� pliki ukryte i &systemowe",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,126,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "Anuluj",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "W�a�ciwo�ci: %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "Anulujl",IDCANCEL,191,29,50,14 + LTEXT "&Nazwa pliku:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&Pe�na �cie�ka:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&Ostatnio modyfikowany:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&Wersja:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Prawa a&utorskie:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Wie&lko��:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Atrybuty",-1,7,79,158,46 + CONTROL "Tylko do &odczytu",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "&Ukryty",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Archiwalny",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&Systemowy",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "S&kompresowany",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "We&rsja",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + STRINGTABLE { IDS_FONT_SEL_DLG_NAME "Wprowadzanie ustawie� czcionki" IDS_FONT_SEL_ERROR "B��d przy wybieraniu czcionki" } + +STRINGTABLE +{ + IDS_WINEFILE "Winefile" + IDS_ERROR "B��d" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Pulpit" + IDS_SHELL "Pulpit" /* t�umaczenie nie dos�owne, ale chyba lepiej pasuje */ + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Jeszcze nie zaimplementowane" + IDS_WINE "WINE" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "Nazwa" + IDS_COL_SIZE "Wielko��" + IDS_COL_CDATE "CDate" + IDS_COL_ADATE "ADate" + IDS_COL_MDATE "MDate" + IDS_COL_IDX "Indeks/inode" + IDS_COL_LINKS "Dowi�zania" + IDS_COL_ATTR "Atrybuty" + IDS_COL_SEC "Prawa dost�pu" + + IDS_FREE_SPACE_FMT "%s z %s wolne" +}

1 0

Mikołaj Zalewski : user32: Update Polish translation.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: a73813a0939472f5913a55a6f6a0d2e037e45fa6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a73813a0939472f5913a55a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Sep 25 12:06:51 2006 +0200 user32: Update Polish translation. --- dlls/user/resources/user32_Pl.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/user/resources/user32_Pl.rc b/dlls/user/resources/user32_Pl.rc index a33b380..8b733c8 100644 --- a/dlls/user/resources/user32_Pl.rc +++ b/dlls/user/resources/user32_Pl.rc @@ -31,6 +31,8 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARD MENUITEM "Prze��&cz na...\tCtrl-Esc", 61744 MENUITEM SEPARATOR MENUITEM "&O programie WINE...", 61761 + MENUITEM SEPARATOR + MENUITEM "Dopisz \"znacznik debugowania\" ", 61762 } EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE @@ -61,3 +63,19 @@ BEGIN PUSHBUTTON "&Tak", 6, 263, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Nie", 7, 311, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Wybierz okno" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ + DEFPUSHBUTTON "OK", IDOK, 75, 100, 35, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 120, 100, 35, 14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_ERROR "B��d" + IDS_MDI_MOREWINDOWS "&Wi�cej okien..." +}

1 0

Mikołaj Zalewski : resources: Mark common resources as LANG_NEUTRAL, SUBLANG_NEUTRAL.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 3380a7d955806dfb645db1248745e85ff05b6c8c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3380a7d955806dfb645db12… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Sep 25 11:53:54 2006 +0200 resources: Mark common resources as LANG_NEUTRAL, SUBLANG_NEUTRAL. --- dlls/mshtml/rsrc.rc | 2 ++ dlls/msi/msi.rc | 2 ++ dlls/shdocvw/shdocvw.rc | 1 + programs/oleview/rsrc.rc | 2 ++ programs/uninstaller/rsrc.rc | 2 ++ 5 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/rsrc.rc b/dlls/mshtml/rsrc.rc index 5e47ba9..3d349bd 100644 --- a/dlls/mshtml/rsrc.rc +++ b/dlls/mshtml/rsrc.rc @@ -44,6 +44,8 @@ #include "No.rc" #include "Sv.rc" #include "Tr.rc" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + REGINST REGINST mshtml.inf blank.htm HTML "blank.htm" diff --git a/dlls/msi/msi.rc b/dlls/msi/msi.rc index 9199acc..822a531 100644 --- a/dlls/msi/msi.rc +++ b/dlls/msi/msi.rc @@ -43,6 +43,8 @@ #include "msi_Pt.rc" #include "msi_Ru.rc" #include "msi_Tr.rc" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + /* BINRES instadvert.bmp */ 0x1001 BITMAP instadvert.bmp /* { diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc index d52263f..3a2c6d2 100644 --- a/dlls/shdocvw/shdocvw.rc +++ b/dlls/shdocvw/shdocvw.rc @@ -36,4 +36,5 @@ #include "No.rc" #include "Pt.rc" #include "Tr.rc" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 TYPELIB LOADONCALL DISCARDABLE shdocvw_v1.tlb diff --git a/programs/oleview/rsrc.rc b/programs/oleview/rsrc.rc index 5b3a779..598f97b 100644 --- a/programs/oleview/rsrc.rc +++ b/programs/oleview/rsrc.rc @@ -25,6 +25,8 @@ #include "En.rc" #include "Fr.rc" #include "Ko.rc" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + IDA_OLEVIEW ACCELERATORS DISCARDABLE { VK_F5, IDM_REFRESH, VIRTKEY, NOINVERT diff --git a/programs/uninstaller/rsrc.rc b/programs/uninstaller/rsrc.rc index 3712775..2b4948d 100644 --- a/programs/uninstaller/rsrc.rc +++ b/programs/uninstaller/rsrc.rc @@ -40,6 +40,8 @@ #include "No.rc" #include "Pt.rc" #include "Tr.rc" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + /* BINRES uninstaller.ico */ UNINSTALLER ICON MOVEABLE uninstaller.ico /* {

1 0

Mikołaj Zalewski : cmdlgtst: Move the PageSetup_Flags_Dialog from Ru.rc to En.rc.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 82fb03a5df9068fb26ccd019655d8e6569dc1b19 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=82fb03a5df9068fb26ccd01… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Sep 25 12:02:56 2006 +0200 cmdlgtst: Move the PageSetup_Flags_Dialog from Ru.rc to En.rc. --- programs/cmdlgtst/En.rc | 28 ++++++++++++++++++++++++++++ programs/cmdlgtst/Ru.rc | 28 ---------------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/programs/cmdlgtst/En.rc b/programs/cmdlgtst/En.rc index d61d59e..707b1f5 100644 --- a/programs/cmdlgtst/En.rc +++ b/programs/cmdlgtst/En.rc @@ -180,6 +180,34 @@ FONT 8, "MS Shell Dlg" CHECKBOX "PD_USEDEVMODECOPIES", I_PD_USEDEVMODECOPIES, 12, 264, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP } +PageSetup_Flags_Dialog DIALOG 4, 17, 239, 245 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION " " +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", IDOK, 180, 6, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 180, 24, 50, 14 + CHECKBOX "PSD_DEFAULTMINMARGINS", I_PSD_DEFAULTMINMARGINS, 12, 12, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEMARGINS", I_PSD_DISABLEMARGINS, 12, 24, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEORIENTATION", I_PSD_DISABLEORIENTATION, 12, 36, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEPAGEPAINTING", I_PSD_DISABLEPAGEPAINTING, 12, 48, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEPAPER", I_PSD_DISABLEPAPER, 12, 60, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEPRINTER", I_PSD_DISABLEPRINTER, 12, 72, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGEPAINTHOOK", I_PSD_ENABLEPAGEPAINTHOOK, 12, 84, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGESETUPHOOK", I_PSD_ENABLEPAGESETUPHOOK, 12, 96, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGESETUPTEMPLATE", I_PSD_ENABLEPAGESETUPTEMPLATE, 12, 108, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGESETUPTEMPLATEHANDLE", I_PSD_ENABLEPAGESETUPTEMPLATEHANDLE, 12, 120, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_INHUNDREDTHSOFMILLIMETERS", I_PSD_INHUNDREDTHSOFMILLIMETERS, 12, 132, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_INTHOUSANDTHSOFINCHES", I_PSD_INTHOUSANDTHSOFINCHES, 12, 144, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_INWININIINTLMEASURE", I_PSD_INWININIINTLMEASURE, 12, 156, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_MARGINS", I_PSD_MARGINS, 12, 168, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_MINMARGINS", I_PSD_MINMARGINS, 12, 180, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_NONETWORKBUTTON", I_PSD_NONETWORKBUTTON, 12, 192, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_NOWARNING", I_PSD_NOWARNING, 12, 204, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_RETURNDEFAULT", I_PSD_RETURNDEFAULT, 12, 216, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_SHOWHELP", I_PSD_SHOWHELP, 12, 228, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +} + File_Flags_Dialog DIALOG 6, 15, 207, 227 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Open File/Save File Flags" diff --git a/programs/cmdlgtst/Ru.rc b/programs/cmdlgtst/Ru.rc index 7dc9a42..6419186 100644 --- a/programs/cmdlgtst/Ru.rc +++ b/programs/cmdlgtst/Ru.rc @@ -179,34 +179,6 @@ FONT 8, "MS Shell Dlg" CHECKBOX "PD_USEDEVMODECOPIES", I_PD_USEDEVMODECOPIES, 12, 264, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP } -PageSetup_Flags_Dialog DIALOG 4, 17, 239, 245 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION " " -FONT 8, "MS Shell Slg" -{ - DEFPUSHBUTTON "OK", IDOK, 180, 6, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 180, 24, 50, 14 - CHECKBOX "PSD_DEFAULTMINMARGINS", I_PSD_DEFAULTMINMARGINS, 12, 12, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "PSD_DISABLEMARGINS", I_PSD_DISABLEMARGINS, 12, 24, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "PSD_DISABLEORIENTATION", I_PSD_DISABLEORIENTATION, 12, 36, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "PSD_DISABLEPAGEPAINTING", I_PSD_DISABLEPAGEPAINTING, 12, 48, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "PSD_DISABLEPAPER", I_PSD_DISABLEPAPER, 12, 60, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "PSD_DISABLEPRINTER", I_PSD_DISABLEPRINTER, 12, 72, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "PSD_ENABLEPAGEPAINTHOOK", I_PSD_ENABLEPAGEPAINTHOOK, 12, 84, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "PSD_ENABLEPAGESETUPHOOK", I_PSD_ENABLEPAGESETUPHOOK, 12, 96, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "PSD_ENABLEPAGESETUPTEMPLATE", I_PSD_ENABLEPAGESETUPTEMPLATE, 12, 108, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "PSD_ENABLEPAGESETUPTEMPLATEHANDLE", I_PSD_ENABLEPAGESETUPTEMPLATEHANDLE, 12, 120, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "PSD_INHUNDREDTHSOFMILLIMETERS", I_PSD_INHUNDREDTHSOFMILLIMETERS, 12, 132, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "PSD_INTHOUSANDTHSOFINCHES", I_PSD_INTHOUSANDTHSOFINCHES, 12, 144, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "PSD_INWININIINTLMEASURE", I_PSD_INWININIINTLMEASURE, 12, 156, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "PSD_MARGINS", I_PSD_MARGINS, 12, 168, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "PSD_MINMARGINS", I_PSD_MINMARGINS, 12, 180, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "PSD_NONETWORKBUTTON", I_PSD_NONETWORKBUTTON, 12, 192, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "PSD_NOWARNING", I_PSD_NOWARNING, 12, 204, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "PSD_RETURNDEFAULT", I_PSD_RETURNDEFAULT, 12, 216, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "PSD_SHOWHELP", I_PSD_SHOWHELP, 12, 228, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP -} - File_Flags_Dialog DIALOG 6, 15, 207, 227 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "�� /�� "

1 0

Mikołaj Zalewski : regedit: Update Polish translation.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: c807132ebde54bbc8a094aac1b73f18e417a00dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c807132ebde54bbc8a094aa… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Sep 25 12:05:08 2006 +0200 regedit: Update Polish translation. --- programs/regedit/Pl.rc | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/programs/regedit/Pl.rc b/programs/regedit/Pl.rc index 48c50d7..5f98953 100644 --- a/programs/regedit/Pl.rc +++ b/programs/regedit/Pl.rc @@ -68,8 +68,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Kopiuj nazw� klucza", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR - MENUITEM "&Znajd�...\tCtrl+F", ID_EDIT_FIND - MENUITEM "Zn&ajd� nast�pny\tF3", ID_EDIT_FINDNEXT + MENUITEM "&Znajd�...\tCtrl+F", ID_EDIT_FIND, GRAYED + MENUITEM "Zn&ajd� nast�pny\tF3", ID_EDIT_FINDNEXT, GRAYED END POPUP "&Widok" BEGIN @@ -118,7 +118,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Kopiuj nazw� klucza", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR - MENUITEM "&Znajd<9f>...\tCtrl+F", ID_EDIT_FIND, GRAYED + MENUITEM "&Znajd�...\tCtrl+F", ID_EDIT_FIND, GRAYED END END @@ -128,7 +128,7 @@ END */ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 230, 75 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "Edytor rejestru - informacje" FONT 8, "MS Shell Dlg" BEGIN @@ -191,7 +191,7 @@ BEGIN END IDD_EDIT_DWORD DIALOG DISCARDABLE 22, 17, 210, 100 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "Edycja danej liczbowej (DWORD)" FONT 8, "MS Shell Dlg" BEGIN @@ -206,6 +206,19 @@ BEGIN PUSHBUTTON "Anuluj",IDCANCEL,175,80,30,11,WS_GROUP END +IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 210, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Edycja danej binarnej" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Nazwa:",IDC_STATIC,5,5,119,8 + EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED + LTEXT "Warto��:",IDC_STATIC,5,30,90,8 + CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,4,40,160,40 + DEFPUSHBUTTON "OK",IDOK,140,80,30,11,WS_GROUP + PUSHBUTTON "Anuluj",IDCANCEL,175,80,30,11,WS_GROUP +END + /* * String Table */

1 0

Stefan Dösinger : wined3d: Avoid wasting a uniform.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 96bce8d6d49d92b524cca2f1f6722c83181951cd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=96bce8d6d49d92b524cca2f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 23 19:09:06 2006 +0200 wined3d: Avoid wasting a uniform. --- dlls/wined3d/arb_program_shader.c | 3 +++ dlls/wined3d/drawprim.c | 19 +++---------------- dlls/wined3d/glsl_shader.c | 10 ++++++++++ dlls/wined3d/vertexshader.c | 32 ++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 9 +++++++++ 5 files changed, 39 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e984b9d..47397d6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -127,6 +127,9 @@ void shader_arb_load_constants( GL_LIMITS(vshader_constantsF), stateBlock->vertexShaderConstantF, &stateBlock->set_vconstantsF); + + /* Upload the position fixup */ + GL_EXTCALL(glProgramEnvParameter4fvARB(GL_VERTEX_PROGRAM_ARB, ARB_SHADER_PRIVCONST_POS, vshader_impl->wineD3DDevice->posFixup)); } if (usePixelShader) { diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 2c31eb9..ff465a8 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -311,22 +311,9 @@ static void primitiveInitState( /* Vertex Shader output is already transformed, so set up identity matrices */ if (useVS) { - glMatrixMode(GL_MODELVIEW); - checkGLcall("glMatrixMode"); - glLoadIdentity(); - glMatrixMode(GL_PROJECTION); - checkGLcall("glMatrixMode"); - glLoadIdentity(); - /* Window Coord 0 is the middle of the first pixel, so translate by half - a pixel (See comment above glTranslate above) */ - glTranslatef(0.9 / This->stateBlock->viewport.Width, -0.9 / This->stateBlock->viewport.Height, 0); - checkGLcall("glTranslatef (0.9 / width, -0.9 / height, 0)"); - if (This->renderUpsideDown) { - glMultMatrixf(invymat); - checkGLcall("glMultMatrixf(invymat)"); - } - This->modelview_valid = FALSE; - This->proj_valid = FALSE; + This->posFixup[1] = This->renderUpsideDown ? -1.0 : 1.0; + This->posFixup[2] = 0.9 / This->stateBlock->viewport.Width; + This->posFixup[3] = -0.9 / This->stateBlock->viewport.Height; } This->last_was_rhw = FALSE; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 257b9e5..0554392 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -288,6 +288,7 @@ void shader_glsl_load_constants( if (useVertexShader) { IWineD3DBaseShaderImpl* vshader = (IWineD3DBaseShaderImpl*) stateBlock->vertexShader; IWineD3DVertexShaderImpl* vshader_impl = (IWineD3DVertexShaderImpl*) vshader; + GLint pos; IWineD3DVertexDeclarationImpl* vertexDeclaration = (IWineD3DVertexDeclarationImpl*) vshader_impl->vertexDeclaration; @@ -314,6 +315,12 @@ void shader_glsl_load_constants( shader_glsl_load_constantsB(vshader, gl_info, programId, MAX_CONST_B, stateBlock->vertexShaderConstantB, stateBlock->set.vertexShaderConstantsB); + + /* Upload the position fixup params */ + pos = GL_EXTCALL(glGetUniformLocationARB(programId, "posFixup")); + checkGLcall("glGetUniformLocationARB"); + glUniform4fvARB(pos, 1, &vshader_impl->wineD3DDevice->posFixup[0]); + checkGLcall("glUniform4fvARB"); } if (usePixelShader) { @@ -375,6 +382,9 @@ void shader_generate_glsl_declarations( if (This->baseShader.limits.constant_bool > 0) shader_addline(buffer, "uniform bool %cB[%u];\n", prefix, This->baseShader.limits.constant_bool); + if(!pshader) + shader_addline(buffer, "uniform vec4 posFixup;\n"); + /* Declare texture samplers */ for (i = 0; i < This->baseShader.limits.sampler; i++) { if (reg_maps->samplers[i]) { diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 9719264..2d7ab58 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -737,17 +737,16 @@ #endif /* Write the final position. * * OpenGL coordinates specify the center of the pixel while d3d coords specify - * the corner. For that reason a translation is done with the projection matrix, - * which sets the offsets to move in the w coords of the matrix(see glTranslate manpage) - * Add the w coordinates to x and y, this avoids the need for a full matrix - * multiplication. The matrix is set up in drawprim.c, primitiveInitState. + * the corner. The offsets are stored in z and w in the 2nd row of the projection + * matrix to avoid wasting a free shader constant. Add them to the w and z coord + * of the 2nd row */ - shader_addline(&buffer, "gl_Position.x = gl_Position.x + gl_ProjectionMatrix[3][0];\n"); - shader_addline(&buffer, "gl_Position.y = gl_Position.y + gl_ProjectionMatrix[3][1];\n"); + shader_addline(&buffer, "gl_Position.x = gl_Position.x + posFixup[2];\n"); + shader_addline(&buffer, "gl_Position.y = gl_Position.y + posFixup[3];\n"); /* Account for any inverted textures (render to texture case) by reversing the y coordinate * (this is handled in drawPrim() when it sets the MODELVIEW and PROJECTION matrices) */ - shader_addline(&buffer, "gl_Position.y = gl_Position.y * gl_ProjectionMatrix[1][1];\n"); + shader_addline(&buffer, "gl_Position.y = gl_Position.y * posFixup[1];\n"); shader_addline(&buffer, "}\n\0"); @@ -771,10 +770,9 @@ #endif /* Base Declarations */ shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, &buffer, &GLINFO_LOCATION); - - /* We need the projection matrix to correctly render upside-down objects (render to texture) */ - shader_addline(&buffer, "PARAM PROJECTIONX = state.matrix.projection.row[0];\n"); - shader_addline(&buffer, "PARAM PROJECTIONY = state.matrix.projection.row[1];\n"); + + /* We need a constant to fixup the final position */ + shader_addline(&buffer, "PARAM posFixup = program.env[%d];\n", ARB_SHADER_PRIVCONST_POS); if (reg_maps->fog) { This->usesFog = 1; @@ -792,17 +790,15 @@ #endif /* Write the final position. * * OpenGL coordinates specify the center of the pixel while d3d coords specify - * the corner. For that reason a translation is done with the projection matrix, - * which sets the offsets to move in the w coords of the matrix(see glTranslate manpage) - * Add the w coordinates to x and y, this avoids the need for a full matrix - * multiplication. The matrix is set up in drawprim.c, primitiveInitState. + * the corner. The offsets are stored in the 2nd row of the projection matrix, + * the x offset in z and the y offset in w. Add them to the resulting position */ - shader_addline(&buffer, "ADD result.position.x, TMP_OUT.x, PROJECTIONX.w;\n"); - shader_addline(&buffer, "ADD result.position.y, TMP_OUT.y, PROJECTIONY.w;\n"); + shader_addline(&buffer, "ADD result.position.x, TMP_OUT.x, posFixup.z;\n"); + shader_addline(&buffer, "ADD result.position.y, TMP_OUT.y, posFixup.w;\n"); /* Account for any inverted textures (render to texture case) by reversing the y coordinate * (this is handled in drawPrim() when it sets the MODELVIEW and PROJECTION matrices) */ - shader_addline(&buffer, "MUL result.position.y, TMP_OUT.y, PROJECTIONY.y;\n"); + shader_addline(&buffer, "MUL result.position.y, TMP_OUT.y, posFixup.y;\n"); shader_addline(&buffer, "END\n\0"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a4fae10..9921d4c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -581,6 +581,9 @@ #define NEEDS_DI /* List of GLSL shader programs and their associated vertex & pixel shaders */ struct list glsl_shader_progs; + + /* Final position fixup constant */ + float posFixup[4]; } IWineD3DDeviceImpl; extern const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl; @@ -1667,6 +1670,12 @@ inline static BOOL shader_is_comment(DWO return D3DSIO_COMMENT == (token & D3DSI_OPCODE_MASK); } +/* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vshader_constantsF) - 1, + * so upload them above that + */ +#define ARB_SHADER_PRIVCONST_BASE GL_LIMITS(vshader_constantsF) +#define ARB_SHADER_PRIVCONST_POS ARB_SHADER_PRIVCONST_BASE + 0 + /***************************************************************************** * IDirect3DVertexShader implementation structure */

1 0

Stefan Dösinger : wined3d: Surface data is 32 bit aligned.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 9cafbd6de0be23350cbb1442444c3767d7796352 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9cafbd6de0be23350cbb144… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Sep 24 09:49:05 2006 +0200 wined3d: Surface data is 32 bit aligned. --- dlls/d3d9/tests/surface.c | 22 ++++++++++++++++++++++ dlls/wined3d/device.c | 4 +++- dlls/wined3d/surface.c | 5 ++++- dlls/wined3d/surface_gdi.c | 2 +- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 23b8d73..7934d1f 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -113,6 +113,27 @@ cleanup: if (surface_ptr) IDirect3DSurface9_Release(surface_ptr); } +static void test_surface_alignment(IDirect3DDevice9 *device_ptr) +{ + IDirect3DSurface9 *surface_ptr = 0; + HRESULT hr; + + /* Test a sysmem surface as those aren't affected by the hardware's np2 restrictions */ + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device_ptr, 5, 5, D3DFMT_R5G6B5, D3DPOOL_SYSTEMMEM, &surface_ptr, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateOffscreenPlainSurface returned %08lx\n", hr); + + if(surface_ptr) + { + D3DLOCKED_RECT lockedRect; + hr = IDirect3DSurface9_LockRect(surface_ptr, &lockedRect, NULL, 0); + ok(hr == D3D_OK, "IDirect3DSurface9_LockRect returned %08lx\n", hr); + /* test is deactivated until out np2 support doesn't report the full power of 2 pitch to the app */ + todo_wine ok(lockedRect.Pitch == 12, "Got pitch %d, expected 12\n", lockedRect.Pitch); + hr = IDirect3DSurface9_UnlockRect(surface_ptr); + IDirect3DSurface9_Release(surface_ptr); + } +} + START_TEST(surface) { HMODULE d3d9_handle; @@ -129,4 +150,5 @@ START_TEST(surface) if (!device_ptr) return; test_surface_get_container(device_ptr); + test_surface_alignment(device_ptr); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c4b9767..7aef3ac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1001,7 +1001,9 @@ static HRESULT WINAPI IWineD3DDeviceImp Format == WINED3DFMT_DXT4 || Format == WINED3DFMT_DXT5) { Size = ((max(pow2Width,4) * tableEntry->bpp) * max(pow2Height,4)); } else { - Size = (pow2Width * tableEntry->bpp) * pow2Height; + /* The pitch is a multiple of 4 bytes */ + Size = ((pow2Width * tableEntry->bpp) + 3) & ~3; + Size *= pow2Height; } /** Create and initialise the surface resource **/ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 908211e..3146475 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2170,7 +2170,8 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetFo format == WINED3DFMT_DXT4 || format == WINED3DFMT_DXT5) { This->resource.size = ((max(This->pow2Width, 4) * formatEntry->bpp) * max(This->pow2Height, 4)); } else { - This->resource.size = (This->pow2Width * formatEntry->bpp) * This->pow2Height; + This->resource.size = ((This->pow2Width * formatEntry->bpp) + 3) & ~3; + This->resource.size *= This->pow2Height; } @@ -3063,6 +3064,8 @@ DWORD WINAPI IWineD3DSurfaceImpl_GetPitc } else { ret = This->bytesPerPixel * This->pow2Width; } + /* Surfaces are 32 bit aligned */ + ret = (ret + 3) & ~3; } TRACE("(%p) Returning %ld\n", This, ret); return ret; diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index f9b20c1..65c8aae 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -1516,7 +1516,7 @@ IWineGDISurfaceImpl_PrivateSetup(IWineD3 This->resource.allocatedMemory = NULL; /* We don't mind the nonpow2 stuff in GDI */ - This->resource.size = This->currentDesc.Width * getFormatDescEntry(This->resource.format)->bpp * This->currentDesc.Height; + This->resource.size = IWineD3DSurface_GetPitch(iface) * This->currentDesc.Height; This->pow2Size = This->resource.size; This->pow2Width = This->currentDesc.Width; This->pow2Height = This->currentDesc.Height;

1 0

Stefan Dösinger : wined3d: Verify the VBO vertex declaration every draw.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 615db2b93d172a3faea307e4f9c4d9af0ca5e52e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=615db2b93d172a3faea307e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 23 17:57:29 2006 +0200 wined3d: Verify the VBO vertex declaration every draw. --- dlls/wined3d/vertexbuffer.c | 326 +++++++++++++++++++++++++------------------ 1 files changed, 188 insertions(+), 138 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=615db2b93d172a3faea…

1 0

Stefan Dösinger : wined3d: Stop fixing up a VBO if the declaration changes too often.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 674af50174993baaed43a267e0d3d05ce8e81e71 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=674af50174993baaed43a26… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 23 18:02:22 2006 +0200 wined3d: Stop fixing up a VBO if the declaration changes too often. --- dlls/wined3d/vertexbuffer.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index bf734b5..5046d42 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -26,6 +26,9 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION ((IWineD3DImpl *)(((IWineD3DDeviceImpl *)This->resource.wineD3DDevice)->wineD3D))->gl_info +#define VB_MAXDECLCHANGES 100 /* After that number we stop converting */ +#define VB_RESETDECLCHANGE 1000 /* Reset the changecount after that number of draws */ + /* ******************************************* IWineD3DVertexBuffer IUnknown parts follow ******************************************* */ @@ -278,6 +281,39 @@ static void WINAPI IWineD3DVertexBuf } declChanged = IWineD3DVertexBufferImpl_FindDecl(This); + + /* If applications change the declaration over and over, reconverting all the time is a huge + * performance hit. So count the declaration changes and release the VBO if there are too much + * of them(and thus stop converting) + */ + if(declChanged) { + This->declChanges++; + This->draws = 0; + + if(This->declChanges > VB_MAXDECLCHANGES) { + if(This->resource.allocatedMemory) { + FIXME("Too much declaration changes, stopping converting\n"); + ENTER_GL(); + GL_EXTCALL(glDeleteBuffersARB(1, &This->vbo)); + checkGLcall("glDeleteBuffersARB"); + LEAVE_GL(); + This->vbo = 0; + return; + } + /* Otherwise do not bother to release the VBO. If we're doing direct locking now, + * and the declarations changed the code below will fetch the VBO's contents, convert + * and on the next decl change the data will be in sysmem too and we can just release the VBO + */ + } + } else { + /* However, it is perfectly fine to change the declaration every now and then. We don't want a game that + * changes it every minute drop the VBO after VB_MAX_DECL_CHANGES minutes. So count draws without + * decl changes and reset the decl change count after a specific number of them + */ + This->draws++; + if(This->draws > VB_RESETDECLCHANGE) This->declChanges = 0; + } + if(declChanged) { /* The declaration changed, reload the whole buffer */ WARN("Reloading buffer because of decl change\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9b36a70..a4fae10 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -655,6 +655,7 @@ typedef struct IWineD3DVertexBufferImpl UINT dirtystart, dirtyend; LONG lockcount; + LONG declChanges, draws; /* Last description of the buffer */ WineDirect3DVertexStridedData strided; } IWineD3DVertexBufferImpl;

1 0

Andrew Talbot : quartz: Cast-qual warnings fix.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 04423c4f59e9e4a49ff2ef58191d80f1824f36d3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=04423c4f59e9e4a49ff2ef5… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Sep 22 18:50:12 2006 +0100 quartz: Cast-qual warnings fix. --- dlls/quartz/acmwrapper.c | 3 ++- dlls/quartz/avidec.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index a6dda6b..f514f25 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -169,8 +169,9 @@ static HRESULT ACMWrapper_ConnectInput(T TRACE("(%p)->(%p)\n", This, pmt); + /* Check root (GUID w/o FOURCC) */ if ((IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio)) && - (!memcmp(((char*)&pmt->subtype)+4, ((char*)&MEDIATYPE_Audio)+4, sizeof(GUID)-4)) && /* Check root (GUID w/o FOURCC) */ + (!memcmp(((const char *)&pmt->subtype)+4, ((const char *)&MEDIATYPE_Audio)+4, sizeof(GUID)-4)) && (IsEqualIID(&pmt->formattype, &FORMAT_WaveFormatEx))) { HACMSTREAM drv; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 01cb35d..8e7a6a0 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -157,9 +157,10 @@ static HRESULT AVIDec_ConnectInput(Trans TRACE("(%p)->(%p)\n", This, pmt); AVIDec_Cleanup(pTransformFilter); - + + /* Check root (GUID w/o FOURCC) */ if ((IsEqualIID(&pmt->majortype, &MEDIATYPE_Video)) && - (!memcmp(((char*)&pmt->subtype)+4, ((char*)&MEDIATYPE_Video)+4, sizeof(GUID)-4)) && /* Check root (GUID w/o FOURCC) */ + (!memcmp(((const char *)&pmt->subtype)+4, ((const char *)&MEDIATYPE_Video)+4, sizeof(GUID)-4)) && (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo))) { VIDEOINFOHEADER* format = (VIDEOINFOHEADER*)pmt->pbFormat;

1 0