From d5e7c7927c7b6e558503a12ec2e4cd97d41ff64d Mon Sep 17 00:00:00 2001
From: Marcus Meissner <marcus@jet.franken.de>
Date: Wed, 9 Dec 1998 11:06:00 +0000
Subject: [PATCH] Some unnecessary #include and messages removed.

---
 controls/menu.c   | 4 ++--
 controls/scroll.c | 3 ---
 files/change.c    | 1 -
 loader/module.c   | 4 +++-
 misc/lzexpand.c   | 5 -----
 misc/main.c       | 3 +--
 multimedia/time.c | 1 -
 ole/compobj.c     | 6 +++---
 8 files changed, 9 insertions(+), 18 deletions(-)

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