10 Jan
2009
10 Jan
'09
2:50 p.m.
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 "IuWFNgÌ}ü"
-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 "IuWFNgÌíÞ:",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 "LZ",IDCANCEL,221,24,66,14
- GROUPBOX "Ê",IDC_RESULT,7,103,208,41
- CONTROL
"VKì¬",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 "Rg[ðì¬",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
"Rg[ðÇÁ(&A)...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE
- CONTROL
"ACRƵÄ\¦",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 "hL
gÉVµ¢ %s IuWFNgð}üµÜ·"
- IDS_RESULTFILEOBJDESC "t@CÌàeðIuWFNgƵÄhL
gÉ}üµÜ·BIuWFNgÍ쬵½vO©çLøÉÅ«Ü·B"
- IDS_BROWSE "QÆ"
- IDS_NOTOLEMOD "t@CÍLøÈOLEW
[ÅÍÈ¢æ¤Å·BOLERg[ðo^ūܹñB"
- IDS_NOTOLEMODCAPTION "Rg[ðÇÁ"
+ 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"
6138
days inactive
6138
days old
0 comments
1 participants
participants (1)
-
cwittich＠svn.reactos.org