Commit d5e7c792 authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard

Some unnecessary #include and messages removed.

parent b741528f
...@@ -18,10 +18,9 @@ ...@@ -18,10 +18,9 @@
#include <string.h> #include <string.h>
#include "windows.h" #include "windows.h"
#include "bitmap.h" #include "bitmap.h"
#include "gdi.h" #include "win.h"
#include "sysmetrics.h" #include "sysmetrics.h"
#include "task.h" #include "task.h"
#include "win.h"
#include "heap.h" #include "heap.h"
#include "module.h" #include "module.h"
#include "neexe.h" #include "neexe.h"
...@@ -30,6 +29,7 @@ ...@@ -30,6 +29,7 @@
#include "message.h" #include "message.h"
#include "resource.h" #include "resource.h"
#include "tweak.h" #include "tweak.h"
#include "debug.h" #include "debug.h"
......
...@@ -5,9 +5,6 @@ ...@@ -5,9 +5,6 @@
* Copyright 1994, 1996 Alexandre Julliard * Copyright 1994, 1996 Alexandre Julliard
*/ */
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include "windows.h" #include "windows.h"
#include "sysmetrics.h" #include "sysmetrics.h"
#include "scroll.h" #include "scroll.h"
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
* Copyright 1998 Ulrich Weigand * Copyright 1998 Ulrich Weigand
*/ */
#include <errno.h>
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
......
...@@ -95,6 +95,9 @@ static void MODULE_DoInitializeDLLs( PDB32 *process, WINE_MODREF *wm, ...@@ -95,6 +95,9 @@ static void MODULE_DoInitializeDLLs( PDB32 *process, WINE_MODREF *wm,
PE_InitDLL( wm, type, lpReserved ); PE_InitDLL( wm, type, lpReserved );
break; break;
case MODULE32_ELF:
/* no need to do that, dlopen() already does */
break;
default: default:
ERR(module, "wine_modref type %d not handled.\n", wm->type); ERR(module, "wine_modref type %d not handled.\n", wm->type);
break; break;
...@@ -579,7 +582,6 @@ BOOL32 WINAPI CreateProcess32A( LPCSTR lpApplicationName, LPSTR lpCommandLine, ...@@ -579,7 +582,6 @@ BOOL32 WINAPI CreateProcess32A( LPCSTR lpApplicationName, LPSTR lpCommandLine,
lstrcpyn32A(name, lpCommandLine, len); lstrcpyn32A(name, lpCommandLine, len);
if (!strchr(name, '\\') && !strchr(name, '.')) if (!strchr(name, '\\') && !strchr(name, '.'))
strcat(name, ".exe"); strcat(name, ".exe");
fprintf(stderr,"looking for: %s\n",name);
if (GetFileAttributes32A(name)!=-1) if (GetFileAttributes32A(name)!=-1)
break; break;
/* if there is a space and no file found yet, include the word /* if there is a space and no file found yet, include the word
......
...@@ -7,16 +7,11 @@ ...@@ -7,16 +7,11 @@
* FIXME: return values might be wrong * FIXME: return values might be wrong
*/ */
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#include <ctype.h> #include <ctype.h>
#include <sys/types.h>
#include <sys/stat.h>
#include "windows.h" #include "windows.h"
#include "file.h" #include "file.h"
#include "heap.h" #include "heap.h"
#include "ldt.h"
#include "lzexpand.h" #include "lzexpand.h"
#include "debug.h" #include "debug.h"
......
...@@ -9,9 +9,8 @@ ...@@ -9,9 +9,8 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <ctype.h> #include <ctype.h>
/* #include <locale.h> */
#ifdef MALLOC_DEBUGGING #ifdef MALLOC_DEBUGGING
#include <malloc.h> # include <malloc.h>
#endif #endif
#include "ts_xlib.h" #include "ts_xlib.h"
#include "ts_xresource.h" #include "ts_xresource.h"
......
...@@ -92,7 +92,6 @@ static void TIME_TriggerCallBack(LPTIMERENTRY lpTimer, DWORD dwCurrent) ...@@ -92,7 +92,6 @@ static void TIME_TriggerCallBack(LPTIMERENTRY lpTimer, DWORD dwCurrent)
break; break;
} }
TRACE(mmtime, "after CallBack16 !\n"); TRACE(mmtime, "after CallBack16 !\n");
fflush(stdout);
} }
if (lpTimer->wFlags & TIME_ONESHOT) if (lpTimer->wFlags & TIME_ONESHOT)
timeKillEvent32(lpTimer->wTimerID); timeKillEvent32(lpTimer->wTimerID);
......
...@@ -768,13 +768,13 @@ HRESULT WINAPI CoGetClassObject(REFCLSID rclsid, DWORD dwClsContext, ...@@ -768,13 +768,13 @@ HRESULT WINAPI CoGetClassObject(REFCLSID rclsid, DWORD dwClsContext,
if (hres != ERROR_SUCCESS) { if (hres != ERROR_SUCCESS) {
RegCloseKey(CLSIDkey); RegCloseKey(CLSIDkey);
return REGDB_E_CLASSNOTREG; return REGDB_E_CLASSNOTREG;
} }
hres = RegQueryValue32A(key, "InprocServer32", dllName, &dllNameLen); hres = RegQueryValue32A(key, "InprocServer32", dllName, &dllNameLen);
RegCloseKey(key); RegCloseKey(key);
RegCloseKey(CLSIDkey); RegCloseKey(CLSIDkey);
if (hres != ERROR_SUCCESS) if (hres != ERROR_SUCCESS)
return REGDB_E_READREGDB; return REGDB_E_READREGDB;
TRACE(ole,"found InprocServer32 dll %s\n", dllName); TRACE(ole,"found InprocServer32 dll %s\n", dllName);
/* open dll, call DllGetClassFactory */ /* open dll, call DllGetClassFactory */
hLibrary = CoLoadLibrary(dllName, TRUE); hLibrary = CoLoadLibrary(dllName, TRUE);
......
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