[winesync] 26087: Autosyncing with Wine HEAD

Author: winesync
Date: Wed Mar 14 17:44:22 2007
New Revision: 26087

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

Modified:
    trunk/reactos/dll/win32/objsel/objsel.c
    trunk/reactos/dll/win32/objsel/objsel_private.h

Modified: trunk/reactos/dll/win32/objsel/objsel.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel.c?…
==============================================================================
--- trunk/reactos/dll/win32/objsel/objsel.c (original)
+++ trunk/reactos/dll/win32/objsel/objsel.c Wed Mar 14 17:44:22 2007
@@ -25,7 +25,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(objsel);
 
 LONG dll_refs = 0;
-HINSTANCE hInstance;
+static HINSTANCE hInstance;
 
 /***********************************************************************
  *		DllEntryPoint

Modified: trunk/reactos/dll/win32/objsel/objsel_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel_pr…
==============================================================================
--- trunk/reactos/dll/win32/objsel/objsel_private.h (original)
+++ trunk/reactos/dll/win32/objsel/objsel_private.h Wed Mar 14 17:44:22 2007
@@ -29,7 +29,6 @@
 #include "winuser.h"
 
 #define COBJMACROS
-#define COM_NO_WINDOWS_H
 
 #include "ole2.h"
 #include "strmif.h"