Index: trunk/src/user32/HOOK.CPP
===================================================================
--- trunk/src/user32/HOOK.CPP	(revision 2803)
+++ trunk/src/user32/HOOK.CPP	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: HOOK.CPP,v 1.10 2000-02-12 18:09:49 cbratschi Exp $ */
+/* $Id: HOOK.CPP,v 1.11 2000-02-16 14:34:02 sandervl Exp $ */
 
 /*
@@ -35,4 +35,7 @@
 #include <vmutex.h>
 #include <wprocess.h>
+
+#define DBG_LOCALLOG	DBG_hook
+#include "dbglocal.h"
 
 DEFAULT_DEBUG_CHANNEL(hook)
Index: trunk/src/user32/Makefile
===================================================================
--- trunk/src/user32/Makefile	(revision 2803)
+++ trunk/src/user32/Makefile	(revision 2804)
@@ -1,3 +1,3 @@
-# $Id: Makefile,v 1.64 2000-02-09 23:47:03 bird Exp $
+# $Id: Makefile,v 1.65 2000-02-16 14:34:03 sandervl Exp $
 
 #
@@ -38,5 +38,5 @@
         win32wmdiclient.obj oslibutil.obj oslibmsg.obj dib.obj oslibdos.obj \
         win32wmdichild.obj winprop.obj wingdi.obj oslibgdi.obj winaccel.obj \
-        win32wbasepos.obj oslibres.obj dc.obj timer.obj \
+        win32wbasepos.obj oslibres.obj dc.obj timer.obj dbglocal.obj \
         caret.obj resource.obj winproc.obj text.obj oslibmsgtranslate.obj \
         windlgmsg.obj windlg.obj win32wdesktop.obj win32wbasenonclient.obj
Index: trunk/src/user32/button.cpp
===================================================================
--- trunk/src/user32/button.cpp	(revision 2803)
+++ trunk/src/user32/button.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: button.cpp,v 1.32 2000-02-05 19:45:14 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.33 2000-02-16 14:34:03 sandervl Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -20,4 +20,7 @@
 #include <misc.h>
 #include "initterm.h"
+
+#define DBG_LOCALLOG	DBG_button
+#include "dbglocal.h"
 
 #ifdef DEBUG
Index: trunk/src/user32/caret.cpp
===================================================================
--- trunk/src/user32/caret.cpp	(revision 2803)
+++ trunk/src/user32/caret.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: caret.cpp,v 1.11 2000-01-18 20:10:31 sandervl Exp $ */
+/* $Id: caret.cpp,v 1.12 2000-02-16 14:34:04 sandervl Exp $ */
 
 /*
@@ -19,8 +19,11 @@
 #include <win32wbase.h>
 #include "oslibwin.h"
-#include "dcdata.h"
+#include <dcdata.h>
 #define INCLUDED_BY_DC
 #include "dc.h"
 #include "caret.h"
+
+#define DBG_LOCALLOG	DBG_caret
+#include "dbglocal.h"
 
 #undef SEVERITY_ERROR
Index: trunk/src/user32/char.cpp
===================================================================
--- trunk/src/user32/char.cpp	(revision 2803)
+++ trunk/src/user32/char.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: char.cpp,v 1.11 2000-01-18 20:10:31 sandervl Exp $ */
+/* $Id: char.cpp,v 1.12 2000-02-16 14:34:05 sandervl Exp $ */
 
 /*
@@ -21,4 +21,7 @@
 
 #include <wctype.h> /* towupper, towlower support */
+
+#define DBG_LOCALLOG	DBG_char
+#include "dbglocal.h"
 
 
Index: trunk/src/user32/clipboard.cpp
===================================================================
--- trunk/src/user32/clipboard.cpp	(revision 2803)
+++ trunk/src/user32/clipboard.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: clipboard.cpp,v 1.4 2000-01-18 20:10:31 sandervl Exp $ */
+/* $Id: clipboard.cpp,v 1.5 2000-02-16 14:34:06 sandervl Exp $ */
 
 /*
@@ -17,4 +17,7 @@
 #include <os2win.h>
 #include "win32wbase.h"
+
+#define DBG_LOCALLOG	DBG_clipboard
+#include "dbglocal.h"
 
 //******************************************************************************
Index: trunk/src/user32/combo.cpp
===================================================================
--- trunk/src/user32/combo.cpp	(revision 2803)
+++ trunk/src/user32/combo.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: combo.cpp,v 1.25 2000-02-14 17:30:10 cbratschi Exp $ */
+/* $Id: combo.cpp,v 1.26 2000-02-16 14:34:06 sandervl Exp $ */
 /*
  * Combo controls
@@ -30,4 +30,7 @@
 char *GetMsgText(int Msg);
 #endif
+
+#define DBG_LOCALLOG	DBG_combo
+#include "dbglocal.h"
 
   /* bits in the dwKeyData */
Index: trunk/src/user32/controls.cpp
===================================================================
--- trunk/src/user32/controls.cpp	(revision 2803)
+++ trunk/src/user32/controls.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: controls.cpp,v 1.9 2000-01-31 22:30:51 sandervl Exp $ */
+/* $Id: controls.cpp,v 1.10 2000-02-16 14:34:08 sandervl Exp $ */
 /* File: controls.cpp -- Win32 common controls
  *
@@ -21,4 +21,7 @@
 #include "menu.h"
 #include "controls.h"
+
+#define DBG_LOCALLOG	DBG_controls
+#include "dbglocal.h"
 
 ATOM  controlAtoms[MAX_CONTROLS] = {0};
Index: trunk/src/user32/dbglocal.cpp
===================================================================
--- trunk/src/user32/dbglocal.cpp	(revision 2804)
+++ trunk/src/user32/dbglocal.cpp	(revision 2804)
@@ -0,0 +1,125 @@
+/* $Id: dbglocal.cpp,v 1.1 2000-02-16 14:34:09 sandervl Exp $ */
+
+/*
+ * debug logging functions for OS/2
+ *
+ *
+ * Copyright 2000 Sander van Leeuwen
+ * Project Odin Software License can be found in LICENSE.TXT
+ */
+#include <os2wrap.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "dbglocal.h"
+
+USHORT DbgEnabled[DBG_MAXFILES];
+char  *DbgFileNames[DBG_MAXFILES] =
+{
+"user32",
+"loadres",
+"dde",
+"win32wndhandle",
+"wsprintf",
+"winmouse",
+"icon",
+"hook",
+"winkeyboard",
+"defwndproc",
+"syscolor",
+"char",
+"initterm",
+"uitools",
+"unknown",
+"spy",
+"wndmsg",
+"display",
+"pmwindow",
+"pmframe",
+"win32class",
+"win32wnd",
+"win32dlg",
+"msgbox",
+"window",
+"windowmsg",
+"windowclass",
+"win32wbase",
+"windowword",
+"gen_object",
+"oslibwin",
+"win32wndchild",
+"controls",
+"button",
+"static",
+"scroll",
+"listbox",
+"menu",
+"combo",
+"edit",
+"winswitch",
+"icontitle",
+"clipboard",
+"winicon",
+"win32wmdiclient",
+"oslibutil",
+"oslibmsg",
+"dib",
+"oslibdos",
+"win32wmdichild",
+"winprop",
+"wingdi",
+"oslibgdi",
+"winaccel",
+"win32wbasepos",
+"oslibres",
+"dc",
+"timer",
+"caret",
+"resource",
+"winproc",
+"text",
+"oslibmsgtranslate",
+"windlgmsg",
+"windlg",
+"win32wdesktop",
+"win32wbasenonclient"
+};
+//******************************************************************************
+//******************************************************************************
+void ParseLogStatus()
+{
+ char *envvar = getenv(DBG_ENVNAME);
+ char *dbgvar;
+ int   i;
+
+    for(i=0;i<DBG_MAXFILES;i++) {
+        DbgEnabled[i] = 1;
+    }
+
+    if(!envvar)
+        return;
+
+    dbgvar = strstr(envvar, "dll");
+    if(dbgvar) {
+        if(*(dbgvar-1) == '-') {
+            for(i=0;i<DBG_MAXFILES;i++) {
+                DbgEnabled[i] = 0;
+            }
+        }
+    }
+    for(i=0;i<DBG_MAXFILES;i++) {
+        dbgvar = strstr(envvar, DbgFileNames[i]);
+        if(dbgvar) {
+            if(*(dbgvar-1) == '-') {
+                    DbgEnabled[i] = 0;
+            }
+            else    
+            if(*(dbgvar-1) == '+') {
+		DbgEnabled[i] = 1;
+	    }
+        }
+    }
+}
+//******************************************************************************
+//******************************************************************************
+
Index: trunk/src/user32/dbglocal.h
===================================================================
--- trunk/src/user32/dbglocal.h	(revision 2804)
+++ trunk/src/user32/dbglocal.h	(revision 2804)
@@ -0,0 +1,105 @@
+/* $Id: dbglocal.h,v 1.1 2000-02-16 14:34:13 sandervl Exp $ */
+
+/*
+ * debug logging functions for OS/2
+ *
+ * Overrides main dprintf macros
+ *
+ * Copyright 2000 Sander van Leeuwen
+ *
+ * Project Odin Software License can be found in LICENSE.TXT
+ */
+#ifndef __DBGLOCAL_H__
+#define __DBGLOCAL_H__
+
+#ifdef DEBUG
+//Parses environment variable for selective enabling/disabling of logging
+void ParseLogStatus();
+
+#define DBG_ENVNAME        "dbg_user32"
+
+#define DBG_user32               0
+#define DBG_loadres              1
+#define DBG_dde                  2
+#define DBG_win32wndhandle       3
+#define DBG_wsprintf             4
+#define DBG_winmouse             5
+#define DBG_icon                 6
+#define DBG_hook                 7
+#define DBG_winkeyboard          8
+#define DBG_defwndproc           9
+#define DBG_syscolor             10
+#define DBG_char                 11
+#define DBG_initterm             12
+#define DBG_uitools              13
+#define DBG_unknown              14
+#define DBG_spy                  15
+#define DBG_wndmsg               16
+#define DBG_display              17
+#define DBG_pmwindow             18
+#define DBG_pmframe              19
+#define DBG_win32class           20
+#define DBG_win32wnd             21
+#define DBG_win32dlg             22
+#define DBG_msgbox               23
+#define DBG_window               24
+#define DBG_windowmsg            25
+#define DBG_windowclass          26
+#define DBG_win32wbase           27
+#define DBG_windowword           28
+#define DBG_gen_object           29
+#define DBG_oslibwin             30
+#define DBG_win32wndchild        31
+#define DBG_controls             32
+#define DBG_button               33
+#define DBG_static               34
+#define DBG_scroll               35
+#define DBG_listbox              36
+#define DBG_menu                 37
+#define DBG_combo                38
+#define DBG_edit                 39
+#define DBG_winswitch            40
+#define DBG_icontitle            41
+#define DBG_clipboard            42
+#define DBG_winicon              43
+#define DBG_win32wmdiclient      44
+#define DBG_oslibutil            45
+#define DBG_oslibmsg             46
+#define DBG_dib                  47
+#define DBG_oslibdos             48
+#define DBG_win32wmdichild       49
+#define DBG_winprop              50
+#define DBG_wingdi               51
+#define DBG_oslibgdi             52
+#define DBG_winaccel             53
+#define DBG_win32wbasepos        54
+#define DBG_oslibres             55
+#define DBG_dc                   56
+#define DBG_timer                57
+#define DBG_caret                58
+#define DBG_resource             59
+#define DBG_winproc              60
+#define DBG_text                 61
+#define DBG_oslibmsgtranslate    62
+#define DBG_windlgmsg            63
+#define DBG_windlg               64
+#define DBG_win32wdesktop        65
+#define DBG_win32wbasenonclient  66
+#define DBG_MAXFILES             67
+
+extern USHORT DbgEnabled[DBG_MAXFILES];
+
+#ifdef dprintf
+#undef dprintf
+#endif
+
+#define dprintf(a)      if(DbgEnabled[DBG_LOCALLOG] == 1) WriteLog a
+
+#else
+
+#define ParseLogStatus()
+#define DBG_LOCALLOG(a)
+
+#endif //DEBUG
+
+#endif
Index: trunk/src/user32/dc.cpp
===================================================================
--- trunk/src/user32/dc.cpp	(revision 2803)
+++ trunk/src/user32/dc.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: dc.cpp,v 1.47 2000-02-14 17:30:11 cbratschi Exp $ */
+/* $Id: dc.cpp,v 1.48 2000-02-16 14:34:13 sandervl Exp $ */
 
 /*
@@ -37,4 +37,7 @@
 #undef SEVERITY_ERROR
 #include <winerror.h>
+
+#define DBG_LOCALLOG	DBG_dc
+#include "dbglocal.h"
 
 #ifndef DEVESC_SETPS
Index: trunk/src/user32/dde.cpp
===================================================================
--- trunk/src/user32/dde.cpp	(revision 2803)
+++ trunk/src/user32/dde.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: dde.cpp,v 1.9 2000-01-18 20:10:34 sandervl Exp $ */
+/* $Id: dde.cpp,v 1.10 2000-02-16 14:34:14 sandervl Exp $ */
 
 /*
@@ -12,4 +12,7 @@
 #include <os2win.h>
 #include <misc.h>
+#define DBG_LOCALLOG	DBG_dde
+#include "dbglocal.h"
+
 //******************************************************************************
 //******************************************************************************
Index: trunk/src/user32/defwndproc.cpp
===================================================================
--- trunk/src/user32/defwndproc.cpp	(revision 2803)
+++ trunk/src/user32/defwndproc.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: defwndproc.cpp,v 1.12 2000-01-18 20:10:34 sandervl Exp $ */
+/* $Id: defwndproc.cpp,v 1.13 2000-02-16 14:34:15 sandervl Exp $ */
 
 /*
@@ -18,4 +18,7 @@
 #include "win32wmdichild.h"
 #include "win32dlg.h"
+
+#define DBG_LOCALLOG	DBG_defwndproc
+#include "dbglocal.h"
 
 #ifdef DEBUG
Index: trunk/src/user32/dib.cpp
===================================================================
--- trunk/src/user32/dib.cpp	(revision 2803)
+++ trunk/src/user32/dib.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: dib.cpp,v 1.4 2000-01-18 20:10:35 sandervl Exp $ */
+/* $Id: dib.cpp,v 1.5 2000-02-16 14:34:16 sandervl Exp $ */
 
 /*
@@ -20,4 +20,7 @@
 #include <stdlib.h>
 #include <misc.h>
+
+#define DBG_LOCALLOG	DBG_dib
+#include "dbglocal.h"
 
 /***********************************************************************
Index: trunk/src/user32/display.cpp
===================================================================
--- trunk/src/user32/display.cpp	(revision 2803)
+++ trunk/src/user32/display.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: display.cpp,v 1.4 2000-01-18 20:10:35 sandervl Exp $ */
+/* $Id: display.cpp,v 1.5 2000-02-16 14:34:16 sandervl Exp $ */
 /*
  * Display/Monitor Win32 apis
@@ -20,4 +20,7 @@
 #include "monitor.h"
 #include "windef.h"
+
+#define DBG_LOCALLOG	DBG_display
+#include "dbglocal.h"
 
 #define NRMODES 5
Index: trunk/src/user32/edit.cpp
===================================================================
--- trunk/src/user32/edit.cpp	(revision 2803)
+++ trunk/src/user32/edit.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: edit.cpp,v 1.32 2000-02-05 19:45:15 cbratschi Exp $ */
+/* $Id: edit.cpp,v 1.33 2000-02-16 14:34:17 sandervl Exp $ */
 /*
  *      Edit control
@@ -27,4 +27,7 @@
 #include "controls.h"
 #include "combo.h"
+
+#define DBG_LOCALLOG	DBG_edit
+#include "dbglocal.h"
 
 #ifdef DEBUG
Index: trunk/src/user32/gen_object.cpp
===================================================================
--- trunk/src/user32/gen_object.cpp	(revision 2803)
+++ trunk/src/user32/gen_object.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: gen_object.cpp,v 1.4 2000-01-18 20:10:36 sandervl Exp $ */
+/* $Id: gen_object.cpp,v 1.5 2000-02-16 14:34:19 sandervl Exp $ */
 /*
  * Generic Object Class for OS/2
@@ -18,4 +18,7 @@
 #include <misc.h>
 #include <vmutex.h>
+
+#define DBG_LOCALLOG	DBG_gen_object
+#include "dbglocal.h"
 
 VMutex genMutex[OBJTYPE_MAX];
Index: trunk/src/user32/icon.cpp
===================================================================
--- trunk/src/user32/icon.cpp	(revision 2803)
+++ trunk/src/user32/icon.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: icon.cpp,v 1.9 2000-01-18 20:10:36 sandervl Exp $ */
+/* $Id: icon.cpp,v 1.10 2000-02-16 14:34:19 sandervl Exp $ */
 
 /*
@@ -28,4 +28,7 @@
 #include <winicon.h>
 #include <misc.h>
+
+#define DBG_LOCALLOG	DBG_icon
+#include "dbglocal.h"
 
 //******************************************************************************
Index: trunk/src/user32/icontitle.cpp
===================================================================
--- trunk/src/user32/icontitle.cpp	(revision 2803)
+++ trunk/src/user32/icontitle.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: icontitle.cpp,v 1.4 2000-01-18 20:10:36 sandervl Exp $ */
+/* $Id: icontitle.cpp,v 1.5 2000-02-16 14:34:20 sandervl Exp $ */
 /*
  * Icontitle window class.
@@ -14,4 +14,7 @@
 #include "controls.h"
 #include "icontitle.h"
+
+#define DBG_LOCALLOG	DBG_icontitle
+#include "dbglocal.h"
 
 static  LPCSTR  emptyTitleText = "<...>";
Index: trunk/src/user32/initterm.cpp
===================================================================
--- trunk/src/user32/initterm.cpp	(revision 2803)
+++ trunk/src/user32/initterm.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: initterm.cpp,v 1.20 2000-02-05 02:12:20 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.21 2000-02-16 14:34:20 sandervl Exp $ */
 
 /*
@@ -44,4 +44,7 @@
 #include <exitlist.h>
 
+#define DBG_LOCALLOG	DBG_initterm
+#include "dbglocal.h"
+
 /*-------------------------------------------------------------------*/
 /* A clean up routine registered with DosExitList must be used if    */
@@ -85,4 +88,5 @@
       case 0 :
          _ctordtorInit();
+         ParseLogStatus();
 
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
Index: trunk/src/user32/listbox.cpp
===================================================================
--- trunk/src/user32/listbox.cpp	(revision 2803)
+++ trunk/src/user32/listbox.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: listbox.cpp,v 1.18 2000-01-18 20:10:36 sandervl Exp $ */
+/* $Id: listbox.cpp,v 1.19 2000-02-16 14:34:20 sandervl Exp $ */
 /*
  * Listbox controls
@@ -17,4 +17,7 @@
 #include "combo.h"
 #include <misc.h>
+
+#define DBG_LOCALLOG	DBG_listbox
+#include "dbglocal.h"
 
 /* Unimplemented yet:
Index: trunk/src/user32/loadres.cpp
===================================================================
--- trunk/src/user32/loadres.cpp	(revision 2803)
+++ trunk/src/user32/loadres.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: loadres.cpp,v 1.22 2000-01-18 20:10:37 sandervl Exp $ */
+/* $Id: loadres.cpp,v 1.23 2000-02-16 14:34:21 sandervl Exp $ */
 
 /*
@@ -28,4 +28,7 @@
 #include "initterm.h"
 #include <win\cursoricon.h>
+
+#define DBG_LOCALLOG	DBG_loadres
+#include "dbglocal.h"
 
 //******************************************************************************
@@ -358,6 +361,15 @@
         }
         else {
-          hbitmap = CreateDIBitmap( hdc, &fix_info->bmiHeader, CBM_INIT,
-                                      bits, fix_info, DIB_RGB_COLORS );
+//	  if(fix_info->bmiHeader.biBitCount == 1) {
+//          	hbitmap = CreateBitmap(fix_info->bmiHeader.biWidth, 
+//                                       fix_info->bmiHeader.biHeight,
+//                                       fix_info->bmiHeader.biPlanes, 
+//                                       fix_info->bmiHeader.biBitCount, 
+//                                       (PVOID)bits);
+//	  }
+//	  else {
+          	hbitmap = CreateDIBitmap(hdc, &fix_info->bmiHeader, CBM_INIT,
+                                         bits, fix_info, DIB_RGB_COLORS );
+//	  }
         }
         ReleaseDC( 0, hdc );
Index: trunk/src/user32/menu.cpp
===================================================================
--- trunk/src/user32/menu.cpp	(revision 2803)
+++ trunk/src/user32/menu.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: menu.cpp,v 1.16 2000-02-10 18:49:50 cbratschi Exp $*/
+/* $Id: menu.cpp,v 1.17 2000-02-16 14:34:22 sandervl Exp $*/
 /*
  * Menu functions
@@ -29,4 +29,7 @@
 #include "controls.h"
 #include "menu.h"
+
+#define DBG_LOCALLOG	DBG_menu
+#include "dbglocal.h"
 
 //DEFAULT_DEBUG_CHANNEL(menu)
Index: trunk/src/user32/msgbox.c
===================================================================
--- trunk/src/user32/msgbox.c	(revision 2803)
+++ trunk/src/user32/msgbox.c	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: msgbox.c,v 1.1 2000-01-18 20:10:39 sandervl Exp $ */
+/* $Id: msgbox.c,v 1.2 2000-02-16 14:34:24 sandervl Exp $ */
 /*
  * Message boxes (based on Wine code)
@@ -13,4 +13,7 @@
 #include <misc.h>
 #include <heapstring.h>
+
+#define DBG_LOCALLOG	DBG_msgbox
+#include "dbglocal.h"
 
 #define MSGBOX_IDICON 1088
Index: trunk/src/user32/oslibdos.cpp
===================================================================
--- trunk/src/user32/oslibdos.cpp	(revision 2803)
+++ trunk/src/user32/oslibdos.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: oslibdos.cpp,v 1.3 2000-01-18 20:10:39 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.4 2000-02-16 14:34:25 sandervl Exp $ */
 /*
  * Dos* api wrappers for OS/2
@@ -19,4 +19,7 @@
 #include "oslibdos.h"
 
+#define DBG_LOCALLOG	DBG_oslibdos
+#include "dbglocal.h"
+
 //******************************************************************************
 //Map shared memory into our address space
Index: trunk/src/user32/oslibgdi.cpp
===================================================================
--- trunk/src/user32/oslibgdi.cpp	(revision 2803)
+++ trunk/src/user32/oslibgdi.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: oslibgdi.cpp,v 1.9 2000-01-18 20:10:39 sandervl Exp $ */
+/* $Id: oslibgdi.cpp,v 1.10 2000-02-16 14:34:25 sandervl Exp $ */
 /*
  * Window GDI wrapper functions for OS/2
@@ -21,4 +21,7 @@
 #include "win32wbase.h"
 
+#define DBG_LOCALLOG	DBG_oslibgdi
+#include "dbglocal.h"
+
 /*
 First letter is lower case to avoid conflicts with Win32 API names
Index: trunk/src/user32/oslibmenu.cpp
===================================================================
--- trunk/src/user32/oslibmenu.cpp	(revision 2803)
+++ trunk/src/user32/oslibmenu.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: oslibmenu.cpp,v 1.10 2000-01-18 20:10:40 sandervl Exp $ */
+/* $Id: oslibmenu.cpp,v 1.11 2000-02-16 14:34:26 sandervl Exp $ */
 /*
  * Window Menu wrapper functions for OS/2
@@ -22,4 +22,7 @@
 #include "oslibutil.h"
 #include "oslibmenu.h"
+
+#define DBG_LOCALLOG	DBG_oslibmenu
+#include "dbglocal.h"
 
 //******************************************************************************
Index: trunk/src/user32/oslibmsg.cpp
===================================================================
--- trunk/src/user32/oslibmsg.cpp	(revision 2803)
+++ trunk/src/user32/oslibmsg.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: oslibmsg.cpp,v 1.27 2000-01-27 21:50:01 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.28 2000-02-16 14:34:26 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -33,4 +33,7 @@
 #include "oslibwin.h"
 
+#define DBG_LOCALLOG	DBG_oslibmsg
+#include "dbglocal.h"
+
 typedef BOOL (EXPENTRY FNTRANS)(MSG *, QMSG *);
 typedef FNTRANS *PFNTRANS;
Index: trunk/src/user32/oslibmsgtranslate.cpp
===================================================================
--- trunk/src/user32/oslibmsgtranslate.cpp	(revision 2803)
+++ trunk/src/user32/oslibmsgtranslate.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.16 2000-01-20 16:48:55 cbratschi Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.17 2000-02-16 14:34:27 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -31,4 +31,7 @@
 #include "pmwindow.h"
 #include "oslibwin.h"
+
+#define DBG_LOCALLOG	DBG_oslibmsgtranslate
+#include "dbglocal.h"
 
 //Used for key translation while processing WM_CHAR message
Index: trunk/src/user32/oslibres.cpp
===================================================================
--- trunk/src/user32/oslibres.cpp	(revision 2803)
+++ trunk/src/user32/oslibres.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: oslibres.cpp,v 1.8 2000-01-18 20:10:41 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.9 2000-02-16 14:34:28 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -25,4 +25,6 @@
 #include "pmwindow.h"
 
+#define DBG_LOCALLOG	DBG_oslibres
+#include "dbglocal.h"
 
 //******************************************************************************
Index: trunk/src/user32/oslibutil.cpp
===================================================================
--- trunk/src/user32/oslibutil.cpp	(revision 2803)
+++ trunk/src/user32/oslibutil.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: oslibutil.cpp,v 1.4 2000-01-18 20:10:42 sandervl Exp $ */
+/* $Id: oslibutil.cpp,v 1.5 2000-02-16 14:34:28 sandervl Exp $ */
 /*
  * Window API utility functions for OS/2
@@ -14,4 +14,7 @@
 #include <wprocess.h>
 #include "oslibutil.h"
+
+#define DBG_LOCALLOG	DBG_oslibutil
+#include "dbglocal.h"
 
 //******************************************************************************
Index: trunk/src/user32/oslibwin.cpp
===================================================================
--- trunk/src/user32/oslibwin.cpp	(revision 2803)
+++ trunk/src/user32/oslibwin.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: oslibwin.cpp,v 1.68 2000-02-07 14:30:18 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.69 2000-02-16 14:34:29 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -26,4 +26,7 @@
 #include "oslibgdi.h"
 #include "pmwindow.h"
+
+#define DBG_LOCALLOG	DBG_oslibwin
+#include "dbglocal.h"
 
 //******************************************************************************
Index: trunk/src/user32/pmframe.cpp
===================================================================
--- trunk/src/user32/pmframe.cpp	(revision 2803)
+++ trunk/src/user32/pmframe.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: pmframe.cpp,v 1.41 2000-01-28 22:25:59 sandervl Exp $ */
+/* $Id: pmframe.cpp,v 1.42 2000-02-16 14:34:30 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -25,4 +25,7 @@
 #include "caret.h"
 #include "oslibmsg.h"
+
+#define DBG_LOCALLOG	DBG_pmframe
+#include "dbglocal.h"
 
 #define PMFRAMELOG
Index: trunk/src/user32/pmwindow.cpp
===================================================================
--- trunk/src/user32/pmwindow.cpp	(revision 2803)
+++ trunk/src/user32/pmwindow.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: pmwindow.cpp,v 1.84 2000-02-06 17:39:33 cbratschi Exp $ */
+/* $Id: pmwindow.cpp,v 1.85 2000-02-16 14:34:31 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -37,4 +37,7 @@
 #include "timer.h"
 #include <codepage.h>
+
+#define DBG_LOCALLOG	DBG_pmwindow
+#include "dbglocal.h"
 
 HMQ  hmq = 0;                             /* Message queue handle         */
Index: trunk/src/user32/scroll.cpp
===================================================================
--- trunk/src/user32/scroll.cpp	(revision 2803)
+++ trunk/src/user32/scroll.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: scroll.cpp,v 1.33 2000-02-03 17:13:01 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.34 2000-02-16 14:34:32 sandervl Exp $ */
 /*
  * Scrollbar control
@@ -22,4 +22,7 @@
 #include "initterm.h"
 #include "pmframe.h"
+
+#define DBG_LOCALLOG	DBG_scroll
+#include "dbglocal.h"
 
 #define SCROLL_MIN_RECT  4 /* Minimum size of the rectangle between the arrows */
Index: trunk/src/user32/spy.cpp
===================================================================
--- trunk/src/user32/spy.cpp	(revision 2803)
+++ trunk/src/user32/spy.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: spy.cpp,v 1.9 2000-01-18 20:10:45 sandervl Exp $ */
+/* $Id: spy.cpp,v 1.10 2000-02-16 14:34:33 sandervl Exp $ */
 
 /*
@@ -25,4 +25,6 @@
 #include <spy.h>
 
+#define DBG_LOCALLOG	DBG_spy
+#include "dbglocal.h"
 
 #define  Q_BUFFER_SIZE  4096
Index: trunk/src/user32/static.cpp
===================================================================
--- trunk/src/user32/static.cpp	(revision 2803)
+++ trunk/src/user32/static.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: static.cpp,v 1.16 2000-01-18 20:10:45 sandervl Exp $ */
+/* $Id: static.cpp,v 1.17 2000-02-16 14:34:34 sandervl Exp $ */
 /*
  * Static control
@@ -18,4 +18,7 @@
 #include "controls.h"
 #include "static.h"
+
+#define DBG_LOCALLOG	DBG_static
+#include "dbglocal.h"
 
 //Prototypes
Index: trunk/src/user32/syscolor.cpp
===================================================================
--- trunk/src/user32/syscolor.cpp	(revision 2803)
+++ trunk/src/user32/syscolor.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: syscolor.cpp,v 1.17 2000-02-10 18:49:51 cbratschi Exp $ */
+/* $Id: syscolor.cpp,v 1.18 2000-02-16 14:34:35 sandervl Exp $ */
 
 /*
@@ -23,4 +23,7 @@
 #include "syscolor.h"
 #include "options.h"
+
+#define DBG_LOCALLOG	DBG_syscolor
+#include "dbglocal.h"
 
 //SvL: Open32 colors are much better than those in the table below
@@ -208,7 +211,5 @@
     }
 
-#ifdef DEBUG
-    WriteLog("OS2SetSysColors\n");
-#endif
+    dprintf(("SetSysColors\n"));
 
     O32_SetSysColors(nChanges, lpSysColor, lpColorValues);
@@ -234,7 +235,5 @@
 HBRUSH WIN32API GetSysColorBrush(int nIndex)
 {
-#ifdef DEBUG
-  WriteLog("OS2GetSysColorBrush %d returned", nIndex);
-#endif
+  dprintf(("GetSysColorBrush %d returned", nIndex));
   if (!fColorInit)
   {
Index: trunk/src/user32/text.cpp
===================================================================
--- trunk/src/user32/text.cpp	(revision 2803)
+++ trunk/src/user32/text.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: text.cpp,v 1.6 2000-01-29 14:23:33 sandervl Exp $ */
+/* $Id: text.cpp,v 1.7 2000-02-16 14:34:35 sandervl Exp $ */
 
 /*
@@ -14,4 +14,7 @@
 #include "winuser.h"
 #include "user32.h"
+
+#define DBG_LOCALLOG	DBG_text
+#include "dbglocal.h"
 
 //WINE parts: wine-991031
Index: trunk/src/user32/timer.cpp
===================================================================
--- trunk/src/user32/timer.cpp	(revision 2803)
+++ trunk/src/user32/timer.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: timer.cpp,v 1.10 2000-01-18 20:10:46 sandervl Exp $ */
+/* $Id: timer.cpp,v 1.11 2000-02-16 14:34:36 sandervl Exp $ */
 
 /*
@@ -23,4 +23,7 @@
 #include "timer.h"
 
+#define DBG_LOCALLOG	DBG_timer
+#include "dbglocal.h"
+
 #ifndef OPEN32API
 #define OPEN32API _System
Index: trunk/src/user32/uitools.cpp
===================================================================
--- trunk/src/user32/uitools.cpp	(revision 2803)
+++ trunk/src/user32/uitools.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: uitools.cpp,v 1.22 2000-01-29 14:23:33 sandervl Exp $ */
+/* $Id: uitools.cpp,v 1.23 2000-02-16 14:34:37 sandervl Exp $ */
 /*
  * User Interface Functions
@@ -15,4 +15,7 @@
 #include "user32.h"
 #include "win32wbase.h"
+
+#define DBG_LOCALLOG	DBG_uitools
+#include "dbglocal.h"
 
 static const WORD wPattern_AA55[8] = { 0xaaaa, 0x5555, 0xaaaa, 0x5555,
Index: trunk/src/user32/unknown.cpp
===================================================================
--- trunk/src/user32/unknown.cpp	(revision 2803)
+++ trunk/src/user32/unknown.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: unknown.cpp,v 1.7 2000-01-18 20:10:47 sandervl Exp $ */
+/* $Id: unknown.cpp,v 1.8 2000-02-16 14:34:38 sandervl Exp $ */
 
 /*
@@ -11,4 +11,7 @@
 
 #include <os2win.h>
+
+#define DBG_LOCALLOG	DBG_unknown
+#include "dbglocal.h"
 
 /*****************************************************************************
Index: trunk/src/user32/user32.cpp
===================================================================
--- trunk/src/user32/user32.cpp	(revision 2803)
+++ trunk/src/user32/user32.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: user32.cpp,v 1.72 2000-02-12 18:09:49 cbratschi Exp $ */
+/* $Id: user32.cpp,v 1.73 2000-02-16 14:34:39 sandervl Exp $ */
 
 /*
@@ -41,4 +41,7 @@
 #include <win32wnd.h>
 #include <winuser.h>
+
+#define DBG_LOCALLOG	DBG_user32
+#include "dbglocal.h"
 
 //undocumented stuff
Index: trunk/src/user32/wndmsg.cpp
===================================================================
--- trunk/src/user32/wndmsg.cpp	(revision 2803)
+++ trunk/src/user32/wndmsg.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: wndmsg.cpp,v 1.13 2000-02-12 18:09:50 cbratschi Exp $ */
+/* $Id: wndmsg.cpp,v 1.14 2000-02-16 14:34:40 sandervl Exp $ */
 /*
  * Win32 window message text function for OS/2
@@ -15,4 +15,7 @@
 #include <win\winmfcmsg.h>
 #include <spy.h>
+
+#define DBG_LOCALLOG	DBG_wndmsg
+#include "dbglocal.h"
 
 #ifdef DEBUG
Index: trunk/src/user32/wsprintf.cpp
===================================================================
--- trunk/src/user32/wsprintf.cpp	(revision 2803)
+++ trunk/src/user32/wsprintf.cpp	(revision 2804)
@@ -1,3 +1,3 @@
-/* $Id: wsprintf.cpp,v 1.5 2000-01-18 20:11:27 sandervl Exp $ */
+/* $Id: wsprintf.cpp,v 1.6 2000-02-16 14:34:41 sandervl Exp $ */
 
 /*
@@ -29,4 +29,7 @@
 
 #include <misc.h>
+
+#define DBG_LOCALLOG	DBG_wsprintf
+#include "dbglocal.h"
 
 ODINDEBUGCHANNEL(USER32-WSPRINTF)
