Commit ba25254d authored by Rob Shearman's avatar Rob Shearman Committed by Alexandre Julliard

ole32: Remove some unneeded inclusions of headers.

Change some incorrect usages of SEEK_SET to the intended STREAM_SEEK_SET instead.
parent d02b27c0
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#include "config.h" #include "config.h"
#include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
...@@ -1677,7 +1676,7 @@ HRESULT WINAPI CoRevokeClassObject( ...@@ -1677,7 +1676,7 @@ HRESULT WINAPI CoRevokeClassObject(
LARGE_INTEGER zero; LARGE_INTEGER zero;
memset(&zero, 0, sizeof(zero)); memset(&zero, 0, sizeof(zero));
/* FIXME: stop local server thread */ /* FIXME: stop local server thread */
IStream_Seek(curClass->pMarshaledData, zero, SEEK_SET, NULL); IStream_Seek(curClass->pMarshaledData, zero, STREAM_SEEK_SET, NULL);
CoReleaseMarshalData(curClass->pMarshaledData); CoReleaseMarshalData(curClass->pMarshaledData);
} }
......
...@@ -24,13 +24,7 @@ ...@@ -24,13 +24,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "config.h"
#include <assert.h>
#include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h>
#include <string.h>
#define COBJMACROS #define COBJMACROS
#define NONAMELESSUNION #define NONAMELESSUNION
...@@ -42,8 +36,6 @@ ...@@ -42,8 +36,6 @@
#include "objbase.h" #include "objbase.h"
#include "ole2.h" #include "ole2.h"
#include "winerror.h" #include "winerror.h"
#include "winreg.h"
#include "winternl.h"
#include "compobj_private.h" #include "compobj_private.h"
...@@ -208,7 +200,7 @@ StdGlobalInterfaceTable_RegisterInterfaceInGlobal( ...@@ -208,7 +200,7 @@ StdGlobalInterfaceTable_RegisterInterfaceInGlobal(
} }
zero.QuadPart = 0; zero.QuadPart = 0;
IStream_Seek(stream, zero, SEEK_SET, NULL); IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL);
entry = HeapAlloc(GetProcessHeap(), 0, sizeof(StdGITEntry)); entry = HeapAlloc(GetProcessHeap(), 0, sizeof(StdGITEntry));
if (entry == NULL) return E_OUTOFMEMORY; if (entry == NULL) return E_OUTOFMEMORY;
......
...@@ -20,11 +20,7 @@ ...@@ -20,11 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "config.h"
#include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
...@@ -35,10 +31,7 @@ ...@@ -35,10 +31,7 @@
#include "winuser.h" #include "winuser.h"
#include "objbase.h" #include "objbase.h"
#include "ole2.h" #include "ole2.h"
#include "rpc.h"
#include "winerror.h" #include "winerror.h"
#include "winreg.h"
#include "wtypes.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "compobj_private.h" #include "compobj_private.h"
...@@ -1780,7 +1773,7 @@ HRESULT WINAPI CoMarshalInterThreadInterfaceInStream( ...@@ -1780,7 +1773,7 @@ HRESULT WINAPI CoMarshalInterThreadInterfaceInStream(
if (SUCCEEDED(hres)) if (SUCCEEDED(hres))
{ {
memset(&seekto, 0, sizeof(seekto)); memset(&seekto, 0, sizeof(seekto));
IStream_Seek(*ppStm, seekto, SEEK_SET, &xpos); IStream_Seek(*ppStm, seekto, STREAM_SEEK_SET, &xpos);
} }
else else
{ {
......
...@@ -23,11 +23,8 @@ ...@@ -23,11 +23,8 @@
#include "config.h" #include "config.h"
#include "wine/port.h" #include "wine/port.h"
#include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include <assert.h>
#define COBJMACROS #define COBJMACROS
#define NONAMELESSUNION #define NONAMELESSUNION
...@@ -42,7 +39,6 @@ ...@@ -42,7 +39,6 @@
#include "rpc.h" #include "rpc.h"
#include "winerror.h" #include "winerror.h"
#include "winreg.h" #include "winreg.h"
#include "wtypes.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "compobj_private.h" #include "compobj_private.h"
......
...@@ -35,9 +35,8 @@ ...@@ -35,9 +35,8 @@
#include "winbase.h" #include "winbase.h"
#include "winuser.h" #include "winuser.h"
#include "objbase.h" #include "objbase.h"
#include "ole2.h"
#include "ole2ver.h"
#include "rpc.h" #include "rpc.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "compobj_private.h" #include "compobj_private.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment