Release 950216
Thu Feb 16 18:57:31 1995 Alexandre Julliard (julliard@sunsite.unc.edu)
* [if1632/call.S]
Only save the lower 16-bits of SP and BP.
* [if1632/callback.c]
When calling to 16-bit code, restore DS from its previous value on
entry to the 32-bit code, instead of from the code segment owner.
* [if1632/relay.c] [include/stackframe.h]
Use a structure to represent the 16-bit stack frame layout
instead of hard-coded offsets.
* [rc/Imakefile]
Use y.tab.c for bison output file for compatibility with yacc.
* [tools/build.c]
Small optimization for calls to 32-bit code.
Sun Feb 12 03:19:47 1995 Michael Veksler (s1678223@t2.technion.ac.il)
* [tools/build.c]
Fixed bug (inflicted by previous change) - SEGV on ZMAGIC file format.
Sun Feb 11 20:00:00 1995 Göran Thyni (goran@norrsken.bildbasen.se)
* [debugger/dbg.y]
Remove unnecessary sym-table loading when stopped in 16-bit mode.
* [include/segmem.h] [loader/selector.c]
Added dynamic alloction of selectors.
Fixed some problems with large programs SIGSEGV-ing while
running out of selectors.
* [include/segmem.h] [loader/selector.c] [if1632/callback.c]
[memory/global.c] [memory/heap.c] [memory/linear.c]
Use __AHSHIFT and __AHINCR instead of 3 and 8.
Mon Feb 6 18:07:38 1995 Cameron Heide (heide@ee.ualberta.ca)
* [misc/dos_fs.c]
Better relative path handling when converting filenames between
dos and unix, allowing '.' to be used in the Windows path.
Startup working dir is now based on current working dir.
Sat Feb 4 21:21:13 1995 Michael Veksler (s1678223@t2.technion.ac.il)
* [if1632/relay.c] [include/dlls.h] [tools/build.c]
Squeezed data structure that references internal dll's (mostly
"struct dll_table_entry_s"). Caused 20% reduction in executable
code size.
Fri Feb 3 18:53:15 1995 Martin v. Loewis (loewis@marie)
* [Imakefile]
make wine.sym only when making emulator
* [misc/file.c]
OpenFile(): report as not implemented for WINELIB
* [misc/winsock.c]
Fix CONVERT_HOSTENT and friends for use with WINELIB
* [rc/Imakefile][rc/rc.y][rc/parser.c]
Rename rc.y to parser.y
Use flex and bison on Sun
* [toolkit/sup.c]
CallWindowProc: fix parameter type
* [windows/event.c]
Commented #ifdef sparc
diff --git a/include/brush.h b/include/brush.h
index 3f41e59..c548dbe 100644
--- a/include/brush.h
+++ b/include/brush.h
@@ -9,7 +9,9 @@
#include "gdi.h"
+#ifndef WINELIB
#pragma pack(1)
+#endif
/* GDI logical brush object */
typedef struct
@@ -18,7 +20,9 @@
LOGBRUSH logbrush WINE_PACKED;
} BRUSHOBJ;
+#ifndef WINELIB
#pragma pack(4)
+#endif
extern BOOL BRUSH_Init(void);
extern int BRUSH_GetObject( BRUSHOBJ * brush, int count, LPSTR buffer );
diff --git a/include/class.h b/include/class.h
index 07531bd..5c99d1d 100644
--- a/include/class.h
+++ b/include/class.h
@@ -11,7 +11,9 @@
#define CLASS_MAGIC 0x4b4e /* 'NK' */
+#ifndef WINELIB
#pragma pack(1)
+#endif
/* !! Don't change this structure (see GetClassLong()) */
typedef struct tagCLASS
@@ -25,7 +27,9 @@
WORD wExtra[1]; /* Class extra bytes */
} CLASS;
+#ifndef WINELIB
#pragma pack(4)
+#endif
HCLASS CLASS_FindClassByName( char * name, WORD hinstance, CLASS **ptr );
diff --git a/include/dialog.h b/include/dialog.h
index ad4b9de..ca1f418 100644
--- a/include/dialog.h
+++ b/include/dialog.h
@@ -14,7 +14,9 @@
extern int DialogBoxIndirectPtr( HINSTANCE hInst, LPCSTR dlgTemplate,
HWND owner, WNDPROC dlgProc);
+#ifndef WINELIB
#pragma pack(1)
+#endif
/* Dialog info structure.
* This structure is stored into the window extra bytes (cbWndExtra).
@@ -70,6 +72,8 @@
LPSTR faceName;
} DLGTEMPLATE;
+#ifndef WINELIB
#pragma pack(4)
+#endif
#endif /* DIALOG_H */
diff --git a/include/dlls.h b/include/dlls.h
index b4a3fc0..169dac1 100644
--- a/include/dlls.h
+++ b/include/dlls.h
@@ -51,12 +51,6 @@
extern struct w_files *wine_files;
-typedef struct dll_arg_relocation_s
-{
- unsigned short dst_arg; /* Offset to argument on stack */
- unsigned char src_type; /* Argument type */
-} DLL_ARG;
-
#define DLL 0
#define EXE 1
@@ -82,12 +76,13 @@
*/
char *export_name;
void *handler; /* Address of function to process request */
- int handler_type; /* C or PASCAL calling convention */
+ char handler_type; /* C or PASCAL calling convention */
+ char n_args; /* Number of arguments passed to function */
+ short conv_reference ; /* reference to Argument conversion data */
#ifdef WINESTAT
int used; /* Number of times this function referenced */
#endif
- int n_args; /* Number of arguments passed to function */
- DLL_ARG args[DLL_MAX_ARGS]; /* Argument conversion data */
+
};
struct dll_name_table_entry_s
@@ -114,6 +109,43 @@
extern struct dll_table_entry_s MOUSE_table[];
extern struct dll_table_entry_s COMMDLG_table[];
+
+extern unsigned short KERNEL_offsets[];
+extern unsigned short USER_offsets[];
+extern unsigned short GDI_offsets[];
+extern unsigned short UNIXLIB_offsets[];
+extern unsigned short WIN87EM_offsets[];
+extern unsigned short MMSYSTEM_offsets[];
+extern unsigned short SHELL_offsets[];
+extern unsigned short SOUND_offsets[];
+extern unsigned short KEYBOARD_offsets[];
+extern unsigned short WINSOCK_offsets[];
+extern unsigned short STRESS_offsets[];
+extern unsigned short SYSTEM_offsets[];
+extern unsigned short TOOLHELP_offsets[];
+extern unsigned short MOUSE_offsets[];
+extern unsigned short COMMDLG_offsets[];
+
+
+extern unsigned char KERNEL_types[];
+extern unsigned char USER_types[];
+extern unsigned char GDI_types[];
+extern unsigned char UNIXLIB_types[];
+extern unsigned char WIN87EM_types[];
+extern unsigned char MMSYSTEM_types[];
+extern unsigned char SHELL_types[];
+extern unsigned char SOUND_types[];
+extern unsigned char KEYBOARD_types[];
+extern unsigned char WINSOCK_types[];
+extern unsigned char STRESS_types[];
+extern unsigned char SYSTEM_types[];
+extern unsigned char TOOLHELP_types[];
+extern unsigned char MOUSE_types[];
+extern unsigned char COMMDLG_types[];
+
+
#define N_BUILTINS 15
#endif /* DLLS_H */
+
+
diff --git a/include/dos_fs.h b/include/dos_fs.h
index 79b5ce4..b32d900 100644
--- a/include/dos_fs.h
+++ b/include/dos_fs.h
@@ -29,6 +29,8 @@
extern struct dosdirent *DOS_opendir(char *dosdirname);
extern struct dosdirent *DOS_readdir(struct dosdirent *de);
extern void DOS_closedir(struct dosdirent *de);
+extern void DOS_ExpandToFullPath(char *filename, int drive);
+extern void DOS_ExpandToFullUnixPath(char *filename);
extern char WindowsPath[256];
diff --git a/include/font.h b/include/font.h
index b26a260..3f90f9a 100644
--- a/include/font.h
+++ b/include/font.h
@@ -9,7 +9,9 @@
#include "gdi.h"
+#ifndef WINELIB
#pragma pack(1)
+#endif
/* GDI logical font object */
typedef struct
@@ -18,7 +20,9 @@
LOGFONT logfont WINE_PACKED;
} FONTOBJ;
+#ifndef WINELIB
#pragma pack(4)
+#endif
extern BOOL FONT_Init( void );
extern int FONT_GetObject( FONTOBJ * font, int count, LPSTR buffer );
diff --git a/include/gdi.h b/include/gdi.h
index 07bde36..476782f 100644
--- a/include/gdi.h
+++ b/include/gdi.h
@@ -27,7 +27,9 @@
#define METAFILE_MAGIC 0x4f50
#define METAFILE_DC_MAGIC 0x4f51
+#ifndef WINELIB
#pragma pack(1)
+#endif
typedef struct tagGDIOBJHDR
{
@@ -72,7 +74,9 @@
WORD colorRes; /* 108: color resolution */
} DeviceCaps;
+#ifndef WINELIB
#pragma pack(4)
+#endif
/* Device independent DC information */
diff --git a/include/heap.h b/include/heap.h
index fd234de..043d013 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -7,8 +7,8 @@
#define HEAP_H
#include "segmem.h"
-#include "regfunc.h"
#include "atom.h"
+#include "stackframe.h"
/**********************************************************************
* LOCAL HEAP STRUCTURES AND FUNCTIONS
@@ -48,11 +48,8 @@
extern void *WIN16_LocalReAlloc(unsigned int handle, int flags, int bytes);
extern unsigned int WIN16_LocalUnlock(unsigned int handle);
-#if 0
-#define HEAP_OWNER (Segments[Stack16Frame[11] >> 3].owner)
-#endif
/* Use ds instead of owner of cs */
-#define HEAP_OWNER Stack16Frame[6]
+#define HEAP_OWNER (pStack16Frame->ds)
#define LOCALHEAP() (&HEAP_LocalFindHeap(HEAP_OWNER)->free_list)
#define LOCALATOMTABLE() (&HEAP_LocalFindHeap(HEAP_OWNER)->local_table)
diff --git a/include/palette.h b/include/palette.h
index ddb76e0..d5145f2 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -9,7 +9,9 @@
#include "gdi.h"
+#ifndef WINELIB
#pragma pack(1)
+#endif
/* GDI logical palette object */
typedef struct
@@ -18,7 +20,9 @@
LOGPALETTE logpalette WINE_PACKED;
} PALETTEOBJ;
+#ifndef WINELIB
#pragma pack(4)
+#endif
extern int PALETTE_GetObject( PALETTEOBJ * palette, int count, LPSTR buffer );
diff --git a/include/pen.h b/include/pen.h
index 2e2b512..1fc160c 100644
--- a/include/pen.h
+++ b/include/pen.h
@@ -9,7 +9,9 @@
#include "gdi.h"
+#ifndef WINELIB
#pragma pack(1)
+#endif
/* GDI logical pen object */
typedef struct
@@ -18,7 +20,9 @@
LOGPEN logpen WINE_PACKED;
} PENOBJ;
+#ifndef WINELIB
#pragma pack(4)
+#endif
extern int PEN_GetObject( PENOBJ * pen, int count, LPSTR buffer );
extern HPEN PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen );
diff --git a/include/regfunc.h b/include/regfunc.h
index d68a2d7..913ca86 100644
--- a/include/regfunc.h
+++ b/include/regfunc.h
@@ -5,10 +5,9 @@
#define REGFUNC_H
#include "wine.h"
+#include "stackframe.h"
-extern unsigned short *Stack16Frame;
-
-#define _CONTEXT ((struct sigcontext_struct *) &Stack16Frame[12])
+#define _CONTEXT ((struct sigcontext_struct *) pStack16Frame->args)
#define _AX (_CONTEXT->sc_eax)
#define _BX (_CONTEXT->sc_ebx)
#define _CX (_CONTEXT->sc_ecx)
diff --git a/include/segmem.h b/include/segmem.h
index 527002a..583adc9 100644
--- a/include/segmem.h
+++ b/include/segmem.h
@@ -26,23 +26,28 @@
/*
* Array to track selector allocation.
*/
-#define MAX_SELECTORS 512
#define SELECTOR_ISFREE 0x8000
#define SELECTOR_IS32BIT 0x4000
#define SELECTOR_INDEXMASK 0x0fff
-extern unsigned short SelectorMap[MAX_SELECTORS];
+#define __AHSHIFT 3
+#define __AHINCR (1 << __AHSHIFT)
+
+extern unsigned short* SelectorMap;
#ifdef HAVE_IPC
#define SAFEMAKEPTR(s, o) ((void *)(((int) (s) << 16) | ((o) & 0xffff)))
#define FIXPTR(p) (p)
#else
#define SAFEMAKEPTR(s, o) \
- ((void *)(((int)SelectorMap[SelectorMap[(s) >> 3] & SELECTOR_INDEXMASK] \
- << 19) | 0x70000 | ((o) & 0xffff)))
+ ((void*)(((int)SelectorMap[SelectorMap[(s)>>__AHSHIFT] & SELECTOR_INDEXMASK]\
+ << (16 + __AHSHIFT)) | 0x70000 | ((o) & 0xffff)))
#define FIXPTR(p) SAFEMAKEPTR((unsigned long) (p) >> 16, (p))
#endif
+#define MAKESELECTOR(fp) ((unsigned short) (fp >> (16 + __AHSHIFT)))
+
+
/*
* Structure to hold info about each selector we create.
*/
@@ -79,14 +84,14 @@
#ifdef __ELF__
#define FIRST_SELECTOR 2
#define IS_16_BIT_ADDRESS(addr) \
- (!(SelectorMap[(unsigned int)(addr)>>19]& SELECTOR_IS32BIT))
+ (!(SelectorMap[(unsigned int)(addr) >> (16+__AHSHIFT)]& SELECTOR_IS32BIT))
#else
#define FIRST_SELECTOR 8
#define IS_16_BIT_ADDRESS(addr) \
- ((unsigned int)(addr) >= (((FIRST_SELECTOR << 3) | 0x0007) << 16))
+ ((unsigned int)(addr) >= (((FIRST_SELECTOR << __AHSHIFT) | 7) << 16))
#endif
-extern SEGDESC Segments[];
+extern SEGDESC* Segments;
#endif /* SEGMEM_H */
diff --git a/include/stackframe.h b/include/stackframe.h
new file mode 100644
index 0000000..9c008d7
--- /dev/null
+++ b/include/stackframe.h
@@ -0,0 +1,29 @@
+/*
+ * 16-bit mode stack frame layout
+ *
+ * Copyright 1995 Alexandre Julliard
+ */
+
+#ifndef WINE_STACKFRAME_H
+#define WINE_STACKFRAME_H
+
+#include <windows.h>
+
+typedef struct
+{
+ WORD saved_ss;
+ WORD saved_bp;
+ WORD saved_sp;
+ WORD es;
+ WORD ds;
+ WORD bp;
+ WORD arg_length;
+ WORD ip;
+ WORD cs;
+ WORD args[1];
+} STACK16FRAME;
+
+
+extern STACK16FRAME *pStack16Frame;
+
+#endif /* WINE_STACKFRAME_H */
diff --git a/include/windows.h b/include/windows.h
index 0c4c17e..088d0fa 100644
--- a/include/windows.h
+++ b/include/windows.h
@@ -5,7 +5,9 @@
#include <wintypes.h>
+#ifndef WINELIB
#pragma pack(1)
+#endif
typedef struct {
INT x;
@@ -2260,7 +2262,9 @@
#define META_CREATEBITMAP 0x06FE
#define META_CREATEREGION 0x06FF
+#ifndef WINELIB
#pragma pack(4)
+#endif
#define F(ret,name) ret name(void);
diff --git a/include/wintypes.h b/include/wintypes.h
index da99fed..a74457e 100644
--- a/include/wintypes.h
+++ b/include/wintypes.h
@@ -70,8 +70,6 @@
#define WINE_PACKED __attribute__ ((packed))
#endif
-#pragma pack(1)
-
#define LOBYTE(w) ((BYTE)(w))
#define HIBYTE(w) ((BYTE)((UINT)(w) >> 8))
