Changeset 1615 for trunk/src

Timestamp:

Nov 5, 1999, 2:01:33 PM (26 years ago)

Author:

achimha

Message:

source code cleanup, remove warnings

Location:

trunk/src/comctl32

Files:

• comctl32.h (modified) (2 diffs)
• comctl32undoc.c (modified) (10 diffs)
• propsheet.c (modified) (7 diffs)
• tab.c (modified) (3 diffs)

trunk/src/comctl32/comctl32.h

@@ -1 @@
-/* $Id: comctl32.h,v 1.8 1999-09-26 11:01:08 achimha Exp $ */
+/* $Id: comctl32.h,v 1.9 1999-11-05 13:01:32 achimha Exp $ */
 /*
  * Win32 common controls implementation
@@ -24 +24 @@
 #include "wineuni.h"
 
+#define TRACE(x)
+#define FIXME(x)
+#define WARN(x)
+
+#define _OS2WIN_H
+#define NO_ULONG
+#include <misc.h>
 
 #ifdef __cplusplus

trunk/src/comctl32/comctl32undoc.c

@@ -1 @@
-/* $Id: comctl32undoc.c,v 1.13 1999-11-02 21:44:01 achimha Exp $ */
+/* $Id: comctl32undoc.c,v 1.14 1999-11-05 13:01:32 achimha Exp $ */
 /*
  * Undocumented functions from COMCTL32.DLL
@@ -1831 +1831 @@
  */
 LPWSTR WINAPI COMCTL32_StrChrW( LPCWSTR lpStart, WORD wMatch) {
+  dprintf(("COMCTL32: StrChrW - unimplemented stub\n"));
 //  return CRTDLL_wcschr(lpStart, wMatch);
+  return 0;
 }
 
@@ -1847 +1849 @@
  */
 INT WINAPI COMCTL32_StrCmpNW( LPCWSTR lpStr1, LPCWSTR lpStr2, int nChar) {
+  dprintf(("COMCTL32: StrCmpNW - unimplemented stub\n"));
 //  return lstrncmpW(lpStr1, lpStr2, nChar);
+  return 0;
 }
 
@@ -1856 +1860 @@
 INT WINAPI COMCTL32_StrCmpNIW( LPCWSTR lpStr1, LPCWSTR lpStr2, int nChar) {
 //  FIXME("(%s, %s, %i): stub\n", debugstr_w(lpStr1), debugstr_w(lpStr2), nChar);
+  dprintf(("COMCTL32: StrCmpNIW - unimplemented stub\n"));
   return 0;
 }
@@ -1864 +1869 @@
  */
 LPSTR WINAPI COMCTL32_StrRChrA( LPCSTR lpStart, LPCSTR lpEnd, WORD wMatch) {
+  dprintf(("COMCTL32: lstrrchr - unimplemented stub\n"));
 //  return lstrrchr(lpStart, lpEnd, wMatch);
+  return 0;
 }
 
@@ -1872 +1879 @@
  */
 LPWSTR WINAPI COMCTL32_StrRChrW( LPCWSTR lpStart, LPCWSTR lpEnd, WORD wMatch) {
+  dprintf(("COMCTL32: StrRChrW - unimplemented stub\n"));
 //  return lstrrchrw(lpStart, lpEnd, wMatch);
+  return 0;
 }
 
@@ -1888 +1897 @@
  */
 LPWSTR WINAPI COMCTL32_StrStrW( LPCWSTR lpFirst, LPCWSTR lpSrch) {
+  dprintf(("COMCTL32: StrStrW - unimplemented stub\n"));
 //  return strstrw(lpFirst, lpSrch);
+  return 0;
 }
 
@@ -1897 +1908 @@
 INT WINAPI COMCTL32_StrSpnW( LPWSTR lpStr, LPWSTR lpSet) {
   LPWSTR lpLoop = lpStr;
+
+  dprintf(("COMCTL32: StrSpnW - unimplemented stub\n"));
+  return 0;
 
   /* validate ptr */
@@ -1919 +1933 @@
 BOOL WINAPI comctl32_410( HWND hw, DWORD b, DWORD c, DWORD d) {
 
+  dprintf(("COMCTL32: comctl32_410 - unimplemented stub\n"));
    //FIXME_(commctrl)("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d);
 
@@ -1934 +1949 @@
 
    //FIXME_(commctrl)("(%lx): stub!\n", a);
+  dprintf(("COMCTL32: InitMUILanguage - unimplemented stub\n"));
 
    return TRUE;

trunk/src/comctl32/propsheet.c

@@ -1 @@
-/* $Id: propsheet.c,v 1.11 1999-11-02 21:44:02 achimha Exp $ */
+/* $Id: propsheet.c,v 1.12 1999-11-05 13:01:33 achimha Exp $ */
 /*
  * Property Sheets
@@ -890 +890 @@
   PADDING_INFO padding;
 
-  TRACE("index %d\n", index);
+//  TRACE("index %d\n", index);
 
   if (ppshpage->dwFlags & PSP_DLGINDIRECT)
@@ -1051 +1051 @@
   msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
 
-  TRACE("msg result %ld\n", msgResult);
+//  TRACE("msg result %ld\n", msgResult);
 
   if (msgResult == -1)
@@ -1082 +1082 @@
   msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
 
-  TRACE("msg result %ld\n", msgResult);
+//  TRACE("msg result %ld\n", msgResult);
 
   if (msgResult != 0)
@@ -1522 +1522 @@
 
   if (!psInfo) {
-    FIXME("No psInfo for propertysheet at windows 0x%04x, returning FALSE...\n", hwndDlg);
+//    FIXME("No psInfo for propertysheet at windows 0x%04x, returning FALSE...\n", hwndDlg);
     return FALSE;
   }
@@ -1537 +1537 @@
   if (index < 0 || index >= psInfo->nPages)
     {
-      TRACE("Could not find page to remove!\n");
+//      TRACE("Could not find page to remove!\n");
       return FALSE;
     }
 
-  TRACE("total pages %d removing page %d active page %d\n",
-        psInfo->nPages, index, psInfo->active_page);
+//  TRACE("total pages %d removing page %d active page %d\n",
+//        psInfo->nPages, index, psInfo->active_page);
   /*
    * Check if we're removing the active page.
@@ -1563 +1563 @@
     else
     {
-      TRACE("Removing the only page, close the dialog!\n");
+//      TRACE("Removing the only page, close the dialog!\n");
 
       if (psInfo->isModeless)

trunk/src/comctl32/tab.c

@@ -1 @@
-/* $Id: tab.c,v 1.16 1999-11-02 21:44:03 achimha Exp $ */
+/* $Id: tab.c,v 1.17 1999-11-05 13:01:33 achimha Exp $ */
 /*
  * Tab control
@@ -396 +396 @@
   pt.y = (INT)HIWORD(lParam);
   
-  newItem=TAB_InternalHitTest (hwnd, infoPtr,pt,&dummy);
+  newItem = TAB_InternalHitTest (hwnd, infoPtr, pt, (unsigned int*)&dummy);
   
-  TRACE("On Tab, item %d\n", newItem);
+//  TRACE("On Tab, item %d\n", newItem);
     
   if ( (newItem!=-1) &&
@@ -1497 +1497 @@
    if (len>wineItem->cchTextMax) 
      wineItem->pszText= COMCTL32_ReAlloc (wineItem->pszText, len+1);
-   lstrcpyA (wineItem->pszText, tabItem->pszText);
+   lstrcpyA ((unsigned char*)wineItem->pszText, tabItem->pszText);
   }