[ros-diffs] [cwittich] 45917: [OLEDLG] sync oledlg to wine 1.1.40

[cwittich at svn.reactos.org]

Author: cwittich
Date: Sat Mar  6 12:21:01 2010
New Revision: 45917

URL: http://svn.reactos.org/svn/reactos?rev=45917&view=rev
Log:
[OLEDLG]
sync oledlg to wine 1.1.40

Modified:
    trunk/reactos/dll/win32/oledlg/insobjdlg.c
    trunk/reactos/dll/win32/oledlg/oledlg_De.rc
    trunk/reactos/dll/win32/oledlg/rsrc.rc

Modified: trunk/reactos/dll/win32/oledlg/insobjdlg.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/insobjdlg.c?rev=45917&r1=45916&r2=45917&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oledlg/insobjdlg.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/insobjdlg.c [iso-8859-1] Sat Mar  6 12:21:01 2010
@@ -380,7 +380,7 @@
        *lpclsid = clsid;
 
        len = SendMessageW(pdlgInfo->hwndObjTypeLB, LB_ADDSTRING, 0, (LPARAM)keydesc);
-       SendMessageW(pdlgInfo->hwndObjTypeLB, LB_SETITEMDATA, (WPARAM)len, (LPARAM)lpclsid);
+       SendMessageW(pdlgInfo->hwndObjTypeLB, LB_SETITEMDATA, len, (LPARAM)lpclsid);
     }
   }
 
@@ -426,7 +426,7 @@
 
   if (LoadStringW(OLEDLG_hInstance, IDS_RESULTOBJDESC, resstr, MAX_PATH) &&
      ((index = SendMessageW(pdlgInfo->hwndObjTypeLB, LB_GETCURSEL, 0, 0)) >= 0) &&
-     SendMessageW(pdlgInfo->hwndObjTypeLB, LB_GETTEXT, (WPARAM)index, (LPARAM)objname))
+     SendMessageW(pdlgInfo->hwndObjTypeLB, LB_GETTEXT, index, (LPARAM)objname))
        wsprintfW(objdesc, resstr, objname);
   else
     objdesc[0] = 0;
@@ -452,7 +452,7 @@
     if (index >= 0)
     {
        CLSID* clsid = (CLSID*) SendMessageA(pdlgInfo->hwndObjTypeLB, 
-          LB_GETITEMDATA, (WPARAM)index, 0);
+          LB_GETITEMDATA, index, 0);
        pdlgInfo->lpOleUIInsertObject->clsid = *clsid;
 
        if (pdlgInfo->lpOleUIInsertObject->dwFlags & IOF_CREATENEWOBJECT)
@@ -525,7 +525,7 @@
    fn.nMaxCustFilter = 0;
    fn.nFilterIndex = 0;
 
-   SendMessageA(pdlgInfo->hwndFileTB, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)fname);
+   SendMessageA(pdlgInfo->hwndFileTB, WM_GETTEXT, MAX_PATH, (LPARAM)fname);
    fn.lpstrFile = fname;
    fn.nMaxFile = MAX_PATH;
 

Modified: trunk/reactos/dll/win32/oledlg/oledlg_De.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_De.rc?rev=45917&r1=45916&r2=45917&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_De.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_De.rc [iso-8859-1] Sat Mar  6 12:21:01 2010
@@ -75,11 +75,11 @@
     CONTROL       "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14
     CONTROL       "Abbrechen", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14
     CONTROL       "&Hilfe", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14
-    CONTROL       "Als Symbol &darstellen", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14
+    CONTROL       "Als Sym&bol", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14
     CONTROL       "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44
     CONTROL       "&Symbol ändern...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14
     CONTROL       "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34
-    CONTROL       "<< result text goes here >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35
+    CONTROL       "<< Ergebnis Text hier her >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35
     CONTROL       "Ergebnis", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48
     CONTROL       "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8
 END

Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/rsrc.rc?rev=45917&r1=45916&r2=45917&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oledlg/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/rsrc.rc [iso-8859-1] Sat Mar  6 12:21:01 2010
@@ -35,22 +35,25 @@
  */
 #include "oledlg_Cs.rc"
 #include "oledlg_Da.rc"
-#include "oledlg_De.rc"
 #include "oledlg_En.rc"
 #include "oledlg_Es.rc"
-#include "oledlg_Fr.rc"
 #include "oledlg_Hu.rc"
 #include "oledlg_It.rc"
-#include "oledlg_Ja.rc"
 #include "oledlg_Ko.rc"
-#include "oledlg_Lt.rc"
 #include "oledlg_Nl.rc"
 #include "oledlg_No.rc"
 #include "oledlg_Pl.rc"
+#include "oledlg_Sv.rc"
+#include "oledlg_Tr.rc"
+#include "oledlg_Uk.rc"
+
+/* UTF-8 */
+#include "oledlg_De.rc"
+#include "oledlg_Fr.rc"
+#include "oledlg_Ja.rc"
+#include "oledlg_Lt.rc"
 #include "oledlg_Pt.rc"
 #include "oledlg_Ru.rc"
 #include "oledlg_Si.rc"
-#include "oledlg_Sv.rc"
-#include "oledlg_Tr.rc"
-#include "oledlg_Uk.rc"
 #include "oledlg_Zh.rc"
+