Changeset 4356

Timestamp:

Oct 1, 2000, 11:25:49 PM (25 years ago)

Author:

phaller

Message:

.

Location:

trunk

Files:

• changelog (modified) (1 diff)
• doc/ToDO.txt (modified) (2 diffs)
• src/gdi32/blit.cpp (modified) (2 diffs)
• src/kernel32/time.cpp (modified) (2 diffs)
• src/ole32/library.cpp (modified) (3 diffs)

trunk/changelog

@@ -1 @@
- /* $Id: changelog,v 1.1154 2000-10-01 12:04:46 sandervl Exp $ */
+ /* $Id: changelog,v 1.1155 2000-10-01 21:19:41 phaller Exp $ */
+
+ 2000-10-01: Patrick Haller <phaller@gmx.net>
+    - KERNEL32: Optimization of PROFILE calls
+    - GDI32:    Fix for uncompressed/RGB bitmaps (biSizeImage == 0)
+    - WINMM:    Fix for timer logic - timers still quite untested
 
  2000-10-01: Sander van Leeuwen <sandervl@xs4all.nl>

trunk/doc/ToDO.txt

@@ -1 @@
-/* $Id: ToDO.txt,v 1.8 2000-08-01 23:17:55 sandervl Exp $ */
+/* $Id: ToDO.txt,v 1.9 2000-10-01 21:25:49 phaller Exp $ */
 
 To Do list for ODIN:
@@ -6 +6 @@
 Assigned Status Topic -------------------------------------------------------
 
+PH              Implement WaitForSingleObject() for process handles
+
 PD       DONE   Handle named pipes via HandleManager
 
-AH              Do COM (serial port) support for ODIN (requires
+MM       DONE   Do COM (serial port) support for ODIN (requires
                 pseudo-device in HM)
 
-PH              Sync SHELL32 with WINE
+PH       DONE   Sync SHELL32 with WINE
+
+SvL             Add HKLM\\SOFTWARE\Microsoft\WINDOWS\CurrentVersion
+                Key CommonFilesDir="?:\Program Files\Common Files" for
+                TogetherJ installation to the ODIN installer.
 
 PH              Sync NTDLL with WINE

trunk/src/gdi32/blit.cpp

@@ -1 @@
-/* $Id: blit.cpp,v 1.18 2000-09-13 21:00:22 sandervl Exp $ */
+/* $Id: blit.cpp,v 1.19 2000-10-01 21:21:15 phaller Exp $ */
 
 /*
@@ -55 +55 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API BitBlt(HDC hdcDest, int arg2, int arg3, int arg4, int arg5, HDC hdcSrc, int arg7, int arg8, DWORD  arg9)
-{
- BOOL rc;
-
-    SetLastError(ERROR_SUCCESS);
-    if(DIBSection::getSection() != NULL) {
-        DIBSection *dsect = DIBSection::findHDC(hdcSrc);
-        if(dsect) {
-                return dsect->BitBlt(hdcDest, arg2, arg3, arg4, arg5, arg7, arg8, arg4, arg5, arg9);
-        }
-    }
-    dprintf(("GDI32: BitBlt to hdc %X from (%d,%d) to (%d,%d), (%d,%d) rop %X\n", hdcDest, arg7, arg8, arg2, arg3, arg4, arg5, arg9));
-    return O32_BitBlt(hdcDest, arg2, arg3, arg4, arg5, hdcSrc, arg7, arg8, arg9);
+BOOL WIN32API BitBlt(HDC hdcDest, 
+                     int nXDest, 
+                     int nYDest,
+                     int nWidth,
+                     int nHeight,
+                     HDC hdcSrc, 
+                     int nXSrc,
+                     int nYSrc,
+                     DWORD  dwRop)
+{
+  BOOL rc;
+
+  SetLastError(ERROR_SUCCESS);
+  if(DIBSection::getSection() != NULL) 
+  {
+    DIBSection *dsect = DIBSection::findHDC(hdcSrc);
+    if(dsect) 
+    {
+      return dsect->BitBlt(hdcDest,
+                           nXDest,
+                           nYDest,
+                           nWidth,
+                           nHeight,
+                           nXSrc,
+                           nYSrc,
+                           nWidth,
+                           nHeight,
+                           dwRop);
+    }
+  }
+  dprintf(("GDI32: BitBlt to hdc %X from (%d,%d) to (%d,%d), (%d,%d) rop %X\n", 
+           hdcDest, nXSrc, nYSrc, nXDest, nYDest, nWidth, nHeight, dwRop));
+  return O32_BitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, dwRop);
 }
 //******************************************************************************

trunk/src/kernel32/time.cpp

@@ -1 @@
-/* $Id: time.cpp,v 1.12 2000-09-08 00:33:16 phaller Exp $ */
+/* $Id: time.cpp,v 1.13 2000-10-01 21:21:09 phaller Exp $ */
 
 /*
@@ -122 +122 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API FileTimeToSystemTime(const FILETIME * arg1, LPSYSTEMTIME  arg2)
-{
-    dprintf(("KERNEL32:  FileTimeToSystemTime"));
-    return O32_FileTimeToSystemTime(arg1, arg2);
+ODINFUNCTION2(BOOL, FileTimeToSystemTime,
+              const FILETIME *, arg1, 
+              LPSYSTEMTIME, arg2)
+{
+  return O32_FileTimeToSystemTime(arg1, arg2);
 }
 //******************************************************************************

trunk/src/ole32/library.cpp

@@ -1 @@
-/* $Id: library.cpp,v 1.3 2000-09-17 10:31:05 davidr Exp $ */
+/* $Id: library.cpp,v 1.4 2000-10-01 21:22:08 phaller Exp $ */
 /* 
  * 
@@ -19 +19 @@
  */
 
+/*****************************************************************************
+ * Includes                                                                  *
+ *****************************************************************************/
+
+#include <odin.h>
+#include <odinwrap.h>
+#include <os2sel.h>
+
+
 #include "ole32.h"
 
 #include "oString.h"
 #include "moniker.h"    // RunningObjectTableImpl_***
+
+
+/*****************************************************************************
+ * Defines                                                                   *
+ *****************************************************************************/
+
+ODINDEBUGCHANNEL(OLE32-LIBRARY)
+
 
 // ======================================================================
@@ -49 +66 @@
 // CoLoadLibrary
 // ----------------------------------------------------------------------
-HINSTANCE WIN32API CoLoadLibrary(LPSTR lpszLibName, BOOL bAutoFree)
+//HINSTANCE WIN32API CoLoadLibrary(LPSTR lpszLibName, BOOL bAutoFree)
+ODINFUNCTION2(HINSTANCE, CoLoadLibrary,
+              LPSTR, lpszLibName,
+              BOOL, bAutoFree)
 {
     HINSTANCE   hLibrary;