[ros-diffs] [cwittich] 38679: sync oleacc and oledlg with wine 1.1.12

Author: cwittich
Date: Sat Jan 10 08:50:05 2009
New Revision: 38679

URL: http://svn.reactos.org/svn/reactos?rev=38679&view=rev
Log:
sync oleacc and oledlg with wine 1.1.12

Added:
    trunk/reactos/dll/win32/oledlg/oledlg_Zh.rc   (with props)
Modified:
    trunk/reactos/dll/win32/oleacc/main.c
    trunk/reactos/dll/win32/oleacc/oleacc.spec
    trunk/reactos/dll/win32/oledlg/insobjdlg.c
    trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc
    trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc
    trunk/reactos/dll/win32/oledlg/pastespl.c
    trunk/reactos/dll/win32/oledlg/rsrc.rc

Modified: trunk/reactos/dll/win32/oleacc/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/main.c?re…
==============================================================================
--- trunk/reactos/dll/win32/oleacc/main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oleacc/main.c [iso-8859-1] Sat Jan 10 08:50:05 2009
@@ -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,9 +40,15 @@
     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;
 }
 

Modified: trunk/reactos/dll/win32/oleacc/oleacc.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.sp…
==============================================================================
--- trunk/reactos/dll/win32/oleacc/oleacc.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oleacc/oleacc.spec [iso-8859-1] Sat Jan 10 08:50:05 2009
@@ -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

Modified: trunk/reactos/dll/win32/oledlg/insobjdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/insobjdlg…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/insobjdlg.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/insobjdlg.c [iso-8859-1] Sat Jan 10 08:50:05 2009
@@ -124,7 +124,7 @@
  */
 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 @@
 
         pdlgInfo->hwndSelf = hwnd;
 
-        SetPropA(hwnd, OleUIInsertObjectInfoStr, (HANDLE) pdlgInfo);
+        SetPropA(hwnd, OleUIInsertObjectInfoStr, pdlgInfo);
 
         UIINSERTOBJECTDLG_InitDialog(pdlgInfo);
 
@@ -165,7 +165,7 @@
 {
   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 @@
   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 @@
 {
   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 @@
    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);
 }
 
 

Modified: trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ja…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc [iso-8859-1] Sat Jan 10 08:50:05 2009
@@ -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)

Modified: trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ko…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc [iso-8859-1] Sat Jan 10 08:50:05 2009
@@ -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 @@
 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,

Added: trunk/reactos/dll/win32/oledlg/oledlg_Zh.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Zh…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_Zh.rc (added)
+++ trunk/reactos/dll/win32/oledlg/oledlg_Zh.rc [iso-8859-1] Sat Jan 10 08:50:05 2009
@@ -1,0 +1,180 @@
+/*
+ * oledlg (Simplified and Traditional Chinese Resources)
+ *
+ * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com>
+ *
+ * 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)

Propchange: trunk/reactos/dll/win32/oledlg/oledlg_Zh.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/oledlg/pastespl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/pastespl.…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/pastespl.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/pastespl.c [iso-8859-1] Sat Jan 10 08:50:05 2009
@@ -648,7 +648,7 @@
     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 @@
 
     if(psA->cPasteEntries > 0)
     {
-        UINT i;
+        INT i;
         for(i = 0; i < psA->cPasteEntries; i++)
         {
             HeapFree(GetProcessHeap(), 0,
(WCHAR*)ps.arrPasteEntries[i].lpstrFormatName);

Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/rsrc.rc?r…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oledlg/rsrc.rc [iso-8859-1] Sat Jan 10 08:50:05 2009
@@ -52,3 +52,4 @@
 #include "oledlg_Sv.rc"
 #include "oledlg_Tr.rc"
 #include "oledlg_Uk.rc"
+#include "oledlg_Zh.rc"