Release 980809
Sat Aug 8 19:11:46 1998 Marcus Meissner <marcus@jet.franken.de>
* [*/*]
Added some missing WINAPI and some missing prototypes for
functions.
* [controls/static.c]
Got rid of the MODULE32_LookupHMODULE error showing up for every
message box.
* [windows/winproc.c]
WM_NOTIFY 16->32 mapping (AOL Instant Messenger or however it is called).
* [misc/winsock.c]
hostent/servent/protoent should not use the same static buffers.
(has broken nt3.15 finger.exe which does hp=gethostbyname(), then
getservbyname("finger","tcp") and the references hp->h_addr_list[0]).
Sat Aug 8 13:21:24 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [include/server.h] [tools/make_requests] [server/request.c]
[server/trace.c]
Automated part of the client/server request code generation.
Added tracing of client/server communication.
* [scheduler/*.c] [server/process.c]
Added support for server-side handles.
* [scheduler/thread.c]
Added DLL_THREAD_ATTACH/DETACH notifications.
* [configure.in]
Added check for -lsocket.
* [windows/winproc.c]
Return the thunk address in WINPROC_GetProc if the function types
don't match.
Sat Aug 8 02:44:04 1998 Douglas Ridgway <ridgway@winehq.com>
* [windows/winproc.c][windows/win.c][windows/message.c]
Documentation for CallWindowProc, SetWindowLong, DispatchMessage,
WaitMessage, GetMessage, and PeekMessage.
Sat Aug 8 01:00:00 1998 Juergen Schmied <juergen.schmied@metronet.de>
* [controls/commctrl.c][controls/widgets.c][include/builtin32.h]
[include/commctrl.h][relay32/builtin32.c][relay32/comctl32.spec]
[tools/build.c] [relay32/shell32.spec]
Added the functionality of the LibMain function. The common
controls are properly initialized now.
* [controls/treeview.c][memory/atom.c][scheduler/thread.c][windows/class.c]
[windows/msgbox.c][windows/win.c]
Put TRACE in, put SetLastError() in.
* [include/interfaces.h]
Added IClassFactory::LockServer.
* [include/ole2.h]
Added struct for LPOLEMENUGROUPWIDTHS32, HOLEMENU32.
* [include/shell.h][include/shlobj.h][misc/shell.c][ole/folders.c]
Reorganized and many structs and classes (IShellBrowser,IShellView)
added. shell32.dll should work in many cases now.
Started SHGetFileInfoA implementeation, rewrote SHGetPathFromIDList32A.
New Shell32LibMain started ShellIconCache Implementation.
* [misc/shellord.c]
Rewrote ILCombine, ILGetSize
New stubs SHFind_InitMenuPopup, FileMenu_Create, ShellExecuteEx,
SHSetInstanceExplorer, SHGetInstanceExplorer, SHFreeUnusedLibraries.
* [include/winerror.h]
Class and window related error codes added.
* [memory/heap.c]
Changed lstrlen32A to strlen to get rid of milions of TRACE lines.
* [misc/ddeml.c]
First lines for DdeCreateStringHandle32A / DdeFreeStringHandle32.
* [misc/network.c][relay32/mpr.spec]
Fixed some bugs, changed ordinals.
* [windows/class.c]
Workarounds for incorrect hInstance handling. Fixes parts of
MSWord95/Excel95 and Money95.
Thu Aug 6 21:05:35 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [windows/nonclient.c][misc/tweak.c][include/tweak.h]
[documentation/win95look]
Removed some tweak variables. They are no longer needed.
* [files/dos_fs.c]
Added check for null pointer in DOSFS_GetDevice().
* [controls/tooltips.c][include/commctrl.h]
Improved tooltips.
* [controls/status.c][include/commctrl.h]
Cleaned up code and added tooltip support.
* [controls/toolbar.c][include/commctrl.h]
Added tooltip support.
* [documentation/common_controls]
Updated.
Thu Aug 6 00:05:22 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* [include/ver.h] [misc/ver.c]
Write VIF_BUFFTOOSMALL, not VIF_BUFTOSMALL.
* [debugger/hash.c] [debugger/stabs.c]
Make debug output more friendly for posting.
* [files/file.c]
Partial implementation of OF_SHARE_EXCLUSIVE.
Needed for Quicklogic/QuickChip (InstallShield).
* [files/profile.c]
When a cached-only entry is found, return it.
* [graphics/x11drv/xfont.c]
Accept a space as delimiter for a fontname and inhibit overrun
(Make xplasim.ex from the Phillips Coolrunner CPLD suite proceed).
* [miscemu/main.c]
Delay setting IF1632_CallLargeStack after loading the executables.
Stops fpgaexp.exe from the Viewlogic FPGA suite from crashing when
showing the Blinker error Message Box.
* [misc/network.c]
Make WNetGetConnection16 recognise a CDROM as a local drive.
* [multimedia/mmsystem.c]
Preliminary check for MCI_ALL_DEVICE_ID in MCI_Close by a FIXME.
Tue Aug 4 21:15:23 1998 James Juran <jrj120@psu.edu>
* [ole/ole2nls.c]
Fixed bug in CompareString32A. strcmp() doesn't necessarily
return -1, 0, or 1, which the previous code depended on.
Changed name of is_punctuation to OLE2NLS_isPunctuation.
Made NORM_IGNOREWIDTH not print a FIXME message in
LCMapString32A.
Other debugging messages, documentation, and code cleanups.
* [objects/font.c] [relay32/gdi32.spec] [include/winerror.h]
Added stub for GetFontData32, and added GDI_ERROR constant
to winerror.h.
Tue Aug 4 07:44:43 1998 Ove Kaaven <ovek@arcticnet.no>
* [multimedia/mmio.c]
Implemented mmioSetBuffer, mmioAdvance, mmioAscend, and
mmioCreateChunk to the best of my knowledge. But watch out,
there's bound to be bugs in there...
* [include/mmsystem.h] [multimedia/mmsystem.c]
Hacked in support for 32-bit multimedia function callbacks.
* [AUTHORS] [misc/shell.c]
Selfishly credited my authorship. Hopefully I'm excused.
* [include/dosexe.h] [include/module.h] [loader/dos/*]
[loader/module.c] [loader/task.c] [Makefile.in]
[configure.in] [Makefile.in]
Added DOS EXE (MZ) loader and virtual machine. Task
structure integration thanks to Ulrich Weigand.
* [files/dos_fs.c]
Work around a null pointer dereference if ioctlGetDeviceInfo-ing
a FILE_DupUnixHandle'd file (i.e. GetStdHandle'd).
* [include/miscemu.h] [include/winnt.h] [loader/main.c]
[memory/global.c] [msdos/dpmi.c] [msdos/dosmem.c]
Added support for DOS memory images, and added
DOSMEM_ResizeBlock() and DOSMEM_Available().
* [msdos/int21.c]
Added support for the DOS virtual machine, tweaked handle
assignment to avoid stdio clashes, forced INT21_FindNext to exit
wildcardless searches after finding one entry, added AH=7, 8, 9,
C, 48, 49, 4A, and 7160 CL=1 (Get Short Filename), and made the
long filename calls only respond if running with with -winver
win95.
* [objects/cursoricon.c]
DestroyCursor32 and DestroyIcon32 should now free the objects
(hopefully) correctly.
Sun Aug 2 21:42:09 1998 Huw D M Davies <daviesh@abacus.physics.ox.ac.uk>
* [graphics/psdrv/*] [include/psdrv.h]
Added PPD file parsing - at the moment it reads a file called
default.ppd from the directory in which you start Wine. Page sizes
other than A4 should now work (landscape may not). All fonts that are
present on your printer (according to the PPD) should be available,
providing you have the AFM files. Fonts should now be the correct size.
Graphics is still basically lines only. See graphics/psdrv/README .
* [misc/printdrv.c]
Yet more Drv[Get/Set]PrinterData fixes.
Fri Jul 31 21:33:22 1998 Per Lindström <pelinstr@algonet.se>
* [relay32/crtdll.spec] [misc/crtdll.c]
Added stub for freopen, _findfirst, _findnext, _fstat and _read.
* [files/directory.c]
Modified warning message.
Wed Jul 29 11:25:28 1998 Luiz Otavio L. Zorzella <zorzella@nr.conexware.com>
* [objects/font.c]
Added stub for GetFontData.
* [multimedia/msvideo.c]
Created this file to hold the msvideo.dll calls (and maybe also
msvfw32.dll).
* [objects/cursoricon.c]
Added search in Global Heap for cursor when trying to destroy it
with DestroyCursor16. This test should be done in many (all?)
other functions that use FreeResource.
* [controls/treeview.c] [include/commctrl.h]
Minor correction in name and addition of many placeholders for TVM
messages in TREEVIEW_WindowProc.
* [msdos/dpmi.c]
Fixed a bug in DPMI_xrealloc where in a copy of a memory region
"A" of size "a" to a region "B" of size "b", "b" bytes were being
copied, instead of "a", as the new version does. This both
increases speed, as well as avoids segfaults.
diff --git a/win32/console.c b/win32/console.c
index 6bab46d..0c24ff6 100644
--- a/win32/console.c
+++ b/win32/console.c
@@ -383,7 +383,7 @@
SYSTEM_LOCK();
if (pdb->console != NULL) {
CONSOLE *console = (CONSOLE *)pdb->console;
- handle = (HFILE32)HANDLE_Alloc(pdb, &console->header, 0, TRUE);
+ handle = (HFILE32)HANDLE_Alloc(pdb, &console->header, 0, TRUE, -1);
}
SYSTEM_UNLOCK();
return handle;
@@ -440,14 +440,14 @@
console->slave = slave;
console->pid = pid;
- if ((hIn = HANDLE_Alloc(pdb,&console->header, 0, TRUE)) == INVALID_HANDLE_VALUE32)
+ if ((hIn = HANDLE_Alloc(pdb,&console->header, 0, TRUE,-1)) == INVALID_HANDLE_VALUE32)
{
K32OBJ_DecCount(&console->header);
SYSTEM_UNLOCK();
return FALSE;
}
- if ((hOut = HANDLE_Alloc(pdb,&console->header, 0, TRUE)) == INVALID_HANDLE_VALUE32)
+ if ((hOut = HANDLE_Alloc(pdb,&console->header, 0, TRUE,-1)) == INVALID_HANDLE_VALUE32)
{
CloseHandle(hIn);
K32OBJ_DecCount(&console->header);
@@ -456,7 +456,7 @@
}
- if ((hErr = HANDLE_Alloc(pdb,&console->header, 0, TRUE)) == INVALID_HANDLE_VALUE32)
+ if ((hErr = HANDLE_Alloc(pdb,&console->header, 0, TRUE,-1)) == INVALID_HANDLE_VALUE32)
{
CloseHandle(hIn);
CloseHandle(hOut);
diff --git a/win32/device.c b/win32/device.c
index 052e472..7574bb5 100644
--- a/win32/device.c
+++ b/win32/device.c
@@ -59,7 +59,7 @@
handle = HANDLE_Alloc( PROCESS_Current(), &(dev->header),
FILE_ALL_ACCESS | GENERIC_READ |
- GENERIC_WRITE | GENERIC_EXECUTE /*FIXME*/, TRUE );
+ GENERIC_WRITE | GENERIC_EXECUTE /*FIXME*/, TRUE, -1 );
/* If the allocation failed, the object is already destroyed */
if (handle == INVALID_HANDLE_VALUE32) dev = NULL;
return handle;
@@ -86,7 +86,7 @@
LPOVERLAPPED lpOverlapped)
{
DEVICE_OBJECT *dev = (DEVICE_OBJECT *)HANDLE_GetObjPtr(
- PROCESS_Current(), hDevice, K32OBJ_DEVICE_IOCTL, 0 /*FIXME*/ );
+ PROCESS_Current(), hDevice, K32OBJ_DEVICE_IOCTL, 0 /*FIXME*/, NULL );
FIXME(win32, "(%ld,%ld,%p,%ld,%p,%ld,%p,%p), stub\n",
hDevice,dwIoControlCode,lpvlnBuffer,cblnBuffer,
diff --git a/win32/file.c b/win32/file.c
index 3d24640..fd1de18 100644
--- a/win32/file.c
+++ b/win32/file.c
@@ -41,7 +41,7 @@
numberOfBytesToWrite);
if (!(ioptr = HANDLE_GetObjPtr( PROCESS_Current(), hFile,
- K32OBJ_UNKNOWN, 0 )))
+ K32OBJ_UNKNOWN, 0, NULL )))
return HFILE_ERROR32;
if (K32OBJ_OPS(ioptr)->write)
status = K32OBJ_OPS(ioptr)->write(ioptr, lpBuffer, numberOfBytesToWrite,
@@ -63,7 +63,7 @@
numberOfBytesToRead);
if (!(ioptr = HANDLE_GetObjPtr( PROCESS_Current(), hFile,
- K32OBJ_UNKNOWN, 0 )))
+ K32OBJ_UNKNOWN, 0, NULL )))
return HFILE_ERROR32;
if (K32OBJ_OPS(ioptr)->read)
status = K32OBJ_OPS(ioptr)->read(ioptr, lpBuffer, numberOfBytesToRead,
@@ -78,7 +78,7 @@
*/
typedef
VOID
-(WINAPI *LPOVERLAPPED_COMPLETION_ROUTINE)(
+(CALLBACK *LPOVERLAPPED_COMPLETION_ROUTINE)(
DWORD dwErrorCode,
DWORD dwNumberOfBytesTransfered,
LPOVERLAPPED lpOverlapped
diff --git a/win32/init.c b/win32/init.c
index 6a646cb..0224954 100644
--- a/win32/init.c
+++ b/win32/init.c
@@ -26,6 +26,7 @@
lpStartupInfo->cbReserved2 = 0;
lpStartupInfo->lpReserved2 = NULL; /* must be NULL for VC runtime */
+ lpStartupInfo->dwFlags = STARTF_USESTDHANDLES;
lpStartupInfo->hStdInput = (HANDLE32)0;
lpStartupInfo->hStdOutput = (HANDLE32)1;
lpStartupInfo->hStdError = (HANDLE32)2;
diff --git a/win32/kernel32.c b/win32/kernel32.c
index 12e69b4..08eca15 100644
--- a/win32/kernel32.c
+++ b/win32/kernel32.c
@@ -20,6 +20,7 @@
#include "win.h"
#include "debug.h"
#include "flatthunk.h"
+#include "syslevel.h"
/***********************************************************************
@@ -1049,7 +1050,7 @@
*/
VOID WINAPI _KERNEL_475(CONTEXT *context)
{
- GET_FS( THREAD_Current()->saved_fs );
+ GET_FS( FS_reg(context) );
}
/**********************************************************************
@@ -1165,6 +1166,8 @@
TRACE(thunk, "after SYSTHUNK hack: EBP: %08lx ESP: %08lx cur_stack: %08lx\n",
EBP_reg(context), ESP_reg(context), thdb->cur_stack);
}
+
+ SYSLEVEL_ReleaseWin16Lock();
}
/***********************************************************************
@@ -1174,6 +1177,8 @@
{
LPBYTE code = (LPBYTE)EIP_reg(context) - 13;
+ SYSLEVEL_RestoreWin16Lock();
+
/* We undo the SYSTHUNK hack if necessary. See K32Thk1632Prolog. */
if ( code[5] == 0xFF && code[6] == 0x55 && code[7] == 0xFC
diff --git a/win32/newfns.c b/win32/newfns.c
index 7f61887..693c5f7 100644
--- a/win32/newfns.c
+++ b/win32/newfns.c
@@ -55,28 +55,6 @@
return TRUE;
}
-HANDLE32 WINAPI FindFirstChangeNotification32A(LPCSTR lpPathName,BOOL32 bWatchSubtree,DWORD dwNotifyFilter) {
- FIXME(file,"(%s,%d,%08lx): stub\n",
- lpPathName,bWatchSubtree,dwNotifyFilter);
- return 0xcafebabe;
-}
-
-HANDLE32 WINAPI FindFirstChangeNotification32W(LPCWSTR lpPathName,BOOL32 bWatchSubtree,DWORD dwNotifyFilter) {
- FIXME(file,"(%s,%d,%08lx): stub\n",
- debugstr_w(lpPathName),bWatchSubtree,dwNotifyFilter);
- return 0xcafebabe;
-}
-
-BOOL32 WINAPI FindNextChangeNotification(HANDLE32 fcnhandle) {
- FIXME(file,"(%08x): stub!\n",fcnhandle);
- return FALSE;
-}
-
-BOOL32 WINAPI FindCloseChangeNotification(HANDLE32 fcnhandle) {
- FIXME(file,"(%08x): stub!\n",fcnhandle);
- return FALSE;
-}
-
/****************************************************************************
* QueryPerformanceFrequency (KERNEL32.565)
*/
diff --git a/win32/ordinals.c b/win32/ordinals.c
index a1077a6..a9699cf 100644
--- a/win32/ordinals.c
+++ b/win32/ordinals.c
@@ -16,78 +16,6 @@
#include "callback.h"
#include "debug.h"
-static CRITICAL_SECTION Win16Mutex;
-static SEGPTR segWin16Mutex = (SEGPTR)NULL;
-
-
-/***********************************************
- * GetpWin16Lock (KERNEL32.93)
- * Return the infamous Win16Mutex.
- */
-VOID WINAPI GetpWin16Lock(CRITICAL_SECTION **lock)
-{
- FIXME(win32, "(%p)\n",lock);
- *lock = &Win16Mutex;
-}
-
-/***********************************************
- * _ConfirmWin16Lock (KERNEL32.96)
- */
-DWORD WINAPI _ConfirmWin16Lock(void)
-{
- FIXME(win32, "()\n");
- return 1;
-}
-
-/***********************************************
- * _EnterSysLevel (KERNEL32.97)
- */
-VOID WINAPI _EnterSysLevel(CRITICAL_SECTION *lock)
-{
- FIXME(win32, "(%p)\n", lock);
-}
-
-/***********************************************
- * _EnterSysLevel (KERNEL32.98)
- */
-VOID WINAPI _LeaveSysLevel(CRITICAL_SECTION *lock)
-{
- FIXME(win32, "(%p)\n", lock);
-}
-
-/***********************************************
- * ReleaseThunkLock (KERNEL32.48)
- */
-VOID WINAPI ReleaseThunkLock(DWORD *mutex_count)
-{
- _LeaveSysLevel(&Win16Mutex);
-
- *mutex_count = (DWORD) NtCurrentTeb()->mutex_count;
- NtCurrentTeb()->mutex_count = 0xFFFF;
-}
-
-/***********************************************
- * RestoreThunkLock (KERNEL32.49)
- */
-VOID WINAPI RestoreThunkLock(DWORD mutex_count)
-{
- NtCurrentTeb()->mutex_count = (WORD)mutex_count;
-
- _EnterSysLevel(&Win16Mutex);
-}
-
-/***********************************************
- * GetPK16SysVar (KERNEL32.92)
- */
-LPVOID WINAPI GetPK16SysVar(void)
-{
- static BYTE PK16SysVar[128];
-
- FIXME(win32, "()\n");
- return PK16SysVar;
-}
-
-
/**********************************************************************
* WOWGetDescriptor (KERNEL32.88) (WOW32.1)
*/
@@ -180,6 +108,18 @@
return 0;
}
+/**********************************************************************
+ * GetPK16SysVar (KERNEL32.92)
+ */
+LPVOID WINAPI GetPK16SysVar(void)
+{
+ static BYTE PK16SysVar[128];
+
+ FIXME(win32, "()\n");
+ return PK16SysVar;
+}
+
+
BOOL32 WINAPI _KERNEL32_100(HANDLE32 threadid,DWORD exitcode,DWORD x) {
FIXME(thread,"(%d,%ld,0x%08lx): stub\n",threadid,exitcode,x);
return TRUE;
@@ -190,18 +130,3 @@
return 1;
}
-/************************************************************************
- * KERNEL_449 (KERNEL.449)
- * This returns a segmented static pointer to a linear pointer to a critical
- * section in kernel32 address space. This is most likely the Win16 Lock,
- * but I am not sure.
- */
-SEGPTR WINAPI KERNEL_449(void) {
- if (!segWin16Mutex) {
- LPDWORD w16m = SEGPTR_ALLOC(4);
-
- *w16m = (DWORD)&Win16Mutex;
- segWin16Mutex = SEGPTR_GET(w16m);
- }
- return segWin16Mutex;
-}
diff --git a/win32/process.c b/win32/process.c
index a9e8b2d..3a85430 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -14,29 +14,11 @@
#include "process.h"
#include "pe_image.h"
#include "file.h"
+#include "task.h"
+#include "toolhelp.h"
#include "debug.h"
-/***********************************************************************
- * MsgWaitForMultipleObjects (USER32.400)
- */
-DWORD WINAPI MsgWaitForMultipleObjects(
- DWORD nCount,HANDLE32 *pHandles,BOOL32 fWaitAll,DWORD dwMilliseconds,
- DWORD dwWakeMask
-) {
-#if 0
- int i;
- fprintf(stderr,"MsgWaitForMultipleObjects(%ld,[",nCount);
- for (i=0;i<nCount;i++)
- fprintf(stderr,"%ld,",(DWORD)pHandles[i]);
- fprintf(stderr,"],%d,%ld,0x%08lx)\n",fWaitAll,dwMilliseconds,dwWakeMask);
- return 0;
-#else
- return WaitForMultipleObjectsEx(nCount, pHandles, fWaitAll, dwMilliseconds,
- FALSE);
-#endif
-}
-
/**********************************************************************
* GetProcessAffinityMask
*/
@@ -62,7 +44,7 @@
*/
BOOL32 WINAPI SetThreadAffinityMask(HANDLE32 hThread, DWORD dwThreadAffinityMask)
{
- THDB *thdb = THREAD_GetPtr( hThread, THREAD_SET_INFORMATION );
+ THDB *thdb = THREAD_GetPtr( hThread, THREAD_SET_INFORMATION, NULL );
if (!thdb)
return FALSE;
@@ -85,13 +67,16 @@
DWORD creationflags,LPVOID env,LPCSTR curdir,
LPSTARTUPINFO32A startupinfo,LPPROCESS_INFORMATION processinfo
) {
- WARN(win32,"CreateProcessA(%s,%s,%p,%p,%d,%08lx,%p,%s,%p,%p),\n
- calling WinExec32 instead\n",
+ HINSTANCE16 hInst = 0;
+ if (processinfo) memset(processinfo, '\0', sizeof(*processinfo));
+
+ FIXME(win32,"(%s,%s,%p,%p,%d,%08lx,%p,%s,%p,%p): calling WinExec32\n",
appname,cmdline,processattributes,threadattributes,
- inherithandles,creationflags,env,curdir,startupinfo,processinfo
- );
- WinExec32(cmdline,TRUE);
- return TRUE;
+ inherithandles,creationflags,env,curdir,startupinfo,processinfo);
+
+ hInst = WinExec32(cmdline,TRUE);
+
+ return hInst >= 32;
#if 0
/* make from lcc uses system as fallback if CreateProcess returns
FALSE, so return false */
