sync oledlg to wine 1.1.40

svn path=/trunk/; revision=45917
This commit is contained in:
Christoph von Wittich 2010-03-06 11:21:01 +00:00
parent 435ed8ec60
commit 701bf7b07f
3 changed files with 16 additions and 13 deletions

View file

@ -380,7 +380,7 @@ static BOOL UIINSERTOBJECTDLG_PopulateObjectTypes(InsertObjectDlgInfo* pdlgInfo)
*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 @@ static void UIINSERTOBJECTDLG_SelChange(InsertObjectDlgInfo* pdlgInfo)
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 @@ static BOOL UIINSERTOBJECTDLG_OnOpen(InsertObjectDlgInfo* pdlgInfo)
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 @@ static void UIINSERTOBJECTDLG_BrowseFile(InsertObjectDlgInfo* pdlgInfo)
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;

View file

@ -75,11 +75,11 @@ BEGIN
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

View file

@ -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_Pt.rc"
#include "oledlg_Ru.rc"
#include "oledlg_Si.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_Zh.rc"