some small include fixes, some checks for NULL ptrs,

loader/elf.c: fixed the "lib" insertion
crtdll: added fsopen()
dinput: return that we are attached.

dlls/advapi32/advapi.c

@@ -8,10 +8,10 @@
 #include <unistd.h>
 #include <string.h>
 
+#include "winbase.h"
 #include "windef.h"
 #include "winerror.h"
 #include "wine/winestring.h"
-#include "heap.h"
 
 #include "debugtools.h"
 

dlls/advapi32/eventlog.c

@@ -4,6 +4,7 @@
  * Copyright 1995 Sven Verdoolaege, 1998 Juergen Schmied
  */
 
+#include "winbase.h"
 #include "windef.h"
 #include "winreg.h"
 #include "winerror.h"

dlls/avifil32/avifile.c

@@ -5,8 +5,8 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "vfw.h"
 #include "winbase.h"
+#include "vfw.h"
 #include "wine/winestring.h"
 #include "driver.h"
 #include "mmsystem.h"

dlls/comctl32/propsheet.c

@@ -761,6 +761,7 @@ static void PROPSHEET_Changed(HWND hwndDlg, HWND hwndDirtyPage)
   PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwndDlg,
                                                     PropSheetInfoStr);
 
+  if (!psInfo) return;
   /*
    * Set the dirty flag of this page.
    */

dlls/comctl32/trackbar.c

@@ -167,6 +167,7 @@ TRACKBAR_CalcThumb (HWND hwnd, TRACKBAR_INFO *infoPtr)
 	
     thumb=&infoPtr->rcThumb;
     range=infoPtr->nRangeMax - infoPtr->nRangeMin;
+    if (!range) return; /* FIXME: may this happen? */
     if (GetWindowLongA (hwnd, GWL_STYLE) & TBS_VERT) {
     	width=infoPtr->rcChannel.bottom - infoPtr->rcChannel.top;
         thumb->left  = infoPtr->rcChannel.left - 1;

dlls/version/resource.c

@@ -9,13 +9,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "peexe.h"
 #include "neexe.h"
 #include "module.h"
 #include "winver.h"
-#include "heap.h"
 #include "lzexpand.h"
-#include "peexe.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(ver)

if1632/relay.c

@@ -13,6 +13,7 @@
 #include "module.h"
 #include "stackframe.h"
 #include "task.h"
+#include "syslevel.h"
 #include "debugstr.h"
 #include "debugtools.h"
 #include "main.h"

include/win.h

@@ -7,6 +7,7 @@
 #ifndef __WINE_WIN_H
 #define __WINE_WIN_H
 
+#include "winuser.h"
 #include "queue.h"
 #include "class.h"
 

loader/elf.c

@@ -114,8 +114,10 @@ WINE_MODREF *ELF_LoadLibraryExA( LPCSTR libname, DWORD flags, DWORD *err)
 	if (!s)
 		s=strrchr(libname,'\\');
 	if (s) {
-		strncpy(t,libname,s-libname+1);
-		t[s-libname+1]= '\0';
+		s++; /* skip / or \ */
+		/* copy everything up to s-1 */
+		memcpy(t,libname,s-libname);
+		t[s-libname]= '\0';
 	} else
 		s = (LPSTR)libname;
 	modname = s;

loader/pe_image.c

@@ -422,14 +422,8 @@ static void do_relocations( unsigned int load_addr, IMAGE_BASE_RELOCATION *r )
 				*(short*)(page+offset) += ldelta;
 				break;
 			case IMAGE_REL_BASED_HIGHLOW:
-#if 1
 				*(int*)(page+offset) += delta;
-#else
-				{ int h=*(unsigned short*)(page+offset);
-				  int l=r->TypeOffset[++i];
-				  *(unsigned int*)(page + offset) = (h<<16) + l + delta;
-				}
-#endif
+				/* FIXME: if this is an exported address, fire up enhanced logic */
 				break;
 			case IMAGE_REL_BASED_HIGHADJ:
 				FIXME_(win32)("Don't know what to do with IMAGE_REL_BASED_HIGHADJ\n");

misc/crtdll.c

@@ -247,6 +247,10 @@ DWORD __cdecl CRTDLL__initterm(_INITTERMFUN *start,_INITTERMFUN *end)
 	return 0;
 }
 
+CRTDLL_FILE * __cdecl CRTDLL__fsopen(LPCSTR x, LPCSTR y, INT z) {
+	FIXME("(%s,%s,%d),stub!\n",x,y,z);
+	return NULL;
+}
 /*********************************************************************
  *                  _fdopen     (CRTDLL.91)
  */

misc/shell.c

@@ -23,6 +23,7 @@
 #include "shlobj.h"
 #include "debugtools.h"
 #include "winreg.h"
+#include "syslevel.h"
 #include "imagelist.h"
 
 DECLARE_DEBUG_CHANNEL(exec)

multimedia/dsound.c

@@ -2277,7 +2277,7 @@ HRESULT WINAPI DirectSoundCreate(REFGUID lpGUID,LPDIRECTSOUND *ppDS,IUnknown *pU
 		} else if (errno == EBUSY) {
 			MSG("Sound device busy, will keep trying.\n");
 		} else {
-			MSG("Unexpected error while checking for sound support.\n");
+			MSG("Unexpected error (%d) while checking for sound support.\n",errno);
 			return DSERR_GENERIC;
 		}
 	} else {

relay32/crtdll.spec

@@ -112,7 +112,7 @@ init    CRTDLL_Init
 107 cdecl _fpreset() CRTDLL__fpreset
 108 stub _fputchar
 109 stub _fputwchar
-110 stub _fsopen
+110 cdecl _fsopen(str str long) CRTDLL__fsopen
 111 cdecl _fstat(long ptr) CRTDLL__fstat
 112 stub _ftime
 113 cdecl _ftol() CRTDLL__ftol

windows/dinput.c

@@ -517,6 +517,7 @@ static HRESULT WINAPI IDirectInputDevice2AImpl_GetCapabilities(
 	LPDIRECTINPUTDEVICE2A iface,
 	LPDIDEVCAPS lpDIDevCaps)
 {
+	lpDIDevCaps->dwFlags = DIDC_ATTACHED;
 	FIXME(dinput, "stub!\n");
 	return DI_OK;
 }