Fixed some warnings.
diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c
index 39b0964..5836423 100644
--- a/dlls/comctl32/datetime.c
+++ b/dlls/comctl32/datetime.c
@@ -780,7 +780,7 @@
if(infoPtr->bCalDepressed == TRUE) {
infoPtr->bCalDepressed = FALSE;
- RedrawWindow(hwnd, &(infoPtr->calbutton), NULL, RDW_ERASE|RDW_INVALIDATE);
+ RedrawWindow(hwnd, &(infoPtr->calbutton), 0, RDW_ERASE|RDW_INVALIDATE);
}
return 0;
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 20b49b7..0d808fe 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -3012,7 +3012,7 @@
if ( wineItem == NULL )
{
ERR("Cannot get valid TREEVIEW_ITEM for lParam\n");
- return NULL;
+ return 0;
}
TRACE("Edit started for %s.\n", wineItem->pszText);
@@ -3069,7 +3069,7 @@
TREEVIEW_EndEditLabelNow(hwnd, (WPARAM)TRUE, 0);
- return NULL;
+ return 0;
}
SetWindowPos (
@@ -3091,7 +3091,7 @@
** return NULL since we cannot edit this.
*/
- return NULL;
+ return 0;
}
return infoPtr->hwndEdit;
@@ -3214,7 +3214,7 @@
/* update the window to eliminate fragments and the like */
TreeView_GetItemRect(hwnd,infoPtr->editItem,&itemRect,FALSE);
- RedrawWindow(hwnd,&itemRect,NULL,RDW_ERASE|RDW_INVALIDATE|RDW_UPDATENOW);
+ RedrawWindow(hwnd,&itemRect,0,RDW_ERASE|RDW_INVALIDATE|RDW_UPDATENOW);
infoPtr->editItem = 0;
@@ -3355,7 +3355,7 @@
{
if ( infoPtr->editItem == 0 ) /* If we are not curently editing */
{
- if( SendMessageA(hwnd, TVM_EDITLABELA, 0, (LPARAM)iItem) == NULL)
+ if( SendMessageA(hwnd, TVM_EDITLABELA, 0, (LPARAM)iItem) == 0)
return 0;
}
}
diff --git a/dlls/commdlg/filedlg95.c b/dlls/commdlg/filedlg95.c
index 7d1ce97..4fab7f5 100644
--- a/dlls/commdlg/filedlg95.c
+++ b/dlls/commdlg/filedlg95.c
@@ -23,7 +23,9 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+
#include "winbase.h"
+#include "crtdll.h"
#include "ldt.h"
#include "heap.h"
#include "commdlg.h"
diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c
index 4309446..38b7e76 100644
--- a/dlls/x11drv/x11drv_main.c
+++ b/dlls/x11drv/x11drv_main.c
@@ -15,6 +15,7 @@
#include "ts_xutil.h"
#include "winbase.h"
+#include "wine/winbase16.h"
#include "winreg.h"
#include "callback.h"
diff --git a/include/crtdll.h b/include/crtdll.h
index 6a600c0..4657bce 100644
--- a/include/crtdll.h
+++ b/include/crtdll.h
@@ -32,6 +32,7 @@
LPSTR __cdecl CRTDLL__mbsinc( LPCSTR str );
INT __cdecl CRTDLL__mbslen( LPCSTR str );
+LPSTR __cdecl CRTDLL__strlwr( LPSTR str );
LPWSTR __cdecl CRTDLL__wcsdup( LPCWSTR str );
INT __cdecl CRTDLL__wcsicmp( LPCWSTR str1, LPCWSTR str2 );
INT __cdecl CRTDLL__wcsicoll( LPCWSTR str1, LPCWSTR str2 );
diff --git a/msdos/ioports.c b/msdos/ioports.c
index 49fb7a0..24d0134 100644
--- a/msdos/ioports.c
+++ b/msdos/ioports.c
@@ -69,8 +69,6 @@
#define IO_READ 1
#define IO_WRITE 2
-#endif /* DIRECT_IO_ACCESS */
-
static void IO_FixCMOSCheckSum(void)
{
WORD sum = 0;
@@ -83,6 +81,8 @@
TRACE("calculated hi %02x, lo %02x\n", cmosimage[0x2e], cmosimage[0x2f]);
}
+#endif /* DIRECT_IO_ACCESS */
+
static void set_timer_maxval(unsigned timer, unsigned maxval)
{
switch (timer) {
@@ -220,11 +220,8 @@
__asm__ __volatile__( "outl %0,%w1" : : "a" (value), "d" (port) );
}
-#endif /* DIRECT_IO_ACCESS */
-
static void IO_port_init(void)
{
-#ifdef DIRECT_IO_ACCESS
char temp[1024];
do_direct_port_access = 0;
@@ -239,10 +236,10 @@
temp, sizeof(temp) );
do_IO_port_init_read_or_write(temp, IO_WRITE);
}
-#endif /* DIRECT_IO_ACCESS */
IO_FixCMOSCheckSum();
}
+#endif /* DIRECT_IO_ACCESS */
/**********************************************************************
* IO_inport
