ole32: Remove some unneeded inclusions of headers.
Robert Shearman
rob at codeweavers.com
Tue Jan 9 11:15:59 CST 2007
Change some incorrect usages of SEEK_SET to the intended STREAM_SEEK_SET
instead.
---
dlls/ole32/compobj.c | 3 +--
dlls/ole32/git.c | 10 +---------
dlls/ole32/marshal.c | 9 +--------
dlls/ole32/rpc.c | 4 ----
dlls/ole32/stubmanager.c | 3 +--
5 files changed, 4 insertions(+), 25 deletions(-)
-------------- next part --------------
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 452ea0d..f1c6ebe 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -41,7 +41,6 @@
#include "config.h"
-#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
@@ -1677,7 +1676,7 @@ HRESULT WINAPI CoRevokeClassObject(
LARGE_INTEGER zero;
memset(&zero, 0, sizeof(zero));
/* 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);
}
diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c
index 4f8d17d..222eb6f 100644
--- a/dlls/ole32/git.c
+++ b/dlls/ole32/git.c
@@ -24,13 +24,7 @@
* 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 <stdio.h>
-#include <string.h>
#define COBJMACROS
#define NONAMELESSUNION
@@ -42,8 +36,6 @@ #include "winuser.h"
#include "objbase.h"
#include "ole2.h"
#include "winerror.h"
-#include "winreg.h"
-#include "winternl.h"
#include "compobj_private.h"
@@ -208,7 +200,7 @@ StdGlobalInterfaceTable_RegisterInterfac
}
zero.QuadPart = 0;
- IStream_Seek(stream, zero, SEEK_SET, NULL);
+ IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL);
entry = HeapAlloc(GetProcessHeap(), 0, sizeof(StdGITEntry));
if (entry == NULL) return E_OUTOFMEMORY;
diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c
index dd50486..01368cb 100644
--- a/dlls/ole32/marshal.c
+++ b/dlls/ole32/marshal.c
@@ -20,11 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
-#include <stdlib.h>
#include <stdarg.h>
-#include <stdio.h>
#include <string.h>
#include <assert.h>
@@ -35,10 +31,7 @@ #include "winbase.h"
#include "winuser.h"
#include "objbase.h"
#include "ole2.h"
-#include "rpc.h"
#include "winerror.h"
-#include "winreg.h"
-#include "wtypes.h"
#include "wine/unicode.h"
#include "compobj_private.h"
@@ -1780,7 +1773,7 @@ HRESULT WINAPI CoMarshalInterThreadInter
if (SUCCEEDED(hres))
{
memset(&seekto, 0, sizeof(seekto));
- IStream_Seek(*ppStm, seekto, SEEK_SET, &xpos);
+ IStream_Seek(*ppStm, seekto, STREAM_SEEK_SET, &xpos);
}
else
{
diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c
index f063883..d28241b 100644
--- a/dlls/ole32/rpc.c
+++ b/dlls/ole32/rpc.c
@@ -23,11 +23,8 @@
#include "config.h"
#include "wine/port.h"
-#include <stdlib.h>
#include <stdarg.h>
-#include <stdio.h>
#include <string.h>
-#include <assert.h>
#define COBJMACROS
#define NONAMELESSUNION
@@ -42,7 +39,6 @@ #include "ole2.h"
#include "rpc.h"
#include "winerror.h"
#include "winreg.h"
-#include "wtypes.h"
#include "wine/unicode.h"
#include "compobj_private.h"
diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c
index 264a2e5..3665443 100644
--- a/dlls/ole32/stubmanager.c
+++ b/dlls/ole32/stubmanager.c
@@ -35,9 +35,8 @@ #include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "objbase.h"
-#include "ole2.h"
-#include "ole2ver.h"
#include "rpc.h"
+
#include "wine/debug.h"
#include "compobj_private.h"
More information about the wine-patches
mailing list