[ros-diffs] [winesync] 22830: Autosyncing with Wine

winesync at svn.reactos.org winesync at svn.reactos.org
Tue Jul 4 16:09:36 CEST 2006


Author: winesync
Date: Tue Jul  4 18:09:35 2006
New Revision: 22830

URL: http://svn.reactos.org/svn/reactos?rev=22830&view=rev
Log:
Autosyncing with Wine

Added:
    trunk/reactos/dll/win32/netapi32/share.c   (with props)
    trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc   (with props)
Removed:
    trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc
Modified:
    trunk/reactos/dll/win32/msimg32/msimg32.rbuild
    trunk/reactos/dll/win32/netapi32/access.c
    trunk/reactos/dll/win32/netapi32/netapi32.rbuild
    trunk/reactos/dll/win32/netapi32/wksta.c
    trunk/reactos/dll/win32/oleacc/oleacc.rbuild
    trunk/reactos/dll/win32/oledlg/oledlg.rbuild
    trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc
    trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc   (contents, props changed)
    trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc
    trunk/reactos/dll/win32/oledlg/rsrc.rc

Modified: trunk/reactos/dll/win32/msimg32/msimg32.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimg32/msimg32.rbuild?rev=22830&r1=22829&r2=22830&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msimg32/msimg32.rbuild (original)
+++ trunk/reactos/dll/win32/msimg32/msimg32.rbuild Tue Jul  4 18:09:35 2006
@@ -1,12 +1,17 @@
 <module name="msimg32" type="win32dll" baseaddress="${BASEADDRESS_MSIMG32}" installbase="system32" installname="msimg32.dll" allowwarnings="true">
 	<importlibrary definition="msimg32.spec.def" />
 	<include base="msimg32">.</include>
-	<include base="msimg32">include</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>
+	<library>wine</library>
+	<library>gdi32</library>
+	<library>kernel32</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>gdi32</library>
 	<file>msimg32_main.c</file>
 	<file>msimg32.spec</file>
 </module>

Modified: trunk/reactos/dll/win32/netapi32/access.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.c?rev=22830&r1=22829&r2=22830&view=diff
==============================================================================
--- trunk/reactos/dll/win32/netapi32/access.c (original)
+++ trunk/reactos/dll/win32/netapi32/access.c Tue Jul  4 18:09:35 2006
@@ -554,6 +554,12 @@
 NET_API_STATUS WINAPI NetUserModalsGet(LPCWSTR szServer, DWORD level, LPBYTE *pbuffer)
 {
     FIXME("(%s %ld %p) stub!\n", debugstr_w(szServer), level, pbuffer);
+
+    if (level == 2)
+    {
+        *pbuffer = NULL;
+        return NERR_Success;
+    }
     return NERR_InternalError;
 }
 

Modified: trunk/reactos/dll/win32/netapi32/netapi32.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi32.rbuild?rev=22830&r1=22829&r2=22830&view=diff
==============================================================================
--- trunk/reactos/dll/win32/netapi32/netapi32.rbuild (original)
+++ trunk/reactos/dll/win32/netapi32/netapi32.rbuild Tue Jul  4 18:09:35 2006
@@ -3,26 +3,35 @@
 	<include base="netapi32">.</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="_SVRAPI_" />
 	<library>wine</library>
+	<library>iphlpapi</library>
+	<library>ws2_32</library>
+	<library>advapi32</library>
+	<library>kernel32</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>advapi32</library>
-	<library>ws2_32</library>
-	<library>iphlpapi</library>
 	<file>access.c</file>
+	<library>ntdll</library>
 	<file>apibuf.c</file>
+	<library>ntdll</library>
 	<file>browsr.c</file>
+	<library>ntdll</library>
 	<file>ds.c</file>
+	<library>ntdll</library>
 	<file>nbcmdqueue.c</file>
+	<library>ntdll</library>
 	<file>nbnamecache.c</file>
+	<library>ntdll</library>
 	<file>nbt.c</file>
+	<library>ntdll</library>
 	<file>netapi32.c</file>
+	<library>ntdll</library>
 	<file>netbios.c</file>
+	<library>ntdll</library>
 	<file>wksta.c</file>
 	<file>netapi32.spec</file>
 </module>

Added: trunk/reactos/dll/win32/netapi32/share.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/share.c?rev=22830&view=auto
==============================================================================
--- trunk/reactos/dll/win32/netapi32/share.c (added)
+++ trunk/reactos/dll/win32/netapi32/share.c Tue Jul  4 18:09:35 2006
@@ -1,0 +1,85 @@
+/* Copyright 2006 Paul Vriens
+ *
+ * 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
+ */
+
+#include "wine/debug.h"
+#include "lm.h"
+#include "winerror.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(share);
+
+/************************************************************
+ * NetSessionEnum  (NETAPI32.@)
+ *
+ * PARAMS
+ *   servername    [I]   Pointer to a string with the name of the server
+ *   UncClientName [I]   Pointer to a string with the name of the session
+ *   username      [I]   Pointer to a string with the name of the user
+ *   level         [I]   Data information level
+ *   bufptr        [O]   Buffer to the data
+ *   prefmaxlen    [I]   Preferred maximum length of the data
+ *   entriesread   [O]   Pointer to the number of entries enumerated
+ *   totalentries  [O]   Pointer to the possible number of entries
+ *   resume_handle [I/O] Pointer to a handle for subsequent searches
+ *
+ * RETURNS
+ *   If successful, the function returns NERR_Success
+ *   On failure it returns:
+ *     ERROR_ACCESS_DENIED         User has no access to the requested information
+ *     ERROR_INVALID_LEVEL         Value of 'level' is not correct
+ *     ERROR_INVALID_PARAMETER     Wrong parameter
+ *     ERROR_MORE_DATA             Need a larger buffer
+ *     ERROR_NOT_ENOUGH_MEMORY     Not enough memory
+ *     NERR_ClientNameNotFound     A session does not exist on a given computer
+ *     NERR_InvalidComputer        Invalid computer name
+ *     NERR_UserNotFound           User name could not be found.
+ */
+NET_API_STATUS WINAPI NetSessionEnum(LPWSTR servername, LPWSTR UncClientName,
+    LPWSTR username, DWORD level, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread,
+    LPDWORD totalentries, LPDWORD resume_handle)
+{
+    FIXME("Stub (%s %s %s %ld %p %ld %p %p %p)\n", debugstr_w(servername),
+        debugstr_w(UncClientName), debugstr_w(username),
+        level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle);
+
+    return NERR_Success;
+}
+
+/************************************************************
+ * NetShareEnum  (NETAPI32.@)
+ *
+ * PARAMS
+ *   servername    [I]   Pointer to a string with the name of the server
+ *   level         [I]   Data information level
+ *   bufptr        [O]   Buffer to the data
+ *   prefmaxlen    [I]   Preferred maximum length of the data
+ *   entriesread   [O]   Pointer to the number of entries enumerated
+ *   totalentries  [O]   Pointer to the possible number of entries
+ *   resume_handle [I/O] Pointer to a handle for subsequent searches
+ *
+ * RETURNS
+ *   If successful, the function returns NERR_Success
+ *   On failure it returns a system error code (FIXME: find out which)
+ *
+ */
+NET_API_STATUS WINAPI NetShareEnum( LPWSTR servername, DWORD level, LPBYTE* bufptr,
+    DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle)
+{
+    FIXME("Stub (%s %ld %p %ld %p %p %p)\n", debugstr_w(servername), level, bufptr,
+        prefmaxlen, entriesread, totalentries, resume_handle);
+
+    return ERROR_NOT_SUPPORTED;
+}

Propchange: trunk/reactos/dll/win32/netapi32/share.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/netapi32/wksta.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c?rev=22830&r1=22829&r2=22830&view=diff
==============================================================================
--- trunk/reactos/dll/win32/netapi32/wksta.c (original)
+++ trunk/reactos/dll/win32/netapi32/wksta.c Tue Jul  4 18:09:35 2006
@@ -36,6 +36,7 @@
 #include "iphlpapi.h"
 #include "winerror.h"
 #include "winreg.h"
+#include "winternl.h"
 #include "ntsecapi.h"
 #include "netbios.h"
 #include "wine/debug.h"

Modified: trunk/reactos/dll/win32/oleacc/oleacc.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.rbuild?rev=22830&r1=22829&r2=22830&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oleacc/oleacc.rbuild (original)
+++ trunk/reactos/dll/win32/oleacc/oleacc.rbuild Tue Jul  4 18:09:35 2006
@@ -1,13 +1,16 @@
-<module name="oleacc" type="win32dll" baseaddress="${BASEADDRESS_OLEACC}" installbase="system32" installname="oleacc.dll">
-	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
+<module name="oleacc" type="win32dll" baseaddress="${BASEADDRESS_OLEACC}" installbase="system32" installname="oleacc.dll" allowwarnings="true">
 	<importlibrary definition="oleacc.spec.def" />
 	<include base="oleacc">.</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>
+	<library>wine</library>
+	<library>kernel32</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>wine</library>
 	<file>main.c</file>
 	<file>oleacc.spec</file>
 </module>

Modified: trunk/reactos/dll/win32/oledlg/oledlg.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg.rbuild?rev=22830&r1=22829&r2=22830&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg.rbuild (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg.rbuild Tue Jul  4 18:09:35 2006
@@ -3,17 +3,20 @@
 	<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>
 	<library>wine</library>
+	<library>ole32</library>
+	<library>comdlg32</library>
+	<library>user32</library>
+	<library>advapi32</library>
+	<library>kernel32</library>
 	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>comdlg32</library>
-	<library>ole32</library>
+	<file>insobjdlg.c</file>
 	<file>oledlg_main.c</file>
-	<file>insobjdlg.c</file>
 	<file>rsrc.rc</file>
 	<file>oledlg.spec</file>
 </module>

Modified: trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc?rev=22830&r1=22829&r2=22830&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc Tue Jul  4 18:09:35 2006
@@ -1,4 +1,5 @@
-/*
+/* Hey, Emacs, open this file with -*- coding: cp1250 -*-
+ *
  * Czech resources or oledlg
  * Copyright 2003 Ulrich Czekalla for CodeWeavers
  * Copyright 2004 David Kredba
@@ -20,9 +21,11 @@
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
+/* Czech strings in CP1250 */
+
 UIINSERTOBJECT DIALOG DISCARDABLE  0, 0, 294, 151
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Vlo¾it objekt"
+CAPTION "Vložit objekt"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LISTBOX         IDC_OBJTYPELIST,82,19,131,66,LBS_SORT |
@@ -49,8 +52,8 @@
 
 STRINGTABLE DISCARDABLE
 {
-  IDS_RESULTOBJDESC	"Vlo¾en nový %s objekt do Va¹eho dokumentu"
-  IDS_RESULTFILEOBJDESC	"Vlo¾en obsah souboru jako objekt do Va¹eho dokumentu, tak¾e ho mù¾ete upravit programem, kterým byl vytvoøen."
+  IDS_RESULTOBJDESC	"Vložen nový %s objekt do Vašeho dokumentu"
+  IDS_RESULTFILEOBJDESC	"Vložen obsah souboru jako objekt do Vašeho dokumentu, takže ho mùžete upravit programem, kterým byl vytvoøen."
   IDS_BROWSE            "Procházet"
   IDS_NOTOLEMOD         "Soubor není platným OLE modulem. Nelze registrovat OLE propojení."
   IDS_NOTOLEMODCAPTION  "Pøidat propojení"

Modified: trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc?rev=22830&r1=22829&r2=22830&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc Tue Jul  4 18:09:35 2006
@@ -1,56 +1,55 @@
-/*
- * Copyright 2003 Ulrich Czekalla for CodeWeavers
- * Copyright 2005 Gergely Risko
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
-
-UIINSERTOBJECT DIALOG DISCARDABLE  0, 0, 294, 151
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Objektum Beszúrása"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LISTBOX         IDC_OBJTYPELIST,82,19,131,66,LBS_SORT |
-                    LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL |
-                    WS_TABSTOP
-    LTEXT           "Objektum típusa:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE
-    DEFPUSHBUTTON   "OK",IDOK,221,7,66,14
-    PUSHBUTTON      "Mégse",IDCANCEL,221,24,66,14
-    GROUPBOX        "Eredmény",IDC_RESULT,7,103,208,41
-    CONTROL         "Új",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP,7,20,62,10
-    CONTROL         "Vezérlõelem létrehozása",IDC_CREATECONTROL,"Button",
-                    BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10
-    CONTROL         "Létrehozás állományból",IDC_CREATEFROMFILE,"Button",
-                    BS_AUTORADIOBUTTON,7,37,67,10
-    LTEXT           "",IDC_RESULTDESC,49,112,159,23
-    PUSHBUTTON      /* NOT TRANSLATED */ "&Add Control...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE
-    CONTROL         "Megjelenítés ikonként",IDC_ASICON,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10
-    PUSHBUTTON      "Böngészés...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE
-    LTEXT           "Állomány:",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	"Új %s objektum beszúrása a dokumentumba"
-  IDS_RESULTFILEOBJDESC	"Az állomány tartalmának beszúrása objektumként a dokumentumba, így azzal a programmal tudod használni, amelyikkel készült."
-  IDS_BROWSE            "Böngészés"
-  IDS_NOTOLEMOD         "Az állomány nem tûnik helyes OLE modulnak. Nem lehet regisztrálni az OLE modult."
-  IDS_NOTOLEMODCAPTION  "Vezérlõelem hozzáadása"
-}
+/*
+ * Copyright 2006 Andras Kovacs
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+UIINSERTOBJECT DIALOG DISCARDABLE  0, 0, 294, 151
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Objektum beszúrása"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LISTBOX         IDC_OBJTYPELIST,82,19,131,66,LBS_SORT |
+                    LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL |
+                    WS_TABSTOP
+    LTEXT           "Obktum típus:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE
+    DEFPUSHBUTTON   "OK",IDOK,221,7,66,14
+    PUSHBUTTON      "Mégse",IDCANCEL,221,24,66,14
+    GROUPBOX        "Eredmény",IDC_RESULT,7,103,208,41
+    CONTROL         "Új létrehozása",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | 
+                    WS_GROUP,7,20,62,10
+    CONTROL         "Vezérlõ létrehozása",IDC_CREATECONTROL,"Button",
+                    BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10
+    CONTROL         "Létrehozás fájlból",IDC_CREATEFROMFILE,"Button",
+                    BS_AUTORADIOBUTTON,7,37,67,10
+    LTEXT           "",IDC_RESULTDESC,49,112,159,23
+    PUSHBUTTON      "Vezérlõ hozzá&adása...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE
+    CONTROL         "Megjelenítés ikonként",IDC_ASICON,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10
+    PUSHBUTTON      "Tallóz...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE
+    LTEXT           "Fájl:",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	"Új %s objektum behelyezése az Ön dokumentumába"
+  IDS_RESULTFILEOBJDESC	"Kérem illesssze be a fájl tartalmát, mint objektumot a dokumentumába, azzal a programmal amivel létrehozta."
+  IDS_BROWSE            "Tallózás"
+  IDS_NOTOLEMOD         "A fájl úgy tûnik nem egy érvényes OLE modul. Nem tudom regisztrálni az OLE vezérlõt."
+  IDS_NOTOLEMODCAPTION  "Vezérlõ hozzáadása"
+}

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

Modified: trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc?rev=22830&r1=22829&r2=22830&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc Tue Jul  4 18:09:35 2006
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 UIINSERTOBJECT DIALOG DISCARDABLE  0, 0, 294, 151
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -38,7 +38,7 @@
                     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 | 
+    CONTROL         "ƒAƒCƒRƒ“‚Æ‚µ‚Ä•\Ž¦",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

Removed: trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc?rev=22829&view=auto
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_Ru.rc (removed)
@@ -1,56 +1,0 @@
-/*
- * Copyright 2005 Mikhail Y. Zvyozdochkin
- *                Aleksey Bragin 
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-
-UIINSERTOBJECT DIALOG DISCARDABLE  0, 0, 294, 151
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Âñòàâêà îáúåêòà"
-FONT 8, "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   "OK",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      "&Äîáàâèòü ýëåìåíò óïðàâëåíèÿ...",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  "Äîáàâëÿåò ýëåìåíò óïðàâëåíèÿ"
-}

Added: trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc?rev=22830&view=auto
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc (added)
+++ trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc Tue Jul  4 18:09:35 2006
@@ -1,0 +1,57 @@
+/*
+ * Turkish Resources
+ *
+ * Copyright 2006 Fatih Aþýcý
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
+
+UIINSERTOBJECT DIALOG DISCARDABLE  0, 0, 294, 151
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Nesne Ekle"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LISTBOX         IDC_OBJTYPELIST,82,19,131,66,LBS_SORT |
+                    LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL |
+                    WS_TABSTOP
+    LTEXT           "Nesne Türü:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE
+    DEFPUSHBUTTON   "Tamam",IDOK,221,7,66,14
+    PUSHBUTTON      "Ýptal",IDCANCEL,221,24,66,14
+    GROUPBOX        "Sonuç",IDC_RESULT,7,103,208,41
+    CONTROL         "Yeni Oluþtur",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | 
+                    WS_GROUP,7,20,62,10
+    CONTROL         "Denetim Oluþtur",IDC_CREATECONTROL,"Button",
+                    BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10
+    CONTROL         "Dosyadan Oluþtur",IDC_CREATEFROMFILE,"Button",
+                    BS_AUTORADIOBUTTON,7,37,67,10
+    LTEXT           "",IDC_RESULTDESC,49,112,159,23
+    PUSHBUTTON      "&Denetim Ekle...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE
+    CONTROL         "Simge Olarak Göster",IDC_ASICON,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10
+    PUSHBUTTON      "Gözat...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE
+    LTEXT           "Dosya:",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	"Belgenize yeni bir %s nesnesi ekle"
+  IDS_RESULTFILEOBJDESC	"Dosya içeriðini belgenize nesne olarak ekleyin. Böylece kendisini oluþturan programý kullanarak onu etkinleþtirebilirsiniz."
+  IDS_BROWSE            "Gözat"
+  IDS_NOTOLEMOD         "Dosya geçerli bir OLE modülü olarak görünmüyor. OLE denetimi kaydedilemiyor."
+  IDS_NOTOLEMODCAPTION  "Denetim Ekle"
+}

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

Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/rsrc.rc?rev=22830&r1=22829&r2=22830&view=diff
==============================================================================
--- trunk/reactos/dll/win32/oledlg/rsrc.rc (original)
+++ trunk/reactos/dll/win32/oledlg/rsrc.rc Tue Jul  4 18:09:35 2006
@@ -36,11 +36,11 @@
 #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_Nl.rc"
 #include "oledlg_No.rc"
 #include "oledlg_Pt.rc"
-#include "oledlg_Ru.rc"
-#include "oledlg_Hu.rc"
+#include "oledlg_Tr.rc"




More information about the Ros-diffs mailing list