[ros-diffs] [dchapyshev] 41317: - Sync comdlg32, avifil32 with Wine 1.1.23

Author: dchapyshev
Date: Sun Jun  7 11:55:59 2009
New Revision: 41317

URL: http://svn.reactos.org/svn/reactos?rev=41317&view=rev
Log:
- Sync comdlg32, avifil32 with Wine 1.1.23

Modified:
    trunk/reactos/dll/win32/avifil32/avifile.c
    trunk/reactos/dll/win32/comdlg32/cdlg_De.rc

Modified: trunk/reactos/dll/win32/avifil32/avifile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] Sun Jun  7 11:55:59 2009
@@ -226,7 +226,7 @@
 				    LONG lSkip);
 static void    AVIFILE_UpdateInfo(IAVIFileImpl *This);
 static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block,
-				  FOURCC ckid, DWORD flags, LPVOID buffer,
+				  FOURCC ckid, DWORD flags, LPCVOID buffer,
 				  LONG size);
 
 HRESULT AVIFILE_CreateAVIFile(REFIID riid, LPVOID *ppv)
@@ -2543,7 +2543,7 @@
 }
 
 static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block,
-				  FOURCC ckid, DWORD flags, LPVOID buffer,
+				  FOURCC ckid, DWORD flags, LPCVOID buffer,
 				  LONG size)
 {
   MMCKINFO ck;

Modified: trunk/reactos/dll/win32/comdlg32/cdlg_De.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_De…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/cdlg_De.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comdlg32/cdlg_De.rc [iso-8859-1] Sun Jun  7 11:55:59 2009
@@ -212,40 +212,40 @@
 }
 
 
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 30, 73, 241, 63
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Suchen"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "S&uchen nach:", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Nur ganze &Worte", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX |
WS_GROUP | WS_TABSTOP
- CHECKBOX "Beachte Groß/Kleinschreibung", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX
| WS_TABSTOP
- GROUPBOX "Richtung", 1072, 107, 26, 68, 28
- CONTROL "H&och", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD |
WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "&Runter", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD
| WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
- DEFPUSHBUTTON "&Nächsten finden", IDOK, 182, 5, 50, 14, WS_GROUP |
WS_TABSTOP
- PUSHBUTTON "Abbrechen", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hilfe", pshHelp, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+ LTEXT "S&uchen nach:", -1, 4, 8, 45, 8
+ EDITTEXT 1152, 53, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Nu&r ganzes Wort suchen", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX
| WS_GROUP | WS_TABSTOP
+ CHECKBOX "Groß-/Klein&schreibung", 1041, 4, 42, 84, 12, BS_AUTOCHECKBOX |
WS_TABSTOP
+ GROUPBOX "Suchrichtung", 1072, 113, 23, 68, 37
+ CONTROL "Nach &oben", rad1, "BUTTON", BS_AUTORADIOBUTTON |
WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 117, 34, 50, 10
+ CONTROL "Nach &unten", rad2, "BUTTON", BS_AUTORADIOBUTTON |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 117, 47, 50, 10
+ DEFPUSHBUTTON "&Weitersuchen", IDOK, 187, 5, 50, 14, WS_GROUP |
WS_TABSTOP
+ PUSHBUTTON "Abbrechen", IDCANCEL, 187, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hilfe", pshHelp, 187, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 44, 240, 94
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ersetzen"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "S&uchen nach:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "Ersetzen &durch:", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Nur ganze &Worte", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX |
WS_GROUP | WS_TABSTOP
- CHECKBOX "Beachte Groß/Kleinschreibung", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX
| WS_TABSTOP
- DEFPUSHBUTTON "&Nächsten finden", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON |
WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Ersetzen", psh1, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Alle ersetzen", psh2, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Abbrechen", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hilfe", pshHelp, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&Suchen nach:", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 56, 7, 112, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "Ersetzen &durch:", -1, 4, 26, 52, 8
+ EDITTEXT 1153, 56, 24, 112, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Nu&r ganzes Wort", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX |
WS_GROUP | WS_TABSTOP
+ CHECKBOX "Groß-/Kleins&chreibung", 1041, 5, 62, 86, 12, BS_AUTOCHECKBOX |
WS_TABSTOP
+ DEFPUSHBUTTON "&Weitersuchen", IDOK, 175, 6, 60, 14, BS_DEFPUSHBUTTON |
WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ersetzen", psh1, 175, 23, 60, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&lles ersetzen", psh2, 175, 40, 60, 14, WS_GROUP |
WS_TABSTOP
+ PUSHBUTTON "Abbrechen", IDCANCEL, 175, 57, 60, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hilfe", pshHelp, 175, 74, 60, 14, WS_GROUP | WS_TABSTOP
 }
 
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164