Changeset 5354 for trunk/src

Timestamp:

Mar 22, 2001, 7:16:54 PM (24 years ago)

Author:

sandervl

Message:

thread handler call workaround for app bugs + GetBinaryTypeA/W port

Location:

trunk/src/kernel32

Files:

• KERNEL32.CPP (modified) (3 diffs)
• exceptutil.asm (modified) (2 diffs)
• exceptutil.h (modified) (3 diffs)
• makefile (modified) (3 diffs)
• module.cpp (added)
• thread.cpp (modified) (3 diffs)
• wprocess.cpp (modified) (2 diffs)

trunk/src/kernel32/KERNEL32.CPP

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.59 2001-03-13 18:45:32 sandervl Exp $ */
+/* $Id: KERNEL32.CPP,v 1.60 2001-03-22 18:16:40 sandervl Exp $ */
 
 /*
@@ -238 +238 @@
     dprintf(("dwAvailVirtual  %X\n", arg1->dwAvailVirtual));
 }
-VOID WIN32API Sleep(DWORD arg1)
-{
-    dprintf2(("KERNEL32:  Sleep %d\n", arg1));
-    O32_Sleep(arg1);
-}
-//******************************************************************************
-//******************************************************************************
-DWORD WIN32API GetPriorityClass(HANDLE arg1)
-{
-    dprintf(("KERNEL32:  GetPriorityClass\n"));
-    return O32_GetPriorityClass(arg1);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API SetPriorityClass(HANDLE arg1, DWORD  arg2)
-{
-    dprintf(("KERNEL32:  SetPriorityClass\n"));
-    return O32_SetPriorityClass(arg1, arg2);
-}
-//******************************************************************************
-//******************************************************************************
 BOOL WIN32API Beep( DWORD arg1, DWORD  arg2)
 {
@@ -370 +349 @@
 }
 //******************************************************************************
-//TODO: Not complete or correct, but sufficient for now
-//******************************************************************************
-BOOL WIN32API GetBinaryTypeA(LPCTSTR lpApplicationName, LPDWORD lpBinaryType)
-{
-  dprintf(("KERNEL32:  OS2GetBinaryTypeA %s\n", lpApplicationName));
-  if(strstr(lpApplicationName, ".EXE") ||   strstr(lpApplicationName, ".exe"))
-        *lpBinaryType = SCS_32BIT_BINARY;
-  else
-  if(strstr(lpApplicationName, ".COM") ||   strstr(lpApplicationName, ".com"))
-        *lpBinaryType = SCS_DOS_BINARY;
-  else
-  if(strstr(lpApplicationName, ".PIF") ||   strstr(lpApplicationName, ".pif"))
-        *lpBinaryType = SCS_PIF_BINARY;
-  else  return(FALSE);
-  return(TRUE);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API GetBinaryTypeW(LPCWSTR lpApplicationName, LPDWORD lpBinaryType)
-{
- BOOL rc;
- char  *astring;
-
-    dprintf(("KERNEL32:  OS2GetBinaryTypeW\n"));
-    astring = UnicodeToAsciiString((LPWSTR)lpApplicationName);
-    rc = GetBinaryTypeA(astring, lpBinaryType);
-    FreeAsciiString(astring);
-    return(rc);
-}
-//******************************************************************************
 //******************************************************************************
 BOOL WIN32API FlushInstructionCache(     /*PLF Mon  98-02-09 23:56:49 : STUB STUB STUB STUB STUB */

trunk/src/kernel32/exceptutil.asm

@@ -1 @@
-; $Id: exceptutil.asm,v 1.12 2001-02-08 10:23:40 sandervl Exp $
+; $Id: exceptutil.asm,v 1.13 2001-03-22 18:16:40 sandervl Exp $
 
 ;/*
@@ -232 +232 @@
 _Mul32x32to64 endp
 
+        PUBLIC  _AsmCallThreadHandler
+_AsmCallThreadHandler proc near
+        push    ebp
+        mov     ebp, esp
+
+        push    [ebp+12]
+        mov     eax, dword ptr [ebp+8]
+        call    eax
+
+        mov     esp, ebp
+        pop     ebp
+        ret
+_AsmCallThreadHandler endp
+
 CODE32          ENDS
 

trunk/src/kernel32/exceptutil.h

@@ -1 @@
-/* $Id: exceptutil.h,v 1.10 2000-10-18 17:09:32 sandervl Exp $ */
+/* $Id: exceptutil.h,v 1.11 2001-03-22 18:16:41 sandervl Exp $ */
 
 /*
@@ -45 +45 @@
 void CDECL Mul32x32to64(PVOID result, DWORD op1, DWORD op2);
 
+ULONG CDECL AsmCallThreadHandler(ULONG handler, LPVOID parameter);
+
 #ifdef __cplusplus
 }
@@ -53 +55 @@
 void LogException(int state);
 
+
 #endif

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.110 2001-02-17 21:48:23 bird Exp $
+# $Id: makefile,v 1.111 2001-03-22 18:16:41 sandervl Exp $
 
 #
@@ -7 +7 @@
 #
 
-
 #
 # Compiler, tools, and interference rules.
 #
 !include ../../makefile.inc
-
 
 #
@@ -120 +118 @@
 $(OBJDIR)\exceptstackdump.obj \
 !endif
+$(OBJDIR)\module.obj \
 $(OBJDIR)\kernelrsrc.obj
 

trunk/src/kernel32/thread.cpp

@@ -1 @@
-/* $Id: thread.cpp,v 1.27 2001-02-11 10:34:45 sandervl Exp $ */
+/* $Id: thread.cpp,v 1.28 2001-03-22 18:16:41 sandervl Exp $ */
 
 /*
@@ -98 +98 @@
  EXCEPTION_FRAME exceptFrame;
  Win32Thread     *me = (Win32Thread *)lpData;
- WIN32THREADPROC  winthread = me->pCallback;
+ ULONG            winthread = (ULONG)me->pCallback;
  LPVOID           userdata  = me->lpUserData;
  HANDLE           hThread   = me->hThread;
@@ -134 +134 @@
   //Set default FPU control word (no exceptions); same as in NT
   CONTROL87(0x27F, 0xFFF);
-  rc = winthread(userdata);
+  rc = AsmCallThreadHandler(winthread, userdata);
 
   HMSetThreadTerminated(GetCurrentThread());

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.115 2001-03-19 19:27:14 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.116 2001-03-22 18:16:41 sandervl Exp $ */
 
 /*
@@ -1756 +1756 @@
     return procinfo.hProcess; //correct?
 }
+//******************************************************************************
+//******************************************************************************
+VOID WIN32API Sleep(DWORD arg1)
+{
+    dprintf2(("KERNEL32:  Sleep %d\n", arg1));
+    O32_Sleep(arg1);
+}
+//******************************************************************************
+//******************************************************************************
+DWORD WIN32API GetPriorityClass(HANDLE hProcess)
+{
+    dprintf(("KERNEL32: GetPriorityClass %x", hProcess));
+    return O32_GetPriorityClass(hProcess);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API SetPriorityClass(HANDLE hProcess, DWORD dwPriority)
+{
+    dprintf(("KERNEL32: SetPriorityClass %x %x", hProcess, dwPriority));
+    return O32_SetPriorityClass(hProcess, dwPriority);
+}
 /**********************************************************************
  * LoadModule    (KERNEL32.499)