[ros-diffs] [winesync] 23209: Autosyncing with Wine HEAD

Author: winesync
Date: Fri Jul 21 17:05:13 2006
New Revision: 23209

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

Removed:
    trunk/reactos/dll/win32/oledlg/Makefile.in
Modified:
    trunk/reactos/dll/win32/oledlg/insobjdlg.c
    trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc
    trunk/reactos/dll/win32/oledlg/oledlg_De.rc
    trunk/reactos/dll/win32/oledlg/oledlg_En.rc
    trunk/reactos/dll/win32/oledlg/oledlg_Es.rc
    trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc
    trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc
    trunk/reactos/dll/win32/oledlg/oledlg_It.rc
    trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc
    trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc
    trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc
    trunk/reactos/dll/win32/oledlg/oledlg_No.rc
    trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc
    trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc
    trunk/reactos/dll/win32/oledlg/oledlg_main.c
    trunk/reactos/dll/win32/oledlg/resource.h

Removed: trunk/reactos/dll/win32/oledlg/Makefile.in
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/Makefile.…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/Makefile.in (original)
+++ trunk/reactos/dll/win32/oledlg/Makefile.in (removed)
@@ -1,17 +1,0 @@
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = oledlg.dll
-IMPORTLIB = liboledlg.$(IMPLIBEXT)
-IMPORTS   = ole32 comdlg32 user32 advapi32 kernel32 ntdll
-
-C_SRCS = \
-	insobjdlg.c \
-	oledlg_main.c
-
-RC_SRCS = rsrc.rc
-
-@MAKE_DLL_RULES@
-
-### Dependencies:

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 (original)
+++ trunk/reactos/dll/win32/oledlg/insobjdlg.c Fri Jul 21 17:05:13 2006
@@ -15,7 +15,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <stdarg.h>

Modified: trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Cs…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_Cs.rc Fri Jul 21 17:05:13 2006
@@ -16,7 +16,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT

Modified: trunk/reactos/dll/win32/oledlg/oledlg_De.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_De…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_De.rc (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_De.rc Fri Jul 21 17:05:13 2006
@@ -13,7 +13,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT

Modified: trunk/reactos/dll/win32/oledlg/oledlg_En.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_En…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_En.rc (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_En.rc Fri Jul 21 17:05:13 2006
@@ -13,7 +13,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT

Modified: trunk/reactos/dll/win32/oledlg/oledlg_Es.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Es…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_Es.rc (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_Es.rc Fri Jul 21 17:05:13 2006
@@ -13,7 +13,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL

Modified: trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Fr…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc Fri Jul 21 17:05:13 2006
@@ -16,7 +16,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 

Modified: trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Hu…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_Hu.rc Fri Jul 21 17:05:13 2006
@@ -13,7 +13,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT

Modified: trunk/reactos/dll/win32/oledlg/oledlg_It.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_It…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_It.rc (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_It.rc Fri Jul 21 17:05:13 2006
@@ -14,7 +14,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT

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 (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_Ja.rc Fri Jul 21 17:05:13 2006
@@ -13,7 +13,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 LANGUAGE LANG_JAPANESE, SUBLANG_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 (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc Fri Jul 21 17:05:13 2006
@@ -13,7 +13,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

Modified: trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Nl…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc Fri Jul 21 17:05:13 2006
@@ -14,7 +14,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT

Modified: trunk/reactos/dll/win32/oledlg/oledlg_No.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_No…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_No.rc (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_No.rc Fri Jul 21 17:05:13 2006
@@ -13,7 +13,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL

Modified: trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Pt…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc Fri Jul 21 17:05:13 2006
@@ -13,7 +13,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT

Modified: trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Tr…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_Tr.rc Fri Jul 21 17:05:13 2006
@@ -15,7 +15,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

Modified: trunk/reactos/dll/win32/oledlg/oledlg_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_ma…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/oledlg_main.c (original)
+++ trunk/reactos/dll/win32/oledlg/oledlg_main.c Fri Jul 21 17:05:13 2006
@@ -15,7 +15,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #define COM_NO_WINDOWS_H
@@ -245,7 +245,7 @@
 /***********************************************************************
  *           OleUIPromptUserA (OLEDLG.10)
  */
-INT __cdecl OleUIPromptUserA(
+INT WINAPIV OleUIPromptUserA(
   INT nTemplate, HWND hwndParent, ...)
 {
   FIXME("(%d, %p, ...): stub\n", nTemplate, hwndParent);
@@ -256,7 +256,7 @@
 /***********************************************************************
  *           OleUIPromptUserW (OLEDLG.13)
  */
-INT __cdecl OleUIPromptUserW(
+INT WINAPIV OleUIPromptUserW(
   INT nTemplate, HWND hwndParent, ...)
 {
   FIXME("(%d, %p, ...): stub\n", nTemplate, hwndParent);

Modified: trunk/reactos/dll/win32/oledlg/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/resource.…
==============================================================================
--- trunk/reactos/dll/win32/oledlg/resource.h (original)
+++ trunk/reactos/dll/win32/oledlg/resource.h Fri Jul 21 17:05:13 2006
@@ -15,7 +15,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #define IDS_RESULTOBJDESC               101