Sun Oct 16 13:29:07 1994 Alexandre Julliard (julliard@lamisun.epfl.ch) * [controls/button.c] Implemented WM_GETDLGCODE, WM_SETFONT, BM_SETSTYLE, BM_SETCHECK, BM_SETSTATE. Implemented default button painting. Optimised redrawing. Fixed owner-draw buttons. * [controls/static.c] Implemented WM_SETFONT. A few optimisations in painting code. Bug fix for SS_SIMPLE controls. * [if1632/callback.c] Preliminary GetCodeHandle(). * [if1632/gdi.spec] Changed 'pascal' to 'pascal16' everywhere it's needed. * [include/windows.h] Fixed a few data structures. * [memory/heap.c] Bug fix in HEAP_ReAlloc(). * [misc/cursor.c] Fixed SetCursor(). * [objects/bitblt.c] Fixed PatBlt() when using BLACKNESS or WHITENESS codes. * [objects/font.c] Better font mapping code. Implemented GetTextFace(). * [objects/region.c] Bug fix in REGION_MakePixmap(). Faster region copying. * [objects/text.c] Implemented ExtTextOut(). Implemented DT_NOCLIP style for DrawText(). * [windows/dc.c] Free the bitmap when deleting a memory DC. * [windows/dce.c] Added support for windows that have no associated X window. Implemented DCX_CLIPSIBLINGS and DCX_PARENTCLIP in GetDCEx(). * [windows/defdlg.c] Implemented default push button handling and DM_SETDEFID. Implemented WM_NEXTDLGCTL. * [windows/dialog.c] Implemented default push button handling. Beginning of a keyboard interface in dialogs (does not really work yet). Fixed dialogs that use a special font. * [windows/event.c] [windows/focus.c] Added support for non-X windows. * [windows/graphics.c] Rewritten FloodFill() and implemented ExtFloodFill(). * [windows/message.c] Cleaner hardware messages and X events handling. * [windows/defwnd.c] [windows/painting.c] Implemented WM_SETREDRAW. * [windows/win.c] Only create an X window for top-level windows, or for the desktop. Child windows now use their parent's drawable. * [windows/winpos.c] Beginning of support for non-X windows (still somewhat broken). Implemented *DeferWindowPos(). * [*/Imakefile] Cleaned up some Imakefiles. Moved dc.c from windows/ to objects/. Moved cursor.c from misc/ to windows/. Sun Oct 16 12:21:52 1994 Michael Patra <micky@marie.physik.tu-berlin.d400.de> * [include/debug.h] [include/stddebug.h] [*/*.c] Rewritten all the calls to printf for displaying debug-information (messages like "LoadImage: loading SOL (SOL.EXE)" etc.) Added option "-debugmsg" to Wine. Example: "-debugmsg +all" will turn all these messages on, "-debugmsg -dll" will turn all messages concerning DLLs off. * [controls/combo.c] Added some handling for combo controls with ownerdraw-styles (just creating and passing the necessary messages to the corresponding listbox control; the edit-control needs to be replaced with something else). * [controls/edit.c] [windows/dialog.c] Added support for use of global heap memory in dialogs with edit controls. * [controls/listbox.c] Added support for item data. ListBoxInsertString(): Fixed bug for elements which are not inserted after the currently last element. * [misc/dos_fs.c] [miscemu/int21.c] DOS_ValidDirectory(): Checks whether a given string is in fact the valid name of a directory. Sat Oct 15 17:35:00 PDT 1994 <martin@cs.csufresno.edu> * [Imakefile] generate wine.sym after creating wine * [debugger/dbg.y] load "wine.sym" when entering debugger * [debugger/info.c] symbolic backtrace for 32-bit stack. Breaks 16-bit bt. Sun Sep 25 12:00:00 PDT 1994 <martin@osiris.cs.csufresno.edu> * [rc/rc.y] [rc/rc.h] [rc/rc.l] [rc/winerc.c] Files created Sun Sep 18 11:04:45 MET DST 1994 Dag Asheim (dash@ifi.uio.no) * [misc/spy.c] Exclude and Include no longer requires a terminating ';' to register the last component. Thu Sep 15 23:10:09 MET DST 1994 Dag Asheim (dash@ifi.uio.no) * [Configure] Rewrote much of it. Added capability to generate a wine.ini file. Commented out the processor emulator options until that becomes interesting. Gives a warning if it sees any *.rej files. I hope I haven't assumed to much about the shell/OS so that it breaks under *BSD. * [misc/dos_fs.c] Removed/changed calls to ToUnix() (which calls tolower()) so that the part of the pathname which correspond with the drive letter on DOS no longer will be mapped to lowercase. This means that it should be possible to have uppercase letters in the [drives] section of wine.ini. * [LICENSE] Cosmetic changes so that it displays better in the window you get from pressing "Credit_License" in the "About WINE" window. Sun Aug 21 21:12:06 MET DST 1994 <erik@xs4all.nl> * [controls/menu.c] LoadMenu() moved to loader/resource.c. * [misc/main.c] Added stub for FileCDR(). * [include/peexe.h] Added, from Eric's pe-test. * [include/resource.h] Added. * [loader/resources.c] Removed duplicated code in *Resource() functions. Moved NE-program specific functions into ne_image.c. Moved NE-fileformat functions to ne_resource.c. * [pe_image.c] [pe_resource.c] Added. Nothing implemented to run PE-executables, resource loading only. * [misc/file.c] Changed OpenFile() to use macros. * [misc/shell.c] Added NULL-ptr checks to ShellAbout(). * [miscemu/int21.c] Fixed a few typos. * [miscemu/kernel.c] Added _DI = _DS, to put the caller's instance in DI. Doesn't work properly if caller changed DS :-(
259 lines
6.9 KiB
C
259 lines
6.9 KiB
C
/*
|
|
* Windows Exec & Help
|
|
*
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include "neexe.h"
|
|
#include "segmem.h"
|
|
#include "prototypes.h"
|
|
#include "dlls.h"
|
|
#include "wine.h"
|
|
#include "windows.h"
|
|
#include "stddebug.h"
|
|
/* #define DEBUG_EXEC /* */
|
|
/* #undef DEBUG_EXEC /* */
|
|
#include "debug.h"
|
|
|
|
#define HELP_CONTEXT 0x0001
|
|
#define HELP_QUIT 0x0002
|
|
#define HELP_INDEX 0x0003
|
|
#define HELP_CONTENTS 0x0003
|
|
#define HELP_HELPONHELP 0x0004
|
|
#define HELP_SETINDEX 0x0005
|
|
#define HELP_SETCONTENTS 0x0005
|
|
#define HELP_CONTEXTPOPUP 0x0008
|
|
#define HELP_FORCEFILE 0x0009
|
|
#define HELP_KEY 0x0101
|
|
#define HELP_COMMAND 0x0102
|
|
#define HELP_PARTIALKEY 0x0105
|
|
#define HELP_MULTIKEY 0x0201
|
|
#define HELP_SETWINPOS 0x0203
|
|
|
|
extern struct w_files * wine_files;
|
|
|
|
typedef struct {
|
|
WORD wEnvSeg;
|
|
LPSTR lpCmdLine;
|
|
LPVOID lpCmdShow;
|
|
DWORD dwReserved;
|
|
} PARAMBLOCK;
|
|
|
|
typedef BOOL (CALLBACK * LPFNWINMAIN)(HANDLE, HANDLE, LPSTR, int);
|
|
|
|
|
|
extern int CallToInit16(unsigned long csip, unsigned long sssp,
|
|
unsigned short ds);
|
|
HANDLE CreateNewTask(HINSTANCE hInst);
|
|
|
|
#ifndef WINELIB
|
|
void InitializeLoadedNewDLLs(HINSTANCE hInst)
|
|
{
|
|
struct w_files * w;
|
|
struct w_files * wpnt;
|
|
int cs_reg, ds_reg, ip_reg;
|
|
int rv;
|
|
|
|
dprintf_exec(stddeb, "Initializing New DLLs\n");
|
|
|
|
/*
|
|
* Initialize libraries
|
|
*/
|
|
dprintf_exec(stddeb,
|
|
"InitializeLoadedNewDLLs() before searching hInst=%04X !\n", hInst);
|
|
w = wine_files;
|
|
while (w && w->hinstance != hInst) w = w->next;
|
|
if (w == NULL) return;
|
|
dprintf_exec(stddeb,"InitializeLoadedNewDLLs() // before InitLoop !\n");
|
|
for(wpnt = w; wpnt; wpnt = wpnt->next)
|
|
{
|
|
/*
|
|
* Is this a library?
|
|
*/
|
|
if (wpnt->ne->ne_header->format_flags & 0x8000)
|
|
{
|
|
if (!(wpnt->ne->ne_header->format_flags & 0x0001))
|
|
{
|
|
/* Not SINGLEDATA */
|
|
fprintf(stderr, "Library is not marked SINGLEDATA\n");
|
|
exit(1);
|
|
}
|
|
|
|
ds_reg = wpnt->ne->selector_table[wpnt->ne->
|
|
ne_header->auto_data_seg-1].selector;
|
|
cs_reg = wpnt->ne->selector_table[wpnt->ne->ne_header->cs-1].selector;
|
|
ip_reg = wpnt->ne->ne_header->ip;
|
|
|
|
dprintf_exec(stddeb, "Initializing %s, cs:ip %04x:%04x, ds %04x\n",
|
|
wpnt->name, cs_reg, ip_reg, ds_reg);
|
|
|
|
rv = CallTo16(cs_reg << 16 | ip_reg, ds_reg);
|
|
dprintf_exec(stddeb,"rv = %x\n", rv);
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
void StartNewTask(HINSTANCE hInst)
|
|
{
|
|
struct w_files * wpnt;
|
|
struct w_files * w;
|
|
int cs_reg, ds_reg, ss_reg, ip_reg, sp_reg;
|
|
int rv;
|
|
int segment;
|
|
|
|
dprintf_exec(stddeb,
|
|
"StartNewTask() before searching hInst=%04X !\n", hInst);
|
|
wpnt = wine_files;
|
|
while (wpnt && wpnt->hinstance != hInst) wpnt = wpnt->next;
|
|
if (wpnt == NULL) return;
|
|
dprintf_exec(stddeb,"StartNewTask() // before FixupSegment !\n");
|
|
for(w = wpnt; w; w = w->next) {
|
|
for (segment = 0; segment < w->ne->ne_header->n_segment_tab; segment++) {
|
|
if (FixupSegment(w, segment) < 0) {
|
|
myerror("fixup failed.");
|
|
}
|
|
}
|
|
}
|
|
dprintf_exec(stddeb,"StartNewTask() before InitializeLoadedNewDLLs !\n");
|
|
InitializeLoadedNewDLLs(hInst);
|
|
dprintf_exec(stddeb,"StartNewTask() before setup register !\n");
|
|
ds_reg = (wpnt->ne->selector_table[wpnt->ne->ne_header->auto_data_seg-1].selector);
|
|
cs_reg = wpnt->ne->selector_table[wpnt->ne->ne_header->cs-1].selector;
|
|
ip_reg = wpnt->ne->ne_header->ip;
|
|
ss_reg = wpnt->ne->selector_table[wpnt->ne->ne_header->ss-1].selector;
|
|
sp_reg = wpnt->ne->ne_header->sp;
|
|
|
|
dprintf_exec(stddeb,"StartNewTask() before CallToInit16() !\n");
|
|
rv = CallToInit16(cs_reg << 16 | ip_reg, ss_reg << 16 | sp_reg, ds_reg);
|
|
printf ("rv = %x\n", rv);
|
|
|
|
}
|
|
|
|
#else
|
|
void StartNewTask (HINSTANCE hInst)
|
|
{
|
|
printf ("Not yet implemented\n");
|
|
}
|
|
#endif
|
|
|
|
/**********************************************************************
|
|
* LoadModule [KERNEL.45]
|
|
*/
|
|
HANDLE LoadModule(LPSTR modulefile, LPVOID lpParamBlk)
|
|
{
|
|
PARAMBLOCK *pblk = lpParamBlk;
|
|
WORD *lpCmdShow;
|
|
dprintf_exec(stddeb,"LoadModule '%s' %08X\n", modulefile, lpParamBlk);
|
|
if (lpParamBlk == NULL) return 0;
|
|
lpCmdShow = (WORD *)pblk->lpCmdShow;
|
|
return WinExec(pblk->lpCmdLine, lpCmdShow[1]);
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* WinExec [KERNEL.166]
|
|
*/
|
|
WORD WinExec(LPSTR lpCmdLine, WORD nCmdShow)
|
|
{
|
|
int c = 0;
|
|
int x, x2;
|
|
char *ArgV[20];
|
|
LPFNWINMAIN lpfnMain;
|
|
HINSTANCE hInst = 0;
|
|
HANDLE hTask = 0;
|
|
dprintf_exec(stddeb,"WinExec('%s', %04X)\n", lpCmdLine, nCmdShow);
|
|
/* ArgV[0] = "wine";
|
|
c = 1; */
|
|
for (x = x2 = 0; x < strlen(lpCmdLine) + 1; x++) {
|
|
if ((lpCmdLine[x] == ' ') || (lpCmdLine[x] == '\0')) {
|
|
ArgV[c] = (char *)malloc(x - x2 + 1);
|
|
strncpy(ArgV[c], &lpCmdLine[x2], x - x2);
|
|
ArgV[c][x - x2] = '\0';
|
|
c++; x2 = x + 1;
|
|
}
|
|
}
|
|
ArgV[c] = NULL;
|
|
for (c = 0; ArgV[c] != NULL; c++)
|
|
dprintf_exec(stddeb,"--> '%s' \n", ArgV[c]);
|
|
switch(fork()) {
|
|
case -1:
|
|
fprintf(stderr,"Can't 'fork' process !\n");
|
|
break;
|
|
case 0:
|
|
if ((hInst = LoadImage(ArgV[0], EXE, 1)) == (HINSTANCE) NULL ) {
|
|
fprintf(stderr, "wine: can't find %s!.\n", ArgV[0]);
|
|
fprintf(stderr,"Child process died !\n");
|
|
exit(1);
|
|
}
|
|
hTask = CreateNewTask(hInst);
|
|
dprintf_exec(stddeb,
|
|
"WinExec // hTask=%04X hInst=%04X !\n", hTask, hInst);
|
|
StartNewTask(hInst);
|
|
/*
|
|
lpfnMain = (LPFNWINMAIN)GetProcAddress(hInst, (LPSTR)0L);
|
|
dprintf_exec(stddeb,
|
|
"WineExec() // lpfnMain=%08X\n", (LONG)lpfnMain);
|
|
if (lpfnMain != NULL) {
|
|
(lpfnMain)(hInst, 0, lpCmdLine, nCmdShow);
|
|
dprintf_exec(stddeb,
|
|
"WineExec() // after lpfnMain\n");
|
|
}
|
|
*/
|
|
/* hTask = CreateNewTask(0);
|
|
dprintf_exec(stddeb,
|
|
"WinExec // New Task hTask=%04X !\n", hTask);
|
|
execvp(ArgV[0], ArgV); */
|
|
|
|
fprintf(stderr,"Child process died !\n");
|
|
exit(1);
|
|
default:
|
|
dprintf_exec(stddeb,
|
|
"WinExec (Main process stay alive) hTask=%04X !\n",
|
|
hTask);
|
|
break;
|
|
}
|
|
for (c = 0; ArgV[c] != NULL; c++) free(ArgV[c]);
|
|
return hTask;
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* ExitWindows [USER.7]
|
|
*/
|
|
BOOL ExitWindows(DWORD dwReserved, WORD wRetCode)
|
|
{
|
|
dprintf_exec(stdnimp,"EMPTY STUB !!! ExitWindows(%08X, %04X) !\n",
|
|
dwReserved, wRetCode);
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* WinHelp [USER.171]
|
|
*/
|
|
BOOL WinHelp(HWND hWnd, LPSTR lpHelpFile, WORD wCommand, DWORD dwData)
|
|
{
|
|
char str[256];
|
|
dprintf_exec(stddeb,"WinHelp(%s, %u, %lu)\n",
|
|
lpHelpFile, wCommand, dwData);
|
|
switch(wCommand) {
|
|
case 0:
|
|
case HELP_HELPONHELP:
|
|
GetWindowsDirectory(str, sizeof(str));
|
|
strcat(str, "\\winhelp.exe");
|
|
dprintf_exec(stddeb,"'%s'\n", str);
|
|
break;
|
|
case HELP_INDEX:
|
|
GetWindowsDirectory(str, sizeof(str));
|
|
strcat(str, "\\winhelp.exe");
|
|
dprintf_exec(stddeb,"'%s'\n", str);
|
|
break;
|
|
default:
|
|
return FALSE;
|
|
}
|
|
WinExec(str, SW_SHOWNORMAL);
|
|
return(TRUE);
|
|
}
|