From 68d310770a82d25eae7956dd5779c8fe5f63d5ca Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Sat, 10 Jan 2009 14:50:05 +0000 Subject: [PATCH] sync oleacc and oledlg with wine 1.1.12 svn path=/trunk/; revision=38679 --- reactos/dll/win32/oleacc/main.c | 9 +- reactos/dll/win32/oleacc/oleacc.spec | 2 +- reactos/dll/win32/oledlg/insobjdlg.c | 14 +- reactos/dll/win32/oledlg/oledlg_Ja.rc | 39 +++--- reactos/dll/win32/oledlg/oledlg_Ko.rc | 6 +- reactos/dll/win32/oledlg/oledlg_Zh.rc | 180 ++++++++++++++++++++++++++ reactos/dll/win32/oledlg/pastespl.c | 4 +- reactos/dll/win32/oledlg/rsrc.rc | 1 + 8 files changed, 224 insertions(+), 31 deletions(-) create mode 100644 reactos/dll/win32/oledlg/oledlg_Zh.rc diff --git a/reactos/dll/win32/oleacc/main.c b/reactos/dll/win32/oleacc/main.c index 5076e001866..0e7b78e8a08 100644 --- a/reactos/dll/win32/oleacc/main.c +++ b/reactos/dll/win32/oleacc/main.c @@ -23,6 +23,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "oleacc.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -39,12 +40,18 @@ HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, return E_NOTIMPL; } -HRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) +LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) { FIXME("%s %ld %p\n", debugstr_guid(riid), wParam, pAcc ); return E_NOTIMPL; } +HRESULT WINAPI AccessibleObjectFromPoint( POINT ptScreen, IAccessible** ppacc, VARIANT* pvarChild ) +{ + FIXME("{%d,%d} %p %p: stub\n", ptScreen.x, ptScreen.y, ppacc, pvarChild ); + return E_NOTIMPL; +} + HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, REFIID riid, void** ppvObject ) { diff --git a/reactos/dll/win32/oleacc/oleacc.spec b/reactos/dll/win32/oleacc/oleacc.spec index 2baeb2b383f..2736a3d6070 100644 --- a/reactos/dll/win32/oleacc/oleacc.spec +++ b/reactos/dll/win32/oleacc/oleacc.spec @@ -1,6 +1,6 @@ @ stub AccessibleChildren @ stub AccessibleObjectFromEvent -@ stub AccessibleObjectFromPoint +@ stdcall AccessibleObjectFromPoint(double ptr ptr) @ stdcall AccessibleObjectFromWindow(ptr long ptr ptr) @ stdcall CreateStdAccessibleObject(ptr long ptr ptr) @ stub CreateStdAccessibleProxyA diff --git a/reactos/dll/win32/oledlg/insobjdlg.c b/reactos/dll/win32/oledlg/insobjdlg.c index e8750487e40..5db79f61109 100644 --- a/reactos/dll/win32/oledlg/insobjdlg.c +++ b/reactos/dll/win32/oledlg/insobjdlg.c @@ -124,7 +124,7 @@ UINT WINAPI OleUIInsertObjectA(LPOLEUIINSERTOBJECTA lpOleUIInsertObject) */ INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - InsertObjectDlgInfo* pdlgInfo = (InsertObjectDlgInfo*) GetPropA(hwnd,OleUIInsertObjectInfoStr); + InsertObjectDlgInfo* pdlgInfo = GetPropA(hwnd,OleUIInsertObjectInfoStr); switch(uMsg) { @@ -134,7 +134,7 @@ INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR pdlgInfo->hwndSelf = hwnd; - SetPropA(hwnd, OleUIInsertObjectInfoStr, (HANDLE) pdlgInfo); + SetPropA(hwnd, OleUIInsertObjectInfoStr, pdlgInfo); UIINSERTOBJECTDLG_InitDialog(pdlgInfo); @@ -165,7 +165,7 @@ static LRESULT UIINSOBJDLG_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam) { WORD wNotifyCode = HIWORD(wParam); WORD wID = LOWORD(wParam); - InsertObjectDlgInfo* pdlgInfo = (InsertObjectDlgInfo*) GetPropA(hwnd,OleUIInsertObjectInfoStr); + InsertObjectDlgInfo* pdlgInfo = GetPropA(hwnd,OleUIInsertObjectInfoStr); switch(wID) { @@ -340,7 +340,7 @@ static BOOL UIINSERTOBJECTDLG_PopulateObjectTypes(InsertObjectDlgInfo* pdlgInfo) HKEY hkclsids; HKEY hkey; CLSID clsid; - HRESULT ret; + LSTATUS ret; WCHAR keydesc[MAX_PATH]; WCHAR keyname[MAX_PATH]; WCHAR szclsid[128]; @@ -399,12 +399,12 @@ static void UIINSERTOBJECTDLG_FreeObjectTypes(InsertObjectDlgInfo* pdlgInfo) { UINT i, count; - count = SendMessageA(pdlgInfo->hwndObjTypeLB, LB_GETCOUNT, (WPARAM)0, (LPARAM)0); + count = SendMessageA(pdlgInfo->hwndObjTypeLB, LB_GETCOUNT, 0, 0); for (i = 0; i < count; i++) { CLSID* lpclsid = (CLSID*) SendMessageA(pdlgInfo->hwndObjTypeLB, - LB_GETITEMDATA, (WPARAM)i, (LPARAM)0); + LB_GETITEMDATA, i, 0); HeapFree(GetProcessHeap(), 0, lpclsid); } } @@ -546,7 +546,7 @@ static void UIINSERTOBJECTDLG_BrowseFile(InsertObjectDlgInfo* pdlgInfo) fn.lpTemplateName = NULL; if (GetOpenFileNameA(&fn)) - SendMessageA(pdlgInfo->hwndFileTB, WM_SETTEXT, (WPARAM)0, (LPARAM)fn.lpstrFile); + SendMessageA(pdlgInfo->hwndFileTB, WM_SETTEXT, 0, (LPARAM)fn.lpstrFile); } diff --git a/reactos/dll/win32/oledlg/oledlg_Ja.rc b/reactos/dll/win32/oledlg/oledlg_Ja.rc index a412f7d86b2..d753022f257 100644 --- a/reactos/dll/win32/oledlg/oledlg_Ja.rc +++ b/reactos/dll/win32/oledlg/oledlg_Ja.rc @@ -16,40 +16,45 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ƒIƒuƒWƒFƒNƒg‚Ì‘}“ü" -FONT 9, "MS UI Gothic" +CAPTION "オブジェクトã®æŒ¿å…¥" +FONT 9, "MS Shell Dlg" BEGIN LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "ƒIƒuƒWƒFƒNƒg‚ÌŽí—Þ:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + LTEXT "オブジェクトã®ç¨®é¡ž:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE DEFPUSHBUTTON "OK",IDOK,221,7,66,14 - PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,221,24,66,14 - GROUPBOX "Œ‹‰Ê",IDC_RESULT,7,103,208,41 - CONTROL "V‹Kì¬",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + PUSHBUTTON "キャンセル",IDCANCEL,221,24,66,14 + GROUPBOX "çµæžœ",IDC_RESULT,7,103,208,41 + CONTROL "æ–°è¦ä½œæˆ",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 - CONTROL "ƒRƒ“ƒgƒ[ƒ‹‚ðì¬",IDC_CREATECONTROL,"Button", + CONTROL "コントロールを作æˆ",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "ƒtƒ@ƒCƒ‹‚©‚çì¬",IDC_CREATEFROMFILE,"Button", + CONTROL "ファイルã‹ã‚‰ä½œæˆ",IDC_CREATEFROMFILE,"Button", BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "ƒRƒ“ƒgƒ[ƒ‹‚ð’ljÁ(&A)...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "ƒAƒCƒRƒ“‚Æ‚µ‚Ä•\Ž¦",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + PUSHBUTTON "コントロールを追加(&A)...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "アイコンã¨ã—ã¦è¡¨ç¤º",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 - PUSHBUTTON "ŽQÆ...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE - LTEXT "ƒtƒ@ƒCƒ‹:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + PUSHBUTTON "å‚ç…§...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "ファイル:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE END STRINGTABLE DISCARDABLE { - IDS_RESULTOBJDESC "ƒhƒLƒ…ƒƒ“ƒg‚ÉV‚µ‚¢ %s ƒIƒuƒWƒFƒNƒg‚ð‘}“ü‚µ‚Ü‚·" - IDS_RESULTFILEOBJDESC "ƒtƒ@ƒCƒ‹‚Ì“à—e‚ðƒIƒuƒWƒFƒNƒg‚Æ‚µ‚ăhƒLƒ…ƒƒ“ƒg‚É‘}“ü‚µ‚Ü‚·BƒIƒuƒWƒFƒNƒg‚Í쬂µ‚½ƒvƒƒOƒ‰ƒ€‚©‚ç—LŒø‚É‚Å‚«‚Ü‚·B" - IDS_BROWSE "ŽQÆ" - IDS_NOTOLEMOD "ƒtƒ@ƒCƒ‹‚Í—LŒø‚ÈOLEƒ‚ƒWƒ…[ƒ‹‚Å‚Í‚È‚¢‚悤‚Å‚·BOLEƒRƒ“ƒgƒ[ƒ‹‚ð“o˜^‚Å‚«‚Ü‚¹‚ñB" - IDS_NOTOLEMODCAPTION "ƒRƒ“ƒgƒ[ƒ‹‚ð’ljÁ" + IDS_RESULTOBJDESC "ドキュメントã«æ–°ã—ã„ %s オブジェクトを挿入ã—ã¾ã™" + IDS_RESULTFILEOBJDESC "ファイルã®å†…容をオブジェクトã¨ã—ã¦ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã«æŒ¿å…¥ã—ã¾ã™ã€‚オブジェクトã¯ä½œæˆã—ãŸãƒ—ログラムã‹ã‚‰æœ‰åŠ¹ã«ã§ãã¾ã™ã€‚" + IDS_BROWSE "å‚ç…§" + IDS_NOTOLEMOD "ファイルã¯æœ‰åŠ¹ãªOLEモジュールã§ã¯ãªã„よã†ã§ã™ã€‚OLEコントロールを登録ã§ãã¾ã›ã‚“。" + IDS_NOTOLEMODCAPTION "コントロールを追加" } + +#pragma code_page(default) diff --git a/reactos/dll/win32/oledlg/oledlg_Ko.rc b/reactos/dll/win32/oledlg/oledlg_Ko.rc index 20b6d9e20d0..32a49305afc 100644 --- a/reactos/dll/win32/oledlg/oledlg_Ko.rc +++ b/reactos/dll/win32/oledlg/oledlg_Ko.rc @@ -16,12 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "°´Ã¼ »ðÀÔ" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | @@ -57,7 +57,7 @@ STRINGTABLE DISCARDABLE IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ưº°ÇÏ°Ô ºÙ¿©³Ö±â" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "¿øº»:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP CONTROL "ºÙ¿©³Ö±â(&P)", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, diff --git a/reactos/dll/win32/oledlg/oledlg_Zh.rc b/reactos/dll/win32/oledlg/oledlg_Zh.rc new file mode 100644 index 00000000000..2f2daeda90d --- /dev/null +++ b/reactos/dll/win32/oledlg/oledlg_Zh.rc @@ -0,0 +1,180 @@ +/* + * oledlg (Simplified and Traditional Chinese Resources) + * + * Copyright 2008 Hongbo Ni + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "æ’入对象" +FONT 9, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "对象类型:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "确定",IDOK,221,7,66,14 + PUSHBUTTON "å–消",IDCANCEL,221,24,66,14 + GROUPBOX "结果",IDC_RESULT,7,103,208,41 + CONTROL "新建",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "建立控件",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "建立于文件",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "添加控件(&A)...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "显示为图标",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "æµè§ˆ...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "文件:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "在你的文件中æ’入一个新的 %s 对象" + IDS_RESULTFILEOBJDESC "将文件的内容以对象的方å¼æ’入到你的文件以便你å¯ä»¥ç”¨åˆ›å»ºæœ¬æ–‡ä»¶çš„程åºæ¥æ¿€æ´»å®ƒ." + IDS_BROWSE "æµè§ˆ" + IDS_NOTOLEMOD "本文件ä¸åƒæ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ OLE 模型. ä¸èƒ½æ³¨å†Œ OLE 控件." + IDS_NOTOLEMODCAPTION "添加控件" +} + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "特殊粘贴" +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "æº:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "粘贴(&P)", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "粘贴链接(&L)", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "为(&A):", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "确定", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "å–消", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "帮助(&H)", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "显示为图标(&D)", 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 "改å˜å›¾æ ‡(&I)...", 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 "结果", -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 + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "将剪贴æ¿çš„内容以 %s æ’入到你的文件." + IDS_PS_PASTE_OBJECT "将剪贴æ¿çš„内容æ’入到你的文件以便你å¯ä»¥ä½¿ç”¨ %s." + IDS_PS_PASTE_OBJECT_AS_ICON "将剪贴æ¿çš„内容æ’入到你的文件以便你å¯ä»¥ç”¨ %s 激活它, 一般显示为图标." + IDS_PS_PASTE_LINK_DATA "将剪贴æ¿çš„内容以 %s æ’入到你的文件. æ•°æ®æ˜¯é“¾æŽ¥åˆ°æºæ–‡ä»¶çš„, 对æºæ–‡ä»¶çš„任何改动都会å应到你的文件." + IDS_PS_PASTE_LINK_OBJECT "将剪贴æ¿çš„图åƒæ’入到你的文件. 图åƒæ˜¯é“¾æŽ¥åˆ°æºæ–‡ä»¶çš„, 对æºæ–‡ä»¶çš„任何改动都会å应到你的文件." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "将剪贴æ¿çš„æ·å¾„æ’入到你的文件. æ·å¾„是链接到æºæ–‡ä»¶çš„, 对æºæ–‡ä»¶çš„任何改动都会å应到你的文件." + IDS_PS_NON_OLE "将剪贴æ¿çš„内容æ’入到你的文件." + IDS_PS_UNKNOWN_TYPE "ä¸æ˜Žç±»åž‹" + IDS_PS_UNKNOWN_SRC "ä¸æ˜Žæ¥æº" + IDS_PS_UNKNOWN_APP "ä¸æ˜Žåº”用程åº" +} + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "æ’å…¥å°è±¡" +FONT 9, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "å°è±¡é¡žåž‹:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "確定",IDOK,221,7,66,14 + PUSHBUTTON "å–消",IDCANCEL,221,24,66,14 + GROUPBOX "çµæžœ",IDC_RESULT,7,103,208,41 + CONTROL "新建",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "建立控件",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "建立於檔案",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "添加控件(&A)...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "顯示為圖標",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "ç€è¦½...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "檔案:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "在你的檔案中æ’入一個新的 %s å°è±¡" + IDS_RESULTFILEOBJDESC "將檔案的內容以å°è±¡çš„æ–¹å¼æ’入到你的檔案以便你å¯ä»¥ç”¨å‰µå»ºæœ¬æª”案的程å¼ä¾†æ¿€æ´»å®ƒ." + IDS_BROWSE "ç€è¦½" + IDS_NOTOLEMOD "本檔案ä¸åƒæ˜¯ä¸€å€‹æœ‰æ•ˆçš„ OLE 模型. ä¸èƒ½è¨»å†Š OLE 控件." + IDS_NOTOLEMODCAPTION "添加控件" +} + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "特殊貼上" +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "æº:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "貼上(&P)", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "貼上éˆæŽ¥(&L)", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "為(&A):", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "確定", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "å–消", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "幫助(&H)", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "顯示為圖標(&D)", 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 "改變圖標(&I)...", 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 "çµæžœ", -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 + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "將剪貼æ¿çš„內容以 %s æ’入到你的檔案." + IDS_PS_PASTE_OBJECT "將剪貼æ¿çš„內容æ’入到你的檔案以便你å¯ä»¥ä½¿ç”¨ %s." + IDS_PS_PASTE_OBJECT_AS_ICON "將剪貼æ¿çš„內容æ’入到你的檔案以便你å¯ä»¥ç”¨ %s 激活它, 一般顯示為圖標." + IDS_PS_PASTE_LINK_DATA "將剪貼æ¿çš„內容以 %s æ’入到你的檔案. 數據是éˆæŽ¥åˆ°æºæª”案的, å°æºæª”案的任何改動都會å應到你的檔案." + IDS_PS_PASTE_LINK_OBJECT "將剪貼æ¿çš„圖åƒæ’入到你的檔案. 圖åƒæ˜¯éˆæŽ¥åˆ°æºæª”案的, å°æºæª”案的任何改動都會å應到你的檔案." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "將剪貼æ¿çš„æ·å¾‘æ’入到你的檔案. æ·å¾‘是éˆæŽ¥åˆ°æºæª”案的, å°æºæª”案的任何改動都會å應到你的檔案." + IDS_PS_NON_OLE "將剪貼æ¿çš„內容æ’入到你的檔案." + IDS_PS_UNKNOWN_TYPE "ä¸æ˜Žé¡žåž‹" + IDS_PS_UNKNOWN_SRC "ä¸æ˜Žä¾†æº" + IDS_PS_UNKNOWN_APP "ä¸æ˜Žæ‡‰ç”¨ç¨‹å¼" +} + +#pragma code_page(default) diff --git a/reactos/dll/win32/oledlg/pastespl.c b/reactos/dll/win32/oledlg/pastespl.c index 68bad0630e0..ae5e2f2f04d 100644 --- a/reactos/dll/win32/oledlg/pastespl.c +++ b/reactos/dll/win32/oledlg/pastespl.c @@ -648,7 +648,7 @@ UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA psA) if(psA->cPasteEntries > 0) { DWORD size = psA->cPasteEntries * sizeof(ps.arrPasteEntries[0]); - UINT i; + INT i; ps.arrPasteEntries = HeapAlloc(GetProcessHeap(), 0, size); memcpy(ps.arrPasteEntries, psA->arrPasteEntries, size); @@ -665,7 +665,7 @@ UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA psA) if(psA->cPasteEntries > 0) { - UINT i; + INT i; for(i = 0; i < psA->cPasteEntries; i++) { HeapFree(GetProcessHeap(), 0, (WCHAR*)ps.arrPasteEntries[i].lpstrFormatName); diff --git a/reactos/dll/win32/oledlg/rsrc.rc b/reactos/dll/win32/oledlg/rsrc.rc index 9bfd47e6379..4cbc8628f33 100644 --- a/reactos/dll/win32/oledlg/rsrc.rc +++ b/reactos/dll/win32/oledlg/rsrc.rc @@ -52,3 +52,4 @@ #include "oledlg_Sv.rc" #include "oledlg_Tr.rc" #include "oledlg_Uk.rc" +#include "oledlg_Zh.rc"