Sun Jan 14 13:45:22 1996 Alexandre Julliard <julliard@sunsite.unc.edu> * [configure.in] Added check for gcc strength-reduce bug. * [controls/listbox.c] Changed ListBoxDirectory() to use the new DOS file functions. * [controls/menu.c] Fixed parameters for DeleteMenu() call in ChangeMenu(). * [debugger/stack.c] Also display current frame in back-trace. * [files/directory.c] [files/dos_fs.c] [files/drive.c] [files/file.c] Complete rewrite of the DOS file handling. Implemented per-task file handles. Removed default Z: drive; needs to be put explicitely in wine.ini if desired. * [loader/module.c] Fixed file descriptor leak in LoadModule(). * [loader/task.c] Initialise PDB file handle table in TASK_CreateTask(). Close file handles on task termination. Implemented SetErrorMode(). * [misc/network.c] Fixed WNetGetConnection() to use GetDriveType(). * [misc/xmalloc.c] Added function xstrdup(). * [miscemu/int21.c] Many changes for new DOS file functions. * [miscemu/interrupts.c] Moved DOS_GetEquipment() function into INT_Int11Handler(). * [windows/win.c] Bug fix: create system menu before sending WM_NCCREATE. * [*/*.c] Replaced strcasecmp and strncasecmp by lstrcmpi and lstrncmpi for better portability. Sat Jan 13 16:13:02 1996 Jim Peterson <jspeter@birch.ee.vt.edu> * [include/wintypes.h] Added 'typedef HGLOBAL GOBALHANDLE;'. This is not precisely in line with the true windows 'typedef HANDLE GLOBALHANDLE;', but I believe it should suffice. * [include/winsock.h] Added '#include <arpa/inet.h>' for various declarations. '#ifdef'-ed out some old style internet address #define's. * [loader/task.c] Made MakeProcInstance() return first parameter #ifdef WINELIB32. Made FreeProcInstance() do nothing #ifdef WINELIB32. '#ifdef'-ed out TASK_AllocThunk(), as it was unused in WINELIB32. * [library/miscstubs.c] Made GetWndProcEntry16() return ACTIVATEAPP_callback() when called with name="ActivateAppProc". This hardly seems correct, but it's my best guess as to how the emulator responds. Sat Jan 6 17:57:45 1996 Martin von Loewis <loewis@informatik.hu-berlin.de> * [if1632/kernel32.spec][win32/process.c] WIN32_GetProcAddress, LoadLibraryA: new functions * [if1632/relay32.c] RELAY32_GetEntryPoint: Removed code to load PE DLLs * [include/pe_image.h][include/pe_exe.h] struct pe_data: new fields base_addr,load_addr,vma_size,pe_reloc struct PE_Reloc_Block: new structure * [loader/module.c] MODULE_RegisterModule: new function * [loader/pe_image.c] PE_FindExportedFunction,PE_GetProcAddress: new functions fixup_imports: expect struct w_files* now, fill dlls_to_init, load PE DLLs do_relocations: new functions calc_vma_size: renamed from dump_table PE_LoadImage: use malloc to allocate memory for image PE_InitDLL: expect HMODULE PE_InitializeDLLs: new function * [loader/task.c] NE_InitializeDLLs: branch to PE_InitializeDLLs for PE modules GetExePtr: Accept PE modules * [misc/commdlg.c] FILEDLG_WMCommand: unpack WIN32 WM_COMMAND appropriately for WineLib Thu Jan 4 11:36:21 1996 Manfred Weichel <Manfred.Weichel@mch.sni.de> * [misc/port.c] New file with usleep() function for SVR4. * [configure.in] Check for usleep() function. Tue Jan 02 14:00:00 1996 Anand Kumria <akumria@ozemail.com.au> * [if1632/toolhelp.spec] [include/toolhelp.h] [misc/user.c] [windows/message.c] Implement TOOLHELP.80 TimerCount. Fix GetTickCount. * [winsocket.c] Fixed ENOENT error. * [miscemu/dpmi.c] Implement DPMI Get Page Size (AX=0604, INT 31) * [memory/global.c] Implement TOOLHELP.72 GetMemManInfo. Mon Jan 2 10:33:00 1996 Thomas Sandford <t.d.g.sandford@prds-grn.demon.co.uk> * [if1632/callback.c] CallWindowProc() - When calling RELAY32_CallWindowProc, check whether lParam should be a SEGPTR, and if so convert it to one. * [if1632/gdi.spec] [if1632/kernel32.spec] [if1632/user32.spec] Numerous functions added, mostly calls to original (win16) functions. Note that some (many) of these are probably not strictly correct, but with these additions freecell will at least display its main window though it is garbled. * [if1632/winprocs.spec] Completely rewritten - all WndProcs now have win32 versions to help with the lparam SEGPTR fix in callback.c * [include/kernel32.h] LPTCSTR defined. * [include/peexe.h] Definition of PE_Export_Directory amended. * [include/resource32.h] New file. * [include/stackframe.h] Definition of MAKE_SEGPTR macro #ifdef'd out and replaced with prototype for replacement function in memory/selector.c which can operate on any given memory address. This is currently required for win32 support. It is a dreadful cludge, and will certainly slow down other programs. If you are not interested in win32 development you may wish to reverse this patch. * [include/windows.h] Definition of SW_SHOWDEFAULT added. * [loader/pe_image.c] Extensive rewrites of xmmap() fixup_imports(). PE_LoadImage() - initialisation of bss added, extraction of module name fixed, initialisation of DLL added. PE_InitDLL() - now does something. PE_Win32CallToStart() - initialisation of TEB pointed to by fs added. PE_InitTEB() created to perform TEB initialisation. * [memory/selector.c] New function MAKE_SEGPTR() - see include/stackframe.h above. * [misc/user32.c] USER32_RegisterClassA(), CreateWindowExA() memory allocation method changed. This is probably now unnecessary with the new MAKE_SEGPTR handling code. USER32_DefWndProcA() removed to win32/winprocs.c USER32_TranslateMessage added. * [tools/build.c] handling of win32 spec files changed to support gcc2.6.X this requires optimisations to be disabled. * [win32/resource.c] [win32/newfns.c] [win32/heap.c] [win32/winprocs.c] New files. * [win32/Makefile.in] New files heap.c, newfns.c, resource.c and winprocs.c added to build. * [win32/file.c] New function W32_SetHandleCount. * [win32/init.c] WIN32_GetModuleHandle() - now returns handle of running process if called with NULL. GetStartupInfoA() - set cbReserved2 to 0. * [win32/memory.c] VirtualAlloc() - set mmap() file parameter to -1 instead of 0 to make it work with FreeBSD. Also check for return value. Removed extra return. * [windows/winpos.c] ShowWindow() - SW_SHOWDEFAULT handling kludged in.
197 lines
5.4 KiB
C
197 lines
5.4 KiB
C
/*
|
|
* Win32 user functions
|
|
*
|
|
* Copyright 1995 Martin von Loewis
|
|
*/
|
|
|
|
/* This file contains only wrappers to existing Wine functions or trivial
|
|
stubs. 'Real' implementations go into context specific files */
|
|
|
|
#include <unistd.h>
|
|
#include "windows.h"
|
|
#include "winerror.h"
|
|
#include "relay32.h"
|
|
#include "alias.h"
|
|
#include "stackframe.h"
|
|
#include "xmalloc.h"
|
|
|
|
/* Structure copy functions */
|
|
static void MSG16to32(MSG *msg16,struct WIN32_MSG *msg32)
|
|
{
|
|
msg32->hwnd=(DWORD)msg16->hwnd;
|
|
msg32->message=msg16->message;
|
|
msg32->wParam=msg16->wParam;
|
|
msg32->lParam=msg16->lParam;
|
|
msg32->time=msg16->time;
|
|
msg32->pt.x=msg16->pt.x;
|
|
msg32->pt.y=msg16->pt.y;
|
|
}
|
|
|
|
static void MSG32to16(struct WIN32_MSG *msg32,MSG *msg16)
|
|
{
|
|
msg16->hwnd=(HWND)msg32->hwnd;
|
|
msg16->message=msg32->message;
|
|
msg16->wParam=msg32->wParam;
|
|
msg16->lParam=msg32->lParam;
|
|
msg16->time=msg32->time;
|
|
msg16->pt.x=msg32->pt.x;
|
|
msg16->pt.y=msg32->pt.y;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* RegisterClassA (USER32.426)
|
|
*/
|
|
ATOM USER32_RegisterClassA(WNDCLASSA* wndclass)
|
|
{
|
|
WNDCLASS copy;
|
|
HANDLE classh = 0, menuh = 0;
|
|
SEGPTR classsegp, menusegp;
|
|
char *classbuf, *menubuf;
|
|
|
|
ATOM retval;
|
|
copy.style=wndclass->style;
|
|
ALIAS_RegisterAlias(0,0,(DWORD)wndclass->lpfnWndProc);
|
|
copy.lpfnWndProc=wndclass->lpfnWndProc;
|
|
copy.cbClsExtra=wndclass->cbClsExtra;
|
|
copy.cbWndExtra=wndclass->cbWndExtra;
|
|
copy.hInstance=(HINSTANCE)wndclass->hInstance;
|
|
copy.hIcon=(HICON)wndclass->hIcon;
|
|
copy.hCursor=(HCURSOR)wndclass->hCursor;
|
|
copy.hbrBackground=(HBRUSH)wndclass->hbrBackground;
|
|
|
|
/* FIXME: There has to be a better way of doing this - but neither
|
|
malloc nor alloca will work */
|
|
|
|
if(wndclass->lpszMenuName)
|
|
{
|
|
menuh = GlobalAlloc(0, strlen(wndclass->lpszMenuName)+1);
|
|
menusegp = WIN16_GlobalLock(menuh);
|
|
menubuf = PTR_SEG_TO_LIN(menusegp);
|
|
strcpy( menubuf, wndclass->lpszMenuName);
|
|
copy.lpszMenuName=menusegp;
|
|
}else
|
|
copy.lpszMenuName=0;
|
|
if(wndclass->lpszClassName)
|
|
{
|
|
classh = GlobalAlloc(0, strlen(wndclass->lpszClassName)+1);
|
|
classsegp = WIN16_GlobalLock(classh);
|
|
classbuf = PTR_SEG_TO_LIN(classsegp);
|
|
strcpy( classbuf, wndclass->lpszClassName);
|
|
copy.lpszClassName=classsegp;
|
|
}
|
|
retval = RegisterClass(©);
|
|
GlobalFree(menuh);
|
|
GlobalFree(classh);
|
|
return retval;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* GetMessageA (USER32.269)
|
|
*/
|
|
BOOL USER32_GetMessageA(struct WIN32_MSG* lpmsg,DWORD hwnd,DWORD min,DWORD max)
|
|
{
|
|
BOOL ret;
|
|
MSG msg;
|
|
ret=GetMessage(MAKE_SEGPTR(&msg),(HWND)hwnd,min,max);
|
|
MSG16to32(&msg,lpmsg);
|
|
return ret;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* BeginPaint (USER32.9)
|
|
*/
|
|
HDC USER32_BeginPaint(DWORD hwnd,struct WIN32_PAINTSTRUCT *lpps)
|
|
{
|
|
PAINTSTRUCT ps;
|
|
HDC ret;
|
|
ret=BeginPaint((HWND)hwnd,&ps);
|
|
lpps->hdc=(DWORD)ps.hdc;
|
|
lpps->fErase=ps.fErase;
|
|
lpps->rcPaint.top=ps.rcPaint.top;
|
|
lpps->rcPaint.left=ps.rcPaint.left;
|
|
lpps->rcPaint.right=ps.rcPaint.right;
|
|
lpps->rcPaint.bottom=ps.rcPaint.bottom;
|
|
lpps->fRestore=ps.fRestore;
|
|
lpps->fIncUpdate=ps.fIncUpdate;
|
|
return ret;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* EndPaint (USER32.175)
|
|
*/
|
|
BOOL USER32_EndPaint(DWORD hwnd,struct WIN32_PAINTSTRUCT *lpps)
|
|
{
|
|
PAINTSTRUCT ps;
|
|
ps.hdc=(HDC)lpps->hdc;
|
|
ps.fErase=lpps->fErase;
|
|
ps.rcPaint.top=lpps->rcPaint.top;
|
|
ps.rcPaint.left=lpps->rcPaint.left;
|
|
ps.rcPaint.right=lpps->rcPaint.right;
|
|
ps.rcPaint.bottom=lpps->rcPaint.bottom;
|
|
ps.fRestore=lpps->fRestore;
|
|
ps.fIncUpdate=lpps->fIncUpdate;
|
|
EndPaint((HWND)hwnd,&ps);
|
|
return TRUE;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* DispatchMessageA (USER32.140)
|
|
*/
|
|
LONG USER32_DispatchMessageA(struct WIN32_MSG* lpmsg)
|
|
{
|
|
MSG msg;
|
|
LONG ret;
|
|
MSG32to16(lpmsg,&msg);
|
|
ret=DispatchMessage(&msg);
|
|
MSG16to32(&msg,lpmsg);
|
|
return ret;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* TranslateMessage (USER32.555)
|
|
*/
|
|
BOOL USER32_TranslateMessage(struct WIN32_MSG* lpmsg)
|
|
{
|
|
MSG msg;
|
|
MSG32to16(lpmsg,&msg);
|
|
return TranslateMessage(&msg);
|
|
}
|
|
|
|
/***********************************************************************
|
|
* CreateWindowExA (USER32.82)
|
|
*/
|
|
DWORD USER32_CreateWindowExA(long flags,char* class,char *title,
|
|
long style,int x,int y,int width,int height,DWORD parent,DWORD menu,
|
|
DWORD instance,DWORD param)
|
|
{
|
|
DWORD retval;
|
|
HANDLE classh, titleh;
|
|
SEGPTR classsegp, titlesegp;
|
|
char *classbuf, *titlebuf;
|
|
|
|
/*Have to translate CW_USEDEFAULT */
|
|
if(x==0x80000000)x=CW_USEDEFAULT;
|
|
if(y==0x80000000)y=CW_USEDEFAULT;
|
|
if(width==0x80000000)width=CW_USEDEFAULT;
|
|
if(height==0x80000000)height=CW_USEDEFAULT;
|
|
|
|
/* FIXME: There has to be a better way of doing this - but neither
|
|
malloc nor alloca will work */
|
|
|
|
classh = GlobalAlloc(0, strlen(class)+1);
|
|
titleh = GlobalAlloc(0, strlen(title)+1);
|
|
classsegp = WIN16_GlobalLock(classh);
|
|
titlesegp = WIN16_GlobalLock(titleh);
|
|
classbuf = PTR_SEG_TO_LIN(classsegp);
|
|
titlebuf = PTR_SEG_TO_LIN(titlesegp);
|
|
strcpy( classbuf, class );
|
|
strcpy( titlebuf, title );
|
|
|
|
retval = (DWORD) CreateWindowEx(flags,classsegp,
|
|
titlesegp,style,x,y,width,height,
|
|
(HWND)parent,(HMENU)menu,(HINSTANCE)instance,
|
|
(LPVOID)param);
|
|
GlobalFree(classh);
|
|
GlobalFree(titleh);
|
|
return retval;
|
|
}
|