Release 971116
Sun Nov 16 07:42:44 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c] [windows/clipboard.c] [windows/nonclient.c]
Bug fixes.
* [misc/shell.c] [resources/*]
New "About" dialog.
Sat Nov 15 17:30:18 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [configure.in] [Makefile.in]
Replaced --with-library option by --disable-emulator. The default
is now to build both the library and the emulator.
Renamed --with options to --enable to follow autoconf guidelines.
* [loader/main.c] [miscemu/main.c] (New file)
Split initialization in WinelibInit/EmulatorInit.
* [loader/*.c]
Removed all remaining #ifdef's WINELIB.
* [controls/widgets.c] [windows/mdi.c]
Converted MDIClientWndProc to 32-bit.
* [debugger/break.c] [if1632/signal.c] [include/selectors.h]
[scheduler/thread.c]
Code and data selector values are now computed at run-time.
* [library/libres.c]
Moved to loader/ directory.
* [misc/main.c] [misc/version.c] (New file)
Moved all version stuff to version.c. Cleaned up a bit.
* [msdos/dpmi.c]
Update the REALMODECALL structure on return from real-mode
interrupt.
* [windows/event.c] [windows/keyboard.c]
Changed the way event coordinates are determined. Don't rely on
the ConfigureNotify event values. This should fix all problems
with cursor position in -desktop and -managed modes.
Sat Nov 15 16:09:36 1997 Slaven Rezic <eserte@cs.tu-berlin.de>
* [controls/button.c]
(BUTTON_CheckAutoRadioButton): Prevent possible endless loop.
Wed Nov 12 03:42:45 1997 Chris Faherty <chrisf@america.com>
* [misc/ver.c]
Changed VerInstall32A to assume srcdir as destination if destdir
is blank. This was causing alot of DLL installation into SYSTEM
directory to fail.
* [loader/ne_image.c]
NE_LoadSegment buffer[100] was too small and getting overruns.
Changed it to buffer[200].
Sat Nov 8 06:09:57 1997 Len White <phreak@cgocable.net>
* [misc/ddeml.c] [include/ddeml.h] [if1632/ddeml.spec]
Added stub functions DdeConnectList(), DdeQueryNextServer(),
DdeDisconnectList(), DdeSetUserHandle(), DdeAbandonTransaction(),
DdePostAdvise(), DdeCreateDataHandle(), DdeAddData(), DdeGetData(),
DdeAccessData(), DdeUnaccessData(), DdeEnableCallback(),
DdeCmpStringHandles().
Fri Nov 7 19:44:26 1997 Olaf Flebbe <o.flebbe@science-computing.de>
* [files/directory.c]
Fix typo in directory.c [broke loading of cdplayer on nt40]
* [misc/main.c]
Implemented -winver nt40.
* [loader/resource.c] [user32.spec]
Stubs for CopyAcceleratorTable, Destroy AcceleratorTable.
Thu Nov 6 22:37:04 1997 Morten Welinder <welinder@rentec.com>
* [files/drive.c]
(GetDiskFreeSpace32A): Cap at 2GB.
* [include/windows.h]
Prototype DrawIconEx and CreateDIBSection32.
Define OBM_RADIOCHECK.
Add DI_* macros.
* [objects/dib.c] [if1632/gdi.spec]
CreateDIBSection is a WINAPI. Renamed to CreateDIBSection32.
Implement CreateDIBSection16.
* [if1632/user.spec] [if1632/user32.spec]
Add DrawIconEx.
* [objects/cursoricon.c]
(CopyIcon32): Fix bogus implementation.
* [objects/bitmap.c]
(CopyBitmap32): New function.
(CopyImage32): Do bitmaps.
* [graphics/x11drv/text.c]
(X11DRV_ExtTextOut): Change ascent and descent default to avoid
zero-thinkness overstrike line.
* [include/debugstr.h] [misc/debugstr.c]
New files.
* [msdos/dpmi.c]
Don't prototype do_mscdex. In INT_Int31Handler, handle real-mode
int 0x21, ah=0x52.
* [msdos/int2f.c]
Add dummys for 0x1681 and 0x1682.
* [misc/registry.c]
Fix memory leaks in RegDeleteKey32W.
* [objects/text.c]
In TEXT_NextLine, fix another off-by-one bug.
* [include/bitmaps/obm_radiocheck]
New file. (It a small circle used to radio-button menu items
when selected.)
* [objects/oembitmap.c]
Add obm_radiocheck.
* [include/windows.h] [if1632/user32.spec] [controls/menu.c]
[if1632/user.spec]
Define CheckMenuRadioItem{16,32}. Define GetMenuItemRect{16,32}.
Wed Nov 5 11:30:14 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [misc/main.c]
Auto adjust versions depending on binary.
Tue Nov 4 15:21:00 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [controls/listbox.c]
Paint full background in listbox items with tab stops enabled.
* [if1632/thunk.c]
Copy some more message parameter structures (DRAWITEMSTRUCT16,
COMPAREITEMSTRUCT16) to the stack segment to fix broken programs
that need this.
* [windows/dce.c]
Only clip sibling windows when the parent has the WS_CLIPSIBLINGS
style set.
* [windows/focus.c]
Make order of events in FOCUS_SwitchFocus() reflect API docs.
* [windows/defdlg.c]
Fix problem with loss of focus in some dialogs.
* [win32/code_page.c]
Fix return value for MultiByteToWideChar().
* [BUGS]
BCW now works.
diff --git a/loader/main.c b/loader/main.c
index d5bd59e..ed75c11 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -1,7 +1,7 @@
/*
-static char RCSId[] = "$Id: wine.c,v 1.2 1993/07/04 04:04:21 root Exp root $";
-static char Copyright[] = "Copyright Robert J. Amstadt, 1993";
-*/
+ * Main initialization code
+ */
+
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
@@ -23,7 +23,6 @@
#include "queue.h"
#include "syscolor.h"
#include "sysmetrics.h"
-#include "callback.h"
#include "file.h"
#include "gdi.h"
#include "heap.h"
@@ -41,78 +40,48 @@
#include "stddebug.h"
#include "debug.h"
-#ifndef WINELIB
-#include "debugger.h"
-#endif
int __winelib = 1; /* Winelib run-time flag */
HANDLE32 SystemHeap = 0;
HANDLE32 SegptrHeap = 0;
+
/***********************************************************************
- * Main initialisation routine
+ * Kernel initialisation routine
*/
-int MAIN_Init(void)
+BOOL32 MAIN_KernelInit(void)
{
extern BOOL32 EVENT_Init(void);
- extern BOOL32 RELAY_Init(void);
- extern BOOL32 WIN16DRV_Init(void);
extern BOOL32 VIRTUAL_Init(void);
- extern BOOL32 WIDGETS_Init(void);
-
- int queueSize;
/* Initialize virtual memory management */
- if (!VIRTUAL_Init()) return 0;
+ if (!VIRTUAL_Init()) return FALSE;
/* Create the system and SEGPTR heaps */
- if (!(SystemHeap = HeapCreate( HEAP_GROWABLE, 0x10000, 0 ))) return 0;
- if (!(SegptrHeap = HeapCreate( HEAP_WINE_SEGPTR, 0, 0 ))) return 0;
+ if (!(SystemHeap = HeapCreate( HEAP_GROWABLE, 0x10000, 0 ))) return FALSE;
+ if (!(SegptrHeap = HeapCreate( HEAP_WINE_SEGPTR, 0, 0 ))) return FALSE;
/* Load the configuration file */
- if (!PROFILE_LoadWineIni()) return 0;
+ if (!PROFILE_LoadWineIni()) return FALSE;
/* Initialize DOS memory */
- if (!DOSMEM_Init()) return 0;
+ if (!DOSMEM_Init()) return FALSE;
/* Initialize signal handling */
- if (!SIGNAL_Init()) return 0;
-
- /* Initialize event handling */
- if (!EVENT_Init()) return 0;
-
-#ifdef WINELIB
- /* Create USER and GDI heap */
- USER_HeapSel = GlobalAlloc16( GMEM_FIXED, 0x10000 );
- LocalInit( USER_HeapSel, 0, 0xffff );
- GDI_HeapSel = GlobalAlloc16( GMEM_FIXED, GDI_HEAP_SIZE );
- LocalInit( GDI_HeapSel, 0, GDI_HEAP_SIZE-1 );
-#else
- /* Initialize relay code */
- if (!RELAY_Init()) return 0;
-
- /* Initialize signal handling */
- if (!SIGNAL_InitEmulator()) return 0;
-
- /* Create the Win16 printer driver */
- if (!WIN16DRV_Init()) return 0;
-#endif /* WINELIB */
-
- /* Initialize Wine tweaks */
- if (!TWEAK_Init()) return 0;
-
- /* Initialize OEM Bitmaps */
- if (!OBM_Init()) return 0;
+ if (!SIGNAL_Init()) return FALSE;
/* Initialise DOS drives */
- if (!DRIVE_Init()) return 0;
+ if (!DRIVE_Init()) return FALSE;
/* Initialise DOS directories */
- if (!DIR_Init()) return 0;
+ if (!DIR_Init()) return FALSE;
/* Initialize tasks */
- if (!TASK_Init()) return 0;
+ if (!TASK_Init()) return FALSE;
+
+ /* Initialize event handling */
+ if (!EVENT_Init()) return FALSE;
/* Initialize communications */
COMM_Init();
@@ -120,14 +89,45 @@
/* Initialize IO-port permissions */
IO_port_init();
+ return TRUE;
+}
+
+
+/***********************************************************************
+ * USER (and GDI) initialisation routine
+ */
+BOOL32 MAIN_UserInit(void)
+{
+ extern BOOL32 WIDGETS_Init(void);
+
+ int queueSize;
+
+ /* Create USER and GDI heap */
+ if (!USER_HeapSel)
+ {
+ USER_HeapSel = GlobalAlloc16( GMEM_FIXED, 0x10000 );
+ LocalInit( USER_HeapSel, 0, 0xffff );
+ }
+ if (!GDI_HeapSel)
+ {
+ GDI_HeapSel = GlobalAlloc16( GMEM_FIXED, GDI_HEAP_SIZE );
+ LocalInit( GDI_HeapSel, 0, GDI_HEAP_SIZE-1 );
+ }
+
+ /* Initialize Wine tweaks */
+ if (!TWEAK_Init()) return FALSE;
+
+ /* Initialize OEM Bitmaps */
+ if (!OBM_Init()) return FALSE;
+
/* registry initialisation */
SHELL_LoadRegistry();
/* Global atom table initialisation */
- if (!ATOM_Init()) return 0;
+ if (!ATOM_Init()) return FALSE;
/* GDI initialisation */
- if (!GDI_Init()) return 0;
+ if (!GDI_Init()) return FALSE;
/* Initialize system colors and metrics*/
SYSMETRICS_Init();
@@ -137,103 +137,49 @@
DCE_Init();
/* Initialize keyboard */
- if (!KEYBOARD_Init()) return 0;
+ if (!KEYBOARD_Init()) return FALSE;
/* Initialize window procedures */
- if (!WINPROC_Init()) return 0;
+ if (!WINPROC_Init()) return FALSE;
/* Initialize built-in window classes */
- if (!WIDGETS_Init()) return 0;
+ if (!WIDGETS_Init()) return FALSE;
/* Initialize dialog manager */
- if (!DIALOG_Init()) return 0;
+ if (!DIALOG_Init()) return FALSE;
/* Initialize menus */
- if (!MENU_Init()) return 0;
+ if (!MENU_Init()) return FALSE;
/* Create desktop window */
- if (!WIN_CreateDesktopWindow()) return 0;
+ if (!WIN_CreateDesktopWindow()) return FALSE;
/* Initialize message spying */
- if (!SPY_Init()) return 0;
+ if (!SPY_Init()) return FALSE;
/* Check wine.conf for old/bad entries */
- if (!TWEAK_CheckConfiguration()) return 0;
+ if (!TWEAK_CheckConfiguration()) return FALSE;
/* Create system message queue */
queueSize = GetProfileInt32A( "windows", "TypeAhead", 120 );
- if (!QUEUE_CreateSysMsgQueue( queueSize )) return 0;
+ if (!QUEUE_CreateSysMsgQueue( queueSize )) return FALSE;
/* Set double click time */
SetDoubleClickTime32( GetProfileInt32A("windows","DoubleClickSpeed",452) );
+ return TRUE;
+}
+
+
+/***********************************************************************
+ * Winelib initialisation routine
+ */
+int MAIN_WinelibInit(void)
+{
+ /* Initialize the kernel */
+ if (!MAIN_KernelInit()) return 0;
+
+ /* Initialize all the USER stuff */
+ if (!MAIN_UserInit()) return 0;
return 1;
}
-
-
-#ifndef WINELIB
-/**********************************************************************
- * main
- */
-int main(int argc, char *argv[] )
-{
- extern BOOL32 MAIN_WineInit( int *argc, char *argv[] );
- extern void *CALL32_Init(void);
- extern char * DEBUG_argv0;
-
- int i,loaded;
- HINSTANCE32 handle;
-
- __winelib = 0; /* First of all, clear the Winelib flag */
-
- /*
- * Save this so that the internal debugger can get a hold of it if
- * it needs to.
- */
- DEBUG_argv0 = argv[0];
-
- if (!MAIN_WineInit( &argc, argv )) return 1;
- if (!MAIN_Init()) return 1;
-
- /* Initialize CALL32 routines */
- /* This needs to be done just before task-switching starts */
- IF1632_CallLargeStack = (int (*)(int (*func)(), void *arg))CALL32_Init();
-
- loaded=0;
- for (i = 1; i < argc; i++)
- {
- if ((handle = WinExec32( argv[i], SW_SHOWNORMAL )) < 32)
- {
- fprintf(stderr, "wine: can't exec '%s': ", argv[i]);
- switch (handle)
- {
- case 2: fprintf( stderr, "file not found\n" ); break;
- case 11: fprintf( stderr, "invalid exe file\n" ); break;
- case 21: fprintf( stderr, "win32 executable\n" ); break;
- default: fprintf( stderr, "error=%d\n", handle ); break;
- }
- return 1;
- }
- loaded++;
- }
-
- if (!loaded) { /* nothing loaded */
- extern void MAIN_Usage(char*);
- MAIN_Usage(argv[0]);
- return 1;
- }
-
- if (!GetNumTasks())
- {
- fprintf( stderr, "wine: no executable file found.\n" );
- return 0;
- }
-
- if (Options.debug) DEBUG_AddModuleBreakpoints();
-
- Yield(); /* Start the first task */
- fprintf( stderr, "WinMain: Should never happen: returned from Yield()\n" );
- return 0;
-}
-
-#endif /* #ifndef WINELIB */
