Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 21:21:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Autosyncing with Wine HEAD

Browse source 
svn path=/trunk/; revision=30878
This commit is contained in:
The Wine Synchronizer 2007-11-29 11:06:11 +00:00
parent 703674a6fe
commit da37d03ee2
20 changed files with 156 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reactos/dll/win32/oledlg/oledlg.rbuild
View file

@ -1,13 +1,12 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="oledlg" type="win32dll" baseaddress="${BASEADDRESS_OLEDLG}" installbase="system32" installname="oledlg.dll" allowwarnings="true">
<importlibrary definition="oledlg.spec.def" />
<include base="oledlg">.</include>
<include base="ReactOS">include/reactos/wine</include>
<define name="__REACTOS__" />
<define name="__WINESRC__" />
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x600</define>
<define name="_WIN32_WINNT">0x501</define>
<define name="WINVER">0x501</define>
<define name="WINVER">0x600</define>
<define name="_WIN32_WINNT">0x600</define>
<library>wine</library>
<library>ole32</library>
<library>comdlg32</library>

18
reactos/dll/win32/oledlg/oledlg_Ko.rc
View file

@ -1,5 +1,5 @@
/*
* Copyright 2005 YunSong Hwang
* Copyright 2005,2007 YunSong Hwang
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -40,8 +40,8 @@ BEGIN
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
PUSHBUTTON "ã±â...",IDC_BROWSE,155,88,50,14,NOT WS_VISIBLE
LTEXT "ÆÄÀÏ:",IDC_FILELBL,58,21,20,8, NOT WS_VISIBLE
EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE
END
@ -61,13 +61,13 @@ FONT 8, "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
1, 44, 55, 10
CONTROL "링크로 붙여넣기(&L)", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE,
6, 63, 55, 10
LTEXT "&As:", -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
1, 61, 69, 10
LTEXT "´Ù¸¥ À̸§À¸·Î(&A):", -1, 67, 25, 53, 8, WS_VISIBLE | WS_GROUP
LISTBOX IDC_PS_PASTELIST, 66, 36, 150, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
LISTBOX IDC_PS_PASTELINKLIST, 66, 36, 150, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE
LISTBOX IDC_PS_DISPLAYLIST, 66, 36, 150, 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

2
reactos/dll/win32/oledlg/oledlg_No.rc
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

18
reactos/dll/win32/oledlg/oledlg_Pl.rc
View file

@ -21,7 +21,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 310, 151
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Wstaw objekt"
CAPTION "Wstaw obiekt"
FONT 8, "MS Shell Dlg"
BEGIN
LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT |
@ -48,7 +48,7 @@ END
STRINGTABLE DISCARDABLE
{
IDS_RESULTOBJDESC "Wstaw nowy objekt %s do dokumentu"
IDS_RESULTOBJDESC "Wstaw nowy obiekt %s do dokumentu"
IDS_RESULTFILEOBJDESC "Wstaw zawartoœæ pliku jako obiekt do dokumentu. Bêdzie mo¿na go aktywowaæ u¿ywaj¹c programu, który go stworzy³."
IDS_BROWSE "Przegl¹daj"
IDS_NOTOLEMOD "Plik nie wydaje siê byæ poprawnym modu³em OLE. Nie uda³o siê zarejestrowaæ kontrolki OLE."
@ -63,7 +63,7 @@ BEGIN
LTEXT "<22>ród³o:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP
CONTROL "&Wklej", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE,
6, 38, 55, 10
CONTROL "Wklej &³¹czê", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE,
CONTROL "Wklej &³¹cze", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE,
6, 63, 55, 10
LTEXT "&Jako:", -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
@ -83,14 +83,14 @@ END
STRINGTABLE DISCARDABLE
{
IDS_PS_PASTE_DATA "Wstawia zawartoϾ schowka do documentu jako %s."
IDS_PS_PASTE_DATA "Wstawia zawartoϾ schowka do dokumentu jako %s."
IDS_PS_PASTE_OBJECT "Wstawia zawartoœæ schowka do dokumentu, tak aby móg³ byæ aktywowany za pomoc¹ %s."
IDS_PS_PASTE_OBJECT_AS_ICON "Wstawia zawartoœæ schowka do dokumentu, tak aby móg³ byæ aktywowany za pomoc¹ %s. Bêdzie wyœwietlany jako ikona."
IDS_PS_PASTE_LINK_DATA "Wstawia zawartoœæ schowka do documentu jako %s. Dane bêd¹ po³¹czone z plikiem Ÿród³owym, dziêki czemu zmiany w pliku bêd¹ odzwierciedlone w dokumencie."
IDS_PS_PASTE_LINK_OBJECT "Wstawia zawartoœæ schowka do documentu jako obraz. Obraz bêdzie po³¹czony z plikiem Ÿród³owym, dziêki czemu zmiany w pliku bêd¹ odzwierciedlone w dokumencie."
IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Wstawia do documentu skrót do zawartoœci schowka. Skrót bêdzie po³¹czony z plikiem Ÿród³owym, dziêki czemu zmiany w pliku bêd¹ odzwierciedlone w dokumencie."
IDS_PS_PASTE_OBJECT_AS_ICON "Wstawia zawartoœæ schowka do dokumentu, tak aby móg³ byæ aktywowany za pomoc¹ %s. Bêdzie wyœwietlany jako ikona."
IDS_PS_PASTE_LINK_DATA "Wstawia zawartoœæ schowka do dokumentu jako %s. Dane bêd¹ po³¹czone z plikiem Ÿród³owym, dziêki czemu zmiany w pliku bêd¹ odzwierciedlone w dokumencie."
IDS_PS_PASTE_LINK_OBJECT "Wstawia zawartoœæ schowka do dokumentu jako obraz. Obraz bêdzie po³¹czony z plikiem Ÿród³owym, dziêki czemu zmiany w pliku bêd¹ odzwierciedlone w dokumencie."
IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Wstawia do documentu skrót do zawartoœci schowka. Skrót bêdzie po³¹czony z plikiem Ÿród³owym, dziêki czemu zmiany w pliku bêd¹ odzwierciedlone w dokumencie."
IDS_PS_NON_OLE "Wstawia zawartoϾ schowka do dokumentu"
IDS_PS_UNKNOWN_TYPE "Nieznany typ"
IDS_PS_UNKNOWN_SRC "Nieznane Ÿród³o"
IDS_PS_UNKNOWN_APP "program który go stworzy³"
IDS_PS_UNKNOWN_APP "program, który go stworzy³"
}

95
reactos/dll/win32/oledlg/oledlg_Sv.rc Normal file
View file

@ -0,0 +1,95 @@
/*
* Copyright 2007 Daniel Nylander
*
* 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
*/
LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Infoga objekt"
FONT 8, "MS Shell Dlg"
BEGIN
LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT |
LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL |
WS_TABSTOP
LTEXT "Objekttyp:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE
DEFPUSHBUTTON "OK",IDOK,221,7,66,14
PUSHBUTTON "Avbryt",IDCANCEL,221,24,66,14
GROUPBOX "Resultat",IDC_RESULT,7,103,208,41
CONTROL "Skapa ny",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,7,20,62,10
CONTROL "Create Control",IDC_CREATECONTROL,"Button",
BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10
CONTROL "Skapa från fil",IDC_CREATEFROMFILE,"Button",
BS_AUTORADIOBUTTON,7,37,67,10
LTEXT "",IDC_RESULTDESC,49,112,159,23
PUSHBUTTON "&Add Control...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE
CONTROL "Visa som ikon",IDC_ASICON,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10
PUSHBUTTON "Bläddra...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE
LTEXT "Fil:",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 "Infoga ett nytt %s-objekt i ditt dokument"
IDS_RESULTFILEOBJDESC "Insert the contents of the file as an object into your document so that you may activate it using the program which created it."
IDS_BROWSE "Bläddra"
IDS_NOTOLEMOD "File does not appear to be a valid OLE module. Unable to register OLE control."
IDS_NOTOLEMODCAPTION "Add Control"
}
IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140
STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Paste Special"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Källa:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP
CONTROL "Klistra &in", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE,
6, 38, 55, 10
CONTROL "Klistra in &länk", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE,
6, 63, 55, 10
LTEXT "&Som:", -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 "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14
CONTROL "Avbryt", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14
CONTROL "&Hjälp", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14
CONTROL "&Visa som ikon", 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 "Byt &ikon...", 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 "Resultat", -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 "Inserts the contents of the clipboard into your document as %s."
IDS_PS_PASTE_OBJECT "Inserts the contents of the clipboard into your document so that you can activate it using %s."
IDS_PS_PASTE_OBJECT_AS_ICON "Inserts the contents of the clipboard into your document so that you can activate it using %s. It will be displayed as an icon."
IDS_PS_PASTE_LINK_DATA "Inserts the contents of the clipboard into your document as %s. The data is linked to the source file so that changes to the file will be reflected in your document."
IDS_PS_PASTE_LINK_OBJECT "Inserts a picture of the clipboard contents into your document. The picture is linked to the source file so that changes to the file will be reflected in your document."
IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Inserts a shortcut which points to the location of the clipboard contents. The shortcut is linked to the source file so that changes to the file will be reflected in your document."
IDS_PS_NON_OLE "Inserts the contents of the clipboard into your document."
IDS_PS_UNKNOWN_TYPE "Unknown Type"
IDS_PS_UNKNOWN_SRC "Unknown Source"
IDS_PS_UNKNOWN_APP "the program which created it"
}

4
reactos/dll/win32/oledlg/oledlg_ros.diff
View file

@ -58,8 +58,8 @@ Index: rsrc.rc
===================================================================
--- rsrc.rc (revision 25690)
+++ rsrc.rc (revision working copy)
@@ -47,3 +47,4 @@
#include "oledlg_Pl.rc"
@@ -48,3 +48,4 @@
#include "oledlg_Pt.rc"
#include "oledlg_Sv.rc"
#include "oledlg_Tr.rc"
+#include "oledlg_Uk.rc"

6
reactos/dll/win32/oledlg/pastespl.c
View file

@ -83,7 +83,7 @@ static void dump_ps_flags(DWORD flags)
TRACE("flags %08x %s\n", flags, flagstr);
}
static void dump_pastespecial(LPOLEUIPASTESPECIALW ps)
static void dump_pastespecial(const OLEUIPASTESPECIALW *ps)
{
UINT i;
dump_ps_flags(ps->dwFlags);
@ -363,7 +363,7 @@ static void init_lists(HWND hdlg, ps_struct_t *ps_struct)
EnableWindow(GetDlgItem(hdlg, IDOK), 0);
}
static void update_src_text(HWND hdlg, ps_struct_t *ps_struct)
static void update_src_text(HWND hdlg, const ps_struct_t *ps_struct)
{
WCHAR *str;
@ -403,7 +403,7 @@ static void update_as_icon(HWND hdlg, ps_struct_t *ps_struct)
EnableWindow(change_icon, 0);
}
static void update_result_text(HWND hdlg, ps_struct_t *ps_struct)
static void update_result_text(HWND hdlg, const ps_struct_t *ps_struct)
{
WCHAR resource_txt[200];
UINT res_id;

1
reactos/dll/win32/oledlg/rsrc.rc
View file

@ -46,5 +46,6 @@
#include "oledlg_No.rc"
#include "oledlg_Pl.rc"
#include "oledlg_Pt.rc"
#include "oledlg_Sv.rc"
#include "oledlg_Tr.rc"
#include "oledlg_Uk.rc"