Changeset 819

Timestamp:

Sep 4, 1999, 7:56:41 PM (26 years ago)

Author:

dengert

Message:

begin DAXifying windows

Location:

trunk

Files:

• changelog (modified) (28 diffs)
• src/user32/new/makefile (modified) (2 diffs)
• src/user32/new/pmwindow.cpp (modified) (2 diffs)
• src/user32/new/user32.def (modified) (2 diffs)
• src/user32/new/win32class.h (modified) (4 diffs)
• src/user32/new/win32wbase.cpp (modified) (83 diffs)
• src/user32/new/win32wbase.h (modified) (7 diffs)
• src/user32/new/wingdi.cpp (modified) (2 diffs)

trunk/changelog

@@ -1 @@
- /* $Id: changelog,v 1.173 1999-09-04 12:42:27 sandervl Exp $ */
+ /* $Id: changelog,v 1.174 1999-09-04 17:55:55 dengert Exp $ */
+
+ 99-09-04: Daniela Engert <dani@ngrt.de>
+        - USER32\NEW: beginning with 'DAXifying' of our windows
 
  99-09-04: Sander van Leeuwen <sandervl@xs4all.nl>
@@ -10 +13 @@
  99-09-03: Sander van Leeuwen <sandervl@xs4all.nl>
         - USER32\NEW: MDI child/client improvement (not all wine code has
-                      been ported though)
+                      been ported though)
 
  99-09-01: Patrick Haller <phaller@gmx.net>
-        - *:    Cleanup of include files, some ICOM issues in particular, 
+        - *:    Cleanup of include files, some ICOM issues in particular,
                 also fixes LONGLONG problem (now names LONGLONG_W)
         - SHELL32\NEW:  introduction of a straight port of WINE's SHELL32 implementation
@@ -27 +30 @@
  99-09-01: Sander van Leeuwen <sandervl@xs4all.nl>
         - USER32\NEW: Fixed GetWindowDC (Freecell 'Cards Left' string drawn
-                      at the right place)
+                      at the right place)
 
  99-09-01: Jens Wiessner <wiessnej@rfi.de>
@@ -34 +37 @@
 
  99-08-31: Patrick Haller <phaller@gmx.net>
-        - WINMM:        revision of timer services (C&C RA)
-        - KERNEL32:     temporary fix for DuplicateHandle for non-HandleManager handles
+        - WINMM:        revision of timer services (C&C RA)
+        - KERNEL32:     temporary fix for DuplicateHandle for non-HandleManager handles
                         little improvement in console properties
                         incorrect anchor class for mutexes, events and semaphores
@@ -45 +48 @@
         - USER32\NEW: Fixed menu apis
         - KERNEL32\NEW: Changed makefile to generate response file (linker
-                        cmd line too long)
-                        Created resource class for menus (Win32MenuRes)
-        - INC:        Changed debug makefiles to include /dbgpack linker option
-                      (compresses debug info)
+                        cmd line too long)
+                        Created resource class for menus (Win32MenuRes)
+        - INC:        Changed debug makefiles to include /dbgpack linker option
+                      (compresses debug info)
 
  99-08-31: Rene Pronk <R.Pronk@twi.tudelft.nl>
@@ -59 +62 @@
  99-08-30: Sander van Leeuwen <sandervl@xs4all.nl>
         - USER32\NEW: Redesign. Create base class for all window types
-                      Delete Open32 class atoms before recreating them.
-                      Added skeleton class for MDI client window.
+                      Delete Open32 class atoms before recreating them.
+                      Added skeleton class for MDI client window.
 
  99-08-29: Sander van Leeuwen <sandervl@xs4all.nl>
         - USER32\NEW: Changed behaviour of mouse messages (send NC messages
-                      when in non-client area + send WM_SETCURSOR msgs)
-                      Don't send WM_MOUSEMOVE when mouse is captured.
+                      when in non-client area + send WM_SETCURSOR msgs)
+                      Don't send WM_MOUSEMOVE when mouse is captured.
                       Changed CreateMDIWindowA/W (don't call Open32 api anymore,
-                      but post WM_MDICREATE msg)
-                      
+                      but post WM_MDICREATE msg)
+
         - KERNEL32 Interlock apis ported from Wine (with help of Patrick Haller)
         - INC: Removed Masm compatible flag for ALP and enabled debugging
-               info in debug build
+               info in debug build
 
  99-08-29: Jens Wiessner <wiessnej@rfi.de>
@@ -79 +82 @@
 
  99-08-28: Sander van Leeuwen <sandervl@xs4all.nl>
-        - USER32\NEW: Use shared memory for window & class objects
+        - USER32\NEW: Use shared memory for window & class objects
                       Implemented FindWindow(Ex). Not yet tested
-                      Fixed window names.
-                      Created shared heap using VAC's _ucreate.
-                      Separate window handle creation (in shared memory array)
+                      Fixed window names.
+                      Created shared heap using VAC's _ucreate.
+                      Separate window handle creation (in shared memory array)
                       PostMessage fixes (didn't work between two processes)
         - KERNEL32:   Fixed exception handling for kill signals & termination
-                      Changed VMutex constructor (also allows creation of
-                      shared mutex semaphores)
-                      NOTE: This requires a complete recompile!!
+                      Changed VMutex constructor (also allows creation of
+                      shared mutex semaphores)
+                      NOTE: This requires a complete recompile!!
 
  99-08-28: Daniela Engert <dani@ngrt.de>
@@ -95 +98 @@
 
  99-08-28: Achim Hasenmueller <achimha@innotek.de>
-        - COMCTL32: Merged with latest WINE updates (990815)
+        - COMCTL32: Merged with latest WINE updates (990815)
 
  99-08-28: Yuri Dario <mc6530@mclink.it>
@@ -101 +104 @@
 
  99-08-27: Daniela Engert <dani@ngrt.de>
-        - USER32\NEW: window creation, window relationship, window sizing and
-                    positioning enhanced.
-        - USER32\NEW: window and client rectangles are in sync with the WINE
-                    structures now.
+        - USER32\NEW: window creation, window relationship, window sizing and
+                    positioning enhanced.
+        - USER32\NEW: window and client rectangles are in sync with the WINE
+                    structures now.
 
  99-08-27: Sander van Leeuwen <sandervl@xs4all.nl>
         - KERNEL32: Rewrote memory mapped files for multiple views
                     Increased default nr of pages loaded so loading
-                    large apps doesn't take forever to start in IPMD.
+                    large apps doesn't take forever to start in IPMD.
         - KERNEL32: Process dll exports before imports in order to support
-                    circular dll dependencies.
+                    circular dll dependencies.
         - KERNEL32: Replaced fopen/fclose calls in windll.cpp; they mess up FS.
-                    Init full path of image during Init method.
+                    Init full path of image during Init method.
 
  99-08-27: Patrick Haller <phaller@gmx.net>
@@ -120 +123 @@
  99-08-26: Sander van Leeuwen <sandervl@xs4all.nl>
         - KERNEL32: Cleaned up. (removed os2native.cpp & os2util.cpp and
-                    replaced them with oslibdos.* & oslibmisc.*; put 
-                    Virtual* win32 apis in virtual.cpp)
+                    replaced them with oslibdos.* & oslibmisc.*; put
+                    Virtual* win32 apis in virtual.cpp)
         - KERNEL32: Added workaround for (what seems to be) an OS/2 bug.
-                    Fixes crashes when reading from the memory mapped file.
-                    (see comments in kernel32\mmap.cpp)
-                    Bugfixes for VirtualProtect & VirtualQuery
+                    Fixes crashes when reading from the memory mapped file.
+                    (see comments in kernel32\mmap.cpp)
+                    Bugfixes for VirtualProtect & VirtualQuery
 
  99-08-25: Jens Wiessner <wiessnej@rfi.de>
@@ -132 +135 @@
  99-08-25: Sander van Leeuwen <sandervl@xs4all.nl>
         - KERNEL32: Use memory mapped files for PE loader
-                    Readonly memory mapped files work. Read/Write has not
-                    been tested yet. Shared mmaps don't work at this time.
+                    Readonly memory mapped files work. Read/Write has not
+                    been tested yet. Shared mmaps don't work at this time.
         - KERNEL32: Set exception handler chain to -1 (not 0) in KillWin32Process
-                    -> fixes large nr of exceptions
+                    -> fixes large nr of exceptions
         - KERNEL32: Several changes for memory mapped files.
-                    Put back handlemanager changes. (i.e. MapViewOfFile)
+                    Put back handlemanager changes. (i.e. MapViewOfFile)
         - USER32\NEW: Deleted win32type.h
         - ADVAPI32: Fixed some incorrect definitions of security apis
         - INCLUDE\WIN: Changed WINE_NAME_AW definition (now you can use
-                       apis without the 'A' or 'W' suffix)
+                       apis without the 'A' or 'W' suffix)
         - INCLUDE: Added makefile for VAC 3.6.5
-                   To compile use i.e.: nmake DEBUG=1 CCENV=VAC36
+                   To compile use i.e.: nmake DEBUG=1 CCENV=VAC36
         - KERNEL32: Changed VIRTUAL_MapFileA/W
-                    Changed OS2ImageInit from public to protected
+                    Changed OS2ImageInit from public to protected
         - KERNEL32: Added DuplicateHandle to Handle Manager (wasn't working before)
-                    NOTE: Only works for file handles at this time!
-                          The rest still needs to be implemented.
+                    NOTE: Only works for file handles at this time!
+                          The rest still needs to be implemented.
         - USER32\NEW: Changed loadres.cpp call to VIRTUAL_MapFileA
 
@@ -155 +158 @@
         - KERNEL32: HandleManager support for memory mapped files
                     Added FindFirstFileW, FindNextFileW
-                    Bugfix in ExitProcess / iConsoleWaitClose
+                    Bugfix in ExitProcess / iConsoleWaitClose
                     Bugfix in OS2Heap::OS2Heap (Heap 0 always valid for NT programs?)
 
  99-08-24: Sander van Leeuwen <sandervl@xs4all.nl>
         - USER32\NEW: One mutex per type of generic object + mutex protection
-                      of linked list access in win32 classes
+                      of linked list access in win32 classes
         - KERNEL32: Implemented VirtualQuery (not yet tested)
-                    VirtualQueryEx calls VirtualQuery, VirtualProtectEx calls
-                    VirtualProtect
-          NOTE: VirtualQueryEx & VirtualProtectEx can't handle addresses of other
-                processes
+                    VirtualQueryEx calls VirtualQuery, VirtualProtectEx calls
+                    VirtualProtect
+          NOTE: VirtualQueryEx & VirtualProtectEx can't handle addresses of other
+                processes
         - KERNEL32: Added memory mapped file class (not hooked up to apis or
-                    exception handler yet; just committing my preliminary code)
+                    exception handler yet; just committing my preliminary code)
 
  99-08-23: Sander van Leeuwen <sandervl@xs4all.nl>
         - KERNEL32: Dll load order bugfix (PE loader)
         - USER32\NEW: Added two dummy exports so comdlg32 will load
-          NOTE: This is a temporary hack and needs to be changed.
+          NOTE: This is a temporary hack and needs to be changed.
         - USER32\NEW: Fix for OSLibWinCreateIcon (supports single icons now)
         - KERNEL32: Logging change, now creates a unique logfile for each
-                    process. (multiple win32 apps active -> multiple logfiles)
+                    process. (multiple win32 apps active -> multiple logfiles)
 
  99-08-23: Patrick Haller <phaller@gmx.net>
-        - USER32/NEW: partial (not compiling yet) port of DIALOG.C
-        - USER32:     fix: Win32Proc constructor crash (GetClassInfoA(of a Systemclass))
+        - USER32/NEW: partial (not compiling yet) port of DIALOG.C
+        - USER32:     fix: Win32Proc constructor crash (GetClassInfoA(of a Systemclass))
 
 
@@ -188 +191 @@
         - KERNEL32: Fixed some PE resource dll load bugs
         - KERNEL32: Moved CloseLogFile call to after DestroyTIB (fixes crashes
-                    as WriteLog was still called in DestroyTIB & WriteOutProfiles)
+                    as WriteLog was still called in DestroyTIB & WriteOutProfiles)
         - KERNEL32: Added exception handling code for each thread, entrypoint &
-                    TLS callbach handler.
-                    OS2ExceptionHandler (in exceptions.cpp) is registered as the
-                    main exception handler.
-                    NOTE: Still needs to call original win32 exception handler
-                          from OS2ExceptionHandler.
+                    TLS callbach handler.
+                    OS2ExceptionHandler (in exceptions.cpp) is registered as the
+                    main exception handler.
+                    NOTE: Still needs to call original win32 exception handler
+                          from OS2ExceptionHandler.
         - USER32/NEW: Changed WM_ERASEBKGND handling. Fixes FreeCell background.
-                      (but might not be completely correct)
+                      (but might not be completely correct)
         - INCLUDE\WIN: Added custcntl.h & fixed GetObject definition
         - INCLUDE\WIN, WIN\WINE: Added several files, updated OLE headers
@@ -203 +206 @@
  99-08-21: Sander van Leeuwen <sandervl@xs4all.nl>
         - USER32\NEW: Fixed window class bug. Freecell menu now properly
-                      loaded.
-        - USER32\NEW: Changed LoadBitmapA/W to load bitmaps internally 
-                      (also ported some Wine code for that purpose)
-                      Not correct yet: some of Solitaire's bitmaps look bad
+                      loaded.
+        - USER32\NEW: Changed LoadBitmapA/W to load bitmaps internally
+                      (also ported some Wine code for that purpose)
+                      Not correct yet: some of Solitaire's bitmaps look bad
         - KERNEL32:   Fixed name id lookup bug for PE loader resources
         - KERNEL32:   AllocFixedMemory bugfix + added Aurora flag to DosAllocMem
         - KERNEL32:   Close logfile in kernel32 exit list -> last log messages
-                      before crash now properly saved
+                      before crash now properly saved
         - PELDR:      Corrected makefile
 
  99-08-21: Yuri Dario <mc6530@mclink.it>
         - Makefiles: Link with predefined VAC lib (RTLLIB(_O))
-                     Needed for VAC 3.6.5
+                     Needed for VAC 3.6.5
 
  99-08-20: Sander van Leeuwen <sandervl@xs4all.nl>
@@ -221 +224 @@
         - USER32/NEW: Changes to Load* resource apis
         - USER32/NEW: Put back LoadBitmap for now
-                      Rewrote LoadIconA/W & LoadCursorA/W + added
-                      extra code to oslib.
+                      Rewrote LoadIconA/W & LoadCursorA/W + added
+                      extra code to oslib.
 
  99-08-20: Patrick Haller <phaller@gmx.net>
-        - ODINWRAP: fixed invalid macros
+        - ODINWRAP: fixed invalid macros
 
  99-08-19: Patrick Haller <phaller@gmx.net>
-        - ODINWRAP: fixed invalid recursion in ODINFUNCTION0-Debug
-        - WINMM:    odinwrap macros
-        - TAPI32:   odinwrap macros
-        - MPR:      odinwrap macros
-        - COMDLG32: odinwrap macros
-        - WNETAP32: odinwrap macros
-        - WINSPOOL: odinwrap macros
+        - ODINWRAP: fixed invalid recursion in ODINFUNCTION0-Debug
+        - WINMM:    odinwrap macros
+        - TAPI32:   odinwrap macros
+        - MPR:      odinwrap macros
+        - COMDLG32: odinwrap macros
+        - WNETAP32: odinwrap macros
+        - WINSPOOL: odinwrap macros
 
  99-08-19: Sander van Leeuwen <sandervl@xs4all.nl>
         - KERNEL32: PE loader resource fixes + ConvertNameId bugfix
-                    Added pe2lx conversion code for menus, accelerators, 
-                    bitmaps, icons, cursors, icon & cursor groups.
-                    Put back _CreateWin32Exe export in kernel32exp.def
+                    Added pe2lx conversion code for menus, accelerators,
+                    bitmaps, icons, cursors, icon & cursor groups.
+                    Put back _CreateWin32Exe export in kernel32exp.def
         - KERNEL32: Used Odin wrappers for profile apis (mess up FS)
-        - USER32 & USER32\NEW: Cleaned up icon code 
+        - USER32 & USER32\NEW: Cleaned up icon code
 
  99-08-18: Patrick Haller <phaller@gmx.net>
-        - NTDLL:    tons of new stubs and crt functions
-        - WNETAP32: tons of new stubs
+        - NTDLL:    tons of new stubs and crt functions
+        - WNETAP32: tons of new stubs
 
  99-08-18: Sander van Leeuwen <sandervl@xs4all.nl>
@@ -252 +255 @@
           we don't want a kernel32 dependency there)
         - PELDR/KERNEL32: Use reserved memory by peldr.dll to store win32 exe
-                          sections. (now loads exes without fixups & low base address)
-                          Added TLS support.
+                          sections. (now loads exes without fixups & low base address)
+                          Added TLS support.
         - KERNEL32: Lots of changes for the ring 3 PE loader (not completed)
-                    Store PE header at start of module in memory, module handle
-                    set to image base of module. 
+                    Store PE header at start of module in memory, module handle
+                    set to image base of module.
 
  99-08-18: Przemyslaw Dobrowolski <dobrawka@asua.org.pl>
-        - KERNEL32: Profile bugfix (line 506) && removed redundant '\r' 
-                    (except on line 199)
-              
+        - KERNEL32: Profile bugfix (line 506) && removed redundant '\r'
+                    (except on line 199)
+
  99-08-17: Sander van Leeuwen <sandervl@xs4all.nl>
         - KERNEL32/LZ32: Fixed compilation problems introduced by changes below
         - ODINCRT: Rewrote __threadid Clib function to get rid of crashes
-                   (restores OS/2 FS selector before accessing PIB ptr and
-                    puts back original FS selector afterwards)
+                   (restores OS/2 FS selector before accessing PIB ptr and
+                    puts back original FS selector afterwards)
           NOTE: No longer necessary to use ODIN_FS_BEGIN/ODIN_FS_END macros
         - DDRAW: Removed ODIN_FS_BEGIN/ODIN_FS_END calls
-                 Fixed bugs in divewrap.h. Incorrect wrappers called themselves
-                 instead of the original Dive apis.
+                 Fixed bugs in divewrap.h. Incorrect wrappers called themselves
+                 instead of the original Dive apis.
 
  99-08-17: Patrick Haller <phaller@gmx.net>
-        - LZ32:    can't export LZCopy as ID0, changed to alphanumeric export
+        - LZ32:    can't export LZCopy as ID0, changed to alphanumeric export
 
  99-08-16: Sander van Leeuwen <sandervl@xs4all.nl>
@@ -279 +282 @@
         - ODINCRT: Changed compile & link options
         - ODINCRT: Don't export ctordtorInit/Term. These functions must exists
-                   locally for each dll/exe. Fixes crashes in pe loader and
-                   corrupt converted exes generated by pe2lx
+                   locally for each dll/exe. Fixes crashes in pe loader and
+                   corrupt converted exes generated by pe2lx
         - ALL: Makefile changes & initterm.cpp no longer calls c/c++ library
-               init & termination functions (should only be done in odincrt.dll)
+               init & termination functions (should only be done in odincrt.dll)
 
  99-08-16: Patrick Haller <phaller@gmx.net>
-        - SHELL32: integrated Christoph Bratschis SHELL32 stubs
-        - WSOCK32: odinwrap macros
+        - SHELL32: integrated Christoph Bratschis SHELL32 stubs
+        - WSOCK32: odinwrap macros
 
  99-08-16: Christoph Bratschi <cbratschi@datacomm.ch>
@@ -292 +295 @@
 
  99-08-15: Christoph Bratschi <cbratschi@datacomm.ch>
-        - USER32\NEW: controls: wine-990731 update
+        - USER32\NEW: controls: wine-990731 update
 
  99-08-14: Christoph Bratschi <cbratschi@datacomm.ch>
-        - COMCTL32: wine-990731 update
+        - COMCTL32: wine-990731 update
 
  99-08-14: Sander van Leeuwen <sandervl@xs4all.nl>
@@ -310 +313 @@
         - ODINCRT: ordinal exports
         - ADVAPI32:odinwrap macros (partially)
-        - LZ32:    odinwrap macros
+        - LZ32:    odinwrap macros
 
  99-08-10: Sander van Leeuwen <sandervl@xs4all.nl>
@@ -329 +332 @@
  99-08-05: Patrick Haller <phaller@gmx.net>
         - KERNEL32:  interactive control over UnhandledExceptionFilter
-        - KERNEL32:  FormatMessageAW fixed. Do not mix ODIN's heap functions with VAC heap functions
+        - KERNEL32:  FormatMessageAW fixed. Do not mix ODIN's heap functions with VAC heap functions
         - KERNEL32:  added WINE-style string functions in Heapstring.cpp
         - SHELL3232: RestartDialog @59 stub added. IE2 can load now with NT4's URL.DLL.
@@ -335 +338 @@
  99-08-05: Sander van Leeuwen <sandervl@xs4all.nl>
         - KERNEL32:  Bitmap conversion bugfix; always recalculate bitmap size
-                     (bitmap in donut.exe (ddraw sample) contains wrong size)
+                     (bitmap in donut.exe (ddraw sample) contains wrong size)
 
  99-08-04: Patrick Haller <phaller@gmx.net>
@@ -343 +346 @@
  99-08-04: Sander van Leeuwen <sandervl@xs4all.nl>
         - PE2LX: Bugfix for icon conversion (heap corruption for ra95.exe; as
-                 reported by Patrick Haller)
- 
+                 reported by Patrick Haller)
+
  99-08-04: Patrick Haller <phaller@gmx.net>
         - KERNEL32: Heap modification
@@ -358 +361 @@
         - USER32/NEW: Lots of changes; Solitaire displays cards correctly
                       Status bar correctly drawn
-                      Mouse msg translation still wrong.
+                      Mouse msg translation still wrong.
                       Paint not correct.
 
@@ -385 +388 @@
  99-07-21: Edgar Buerkle <100566.557@compuserve.com>
         - KERNEL32: Fix for LoadResource; should return pointer to resource data
-                    LockResource just returns the pointer returned by LoadResource
+                    LockResource just returns the pointer returned by LoadResource
 
  99-07-20: Sander van Leeuwen <sandervl@xs4all.nl>
-        - USER32/NEW: Added support for window icons and accelerators. 
+        - USER32/NEW: Added support for window icons and accelerators.
                       Accelerators don't work yet.
-        - PE2LX: Save icons in different format (BITMAPINFOHEADER2)           
+        - PE2LX: Save icons in different format (BITMAPINFOHEADER2)
 
  99-07-19: Sander van Leeuwen <sandervl@xs4all.nl>
         - KERNEL32: Added method for retrieving converted OS/2 resource
-                    (which will be changed later on)
+                    (which will be changed later on)
         - USER32/NEW: CreateWindowEx now works and menus are displayed
 
  99-07-17: Sander van Leeuwen <sandervl@xs4all.nl>
-        - KERNEL32: Exports for getting TEB & THDB added
-        
+        - KERNEL32: Exports for getting TEB & THDB added
+
  99-07-15: Sander van Leeuwen <sandervl@xs4all.nl>
-        - USER32/NEW: Unicode & window handle translation bugfixes
+        - USER32/NEW: Unicode & window handle translation bugfixes
 
  99-07-14: Christoph Bratschi <cbratschi@datacomm.ch>
-        - USER32/NEW: several bugs fixed, compiles now
-                      CreateWindow doesn't work yet
+        - USER32/NEW: several bugs fixed, compiles now
+                      CreateWindow doesn't work yet
 
  99-07-13: Sander van Leeuwen <sandervl@xs4all.nl>
         - USER32/NEW: *VERY* preliminary/alpha code for Open32 replacement in user32
-                      Compiles, but not tested at all.
+                      Compiles, but not tested at all.
 
  99-07-12: Patrick Haller <phaller@gmx.net>
@@ -420 +423 @@
         - KERNEL32/PE2LX: Added support for TLS sections
         - KERNEL32: Added thread attach/detach messages for dlls
-                    Fixed some bugs, cleaned up code
+                    Fixed some bugs, cleaned up code
           NOTE: THIS CHANGE BREAKS ALL PREVIOUSLY CONVERTED APPLICATIONS
-                RECOMPILE ALL DLLS AND CONVERT EVERYTHING AGAIN!!!!!!!!!
+                RECOMPILE ALL DLLS AND CONVERT EVERYTHING AGAIN!!!!!!!!!
                 THIS CHANGE ALSO BREAKS WIN32K!
 
@@ -432 +435 @@
 
  99-07-05: Patrick Haller <phaller@gmx.net>
-        - SHELL32: SheSetCurDrive stub, ...
+        - SHELL32: SheSetCurDrive stub, ...
 
  99-07-05: Sander van Leeuwen <sandervl@xs4all.nl>
-        - LIB\libconv.def: Added name with '_' appended. (or else Watcom won't
-          link pe2lx\misc.cpp properly)
+        - LIB\libconv.def: Added name with '_' appended. (or else Watcom won't
+          link pe2lx\misc.cpp properly)
 
  99-07-05: Edgar Buerkle <100566.557@compuserve.com>
-        - PE2LX: Preliminary support for codepages
+        - PE2LX: Preliminary support for codepages
 
  99-07-05: Patrick Haller <phaller@gmx.net>
-        - KERNEL32: HandleManager fixes as suggested by Edgar Buerkle
+        - KERNEL32: HandleManager fixes as suggested by Edgar Buerkle
 
  99-07-04: Christoph Bratschi <cbratschi@datacomm.ch>
-        - PE2LX/USER32: Dialog default font set to WarpSans + fixes
+        - PE2LX/USER32: Dialog default font set to WarpSans + fixes
 
  99-07-02: Christoph Bratschi <cbratschi@datacomm.ch>
-        - PE2LX/USER32: Dialog bugfix for entryfield strings
+        - PE2LX/USER32: Dialog bugfix for entryfield strings
 
  99-06-30: Christoph Bratschi <cbratschi@datacomm.ch>
-        - KERNEL32: Unicode changes (unicode.cpp)
-                    lstrcpynA/W (kernel32.cpp
-        - USER32: LoadStringA unicode conversion bugfix
-        - USER32: Changed SystemParameterInfo for default font (now 9.WarpSans)
+        - KERNEL32: Unicode changes (unicode.cpp)
+                    lstrcpynA/W (kernel32.cpp
+        - USER32: LoadStringA unicode conversion bugfix
+        - USER32: Changed SystemParameterInfo for default font (now 9.WarpSans)
 
  99-06-30: Przemysˆaw Dobrowolski <dobrawka@asua.org.pl>
-        - WINMM: Implemented remaining joystick apis + bugfixes
+        - WINMM: Implemented remaining joystick apis + bugfixes
 
  99-06-29: Patrick Haller <phaller@gmx.net>
-        - KERNEL32: GetLocaleInfoA bugfix (lang.cpp)
+        - KERNEL32: GetLocaleInfoA bugfix (lang.cpp)
 
  99-06-29: Przemysˆaw Dobrowolski <dobrawka@asua.org.pl>
-        - WINMM: Implemented most of the joystick apis
+        - WINMM: Implemented most of the joystick apis
 
  99-06-28: Christoph Bratschi
-        - USER32: AsciiToUnicodeN bugfix (unicode.cpp)
+        - USER32: AsciiToUnicodeN bugfix (unicode.cpp)
 
  99-06-28: Sander van Leeuwen
-        - USER32: Get/SetWindowLongA bugfix for dialog controls
+        - USER32: Get/SetWindowLongA bugfix for dialog controls
 
  99-06-27: Sander van Leeuwen
-        - USER32: Message handler updates & lots of bugfixes
-        - USER32: Fix for GetWindowLongA, if Open32 returns 0xffff it really
-          means 0xffffffff -> fixes Winhlp32 buttons.
-        - USER32: Fixed bug when changing window procedures for dialog box
-                  controls
+        - USER32: Message handler updates & lots of bugfixes
+        - USER32: Fix for GetWindowLongA, if Open32 returns 0xffff it really
+          means 0xffffffff -> fixes Winhlp32 buttons.
+        - USER32: Fixed bug when changing window procedures for dialog box
+                  controls
 
  99-06-26: Sander van Leeuwen
-        - USER32: Changes for message spy & several message handler changes
-        - USER32: Restore win32 tib in window msg callback
-        - KERNEL32/include: Restore OS/2 tib on entering Open32 or OS/2 apis
-        - KERNEL32/lang.cpp: Bugfix for GetLocaleInfoA (if buf ptr == null,
-          only return size of memory block required to hold info)
+        - USER32: Changes for message spy & several message handler changes
+        - USER32: Restore win32 tib in window msg callback
+        - KERNEL32/include: Restore OS/2 tib on entering Open32 or OS/2 apis
+        - KERNEL32/lang.cpp: Bugfix for GetLocaleInfoA (if buf ptr == null,
+          only return size of memory block required to hold info)
 
  99-06-25: Achim Hasenmueller
-        - Finally fixed changelog date format to be compliant with
-          the official EU date format :)
+        - Finally fixed changelog date format to be compliant with
+          the official EU date format :)
 
  99-06-25: Christoph Bratschi
-        - USER32: GetSysColorPen bugfix (syscolor.cpp)
+        - USER32: GetSysColorPen bugfix (syscolor.cpp)
 
  99-06-24: Patrick Haller
-        - SHELL32: partial port form WINE
+        - SHELL32: partial port form WINE
 
  99-06-24: Edgar Buerkle
-        - KERNEL32: Implemented GetLocaleInfoA/W
+        - KERNEL32: Implemented GetLocaleInfoA/W
 
  99-06-24: Sander van Leeuwen
-        - include\winos2def.h: Changed OS/2 apis to use wrappers
-          (FS save/restore) and added DosQueryCtryInfo
+        - include\winos2def.h: Changed OS/2 apis to use wrappers
+          (FS save/restore) and added DosQueryCtryInfo
 
  99-06-23: Patrick Haller
-        - Fixed date format in changlog .g.
-        - NTDLL:    a dozen c runtime functions added
-        - USER32:   IsHungAppWindow dummy added
-        - SHELL32:  few more APIs added
-        - KERNEL32: HandleManager, Console, fixes
-        - COMDLG32: basic unicode support added, thou broken somehow
-        - source code splitups and beautification ;-)
+        - Fixed date format in changlog .g.
+        - NTDLL:    a dozen c runtime functions added
+        - USER32:   IsHungAppWindow dummy added
+        - SHELL32:  few more APIs added
+        - KERNEL32: HandleManager, Console, fixes
+        - COMDLG32: basic unicode support added, thou broken somehow
+        - source code splitups and beautification ;-)
 
  99-06-23: Achim Hasenmueller
-        - ported latest WINE fixes and additions for comctl32. Changes
-          involve better undoc. DSA APIs, right colors for the tab control,
-          many improvements for the listview...
+        - ported latest WINE fixes and additions for comctl32. Changes
+          involve better undoc. DSA APIs, right colors for the tab control,
+          many improvements for the listview...
 
  99-06-21: Achim Hasenmueller
-        - ported latest WINE DrawEdge code and moved everything to the
-          new file src/user32/uitools.cpp
+        - ported latest WINE DrawEdge code and moved everything to the
+          new file src/user32/uitools.cpp
 
  99-06-21: Sander van Leeuwen
-        - include\os2wrap.h, removed calling convention
+        - include\os2wrap.h, removed calling convention
 
  99-06-21: Christoph Bratschi
-        - COMCTL32: Progress bar finished (progress.c, USER32 bugs to fix)
-        - COMCTL32: Trackbar finished (trackbar.c)
+        - COMCTL32: Progress bar finished (progress.c, USER32 bugs to fix)
+        - COMCTL32: Trackbar finished (trackbar.c)
 
  99-06-20: Sander van Leeuwen
-        - KERNEL32: Call HMInitialize from initterm, not winexe object creation
-        - KERNEL32: Added comctl to list of system dlls (windll.cpp)
-        - KERNEL32: Fixed dll detach (windll.cpp) for converted win32 dlls
-        - KERNEL32: Module name detection (windll.cpp)
-        - KERNEL32: Activated Win32 TIB code; a selector + memory is allocated
-                    for the main thread and every thread created.
-                    When it's completed, it should fix several problems due to
-                    differences between OS/2's TIB and Win32's TEB.
-        - COMCTL32: Fixed crash on exit (moved unregister of class into exit list handler)
-        - USER32: Changed bugfix (WS_CLIPCHILDREN) for winhlp32 (same as Wine now)
-        - USER32: Fixed bug in wndproc.cpp (release build only)
-        - USER32: Added preliminary support for parent notification
+        - KERNEL32: Call HMInitialize from initterm, not winexe object creation
+        - KERNEL32: Added comctl to list of system dlls (windll.cpp)
+        - KERNEL32: Fixed dll detach (windll.cpp) for converted win32 dlls
+        - KERNEL32: Module name detection (windll.cpp)
+        - KERNEL32: Activated Win32 TIB code; a selector + memory is allocated
+                    for the main thread and every thread created.
+                    When it's completed, it should fix several problems due to
+                    differences between OS/2's TIB and Win32's TEB.
+        - COMCTL32: Fixed crash on exit (moved unregister of class into exit list handler)
+        - USER32: Changed bugfix (WS_CLIPCHILDREN) for winhlp32 (same as Wine now)
+        - USER32: Fixed bug in wndproc.cpp (release build only)
+        - USER32: Added preliminary support for parent notification
 
  99-06-19: Sander van Leeuwen
-        - ALL (except dsound/ddraw): Include <os2wrap.h> instead of <os2.h>
-        - KERNEL32: Changes for win32 TEB (not active)
+        - ALL (except dsound/ddraw): Include <os2wrap.h> instead of <os2.h>
+        - KERNEL32: Changes for win32 TEB (not active)
 
  99-06-07: Sander van Leeuwen
-        - Removed unecessary files
-        - Modified os2win.h to save FS selector before calling Open32 api
-          and restoring it afterwards.
-        - Renamed all .C files (except comctl32) to .CPP and fixed compiler errors
-        - GDI32: Fixed SetDIBitsToDevice bugfix (palette size)
-        - USER32: Fixed RegisterSystemClasses
+        - Removed unecessary files
+        - Modified os2win.h to save FS selector before calling Open32 api
+          and restoring it afterwards.
+        - Renamed all .C files (except comctl32) to .CPP and fixed compiler errors
+        - GDI32: Fixed SetDIBitsToDevice bugfix (palette size)
+        - USER32: Fixed RegisterSystemClasses
 
  99-06-07: Achim Hasenmueller
-        - Added comctl32, mostly untested includes all controls, some undocumented
-          APIs missing
-        - Added internal GetSysColorPen() to user32 - handy API used in WINE
-          Modified syscolor.cpp to support new Win98 colors and create pens
+        - Added comctl32, mostly untested includes all controls, some undocumented
+          APIs missing
+        - Added internal GetSysColorPen() to user32 - handy API used in WINE
+          Modified syscolor.cpp to support new Win98 colors and create pens
 
  99-06-06: Sander van Leeuwen
-        - Bugfixes in VirtualAlloc (KERNEL32), GetScrollPos & RegisterSystemClasses (USER32)
-          as reported on mailinglist by Edgar Buerkle.
-          Also FindResourceA/W.
+        - Bugfixes in VirtualAlloc (KERNEL32), GetScrollPos & RegisterSystemClasses (USER32)
+          as reported on mailinglist by Edgar Buerkle.
+          Also FindResourceA/W.
 
  99-06-01: David Raison
-        - OLE32: Changed everything to make it compile with the new headers
-        - include/win/ole.2 - line 170
-        - include/wine/win/obj_oleview.h - line 32 & 36
+        - OLE32: Changed everything to make it compile with the new headers
+        - include/win/ole.2 - line 170
+        - include/wine/win/obj_oleview.h - line 32 & 36
 
  99-05-23: Sander van Leeuwen
-        - ADVAPI32: Fixed Open32 bugs in RegOpenKeyA (set return key to 0 when failed)
-                    Fixed key definition conflict in convertkey.
-        - KERNEL32: Fixed exception handler, don't continue after process termination
-                    exception! (fixes annoying exitlist hangs)
+        - ADVAPI32: Fixed Open32 bugs in RegOpenKeyA (set return key to 0 when failed)
+                    Fixed key definition conflict in convertkey.
+        - KERNEL32: Fixed exception handler, don't continue after process termination
+                    exception! (fixes annoying exitlist hangs)
 
  99-05-19: Sander van Leeuwen
-        - KERNEL32: Corrected wrong export for HeapSize (reported by Vit Timchishin)
+        - KERNEL32: Corrected wrong export for HeapSize (reported by Vit Timchishin)
 
  99-05-15: Sander van Leeuwen
-        - Fixed a number of bugs introduced during the Wine header update
-        - KERNEL32: Added high/low fixup support for pe loader
+        - Fixed a number of bugs introduced during the Wine header update
+        - KERNEL32: Added high/low fixup support for pe loader
 
  99-05-13: Sander van Leeuwen
-        - Updated USER32
-        - Fixed unicode apis in USER32
-        - Added .def files for ADVAPI32, COMDLG32, GDI32, KERNEL32 & USER32 that
-          export all apis with the correct names. (_apiname@nrofparameterbytes)
+        - Updated USER32
+        - Fixed unicode apis in USER32
+        - Added .def files for ADVAPI32, COMDLG32, GDI32, KERNEL32 & USER32 that
+          export all apis with the correct names. (_apiname@nrofparameterbytes)
 
  99-05-12: Sander van Leeuwen
-        - Finished KERNEL32
-        - Updated WINMM
+        - Finished KERNEL32
+        - Updated WINMM
 
  99-05-10: Vince Vielhaber
-        - Rewrote WSOCK32 for Wine headers
+        - Rewrote WSOCK32 for Wine headers
 
  99-05-08: Sander van Leeuwen
-        - Updated CAPI32, COMDLG32 & GDI32, MPR, NTDLL, TAPI32, WINSPOOL, WNETAP32
-          for new headers
-        - Started with KERNEL32 changes (75% done)
-        - Made basic changes to OLE32 for new headers, but still tons of errors
-        - Fixed some unicode apis in GDI32
+        - Updated CAPI32, COMDLG32 & GDI32, MPR, NTDLL, TAPI32, WINSPOOL, WNETAP32
+          for new headers
+        - Started with KERNEL32 changes (75% done)
+        - Made basic changes to OLE32 for new headers, but still tons of errors
+        - Fixed some unicode apis in GDI32
 
  99-05-04: Sander van Leeuwen
-        - Stripped os2win.h and put it in include directory
-        - WINE header files in include\win
-          (some modified for IBM VAC)
-        - All Open32 apis have 'O32_' as prefix, Open32 specific declarations
-          are appended with _O32.
+        - Stripped os2win.h and put it in include directory
+        - WINE header files in include\win
+          (some modified for IBM VAC)
+        - All Open32 apis have 'O32_' as prefix, Open32 specific declarations
+          are appended with _O32.
 
  99-05-01: Sander van Leeuwen
-        - Changed makefile structure:
-                nmake DEBUG=1   builds debug version
-                nmake           builds release version
+        - Changed makefile structure:
+                nmake DEBUG=1   builds debug version
+                nmake           builds release version
 
  99-04-11: Sander van Leeuwen
-        - Everything except user32 & kernel32: copyrights added to most files
-          Moved a few header files in \include
-        - Fixed import problem in peldr (include\winimage.h), SetFullPath must
-          be a virtual method.
+        - Everything except user32 & kernel32: copyrights added to most files
+          Moved a few header files in \include
+        - Fixed import problem in peldr (include\winimage.h), SetFullPath must
+          be a virtual method.
 
  98-10-26: Sander van Leeuwen
-        - OLE32: CoInitialize takes one parameter, not 0
+        - OLE32: CoInitialize takes one parameter, not 0
 
  98-10-11: Sander van Leeuwen
-        - KERNEL32: except.asm Wrong calling convention for SetExceptionChain
-        - KERNEL32: exceptions.cpp/wprocess.cpp SetExceptionChain(-1) instead of SetExceptionChain(0)
+        - KERNEL32: except.asm Wrong calling convention for SetExceptionChain
+        - KERNEL32: exceptions.cpp/wprocess.cpp SetExceptionChain(-1) instead of SetExceptionChain(0)
 
  98-09-28: Sander van Leeuwen
-        - PE2LX: icon.cpp: palette only for <= 8 bpp
-        - PE2LX: icon.cpp: check if image size in bmp header is correct before using it
+        - PE2LX: icon.cpp: palette only for <= 8 bpp
+        - PE2LX: icon.cpp: check if image size in bmp header is correct before using it
 
  98-09-25: Sander van Leeuwen
-        - PE2LX: Don't fail if an exe/dll doesn't contain any imports (pe.cpp:ProcessImports)
+        - PE2LX: Don't fail if an exe/dll doesn't contain any imports (pe.cpp:ProcessImports)
 
 ********************************************************************************
@@ -638 +641 @@
 ********************************************************************************
  98-09-15: KSO
-        - WIN32K: pe2lx\misc.cpp changes
+        - WIN32K: pe2lx\misc.cpp changes
 
  98-09-13: Sander van Leeuwen
-        - KERNEL32: windll.cpp: fixed bug with szModule not being initialized
-        - PE2LX: pe.cpp: Only read first 1 MB for huge files. (as they are most
-                         likely InstallShield archives; exe appended with
-                         installation data)
+        - KERNEL32: windll.cpp: fixed bug with szModule not being initialized
+        - PE2LX: pe.cpp: Only read first 1 MB for huge files. (as they are most
+                         likely InstallShield archives; exe appended with
+                         installation data)
 
  98-09-12: Sander van Leeuwen
-        - WSOCK32: Changed fd_set to Wfd_set or else it won't compile over here
-        - KERNEL32: Winimage.cpp, extra checks added
-        - KERNEL32: OS2GetModuleFileName bugfix
-        - INCLUDE/MISC.H: Error printf that prints to stdout (more reliable than
-          a logfile)
-        - GDI32: GetDeviceCaps -> NT returns -1 when using 16 bits colors, NOT 65536!
-        - GDI32: CreateDIBSection -> StarCraft uses bitmap with negative height ->
-                                     flip image when blitting
-        - GDI32: DIBSection ctor: bug in BITMAPINFO2 malloc
-        - GDI32: BitBlt: (dibsection) HDC == HPS (thank you, IBM!)
+        - WSOCK32: Changed fd_set to Wfd_set or else it won't compile over here
+        - KERNEL32: Winimage.cpp, extra checks added
+        - KERNEL32: OS2GetModuleFileName bugfix
+        - INCLUDE/MISC.H: Error printf that prints to stdout (more reliable than
+          a logfile)
+        - GDI32: GetDeviceCaps -> NT returns -1 when using 16 bits colors, NOT 65536!
+        - GDI32: CreateDIBSection -> StarCraft uses bitmap with negative height ->
+                                     flip image when blitting
+        - GDI32: DIBSection ctor: bug in BITMAPINFO2 malloc
+        - GDI32: BitBlt: (dibsection) HDC == HPS (thank you, IBM!)
 
  98-09-02: Sander van Leeuwen
-        - KERNEL32/USER32: Split up code
-        - USER32 (/new): Started with new class & window managment code
-                         (not compiled nor tested, so don't change it)
+        - KERNEL32/USER32: Split up code
+        - USER32 (/new): Started with new class & window managment code
+                         (not compiled nor tested, so don't change it)
 
  98-09-01: Patrick Haller
-        - WSOCK32: Circular linker dependency removed
+        - WSOCK32: Circular linker dependency removed
 
  98-08-31: kso
-        - KERNEL32: changed lfile.c to use OS2CreateFile,OS2CloseHandle,.... as
-          NT does. Notepad (W95) is now working better.
-        - KERNEL32: fixed a open32 bug (or win32 feature) - WriteFile with
-          nrbytes = 0 is equal to a SetEndOfFile(..);
+        - KERNEL32: changed lfile.c to use OS2CreateFile,OS2CloseHandle,.... as
+          NT does. Notepad (W95) is now working better.
+        - KERNEL32: fixed a open32 bug (or win32 feature) - WriteFile with
+          nrbytes = 0 is equal to a SetEndOfFile(..);
 
  98-08-17: Sander van Leeuwen
-        - KERNEL32: Changed LoadLibraryA(W/ExA/ExW) to try to load the dll
-                    directly first and if that fails, load it manually.
+        - KERNEL32: Changed LoadLibraryA(W/ExA/ExW) to try to load the dll
+                    directly first and if that fails, load it manually.
 
  98-08-15: Sander van Leeuwen
-        - DDRAW: LOTS of changes,additions and fixes
-                 (ddex1-ddex5 DirectX SDK samples work(ed) + Quake 2 in
-                  DirectDraw mode)
-        - DSOUND: Skeleton code extended
+        - DDRAW: LOTS of changes,additions and fixes
+                 (ddex1-ddex5 DirectX SDK samples work(ed) + Quake 2 in
+                  DirectDraw mode)
+        - DSOUND: Skeleton code extended
 
  98-08-13: Sander van Leeuwen
-        - PE2LX: Replaced stack page removal code; (adjusted GetNrPages instead)
+        - PE2LX: Replaced stack page removal code; (adjusted GetNrPages instead)
 
  98-08-13: KSO:
-        - PE2LX: Borland bugfixes
+        - PE2LX: Borland bugfixes
 
  98-08-08: Sander van Leeuwen
-        - pe2lx (pe.cpp), call SetNrOfExports(0) for dlls without exports
-          to set the module name in the resident name table
-          (otherwise converted dll will not load)
-        - Version resource apis work now
-        - LocalReAlloc bugfix, notepad assumes it returns the same
-          address when the new size is smaller than the old one.
+        - pe2lx (pe.cpp), call SetNrOfExports(0) for dlls without exports
+          to set the module name in the resident name table
+          (otherwise converted dll will not load)
+        - Version resource apis work now
+        - LocalReAlloc bugfix, notepad assumes it returns the same
+          address when the new size is smaller than the old one.
 
  98-08-03 KSO:
-        - pe.cpp:       line 600 - added OS2Exe to the parameterlist
-        - bitmap.cpp: replace file - much.
-        - bitmap.h: replace file - typo (BitMap to Bitmap)
-        - icon.h: replace file  - #define BI_*
+        - pe.cpp:       line 600 - added OS2Exe to the parameterlist
+        - bitmap.cpp: replace file - much.
+        - bitmap.h: replace file - typo (BitMap to Bitmap)
+        - icon.h: replace file  - #define BI_*
 
  98-07-23: Knut Osmundsen
-        - PE2LX: Borland exe changes (import stuff)
+        - PE2LX: Borland exe changes (import stuff)
 
  98-07-18: Sander van Leeuwen
-        - KERNEL32/PE2LX: Changed version checks; version nr is put into the
-                          converted exe/dll as a parameter to one of the kernel32
-                          entry points
-        - USER32: Changed class managment code
-        - USER32: Removed all SYNCPAINT stuff as it breaks many apps
-        - USER32: Removed in CreateWindowExA that checks for values of x, y, nHeight & nWidth
-                  (this broke generic.exe, notepad.exe and probably many others)
-        - USER32: Finished GetMenuStringW (MSPaint), not working right though
-                  it should return 'Recent File', but returns 'Decent File'
-                  Well, whatever.
-        - VERSION/KERNEL32/PE2LX: Version resource API implemention started
-        - PE2LX:  Increased some fixup limits to convert dynhgi35.dll
-        - KERNEL32: AsciiToUnicode fixed (only terminate with one 0; doing
-                    it twice corrupts the heap as our stuff allocates exactly
-                    enough for string + 0 terminator)
+        - KERNEL32/PE2LX: Changed version checks; version nr is put into the
+                          converted exe/dll as a parameter to one of the kernel32
+                          entry points
+        - USER32: Changed class managment code
+        - USER32: Removed all SYNCPAINT stuff as it breaks many apps
+        - USER32: Removed in CreateWindowExA that checks for values of x, y, nHeight & nWidth
+                  (this broke generic.exe, notepad.exe and probably many others)
+        - USER32: Finished GetMenuStringW (MSPaint), not working right though
+                  it should return 'Recent File', but returns 'Decent File'
+                  Well, whatever.
+        - VERSION/KERNEL32/PE2LX: Version resource API implemention started
+        - PE2LX:  Increased some fixup limits to convert dynhgi35.dll
+        - KERNEL32: AsciiToUnicode fixed (only terminate with one 0; doing
+                    it twice corrupts the heap as our stuff allocates exactly
+                    enough for string + 0 terminator)
 
  98-07-14: Sander van Leeuwen
-        - KERNEL32: Changed OS2GetProcAddress to call the ordinal or name getApi
-                    method
+        - KERNEL32: Changed OS2GetProcAddress to call the ordinal or name getApi
+                    method
 
  98-07-13: Patrick Haller
-        - USER32:   Unicode fix for wvsprintfW "%s" -> "%ls"
-        - USER32:   fix in Win32WindowProc destructor when "window" becomes NULL
-        - ADVAPI32: RegConnectRegistry for connection to local machine
+        - USER32:   Unicode fix for wvsprintfW "%s" -> "%ls"
+        - USER32:   fix in Win32WindowProc destructor when "window" becomes NULL
+        - ADVAPI32: RegConnectRegistry for connection to local machine
 
  98-07-13: Patrick Haller
-        - KERNEL32: Unicode fix that garbled CommandLineToArgv and others
+        - KERNEL32: Unicode fix that garbled CommandLineToArgv and others
 
  98-07-12: Patrick Haller
-        - NTDLL:   new functions in NTDLL (-> critical sections)
-        - SHELL32: few new stubs in SHELL32
-        - GDI32:   fix in GDI32\DIBSECT\CreateDIBSection for M$ Backup
-        - USER32:  experimental fix (CS_SYNCPAINT) for WinHlp32 to
-                   display navigation buttons, but crashes SOL.EXE :(
+        - NTDLL:   new functions in NTDLL (-> critical sections)
+        - SHELL32: few new stubs in SHELL32
+        - GDI32:   fix in GDI32\DIBSECT\CreateDIBSection for M$ Backup
+        - USER32:  experimental fix (CS_SYNCPAINT) for WinHlp32 to
+                   display navigation buttons, but crashes SOL.EXE :(
 
  98-07-10: Patrick Haller
-        - stubs for NETAPI32 100%
+        - stubs for NETAPI32 100%
 
  98-07-09: Patrick Haller
-        - stubs for Winspool 100%
+        - stubs for Winspool 100%
 
  98-07-01 Joel Troster
-        - KERNEL32: update to nameid.cpp
+        - KERNEL32: update to nameid.cpp
 
  98-06-07 Joel Troster
-        - WINMM: WaveOpen bugfix
+        - WINMM: WaveOpen bugfix
 
  98-06-07 Felix Maschek
-        - CAPI32: bugfix
+        - CAPI32: bugfix
 
  98-06-15: Patrick Haller
-        - GDI32:    stubs for all missing functions
-        - ADVAPI32: stubs for all missing functions
-        - USER32:   implementation of some real functions
-                    some unknown functions stubbed (IDA/2)
+        - GDI32:    stubs for all missing functions
+        - ADVAPI32: stubs for all missing functions
+        - USER32:   implementation of some real functions
+                    some unknown functions stubbed (IDA/2)
 
  98-06-14: KSO
-        - GDI32:    Stubs for Office 97
-        - PE2LX:    Formatted output
-        - ADVPI32:  Stubs for Office 97
-        - VERSION:  Stubs for Office 97
+        - GDI32:    Stubs for Office 97
+        - PE2LX:    Formatted output
+        - ADVPI32:  Stubs for Office 97
+        - VERSION:  Stubs for Office 97
 
  98-06-12: Patrick Haller
-        - NTDLL:    ported over the NTDLL code from WINE, subject to the GNU Copyleft
-                    some applications open this module explicitly
-        - KERNEL32: few fixes to Unicode handling
-        - KERNEL32: console window sizing (still buggy) and property fixes
-        - KERNEL32: stubs for all missing functions
-        - GDI32:    bugfix for DIB allocation (MS Paint)
-        - WINMM:    functions for FOURCC handling
-        - PE2LX:    CURSOR.CPP: hotspot.y is upside down (fixed for Winhlp32)
-        - PE2LX:    DIALOG.CPP: combobox style translation CBS_ fixed
-        - PE2LX:    DIALOG.CPP: style translation for WINES_MULTILINE
-                                causes MLE control to be generated.
-                                Experimental.
-        - KERNEL32: WINDLL.CPP: fixed endless loop in Win32DLL::StripPath()
+        - NTDLL:    ported over the NTDLL code from WINE, subject to the GNU Copyleft
+                    some applications open this module explicitly
+        - KERNEL32: few fixes to Unicode handling
+        - KERNEL32: console window sizing (still buggy) and property fixes
+        - KERNEL32: stubs for all missing functions
+        - GDI32:    bugfix for DIB allocation (MS Paint)
+        - WINMM:    functions for FOURCC handling
+        - PE2LX:    CURSOR.CPP: hotspot.y is upside down (fixed for Winhlp32)
+        - PE2LX:    DIALOG.CPP: combobox style translation CBS_ fixed
+        - PE2LX:    DIALOG.CPP: style translation for WINES_MULTILINE
+                                causes MLE control to be generated.
+                                Experimental.
+        - KERNEL32: WINDLL.CPP: fixed endless loop in Win32DLL::StripPath()
 
  98-05-25: Patrick Haller
-        - KERNEL32: Added few NTDLL stubs, mainly for support of MSACM32/NT
-        - KERNEL32: Resource fix
+        - KERNEL32: Added few NTDLL stubs, mainly for support of MSACM32/NT
+        - KERNEL32: Resource fix
 
  98-05-03: Joel Troster
-        - WINMM:    Stubbed most of the remaining mmedia apis
+        - WINMM:    Stubbed most of the remaining mmedia apis
 
  98-04-28: Patrick Haller
-        - KERNEL32: Console fixes
-        - KERNEL32: Console properties (partially)
-        - KERNEL32: Handlemanager fixes
-        - KERNEL32: OS2iGetModuleName fixes
+        - KERNEL32: Console fixes
+        - KERNEL32: Console properties (partially)
+        - KERNEL32: Handlemanager fixes
+        - KERNEL32: OS2iGetModuleName fixes
 
 ********************************************************************************
@@ -801 +804 @@
 
  98-04-05: Patrick Haller
-        - KERNEL32: Resource bugfix
+        - KERNEL32: Resource bugfix
 
  98-03-30: Joel Troster
-        - WINMM: midiStream* stubs added
+        - WINMM: midiStream* stubs added
 
  98-03-30: Sander van Leeuwen
-        - PE2LX: Set console flag when exe has no resources
+        - PE2LX: Set console flag when exe has no resources
 
  98-03-27: Joel Troster
-        - WINMM: Midi changes/bugfixes, mci* api stubs added
-        - GDI32: SetObjectOwner stub added
+        - WINMM: Midi changes/bugfixes, mci* api stubs added
+        - GDI32: SetObjectOwner stub added
 
  25-03-98: Sander van Leeuwen
-        - KERNEL32: Several changes in resource code
+        - KERNEL32: Several changes in resource code
 
  19-03-98: Felix Maschek
-        - KERNEL32: Comm stubs added
+        - KERNEL32: Comm stubs added
 
  19-03-98: Sander van Leeuwen
-        - KERNEL32: Pop up a dialog box when a missing api is called
-        - KERNEL32: dll bugfix
-        - KERNEL32: CreateProcessA/W fix
-        - KERNEL32: GetProcAddr completed for PE loader & PE2LX
+        - KERNEL32: Pop up a dialog box when a missing api is called
+        - KERNEL32: dll bugfix
+        - KERNEL32: CreateProcessA/W fix
+        - KERNEL32: GetProcAddr completed for PE loader & PE2LX
 
  19-03-98: Peter Fitzsimmons
-        - created include\version.h
-        - changed pe2lx\lx.cpp    (call SetVersion())
-        - changed pe2lx\misc.cpp  (code for SetVersion(), setea())
-        - changed pe2lx\misc.h    (add prototypes)
-        - changed pe2lx\pe.cpp    (moved DosClose() up a few lines,  so DosSetPathInfo() could write to the file)
-        - changed pe2lx\makefile       \
-        - changed pe2lx\makefile.wat   / Build setver.exe, getver.exe.  I didn't copy
-                                         these exe's to ..\bin in purpose;  they
-                                         aren't supposed to go to end users.
-        - Added one line ("..\server $@") to all makfiles
-
-        - added getea() to kernel32\os2util.c
-        - added a few lines in kernel32/wprocess.cpp/RegisterDll()
-
-        - Edit all initterm.c's to remove that rand() crap (that is from a
-          sample project!).  Also added new version check to each.  Also #include "misc.h"
-
-        - wsock32: edited makefile to remove reference to ..\kernel32\misc.obj and
-                   replace with kernel32.dll.
-
-        - src\makefile:  build kernel32 before wsock
-        - src\kernel32\makefile:  remove reference to wsock32.lib
-        - src\kernel32\network.cpp:  remove call to wsock32
+        - created include\version.h
+        - changed pe2lx\lx.cpp    (call SetVersion())
+        - changed pe2lx\misc.cpp  (code for SetVersion(), setea())
+        - changed pe2lx\misc.h    (add prototypes)
+        - changed pe2lx\pe.cpp    (moved DosClose() up a few lines,  so DosSetPathInfo() could write to the file)
+        - changed pe2lx\makefile       \
+        - changed pe2lx\makefile.wat   / Build setver.exe, getver.exe.  I didn't copy
+                                         these exe's to ..\bin in purpose;  they
+                                         aren't supposed to go to end users.
+        - Added one line ("..\server $@") to all makfiles
+
+        - added getea() to kernel32\os2util.c
+        - added a few lines in kernel32/wprocess.cpp/RegisterDll()
+
+        - Edit all initterm.c's to remove that rand() crap (that is from a
+          sample project!).  Also added new version check to each.  Also #include "misc.h"
+
+        - wsock32: edited makefile to remove reference to ..\kernel32\misc.obj and
+                   replace with kernel32.dll.
+
+        - src\makefile:  build kernel32 before wsock
+        - src\kernel32\makefile:  remove reference to wsock32.lib
+        - src\kernel32\network.cpp:  remove call to wsock32
 
  16-03-98: Joel Troster
-        - GDI32: Added SetObjectOwner stub
+        - GDI32: Added SetObjectOwner stub
 
  15-03-98: Joel Troster
-        - WINMM: RTMIDI dependency removed
+        - WINMM: RTMIDI dependency removed
 
  15-03-98: Sander van Leeuwen
-        - All dlls, C++ init+termination call added to initterm.c
-        - KERNEL32: Icon conversion bugfix
-        - KERNEL32: Removed reroute of exe reading
-        - KERNEL32: Major rewrite of dll & exe handling including
-                    LoadLibary(Ex)A/W, CreateProcessA/W, GetModuleFileNameA/W,
-                    FreeLibrary & GetCommandLineA/W
-          Side effect: Crash at Quake 2 exit fixed
-
-        - KERNEL32: Additional code for PE loader
-        - PE: Created OS/2 ring 3 PE loader
-          syntax: pe win32exe commandline
-          Reads win32exe & all imported dlls, calls all dll entry points and
-          finally calls the exe entry point.
-          TODO: No fixups and low startup address
-          TODO: Resources
-          TODO: CreateProcess doesn't work right
+        - All dlls, C++ init+termination call added to initterm.c
+        - KERNEL32: Icon conversion bugfix
+        - KERNEL32: Removed reroute of exe reading
+        - KERNEL32: Major rewrite of dll & exe handling including
+                    LoadLibary(Ex)A/W, CreateProcessA/W, GetModuleFileNameA/W,
+                    FreeLibrary & GetCommandLineA/W
+          Side effect: Crash at Quake 2 exit fixed
+
+        - KERNEL32: Additional code for PE loader
+        - PE: Created OS/2 ring 3 PE loader
+          syntax: pe win32exe commandline
+          Reads win32exe & all imported dlls, calls all dll entry points and
+          finally calls the exe entry point.
+          TODO: No fixups and low startup address
+          TODO: Resources
+          TODO: CreateProcess doesn't work right
 
  13-03-98: Sander van Leeuwen
-        - KERNEL32: Dll unloading fixed
+        - KERNEL32: Dll unloading fixed
 
  13-03-98: Peter Fitzsimmons
-        - KERNEL32: Fixed CompareStringA/W
+        - KERNEL32: Fixed CompareStringA/W
 
  12-03-98: Joel Troster
-        - WINMM: Stubbed all the mixer APIs and updated support for MidiMapper
+        - WINMM: Stubbed all the mixer APIs and updated support for MidiMapper
 
  10-03-98: Sander van Leeuwen
-        - WSOCK32:  WSAStartup fix and ioctl addition
-                    (Quake 2 Multiplayer working)
-        - KERNEL32: Resource lookup bug fixed
+        - WSOCK32:  WSAStartup fix and ioctl addition
+                    (Quake 2 Multiplayer working)
+        - KERNEL32: Resource lookup bug fixed
 
  10-03-98: Joel Troster
-        - KERNEL32: SetThreadLocale added
+        - KERNEL32: SetThreadLocale added
 
  09-03-98: Patrick Haller
-        - KERNEL32: Fix in GetStdHandle within HandleManager
-
-        - KERNEL32: Console APIs completed, input and output is complete,
-                    however not thoroughly tested, SHORT 0.98D is working.
-                    Codepage support, Unicode support missing.
-                    I'm working on cosmetics and properties dialog.
-
-        - EXECHECK: tool to check executables for convertibility via pe2lx
-                    and keeping track of our APIs, as well as imported/exported
-                    functions of executables (PE import is currently implemented)
+        - KERNEL32: Fix in GetStdHandle within HandleManager
+
+        - KERNEL32: Console APIs completed, input and output is complete,
+                    however not thoroughly tested, SHORT 0.98D is working.
+                    Codepage support, Unicode support missing.
+                    I'm working on cosmetics and properties dialog.
+
+        - EXECHECK: tool to check executables for convertibility via pe2lx
+                    and keeping track of our APIs, as well as imported/exported
+                    functions of executables (PE import is currently implemented)
 
  09-03-98: Sander van Leeuwen
-        - KERNEL32: Put dll & exe apis in wprocess.cpp
-        - KERNEL32: Reroute file io from own exe to original
+        - KERNEL32: Put dll & exe apis in wprocess.cpp
+        - KERNEL32: Reroute file io from own exe to original
 
  08-03-98: Joel Troster
-        - KERNEL32: Unicode changes (lstrcatW, lstrcmpW, lstrcpyW lstrcpynW)
-        - WINMM: Unicode midi apis added to .def file
+        - KERNEL32: Unicode changes (lstrcatW, lstrcmpW, lstrcpyW lstrcpynW)
+        - WINMM: Unicode midi apis added to .def file
 
  08-03-98: Sander van Leeuwen
-        - WINMM: Aux* apis implemented (not tested and not 100% correct)
-        - include: added mmddk.h from win95 ddk
+        - WINMM: Aux* apis implemented (not tested and not 100% correct)
+        - include: added mmddk.h from win95 ddk
 
  07-03-98: Peter Fitzsimmons
-        - Added KERNEL32.GetSystemDefaultLangID() -- I copied GetUserDefaultLangID, which
-          always returns "US ENGLISH".
-          (NOTE: Already added)
-        - Added ADVAPI32.ReportEventA().  Stub.
-        - Added ADVAPI32.OS2SetSecurityDescriptorDacl(). Stub that returns ERROR.
-        - Added ADVAPI32.* a bunch more stubs.
+        - Added KERNEL32.GetSystemDefaultLangID() -- I copied GetUserDefaultLangID, which
+          always returns "US ENGLISH".
+          (NOTE: Already added)
+        - Added ADVAPI32.ReportEventA().  Stub.
+        - Added ADVAPI32.OS2SetSecurityDescriptorDacl(). Stub that returns ERROR.
+        - Added ADVAPI32.* a bunch more stubs.
 
  07-03-98: Sander van Leeuwen
-        - KERNEL32: Implemented Local* memory apis with new heap
-                    (in win32 you can mix Heap and Local apis)
-        - KERNEL32: Corrected key mapping bugs for arrow, insert/del/home/end
-                    page up/down keys.
-                    Doesn't work 100% right yet. (strafing in Quake = alt-arrow)
+        - KERNEL32: Implemented Local* memory apis with new heap
+                    (in win32 you can mix Heap and Local apis)
+        - KERNEL32: Corrected key mapping bugs for arrow, insert/del/home/end
+                    page up/down keys.
+                    Doesn't work 100% right yet. (strafing in Quake = alt-arrow)
 
  06-03-98: Sander van Leeuwen
-        - WINMM: Added WaveOutGetNumDevs and corrected the calling
-                 convention for several apis (WIN32API, not WINAPI)
-        - KERNEL32: Added GetSystemDefaultLangID and moved several
-                    language apis to lang.cpp
-        - KERNEL32: Added EnumSystemLocalesA/W (US English only)
-        - PE2LX: command line option change: pe2lx win32file > logfile
-                 Now makes a backup copy of the win32 file and creates
-                 an OS/2 version with the same name
+        - WINMM: Added WaveOutGetNumDevs and corrected the calling
+                 convention for several apis (WIN32API, not WINAPI)
+        - KERNEL32: Added GetSystemDefaultLangID and moved several
+                    language apis to lang.cpp
+        - KERNEL32: Added EnumSystemLocalesA/W (US English only)
+        - PE2LX: command line option change: pe2lx win32file > logfile
+                 Now makes a backup copy of the win32 file and creates
+                 an OS/2 version with the same name
 
  05-03-98: Joel Troster
-        - KERNEL32: Use OS/2 unicode apis
-        - USER32:   Use OS/2 unicode apis
+        - KERNEL32: Use OS/2 unicode apis
+        - USER32:   Use OS/2 unicode apis
 
  04-03-98: Sander van Leeuwen
-        - KERNEL32: Use OS2gethostname (wsock32.dll) instead of gethostname
+        - KERNEL32: Use OS2gethostname (wsock32.dll) instead of gethostname
 
  03-03-98: Knut Osmundsen
-        - KERNEL32: VirtualAlloc bugfixes & high memory support (SMP)
+        - KERNEL32: VirtualAlloc bugfixes & high memory support (SMP)
 
  03-03-98: Patrick Haller
-        - PECHECK: Initial code for pecheck.exe
+        - PECHECK: Initial code for pecheck.exe
 
  03-03-98: Joel Troster
-        - KERNEL32: Stubs added for Virtual(Un)Lock
-        - WINMM: Unicode midi apis added, MIDIMAP faked, some bugs fixed
+        - KERNEL32: Stubs added for Virtual(Un)Lock
+        - WINMM: Unicode midi apis added, MIDIMAP faked, some bugs fixed
 
  03-03-98: Sander van Leeuwen
-        - KERNEL32: Fixed logbuffer overflow with strlen WriteLogs
-        - KERNEL32: Use tcp32dll instead of pmwsock
-        - PE2LX: Fixed memory corruption in icon.cpp
+        - KERNEL32: Fixed logbuffer overflow with strlen WriteLogs
+        - KERNEL32: Use tcp32dll instead of pmwsock
+        - PE2LX: Fixed memory corruption in icon.cpp
 
  02-03-98: Sander van Leeuwen
-        - KERNEL32: kernel32.c -> kernel32.cpp
-        - KERNEL32: Merged exception logging with my latest code
-        - include:  win32type.h
-        - WSOCK32:  Removed pmwsock.lib from makefile
+        - KERNEL32: kernel32.c -> kernel32.cpp
+        - KERNEL32: Merged exception logging with my latest code
+        - include:  win32type.h
+        - WSOCK32:  Removed pmwsock.lib from makefile
 
  01-03-98: Patrick Haller
-        - KERNEL32: Extensions to the exception handler (logging)
-        - KERNEL32: HandleManager for pseudo-devices (CONIN$,CONOUT$,etc)
-        - KERNEL32: Hooks for HandleManager
-        - KERNEL32: Very early console support for stdout is there ...
-                    Console also has context menue.
+        - KERNEL32: Extensions to the exception handler (logging)
+        - KERNEL32: HandleManager for pseudo-devices (CONIN$,CONOUT$,etc)
+        - KERNEL32: Hooks for HandleManager
+        - KERNEL32: Very early console support for stdout is there ...
+                    Console also has context menue.
 ********************************************************************************
 ***** Release 0.01
 ********************************************************************************
  28-02-98: Sander van Leeuwen
-        - DDRAW: Initial work for Direct3D
-        - KERNEL32/PE2LX, Changes for console applications (flag)
-        - KERNEL32: Kill process when a fatal exception occurs
-          (prevents some kind of eternal loop in OS/2; probably due to
-           invalid exception records or difference in exception handler
-           calling convention)
-        - KERNEL32: Added a try/catch statement around the dll exit list
-                    processing in ExitProcess. Seems to cure the trap
-                    at exit.
+        - DDRAW: Initial work for Direct3D
+        - KERNEL32/PE2LX, Changes for console applications (flag)
+        - KERNEL32: Kill process when a fatal exception occurs
+          (prevents some kind of eternal loop in OS/2; probably due to
+           invalid exception records or difference in exception handler
+           calling convention)
+        - KERNEL32: Added a try/catch statement around the dll exit list
+                    processing in ExitProcess. Seems to cure the trap
+                    at exit.
 
  27-02-98: Patrick haller
-        - MPR: stubs for all documented MPR functions,
-               should be complete now
+        - MPR: stubs for all documented MPR functions,
+               should be complete now
 
  26-02-98: Patrick haller
-        - USER32: stubs for all documented USER32 functions,
-                  should be complete now
-        - USER32: Windows95's SHELL32.DLL requires a few undocumented functions
+        - USER32: stubs for all documented USER32 functions,
+                  should be complete now
+        - USER32: Windows95's SHELL32.DLL requires a few undocumented functions
 
  24-02-98: Joel Troster
-        - WINMM: Midi working
+        - WINMM: Midi working
 
  24-02-98: Sander van Leeuwen
-        - KERNEL32: Exit list changes; terminate all dlls right before
-                    ExitProcess or in kernel32 exitlist in case of a trap
-                    (prevents unkillable processes in most cases)
+        - KERNEL32: Exit list changes; terminate all dlls right before
+                    ExitProcess or in kernel32 exitlist in case of a trap
+                    (prevents unkillable processes in most cases)
 
  23-02-98: Joel Troster
-        - KERNEL32: PMPrintf version of WriteLog added
+        - KERNEL32: PMPrintf version of WriteLog added
 
  22-02-98: Sander van Leeuwen
-        - ALL DLLs: Call C/C++ lib cleanup proc in exit list
-        - PE2LX: Use exit lists in converted win32 dlls to terminate them
-        - WINMM: Remove test code in timer emulation (multiplied time by 10)
-        - KERNEL32: Release winmod objects properly
-        - KERNEL32: Call dll exit proc in FreeLibrary
+        - ALL DLLs: Call C/C++ lib cleanup proc in exit list
+        - PE2LX: Use exit lists in converted win32 dlls to terminate them
+        - WINMM: Remove test code in timer emulation (multiplied time by 10)
+        - KERNEL32: Release winmod objects properly
+        - KERNEL32: Call dll exit proc in FreeLibrary
 
  21-02-98: Sander van Leeuwen
-        - KERNEL32: VirtualProtect size change to include all pages
-                    referenced
+        - KERNEL32: VirtualProtect size change to include all pages
+                    referenced
 
  19-02-98: Sander van Leeuwen
-        - PE2LX: Change order of dlls in import module name table
-        - KERNEL32: Don't call the C/C++ lib cleanup procedure at
-                    dll termination
+        - PE2LX: Change order of dlls in import module name table
+        - KERNEL32: Don't call the C/C++ lib cleanup procedure at
+                    dll termination
 
  18-02-98: Joel Troster
-        - WINMM: Midi changes, wave in/out stubs added
+        - WINMM: Midi changes, wave in/out stubs added
 
  16-02-98: Sander van Leeuwen
-        - KERNEL32: Heap bugfix
+        - KERNEL32: Heap bugfix
 
  16-02-98: Joel Troster
-        - WINMM: Midi updates
+        - WINMM: Midi updates
 
  15-02-98: Sander van Leeuwen
-        - KERNEL32: Changed heap allocation again. (now uses malloc/free)
-        - KERNEL32: QueryPerformanceFrequency/Counter uses DosTmrQueryTime/
-                    DosTmrQueryFreq now, so the normal xf86sup.sys can
-                    be used.
+        - KERNEL32: Changed heap allocation again. (now uses malloc/free)
+        - KERNEL32: QueryPerformanceFrequency/Counter uses DosTmrQueryTime/
+                    DosTmrQueryFreq now, so the normal xf86sup.sys can
+                    be used.
 
  11-02-98: Sander van Leeuwen
-        - MPR: Changed/Corrected ordinals
+        - MPR: Changed/Corrected ordinals
 
 Mon  98-02-09 Peter Fitzsimmons
-        - lx.cpp -- put in check for MAX_SECTIONS (was bombing out in one
-          of "visio technical"'s dlls.
-        - lx.cpp increase MAX_SECTIONS (lx.h) from 16 to 32 (where'd the
-          original value come from?).
-        - kernel32.c: added stub for FlushInstructionCache()
-        - kernel32.c: added stub for OS2GetPrivateProfileSectionA()
-
-        - advapi32: GetUserNameA() stub.  Always says a person named
-          "USER" is logged on.
-
-        - MPR: WNetGetConnection(). NEEDS PROPER ORDINAL IN *.def file.
+        - lx.cpp -- put in check for MAX_SECTIONS (was bombing out in one
+          of "visio technical"'s dlls.
+        - lx.cpp increase MAX_SECTIONS (lx.h) from 16 to 32 (where'd the
+          original value come from?).
+        - kernel32.c: added stub for FlushInstructionCache()
+        - kernel32.c: added stub for OS2GetPrivateProfileSectionA()
+
+        - advapi32: GetUserNameA() stub.  Always says a person named
+          "USER" is logged on.
+
+        - MPR: WNetGetConnection(). NEEDS PROPER ORDINAL IN *.def file.
 
  9-02-1998: Joel Troster
-        - USER32: Added Set/GetDefaultMenuItem (stub)
+        - USER32: Added Set/GetDefaultMenuItem (stub)
 
  7-02-1998: Sander van Leeuwen
-        - KERNEL32/WINMM: Added VMutex to KERNEL32 (imported by WINMM)
-        - KERNEL32: New heap implementation (heap.cpp & os2heap.cpp)
-        - KERNEL32: Replace exception handler for each new thread
-        - KERNEL32: Set previous exception handler to 0 instead of -1
-          (fixes endless exception handler calls)
-        - Added macro dprintf & dassert to include\misc.h (no more need
-          for #ifdef DEBUG's)
+        - KERNEL32/WINMM: Added VMutex to KERNEL32 (imported by WINMM)
+        - KERNEL32: New heap implementation (heap.cpp & os2heap.cpp)
+        - KERNEL32: Replace exception handler for each new thread
+        - KERNEL32: Set previous exception handler to 0 instead of -1
+          (fixes endless exception handler calls)
+        - Added macro dprintf & dassert to include\misc.h (no more need
+          for #ifdef DEBUG's)
 
 31-01-1998: Sander van Leeuwen
-        - USER32: Fixed two bugs in CreateWindowExA/W
-        - WINMM:  Fixed wave playback problem
+        - USER32: Fixed two bugs in CreateWindowExA/W
+        - WINMM:  Fixed wave playback problem
 
 18-01-1998: Sander van Leeuwen
-        - GDI32: Changed GetDIBColor & SetDIBColor
-        - GDI32: Fixed CreateDIBSection
-        - Quake 2 working in a window!
+        - GDI32: Changed GetDIBColor & SetDIBColor
+        - GDI32: Fixed CreateDIBSection
+        - Quake 2 working in a window!
 
 17-01-1998: Sander van Leeuwen
-        - WINMM: Waveout working, Quake 2 WITH sound now!
-        - GDI32: Implemented GetDIBColor & SetDIBColor
+        - WINMM: Waveout working, Quake 2 WITH sound now!
+        - GDI32: Implemented GetDIBColor & SetDIBColor
 
 11-01-1998: Sander van Leeuwen
-        - KERNEL32: Exception handler fix
-        - WINMM: Started with WaveOut implementation
+        - KERNEL32: Exception handler fix
+        - WINMM: Started with WaveOut implementation
 
 11-01-1998: Felix Maschek
-        - TAPI32: Fixes
+        - TAPI32: Fixes
 
 10-01-1998: Sander van Leeuwen
-        - Changes to makefile and wsock32.c to make it compile with VAC
-        - VirtualAlloc bugfix (reserve)
-        - Dialog fix (font name)
-        - WINMM now uses mmsystem.h from win32 SDK
+        - Changes to makefile and wsock32.c to make it compile with VAC
+        - VirtualAlloc bugfix (reserve)
+        - Dialog fix (font name)
+        - WINMM now uses mmsystem.h from win32 SDK
 
 10-01-1998: Chris McKillop
-        - New build tree
+        - New build tree
 
 10-01-1998: Vince Vielhaber
-        - Winsock32 changes
+        - Winsock32 changes
 
 31-12-1997: Sander van Leeuwen
-        - Remove all 'OS2' strings from imports/exports (dlls/pe2lx)
+        - Remove all 'OS2' strings from imports/exports (dlls/pe2lx)
 
 28-12-1997: Sander van Leeuwen
-        - KERNEL32: Code to allow IO in ring 3 added (xf86sup.sys)
-                    Set environment variable WIN32_IOPL2 to enable this
-
-        - KERNEL32: Fixed GetStartupInfoA/W (WINE)
-        - GDI32:    Added CreateDIBSection from Wine (not complete)
-        - Lots of stubs added
-        - Almost got Quake II running....
+        - KERNEL32: Code to allow IO in ring 3 added (xf86sup.sys)
+                    Set environment variable WIN32_IOPL2 to enable this
+
+        - KERNEL32: Fixed GetStartupInfoA/W (WINE)
+        - GDI32:    Added CreateDIBSection from Wine (not complete)
+        - Lots of stubs added
+        - Almost got Quake II running....
 
 23-12-1997: Felix Maschek
-        - CAPI2032: Complete implementation of CAPI
+        - CAPI2032: Complete implementation of CAPI
 
 20-12-1997: Felix Maschek
-        - TAPI32:   Stub dll
+        - TAPI32:   Stub dll
 
 20-12-1997: Sander van Leeuwen
-        - KERNEL32: Bug in winmod.cpp
-        - KERNEL32: Added code for exception handling (not fool proof)
-        - KERNEL32: Fixed HeapCreate (now reserves 32 MB instead of 64 kb)
-        - KERNEL32: Catch FPU exception, mask fpu exceptions, fix stack and continue execution
-        - PE2LX:    Removed stack size & base switch
-        - WINMM:    Added joyGetPos stub
+        - KERNEL32: Bug in winmod.cpp
+        - KERNEL32: Added code for exception handling (not fool proof)
+        - KERNEL32: Fixed HeapCreate (now reserves 32 MB instead of 64 kb)
+        - KERNEL32: Catch FPU exception, mask fpu exceptions, fix stack and continue execution
+        - PE2LX:    Removed stack size & base switch
+        - WINMM:    Added joyGetPos stub
 
 14-12-1997: Sander van Leeuwen
-        - KERNEL32: Added QueryPerformanceFrequency, QueryPerformanceCounter
-        - USER32:   Added some stubs
-        - GDI32:    Added some stubs
-        - WINMM:    Added some stubs
-        - WNETAP32: New (NETAPI32)
-        - PE2LX:    Change module import name NETAPI32 to WNETAP32 (name conflict with OS/2 NETAPI32)
-        - PE2LX:    Cut long dll names to 8 chars
-        - MPR:      Added WNetGetUserA stub
+        - KERNEL32: Added QueryPerformanceFrequency, QueryPerformanceCounter
+        - USER32:   Added some stubs
+        - GDI32:    Added some stubs
+        - WINMM:    Added some stubs
+        - WNETAP32: New (NETAPI32)
+        - PE2LX:    Change module import name NETAPI32 to WNETAP32 (name conflict with OS/2 NETAPI32)
+        - PE2LX:    Cut long dll names to 8 chars
+        - MPR:      Added WNetGetUserA stub
 
 31-11-1997: Sander van Leeuwen
-        - KERNEL32: Fixed GetEnvironmentStringsW
-        - KERNEL32: Added DeviceIOControl (devio.c, map.c, iccio.asm; last two from XFree86 driver src)
-        - KERNEL32: Changed CreateFile to open an OS/2 driver if required
-        - Last two changes for win32 Glide dll.
-
-        - Fixed window creation (wndproc.cpp), Open32 isn't sending WM_NCCREATE msgs!
-        - Filter out CBS_OWNERDRAWFIXED & CBS_OWNERDRAWVARIABLE combobox styles
-          in CreateWindowExA/W (not finished)
-        - Added FormatMessageA/W from Wine (kernel32)
-        - USER32:
-        - Fixed GetSystemParameterInfoA/W, SPI_GETNONCLIENTMETRICS/SPI_SETNONCLIENTMETRICS
-          (ConvertFontAW/ConvertFontWA macros)
-        - Progress comclt32 class working
-        - ADVAPI32, fixed:
-                - RegEnumKeyW
-                - RegEnumKeyExW
-                - RegEnumValueW
-                - RegQueryInfoKeyW
-                - RegQueryValueW
-
-        - USER32:
-        - Fixed DrawEdge                (borrowed from Wine)
-        - Added ChangeMenuA/W           (borrowed from Wine)
-        - Fixed some color problems
-        - Trackbar win32 SDK example working (toolbar comctl32 class)
+        - KERNEL32: Fixed GetEnvironmentStringsW
+        - KERNEL32: Added DeviceIOControl (devio.c, map.c, iccio.asm; last two from XFree86 driver src)
+        - KERNEL32: Changed CreateFile to open an OS/2 driver if required
+        - Last two changes for win32 Glide dll.
+
+        - Fixed window creation (wndproc.cpp), Open32 isn't sending WM_NCCREATE msgs!
+        - Filter out CBS_OWNERDRAWFIXED & CBS_OWNERDRAWVARIABLE combobox styles
+          in CreateWindowExA/W (not finished)
+        - Added FormatMessageA/W from Wine (kernel32)
+        - USER32:
+        - Fixed GetSystemParameterInfoA/W, SPI_GETNONCLIENTMETRICS/SPI_SETNONCLIENTMETRICS
+          (ConvertFontAW/ConvertFontWA macros)
+        - Progress comclt32 class working
+        - ADVAPI32, fixed:
+                - RegEnumKeyW
+                - RegEnumKeyExW
+                - RegEnumValueW
+                - RegQueryInfoKeyW
+                - RegQueryValueW
+
+        - USER32:
+        - Fixed DrawEdge                (borrowed from Wine)
+        - Added ChangeMenuA/W           (borrowed from Wine)
+        - Fixed some color problems
+        - Trackbar win32 SDK example working (toolbar comctl32 class)

trunk/src/user32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.40 1999-08-31 17:14:51 sandervl Exp $
+# $Id: makefile,v 1.41 1999-09-04 17:56:40 dengert Exp $
 
 #
@@ -102 +102 @@
 pmwindow.obj:   pmwindow.cpp win32class.h win32wbase.h win32dlg.h pmwindow.h win32wndchild.h $(PDWIN32_INCLUDE)\wprocess.h oslibgdi.h oslibwin.h
 win32class.obj: win32class.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h
-win32wbase.obj:   win32wbase.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h
+win32wbase.obj:   win32wbase.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h open32wbase.h
 win32wnd.obj:   win32wnd.cpp win32class.h win32wbase.h win32wnd.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h oslibmenu.h
 win32dlg.obj:   win32dlg.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h

trunk/src/user32/new/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.26 1999-08-30 11:59:53 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.27 1999-09-04 17:56:40 dengert Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -131 +131 @@
     case WM_CLOSE:
         dprintf(("OS2: WM_CLOSE %x", hwnd));
+        win32wnd->RemoveFakeOpen32();
         if(win32wnd->MsgClose()) {
                 goto RunDefWndProc;

trunk/src/user32/new/user32.def

@@ -1 @@
-; $Id: user32.def,v 1.6 1999-08-28 19:32:46 sandervl Exp $
+; $Id: user32.def,v 1.7 1999-09-04 17:56:40 dengert Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -9 +9 @@
    _GLOBALDATA CLASS 'DATA'       SHARED LOADONCALL READWRITE
 
+IMPORTS
+    WinQueryDAXData            = PMMERGE.5447
+    WinSetDAXData              = PMMERGE.5448
+
 EXPORTS
     ActivateKeyboardLayout     = _ActivateKeyboardLayout@8    @1
-    AdjustWindowRect           = _AdjustWindowRect@12         @2
-    AdjustWindowRectEx         = _AdjustWindowRectEx@16       @3
-    AnyPopup                   = _AnyPopup@0                  @4
-    AppendMenuA                = _AppendMenuA@16              @5
-    AppendMenuW                = _AppendMenuW@16              @6
+    AdjustWindowRect           = _AdjustWindowRect@12         @2
+    AdjustWindowRectEx         = _AdjustWindowRectEx@16       @3
+    AnyPopup                   = _AnyPopup@0                  @4
+    AppendMenuA                = _AppendMenuA@16              @5
+    AppendMenuW                = _AppendMenuW@16              @6
     ArrangeIconicWindows       = _ArrangeIconicWindows@4      @7
-    AttachThreadInput          = _AttachThreadInput@12        @8
+    AttachThreadInput          = _AttachThreadInput@12        @8
     BeginDeferWindowPos        = _BeginDeferWindowPos@4       @9
-    BeginPaint                 = _BeginPaint@8                @10
-    BringWindowToTop           = _BringWindowToTop@4          @11
+    BeginPaint                 = _BeginPaint@8                @10
+    BringWindowToTop           = _BringWindowToTop@4          @11
     BroadcastSystemMessage     = _BroadcastSystemMessage@20   @12
-;    CalcChildScroll            = _CalcChildScroll@??         @13
-    CallMsgFilter              = _CallMsgFilterA@8           @14
-    CallMsgFilterA             = _CallMsgFilterA@8           @15
-    CallMsgFilterW             = _CallMsgFilterW@8           @16
-    CallNextHookEx             = _CallNextHookEx@16          @17
-    CallWindowProcA            = _CallWindowProcA@20         @18
-    CallWindowProcW            = _CallWindowProcW@20         @19
+;    CalcChildScroll            = _CalcChildScroll@??         @13
+    CallMsgFilter              = _CallMsgFilterA@8           @14
+    CallMsgFilterA             = _CallMsgFilterA@8           @15
+    CallMsgFilterW             = _CallMsgFilterW@8           @16
+    CallNextHookEx             = _CallNextHookEx@16          @17
+    CallWindowProcA            = _CallWindowProcA@20         @18
+    CallWindowProcW            = _CallWindowProcW@20         @19
     CascadeChildWindows        = _CascadeChildWindows@8      @20
-    CascadeWindows             = _CascadeWindows@20          @21
+    CascadeWindows             = _CascadeWindows@20          @21
     ChangeClipboardChain       = _ChangeClipboardChain@8     @22
     ChangeDisplaySettingsA     = _ChangeDisplaySettingsA@8   @23
     ChangeDisplaySettingsW     = _ChangeDisplaySettingsW@8   @24
-    ChangeMenuA                = _ChangeMenuA@20             @25
-    ChangeMenuW                = _ChangeMenuW@20             @26
-    CharLowerA                 = _CharLowerA@4               @27
-    CharLowerBuffA             = _CharLowerBuffA@8           @28
-    CharLowerBuffW             = _CharLowerBuffW@8           @29
-    CharLowerW                 = _CharLowerW@4               @30
-    CharNextA                  = _CharNextA@4                @31
-    CharNextExA                = _CharNextExA@12             @32
-    CharNextExW                = _CharNextExW@12             @33
-    CharNextW                  = _CharNextW@4                @34
-    CharPrevA                  = _CharPrevA@8                @35
-    CharPrevExA                = _CharPrevExA@16             @36
-    CharPrevExW                = _CharPrevExW@16             @37
-    CharPrevW                  = _CharPrevW@8                @38
-    CharToOemA                 = _CharToOemA@8               @39
-    CharToOemBuffA             = _CharToOemBuffA@12          @40
-    CharToOemBuffW             = _CharToOemBuffW@12          @41
-    CharToOemW                 = _CharToOemW@8              @42
-    CharUpperA                 = _CharUpperA@4              @43
-    CharUpperBuffA             = _CharUpperBuffA@8          @44
-    CharUpperBuffW             = _CharUpperBuffW@8          @45
-    CharUpperW                 = _CharUpperW@4              @46
-    CheckDlgButton             = _CheckDlgButton@12          @47
-    CheckMenuItem              = _CheckMenuItem@12           @48
-    CheckMenuRadioItem         = _CheckMenuRadioItem@20      @49
-    CheckRadioButton           = _CheckRadioButton@16        @50
+    ChangeMenuA                = _ChangeMenuA@20             @25
+    ChangeMenuW                = _ChangeMenuW@20             @26
+    CharLowerA                 = _CharLowerA@4               @27
+    CharLowerBuffA             = _CharLowerBuffA@8           @28
+    CharLowerBuffW             = _CharLowerBuffW@8           @29
+    CharLowerW                 = _CharLowerW@4               @30
+    CharNextA                  = _CharNextA@4                @31
+    CharNextExA                = _CharNextExA@12             @32
+    CharNextExW                = _CharNextExW@12             @33
+    CharNextW                  = _CharNextW@4                @34
+    CharPrevA                  = _CharPrevA@8                @35
+    CharPrevExA                = _CharPrevExA@16             @36
+    CharPrevExW                = _CharPrevExW@16             @37
+    CharPrevW                  = _CharPrevW@8                @38
+    CharToOemA                 = _CharToOemA@8               @39
+    CharToOemBuffA             = _CharToOemBuffA@12          @40
+    CharToOemBuffW             = _CharToOemBuffW@12          @41
+    CharToOemW                 = _CharToOemW@8              @42
+    CharUpperA                 = _CharUpperA@4              @43
+    CharUpperBuffA             = _CharUpperBuffA@8          @44
+    CharUpperBuffW             = _CharUpperBuffW@8          @45
+    CharUpperW                 = _CharUpperW@4              @46
+    CheckDlgButton             = _CheckDlgButton@12          @47
+    CheckMenuItem              = _CheckMenuItem@12           @48
+    CheckMenuRadioItem         = _CheckMenuRadioItem@20      @49
+    CheckRadioButton           = _CheckRadioButton@16        @50
     ChildWindowFromPoint       = _ChildWindowFromPoint@12    @51
     ChildWindowFromPointEx     = _ChildWindowFromPointEx@16  @52
-;    ClientThreadConnect        = _ClientThreadConnect@??     @53
-    ClientToScreen             = _ClientToScreen@8           @54
-    ClipCursor                 = _ClipCursor@4              @55
-    CloseClipboard             = _CloseClipboard@0           @56
-    CloseDesktop               = _CloseDesktop@4             @57
-    CloseWindow                = _CloseWindow@4              @58
-    CloseWindowStation         = _CloseWindowStation@4       @59
+;    ClientThreadConnect        = _ClientThreadConnect@??     @53
+    ClientToScreen             = _ClientToScreen@8           @54
+    ClipCursor                 = _ClipCursor@4              @55
+    CloseClipboard             = _CloseClipboard@0           @56
+    CloseDesktop               = _CloseDesktop@4             @57
+    CloseWindow                = _CloseWindow@4              @58
+    CloseWindowStation         = _CloseWindowStation@4       @59
     CopyAcceleratorTableA      = _CopyAcceleratorTableA@12   @60
     CopyAcceleratorTableW      = _CopyAcceleratorTableW@12   @61
-    CopyIcon                   = _CopyIcon@4                 @62
-    CopyImage                  = _CopyImage@20               @63
-    CopyRect                   = _CopyRect@8                 @64
+    CopyIcon                   = _CopyIcon@4                 @62
+    CopyImage                  = _CopyImage@20               @63
+    CopyRect                   = _CopyRect@8                 @64
     CountClipboardFormats      = _CountClipboardFormats@0    @65
     CreateAcceleratorTableA    = _CreateAcceleratorTableA@8  @66
     CreateAcceleratorTableW    = _CreateAcceleratorTableW@8  @67
-    CreateCaret                = _CreateCaret@16             @68
-    CreateCursor               = _CreateCursor@28            @69
-    CreateDesktopA             = _CreateDesktopA@24          @70
-    CreateDesktopW             = _CreateDesktopW@24          @71
-    CreateDialogIndirectParamA  = _CreateDialogIndirectParamA@20 @72
-    CreateDialogIndirectParamW  = _CreateDialogIndirectParamW@20 @73
-    CreateDialogParamA         = _CreateDialogParamA@20      @74
-    CreateDialogParamW         = _CreateDialogParamW@20      @75
-    CreateIcon                 = _CreateIcon@28              @76
+    CreateCaret                = _CreateCaret@16             @68
+    CreateCursor               = _CreateCursor@28            @69
+    CreateDesktopA             = _CreateDesktopA@24          @70
+    CreateDesktopW             = _CreateDesktopW@24          @71
+    CreateDialogIndirectParamA  = _CreateDialogIndirectParamA@20 @72
+    CreateDialogIndirectParamW  = _CreateDialogIndirectParamW@20 @73
+    CreateDialogParamA         = _CreateDialogParamA@20      @74
+    CreateDialogParamW         = _CreateDialogParamW@20      @75
+    CreateIcon                 = _CreateIcon@28              @76
     CreateIconFromResource     = _CreateIconFromResource@16  @77
     CreateIconFromResourceEx   = _CreateIconFromResourceEx@28 @78
-    CreateIconIndirect         = _CreateIconIndirect@4       @79
-    CreateMDIWindowA           = _CreateMDIWindowA@40        @80
-    CreateMDIWindowW           = _CreateMDIWindowW@40        @81
-    CreateMenu                 = _CreateMenu@0               @82
-    CreatePopupMenu            = _CreatePopupMenu@0          @83
-    CreateWindowExA            = _CreateWindowExA@48         @84
-    CreateWindowExW            = _CreateWindowExW@48         @85
+    CreateIconIndirect         = _CreateIconIndirect@4       @79
+    CreateMDIWindowA           = _CreateMDIWindowA@40        @80
+    CreateMDIWindowW           = _CreateMDIWindowW@40        @81
+    CreateMenu                 = _CreateMenu@0               @82
+    CreatePopupMenu            = _CreatePopupMenu@0          @83
+    CreateWindowExA            = _CreateWindowExA@48         @84
+    CreateWindowExW            = _CreateWindowExW@48         @85
     CreateWindowStationA       = _CreateWindowStationA@16    @86
     CreateWindowStationW       = _CreateWindowStationW@16    @87
     DdeAbandonTransaction      = _DdeAbandonTransaction@12   @88
-    DdeAccessData              = _DdeAccessData@8            @89
-    DdeAddData                 = _DdeAddData@16              @90
+    DdeAccessData              = _DdeAccessData@8            @89
+    DdeAddData                 = _DdeAddData@16              @90
     DdeClientTransaction       = _DdeClientTransaction@32    @91
     DdeCmpStringHandles        = _DdeCmpStringHandles@8      @92
-    DdeConnect                 = _DdeConnect@16              @93
-    DdeConnectList             = _DdeConnectList@20          @94
+    DdeConnect                 = _DdeConnect@16              @93
+    DdeConnectList             = _DdeConnectList@20          @94
     DdeCreateDataHandle        = _DdeCreateDataHandle@28     @95
     DdeCreateStringHandleA     = _DdeCreateStringHandleA@12  @96
     DdeCreateStringHandleW     = _DdeCreateStringHandleW@12  @97
-    DdeDisconnect              = _DdeDisconnect@4            @98
-    DdeDisconnectList          = _DdeDisconnectList@4        @99
-    DdeEnableCallback          = _DdeEnableCallback@12       @100
-    DdeFreeDataHandle          = _DdeFreeDataHandle@4        @101
+    DdeDisconnect              = _DdeDisconnect@4            @98
+    DdeDisconnectList          = _DdeDisconnectList@4        @99
+    DdeEnableCallback          = _DdeEnableCallback@12       @100
+    DdeFreeDataHandle          = _DdeFreeDataHandle@4        @101
     DdeFreeStringHandle        = _DdeFreeStringHandle@8      @102
-    DdeGetData                 = _DdeGetData@16              @103
-    DdeGetLastError            = _DdeGetLastError@4          @104
+    DdeGetData                 = _DdeGetData@16              @103
+    DdeGetLastError            = _DdeGetLastError@4          @104
     DdeImpersonateClient       = _DdeImpersonateClient@4     @105
-    DdeInitializeA             = _DdeInitializeA@16          @106
-    DdeInitializeW             = _DdeInitializeW@16          @107
+    DdeInitializeA             = _DdeInitializeA@16          @106
+    DdeInitializeW             = _DdeInitializeW@16          @107
     DdeKeepStringHandle        = _DdeKeepStringHandle@8      @108
-    DdeNameService             = _DdeNameService@16          @109
-    DdePostAdvise              = _DdePostAdvise@12           @110
-    DdeQueryConvInfo           = _DdeQueryConvInfo@12        @111
-    DdeQueryNextServer         = _DdeQueryNextServer@8       @112
-    DdeQueryStringA            = _DdeQueryStringA@20         @113
-    DdeQueryStringW            = _DdeQueryStringW@20         @114
-    DdeReconnect               = _DdeReconnect@4             @115
+    DdeNameService             = _DdeNameService@16          @109
+    DdePostAdvise              = _DdePostAdvise@12           @110
+    DdeQueryConvInfo           = _DdeQueryConvInfo@12        @111
+    DdeQueryNextServer         = _DdeQueryNextServer@8       @112
+    DdeQueryStringA            = _DdeQueryStringA@20         @113
+    DdeQueryStringW            = _DdeQueryStringW@20         @114
+    DdeReconnect               = _DdeReconnect@4             @115
     DdeSetQualityOfService     = _DdeSetQualityOfService@12  @116
-    DdeSetUserHandle           = _DdeSetUserHandle@12        @117
-    DdeUnaccessData            = _DdeUnaccessData@4          @118
-    DdeUninitialize            = _DdeUninitialize@4          @119
-    DefDlgProcA                = _DefDlgProcA@16             @120
-    DefDlgProcW                = _DefDlgProcW@16             @121
-    DefFrameProcA              = _DefFrameProcA@20           @122
-    DefFrameProcW              = _DefFrameProcW@20           @123
-    DefMDIChildProcA           = _DefMDIChildProcA@16        @124
-    DefMDIChildProcW           = _DefMDIChildProcW@16        @125
-    DefWindowProcA             = _DefWindowProcA@16          @126
-    DefWindowProcW             = _DefWindowProcW@16          @127
-    DeferWindowPos             = _DeferWindowPos@32          @128
-    DeleteMenu                 = _DeleteMenu@12              @129
+    DdeSetUserHandle           = _DdeSetUserHandle@12        @117
+    DdeUnaccessData            = _DdeUnaccessData@4          @118
+    DdeUninitialize            = _DdeUninitialize@4          @119
+    DefDlgProcA                = _DefDlgProcA@16             @120
+    DefDlgProcW                = _DefDlgProcW@16             @121
+    DefFrameProcA              = _DefFrameProcA@20           @122
+    DefFrameProcW              = _DefFrameProcW@20           @123
+    DefMDIChildProcA           = _DefMDIChildProcA@16        @124
+    DefMDIChildProcW           = _DefMDIChildProcW@16        @125
+    DefWindowProcA             = _DefWindowProcA@16          @126
+    DefWindowProcW             = _DefWindowProcW@16          @127
+    DeferWindowPos             = _DeferWindowPos@32          @128
+    DeleteMenu                 = _DeleteMenu@12              @129
     DestroyAcceleratorTable    = _DestroyAcceleratorTable@4  @130
-    DestroyCaret               = _DestroyCaret@0             @131
-    DestroyCursor              = _DestroyCursor@4            @132
-    DestroyIcon                = _DestroyIcon@4              @133
-    DestroyMenu                = _DestroyMenu@4              @134
-    DestroyWindow              = _DestroyWindow@4            @135
+    DestroyCaret               = _DestroyCaret@0             @131
+    DestroyCursor              = _DestroyCursor@4            @132
+    DestroyIcon                = _DestroyIcon@4              @133
+    DestroyMenu                = _DestroyMenu@4              @134
+    DestroyWindow              = _DestroyWindow@4            @135
     DialogBoxIndirectParamA    = _DialogBoxIndirectParamA@20 @136
     DialogBoxIndirectParamW    = _DialogBoxIndirectParamW@20 @137
-    DialogBoxParamA            = _DialogBoxParamA@20         @138
-    DialogBoxParamW            = _DialogBoxParamW@20         @139
-    DispatchMessageA           = _DispatchMessageA@4         @140
-    DispatchMessageW           = _DispatchMessageW@4         @141
-    DlgDirListA                = _DlgDirListA@20             @142
+    DialogBoxParamA            = _DialogBoxParamA@20         @138
+    DialogBoxParamW            = _DialogBoxParamW@20         @139
+    DispatchMessageA           = _DispatchMessageA@4         @140
+    DispatchMessageW           = _DispatchMessageW@4         @141
+    DlgDirListA                = _DlgDirListA@20             @142
     DlgDirListComboBoxA        = _DlgDirListComboBoxA@20     @143
     DlgDirListComboBoxW        = _DlgDirListComboBoxW@20     @144
-    DlgDirListW                = _DlgDirListW@20             @145
+    DlgDirListW                = _DlgDirListW@20             @145
     DlgDirSelectComboBoxExA    = _DlgDirSelectComboBoxExA@16 @146
     DlgDirSelectComboBoxExW    = _DlgDirSelectComboBoxExW@16 @147
-    DlgDirSelectExA            = _DlgDirSelectExA@16         @148
-    DlgDirSelectExW            = _DlgDirSelectExW@16         @149
-    DragDetect                 = _DragDetect@12              @150
-    DragObject                 = _DragObject@20              @151
-    DrawAnimatedRects          = _DrawAnimatedRects@16       @152
-    DrawCaption                = _DrawCaption@16             @153
-    DrawCaptionTempA           = _DrawCaptionTempA@28        @154
-    DrawCaptionTempW           = _DrawCaptionTempW@28        @155
-    DrawEdge                   = _DrawEdge@16                @156
-    DrawFocusRect              = _DrawFocusRect@8            @157
-;    DrawFrame                  = _DrawFrame@??               @158
-    DrawFrameControl           = _DrawFrameControl@16        @159
-    DrawIcon                   = _DrawIcon@16                @160
-    DrawIconEx                 = _DrawIconEx@36              @161
-    DrawMenuBar                = _DrawMenuBar@4              @162
-    DrawStateA                 = _DrawStateA@40              @163
-    DrawStateW                 = _DrawStateW@40              @164
-    DrawTextA                  = _DrawTextA@20               @165
-    DrawTextExA                = _DrawTextExA@24             @166
-    DrawTextExW                = _DrawTextExW@24             @167
-    DrawTextW                  = _DrawTextW@20               @168
-;    EditWndProc                = _EditWndProc@??             @169
-    EmptyClipboard             = _EmptyClipboard@0           @170
-    EnableMenuItem             = _EnableMenuItem@12          @171
-    EnableScrollBar            = _EnableScrollBar@12         @172
-    EnableWindow               = _EnableWindow@8             @173
-    EndDeferWindowPos          = _EndDeferWindowPos@4        @174
-    EndDialog                  = _EndDialog@8                @175
-    EndPaint                   = _EndPaint@8                 @176
-    EndTask                    = _EndTask@12                 @177
-    EnumChildWindows           = _EnumChildWindows@12        @178
+    DlgDirSelectExA            = _DlgDirSelectExA@16         @148
+    DlgDirSelectExW            = _DlgDirSelectExW@16         @149
+    DragDetect                 = _DragDetect@12              @150
+    DragObject                 = _DragObject@20              @151
+    DrawAnimatedRects          = _DrawAnimatedRects@16       @152
+    DrawCaption                = _DrawCaption@16             @153
+    DrawCaptionTempA           = _DrawCaptionTempA@28        @154
+    DrawCaptionTempW           = _DrawCaptionTempW@28        @155
+    DrawEdge                   = _DrawEdge@16                @156
+    DrawFocusRect              = _DrawFocusRect@8            @157
+;    DrawFrame                  = _DrawFrame@??               @158
+    DrawFrameControl           = _DrawFrameControl@16        @159
+    DrawIcon                   = _DrawIcon@16                @160
+    DrawIconEx                 = _DrawIconEx@36              @161
+    DrawMenuBar                = _DrawMenuBar@4              @162
+    DrawStateA                 = _DrawStateA@40              @163
+    DrawStateW                 = _DrawStateW@40              @164
+    DrawTextA                  = _DrawTextA@20               @165
+    DrawTextExA                = _DrawTextExA@24             @166
+    DrawTextExW                = _DrawTextExW@24             @167
+    DrawTextW                  = _DrawTextW@20               @168
+;    EditWndProc                = _EditWndProc@??             @169
+    EmptyClipboard             = _EmptyClipboard@0           @170
+    EnableMenuItem             = _EnableMenuItem@12          @171
+    EnableScrollBar            = _EnableScrollBar@12         @172
+    EnableWindow               = _EnableWindow@8             @173
+    EndDeferWindowPos          = _EndDeferWindowPos@4        @174
+    EndDialog                  = _EndDialog@8                @175
+    EndPaint                   = _EndPaint@8                 @176
+    EndTask                    = _EndTask@12                 @177
+    EnumChildWindows           = _EnumChildWindows@12        @178
     EnumClipboardFormats       = _EnumClipboardFormats@4     @179
-    EnumDesktopWindows         = _EnumDesktopWindows@12      @180
-    EnumDesktopsA              = _EnumDesktopsA@12           @181
-    EnumDesktopsW              = _EnumDesktopsW@12           @182
+    EnumDesktopWindows         = _EnumDesktopWindows@12      @180
+    EnumDesktopsA              = _EnumDesktopsA@12           @181
+    EnumDesktopsW              = _EnumDesktopsW@12           @182
     EnumDisplaySettingsA       = _EnumDisplaySettingsA@12    @183
     EnumDisplaySettingsW       = _EnumDisplaySettingsW@12    @184
-    EnumPropsA                 = _EnumPropsA@8               @185
-    EnumPropsExA               = _EnumPropsExA@12            @186
-    EnumPropsExW               = _EnumPropsExW@12            @187
-    EnumPropsW                 = _EnumPropsW@8               @188
-    EnumThreadWindows          = _EnumThreadWindows@12       @189
+    EnumPropsA                 = _EnumPropsA@8               @185
+    EnumPropsExA               = _EnumPropsExA@12            @186
+    EnumPropsExW               = _EnumPropsExW@12            @187
+    EnumPropsW                 = _EnumPropsW@8               @188
+    EnumThreadWindows          = _EnumThreadWindows@12       @189
     EnumWindowStationsA        = _EnumWindowStationsA@8      @190
     EnumWindowStationsW        = _EnumWindowStationsW@8      @191
-    EnumWindows                = _EnumWindows@8              @192
-    EqualRect                  = _EqualRect@8                @193
-    ExcludeUpdateRgn           = _ExcludeUpdateRgn@8         @194
-    ExitWindowsEx              = _ExitWindowsEx@8            @195
-    FillRect                   = _FillRect@12                @196
-    FindWindowA                = _FindWindowA@8              @197
-    FindWindowExA              = _FindWindowExA@16           @198
-    FindWindowExW              = _FindWindowExW@16           @199
-    FindWindowW                = _FindWindowW@8              @200
-    FlashWindow                = _FlashWindow@8              @201
-    FrameRect                  = _FrameRect@12               @202
-    FreeDDElParam              = _FreeDDElParam@8            @203
-    GetActiveWindow            = _GetActiveWindow@0          @204
-    GetAsyncKeyState           = _GetAsyncKeyState@4         @205
-    GetCapture                 = _GetCapture@0               @206
-    GetCaretBlinkTime          = _GetCaretBlinkTime@0        @207
-    GetCaretPos                = _GetCaretPos@4              @208
-    GetClassInfoA              = _GetClassInfoA@12           @209
-    GetClassInfoExA            = _GetClassInfoExA@12         @210
-    GetClassInfoExW            = _GetClassInfoExW@12         @211
-    GetClassInfoW              = _GetClassInfoW@12           @212
-    GetClassLongA              = _GetClassLongA@8            @213
-    GetClassLongW              = _GetClassLongW@8            @214
-    GetClassNameA              = _GetClassNameA@12           @215
-    GetClassNameW              = _GetClassNameW@12           @216
-    GetClassWord               = _GetClassWord@8             @217
-    GetClientRect              = _GetClientRect@8            @218
-    GetClipCursor              = _GetClipCursor@4            @219
-    GetClipboardData           = _GetClipboardData@4         @220
+    EnumWindows                = _EnumWindows@8              @192
+    EqualRect                  = _EqualRect@8                @193
+    ExcludeUpdateRgn           = _ExcludeUpdateRgn@8         @194
+    ExitWindowsEx              = _ExitWindowsEx@8            @195
+    FillRect                   = _FillRect@12                @196
+    FindWindowA                = _FindWindowA@8              @197
+    FindWindowExA              = _FindWindowExA@16           @198
+    FindWindowExW              = _FindWindowExW@16           @199
+    FindWindowW                = _FindWindowW@8              @200
+    FlashWindow                = _FlashWindow@8              @201
+    FrameRect                  = _FrameRect@12               @202
+    FreeDDElParam              = _FreeDDElParam@8            @203
+    GetActiveWindow            = _GetActiveWindow@0          @204
+    GetAsyncKeyState           = _GetAsyncKeyState@4         @205
+    GetCapture                 = _GetCapture@0               @206
+    GetCaretBlinkTime          = _GetCaretBlinkTime@0        @207
+    GetCaretPos                = _GetCaretPos@4              @208
+    GetClassInfoA              = _GetClassInfoA@12           @209
+    GetClassInfoExA            = _GetClassInfoExA@12         @210
+    GetClassInfoExW            = _GetClassInfoExW@12         @211
+    GetClassInfoW              = _GetClassInfoW@12           @212
+    GetClassLongA              = _GetClassLongA@8            @213
+    GetClassLongW              = _GetClassLongW@8            @214
+    GetClassNameA              = _GetClassNameA@12           @215
+    GetClassNameW              = _GetClassNameW@12           @216
+    GetClassWord               = _GetClassWord@8             @217
+    GetClientRect              = _GetClientRect@8            @218
+    GetClipCursor              = _GetClipCursor@4            @219
+    GetClipboardData           = _GetClipboardData@4         @220
     GetClipboardFormatNameA    = _GetClipboardFormatNameA@12 @221
     GetClipboardFormatNameW    = _GetClipboardFormatNameW@12 @222
-    GetClipboardOwner          = _GetClipboardOwner@0        @223
-    GetClipboardViewer         = _GetClipboardViewer@0       @224
-    GetCursor                  = _GetCursor@0               @225
-    GetCursorPos               = _GetCursorPos@4            @226
-    GetDC                      = _GetDC@4                    @227
-    GetDCEx                    = _GetDCEx@12                 @228
-    GetDesktopWindow           = _GetDesktopWindow@0         @229
-    GetDialogBaseUnits         = _GetDialogBaseUnits@0       @230
-    GetDlgCtrlID               = _GetDlgCtrlID@4             @231
-    GetDlgItem                 = _GetDlgItem@8               @232
-    GetDlgItemInt              = _GetDlgItemInt@16           @233
-    GetDlgItemTextA            = _GetDlgItemTextA@16         @234
-    GetDlgItemTextW            = _GetDlgItemTextW@16         @235
-    GetDoubleClickTime         = _GetDoubleClickTime@0       @236
-    GetFocus                   = _GetFocus@0                 @237
+    GetClipboardOwner          = _GetClipboardOwner@0        @223
+    GetClipboardViewer         = _GetClipboardViewer@0       @224
+    GetCursor                  = _GetCursor@0               @225
+    GetCursorPos               = _GetCursorPos@4            @226
+    GetDC                      = _GetDC@4                    @227
+    GetDCEx                    = _GetDCEx@12                 @228
+    GetDesktopWindow           = _GetDesktopWindow@0         @229
+    GetDialogBaseUnits         = _GetDialogBaseUnits@0       @230
+    GetDlgCtrlID               = _GetDlgCtrlID@4             @231
+    GetDlgItem                 = _GetDlgItem@8               @232
+    GetDlgItemInt              = _GetDlgItemInt@16           @233
+    GetDlgItemTextA            = _GetDlgItemTextA@16         @234
+    GetDlgItemTextW            = _GetDlgItemTextW@16         @235
+    GetDoubleClickTime         = _GetDoubleClickTime@0       @236
+    GetFocus                   = _GetFocus@0                 @237
     GetForegroundWindow        = _GetForegroundWindow@0      @238
-    GetIconInfo                = _GetIconInfo@8              @239
-;    GetInputDesktop            = _GetInputDesktop@??         @240
-    GetInputState              = _GetInputState@0            @241
+    GetIconInfo                = _GetIconInfo@8              @239
+;    GetInputDesktop            = _GetInputDesktop@??         @240
+    GetInputState              = _GetInputState@0            @241
     GetInternalWindowPos       = _GetInternalWindowPos@12    @242
-    GetKBCodePage              = _GetKBCodePage@0            @243
-    GetKeyNameTextA            = _GetKeyNameTextA@12         @244
-    GetKeyNameTextW            = _GetKeyNameTextW@12         @245
-    GetKeyState                = _GetKeyState@4             @246
-    GetKeyboardLayout          = _GetKeyboardLayout@4        @247
+    GetKBCodePage              = _GetKBCodePage@0            @243
+    GetKeyNameTextA            = _GetKeyNameTextA@12         @244
+    GetKeyNameTextW            = _GetKeyNameTextW@12         @245
+    GetKeyState                = _GetKeyState@4             @246
+    GetKeyboardLayout          = _GetKeyboardLayout@4        @247
     GetKeyboardLayoutList      = _GetKeyboardLayoutList@8    @248
     GetKeyboardLayoutNameA     = _GetKeyboardLayoutNameA@4   @249
     GetKeyboardLayoutNameW     = _GetKeyboardLayoutNameW@4   @250
-    GetKeyboardState           = _GetKeyboardState@4         @251
-    GetKeyboardType            = _GetKeyboardType@4           @252
-    GetLastActivePopup         = _GetLastActivePopup@4       @253
-    GetMenu                    = _GetMenu@4                  @254
-    GetMenuCheckMarkDimensions  = _GetMenuCheckMarkDimensions@0 @255
+    GetKeyboardState           = _GetKeyboardState@4         @251
+    GetKeyboardType            = _GetKeyboardType@4           @252
+    GetLastActivePopup         = _GetLastActivePopup@4       @253
+    GetMenu                    = _GetMenu@4                  @254
+    GetMenuCheckMarkDimensions  = _GetMenuCheckMarkDimensions@0 @255
     GetMenuContextHelpId       = _GetMenuContextHelpId@4     @256
-    GetMenuDefaultItem         = _GetMenuDefaultItem@12      @257
-    GetMenuItemCount           = _GetMenuItemCount@4         @258
-    GetMenuItemID              = _GetMenuItemID@8            @259
-    GetMenuItemInfoA           = _GetMenuItemInfoA@16        @260
-    GetMenuItemInfoW           = _GetMenuItemInfoW@16        @261
-    GetMenuItemRect            = _GetMenuItemRect@16         @262
-    GetMenuState               = _GetMenuState@12            @263
-    GetMenuStringA             = _GetMenuStringA@20          @264
-    GetMenuStringW             = _GetMenuStringW@20          @265
-    GetMessageA                = _GetMessageA@16             @266
+    GetMenuDefaultItem         = _GetMenuDefaultItem@12      @257
+    GetMenuItemCount           = _GetMenuItemCount@4         @258
+    GetMenuItemID              = _GetMenuItemID@8            @259
+    GetMenuItemInfoA           = _GetMenuItemInfoA@16        @260
+    GetMenuItemInfoW           = _GetMenuItemInfoW@16        @261
+    GetMenuItemRect            = _GetMenuItemRect@16         @262
+    GetMenuState               = _GetMenuState@12            @263
+    GetMenuStringA             = _GetMenuStringA@20          @264
+    GetMenuStringW             = _GetMenuStringW@20          @265
+    GetMessageA                = _GetMessageA@16             @266
     GetMessageExtraInfo        = _GetMessageExtraInfo@0      @267
-    GetMessagePos              = _GetMessagePos@0            @268
-    GetMessageTime             = _GetMessageTime@0           @269
-    GetMessageW                = _GetMessageW@16             @270
+    GetMessagePos              = _GetMessagePos@0            @268
+    GetMessageTime             = _GetMessageTime@0           @269
+    GetMessageW                = _GetMessageW@16             @270
     GetNextDlgGroupItem        = _GetNextDlgGroupItem@12     @271
-    GetNextDlgTabItem          = _GetNextDlgTabItem@12       @272
-    GetNextQueueWindow         = _GetNextQueueWindow@8       @273
+    GetNextDlgTabItem          = _GetNextDlgTabItem@12       @272
+    GetNextQueueWindow         = _GetNextQueueWindow@8       @273
     GetOpenClipboardWindow     = _GetOpenClipboardWindow@0   @274
-    GetParent                  = _GetParent@4                @275
-    GetPriorityClipboardFormat  = _GetPriorityClipboardFormat@8 @276
+    GetParent                  = _GetParent@4                @275
+    GetPriorityClipboardFormat  = _GetPriorityClipboardFormat@8 @276
     GetProcessWindowStation    = _GetProcessWindowStation@0  @277
-    GetProgmanWindow           = _GetProgmanWindow@0                 ;@289
-    GetPropA                   = _GetPropA@8                 @278
-    GetPropW                   = _GetPropW@8                 @279
-    GetQueueStatus             = _GetQueueStatus@4           @280
-    GetScrollInfo              = _GetScrollInfo@12           @281
-    GetScrollPos               = _GetScrollPos@8             @282
-    GetScrollRange             = _GetScrollRange@16          @283
-    GetShellWindow             = _GetShellWindow@0           @284
-    GetSubMenu                 = _GetSubMenu@8               @285
-    GetSysColor                = _GetSysColor@4              @286
-    GetSysColorBrush           = _GetSysColorBrush@4         @287
-    GetSystemMenu              = _GetSystemMenu@8            @288
-    GetSystemMetrics           = _GetSystemMetrics@4         @289
+    GetProgmanWindow           = _GetProgmanWindow@0                 ;@289
+    GetPropA                   = _GetPropA@8                 @278
+    GetPropW                   = _GetPropW@8                 @279
+    GetQueueStatus             = _GetQueueStatus@4           @280
+    GetScrollInfo              = _GetScrollInfo@12           @281
+    GetScrollPos               = _GetScrollPos@8             @282
+    GetScrollRange             = _GetScrollRange@16          @283
+    GetShellWindow             = _GetShellWindow@0           @284
+    GetSubMenu                 = _GetSubMenu@8               @285
+    GetSysColor                = _GetSysColor@4              @286
+    GetSysColorBrush           = _GetSysColorBrush@4         @287
+    GetSystemMenu              = _GetSystemMenu@8            @288
+    GetSystemMetrics           = _GetSystemMetrics@4         @289
     GetTabbedTextExtentA       = _GetTabbedTextExtentA@20    @290
     GetTabbedTextExtentW       = _GetTabbedTextExtentW@20    @291
-    GetTaskmanWindow           = _GetTaskmanWindow@0                  ;@304
-    GetThreadDesktop           = _GetThreadDesktop@4         @292
-    GetTopWindow               = _GetTopWindow@4             @293
-    GetUpdateRect              = _GetUpdateRect@12           @294
-    GetUpdateRgn               = _GetUpdateRgn@12            @295
+    GetTaskmanWindow           = _GetTaskmanWindow@0                  ;@304
+    GetThreadDesktop           = _GetThreadDesktop@4         @292
+    GetTopWindow               = _GetTopWindow@4             @293
+    GetUpdateRect              = _GetUpdateRect@12           @294
+    GetUpdateRgn               = _GetUpdateRgn@12            @295
     GetUserObjectInformationA  = _GetUserObjectInformationA@20 @296
     GetUserObjectInformationW  = _GetUserObjectInformationW@20 @297
     GetUserObjectSecurity      = _GetUserObjectSecurity@20   @298
-    GetWindow                  = _GetWindow@8                @299
+    GetWindow                  = _GetWindow@8                @299
     GetWindowContextHelpId     = _GetWindowContextHelpId@4   @300
-    GetWindowDC                = _GetWindowDC@4              @301
-    GetWindowLongA             = _GetWindowLongA@8           @302
-    GetWindowLongW             = _GetWindowLongW@8           @303
-    GetWindowPlacement         = _GetWindowPlacement@8       @304
-    GetWindowRect              = _GetWindowRect@8            @305
-    GetWindowRgn               = _GetWindowRgn@8             @306
-    GetWindowTextA             = _GetWindowTextA@12          @307
+    GetWindowDC                = _GetWindowDC@4              @301
+    GetWindowLongA             = _GetWindowLongA@8           @302
+    GetWindowLongW             = _GetWindowLongW@8           @303
+    GetWindowPlacement         = _GetWindowPlacement@8       @304
+    GetWindowRect              = _GetWindowRect@8            @305
+    GetWindowRgn               = _GetWindowRgn@8             @306
+    GetWindowTextA             = _GetWindowTextA@12          @307
     GetWindowTextLengthA       = _GetWindowTextLengthA@4     @308
     GetWindowTextLengthW       = _GetWindowTextLengthW@4     @309
-    GetWindowTextW             = _GetWindowTextW@12          @310
+    GetWindowTextW             = _GetWindowTextW@12          @310
     GetWindowThreadProcessId   = _GetWindowThreadProcessId@8 @311
-    GetWindowWord              = _GetWindowWord@8            @312
-    GrayStringA                = _GrayStringA@36             @313
-    GrayStringW                = _GrayStringW@36             @314
-    HideCaret                  = _HideCaret@4                @315
-    HiliteMenuItem             = _HiliteMenuItem@16          @316
-    ImpersonateDdeClientWindow  = _ImpersonateDdeClientWindow@8 @317
-    InSendMessage              = _InSendMessage@0            @318
-    InflateRect                = _InflateRect@12             @319
-;    InitSharedTable            = _InitSharedTable@??         @320
-;    InitTask                   = _InitTask@??                @321
-    InsertMenuA                = _InsertMenuA@20             @322
-    InsertMenuItemA            = _InsertMenuItemA@16         @323
-    InsertMenuItemW            = _InsertMenuItemW@16         @324
-    InsertMenuW                = _InsertMenuW@20             @325
+    GetWindowWord              = _GetWindowWord@8            @312
+    GrayStringA                = _GrayStringA@36             @313
+    GrayStringW                = _GrayStringW@36             @314
+    HideCaret                  = _HideCaret@4                @315
+    HiliteMenuItem             = _HiliteMenuItem@16          @316
+    ImpersonateDdeClientWindow  = _ImpersonateDdeClientWindow@8 @317
+    InSendMessage              = _InSendMessage@0            @318
+    InflateRect                = _InflateRect@12             @319
+;    InitSharedTable            = _InitSharedTable@??         @320
+;    InitTask                   = _InitTask@??                @321
+    InsertMenuA                = _InsertMenuA@20             @322
+    InsertMenuItemA            = _InsertMenuItemA@16         @323
+    InsertMenuItemW            = _InsertMenuItemW@16         @324
+    InsertMenuW                = _InsertMenuW@20             @325
     InternalGetWindowText      = _InternalGetWindowText@12   @326
-    IntersectRect              = _IntersectRect@12           @327
-    InvalidateRect             = _InvalidateRect@12          @328
-    InvalidateRgn              = _InvalidateRgn@12           @329
-    InvertRect                 = _InvertRect@8               @330
-    IsCharAlphaA               = _IsCharAlphaA@4             @331
+    IntersectRect              = _IntersectRect@12           @327
+    InvalidateRect             = _InvalidateRect@12          @328
+    InvalidateRgn              = _InvalidateRgn@12           @329
+    InvertRect                 = _InvertRect@8               @330
+    IsCharAlphaA               = _IsCharAlphaA@4             @331
     IsCharAlphaNumericA        = _IsCharAlphaNumericA@4      @332
     IsCharAlphaNumericW        = _IsCharAlphaNumericW@4      @333
-    IsCharAlphaW               = _IsCharAlphaW@4             @334
-    IsCharLowerA               = _IsCharLowerA@4             @335
-    IsCharLowerW               = _IsCharLowerW@4             @336
-    IsCharUpperA               = _IsCharUpperA@4             @337
-    IsCharUpperW               = _IsCharUpperW@4             @338
-    IsChild                    = _IsChild@8                  @339
-    IsClipboardFormatAvailable  = _IsClipboardFormatAvailable@4 @340
-    IsDialogMessage            = _IsDialogMessageA@8         @341
-    IsDialogMessageA           = _IsDialogMessageA@8         @342
-    IsDialogMessageW           = _IsDialogMessageW@8         @343
-    IsDlgButtonChecked         = _IsDlgButtonChecked@8       @344
-    IsHungThread               = _IsHungThread@4             @345
-    IsHungAppWindow            = _IsHungAppWindow@8
-    IsIconic                   = _IsIconic@4                 @346
-    IsMenu                     = _IsMenu@4                   @347
-    IsRectEmpty                = _IsRectEmpty@4              @348
-    IsWindow                   = _IsWindow@4                 @349
-    IsWindowEnabled            = _IsWindowEnabled@4          @350
-    IsWindowUnicode            = _IsWindowUnicode@4          @351
-    IsWindowVisible            = _IsWindowVisible@4          @352
-    IsZoomed                   = _IsZoomed@4                 @353
-    KillTimer                  = _KillTimer@8                @354
-    LoadAcceleratorsA          = _LoadAcceleratorsA@8        @355
-    LoadAcceleratorsW          = _LoadAcceleratorsW@8        @356
-    LoadBitmapA                = _LoadBitmapA@8              @357
-    LoadBitmapW                = _LoadBitmapW@8              @358
-    LoadCursorA                = _LoadCursorA@8              @359
+    IsCharAlphaW               = _IsCharAlphaW@4             @334
+    IsCharLowerA               = _IsCharLowerA@4             @335
+    IsCharLowerW               = _IsCharLowerW@4             @336
+    IsCharUpperA               = _IsCharUpperA@4             @337
+    IsCharUpperW               = _IsCharUpperW@4             @338
+    IsChild                    = _IsChild@8                  @339
+    IsClipboardFormatAvailable  = _IsClipboardFormatAvailable@4 @340
+    IsDialogMessage            = _IsDialogMessageA@8         @341
+    IsDialogMessageA           = _IsDialogMessageA@8         @342
+    IsDialogMessageW           = _IsDialogMessageW@8         @343
+    IsDlgButtonChecked         = _IsDlgButtonChecked@8       @344
+    IsHungThread               = _IsHungThread@4             @345
+    IsHungAppWindow            = _IsHungAppWindow@8
+    IsIconic                   = _IsIconic@4                 @346
+    IsMenu                     = _IsMenu@4                   @347
+    IsRectEmpty                = _IsRectEmpty@4              @348
+    IsWindow                   = _IsWindow@4                 @349
+    IsWindowEnabled            = _IsWindowEnabled@4          @350
+    IsWindowUnicode            = _IsWindowUnicode@4          @351
+    IsWindowVisible            = _IsWindowVisible@4          @352
+    IsZoomed                   = _IsZoomed@4                 @353
+    KillTimer                  = _KillTimer@8                @354
+    LoadAcceleratorsA          = _LoadAcceleratorsA@8        @355
+    LoadAcceleratorsW          = _LoadAcceleratorsW@8        @356
+    LoadBitmapA                = _LoadBitmapA@8              @357
+    LoadBitmapW                = _LoadBitmapW@8              @358
+    LoadCursorA                = _LoadCursorA@8              @359
     LoadCursorFromFileA        = _LoadCursorFromFileA@4      @360
     LoadCursorFromFileW        = _LoadCursorFromFileW@4      @361
-    LoadCursorW                = _LoadCursorW@8              @362
-    LoadIconA                  = _LoadIconA@8                @363
-    LoadIconW                  = _LoadIconW@8                @364
-    LoadImageA                 = _LoadImageA@24              @365
-    LoadImageW                 = _LoadImageW@24              @366
+    LoadCursorW                = _LoadCursorW@8              @362
+    LoadIconA                  = _LoadIconA@8                @363
+    LoadIconW                  = _LoadIconW@8                @364
+    LoadImageA                 = _LoadImageA@24              @365
+    LoadImageW                 = _LoadImageW@24              @366
     LoadKeyboardLayoutA        = _LoadKeyboardLayoutA@8      @367
     LoadKeyboardLayoutW        = _LoadKeyboardLayoutW@8      @368
-    LoadMenuA                  = _LoadMenuA@8                @369
-    LoadMenuIndirectA          = _LoadMenuIndirectA@4        @370
-    LoadMenuIndirectW          = _LoadMenuIndirectW@4        @371
-    LoadMenuW                  = _LoadMenuW@8                @372
-    LoadStringA                = _LoadStringA@16             @373
-    LoadStringW                = _LoadStringW@16             @374
-;    LockWindowStation          = _LockWindowStation@??       @375
-    LockWindowUpdate           = _LockWindowUpdate@4         @376
+    LoadMenuA                  = _LoadMenuA@8                @369
+    LoadMenuIndirectA          = _LoadMenuIndirectA@4        @370
+    LoadMenuIndirectW          = _LoadMenuIndirectW@4        @371
+    LoadMenuW                  = _LoadMenuW@8                @372
+    LoadStringA                = _LoadStringA@16             @373
+    LoadStringW                = _LoadStringW@16             @374
+;    LockWindowStation          = _LockWindowStation@??       @375
+    LockWindowUpdate           = _LockWindowUpdate@4         @376
     LookupIconIdFromDirectory  = _LookupIconIdFromDirectory@8 @377
     LookupIconIdFromDirectoryEx  = _LookupIconIdFromDirectoryEx@20 @378
-    MapDialogRect              = _MapDialogRect@8            @379
-    MapVirtualKeyA             = _MapVirtualKeyA@8           @380
-    MapVirtualKeyExA           = _MapVirtualKeyExA@12        @381
-    MapVirtualKeyExW           = _MapVirtualKeyExW@12        @382
-    MapVirtualKeyW             = _MapVirtualKeyW@8           @383
-    MapWindowPoints            = _MapWindowPoints@16         @384
-    MenuItemFromPoint          = _MenuItemFromPoint@16       @385
-    MessageBeep                = _MessageBeep@4              @386
-    MessageBoxA                = _MessageBoxA@16             @387
-    MessageBoxExA              = _MessageBoxExA@20           @388
-    MessageBoxExW              = _MessageBoxExW@20           @389
+    MapDialogRect              = _MapDialogRect@8            @379
+    MapVirtualKeyA             = _MapVirtualKeyA@8           @380
+    MapVirtualKeyExA           = _MapVirtualKeyExA@12        @381
+    MapVirtualKeyExW           = _MapVirtualKeyExW@12        @382
+    MapVirtualKeyW             = _MapVirtualKeyW@8           @383
+    MapWindowPoints            = _MapWindowPoints@16         @384
+    MenuItemFromPoint          = _MenuItemFromPoint@16       @385
+    MessageBeep                = _MessageBeep@4              @386
+    MessageBoxA                = _MessageBoxA@16             @387
+    MessageBoxExA              = _MessageBoxExA@20           @388
+    MessageBoxExW              = _MessageBoxExW@20           @389
     MessageBoxIndirectA        = _MessageBoxIndirectA@4     @390
     MessageBoxIndirectW        = _MessageBoxIndirectW@4     @391
-    MessageBoxW                = _MessageBoxW@16             @392
-;    ModifyAccess               = _ModifyAccess@??            @393
-    ModifyMenuA                = _ModifyMenuA@20             @394
-    ModifyMenuW                = _ModifyMenuW@20             @395
-    MoveWindow                 = _MoveWindow@24              @396
+    MessageBoxW                = _MessageBoxW@16             @392
+;    ModifyAccess               = _ModifyAccess@??            @393
+    ModifyMenuA                = _ModifyMenuA@20             @394
+    ModifyMenuW                = _ModifyMenuW@20             @395
+    MoveWindow                 = _MoveWindow@24              @396
     MsgWaitForMultipleObjects  = _MsgWaitForMultipleObjects@20 @397
-    OemKeyScan                 = _OemKeyScan@4               @398
-    OemToCharA                 = _OemToCharA@8               @399
-    OemToCharBuffA             = _OemToCharBuffA@12          @400
-    OemToCharBuffW             = _OemToCharBuffW@12          @401
-    OemToCharW                 = _OemToCharW@8               @402
-    OffsetRect                 = _OffsetRect@12              @403
-    OpenClipboard              = _OpenClipboard@4            @404
-    OpenDesktopA               = _OpenDesktopA@16            @405
-    OpenDesktopW               = _OpenDesktopW@16            @406
-    OpenIcon                   = _OpenIcon@4                 @407
-    OpenInputDesktop           = _OpenInputDesktop@12        @408
-    OpenWindowStationA         = _OpenWindowStationA@12      @409
-    OpenWindowStationW         = _OpenWindowStationW@12      @410
-    PackDDElParam              = _PackDDElParam@12           @411
-    PaintDesktop               = _PaintDesktop@4             @412
-    PeekMessageA               = _PeekMessageA@20            @413
-    PeekMessageW               = _PeekMessageW@20            @414
-    PlaySoundEvent             = _PlaySoundEvent@4           @415
-    PostMessageA               = _PostMessageA@16            @416
-    PostMessageW               = _PostMessageW@16            @417
-    PostQuitMessage            = _PostQuitMessage@4          @418
-    PostThreadMessageA         = _PostThreadMessageA@16      @419
-    PostThreadMessageW         = _PostThreadMessageW@16      @420
-    PtInRect                   = _PtInRect@12                @421
-    RedrawWindow               = _RedrawWindow@16            @422
-    RegisterClassA             = _RegisterClassA@4           @423
-    RegisterClassExA           = _RegisterClassExA@4         @424
-    RegisterClassExW           = _RegisterClassExW@4         @425
-    RegisterClassW             = _RegisterClassW@4           @426
+    OemKeyScan                 = _OemKeyScan@4               @398
+    OemToCharA                 = _OemToCharA@8               @399
+    OemToCharBuffA             = _OemToCharBuffA@12          @400
+    OemToCharBuffW             = _OemToCharBuffW@12          @401
+    OemToCharW                 = _OemToCharW@8               @402
+    OffsetRect                 = _OffsetRect@12              @403
+    OpenClipboard              = _OpenClipboard@4            @404
+    OpenDesktopA               = _OpenDesktopA@16            @405
+    OpenDesktopW               = _OpenDesktopW@16            @406
+    OpenIcon                   = _OpenIcon@4                 @407
+    OpenInputDesktop           = _OpenInputDesktop@12        @408
+    OpenWindowStationA         = _OpenWindowStationA@12      @409
+    OpenWindowStationW         = _OpenWindowStationW@12      @410
+    PackDDElParam              = _PackDDElParam@12           @411
+    PaintDesktop               = _PaintDesktop@4             @412
+    PeekMessageA               = _PeekMessageA@20            @413
+    PeekMessageW               = _PeekMessageW@20            @414
+    PlaySoundEvent             = _PlaySoundEvent@4           @415
+    PostMessageA               = _PostMessageA@16            @416
+    PostMessageW               = _PostMessageW@16            @417
+    PostQuitMessage            = _PostQuitMessage@4          @418
+    PostThreadMessageA         = _PostThreadMessageA@16      @419
+    PostThreadMessageW         = _PostThreadMessageW@16      @420
+    PtInRect                   = _PtInRect@12                @421
+    RedrawWindow               = _RedrawWindow@16            @422
+    RegisterClassA             = _RegisterClassA@4           @423
+    RegisterClassExA           = _RegisterClassExA@4         @424
+    RegisterClassExW           = _RegisterClassExW@4         @425
+    RegisterClassW             = _RegisterClassW@4           @426
     RegisterClipboardFormatA   = _RegisterClipboardFormatA@4 @427
     RegisterClipboardFormatW   = _RegisterClipboardFormatW@4 @428
-    RegisterHotKey             = _RegisterHotKey@16          @429
-;    RegisterLogonProcess       = _RegisterLogonProcess@??    @430
+    RegisterHotKey             = _RegisterHotKey@16          @429
+;    RegisterLogonProcess       = _RegisterLogonProcess@??    @430
     RegisterNetworkCapabilities  = _RegisterNetworkCapabilities@8 @431
     RegisterSystemThread       = _RegisterSystemThread@8     @432
-    RegisterTasklist           = _RegisterTasklist@4         @433
+    RegisterTasklist           = _RegisterTasklist@4         @433
     RegisterWindowMessageA     = _RegisterWindowMessageA@4   @434
     RegisterWindowMessageW     = _RegisterWindowMessageW@4   @435
-    ReleaseCapture             = _ReleaseCapture@0           @436
-    ReleaseDC                  = _ReleaseDC@8                @437
-    RemoveMenu                 = _RemoveMenu@12              @438
-    RemovePropA                = _RemovePropA@8              @439
-    RemovePropW                = _RemovePropW@8              @440
-    ReplyMessage               = _ReplyMessage@4             @441
-    ReuseDDElParam             = _ReuseDDElParam@20          @442
-    ScreenToClient             = _ScreenToClient@8           @443
-    ScrollDC                   = _ScrollDC@28                @444
-    ScrollWindow               = _ScrollWindow@20            @445
-    ScrollWindowEx             = _ScrollWindowEx@32          @446
+    ReleaseCapture             = _ReleaseCapture@0           @436
+    ReleaseDC                  = _ReleaseDC@8                @437
+    RemoveMenu                 = _RemoveMenu@12              @438
+    RemovePropA                = _RemovePropA@8              @439
+    RemovePropW                = _RemovePropW@8              @440
+    ReplyMessage               = _ReplyMessage@4             @441
+    ReuseDDElParam             = _ReuseDDElParam@20          @442
+    ScreenToClient             = _ScreenToClient@8           @443
+    ScrollDC                   = _ScrollDC@28                @444
+    ScrollWindow               = _ScrollWindow@20            @445
+    ScrollWindowEx             = _ScrollWindowEx@32          @446
     SendDlgItemMessageA        = _SendDlgItemMessageA@20     @447
     SendDlgItemMessageW        = _SendDlgItemMessageW@20     @448
-    SendMessageA               = _SendMessageA@16            @449
+    SendMessageA               = _SendMessageA@16            @449
     SendMessageCallbackA       = _SendMessageCallbackA@24    @450
     SendMessageCallbackW       = _SendMessageCallbackW@24    @451
     SendMessageTimeoutA        = _SendMessageTimeoutA@28     @452
     SendMessageTimeoutW        = _SendMessageTimeoutW@28     @453
-    SendMessageW               = _SendMessageW@16            @454
-    SendNotifyMessageA         = _SendNotifyMessageA@16      @455
-    SendNotifyMessageW         = _SendNotifyMessageW@16      @456
-    SetActiveWindow            = _SetActiveWindow@4          @457
-    SetCapture                 = _SetCapture@4               @458
-    SetCaretBlinkTime          = _SetCaretBlinkTime@4        @459
-    SetCaretPos                = _SetCaretPos@8              @460
-    SetClassLongA              = _SetClassLongA@12           @461
-    SetClassLongW              = _SetClassLongW@12           @462
-    SetClassWord               = _SetClassWord@12            @463
-    SetClipboardData           = _SetClipboardData@8         @464
-    SetClipboardViewer         = _SetClipboardViewer@4      @465
-    SetCursor                  = _SetCursor@4                @466
-    SetCursorPos               = _SetCursorPos@8             @467
-    SetDebugErrorLevel         = _SetDebugErrorLevel@4       @468
-;    SetDeskWallpaper           = _SetDeskWallpaper@??        @469
-;    SetDesktopBitmap           = _SetDesktopBitmap@??        @470
-    SetDlgItemInt              = _SetDlgItemInt@16           @471
-    SetDlgItemTextA            = _SetDlgItemTextA@12         @472
-    SetDlgItemTextW            = _SetDlgItemTextW@12         @473
-    SetDoubleClickTime         = _SetDoubleClickTime@4       @474
-    SetFocus                   = _SetFocus@4                 @475
+    SendMessageW               = _SendMessageW@16            @454
+    SendNotifyMessageA         = _SendNotifyMessageA@16      @455
+    SendNotifyMessageW         = _SendNotifyMessageW@16      @456
+    SetActiveWindow            = _SetActiveWindow@4          @457
+    SetCapture                 = _SetCapture@4               @458
+    SetCaretBlinkTime          = _SetCaretBlinkTime@4        @459
+    SetCaretPos                = _SetCaretPos@8              @460
+    SetClassLongA              = _SetClassLongA@12           @461
+    SetClassLongW              = _SetClassLongW@12           @462
+    SetClassWord               = _SetClassWord@12            @463
+    SetClipboardData           = _SetClipboardData@8         @464
+    SetClipboardViewer         = _SetClipboardViewer@4      @465
+    SetCursor                  = _SetCursor@4                @466
+    SetCursorPos               = _SetCursorPos@8             @467
+    SetDebugErrorLevel         = _SetDebugErrorLevel@4       @468
+;    SetDeskWallpaper           = _SetDeskWallpaper@??        @469
+;    SetDesktopBitmap           = _SetDesktopBitmap@??        @470
+    SetDlgItemInt              = _SetDlgItemInt@16           @471
+    SetDlgItemTextA            = _SetDlgItemTextA@12         @472
+    SetDlgItemTextW            = _SetDlgItemTextW@12         @473
+    SetDoubleClickTime         = _SetDoubleClickTime@4       @474
+    SetFocus                   = _SetFocus@4                 @475
     SetForegroundWindow        = _SetForegroundWindow@4      @476
     SetInternalWindowPos       = _SetInternalWindowPos@16    @477
-    SetKeyboardState           = _SetKeyboardState@4         @478
-    SetLastErrorEx             = _SetLastErrorEx@8           @479
-;    SetLogonNotifyWindow       = _SetLogonNotifyWindow@??    @480
-    SetMenu                    = _SetMenu@8                  @481
+    SetKeyboardState           = _SetKeyboardState@4         @478
+    SetLastErrorEx             = _SetLastErrorEx@8           @479
+;    SetLogonNotifyWindow       = _SetLogonNotifyWindow@??    @480
+    SetMenu                    = _SetMenu@8                  @481
     SetMenuContextHelpId       = _SetMenuContextHelpId@8     @482
-    SetMenuDefaultItem         = _SetMenuDefaultItem@12      @483
-    SetMenuItemBitmaps         = _SetMenuItemBitmaps@20      @484
-    SetMenuItemInfoA           = _SetMenuItemInfoA@16        @485
-    SetMenuItemInfoW           = _SetMenuItemInfoW@16        @486
+    SetMenuDefaultItem         = _SetMenuDefaultItem@12      @483
+    SetMenuItemBitmaps         = _SetMenuItemBitmaps@20      @484
+    SetMenuItemInfoA           = _SetMenuItemInfoA@16        @485
+    SetMenuItemInfoW           = _SetMenuItemInfoW@16        @486
     SetMessageExtraInfo        = _SetMessageExtraInfo@4      @487
-    SetMessageQueue            = _SetMessageQueue@4          @488
-    SetParent                  = _SetParent@8                @489
+    SetMessageQueue            = _SetMessageQueue@4          @488
+    SetParent                  = _SetParent@8                @489
     SetProcessWindowStation    = _SetProcessWindowStation@4  @490
-    SetProgmanWindow           = _SetProgmanWindow@4                 ;@522 ?
-    SetPropA                   = _SetPropA@12                @491
-    SetPropW                   = _SetPropW@12                @492
-    SetRect                    = _SetRect@20                 @493
-    SetRectEmpty               = _SetRectEmpty@4             @494
-    SetScrollInfo              = _SetScrollInfo@16           @495
-    SetScrollPos               = _SetScrollPos@16            @496
-    SetScrollRange             = _SetScrollRange@20          @497
-    SetShellWindow             = _SetShellWindow@4           @498
-    SetShellWindowEx           = _SetShellWindowEx@8                 ;@531 ?
-    SetSysColors               = _SetSysColors@12            @499
-    SetSysColorsTemp           = _SetSysColorsTemp@0         @500
-    SetSystemCursor            = _SetSystemCursor@8          @501
-    SetTaskmanWindow           = _SetTaskmanWindow@4                 ;@537
-    SetThreadDesktop           = _SetThreadDesktop@4         @502
-    SetTimer                   = _SetTimer@16                @503
+    SetProgmanWindow           = _SetProgmanWindow@4                 ;@522 ?
+    SetPropA                   = _SetPropA@12                @491
+    SetPropW                   = _SetPropW@12                @492
+    SetRect                    = _SetRect@20                 @493
+    SetRectEmpty               = _SetRectEmpty@4             @494
+    SetScrollInfo              = _SetScrollInfo@16           @495
+    SetScrollPos               = _SetScrollPos@16            @496
+    SetScrollRange             = _SetScrollRange@20          @497
+    SetShellWindow             = _SetShellWindow@4           @498
+    SetShellWindowEx           = _SetShellWindowEx@8                 ;@531 ?
+    SetSysColors               = _SetSysColors@12            @499
+    SetSysColorsTemp           = _SetSysColorsTemp@0         @500
+    SetSystemCursor            = _SetSystemCursor@8          @501
+    SetTaskmanWindow           = _SetTaskmanWindow@4                 ;@537
+    SetThreadDesktop           = _SetThreadDesktop@4         @502
+    SetTimer                   = _SetTimer@16                @503
     SetUserObjectInformationA  = _SetUserObjectInformationA@16 @504
     SetUserObjectInformationW  = _SetUserObjectInformationW@16 @505
     SetUserObjectSecurity      = _SetUserObjectSecurity@12   @506
     SetWindowContextHelpId     = _SetWindowContextHelpId@8   @507
-;    SetWindowFullScreenState   = _SetWindowFullScreenState@?? @508
-    SetWindowLongA             = _SetWindowLongA@12          @509
-    SetWindowLongW             = _SetWindowLongW@12          @510
-    SetWindowPlacement         = _SetWindowPlacement@8       @511
-    SetWindowPos               = _SetWindowPos@28            @512
-    SetWindowRgn               = _SetWindowRgn@12            @513
-    SetWindowTextA             = _SetWindowTextA@8           @514
-    SetWindowTextW             = _SetWindowTextW@8           @515
-    SetWindowWord              = _SetWindowWord@12           @516
-    SetWindowsHookA            = _SetWindowsHookA@8          @517
-    SetWindowsHookExA          = _SetWindowsHookExA@16       @518
-    SetWindowsHookExW          = _SetWindowsHookExW@16       @519
-    SetWindowsHookW            = _SetWindowsHookW@8          @520
-    ShowCaret                  = _ShowCaret@4                @521
-    ShowCursor                 = _ShowCursor@4               @522
-    ShowOwnedPopups            = _ShowOwnedPopups@8          @523
-    ShowScrollBar              = _ShowScrollBar@12           @524
-    ShowWindow                 = _ShowWindow@8               @525
-    ShowWindowAsync            = _ShowWindowAsync@8          @526
-    SubtractRect               = _SubtractRect@12            @527
-    SwapMouseButton            = _SwapMouseButton@4          @528
-    SwitchDesktop              = _SwitchDesktop@4            @529
-    SwitchToThisWindow         = _SwitchToThisWindow@8       @530
-    SysErrorBox                = _SysErrorBox@12             @531
+;    SetWindowFullScreenState   = _SetWindowFullScreenState@?? @508
+    SetWindowLongA             = _SetWindowLongA@12          @509
+    SetWindowLongW             = _SetWindowLongW@12          @510
+    SetWindowPlacement         = _SetWindowPlacement@8       @511
+    SetWindowPos               = _SetWindowPos@28            @512
+    SetWindowRgn               = _SetWindowRgn@12            @513
+    SetWindowTextA             = _SetWindowTextA@8           @514
+    SetWindowTextW             = _SetWindowTextW@8           @515
+    SetWindowWord              = _SetWindowWord@12           @516
+    SetWindowsHookA            = _SetWindowsHookA@8          @517
+    SetWindowsHookExA          = _SetWindowsHookExA@16       @518
+    SetWindowsHookExW          = _SetWindowsHookExW@16       @519
+    SetWindowsHookW            = _SetWindowsHookW@8          @520
+    ShowCaret                  = _ShowCaret@4                @521
+    ShowCursor                 = _ShowCursor@4               @522
+    ShowOwnedPopups            = _ShowOwnedPopups@8          @523
+    ShowScrollBar              = _ShowScrollBar@12           @524
+    ShowWindow                 = _ShowWindow@8               @525
+    ShowWindowAsync            = _ShowWindowAsync@8          @526
+    SubtractRect               = _SubtractRect@12            @527
+    SwapMouseButton            = _SwapMouseButton@4          @528
+    SwitchDesktop              = _SwitchDesktop@4            @529
+    SwitchToThisWindow         = _SwitchToThisWindow@8       @530
+    SysErrorBox                = _SysErrorBox@12             @531
     SystemParametersInfoA      = _SystemParametersInfoA@16   @532
     SystemParametersInfoW      = _SystemParametersInfoW@16   @533
-    TabbedTextOutA             = _TabbedTextOutA@32          @534
-    TabbedTextOutW             = _TabbedTextOutW@32          @535
-    TileChildWindows           = _TileChildWindows@8         @536
-    TileWindows                = _TileWindows@20             @537
-    ToAscii                    = _ToAscii@20                 @538
-    ToAsciiEx                  = _ToAsciiEx@24               @539
-    ToUnicode                  = _ToUnicode@24               @540
-    TrackPopupMenu             = _TrackPopupMenu@28          @541
-    TrackPopupMenuEx           = _TrackPopupMenuEx@24        @542
+    TabbedTextOutA             = _TabbedTextOutA@32          @534
+    TabbedTextOutW             = _TabbedTextOutW@32          @535
+    TileChildWindows           = _TileChildWindows@8         @536
+    TileWindows                = _TileWindows@20             @537
+    ToAscii                    = _ToAscii@20                 @538
+    ToAsciiEx                  = _ToAsciiEx@24               @539
+    ToUnicode                  = _ToUnicode@24               @540
+    TrackPopupMenu             = _TrackPopupMenu@28          @541
+    TrackPopupMenuEx           = _TrackPopupMenuEx@24        @542
     TranslateAccelerator       = _TranslateAcceleratorA@12   @543
     TranslateAcceleratorA      = _TranslateAcceleratorA@12   @544
     TranslateAcceleratorW      = _TranslateAcceleratorW@12   @545
     TranslateMDISysAccel       = _TranslateMDISysAccel@8     @546
-    TranslateMessage           = _TranslateMessage@4         @547
-    UnhookWindowsHook          = _UnhookWindowsHook@8        @548
+    TranslateMessage           = _TranslateMessage@4         @547
+    UnhookWindowsHook          = _UnhookWindowsHook@8        @548
     UnhookWindowsHookEx        = _UnhookWindowsHookEx@4      @549
-    UnionRect                  = _UnionRect@12               @550
+    UnionRect                  = _UnionRect@12               @550
     UnloadKeyboardLayout       = _UnloadKeyboardLayout@4     @551
-;    UnlockWindowStation        = _UnlockWindowStation@??     @552
-    UnpackDDElParam            = _UnpackDDElParam@16         @553
-    UnregisterClassA           = _UnregisterClassA@8         @554
-    UnregisterClassW           = _UnregisterClassW@8         @555
-    UnregisterHotKey           = _UnregisterHotKey@8         @556
-    UpdateWindow               = _UpdateWindow@4             @557
-;    UserClientDllInitialize    = _UserClientDllInitialize@?? @558
-    UserSignalProc             = _UserSignalProc@16          @559
-    ValidateRect               = _ValidateRect@8             @560
-    ValidateRgn                = _ValidateRgn@8              @561
-    VkKeyScanA                 = _VkKeyScanA@4              @562
-    VkKeyScanExA               = _VkKeyScanExA@8             @563
-    VkKeyScanExW               = _VkKeyScanExW@8             @564
-    VkKeyScanW                 = _VkKeyScanW@4               @565
-;    WNDPROC_CALLBACK           = _WNDPROC_CALLBACK@??        @566
-    WaitForInputIdle           = _WaitForInputIdle@8         @567
-    WaitMessage                = _WaitMessage@0              @568
-    WinHelpA                   = _WinHelpA@16                @569
-    WinHelpW                   = _WinHelpW@16                @570
+;    UnlockWindowStation        = _UnlockWindowStation@??     @552
+    UnpackDDElParam            = _UnpackDDElParam@16         @553
+    UnregisterClassA           = _UnregisterClassA@8         @554
+    UnregisterClassW           = _UnregisterClassW@8         @555
+    UnregisterHotKey           = _UnregisterHotKey@8         @556
+    UpdateWindow               = _UpdateWindow@4             @557
+;    UserClientDllInitialize    = _UserClientDllInitialize@?? @558
+    UserSignalProc             = _UserSignalProc@16          @559
+    ValidateRect               = _ValidateRect@8             @560
+    ValidateRgn                = _ValidateRgn@8              @561
+    VkKeyScanA                 = _VkKeyScanA@4              @562
+    VkKeyScanExA               = _VkKeyScanExA@8             @563
+    VkKeyScanExW               = _VkKeyScanExW@8             @564
+    VkKeyScanW                 = _VkKeyScanW@4               @565
+;    WNDPROC_CALLBACK           = _WNDPROC_CALLBACK@??        @566
+    WaitForInputIdle           = _WaitForInputIdle@8         @567
+    WaitMessage                = _WaitMessage@0              @568
+    WinHelpA                   = _WinHelpA@16                @569
+    WinHelpW                   = _WinHelpW@16                @570
     WinOldAppHackoMatic        = _WinOldAppHackoMatic@4      @571
-    WindowFromDC               = _WindowFromDC@4             @572
-    WindowFromPoint            = _WindowFromPoint@8          @573
-    YieldTask                  = _YieldTask@0                @574
-    keybd_event                = _keybd_event@16             @575
-    mouse_event                = _mouse_event@20             @576
-    wsprintfA                  = _wsprintfA                   @577
-    wsprintfW                  = _wsprintfW                   @578
-    wvsprintfA                 = _wvsprintfA@12              @579
-    wvsprintfW                 = _wvsprintfW@12              @580
-    GetMonitorInfoW               = _GetMonitorInfoW@8          @1000
-    GetMonitorInfoA               = _GetMonitorInfoA@8          @1001
-    MonitorFromWindow          = _MonitorFromWindow@8           @1002
-    MonitorFromRect            = _MonitorFromRect@8             @1003
-    MonitorFromPoint              = _MonitorFromPoint@12        @1004
-    EnumDisplayMonitors        = _EnumDisplayMonitors@16        @1005
+    WindowFromDC               = _WindowFromDC@4             @572
+    WindowFromPoint            = _WindowFromPoint@8          @573
+    YieldTask                  = _YieldTask@0                @574
+    keybd_event                = _keybd_event@16             @575
+    mouse_event                = _mouse_event@20             @576
+    wsprintfA                  = _wsprintfA                   @577
+    wsprintfW                  = _wsprintfW                   @578
+    wvsprintfA                 = _wvsprintfA@12              @579
+    wvsprintfW                 = _wvsprintfW@12              @580
+    GetMonitorInfoW               = _GetMonitorInfoW@8          @1000
+    GetMonitorInfoA               = _GetMonitorInfoA@8          @1001
+    MonitorFromWindow          = _MonitorFromWindow@8           @1002
+    MonitorFromRect            = _MonitorFromRect@8             @1003
+    MonitorFromPoint              = _MonitorFromPoint@12        @1004
+    EnumDisplayMonitors        = _EnumDisplayMonitors@16        @1005
 
-    CreateWindowProc                    @2000
+    CreateWindowProc                    @2000
     GetOS2Callback__15Win32WindowProcFv = GetOS2Callback__Fv @2001
 
 ; Wine helper function
-    GetSysColorPen              = _GetSysColorPen@4              @2002
+    GetSysColorPen              = _GetSysColorPen@4              @2002
 ; COMCTL32 helper functions
-    NativeDlgBoxIP             = _NativeDlgBoxIP@24          @2003
-    NativeCreateDlgIP          = _NativeCreateDlgIP@24       @2004
-    NativeLoadBitmap           = _NativeLoadBitmap@8         @2005
+    NativeDlgBoxIP             = _NativeDlgBoxIP@24          @2003
+    NativeCreateDlgIP          = _NativeCreateDlgIP@24       @2004
+    NativeLoadBitmap           = _NativeLoadBitmap@8         @2005

trunk/src/user32/new/win32class.h

@@ -1 @@
-/* $Id: win32class.h,v 1.6 1999-08-28 17:24:45 dengert Exp $ */
+/* $Id: win32class.h,v 1.7 1999-09-04 17:56:41 dengert Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -55 +55 @@
 
           BOOL  hasClassName(LPSTR classname, BOOL fUnicode = 0);
-          
+
  static  void   UnregisterClassA(HINSTANCE hinst, LPSTR id);
 
@@ -64 +64 @@
 
  //Standard class words/longs
+ ULONG          windowStyle;            //GCL_STYLE     * must be offset 14h *
  ULONG          nrExtraClassWords;      //GCL_CBCLSEXTRA
  ULONG          nrExtraWindowWords;     //GCL_CBWNDEXTRA
@@ -72 +73 @@
  PCHAR          menuNameA;              //GCL_MENUNAME
  WCHAR         *menuNameW;              //GCL_MENUNAME
- ULONG          windowStyle;            //GCL_STYLE
  WNDPROC        windowProc;             //GCL_WNDPROC
  ULONG          classAtom;              //GCW_ATOM

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.5 1999-09-01 19:12:22 phaller Exp $ */
+/* $Id: win32wbase.cpp,v 1.6 1999-09-04 17:56:41 dengert Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -62 +62 @@
 //******************************************************************************
 Win32BaseWindow::Win32BaseWindow(CREATESTRUCTA *lpCreateStructA, ATOM classAtom, BOOL isUnicode)
-                        : GenericObject(&windows, OBJTYPE_WINDOW), ChildWindow()
+                        : GenericObject(&windows, OBJTYPE_WINDOW), ChildWindow()
 {
   Init();
@@ -72 +72 @@
 void Win32BaseWindow::Init()
 {
-  isUnicode        = FALSE;
-  fCreated         = FALSE;
-  fFirstShow       = TRUE;
-
-  windowNameA      = NULL;
-  windowNameW      = NULL;
+  isUnicode        = FALSE;
+  fCreated         = FALSE;
+  fFirstShow       = TRUE;
+
+  windowNameA      = NULL;
+  windowNameW      = NULL;
   wndNameLength    = 0;
 
@@ -83 +83 @@
   nrUserWindowLong = 0;
 
-  magic            = WIN32PM_MAGIC;
-  OS2Hwnd          = 0;
-  OS2HwndFrame     = 0;
-  OS2HwndMenu      = 0;
-  Win32Hwnd        = 0;
+  magic            = WIN32PM_MAGIC;
+  OS2Hwnd          = 0;
+  OS2HwndFrame     = 0;
+  OS2HwndMenu      = 0;
+  Win32Hwnd        = 0;
 
   if(HwAllocateWindowHandle(&Win32Hwnd, (ULONG)this) == FALSE)
   {
-        dprintf(("Win32BaseWindow::Init HwAllocateWindowHandle failed!!"));
-        DebugInt3();
-  }
-
-  posx = posy      = 0;
+        dprintf(("Win32BaseWindow::Init HwAllocateWindowHandle failed!!"));
+        DebugInt3();
+  }
+
+  posx = posy      = 0;
   width = height   = 0;
 
-  dwExStyle        = 0;
-  dwStyle          = 0;
-  win32wndproc     = 0;
-  hInstance        = 0;
-  windowId         = 0xFFFFFFFF;        //default = -1
-  userData         = 0;
+  dwExStyle        = 0;
+  dwStyle          = 0;
+  win32wndproc     = 0;
+  hInstance        = 0;
+  windowId         = 0xFFFFFFFF;        //default = -1
+  userData         = 0;
 
   hwndLinkAfter    = HWND_BOTTOM;
-  flags            = 0;
-  isIcon           = FALSE;
+  flags            = 0;
+  isIcon           = FALSE;
   lastHitTestVal   = 0;
-  owner            = NULL;
-  windowClass      = 0;
+  owner            = NULL;
+  windowClass      = 0;
 
   acceltableResource = NULL;
-  menuResource       = NULL;
-  iconResource       = NULL;
+  menuResource       = NULL;
+  iconResource       = NULL;
 }
 //******************************************************************************
@@ -125 +125 @@
 
   if(Win32Hwnd)
-        HwFreeWindowHandle(Win32Hwnd);
+        HwFreeWindowHandle(Win32Hwnd);
 
   if(userWindowLong)
-        free(userWindowLong);
+        free(userWindowLong);
   if(windowNameA) {
-        free(windowNameA);
-        windowNameA = NULL;
+        free(windowNameA);
+        windowNameA = NULL;
   }
   if(windowNameW) {
-        free(windowNameW);
-        windowNameW = NULL;
+        free(windowNameW);
+        windowNameW = NULL;
   }
 }
@@ -157 +157 @@
     if (cs->hwndParent)
     {
-            Win32BaseWindow *window = GetWindowFromHandle(cs->hwndParent);
-            if(!window) {
-                    dprintf(("Bad parent %04x\n", cs->hwndParent ));
-                    SetLastError(ERROR_INVALID_PARAMETER);
-                    return FALSE;
-            }
-            /* Make sure parent is valid */
-            if (!window->IsWindow() )
-            {
-                    dprintf(("Bad parent %04x\n", cs->hwndParent ));
-                    SetLastError(ERROR_INVALID_PARAMETER);
-                    return FALSE;
-            }
+            Win32BaseWindow *window = GetWindowFromHandle(cs->hwndParent);
+            if(!window) {
+                    dprintf(("Bad parent %04x\n", cs->hwndParent ));
+                    SetLastError(ERROR_INVALID_PARAMETER);
+                    return FALSE;
+            }
+            /* Make sure parent is valid */
+            if (!window->IsWindow() )
+            {
+                    dprintf(("Bad parent %04x\n", cs->hwndParent ));
+                    SetLastError(ERROR_INVALID_PARAMETER);
+                    return FALSE;
+            }
     }
     else
     if ((cs->style & WS_CHILD) && !(cs->style & WS_POPUP)) {
-            dprintf(("No parent for child window\n" ));
-            SetLastError(ERROR_INVALID_PARAMETER);
-            return FALSE;  /* WS_CHILD needs a parent, but WS_POPUP doesn't */
+            dprintf(("No parent for child window\n" ));
+            SetLastError(ERROR_INVALID_PARAMETER);
+            return FALSE;  /* WS_CHILD needs a parent, but WS_POPUP doesn't */
     }
 
@@ -182 +182 @@
   if (!windowClass)
   {
-        GlobalGetAtomNameA( classAtom, buffer, sizeof(buffer) );
-        dprintf(("Bad class '%s'\n", buffer ));
-        return 0;
+        GlobalGetAtomNameA( classAtom, buffer, sizeof(buffer) );
+        dprintf(("Bad class '%s'\n", buffer ));
+        return 0;
   }
 
@@ -192 +192 @@
    */
   if (!HIWORD(cs->lpszClass) ) {
-        if (isUnicode) {
-                GlobalGetAtomNameW( classAtom, (LPWSTR)buffer, sizeof(buffer) );
-        }
-        else {
-                GlobalGetAtomNameA( classAtom, buffer, sizeof(buffer) );
-        }
-        cs->lpszClass = buffer;
+        if (isUnicode) {
+                GlobalGetAtomNameW( classAtom, (LPWSTR)buffer, sizeof(buffer) );
+        }
+        else {
+                GlobalGetAtomNameA( classAtom, buffer, sizeof(buffer) );
+        }
+        cs->lpszClass = buffer;
   }
 
@@ -204 +204 @@
   if (cs->x == CW_USEDEFAULT || cs->x == CW_USEDEFAULT16)
   {
-//        PDB *pdb = PROCESS_Current();
+//        PDB *pdb = PROCESS_Current();
 
        /* Never believe Microsoft's documentation... CreateWindowEx doc says
-        * that if an overlapped window is created with WS_VISIBLE style bit
-        * set and the x parameter is set to CW_USEDEFAULT, the system ignores
-        * the y parameter. However, disassembling NT implementation (WIN32K.SYS)
-        * reveals that
-        *
-        * 1) not only if checks for CW_USEDEFAULT but also for CW_USEDEFAULT16
-        * 2) it does not ignore the y parameter as the docs claim; instead, it
-        *    uses it as second parameter to ShowWindow() unless y is either
-        *    CW_USEDEFAULT or CW_USEDEFAULT16.
-        *
-        * The fact that we didn't do 2) caused bogus windows pop up when wine
-        * was running apps that were using this obscure feature. Example -
-        * calc.exe that comes with Win98 (only Win98, it's different from
-        * the one that comes with Win95 and NT)
-        */
-        if (cs->y != CW_USEDEFAULT && cs->y != CW_USEDEFAULT16) sw = cs->y;
-
-        /* We have saved cs->y, now we can trash it */
+        * that if an overlapped window is created with WS_VISIBLE style bit
+        * set and the x parameter is set to CW_USEDEFAULT, the system ignores
+        * the y parameter. However, disassembling NT implementation (WIN32K.SYS)
+        * reveals that
+        *
+        * 1) not only if checks for CW_USEDEFAULT but also for CW_USEDEFAULT16
+        * 2) it does not ignore the y parameter as the docs claim; instead, it
+        *    uses it as second parameter to ShowWindow() unless y is either
+        *    CW_USEDEFAULT or CW_USEDEFAULT16.
+        *
+        * The fact that we didn't do 2) caused bogus windows pop up when wine
+        * was running apps that were using this obscure feature. Example -
+        * calc.exe that comes with Win98 (only Win98, it's different from
+        * the one that comes with Win95 and NT)
+        */
+        if (cs->y != CW_USEDEFAULT && cs->y != CW_USEDEFAULT16) sw = cs->y;
+
+        /* We have saved cs->y, now we can trash it */
 #if 0
-        if (   !(cs->style & (WS_CHILD | WS_POPUP))
-            &&  (pdb->env_db->startup_info->dwFlags & STARTF_USEPOSITION) )
-        {
-            cs->x = pdb->env_db->startup_info->dwX;
-            cs->y = pdb->env_db->startup_info->dwY;
-        }
+        if (   !(cs->style & (WS_CHILD | WS_POPUP))
+            &&  (pdb->env_db->startup_info->dwFlags & STARTF_USEPOSITION) )
+        {
+            cs->x = pdb->env_db->startup_info->dwX;
+            cs->y = pdb->env_db->startup_info->dwY;
+        }
 #endif
-            cs->x = 0;
-            cs->y = 0;
-//        }
+            cs->x = 0;
+            cs->y = 0;
+//        }
   }
   if (cs->cx == CW_USEDEFAULT || cs->cx == CW_USEDEFAULT16)
   {
 #if 0
-        PDB *pdb = PROCESS_Current();
-        if (   !(cs->style & (WS_CHILD | WS_POPUP))
-            &&  (pdb->env_db->startup_info->dwFlags & STARTF_USESIZE) )
-        {
-            cs->cx = pdb->env_db->startup_info->dwXSize;
-            cs->cy = pdb->env_db->startup_info->dwYSize;
-        }
-        else
-        {
+        PDB *pdb = PROCESS_Current();
+        if (   !(cs->style & (WS_CHILD | WS_POPUP))
+            &&  (pdb->env_db->startup_info->dwFlags & STARTF_USESIZE) )
+        {
+            cs->cx = pdb->env_db->startup_info->dwXSize;
+            cs->cy = pdb->env_db->startup_info->dwYSize;
+        }
+        else
+        {
 #endif
-            cs->cx = 600; /* FIXME */
-            cs->cy = 400;
-//        }
+            cs->cx = 600; /* FIXME */
+            cs->cy = 400;
+//        }
   }
 
@@ -261 +261 @@
   nrUserWindowLong = windowClass->getExtraWndWords();
   if(nrUserWindowLong) {
-        userWindowLong = (ULONG *)_smalloc(nrUserWindowLong);
-        memset(userWindowLong, 0, nrUserWindowLong);
+        userWindowLong = (ULONG *)_smalloc(nrUserWindowLong);
+        memset(userWindowLong, 0, nrUserWindowLong);
   }
 
   if ((cs->style & WS_CHILD) && cs->hwndParent)
   {
-        SetParent(cs->hwndParent);
-        owner = GetWindowFromHandle(cs->hwndParent);
-        if(owner == NULL)
-        {
-            dprintf(("HwGetWindowHandleData couldn't find owner window %x!!!", cs->hwndParent));
-            return FALSE;
-        }
+        SetParent(cs->hwndParent);
+        owner = GetWindowFromHandle(cs->hwndParent);
+        if(owner == NULL)
+        {
+            dprintf(("HwGetWindowHandleData couldn't find owner window %x!!!", cs->hwndParent));
+            return FALSE;
+        }
   }
   else
   {
-        if (!cs->hwndParent) {
-            owner = NULL;
-        }
-        else
-        {
-            owner = GetWindowFromHandle(cs->hwndParent);
-            if(owner == NULL)
-            {
-                dprintf(("HwGetWindowHandleData couldn't find owner window %x!!!", cs->hwndParent));
-                return FALSE;
-            }
-        }
+        if (!cs->hwndParent) {
+            owner = NULL;
+        }
+        else
+        {
+            owner = GetWindowFromHandle(cs->hwndParent);
+            if(owner == NULL)
+            {
+                dprintf(("HwGetWindowHandleData couldn't find owner window %x!!!", cs->hwndParent));
+                return FALSE;
+            }
+        }
   }
 
@@ -297 +297 @@
 
   hwndLinkAfter = ((cs->style & (WS_CHILD|WS_MAXIMIZE)) == WS_CHILD)
-                  ? HWND_BOTTOM : HWND_TOP;
+                  ? HWND_BOTTOM : HWND_TOP;
 
 #if 0
@@ -306 +306 @@
     {
     CBT_CREATEWNDA cbtc;
-        LRESULT ret;
+        LRESULT ret;
 
     cbtc.lpcs = cs;
     cbtc.hwndInsertAfter = hwndLinkAfter;
-        ret = unicode ? HOOK_CallHooksW(WH_CBT, HCBT_CREATEWND, Win32Hwnd, (LPARAM)&cbtc)
-                      : HOOK_CallHooksA(WH_CBT, HCBT_CREATEWND, Win32Hwnd, (LPARAM)&cbtc);
-        if (ret)
+        ret = unicode ? HOOK_CallHooksW(WH_CBT, HCBT_CREATEWND, Win32Hwnd, (LPARAM)&cbtc)
+                      : HOOK_CallHooksA(WH_CBT, HCBT_CREATEWND, Win32Hwnd, (LPARAM)&cbtc);
+        if (ret)
     {
-        TRACE_(win)("CBT-hook returned 0\n");
-        wndPtr->pDriver->pFinalize(wndPtr);
-            retvalue =  0;
-            goto end;
+        TRACE_(win)("CBT-hook returned 0\n");
+        wndPtr->pDriver->pFinalize(wndPtr);
+            retvalue =  0;
+            goto end;
     }
     }
@@ -328 +328 @@
   if (!(cs->style & WS_CHILD))
   {
-        dwStyle |= WS_CLIPSIBLINGS;
-        if (!(cs->style & WS_POPUP))
-        {
-            dwStyle |= WS_CAPTION;
-            flags |= WIN_NEED_SIZE;
-        }
+        dwStyle |= WS_CLIPSIBLINGS;
+        if (!(cs->style & WS_POPUP))
+        {
+            dwStyle |= WS_CAPTION;
+            flags |= WIN_NEED_SIZE;
+        }
   }
   if (cs->dwExStyle & WS_EX_DLGMODALFRAME) dwStyle &= ~WS_THICKFRAME;
@@ -348 +348 @@
   if ((cs->style & WS_THICKFRAME) || !(cs->style & (WS_POPUP | WS_CHILD)))
   {
-        GetMinMaxInfo(&maxSize, &maxPos, &minTrack, &maxTrack);
-        if (maxSize.x < cs->cx) cs->cx = maxSize.x;
-        if (maxSize.y < cs->cy) cs->cy = maxSize.y;
-        if (cs->cx < minTrack.x ) cs->cx = minTrack.x;
-        if (cs->cy < minTrack.y ) cs->cy = minTrack.y;
+        GetMinMaxInfo(&maxSize, &maxPos, &minTrack, &maxTrack);
+        if (maxSize.x < cs->cx) cs->cx = maxSize.x;
+        if (maxSize.y < cs->cy) cs->cy = maxSize.y;
+        if (cs->cx < minTrack.x ) cs->cx = minTrack.x;
+        if (cs->cy < minTrack.y ) cs->cy = minTrack.y;
   }
 
   if(cs->style & WS_CHILD)
   {
-        if(cs->cx < 0) cs->cx = 0;
-        if(cs->cy < 0) cs->cy = 0;
+        if(cs->cx < 0) cs->cx = 0;
+        if(cs->cy < 0) cs->cy = 0;
   }
   else
   {
-        if (cs->cx <= 0) cs->cx = 1;
-        if (cs->cy <= 0) cs->cy = 1;
+        if (cs->cx <= 0) cs->cx = 1;
+        if (cs->cy <= 0) cs->cy = 1;
   }
 
@@ -370 +370 @@
   rectWindow.right  = cs->x + cs->cx;
   rectWindow.bottom = cs->y + cs->cy;
-  rectClient        = rectWindow;
+  rectClient        = rectWindow;
 
   DWORD dwOSWinStyle, dwOSFrameStyle;
@@ -379 +379 @@
 #if 1
   if(cs->style & WS_CHILD) {
-        dwOSFrameStyle = 0;
+        dwOSFrameStyle = 0;
   }
 #endif
 
   if(cs->lpszName)
-        SetWindowText((LPSTR)cs->lpszName);
+        SetWindowText((LPSTR)cs->lpszName);
 
   OS2Hwnd = OSLibWinCreateWindow((getParent()) ? getParent()->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
-                                 dwOSWinStyle, dwOSFrameStyle, (char *)windowNameA,
-                                 (owner) ? owner->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
-                                 (hwndLinkAfter == HWND_BOTTOM) ? TRUE : FALSE,
-                                 &OS2HwndFrame);
+                                 dwOSWinStyle, dwOSFrameStyle, (char *)windowNameA,
+                                 (owner) ? owner->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
+                                 (hwndLinkAfter == HWND_BOTTOM) ? TRUE : FALSE,
+                                 &OS2HwndFrame);
 
   if(OS2Hwnd == 0) {
-        dprintf(("Window creation failed!!"));
-        return FALSE;
+        dprintf(("Window creation failed!!"));
+        return FALSE;
   }
 
   if(OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32WNDPTR, (ULONG)this) == FALSE) {
-        dprintf(("WM_CREATE: WinSetWindowULong %X failed!!", OS2Hwnd));
-        return FALSE;
+        dprintf(("WM_CREATE: WinSetWindowULong %X failed!!", OS2Hwnd));
+        return FALSE;
   }
   if(OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32PM_MAGIC, WIN32PM_MAGIC) == FALSE) {
-        dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2Hwnd));
-        return FALSE;
+        dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2Hwnd));
+        return FALSE;
   }
   //SvL: Need to store the shared memory base, or else other apps can map it into their memory space
   if(OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32PM_SHAREDMEM, HeapGetSharedMemBase()) == FALSE) {
-        dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2Hwnd));
-        return FALSE;
+        dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2Hwnd));
+        return FALSE;
   }
 #if 0
   if(OS2Hwnd != OS2HwndFrame) {
     if(OSLibWinSetWindowULong(OS2HwndFrame, OFFSET_WIN32WNDPTR, (ULONG)this) == FALSE) {
-            dprintf(("WM_CREATE: WinSetWindowULong %X failed!!", OS2HwndFrame));
-            return FALSE;
+            dprintf(("WM_CREATE: WinSetWindowULong %X failed!!", OS2HwndFrame));
+            return FALSE;
     }
     if(OSLibWinSetWindowULong(OS2HwndFrame, OFFSET_WIN32PM_MAGIC, WIN32PM_MAGIC) == FALSE) {
-            dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2HwndFrame));
-            return FALSE;
+            dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2HwndFrame));
+            return FALSE;
     }
     //SvL: Need to store the shared memory base, or else other apps can map it into their memory space
     if(OSLibWinSetWindowULong(OS2HwndFrame, OFFSET_WIN32PM_SHAREDMEM, HeapGetSharedMemBase()) == FALSE) {
-            dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2HwndFrame));
-            return FALSE;
+            dprintf(("WM_CREATE: WinSetWindowULong2 %X failed!!", OS2HwndFrame));
+            return FALSE;
     }
   }
 #endif
+
+  fakeWinBase.hwndThisObject = OS2Hwnd;
+  fakeWinBase.pWindowClass = windowClass;
+  *(PULONG)&fakeWinBase -= 0x90 - 8;
+//  SetFakeOpen32();
 
   /* Set the window menu */
   if ((dwStyle & (WS_CAPTION | WS_CHILD)) == WS_CAPTION )
   {
-        if (cs->hMenu) SetMenu(cs->hMenu);
-        else
-        {
-                if (windowClass->getMenuNameA()) {
-                        cs->hMenu = LoadMenuA(cs->hInstance, windowClass->getMenuNameA());
-                        if (cs->hMenu) SetMenu(cs->hMenu );
-                }
-        }
-  }
-  else  windowId = (UINT)cs->hMenu;
+        if (cs->hMenu) SetMenu(cs->hMenu);
+        else
+        {
+                if (windowClass->getMenuNameA()) {
+                        cs->hMenu = LoadMenuA(cs->hInstance, windowClass->getMenuNameA());
+                        if (cs->hMenu) SetMenu(cs->hMenu );
+                }
+        }
+  }
+  else  windowId = (UINT)cs->hMenu;
 
   //Set icon from class
   if(windowClass->getIcon())
-        SetIcon(windowClass->getIcon());
+        SetIcon(windowClass->getIcon());
 
   if(getParent()) {
-        SetWindowPos(getParent()->getWindowHandle(), rectClient.left, rectClient.top,
-                     rectClient.right-rectClient.left,
-                     rectClient.bottom-rectClient.top,
-                     SWP_NOACTIVATE | SWP_NOZORDER);
+        SetWindowPos(getParent()->getWindowHandle(), rectClient.left, rectClient.top,
+                     rectClient.right-rectClient.left,
+                     rectClient.bottom-rectClient.top,
+                     SWP_NOACTIVATE | SWP_NOZORDER);
   }
   else {
-        SetWindowPos(HWND_TOP, rectClient.left, rectClient.top,
-                     rectClient.right-rectClient.left,
-                     rectClient.bottom-rectClient.top,
-                     SWP_NOACTIVATE);
+        SetWindowPos(HWND_TOP, rectClient.left, rectClient.top,
+                     rectClient.right-rectClient.left,
+                     rectClient.bottom-rectClient.top,
+                     SWP_NOACTIVATE);
   }
   //Get the client window rectangle
@@ -470 +475 @@
   if(SendInternalMessage(WM_NCCREATE, 0, (LPARAM)cs) )
   {
-        //doesn't work right, messes up client rectangle
+        //doesn't work right, messes up client rectangle
 #if 0
-        SendNCCalcSize(FALSE, &rectWindow, NULL, NULL, 0, &rectClient );
+        SendNCCalcSize(FALSE, &rectWindow, NULL, NULL, 0, &rectClient );
 #endif
-        OffsetRect(&rectWindow, maxPos.x - rectWindow.left, maxPos.y - rectWindow.top);
-        dprintf(("Sending WM_CREATE"));
-        if( (SendInternalMessage(WM_CREATE, 0, (LPARAM)cs )) != -1 )
-        {
-            if(!(flags & WIN_NEED_SIZE)) {
-                SendMessageA(WM_SIZE, SIZE_RESTORED,
-                                MAKELONG(rectClient.right-rectClient.left,
-                                         rectClient.bottom-rectClient.top));
-                SendMessageA(WM_MOVE, 0, MAKELONG( rectClient.left, rectClient.top ) );
-            }
-            if (cs->style & WS_VISIBLE) ShowWindow( sw );
+        OffsetRect(&rectWindow, maxPos.x - rectWindow.left, maxPos.y - rectWindow.top);
+        dprintf(("Sending WM_CREATE"));
+        if( (SendInternalMessage(WM_CREATE, 0, (LPARAM)cs )) != -1 )
+        {
+            if(!(flags & WIN_NEED_SIZE)) {
+                SendMessageA(WM_SIZE, SIZE_RESTORED,
+                                MAKELONG(rectClient.right-rectClient.left,
+                                         rectClient.bottom-rectClient.top));
+                SendMessageA(WM_MOVE, 0, MAKELONG( rectClient.left, rectClient.top ) );
+            }
+            if (cs->style & WS_VISIBLE) ShowWindow( sw );
 
 #if 0
-            /* Call WH_SHELL hook */
-
-            if (!(dwStyle & WS_CHILD) && !owner)
-                HOOK_CallHooks16( WH_SHELL, HSHELL_WINDOWCREATED, hwnd, 0 );
+            /* Call WH_SHELL hook */
+
+            if (!(dwStyle & WS_CHILD) && !owner)
+                HOOK_CallHooks16( WH_SHELL, HSHELL_WINDOWCREATED, hwnd, 0 );
 #endif
-            SetLastError(0);
-            return TRUE;
-        }
+            SetLastError(0);
+            return TRUE;
+        }
   }
   fCreated = FALSE;
@@ -504 +509 @@
 #if 0
 /***********************************************************************
- *           WINPOS_MinMaximize
+ *           WINPOS_MinMaximize
  *
  * Fill in lpRect and return additional flags to be used with SetWindowPos().
@@ -523 +528 @@
     if( dwStyle & WS_MINIMIZE )
     {
-        if( !SendInternalMessageA(WM_QUERYOPEN, 0, 0L ) )
-        return (SWP_NOSIZE | SWP_NOMOVE);
-        swpFlags |= SWP_NOCOPYBITS;
+        if( !SendInternalMessageA(WM_QUERYOPEN, 0, 0L ) )
+        return (SWP_NOSIZE | SWP_NOMOVE);
+        swpFlags |= SWP_NOCOPYBITS;
     }
     switch( cmd )
     {
-        case SW_MINIMIZE:
-         if( dwStyle & WS_MAXIMIZE)
-         {
-             flags |= WIN_RESTORE_MAX;
-             dwStyle &= ~WS_MAXIMIZE;
-                 }
-                 else
-             flags &= ~WIN_RESTORE_MAX;
-             dwStyle |= WS_MINIMIZE;
+        case SW_MINIMIZE:
+         if( dwStyle & WS_MAXIMIZE)
+         {
+             flags |= WIN_RESTORE_MAX;
+             dwStyle &= ~WS_MAXIMIZE;
+                 }
+                 else
+             flags &= ~WIN_RESTORE_MAX;
+             dwStyle |= WS_MINIMIZE;
 
 #if 0
-         if( flags & WIN_NATIVE )
-             if( pDriver->pSetHostAttr( wndPtr, HAK_ICONICSTATE, TRUE ) )
-             swpFlags |= MINMAX_NOSWP;
+         if( flags & WIN_NATIVE )
+             if( pDriver->pSetHostAttr( wndPtr, HAK_ICONICSTATE, TRUE ) )
+             swpFlags |= MINMAX_NOSWP;
 #endif
 
-         lpPos->ptIconPos = WINPOS_FindIconPos( wndPtr, lpPos->ptIconPos );
-
-         SetRect(lpRect, lpPos->ptIconPos.x, lpPos->ptIconPos.y,
-             GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON) );
-         swpFlags |= SWP_NOCOPYBITS;
-         break;
-
-        case SW_MAXIMIZE:
-                WINPOS_GetMinMaxInfo( wndPtr, &size, &pt, NULL, NULL );
-
-         if( dwStyle & WS_MINIMIZE )
-         {
-             if( flags & WIN_NATIVE )
-             if( pDriver->pSetHostAttr( wndPtr, HAK_ICONICSTATE, FALSE ) )
-                 swpFlags |= MINMAX_NOSWP;
-
-             WINPOS_ShowIconTitle( wndPtr, FALSE );
-             dwStyle &= ~WS_MINIMIZE;
-         }
-                 dwStyle |= WS_MAXIMIZE;
-
-         SetRect16( lpRect, lpPos->ptMaxPos.x, lpPos->ptMaxPos.y,
-                    size.x, size.y );
-         break;
-
-        case SW_RESTORE:
-         if( dwStyle & WS_MINIMIZE )
-         {
-             if( flags & WIN_NATIVE )
-             if( pDriver->pSetHostAttr( wndPtr, HAK_ICONICSTATE, FALSE ) )
-                 swpFlags |= MINMAX_NOSWP;
-
-             dwStyle &= ~WS_MINIMIZE;
-             WINPOS_ShowIconTitle( wndPtr, FALSE );
-
-             if( flags & WIN_RESTORE_MAX)
-             {
-             /* Restore to maximized position */
-                         CONV_POINT16TO32( &lpPos->ptMaxPos, &pt );
-                         WINPOS_GetMinMaxInfo( wndPtr, &size, &pt, NULL, NULL);
-                         CONV_POINT32TO16( &pt, &lpPos->ptMaxPos );
-             dwStyle |= WS_MAXIMIZE;
-             SetRect16( lpRect, lpPos->ptMaxPos.x, lpPos->ptMaxPos.y, size.x, size.y );
-             break;
-             }
-         }
-         else
-             if( !(dwStyle & WS_MAXIMIZE) ) return (UINT16)(-1);
-             else dwStyle &= ~WS_MAXIMIZE;
-
-         /* Restore to normal position */
-
-        *lpRect = lpPos->rectNormal;
-         lpRect->right -= lpRect->left;
-         lpRect->bottom -= lpRect->top;
-
-         break;
+         lpPos->ptIconPos = WINPOS_FindIconPos( wndPtr, lpPos->ptIconPos );
+
+         SetRect(lpRect, lpPos->ptIconPos.x, lpPos->ptIconPos.y,
+             GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON) );
+         swpFlags |= SWP_NOCOPYBITS;
+         break;
+
+        case SW_MAXIMIZE:
+                WINPOS_GetMinMaxInfo( wndPtr, &size, &pt, NULL, NULL );
+
+         if( dwStyle & WS_MINIMIZE )
+         {
+             if( flags & WIN_NATIVE )
+             if( pDriver->pSetHostAttr( wndPtr, HAK_ICONICSTATE, FALSE ) )
+                 swpFlags |= MINMAX_NOSWP;
+
+             WINPOS_ShowIconTitle( wndPtr, FALSE );
+             dwStyle &= ~WS_MINIMIZE;
+         }
+                 dwStyle |= WS_MAXIMIZE;
+
+         SetRect16( lpRect, lpPos->ptMaxPos.x, lpPos->ptMaxPos.y,
+                    size.x, size.y );
+         break;
+
+        case SW_RESTORE:
+         if( dwStyle & WS_MINIMIZE )
+         {
+             if( flags & WIN_NATIVE )
+             if( pDriver->pSetHostAttr( wndPtr, HAK_ICONICSTATE, FALSE ) )
+                 swpFlags |= MINMAX_NOSWP;
+
+             dwStyle &= ~WS_MINIMIZE;
+             WINPOS_ShowIconTitle( wndPtr, FALSE );
+
+             if( flags & WIN_RESTORE_MAX)
+             {
+             /* Restore to maximized position */
+                         CONV_POINT16TO32( &lpPos->ptMaxPos, &pt );
+                         WINPOS_GetMinMaxInfo( wndPtr, &size, &pt, NULL, NULL);
+                         CONV_POINT32TO16( &pt, &lpPos->ptMaxPos );
+             dwStyle |= WS_MAXIMIZE;
+             SetRect16( lpRect, lpPos->ptMaxPos.x, lpPos->ptMaxPos.y, size.x, size.y );
+             break;
+             }
+         }
+         else
+             if( !(dwStyle & WS_MAXIMIZE) ) return (UINT16)(-1);
+             else dwStyle &= ~WS_MAXIMIZE;
+
+         /* Restore to normal position */
+
+        *lpRect = lpPos->rectNormal;
+         lpRect->right -= lpRect->left;
+         lpRect->bottom -= lpRect->top;
+
+         break;
     }
     } else swpFlags |= SWP_NOSIZE | SWP_NOMOVE;
@@ -608 +613 @@
 #endif
 /*******************************************************************
- *           GetMinMaxInfo
+ *           GetMinMaxInfo
  *
  * Get the minimized and maximized information for a window.
  */
 void Win32BaseWindow::GetMinMaxInfo(POINT *maxSize, POINT *maxPos,
-                                POINT *minTrack, POINT *maxTrack )
+                                POINT *minTrack, POINT *maxTrack )
 {
     MINMAXINFO MinMax;
@@ -630 +635 @@
     else if (HAS_DLGFRAME( dwStyle, dwExStyle ))
     {
-        xinc = GetSystemMetrics(SM_CXDLGFRAME);
-        yinc = GetSystemMetrics(SM_CYDLGFRAME);
+        xinc = GetSystemMetrics(SM_CXDLGFRAME);
+        yinc = GetSystemMetrics(SM_CYDLGFRAME);
     }
     else
     {
-        xinc = yinc = 0;
-        if (HAS_THICKFRAME(dwStyle))
-        {
-            xinc += GetSystemMetrics(SM_CXFRAME);
-            yinc += GetSystemMetrics(SM_CYFRAME);
-        }
-        if (dwStyle & WS_BORDER)
-        {
-            xinc += GetSystemMetrics(SM_CXBORDER);
-            yinc += GetSystemMetrics(SM_CYBORDER);
-        }
+        xinc = yinc = 0;
+        if (HAS_THICKFRAME(dwStyle))
+        {
+            xinc += GetSystemMetrics(SM_CXFRAME);
+            yinc += GetSystemMetrics(SM_CYFRAME);
+        }
+        if (dwStyle & WS_BORDER)
+        {
+            xinc += GetSystemMetrics(SM_CXBORDER);
+            yinc += GetSystemMetrics(SM_CYBORDER);
+        }
     }
     MinMax.ptMaxSize.x += 2 * xinc;
@@ -653 +658 @@
     lpPos = (LPINTERNALPOS)GetPropA( hwndSelf, atomInternalPos );
     if( lpPos && !EMPTYPOINT(lpPos->ptMaxPos) )
-        CONV_POINT16TO32( &lpPos->ptMaxPos, &MinMax.ptMaxPosition );
+        CONV_POINT16TO32( &lpPos->ptMaxPos, &MinMax.ptMaxPosition );
     else
     {
 #endif
-        MinMax.ptMaxPosition.x = -xinc;
-        MinMax.ptMaxPosition.y = -yinc;
+        MinMax.ptMaxPosition.x = -xinc;
+        MinMax.ptMaxPosition.y = -yinc;
 //    }
 
@@ -666 +671 @@
 
     dprintf(("GetMinMaxInfo: %ld %ld / %ld %ld / %ld %ld / %ld %ld\n",
-                      MinMax.ptMaxSize.x, MinMax.ptMaxSize.y,
-                      MinMax.ptMaxPosition.x, MinMax.ptMaxPosition.y,
-                      MinMax.ptMaxTrackSize.x, MinMax.ptMaxTrackSize.y,
-                      MinMax.ptMinTrackSize.x, MinMax.ptMinTrackSize.y));
+                      MinMax.ptMaxSize.x, MinMax.ptMaxSize.y,
+                      MinMax.ptMaxPosition.x, MinMax.ptMaxPosition.y,
+                      MinMax.ptMaxTrackSize.x, MinMax.ptMaxTrackSize.y,
+                      MinMax.ptMinTrackSize.x, MinMax.ptMinTrackSize.y));
     MinMax.ptMaxTrackSize.x = MAX( MinMax.ptMaxTrackSize.x,
-                                   MinMax.ptMinTrackSize.x );
+                                   MinMax.ptMinTrackSize.x );
     MinMax.ptMaxTrackSize.y = MAX( MinMax.ptMaxTrackSize.y,
-                                   MinMax.ptMinTrackSize.y );
+                                   MinMax.ptMinTrackSize.y );
 
     if (maxSize)    *maxSize  = MinMax.ptMaxSize;
@@ -681 +686 @@
 }
 /***********************************************************************
- *           WINPOS_SendNCCalcSize
+ *           WINPOS_SendNCCalcSize
  *
  * Send a WM_NCCALCSIZE message to a window.
@@ -689 +694 @@
  */
 LONG Win32BaseWindow::SendNCCalcSize(BOOL calcValidRect, RECT *newWindowRect, RECT *oldWindowRect,
-                                 RECT *oldClientRect, WINDOWPOS *winpos,
-                                 RECT *newClientRect )
+                                 RECT *oldClientRect, WINDOWPOS *winpos,
+                                 RECT *newClientRect )
 {
    NCCALCSIZE_PARAMS params;
@@ -699 +704 @@
    if (calcValidRect)
    {
-        winposCopy = *winpos;
-        params.rgrc[1] = *oldWindowRect;
-        params.rgrc[2] = *oldClientRect;
-        params.lppos = &winposCopy;
+        winposCopy = *winpos;
+        params.rgrc[1] = *oldWindowRect;
+        params.rgrc[2] = *oldClientRect;
+        params.lppos = &winposCopy;
    }
    result = SendInternalMessageA(WM_NCCALCSIZE, calcValidRect,
-                                 (LPARAM)&params );
+                                 (LPARAM)&params );
    *newClientRect = params.rgrc[0];
    return result;
@@ -727 +732 @@
 {
   if(SendInternalMessageA(WM_CLOSE, 0, 0) == 0) {
-        return 0; //app handles this message
+        return 0; //app handles this message
   }
   delete this;
@@ -762 +767 @@
 #if 1
     if(fCreated == FALSE) {
-        return 1;
+        return 1;
     }
 #endif
@@ -774 +779 @@
 #if 1
     if(fCreated == FALSE) {
-        return 1;
+        return 1;
     }
 #endif
@@ -785 +790 @@
     dprintf(("MsgMove to (%d,%d)", x, y));
     if(fCreated == FALSE) {
-        return 1;
+        return 1;
     }
 
@@ -796 +801 @@
   switch(cmd) {
     case CMD_MENU:
-        return SendInternalMessageA(WM_COMMAND, MAKELONG(Id, 0), 0);
+        return SendInternalMessageA(WM_COMMAND, MAKELONG(Id, 0), 0);
     case CMD_CONTROL:
-        return 0; //todo
+        return 0; //todo
     case CMD_ACCELERATOR:
-        dprintf(("accelerator command"));
-        return 0; //todo
+        dprintf(("accelerator command"));
+        return 0; //todo
   }
   return 0;
@@ -820 +825 @@
 
     if(fCreated == FALSE) {//Solitaire crashes if it receives a WM_SIZE during CreateWindowEx (normal or our fault?)
-        return 1;
+        return 1;
     }
 
     if(fMinimize) {
-            fwSizeType = SIZE_MINIMIZED;
+            fwSizeType = SIZE_MINIMIZED;
     }
     else
     if(fMaximize) {
-            fwSizeType = SIZE_MAXIMIZED;
+            fwSizeType = SIZE_MAXIMIZED;
     }
     else    fwSizeType = SIZE_RESTORED;
@@ -840 +845 @@
     if(SendInternalMessageA(WM_NCACTIVATE, fActivate, 0) == FALSE)
     {
-        if(!fActivate) {
-            return 1;
-        }
+        if(!fActivate) {
+            return 1;
+        }
     }
     return SendInternalMessageA(WM_ACTIVATE, (fActivate) ? WA_ACTIVE : WA_INACTIVE, hwnd);
@@ -862 +867 @@
     lParam |= (scancode << 16);
     if(keyflags & KEY_ALTDOWN)
-        lParam |= (1<<29);
+        lParam |= (1<<29);
     if(keyflags & KEY_PREVDOWN)
-        lParam |= (1<<30);
+        lParam |= (1<<30);
     if(keyflags & KEY_UP)
-        lParam |= (1<<31);
+        lParam |= (1<<31);
     if(keyflags & KEY_DEADKEY) {
-        dprintf(("WM_DEADCHAR: %x %x %08x", OS2Hwnd, cmd, lParam));
-        return SendInternalMessageA(WM_DEADCHAR, cmd, lParam);
+        dprintf(("WM_DEADCHAR: %x %x %08x", OS2Hwnd, cmd, lParam));
+        return SendInternalMessageA(WM_DEADCHAR, cmd, lParam);
     }
     else {
-        dprintf(("WM_CHAR: %x %x %08x", OS2Hwnd, cmd, lParam));
-        return SendInternalMessageA(WM_CHAR, cmd, lParam);
+        dprintf(("WM_CHAR: %x %x %08x", OS2Hwnd, cmd, lParam));
+        return SendInternalMessageA(WM_CHAR, cmd, lParam);
     }
 }
@@ -881 +886 @@
 {
     if(hwnd == 0) {
-            //other app lost focus
-            SendInternalMessageA(WM_ACTIVATEAPP, TRUE, 0); //TODO: Need thread id from hwnd app
+            //other app lost focus
+            SendInternalMessageA(WM_ACTIVATEAPP, TRUE, 0); //TODO: Need thread id from hwnd app
     }
     return  SendInternalMessageA(WM_SETFOCUS, hwnd, 0);
@@ -891 +896 @@
 {
     if(hwnd == 0) {
-            //other app lost focus
-            SendInternalMessageA(WM_ACTIVATEAPP, FALSE, 0); //TODO: Need thread id from hwnd app
+            //other app lost focus
+            SendInternalMessageA(WM_ACTIVATEAPP, FALSE, 0); //TODO: Need thread id from hwnd app
     }
     return  SendInternalMessageA(WM_KILLFOCUS, hwnd, 0);
@@ -905 +910 @@
     dprintf(("MsgButton to (%d,%d)", ncx, ncy));
     switch(msg) {
-        case BUTTON_LEFTDOWN:
-                win32msg = WM_LBUTTONDOWN;
-                win32ncmsg = WM_NCLBUTTONDOWN;
-                break;
-        case BUTTON_LEFTUP:
-                win32msg = WM_LBUTTONUP;
-                win32ncmsg = WM_NCLBUTTONUP;
-                break;
-        case BUTTON_LEFTDBLCLICK:
-                win32msg = WM_LBUTTONDBLCLK;
-                win32ncmsg = WM_NCLBUTTONDBLCLK;
-                break;
-        case BUTTON_RIGHTUP:
-                win32msg = WM_RBUTTONUP;
-                win32ncmsg = WM_NCRBUTTONUP;
-                break;
-        case BUTTON_RIGHTDOWN:
-                win32msg = WM_RBUTTONDOWN;
-                win32ncmsg = WM_NCRBUTTONDOWN;
-                break;
-        case BUTTON_RIGHTDBLCLICK:
-                win32msg = WM_RBUTTONDBLCLK;
-                win32ncmsg = WM_NCRBUTTONDBLCLK;
-                break;
-        case BUTTON_MIDDLEUP:
-                win32msg = WM_MBUTTONUP;
-                win32ncmsg = WM_NCMBUTTONUP;
-                break;
-        case BUTTON_MIDDLEDOWN:
-                win32msg = WM_MBUTTONDOWN;
-                win32ncmsg = WM_NCMBUTTONDOWN;
-                break;
-        case BUTTON_MIDDLEDBLCLICK:
-                win32msg = WM_MBUTTONDBLCLK;
-                win32ncmsg = WM_NCMBUTTONDBLCLK;
-                break;
-        default:
-                dprintf(("Win32BaseWindow::Button: invalid msg!!!!"));
-                return 1;
+        case BUTTON_LEFTDOWN:
+                win32msg = WM_LBUTTONDOWN;
+                win32ncmsg = WM_NCLBUTTONDOWN;
+                break;
+        case BUTTON_LEFTUP:
+                win32msg = WM_LBUTTONUP;
+                win32ncmsg = WM_NCLBUTTONUP;
+                break;
+        case BUTTON_LEFTDBLCLICK:
+                win32msg = WM_LBUTTONDBLCLK;
+                win32ncmsg = WM_NCLBUTTONDBLCLK;
+                break;
+        case BUTTON_RIGHTUP:
+                win32msg = WM_RBUTTONUP;
+                win32ncmsg = WM_NCRBUTTONUP;
+                break;
+        case BUTTON_RIGHTDOWN:
+                win32msg = WM_RBUTTONDOWN;
+                win32ncmsg = WM_NCRBUTTONDOWN;
+                break;
+        case BUTTON_RIGHTDBLCLICK:
+                win32msg = WM_RBUTTONDBLCLK;
+                win32ncmsg = WM_NCRBUTTONDBLCLK;
+                break;
+        case BUTTON_MIDDLEUP:
+                win32msg = WM_MBUTTONUP;
+                win32ncmsg = WM_NCMBUTTONUP;
+                break;
+        case BUTTON_MIDDLEDOWN:
+                win32msg = WM_MBUTTONDOWN;
+                win32ncmsg = WM_NCMBUTTONDOWN;
+                break;
+        case BUTTON_MIDDLEDBLCLICK:
+                win32msg = WM_MBUTTONDBLCLK;
+                win32ncmsg = WM_NCMBUTTONDBLCLK;
+                break;
+        default:
+                dprintf(("Win32BaseWindow::Button: invalid msg!!!!"));
+                return 1;
     }
     if(win32msg == WM_MBUTTONDBLCLK || win32msg == WM_RBUTTONDBLCLK || win32msg == WM_LBUTTONDBLCLK) {
-        if(!(windowClass->getClassLongA(GCL_STYLE) & CS_DBLCLKS)) {
-            return 1;
-        }
+        if(!(windowClass->getClassLongA(GCL_STYLE) & CS_DBLCLKS)) {
+            return 1;
+        }
     }
     SendInternalMessageA(WM_SETCURSOR, Win32Hwnd, MAKELONG(lastHitTestVal, win32ncmsg));
@@ -954 +959 @@
     //WM_NC*BUTTON* is posted when the cursor is in a non-client area of the window
     if(lastHitTestVal != HTCLIENT) {
-            SendInternalMessageA(win32ncmsg, lastHitTestVal, MAKELONG(ncx, ncy)); //TODO:
+            SendInternalMessageA(win32ncmsg, lastHitTestVal, MAKELONG(ncx, ncy)); //TODO:
     }
     return  SendInternalMessageA(win32msg, 0, MAKELONG(clx, cly));
@@ -966 +971 @@
 
     if(keystate & WMMOVE_LBUTTON)
-        winstate |= MK_LBUTTON;
+        winstate |= MK_LBUTTON;
     if(keystate & WMMOVE_RBUTTON)
-        winstate |= MK_RBUTTON;
+        winstate |= MK_RBUTTON;
     if(keystate & WMMOVE_MBUTTON)
-        winstate |= MK_MBUTTON;
+        winstate |= MK_MBUTTON;
     if(keystate & WMMOVE_SHIFT)
-        winstate |= MK_SHIFT;
+        winstate |= MK_SHIFT;
     if(keystate & WMMOVE_CTRL)
-        winstate |= MK_CONTROL;
+        winstate |= MK_CONTROL;
 
     if(lastHitTestVal != HTCLIENT) {
-        setcursormsg = WM_NCMOUSEMOVE;
+        setcursormsg = WM_NCMOUSEMOVE;
     }
     //TODO: hiword should be 0 if window enters menu mode (SDK docs)
@@ -984 +989 @@
     //WM_NCMOUSEMOVE is posted when the cursor moves into a non-client area of the window
     if(lastHitTestVal != HTCLIENT) {
-            SendInternalMessageA(WM_NCMOUSEMOVE, lastHitTestVal, MAKELONG(x, y));
+            SendInternalMessageA(WM_NCMOUSEMOVE, lastHitTestVal, MAKELONG(x, y));
     }
     return  SendInternalMessageA(WM_MOUSEMOVE, keystate, MAKELONG(x, y));
@@ -996 +1001 @@
 //******************************************************************************
 //TODO: Is the clipper region of the window DC equal to the invalidated rectangle?
-//      (or are we simply erasing too much here)
+//      (or are we simply erasing too much here)
 //******************************************************************************
 ULONG Win32BaseWindow::MsgEraseBackGround(HDC hdc)
@@ -1004 +1009 @@
 
     if (hdcErase == 0)
-        hdcErase = O32_GetDC(OS2Hwnd);
+        hdcErase = O32_GetDC(OS2Hwnd);
 
     if(isIcon)
-        rc = SendInternalMessageA(WM_ICONERASEBKGND, hdcErase, 0);
+        rc = SendInternalMessageA(WM_ICONERASEBKGND, hdcErase, 0);
     else
-        rc = SendInternalMessageA(WM_ERASEBKGND, hdcErase, 0);
+        rc = SendInternalMessageA(WM_ERASEBKGND, hdcErase, 0);
     if (hdc == 0)
-        O32_ReleaseDC(OS2Hwnd, hdcErase);
+        O32_ReleaseDC(OS2Hwnd, hdcErase);
     return (rc);
 }
@@ -1019 +1024 @@
 {
     if(isUnicode) {
-            return SendInternalMessageW(WM_SETTEXT, 0, (LPARAM)lpsz);
+            return SendInternalMessageW(WM_SETTEXT, 0, (LPARAM)lpsz);
     }
     else    return SendInternalMessageA(WM_SETTEXT, 0, (LPARAM)lpsz);
@@ -1035 +1040 @@
 {
     if(isUnicode) {
-        SendInternalMessageW(WM_GETTEXT, wndNameLength, (LPARAM)windowNameW);
+        SendInternalMessageW(WM_GETTEXT, wndNameLength, (LPARAM)windowNameW);
     }
     else {
-        SendInternalMessageA(WM_GETTEXT, wndNameLength, (LPARAM)windowNameA);
+        SendInternalMessageA(WM_GETTEXT, wndNameLength, (LPARAM)windowNameA);
     }
     return windowNameA;
@@ -1049 +1054 @@
     {
     case WM_GETTEXTLENGTH:
-        return wndNameLength;
+        return wndNameLength;
 
     case WM_GETTEXT:   //TODO: SS_ICON controls
-        strncpy((LPSTR)lParam, windowNameA, wParam);
-        return min(wndNameLength, wParam);
+        strncpy((LPSTR)lParam, windowNameA, wParam);
+        return min(wndNameLength, wParam);
 
     case WM_SETTEXT:
-        return 0;
+        return 0;
 
     case WM_SETREDRAW:
-        if(wParam)
-                SetWindowLongA (GWL_STYLE, GetWindowLongA (GWL_STYLE) | WS_VISIBLE);
-        else    SetWindowLongA (GWL_STYLE, GetWindowLongA (GWL_STYLE) & ~WS_VISIBLE);
-
-        return 0; //TODO
+        if(wParam)
+                SetWindowLongA (GWL_STYLE, GetWindowLongA (GWL_STYLE) | WS_VISIBLE);
+        else    SetWindowLongA (GWL_STYLE, GetWindowLongA (GWL_STYLE) & ~WS_VISIBLE);
+
+        return 0; //TODO
 
     case WM_NCCREATE:
-        return(TRUE);
+        return(TRUE);
 
     case WM_CTLCOLORMSGBOX:
@@ -1075 +1080 @@
     case WM_CTLCOLORSTATIC:
     case WM_CTLCOLORSCROLLBAR:
-         SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW));
-         SetTextColor((HDC)wParam, GetSysColor(COLOR_WINDOWTEXT));
-         return GetSysColorBrush(COLOR_BTNFACE);
+         SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW));
+         SetTextColor((HDC)wParam, GetSysColor(COLOR_WINDOWTEXT));
+         return GetSysColorBrush(COLOR_BTNFACE);
 
     case WM_PARENTNOTIFY:
-        return 0;
+        return 0;
 
     case WM_MOUSEACTIVATE:
     {
-        DWORD dwStyle = GetWindowLongA(GWL_STYLE);
-        DWORD dwExStyle = GetWindowLongA(GWL_EXSTYLE);
-        dprintf(("DefWndProc: WM_MOUSEACTIVATE for %x Msg %s", Win32Hwnd, GetMsgText(HIWORD(lParam))));
-        if(dwStyle & WS_CHILD && !(dwExStyle & WS_EX_NOPARENTNOTIFY) )
-        {
-            if(getParent()) {
-                LRESULT rc = getParent()->SendMessageA(WM_MOUSEACTIVATE, wParam, lParam );
-                if(rc)  return rc;
-            }
-        }
-        return (LOWORD(lParam) == HTCAPTION) ? MA_NOACTIVATE : MA_ACTIVATE;
+        DWORD dwStyle = GetWindowLongA(GWL_STYLE);
+        DWORD dwExStyle = GetWindowLongA(GWL_EXSTYLE);
+        dprintf(("DefWndProc: WM_MOUSEACTIVATE for %x Msg %s", Win32Hwnd, GetMsgText(HIWORD(lParam))));
+        if(dwStyle & WS_CHILD && !(dwExStyle & WS_EX_NOPARENTNOTIFY) )
+        {
+            if(getParent()) {
+                LRESULT rc = getParent()->SendMessageA(WM_MOUSEACTIVATE, wParam, lParam );
+                if(rc)  return rc;
+            }
+        }
+        return (LOWORD(lParam) == HTCAPTION) ? MA_NOACTIVATE : MA_ACTIVATE;
     }
     case WM_SETCURSOR:
     {
-        DWORD dwStyle = GetWindowLongA(GWL_STYLE);
-        DWORD dwExStyle = GetWindowLongA(GWL_EXSTYLE);
-        dprintf(("DefWndProc: WM_SETCURSOR for %x Msg %s", Win32Hwnd, GetMsgText(HIWORD(lParam))));
-        if(dwStyle & WS_CHILD && !(dwExStyle & WS_EX_NOPARENTNOTIFY) )
-        {
-            if(getParent()) {
-                LRESULT rc = getParent()->SendMessageA(WM_SETCURSOR, wParam, lParam);
-                if(rc)  return rc;
-            }
-        }
-        return 1;
+        DWORD dwStyle = GetWindowLongA(GWL_STYLE);
+        DWORD dwExStyle = GetWindowLongA(GWL_EXSTYLE);
+        dprintf(("DefWndProc: WM_SETCURSOR for %x Msg %s", Win32Hwnd, GetMsgText(HIWORD(lParam))));
+        if(dwStyle & WS_CHILD && !(dwExStyle & WS_EX_NOPARENTNOTIFY) )
+        {
+            if(getParent()) {
+                LRESULT rc = getParent()->SendMessageA(WM_SETCURSOR, wParam, lParam);
+                if(rc)  return rc;
+            }
+        }
+        return 1;
     }
     case WM_MOUSEMOVE:
-        return 0;
+        return 0;
 
     case WM_WINDOWPOSCHANGED:
@@ -1117 +1122 @@
 
 /* undocumented SWP flags - from SDK 3.1 */
-#define SWP_NOCLIENTSIZE        0x0800
-#define SWP_NOCLIENTMOVE        0x1000
-
-        PWINDOWPOS wpos = (PWINDOWPOS)lParam;
-        WPARAM     wp   = SIZE_RESTORED;
-
-        if (!(wpos->flags & SWP_NOCLIENTMOVE))
-            SendMessageA(WM_MOVE, 0, MAKELONG(rectClient.left, rectClient.top));
-
-        if (!(wpos->flags & SWP_NOCLIENTSIZE))
-        {
-            if (dwStyle & WS_MAXIMIZE) wp = SIZE_MAXIMIZED;
-            else if (dwStyle & WS_MINIMIZE) wp = SIZE_MINIMIZED;
-
-           SendMessageA(WM_SIZE, wp, MAKELONG(rectClient.right  - rectClient.left,
-                                              rectClient.bottom - rectClient.top));
-        }
-        return 0;
+#define SWP_NOCLIENTSIZE        0x0800
+#define SWP_NOCLIENTMOVE        0x1000
+
+        PWINDOWPOS wpos = (PWINDOWPOS)lParam;
+        WPARAM     wp   = SIZE_RESTORED;
+
+        if (!(wpos->flags & SWP_NOCLIENTMOVE))
+            SendMessageA(WM_MOVE, 0, MAKELONG(rectClient.left, rectClient.top));
+
+        if (!(wpos->flags & SWP_NOCLIENTSIZE))
+        {
+            if (dwStyle & WS_MAXIMIZE) wp = SIZE_MAXIMIZED;
+            else if (dwStyle & WS_MINIMIZE) wp = SIZE_MINIMIZED;
+
+           SendMessageA(WM_SIZE, wp, MAKELONG(rectClient.right  - rectClient.left,
+                                              rectClient.bottom - rectClient.top));
+        }
+        return 0;
     }
     case WM_ERASEBKGND:
@@ -1142 +1147 @@
       int rc;
 
-        if (!windowClass->getBackgroundBrush()) return 0;
-
-        /*  Since WM_ERASEBKGND may receive either a window dc or a    */
-        /*  client dc, the area to be erased has to be retrieved from  */
-        /*  the device context.                                    */
-        rc = GetClipBox( (HDC)wParam, &rect );
-        if ((rc == SIMPLEREGION) || (rc == COMPLEXREGION))
-            FillRect( (HDC)wParam, &rect, windowClass->getBackgroundBrush());
-
-        return 1;
+        if (!windowClass->getBackgroundBrush()) return 0;
+
+        /*  Since WM_ERASEBKGND may receive either a window dc or a    */
+        /*  client dc, the area to be erased has to be retrieved from  */
+        /*  the device context.                                    */
+        rc = GetClipBox( (HDC)wParam, &rect );
+        if ((rc == SIMPLEREGION) || (rc == COMPLEXREGION))
+            FillRect( (HDC)wParam, &rect, windowClass->getBackgroundBrush());
+
+        return 1;
     }
 
@@ -1163 +1168 @@
     case WM_NCMBUTTONUP:
     case WM_NCMBUTTONDBLCLK:
-        return 0;           //TODO: Send WM_SYSCOMMAND if required
+        return 0;           //TODO: Send WM_SYSCOMMAND if required
 
     case WM_NCHITTEST: //TODO: Calculate position of
-        return HTCLIENT;
+        return HTCLIENT;
 
     default:
-        return 1;
+        return 1;
     }
 }
@@ -1179 +1184 @@
     {
     case WM_GETTEXTLENGTH:
-        return wndNameLength;
+        return wndNameLength;
 
     case WM_GETTEXT:   //TODO: SS_ICON controls
-        lstrcpynW((LPWSTR)lParam, windowNameW, wParam);
-        return min(wndNameLength, wParam);
+        lstrcpynW((LPWSTR)lParam, windowNameW, wParam);
+        return min(wndNameLength, wParam);
 
     default:
-        return DefWindowProcA(Msg, wParam, lParam);
+        return DefWindowProcA(Msg, wParam, lParam);
     }
 }
@@ -1194 +1199 @@
 {
   if(PostSpyMessage(getWindowHandle(), Msg, wParam, lParam) == FALSE)
-        dprintf(("SendMessageA %s for %x %x %x", GetMsgText(Msg), getWindowHandle(), wParam, lParam));
+        dprintf(("SendMessageA %s for %x %x %x", GetMsgText(Msg), getWindowHandle(), wParam, lParam));
 
   if(HkCBT::OS2HkCBTProc(getWindowHandle(), Msg, wParam, lParam) == TRUE) {//hook swallowed msg
-        return(0);
+        return(0);
   }
   switch(Msg)
   {
-        case WM_CREATE:
-        {
-                if(win32wndproc(getWindowHandle(), WM_NCCREATE, 0, lParam) == 0) {
-                        dprintf(("WM_NCCREATE returned FALSE\n"));
-                        return(-1); //don't create window
-                }
-                if(win32wndproc(getWindowHandle(), WM_CREATE, 0, lParam) == -1) {
-                        dprintf(("WM_CREATE returned -1\n"));
-                        return(-1); //don't create window
-                }
-                NotifyParent(Msg, wParam, lParam);
-
-                return(0);
-        }
-        case WM_SETTEXT: //TODO: Nothing happens if passed to DefWindowProc
-                return win32wndproc(getWindowHandle(), WM_SETTEXT, wParam, lParam);
-
-        case WM_LBUTTONDOWN:
-        case WM_MBUTTONDOWN:
-        case WM_RBUTTONDOWN:
-                NotifyParent(Msg, wParam, lParam);
-                return win32wndproc(getWindowHandle(), Msg, wParam, lParam);
-
-        case WM_DESTROY:
-                win32wndproc(getWindowHandle(), WM_NCDESTROY, 0, 0);
-                NotifyParent(Msg, wParam, lParam);
-                return win32wndproc(getWindowHandle(), WM_DESTROY, 0, 0);
-        default:
-                return win32wndproc(getWindowHandle(), Msg, wParam, lParam);
+        case WM_CREATE:
+        {
+                if(win32wndproc(getWindowHandle(), WM_NCCREATE, 0, lParam) == 0) {
+                        dprintf(("WM_NCCREATE returned FALSE\n"));
+                        return(-1); //don't create window
+                }
+                if(win32wndproc(getWindowHandle(), WM_CREATE, 0, lParam) == -1) {
+                        dprintf(("WM_CREATE returned -1\n"));
+                        return(-1); //don't create window
+                }
+                NotifyParent(Msg, wParam, lParam);
+
+                return(0);
+        }
+        case WM_SETTEXT: //TODO: Nothing happens if passed to DefWindowProc
+                return win32wndproc(getWindowHandle(), WM_SETTEXT, wParam, lParam);
+
+        case WM_LBUTTONDOWN:
+        case WM_MBUTTONDOWN:
+        case WM_RBUTTONDOWN:
+                NotifyParent(Msg, wParam, lParam);
+                return win32wndproc(getWindowHandle(), Msg, wParam, lParam);
+
+        case WM_DESTROY:
+                win32wndproc(getWindowHandle(), WM_NCDESTROY, 0, 0);
+                NotifyParent(Msg, wParam, lParam);
+                return win32wndproc(getWindowHandle(), WM_DESTROY, 0, 0);
+        default:
+                return win32wndproc(getWindowHandle(), Msg, wParam, lParam);
   }
 }
@@ -1237 +1242 @@
 {
   if(PostSpyMessage(getWindowHandle(), Msg, wParam, lParam) == FALSE)
-        dprintf(("SendMessageA %s for %x %x %x", GetMsgText(Msg), getWindowHandle(), wParam, lParam));
+        dprintf(("SendMessageA %s for %x %x %x", GetMsgText(Msg), getWindowHandle(), wParam, lParam));
 
   if(HkCBT::OS2HkCBTProc(getWindowHandle(), Msg, wParam, lParam) == TRUE) {//hook swallowed msg
-        return(0);
+        return(0);
   }
   switch(Msg)
   {
-        case WM_CREATE:
-        {
-                if(win32wndproc(getWindowHandle(), WM_NCCREATE, 0, lParam) == 0) {
-                        dprintf(("WM_NCCREATE returned FALSE\n"));
-                        return(0); //don't create window
-                }
-                if(win32wndproc(getWindowHandle(), WM_CREATE, 0, lParam) == 0) {
-                        dprintf(("WM_CREATE returned FALSE\n"));
-                        return(0); //don't create window
-                }
-                NotifyParent(Msg, wParam, lParam);
-
-                return(1);
-        }
-        case WM_SETTEXT: //TODO: Nothing happens if passed to DefWindowProc
-                return win32wndproc(getWindowHandle(), WM_SETTEXT, wParam, lParam);
-
-        case WM_LBUTTONDOWN:
-        case WM_MBUTTONDOWN:
-        case WM_RBUTTONDOWN:
-                NotifyParent(Msg, wParam, lParam);
-                return win32wndproc(getWindowHandle(), Msg, wParam, lParam);
-
-        case WM_DESTROY:
-                win32wndproc(getWindowHandle(), WM_NCDESTROY, 0, 0);
-                NotifyParent(Msg, wParam, lParam);
-                return win32wndproc(getWindowHandle(), WM_DESTROY, 0, 0);
-
-        default:
-                return win32wndproc(getWindowHandle(), Msg, wParam, lParam);
+        case WM_CREATE:
+        {
+                if(win32wndproc(getWindowHandle(), WM_NCCREATE, 0, lParam) == 0) {
+                        dprintf(("WM_NCCREATE returned FALSE\n"));
+                        return(0); //don't create window
+                }
+                if(win32wndproc(getWindowHandle(), WM_CREATE, 0, lParam) == 0) {
+                        dprintf(("WM_CREATE returned FALSE\n"));
+                        return(0); //don't create window
+                }
+                NotifyParent(Msg, wParam, lParam);
+
+                return(1);
+        }
+        case WM_SETTEXT: //TODO: Nothing happens if passed to DefWindowProc
+                return win32wndproc(getWindowHandle(), WM_SETTEXT, wParam, lParam);
+
+        case WM_LBUTTONDOWN:
+        case WM_MBUTTONDOWN:
+        case WM_RBUTTONDOWN:
+                NotifyParent(Msg, wParam, lParam);
+                return win32wndproc(getWindowHandle(), Msg, wParam, lParam);
+
+        case WM_DESTROY:
+                win32wndproc(getWindowHandle(), WM_NCDESTROY, 0, 0);
+                NotifyParent(Msg, wParam, lParam);
+                return win32wndproc(getWindowHandle(), WM_DESTROY, 0, 0);
+
+        default:
+                return win32wndproc(getWindowHandle(), Msg, wParam, lParam);
   }
 }
@@ -1282 +1287 @@
 {
   if(PostSpyMessage(getWindowHandle(), Msg, wParam, lParam) == FALSE)
-        dprintf(("SendInternalMessageA %s for %x %x %x", GetMsgText(Msg), getWindowHandle(), wParam, lParam));
+        dprintf(("SendInternalMessageA %s for %x %x %x", GetMsgText(Msg), getWindowHandle(), wParam, lParam));
 
   if(HkCBT::OS2HkCBTProc(getWindowHandle(), Msg, wParam, lParam) == TRUE) {//hook swallowed msg
-        return(0);
+        return(0);
   }
   switch(Msg)
   {
-        case WM_CREATE:
-        {
-                if(win32wndproc(getWindowHandle(), WM_NCCREATE, 0, lParam) == 0) {
-                        dprintf(("WM_NCCREATE returned FALSE\n"));
-                        return(0); //don't create window
-                }
-                if(win32wndproc(getWindowHandle(), WM_CREATE, 0, lParam) == 0) {
-                        dprintf(("WM_CREATE returned FALSE\n"));
-                        return(0); //don't create window
-                }
-                NotifyParent(Msg, wParam, lParam);
-
-                return(1);
-        }
-        case WM_LBUTTONDOWN:
-        case WM_MBUTTONDOWN:
-        case WM_RBUTTONDOWN:
-                NotifyParent(Msg, wParam, lParam);
-                return win32wndproc(getWindowHandle(), Msg, wParam, lParam);
-
-        case WM_DESTROY:
-                win32wndproc(getWindowHandle(), WM_NCDESTROY, 0, 0);
-                NotifyParent(Msg, wParam, lParam);
-                return win32wndproc(getWindowHandle(), WM_DESTROY, 0, 0);
-        default:
-                return win32wndproc(getWindowHandle(), Msg, wParam, lParam);
+        case WM_CREATE:
+        {
+                if(win32wndproc(getWindowHandle(), WM_NCCREATE, 0, lParam) == 0) {
+                        dprintf(("WM_NCCREATE returned FALSE\n"));
+                        return(0); //don't create window
+                }
+                if(win32wndproc(getWindowHandle(), WM_CREATE, 0, lParam) == 0) {
+                        dprintf(("WM_CREATE returned FALSE\n"));
+                        return(0); //don't create window
+                }
+                NotifyParent(Msg, wParam, lParam);
+
+                return(1);
+        }
+        case WM_LBUTTONDOWN:
+        case WM_MBUTTONDOWN:
+        case WM_RBUTTONDOWN:
+                NotifyParent(Msg, wParam, lParam);
+                return win32wndproc(getWindowHandle(), Msg, wParam, lParam);
+
+        case WM_DESTROY:
+                win32wndproc(getWindowHandle(), WM_NCDESTROY, 0, 0);
+                NotifyParent(Msg, wParam, lParam);
+                return win32wndproc(getWindowHandle(), WM_DESTROY, 0, 0);
+        default:
+                return win32wndproc(getWindowHandle(), Msg, wParam, lParam);
   }
 }
@@ -1324 +1329 @@
 {
   if(PostSpyMessage(getWindowHandle(), Msg, wParam, lParam) == FALSE)
-        dprintf(("SendInternalMessageW %s for %x %x %x", GetMsgText(Msg), getWindowHandle(), wParam, lParam));
+        dprintf(("SendInternalMessageW %s for %x %x %x", GetMsgText(Msg), getWindowHandle(), wParam, lParam));
 
   if(HkCBT::OS2HkCBTProc(getWindowHandle(), Msg, wParam, lParam) == TRUE) {//hook swallowed msg
-        return(0);
+        return(0);
   }
   switch(Msg)
   {
-        case WM_CREATE:
-        {
-                if(win32wndproc(getWindowHandle(), WM_NCCREATE, 0, lParam) == 0) {
-                        dprintf(("WM_NCCREATE returned FALSE\n"));
-                        return(0); //don't create window
-                }
-                if(win32wndproc(getWindowHandle(), WM_CREATE, 0, lParam) == 0) {
-                        dprintf(("WM_CREATE returned FALSE\n"));
-                        return(0); //don't create window
-                }
-                NotifyParent(Msg, wParam, lParam);
-
-                return(1);
-        }
-        case WM_LBUTTONDOWN:
-        case WM_MBUTTONDOWN:
-        case WM_RBUTTONDOWN:
-                NotifyParent(Msg, wParam, lParam);
-                return win32wndproc(getWindowHandle(), Msg, wParam, lParam);
-
-        case WM_DESTROY:
-                win32wndproc(getWindowHandle(), WM_NCDESTROY, 0, 0);
-                NotifyParent(Msg, wParam, lParam);
-                return win32wndproc(getWindowHandle(), WM_DESTROY, 0, 0);
-        default:
-                return win32wndproc(getWindowHandle(), Msg, wParam, lParam);
+        case WM_CREATE:
+        {
+                if(win32wndproc(getWindowHandle(), WM_NCCREATE, 0, lParam) == 0) {
+                        dprintf(("WM_NCCREATE returned FALSE\n"));
+                        return(0); //don't create window
+                }
+                if(win32wndproc(getWindowHandle(), WM_CREATE, 0, lParam) == 0) {
+                        dprintf(("WM_CREATE returned FALSE\n"));
+                        return(0); //don't create window
+                }
+                NotifyParent(Msg, wParam, lParam);
+
+                return(1);
+        }
+        case WM_LBUTTONDOWN:
+        case WM_MBUTTONDOWN:
+        case WM_RBUTTONDOWN:
+                NotifyParent(Msg, wParam, lParam);
+                return win32wndproc(getWindowHandle(), Msg, wParam, lParam);
+
+        case WM_DESTROY:
+                win32wndproc(getWindowHandle(), WM_NCDESTROY, 0, 0);
+                NotifyParent(Msg, wParam, lParam);
+                return win32wndproc(getWindowHandle(), WM_DESTROY, 0, 0);
+        default:
+                return win32wndproc(getWindowHandle(), Msg, wParam, lParam);
   }
 }
@@ -1381 +1386 @@
    while(window)
    {
-        if(window->getStyle() & WS_CHILD && !(window->getExStyle() & WS_EX_NOPARENTNOTIFY) )
-        {
-                /* Notify the parent window only */
-                parentwindow = window->getParent();
-                if(parentwindow) {
-                        if(Msg == WM_CREATE || Msg == WM_DESTROY) {
-                                parentwindow->SendInternalMessageA(WM_PARENTNOTIFY, MAKEWPARAM(Msg, window->getWindowId()), (LPARAM)window->getWindowHandle());
-                        }
-                        else    parentwindow->SendInternalMessageA(WM_PARENTNOTIFY, MAKEWPARAM(Msg, window->getWindowId()), lParam );
-                }
-        }
-        else    break;
-
-        window = parentwindow;
+        if(window->getStyle() & WS_CHILD && !(window->getExStyle() & WS_EX_NOPARENTNOTIFY) )
+        {
+                /* Notify the parent window only */
+                parentwindow = window->getParent();
+                if(parentwindow) {
+                        if(Msg == WM_CREATE || Msg == WM_DESTROY) {
+                                parentwindow->SendInternalMessageA(WM_PARENTNOTIFY, MAKEWPARAM(Msg, window->getWindowId()), (LPARAM)window->getWindowHandle());
+                        }
+                        else    parentwindow->SendInternalMessageA(WM_PARENTNOTIFY, MAKEWPARAM(Msg, window->getWindowId()), lParam );
+                }
+        }
+        else    break;
+
+        window = parentwindow;
    }
 }
@@ -1401 +1406 @@
 BOOL Win32BaseWindow::SetMenu(HMENU hMenu)
 {
- PVOID          menutemplate;
+ PVOID          menutemplate;
  Win32Resource *winres = (Win32Resource *)hMenu;
 
     dprintf(("SetMenu %x", hMenu));
     if(HIWORD(winres) == 0) {
-        dprintf(("Win32BaseWindow:: Win32Resource *winres == 0"));
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return FALSE;
+        dprintf(("Win32BaseWindow:: Win32Resource *winres == 0"));
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
     }
     menutemplate = winres->lockOS2Resource();
     if(menutemplate == NULL)
     {
-        dprintf(("Win32BaseWindow::SetMenu menutemplate == 0"));
-        return FALSE;
+        dprintf(("Win32BaseWindow::SetMenu menutemplate == 0"));
+        return FALSE;
     }
     OS2HwndMenu = OSLibWinCreateMenu(OS2HwndFrame, menutemplate);
     if(OS2HwndMenu == 0) {
-        dprintf(("Win32BaseWindow::SetMenu OS2HwndMenu == 0"));
-        return FALSE;
+        dprintf(("Win32BaseWindow::SetMenu OS2HwndMenu == 0"));
+        return FALSE;
     }
     winres->setOS2Handle(OS2HwndMenu);
@@ -1430 +1435 @@
 {
  Win32Resource *winres = (Win32Resource *)hAccel;
- HANDLE         accelhandle;
+ HANDLE         accelhandle;
 
     if(HIWORD(hAccel) == 0) {
-        dprintf(("SetAccelTable: hAccel %x invalid", hAccel));
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return FALSE;
+        dprintf(("SetAccelTable: hAccel %x invalid", hAccel));
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
     }
     acceltableResource = winres;
@@ -1457 +1462 @@
     dprintf(("ShowWindow %x", nCmdShow));
     if(fFirstShow) {
-        if(isFrameWindow() && IS_OVERLAPPED(getStyle())) {
-                SendMessageA(WM_SIZE, SIZE_RESTORED,
-                                MAKELONG(rectClient.right-rectClient.left,
-                                         rectClient.bottom-rectClient.top));
-                SendMessageA(WM_MOVE, 0, MAKELONG( rectClient.left, rectClient.top ) );
-
-        }
-        fFirstShow = FALSE;
+        if(isFrameWindow() && IS_OVERLAPPED(getStyle())) {
+                SendMessageA(WM_SIZE, SIZE_RESTORED,
+                                MAKELONG(rectClient.right-rectClient.left,
+                                         rectClient.bottom-rectClient.top));
+                SendMessageA(WM_MOVE, 0, MAKELONG( rectClient.left, rectClient.top ) );
+
+        }
+        fFirstShow = FALSE;
     }
     switch(nCmdShow)
@@ -1470 +1475 @@
     case SW_SHOW:
     case SW_SHOWDEFAULT: //todo
-        showstate = SWPOS_SHOW | SWPOS_ACTIVATE;
-        break;
+        showstate = SWPOS_SHOW | SWPOS_ACTIVATE;
+        break;
     case SW_HIDE:
-        showstate = SWPOS_HIDE;
-        break;
+        showstate = SWPOS_HIDE;
+        break;
     case SW_RESTORE:
-        showstate = SWPOS_RESTORE | SWPOS_SHOW | SWPOS_ACTIVATE;
-        break;
+        showstate = SWPOS_RESTORE | SWPOS_SHOW | SWPOS_ACTIVATE;
+        break;
     case SW_MINIMIZE:
-        showstate = SWPOS_MINIMIZE;
-        break;
+        showstate = SWPOS_MINIMIZE;
+        break;
     case SW_SHOWMAXIMIZED:
-        showstate = SWPOS_MAXIMIZE | SWPOS_SHOW | SWPOS_ACTIVATE;
-        break;
+        showstate = SWPOS_MAXIMIZE | SWPOS_SHOW | SWPOS_ACTIVATE;
+        break;
     case SW_SHOWMINIMIZED:
-        showstate = SWPOS_MINIMIZE | SWPOS_SHOW | SWPOS_ACTIVATE;
-        break;
+        showstate = SWPOS_MINIMIZE | SWPOS_SHOW | SWPOS_ACTIVATE;
+        break;
     case SW_SHOWMINNOACTIVE:
-        showstate = SWPOS_MINIMIZE | SWPOS_SHOW;
-        break;
+        showstate = SWPOS_MINIMIZE | SWPOS_SHOW;
+        break;
     case SW_SHOWNA:
-        showstate = SWPOS_SHOW;
-        break;
+        showstate = SWPOS_SHOW;
+        break;
     case SW_SHOWNOACTIVATE:
-        showstate = SWPOS_SHOW;
-        break;
+        showstate = SWPOS_SHOW;
+        break;
     case SW_SHOWNORMAL:
-        showstate = SWPOS_RESTORE | SWPOS_ACTIVATE | SWPOS_SHOW;
-        break;
+        showstate = SWPOS_RESTORE | SWPOS_ACTIVATE | SWPOS_SHOW;
+        break;
     }
     return OSLibWinShowWindow(OS2HwndFrame, showstate);
@@ -1512 +1517 @@
    dprintf (("SetWindowPos %x %x (%d,%d)(%d,%d) %x", Win32Hwnd, hwndInsertAfter, x, y, cx, cy, fuFlags));
 
-   /* Validate the flags passed in ...                   */
+   /* Validate the flags passed in ...                   */
    if ( fuFlags &
-        ~(SWP_NOSIZE     | SWP_NOMOVE     | SWP_NOZORDER     |
-          SWP_NOREDRAW   | SWP_NOACTIVATE | SWP_FRAMECHANGED |
-          SWP_SHOWWINDOW | SWP_HIDEWINDOW | SWP_NOCOPYBITS   |
-          SWP_NOOWNERZORDER) )
+        ~(SWP_NOSIZE     | SWP_NOMOVE     | SWP_NOZORDER     |
+          SWP_NOREDRAW   | SWP_NOACTIVATE | SWP_FRAMECHANGED |
+          SWP_SHOWWINDOW | SWP_HIDEWINDOW | SWP_NOCOPYBITS   |
+          SWP_NOOWNERZORDER) )
    {
       return FALSE;
@@ -1528 +1533 @@
    // Set up with Windows values.
    //****************************
-   wpos.flags            = fuFlags;
-   wpos.cy               = cy;
-   wpos.cx               = cx;
-   wpos.x                = x;
-   wpos.y                = y;
+   wpos.flags            = fuFlags;
+   wpos.cy               = cy;
+   wpos.cx               = cx;
+   wpos.x                = x;
+   wpos.y                = y;
    wpos.hwndInsertAfter  = hwndInsertAfter;
-   wpos.hwnd             = getWindowHandle();
+   wpos.hwnd             = getWindowHandle();
 
    //**********************************************
@@ -1542 +1547 @@
        if (isChild())
        {
-           hParent = getParent()->getOS2WindowHandle();
-           OSLibWinQueryWindowPos(OS2Hwnd, &swpOld);
+           hParent = getParent()->getOS2WindowHandle();
+           OSLibWinQueryWindowPos(OS2Hwnd, &swpOld);
        } else
-           OSLibWinQueryWindowPos(OS2HwndFrame, &swpOld);
+           OSLibWinQueryWindowPos(OS2HwndFrame, &swpOld);
    }
    OSLibMapWINDOWPOStoSWP(&wpos, &swp, &swpOld, hParent, OS2HwndFrame);
@@ -1590 +1595 @@
    if (rc == FALSE)
    {
-//      SET_ERROR_LAST();
+//      SET_ERROR_LAST();
    }
    else
@@ -1602 +1607 @@
       ** a WM_UPDATEFRAME, which will provide the behavior of WM_NCCALCSIZE.
       */
-//      if (fuFlags & SWP_FRAMECHANGED_W)
-//         WinSendMsg(hWindow, WM_UPDATEFRAME, (MPARAM)-1, 0);
+//      if (fuFlags & SWP_FRAMECHANGED_W)
+//         WinSendMsg(hWindow, WM_UPDATEFRAME, (MPARAM)-1, 0);
    }
 
@@ -1622 +1627 @@
     return getParent()->getWindowHandle();
   }
-  else  return 0;
+  else  return 0;
 }
 //******************************************************************************
@@ -1632 +1637 @@
 
    if(getParent()) {
-        oldhwnd = getParent()->getWindowHandle();
+        oldhwnd = getParent()->getWindowHandle();
    }
    else oldhwnd = 0;
@@ -1638 +1643 @@
    if(hwndNewParent == 0) {//desktop window = parent
     setParent(NULL);
-        OSLibWinSetParent(getOS2WindowHandle(), OSLIB_HWND_DESKTOP);
-        return oldhwnd;
+        OSLibWinSetParent(getOS2WindowHandle(), OSLIB_HWND_DESKTOP);
+        return oldhwnd;
    }
    newparent = GetWindowFromHandle(hwndNewParent);
    if(newparent)
    {
-        setParent(newparent);
-        OSLibWinSetParent(getOS2WindowHandle(), getParent()->getOS2WindowHandle());
-        return oldhwnd;
+        setParent(newparent);
+        OSLibWinSetParent(getOS2WindowHandle(), getParent()->getOS2WindowHandle());
+        return oldhwnd;
    }
    SetLastError(ERROR_INVALID_PARAMETER);
@@ -1658 +1663 @@
     return getParent()->getWindowHandle() == hwndParent;
   }
-  else  return 0;
+  else  return 0;
 }
 //******************************************************************************
@@ -1677 +1682 @@
     if(OSLibWinQueryUpdateRect(OS2Hwnd, &rect))
     {//update region not empty
-        HDC hdc;
-
-        hdc = O32_GetDC(OS2Hwnd);
-        if (isIcon)
-        {
-            SendInternalMessageA(WM_ICONERASEBKGND, (WPARAM)hdc, 0);
-            SendInternalMessageA(WM_PAINTICON, 0, 0);
-        } else
-        {
-            SendInternalMessageA(WM_ERASEBKGND, (WPARAM)hdc, 0);
-            SendInternalMessageA(WM_PAINT, 0, 0);
-        }
-        O32_ReleaseDC(OS2Hwnd, hdc);
+        HDC hdc;
+
+        hdc = O32_GetDC(OS2Hwnd);
+        if (isIcon)
+        {
+            SendInternalMessageA(WM_ICONERASEBKGND, (WPARAM)hdc, 0);
+            SendInternalMessageA(WM_PAINTICON, 0, 0);
+        } else
+        {
+            SendInternalMessageA(WM_ERASEBKGND, (WPARAM)hdc, 0);
+            SendInternalMessageA(WM_PAINT, 0, 0);
+        }
+        O32_ReleaseDC(OS2Hwnd, hdc);
     }
     return TRUE;
@@ -1705 +1710 @@
 //******************************************************************************
 HWND Win32BaseWindow::FindWindowEx(HWND hwndParent, HWND hwndChildAfter, LPSTR lpszClass, LPSTR lpszWindow,
-                               BOOL fUnicode)
+                               BOOL fUnicode)
 {
  Win32BaseWindow *parent = GetWindowFromHandle(hwndParent);
@@ -1714 +1719 @@
        (hwndParent == OSLIB_HWND_DESKTOP && hwndChildAfter != 0))
     {
-        dprintf(("Win32BaseWindow::FindWindowEx: parent or child not found %x %x", hwndParent, hwndChildAfter));
-        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-        return 0;
+        dprintf(("Win32BaseWindow::FindWindowEx: parent or child not found %x %x", hwndParent, hwndChildAfter));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return 0;
     }
     if(hwndParent != OSLIB_HWND_DESKTOP)
     {//if the current process owns the window, just do a quick search
-        child = (Win32BaseWindow *)parent->getFirstChild();
-        if(hwndChildAfter != 0)
-        {
-            while(child)
-            {
-                if(child->getWindowHandle() == hwndChildAfter)
-                {
-                    child = (Win32BaseWindow *)child->getNextChild();
-                    break;
-                }
-                child = (Win32BaseWindow *)child->getNextChild();
-            }
-        }
-        while(child)
-        {
-            if(child->getWindowClass()->hasClassName(lpszClass, fUnicode) &&
-               (!lpszWindow || child->hasWindowName(lpszWindow, fUnicode)))
-            {
-                dprintf(("FindWindowEx: Found window %x", child->getWindowHandle()));
-                return child->getWindowHandle();
-            }
-            child = (Win32BaseWindow *)child->getNextChild();
-        }
+        child = (Win32BaseWindow *)parent->getFirstChild();
+        if(hwndChildAfter != 0)
+        {
+            while(child)
+            {
+                if(child->getWindowHandle() == hwndChildAfter)
+                {
+                    child = (Win32BaseWindow *)child->getNextChild();
+                    break;
+                }
+                child = (Win32BaseWindow *)child->getNextChild();
+            }
+        }
+        while(child)
+        {
+            if(child->getWindowClass()->hasClassName(lpszClass, fUnicode) &&
+               (!lpszWindow || child->hasWindowName(lpszWindow, fUnicode)))
+            {
+                dprintf(("FindWindowEx: Found window %x", child->getWindowHandle()));
+                return child->getWindowHandle();
+            }
+            child = (Win32BaseWindow *)child->getNextChild();
+        }
     }
     else {
-        Win32BaseWindow *wnd;
-        HWND henum, hwnd;
-
-        henum = OSLibWinBeginEnumWindows(OSLIB_HWND_DESKTOP);
-        hwnd = OSLibWinGetNextWindow(henum);
-
-        while(hwnd)
-        {
-            wnd = GetWindowFromOS2Handle(hwnd);
-            if(wnd == NULL) {
-                hwnd = OSLibWinQueryClientWindow(hwnd);
-                if(hwnd)  wnd = GetWindowFromOS2Handle(hwnd);
-            }
-
-            if(wnd) {
-                LPVOID sharedmembase = (LPVOID)OSLibWinGetWindowULong(hwnd, OFFSET_WIN32PM_SHAREDMEM);
-
-                if(OSLibDosGetSharedMem(sharedmembase, MAX_HEAPSIZE, OSLIB_PAG_READ) != 0) {
-                    dprintf(("OSLibDosGetSharedMem returned error for %x", wnd));
-                    break;
-                }
-                if(wnd->getWindowClass()->hasClassName(lpszClass, fUnicode) &&
-                   (!lpszWindow || wnd->hasWindowName(lpszWindow, fUnicode)))
-                {
-                    OSLibWinEndEnumWindows(henum);
-                    dprintf(("FindWindowEx: Found window %x", wnd->getWindowHandle()));
-                    return wnd->getWindowHandle();
-                }
-            }
-            hwnd = OSLibWinGetNextWindow(henum);
-        }
-        OSLibWinEndEnumWindows(henum);
+        Win32BaseWindow *wnd;
+        HWND henum, hwnd;
+
+        henum = OSLibWinBeginEnumWindows(OSLIB_HWND_DESKTOP);
+        hwnd = OSLibWinGetNextWindow(henum);
+
+        while(hwnd)
+        {
+            wnd = GetWindowFromOS2Handle(hwnd);
+            if(wnd == NULL) {
+                hwnd = OSLibWinQueryClientWindow(hwnd);
+                if(hwnd)  wnd = GetWindowFromOS2Handle(hwnd);
+            }
+
+            if(wnd) {
+                LPVOID sharedmembase = (LPVOID)OSLibWinGetWindowULong(hwnd, OFFSET_WIN32PM_SHAREDMEM);
+
+                if(OSLibDosGetSharedMem(sharedmembase, MAX_HEAPSIZE, OSLIB_PAG_READ) != 0) {
+                    dprintf(("OSLibDosGetSharedMem returned error for %x", wnd));
+                    break;
+                }
+                if(wnd->getWindowClass()->hasClassName(lpszClass, fUnicode) &&
+                   (!lpszWindow || wnd->hasWindowName(lpszWindow, fUnicode)))
+                {
+                    OSLibWinEndEnumWindows(henum);
+                    dprintf(("FindWindowEx: Found window %x", wnd->getWindowHandle()));
+                    return wnd->getWindowHandle();
+                }
+            }
+            hwnd = OSLibWinGetNextWindow(henum);
+        }
+        OSLibWinEndEnumWindows(henum);
     }
     SetLastError(ERROR_CANNOT_FIND_WND_CLASS); //TODO: not always correct
@@ -1787 +1792 @@
 {
  Win32BaseWindow  *win32wnd;
- ULONG         magic;
- ULONG         getcmd = 0;
- HWND          hwndRelated;
+ ULONG         magic;
+ ULONG         getcmd = 0;
+ HWND          hwndRelated;
 
     dprintf(("GetWindow %x %d NOT COMPLETE", getWindowHandle(), uCmd));
     switch(uCmd)
     {
-        case GW_CHILD:
-            getcmd = QWOS_TOP;
-            break;
-        case GW_HWNDFIRST:
-            if(getParent()) {
-                    getcmd = QWOS_TOP; //top of child windows
-            }
-            else    getcmd = QWOS_TOP; //TODO
-            break;
-        case GW_HWNDLAST:
-            if(getParent()) {
-                    getcmd = QWOS_BOTTOM; //bottom of child windows
-            }
-            else    getcmd = QWOS_BOTTOM; //TODO
-            break;
-        case GW_HWNDNEXT:
-            getcmd = QWOS_NEXT;
-            break;
-        case GW_HWNDPREV:
-            getcmd = QWOS_PREV;
-            break;
-        case GW_OWNER:
-            if(owner) {
-                    return owner->getWindowHandle();
-            }
-            else    return 0;
+        case GW_CHILD:
+            getcmd = QWOS_TOP;
+            break;
+        case GW_HWNDFIRST:
+            if(getParent()) {
+                    getcmd = QWOS_TOP; //top of child windows
+            }
+            else    getcmd = QWOS_TOP; //TODO
+            break;
+        case GW_HWNDLAST:
+            if(getParent()) {
+                    getcmd = QWOS_BOTTOM; //bottom of child windows
+            }
+            else    getcmd = QWOS_BOTTOM; //TODO
+            break;
+        case GW_HWNDNEXT:
+            getcmd = QWOS_NEXT;
+            break;
+        case GW_HWNDPREV:
+            getcmd = QWOS_PREV;
+            break;
+        case GW_OWNER:
+            if(owner) {
+                    return owner->getWindowHandle();
+            }
+            else    return 0;
     }
     hwndRelated = OSLibWinQueryWindow(OS2Hwnd, getcmd);
     if(hwndRelated)
     {
-        win32wnd = (Win32BaseWindow *)OSLibWinGetWindowULong(hwndRelated, OFFSET_WIN32WNDPTR);
-        magic    = OSLibWinGetWindowULong(hwndRelated, OFFSET_WIN32PM_MAGIC);
-        if(CheckMagicDword(magic) && win32wnd)
-        {
-            return win32wnd->getWindowHandle();
-        }
+        win32wnd = (Win32BaseWindow *)OSLibWinGetWindowULong(hwndRelated, OFFSET_WIN32WNDPTR);
+        magic    = OSLibWinGetWindowULong(hwndRelated, OFFSET_WIN32PM_MAGIC);
+        if(CheckMagicDword(magic) && win32wnd)
+        {
+            return win32wnd->getWindowHandle();
+        }
     }
     return 0;
@@ -1856 +1861 @@
 HWND Win32BaseWindow::GetActiveWindow()
 {
- HWND          hwndActive;
+ HWND          hwndActive;
  Win32BaseWindow  *win32wnd;
- ULONG         magic;
+ ULONG         magic;
 
   hwndActive = OSLibWinQueryActiveWindow();
@@ -1866 +1871 @@
   if(CheckMagicDword(magic) && win32wnd)
   {
-        return win32wnd->getWindowHandle();
+        return win32wnd->getWindowHandle();
   }
   return hwndActive;
@@ -1899 +1904 @@
 {
     if(fUnicode) {
-            return (lstrcmpW(windowNameW, (LPWSTR)wndname) == 0);
+            return (lstrcmpW(windowNameW, (LPWSTR)wndname) == 0);
     }
     else    return (strcmp(windowNameA, wndname) == 0);
@@ -1920 +1925 @@
 {
     if(lpsz == NULL)
-        return FALSE;
+        return FALSE;
 
     if(isUnicode == FALSE) {
-        windowNameA = (LPSTR)_smalloc(strlen(lpsz)+1);
-        strcpy(windowNameA, lpsz);
-        windowNameW = (LPWSTR)_smalloc((strlen(lpsz)+1)*sizeof(WCHAR));
-        lstrcpyAtoW(windowNameW, windowNameA);
+        windowNameA = (LPSTR)_smalloc(strlen(lpsz)+1);
+        strcpy(windowNameA, lpsz);
+        windowNameW = (LPWSTR)_smalloc((strlen(lpsz)+1)*sizeof(WCHAR));
+        lstrcpyAtoW(windowNameW, windowNameA);
     }
     else {
-        windowNameW = (LPWSTR)_smalloc((lstrlenW((LPWSTR)lpsz)+1)*sizeof(WCHAR));
-        lstrcpyW(windowNameW, (LPWSTR)lpsz);
-        windowNameA = (LPSTR)_smalloc(lstrlenW((LPWSTR)lpsz)+1);
-        lstrcpyWtoA(windowNameA, windowNameW);
+        windowNameW = (LPWSTR)_smalloc((lstrlenW((LPWSTR)lpsz)+1)*sizeof(WCHAR));
+        lstrcpyW(windowNameW, (LPWSTR)lpsz);
+        windowNameA = (LPSTR)_smalloc(lstrlenW((LPWSTR)lpsz)+1);
+        lstrcpyWtoA(windowNameA, windowNameW);
     }
     wndNameLength = strlen(windowNameA)+1; //including 0 terminator
 
     if(OS2Hwnd)
-        return OSLibWinSetWindowText(OS2Hwnd, (LPSTR)windowNameA);
+        return OSLibWinSetWindowText(OS2Hwnd, (LPSTR)windowNameA);
 
     return TRUE;
@@ -1948 +1953 @@
 
    switch(index) {
-        case GWL_EXSTYLE:
-                oldval = dwExStyle;
-                setExStyle(value);
-                return oldval;
-        case GWL_STYLE:
-                oldval = dwStyle;
-                setStyle(value);
-                return oldval;
-        case GWL_WNDPROC:
-                oldval = (LONG)getWindowProc();
-                setWindowProc((WNDPROC)value);
-                return oldval;
-        case GWL_HINSTANCE:
-                oldval = hInstance;
-                hInstance = value;
-                return oldval;
-        case GWL_HWNDPARENT:
-                return SetParent((HWND)value);
-
-        case GWL_ID:
-                oldval = getWindowId();
-                setWindowId(value);
-                return oldval;
-        case GWL_USERDATA:
-                oldval = userData;
-                userData = value;
-                return oldval;
-        default:
-                if(index >= 0 && index/4 < nrUserWindowLong)
-                {
-                        oldval = userWindowLong[index/4];
-                        userWindowLong[index/4] = value;
-                        return oldval;
-                }
-                SetLastError(ERROR_INVALID_PARAMETER);
-                return 0;
+        case GWL_EXSTYLE:
+                oldval = dwExStyle;
+                setExStyle(value);
+                return oldval;
+        case GWL_STYLE:
+                oldval = dwStyle;
+                setStyle(value);
+                return oldval;
+        case GWL_WNDPROC:
+                oldval = (LONG)getWindowProc();
+                setWindowProc((WNDPROC)value);
+                return oldval;
+        case GWL_HINSTANCE:
+                oldval = hInstance;
+                hInstance = value;
+                return oldval;
+        case GWL_HWNDPARENT:
+                return SetParent((HWND)value);
+
+        case GWL_ID:
+                oldval = getWindowId();
+                setWindowId(value);
+                return oldval;
+        case GWL_USERDATA:
+                oldval = userData;
+                userData = value;
+                return oldval;
+        default:
+                if(index >= 0 && index/4 < nrUserWindowLong)
+                {
+                        oldval = userWindowLong[index/4];
+                        userWindowLong[index/4] = value;
+                        return oldval;
+                }
+                SetLastError(ERROR_INVALID_PARAMETER);
+                return 0;
    }
 }
@@ -1991 +1996 @@
 {
    switch(index) {
-        case GWL_EXSTYLE:
-                return dwExStyle;
-        case GWL_STYLE:
-                return dwStyle;
-        case GWL_WNDPROC:
-                return (ULONG)getWindowProc();
-        case GWL_HINSTANCE:
-                return hInstance;
-        case GWL_HWNDPARENT:
-                if(getParent()) {
-                        return getParent()->getWindowHandle();
-                }
-                else    return 0;
-        case GWL_ID:
-                return getWindowId();
-        case GWL_USERDATA:
-                return userData;
-        default:
-                if(index >= 0 && index/4 < nrUserWindowLong)
-                {
-                        return userWindowLong[index/4];
-                }
-                SetLastError(ERROR_INVALID_PARAMETER);
-                return 0;
+        case GWL_EXSTYLE:
+                return dwExStyle;
+        case GWL_STYLE:
+                return dwStyle;
+        case GWL_WNDPROC:
+                return (ULONG)getWindowProc();
+        case GWL_HINSTANCE:
+                return hInstance;
+        case GWL_HWNDPARENT:
+                if(getParent()) {
+                        return getParent()->getWindowHandle();
+                }
+                else    return 0;
+        case GWL_ID:
+                return getWindowId();
+        case GWL_USERDATA:
+                return userData;
+        default:
+                if(index >= 0 && index/4 < nrUserWindowLong)
+                {
+                        return userWindowLong[index/4];
+                }
+                SetLastError(ERROR_INVALID_PARAMETER);
+                return 0;
    }
 }
@@ -2025 +2030 @@
    if(index >= 0 && index/4 < nrUserWindowLong)
    {
-        oldval = ((WORD *)userWindowLong)[index/2];
-        ((WORD *)userWindowLong)[index/2] = value;
-        return oldval;
+        oldval = ((WORD *)userWindowLong)[index/2];
+        ((WORD *)userWindowLong)[index/2] = value;
+        return oldval;
    }
    SetLastError(ERROR_INVALID_PARAMETER);
@@ -2038 +2043 @@
    if(index >= 0 && index/4 < nrUserWindowLong)
    {
-        return ((WORD *)userWindowLong)[index/2];
+        return ((WORD *)userWindowLong)[index/2];
    }
    SetLastError(ERROR_INVALID_PARAMETER);
@@ -2050 +2055 @@
 
    if(HwGetWindowHandleData(hwnd, (DWORD *)&window) == TRUE) {
-        return window;
+        return window;
    }
    else return NULL;
@@ -2059 +2064 @@
 {
  Win32BaseWindow *win32wnd;
- DWORD        magic;
+ DWORD        magic;
 
   win32wnd = (Win32BaseWindow *)OSLibWinGetWindowULong(hwnd, OFFSET_WIN32WNDPTR);
@@ -2065 +2070 @@
 
   if(win32wnd && CheckMagicDword(magic)) {
-        return win32wnd;
+        return win32wnd;
   }
   return 0;

trunk/src/user32/new/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.3 1999-09-03 15:09:45 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.4 1999-09-04 17:56:41 dengert Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -17 +17 @@
 
 #include <win32class.h>
+#include "open32wbase.h"
 #include <gen_object.h>
 #include <win32wndchild.h>
@@ -31 +32 @@
 #define CheckMagicDword(a)      (a==WIN32PM_MAGIC)
 
-#define WIN32APP_USERMSGBASE            0x1000
+#define WIN32APP_USERMSGBASE            0x1000
 
 typedef struct {
@@ -110 +111 @@
          PRECT  getWindowRect()                 { return &rectWindow; };
          void   setClientRect(LONG left, LONG top, LONG right, LONG bottom)
-         { 
-                rectClient.left  = left;  rectClient.top    = top;
-                rectClient.right = right; rectClient.bottom = bottom;
-         };
-         void   setWindowRect(LONG left, LONG top, LONG right, LONG bottom)
-         { 
-                rectWindow.left  = left;  rectWindow.top    = top;
-                rectWindow.right = right; rectWindow.bottom = bottom;
-         };
+         {
+                rectClient.left  = left;  rectClient.top    = top;
+                rectClient.right = right; rectClient.bottom = bottom;
+         };
+         void   setWindowRect(LONG left, LONG top, LONG right, LONG bottom)
+         {
+                rectWindow.left  = left;  rectWindow.top    = top;
+                rectWindow.right = right; rectWindow.bottom = bottom;
+         };
          void   setWindowRect(PRECT rect)       { rectWindow = *rect; };
 
@@ -158 +159 @@
           BOOL  hasWindowName(LPSTR wndname, BOOL fUnicode = 0);
 Win32WndClass  *getClass()  { return windowClass; };
-        char   *getWindowNameA()              { return windowNameA; };
+        char   *getWindowNameA()              { return windowNameA; };
 Win32BaseWindow *getOwner()                   { return owner; };
 
@@ -175 +176 @@
     static HWND Win32ToOS2Handle(HWND hwnd)
     {
-        Win32BaseWindow *window = GetWindowFromHandle(hwnd);
-
-        if(window) {
-                return window->getOS2WindowHandle();
-        }
-        else  return hwnd;    //OS/2 window handle 
+        Win32BaseWindow *window = GetWindowFromHandle(hwnd);
+
+        if(window) {
+                return window->getOS2WindowHandle();
+        }
+        else  return hwnd;    //OS/2 window handle
     }
 
     static HWND OS2ToWin32Handle(HWND hwnd)
     {
-        Win32BaseWindow *window = GetWindowFromOS2Handle(hwnd);
-
-        if(window) {
-                return window->getWindowHandle();
-        }
-        else  return hwnd;    //OS/2 window handle
+        Win32BaseWindow *window = GetWindowFromOS2Handle(hwnd);
+
+        if(window) {
+                return window->getWindowHandle();
+        }
+        else  return hwnd;    //OS/2 window handle
     }
 
@@ -265 +266 @@
      }
 #endif
+
+public:
+       void SetFakeOpen32()    { WinSetDAXData (OS2Hwnd, &fakeWinBase); }
+       void RemoveFakeOpen32() { WinSetDAXData (OS2Hwnd, NULL); }
+
+  fakeOpen32WinBaseClass fakeWinBase;
 };
 

trunk/src/user32/new/wingdi.cpp

@@ -1 @@
-/* $Id: wingdi.cpp,v 1.12 1999-09-01 18:48:50 sandervl Exp $ */
+/* $Id: wingdi.cpp,v 1.13 1999-09-04 17:56:41 dengert Exp $ */
 /*
  * Win32 Window graphics apis for OS/2
@@ -32 +32 @@
     return 0;
     }
-    window->MsgEraseBackGround(hdc);
+// !! there is no HDC to paint on !!!    window->MsgEraseBackGround(hdc);
 #ifdef OPEN32_GDI
     hdc = O32_BeginPaint(window->getOS2WindowHandle(),lps);