瀏覽代碼

Removed use of .x files.

woollybah 8 年之前
父節點
當前提交
c44c20b3c5

+ 7 - 7
win32.mod/com.bmx

@@ -7,10 +7,10 @@ Import "com.cpp"
 
 
 Extern "win32"
 Extern "win32"
 
 
-Function CLSIDFromProgID(code$w,clsid:Byte Ptr)
-Function CoCreateInstance(rclsid:Byte Ptr,pUnkOuter:Byte Ptr,dwClsContext,riid:Byte Ptr,ppv:Byte Ptr Ptr)
-Function IIDFromString_(lpsz$w,riid:Byte Ptr)="IIDFromString"
-Function StringFromIID_(riid:Byte Ptr,lpsz:Short Ptr Ptr)="StringFromIID"
+Function CLSIDFromProgID(code$w,clsid:Byte Ptr)="BBINT CLSIDFromProgID(BBSHORT * ,BBBYTE * )!"
+Function CoCreateInstance(rclsid:Byte Ptr,pUnkOuter:Byte Ptr,dwClsContext,riid:Byte Ptr,ppv:Byte Ptr Ptr)="BBINT CoCreateInstance(BBBYTE * ,BBBYTE * ,BBINT ,BBBYTE * ,BBBYTE ** )!"
+Function IIDFromString_(lpsz$w,riid:Byte Ptr)="BBINT IIDFromString(BBSHORT * ,BBBYTE * )!"
+Function StringFromIID_(riid:Byte Ptr,lpsz:Short Ptr Ptr)="HRESULT StringFromIID(REFIID, LPOLESTR *)!"
 End Extern
 End Extern
 
 
 Function IIDFromString(lpsz:String, riid:GUID)
 Function IIDFromString(lpsz:String, riid:GUID)
@@ -42,8 +42,8 @@ End Extern
 
 
 ' oleautomation
 ' oleautomation
 Extern 
 Extern 
-Function SysAllocStringLen:Short Ptr(bstr:Short Ptr,length)
-Function SysFreeString(bstr:Short Ptr)
+Function SysAllocStringLen:Short Ptr(bstr:Short Ptr,length)="BBSHORT * SysAllocStringLen(BBSHORT * ,BBINT )!"
+Function SysFreeString(bstr:Short Ptr)="BBINT SysFreeString(BBSHORT * )!"
 End Extern
 End Extern
 
 
 Extern "win32"
 Extern "win32"
@@ -285,7 +285,7 @@ Interface IHTMLWindow2_ Extends IDispatch_
     Method toString(_pbstr:Short Ptr Ptr)
     Method toString(_pbstr:Short Ptr Ptr)
     Method scrollBy(_int,_int1)
     Method scrollBy(_int,_int1)
     Method scrollTo(_int,_int1)
     Method scrollTo(_int,_int1)
-    Method moveTo(_int,_int1)
+    Method MoveTo(_int,_int1)
     Method moveBy(_int,_int1)
     Method moveBy(_int,_int1)
     Method resizeTo(_int,_int1)
     Method resizeTo(_int,_int1)
     Method resizeBy(_int,_int1)
     Method resizeBy(_int,_int1)

+ 0 - 6
win32.mod/com.x

@@ -1,6 +0,0 @@
-BBINT CLSIDFromProgID(BBSHORT * ,BBBYTE * )!
-BBINT CoCreateInstance(BBBYTE * ,BBBYTE * ,BBINT ,BBBYTE * ,BBBYTE ** )!
-BBINT IIDFromString(BBSHORT * ,BBBYTE * )!
-BBSHORT * SysAllocStringLen(BBSHORT * ,BBINT )!
-BBINT SysFreeString(BBSHORT * )!
-HRESULT StringFromIID(REFIID, LPOLESTR *)!

+ 10 - 10
win32.mod/commctrl.bmx

@@ -310,7 +310,7 @@ Type TCITEMW
 		End If
 		End If
 	End Method
 	End Method
 	
 	
-	Method Setmask(mask:Uint)
+	Method Setmask(mask:UInt)
 		bmx_win32_TCITEMW_Setmask(itemPtr, mask)
 		bmx_win32_TCITEMW_Setmask(itemPtr, mask)
 	End Method
 	End Method
 	
 	
@@ -460,7 +460,7 @@ Extern
 	Function bmx_win32_TVITEMW_SetiSelectedImage(handle:Byte Ptr, iSelectedImage:Int)
 	Function bmx_win32_TVITEMW_SetiSelectedImage(handle:Byte Ptr, iSelectedImage:Int)
 	Function bmx_win32_TVITEMW_SetcChildren(handle:Byte Ptr, cChildren:Int)
 	Function bmx_win32_TVITEMW_SetcChildren(handle:Byte Ptr, cChildren:Int)
 	Function bmx_win32_TVITEMW_SetlParam(handle:Byte Ptr, lp:LParam)
 	Function bmx_win32_TVITEMW_SetlParam(handle:Byte Ptr, lp:LParam)
-	Function bmx_win32_TVITEMW_mask:Uint(handle:Byte Ptr)
+	Function bmx_win32_TVITEMW_mask:UInt(handle:Byte Ptr)
 	Function bmx_win32_TVITEMW_hItem:Byte Ptr(handle:Byte Ptr)
 	Function bmx_win32_TVITEMW_hItem:Byte Ptr(handle:Byte Ptr)
 	Function bmx_win32_TVITEMW_pszText:Short Ptr(handle:Byte Ptr)
 	Function bmx_win32_TVITEMW_pszText:Short Ptr(handle:Byte Ptr)
 	Function bmx_win32_TVITEMW_iImage:Int(handle:Byte Ptr)
 	Function bmx_win32_TVITEMW_iImage:Int(handle:Byte Ptr)
@@ -524,7 +524,7 @@ Type TVITEMW
 		bmx_win32_TVITEMW_SetlParam(itemPtr, lp)
 		bmx_win32_TVITEMW_SetlParam(itemPtr, lp)
 	End Method
 	End Method
 	
 	
-	Method mask:Uint()
+	Method mask:UInt()
 		Return bmx_win32_TVITEMW_mask(itemPtr)
 		Return bmx_win32_TVITEMW_mask(itemPtr)
 	End Method
 	End Method
 	
 	
@@ -540,7 +540,7 @@ Type TVITEMW
 		Return bmx_win32_TVITEMW_iImage(itemPtr)
 		Return bmx_win32_TVITEMW_iImage(itemPtr)
 	End Method
 	End Method
 	
 	
-	Method lParam:Byte Ptr()
+	Method LParam:Byte Ptr()
 		Return bmx_win32_TVITEMW_lParam(itemPtr)
 		Return bmx_win32_TVITEMW_lParam(itemPtr)
 	End Method
 	End Method
 '	Field mask
 '	Field mask
@@ -1749,7 +1749,7 @@ Const LVFI_NEARESTXY          =$0040
 Type FINDINFOW
 Type FINDINFOW
 	Field flags
 	Field flags
     Field psz:Short Ptr
     Field psz:Short Ptr
-    Field lParam
+    Field LParam
     Field pt_x,pt_y
     Field pt_x,pt_y
 	Field vkDirection
 	Field vkDirection
 End Type
 End Type
@@ -2082,11 +2082,11 @@ Const CMB_MASKED              =$02
 
 
 Extern "Win32"
 Extern "Win32"
 
 
-Function ImageList_Create:Byte Ptr(cx,cy,flags:UInt,cInitial,cGrow)
-Function ImageList_AddMasked(himl:Byte Ptr,hbmImage:Byte Ptr,crMask:Byte Ptr)
-Function ImageList_Add(himl:Byte Ptr,hbmImage:Byte Ptr,crMask:Byte Ptr)
-Function ImageList_Destroy( hImageList:Byte Ptr )
-Function ImageList_GetImageCount( hImageList:Byte Ptr )
+Function ImageList_Create:Byte Ptr(cx,cy,flags:UInt,cInitial,cGrow)="HIMAGELIST __stdcall ImageList_Create(int ,int ,UINT ,int ,int )!"
+Function ImageList_AddMasked(himl:Byte Ptr,hbmImage:Byte Ptr,crMask:Byte Ptr)="int __stdcall ImageList_AddMasked(HIMAGELIST ,HBITMAP ,COLORREF )!"
+Function ImageList_Add(himl:Byte Ptr,hbmImage:Byte Ptr,crMask:Byte Ptr)="int __stdcall ImageList_Add(HIMAGELIST ,HBITMAP ,HBITMAP )!"
+Function ImageList_Destroy( hImageList:Byte Ptr )="WINBOOL __stdcall ImageList_Destroy(HIMAGELIST )!"
+Function ImageList_GetImageCount( hImageList:Byte Ptr )="int __stdcall ImageList_GetImageCount(HIMAGELIST )!"
 
 
 End Extern
 End Extern
 
 

+ 0 - 5
win32.mod/commctrl.x

@@ -1,5 +0,0 @@
-HIMAGELIST __stdcall ImageList_Create(int ,int ,UINT ,int ,int )!
-int __stdcall ImageList_AddMasked(HIMAGELIST ,HBITMAP ,COLORREF )!
-int __stdcall ImageList_Add(HIMAGELIST ,HBITMAP ,HBITMAP )!
-WINBOOL __stdcall ImageList_Destroy(HIMAGELIST )!
-int __stdcall ImageList_GetImageCount(HIMAGELIST )!

+ 2 - 2
win32.mod/commdlg.bmx

@@ -142,8 +142,8 @@ End Type
 
 
 Extern "Win32"
 Extern "Win32"
 
 
-Function ChooseColorW_( lpcc:Byte Ptr )="ChooseColorW"
-Function ChooseFontW_( lpcc:Byte Ptr )="ChooseFontW"
+Function ChooseColorW_( lpcc:Byte Ptr )="BBINT ChooseColorW(BBBYTE * )!"
+Function ChooseFontW_( lpcc:Byte Ptr )="BBINT ChooseFontW(BBBYTE * )!"
 
 
 
 
 End Extern
 End Extern

+ 0 - 2
win32.mod/commdlg.x

@@ -1,2 +0,0 @@
-BBINT ChooseColorW(BBBYTE * )!
-BBINT ChooseFontW(BBBYTE * )!

+ 37 - 38
win32.mod/gdi32.bmx

@@ -687,44 +687,43 @@ End Type
 
 
 Extern "Win32"
 Extern "Win32"
 
 
-Function GetStockObject:Byte Ptr( fnObject )
-Function ChoosePixelFormat( hdc:Byte Ptr,ppfd:Byte Ptr )
-Function SetPixelFormat( hdc:Byte Ptr,iPixelFormat,ppfd:Byte Ptr )
-Function SwapBuffers( hdc:Byte Ptr )
-
-Function wglCreateContext( hdc:Byte Ptr )
-Function wglDeleteContext( hglrc )
-Function wglMakeCurrent( hdc:Byte Ptr,hglrc )
-
-Function BitBlt(hdc:Byte Ptr,x,y,w,h,src_dc:Byte Ptr,src_x,src_y,dwrop)
-
-Function GetDeviceCaps(hdc:Byte Ptr,indec)
-
-
-Function CreateFontA:Byte Ptr(cHeight,cWidth,cEscapement,cOrientation,cWeight,bItalic,bUnderline,bStrikeOut,..
-	iCharSet,iOutPrecision,iClipPrecision,iQuality,iPitchAndFamily,pszFaceName:Byte Ptr)
+	Function GetStockObject:Byte Ptr( fnObject )="HGDIOBJ GetStockObject(int)!"
+	Function ChoosePixelFormat( hdc:Byte Ptr,ppfd:Byte Ptr )="int ChoosePixelFormat(HDC,CONST PIXELFORMATDESCRIPTOR*)!"
+	Function SetPixelFormat( hdc:Byte Ptr,iPixelFormat,ppfd:Byte Ptr )="BOOL SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR*)!"
+	Function SwapBuffers( hdc:Byte Ptr )="BOOL SwapBuffers(HDC)!"
+	
+	Function wglCreateContext:Byte Ptr( hdc:Byte Ptr )="HGLRC wglCreateContext(HDC)!"
+	Function wglDeleteContext( hglrc )="BOOL wglDeleteContext(HGLRC)!"
+	Function wglMakeCurrent( hdc:Byte Ptr,hglrc )="BOOL wglMakeCurrent(HDC,HGLRC)!"
+	
+	Function BitBlt(hdc:Byte Ptr,x,y,w,h,src_dc:Byte Ptr,src_x,src_y,dwrop)="BOOL BitBlt(HDC,int,int,int,int,HDC,int,int,DWORD)!"
+	
+	Function GetDeviceCaps(hdc:Byte Ptr,indec)="int GetDeviceCaps(HDC,int)!"
+	
+	
+	Function CreateFontA:Byte Ptr(cHeight,cWidth,cEscapement,cOrientation,cWeight,bItalic,bUnderline,bStrikeOut,iCharSet,iOutPrecision,iClipPrecision,iQuality,iPitchAndFamily,pszFaceName:Byte Ptr)="HFONT CreateFontA(int,int,int,int,int,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCSTR)!"
+	
+	Function CreateFontW:Byte Ptr(cHeight,cWidth,cEscapement,cOrientation,cWeight,bItalic,bUnderline,bStrikeOut,iCharSet,iOutPrecision,iClipPrecision,iQuality,iPitchAndFamily,pszFaceName:Short Ptr)="HFONT CreateFontW(int,int,int,int,int,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCWSTR)!"
+	
+	Function SelectObject:Byte Ptr(hdc:Byte Ptr,obj:Byte Ptr)="HGDIOBJ SelectObject(HDC,HGDIOBJ)!"
+	
+	Function DeleteObject( hObject:Byte Ptr )="BOOL DeleteObject(HGDIOBJ)!"
+	
+	Function CreateSolidBrush:Byte Ptr( crColor )="HBRUSH CreateSolidBrush(COLORREF)!"
+	
+	Function CreateCompatibleDC:Byte Ptr( hdc:Byte Ptr )="HDC CreateCompatibleDC(HDC)!"
+	Function CreateCompatibleBitmap:Byte Ptr( hdc:Byte Ptr,nWidth,nHeight )="HBITMAP CreateCompatibleBitmap(HDC,int,int)!"
+	
+	Function SetDIBits( hdc:Byte Ptr,hbmp:Byte Ptr,uStartScan:UInt,cScanLines:UInt,lpvBits:Byte Ptr,lpbmi:Byte Ptr,fuColorUse:UInt )="int SetDIBits(HDC,HBITMAP,UINT,UINT,VOID *,const BITMAPINFO*,UINT)!"
+	Function DeleteDC( hdc:Byte Ptr )="BOOL DeleteDC(HDC)!"
+	
+	Function SetStretchBltMode( hdc:Byte Ptr,iStretchMode )="int SetStretchBltMode(HDC,int)!"
+	
+	Function StretchBlt( hdcDest:Byte Ptr,dx,dy,dw,dh,hdcSrc:Byte Ptr,sx,sy,sw,sh,dwRop )="BOOL StretchBlt(HDC,int,int,int,int,HDC,int,int,int,int,DWORD)!"
+	
+	Function CreateFontIndirectW:Byte Ptr( lplf:Byte Ptr )="HFONT CreateFontIndirectW(const LOGFONTW*)!"
+	Function GetTextMetricsW( hdc:Byte Ptr,lptm:Byte Ptr )="int GetTextMetricsW(HDC,LPTEXTMETRICW)!"
+	Function GetTextFaceW( hdc:Byte Ptr,nCount,lpFaceName:Short Ptr )="int GetTextFaceW(HDC,int,LPWSTR)!"
 	
 	
-Function CreateFontW:Byte Ptr(cHeight,cWidth,cEscapement,cOrientation,cWeight,bItalic,bUnderline,bStrikeOut,..
-	iCharSet,iOutPrecision,iClipPrecision,iQuality,iPitchAndFamily,pszFaceName:Short Ptr)
-
-Function SelectObject:Byte Ptr(hdc:Byte Ptr,obj:Byte Ptr)
-
-Function DeleteObject( hObject:Byte Ptr )
-
-Function CreateSolidBrush:Byte Ptr( crColor )
-
-Function CreateCompatibleDC:Byte Ptr( hdc:Byte Ptr )
-Function CreateCompatibleBitmap:Byte Ptr( hdc:Byte Ptr,nWidth,nHeight )
-
-Function SetDIBits( hdc:Byte Ptr,hbmp:Byte Ptr,uStartScan:UInt,cScanLines:UInt,lpvBits:Byte Ptr,lpbmi:Byte Ptr,fuColorUse:UInt )
-Function DeleteDC( hdc:Byte Ptr )
-
-Function SetStretchBltMode( hdc:Byte Ptr,iStretchMode )
-
-Function StretchBlt( hdcDest:Byte Ptr,dx,dy,dw,dh,hdcSrc:Byte Ptr,sx,sy,sw,sh,dwRop )
-
-Function CreateFontIndirectW( lplf:Byte Ptr )
-Function GetTextMetricsW( hdc:Byte Ptr,lptm:Byte Ptr )
-Function GetTextFaceW( hdc:Byte Ptr,nCount,lpFaceName:Short Ptr )
 
 
 End Extern
 End Extern

+ 0 - 23
win32.mod/gdi32.x

@@ -1,23 +0,0 @@
-int SetDIBits(HDC,HBITMAP,UINT,UINT,VOID *,const BITMAPINFO*,UINT)!
-BOOL DeleteDC(HDC)!
-BOOL StretchBlt(HDC,int,int,int,int,HDC,int,int,int,int,DWORD)!
-HFONT CreateFontIndirectW(const LOGFONTW*)!
-HGDIOBJ GetStockObject(int)!
-int ChoosePixelFormat(HDC,CONST PIXELFORMATDESCRIPTOR*)!
-BOOL SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR*)!
-BOOL SwapBuffers(HDC)!
-HGLRC wglCreateContext(HDC)!
-BOOL wglDeleteContext(HGLRC)!
-BOOL wglMakeCurrent(HDC,HGLRC)!
-BOOL BitBlt(HDC,int,int,int,int,HDC,int,int,DWORD)!
-int GetDeviceCaps(HDC,int)!
-int GetTextMetricsW(HDC,LPTEXTMETRICW)!
-int GetTextFaceW(HDC,int,LPWSTR)!
-HFONT CreateFontA(int,int,int,int,int,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCSTR)!
-HFONT CreateFontW(int,int,int,int,int,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCWSTR)!
-HGDIOBJ SelectObject(HDC,HGDIOBJ)!
-BOOL DeleteObject(HGDIOBJ)!
-HBRUSH CreateSolidBrush(COLORREF)!
-HDC CreateCompatibleDC(HDC)!
-HBITMAP CreateCompatibleBitmap(HDC,int,int)!
-int SetStretchBltMode(HDC,int)!

+ 20 - 20
win32.mod/kernel32.bmx

@@ -23,32 +23,32 @@ Const GMEM_FIXED=0
 Const GMEM_MOVEABLE=2
 Const GMEM_MOVEABLE=2
 Const GMEM_ZEROINT=$40
 Const GMEM_ZEROINT=$40
 
 
-Function Sleep( dwMilliseconds )
-Function Beep( dwFreq,dwDuration )
-Function GetModuleHandleA:Byte Ptr( lpModuleName:Byte Ptr  )
-Function GetModuleHandleW:Byte Ptr( lpModuleName:Short Ptr )
-Function SetFileAttributesA( lpFileName$z,dwFileAttributes )
-Function SetFileAttributesW( lpFileName$z,dwFileAttributes )
-Function GetFileAttributesA( lpFileName$z )
-Function GetFileAttributesW( lpFileName$z )
-
-Function GetCurrentThreadId()
-
-Function GlobalAlloc:Byte Ptr(uFlags:UInt,dwBytes:size_t)
-Function GlobalSize:size_t(hMem:Byte Ptr)
-Function GlobalFree(hMem:Byte Ptr)
-Function GlobalLock:Byte Ptr(hMem:Byte Ptr)
-Function GlobalUnlock(hMem:Byte Ptr)
+Function Sleep( dwMilliseconds )="BBINT Sleep(BBINT )!"
+Function beep( dwFreq,dwDuration )="BBINT Beep(BBINT ,BBINT )!"
+Function GetModuleHandleA:Byte Ptr( lpModuleName:Byte Ptr  )="BBINT GetModuleHandleA(BBBYTE * )!"
+Function GetModuleHandleW:Byte Ptr( lpModuleName:Short Ptr )="BBINT GetModuleHandleW(BBSHORT * )!"
+Function SetFileAttributesA( lpFileName$z,dwFileAttributes )="BBINT SetFileAttributesA(BBBYTE * ,BBINT )!"
+Function SetFileAttributesW( lpFileName$z,dwFileAttributes )="BBINT SetFileAttributesW(BBBYTE * ,BBINT )!"
+Function GetFileAttributesA( lpFileName$z )="BBINT GetFileAttributesA(BBBYTE * )!"
+Function GetFileAttributesW( lpFileName$z )="BBINT GetFileAttributesW(BBBYTE * )!"
+
+Function GetCurrentThreadId()="BBINT GetCurrentThreadId()!"
+
+Function GlobalAlloc:Byte Ptr(uFlags:UInt,dwBytes:Size_T)="HGLOBAL GlobalAlloc(UINT ,SIZE_T )!"
+Function GlobalSize:Size_T(hMem:Byte Ptr)="SIZE_T GlobalSize(HGLOBAL )!"
+Function GlobalFree(hMem:Byte Ptr)="HGLOBAL GlobalFree(HGLOBAL )!"
+Function GlobalLock:Byte Ptr(hMem:Byte Ptr)="BBBYTE * GlobalLock(HGLOBAL )!"
+Function GlobalUnlock(hMem:Byte Ptr)="BBINT GlobalUnlock(HGLOBAL )!"
 
 
 Const STD_INPUT_HANDLE=-10
 Const STD_INPUT_HANDLE=-10
 Const STD_OUTPUT_HANDLE=-11
 Const STD_OUTPUT_HANDLE=-11
 Const STD_ERROR_HANDLE=-12
 Const STD_ERROR_HANDLE=-12
 
 
-Function GetLastError()
+Function GetLastError()="DWORD __stdcall GetLastError()!"
 
 
-Function GetStdHandle:Byte Ptr(nStdHandle)
+Function GetStdHandle:Byte Ptr(nStdHandle)="HANDLE __stdcall GetStdHandle(BBINT )!"
 
 
-Function ReleaseMutex(mutex:Byte Ptr)
-Function CreateMutexW:Byte Ptr( security:Byte Ptr, owner:Int, name$w)
+Function ReleaseMutex(mutex:Byte Ptr)="WINBOOL __stdcall ReleaseMutex(HANDLE)!"
+Function CreateMutexW:Byte Ptr( security:Byte Ptr, owner:Int, name$w)="HANDLE __stdcall CreateMutexW(LPSECURITY_ATTRIBUTES, WINBOOL , LPCWSTR)!"
 
 
 End Extern
 End Extern

+ 0 - 18
win32.mod/kernel32.x

@@ -1,18 +0,0 @@
-BBINT Sleep(BBINT )!
-BBINT Beep(BBINT ,BBINT )!
-BBINT GetModuleHandleA(BBBYTE * )!
-BBINT GetModuleHandleW(BBSHORT * )!
-BBINT SetFileAttributesA(BBBYTE * ,BBINT )!
-BBINT SetFileAttributesW(BBBYTE * ,BBINT )!
-BBINT GetFileAttributesA(BBBYTE * )!
-BBINT GetFileAttributesW(BBBYTE * )!
-BBINT GetCurrentThreadId()!
-HGLOBAL GlobalAlloc(UINT ,SIZE_T )!
-SIZE_T GlobalSize(HGLOBAL )!
-HGLOBAL GlobalFree(HGLOBAL )!
-BBBYTE * GlobalLock(HGLOBAL )!
-BBINT GlobalUnlock(HGLOBAL )!
-HANDLE __stdcall GetStdHandle(BBINT )!
-WINBOOL __stdcall ReleaseMutex(HANDLE)!
-HANDLE __stdcall CreateMutexW(LPSECURITY_ATTRIBUTES, WINBOOL , LPCWSTR)!
-DWORD __stdcall GetLastError()!

+ 2 - 2
win32.mod/shell32.bmx

@@ -2,6 +2,6 @@ Strict
 
 
 
 
 Extern
 Extern
-	Function ExtractIconA:Byte Ptr(hInst:Byte Ptr, lpszExeFileName$z, iconIndex:Int)
-	Function ExtractIconW:Byte Ptr(hInst:Byte Ptr, lpszExeFileName$w, iconIndex:Int)
+	Function ExtractIconA:Byte Ptr(hInst:Byte Ptr, lpszExeFileName$z, iconIndex:Int)="HICON ExtractIconA(HINSTANCE , LPCSTR , UINT )!"
+	Function ExtractIconW:Byte Ptr(hInst:Byte Ptr, lpszExeFileName$w, iconIndex:Int)="HICON ExtractIconW(HINSTANCE , LPCWSTR , UINT )!"
 End Extern	
 End Extern	

+ 0 - 2
win32.mod/shell32.x

@@ -1,2 +0,0 @@
-HICON ExtractIconA(HINSTANCE , LPCSTR , UINT )!
-HICON ExtractIconW(HINSTANCE , LPCWSTR , UINT )!

+ 137 - 137
win32.mod/user32.bmx

@@ -1130,146 +1130,146 @@ End Type
 
 
 Extern "Win32"
 Extern "Win32"
 
 
-Function SetCapture( hWnd:Byte Ptr )
-Function ReleaseCapture()
-
-Function RegisterClassA( lpWndClass:Byte Ptr )
-Function RegisterClassW( lpWndClass:Byte Ptr )
-Function CreateWindowExA:Byte Ptr( dwExStyle,lpClassName:Byte Ptr,lpWindowName:Byte Ptr,dwStyle,x,y,nWidth,nHeight,hWndParent,hmenu:Byte Ptr,hInstance:Byte Ptr,lpParam:Byte Ptr )
-Function CreateWindowExW:Byte Ptr( dwExStyle,lpClassName$w,lpWindowName$w,dwStyle,x,y,nWidth,nHeight,hWndParent:Byte Ptr,hmenu:Byte Ptr,hInstance:Byte Ptr,lpParam:Byte Ptr )
-Function DefWindowProcA:Byte Ptr( hWnd:Byte Ptr,MSG:UInt,wp:WParam,lp:LParam)
-Function DefWindowProcW:Byte Ptr( hWnd:Byte Ptr,MSG:UInt,wp:WParam,lp:LParam)
-Function DispatchMessageA( lpMsg:Byte Ptr )
-Function DispatchMessageW( lpMsg:Byte Ptr )
-Function GetMessageA( lpMsg:Byte Ptr,hWnd:Byte Ptr,wMsgFilterMin,wMsgFilterMax )
-Function GetMessageW( lpMsg:Byte Ptr,hWnd:Byte Ptr,wMsgFilterMin,wMsgFilterMax )
-Function PeekMessageA( lpMsg:Byte Ptr,hWnd:Byte Ptr,wMsgFilterMin,wMsgFilterMax,wRemoveMsg )
-Function PeekMessageW( lpMsg:Byte Ptr,hWnd:Byte Ptr,wMsgFilterMin,wMsgFilterMax,wRemoveMsg )
-Function PostMessageA( hWnd:Byte Ptr,MSG,wp:WParam,lp:LParam )
-Function PostMessageW( hWnd:Byte Ptr,MSG,wp:WParam,lp:LParam )
-Function SendMessageA( hWnd:Byte Ptr,MSG:UInt,wp:WParam,lp:LParam )
-Function SendMessageW( hWnd:Byte Ptr,MSG:UInt,wp:WParam,lp:LParam )
-Function PostThreadMessageA( idThread,Msg,wp:WParam,lp:LParam )
-Function PostThreadMessageW( idThread,Msg,wp:WParam,lp:LParam )
-Function GetDC:Byte Ptr( hWnd:Byte Ptr )
-Function PostQuitMessage( nExitCode )
-Function TranslateMessage( lpMsg:Byte Ptr )
-Function DestroyWindow( hWnd:Byte Ptr )
-Function MsgWaitForMultipleObjects( nCount,pHandles:Byte Ptr,fWaitAll,dwMilliseconds,dwWakeMask )
-Function MsgWaitForMultipleObjectsEx( nCount,pHandles:Byte Ptr,dwMilliseconds,dwWakeMask,dwFlags )
-Function ChangeDisplaySettingsA( lpDevMode:Byte Ptr,dwFlags )
-Function ChangeDisplaySettingsW( lpDevMode:Byte Ptr,dwFlags )
-Function LoadCursorA:Byte Ptr( hInstance:Byte Ptr,lpCursorName:Byte Ptr )
-Function LoadCursorW:Byte Ptr( hInstance:Byte Ptr,lpCursorName:Short Ptr )
-Function ShowCursor( visible )
-Function SetCursor( hCursor:Byte Ptr )
-Function LoadIconA:Byte Ptr( resourceid:Byte Ptr,lpIconName:Byte Ptr )
-Function LoadIconW:Byte Ptr( resourceid:Byte Ptr,lpIconName:Short Ptr )
-Function LoadLibraryA:Byte Ptr( dll$z )
-Function GetProcAddress:Byte Ptr( libhandle:Byte Ptr,func$z )
-Function LoadLibraryW:Byte Ptr( dll$w )
-Function GetClientRect( hWnd:Byte Ptr,lpRect:Int Ptr )
-Function GetWindowRect( hWnd:Byte Ptr,lpRect:Int Ptr )
-Function GetDesktopWindow:Byte Ptr()
-Function AdjustWindowRect( rect:Int Ptr,style,menu )
-Function AdjustWindowRectEx( rect:Int Ptr,style,menu:Int,exstyle )
-Function ClientToScreen( hWnd:Byte Ptr,point:Byte Ptr )
-Function ShowWindow( hWnd:Byte Ptr,nCmdShow )
-Function SetMenu( hWnd:Byte Ptr,hmenu:Byte Ptr )
-Function DrawMenuBar( hWnd:Byte Ptr )
-Function CreateMenu_:Byte Ptr()="CreateMenu" '"CreateMenu@0"
-Function CreatePopupMenu:Byte Ptr()
-Function TrackPopupMenu(hmenu:Byte Ptr,uFLags,x,y,nReserved,hWnd:Byte Ptr,prcRect)
-Function DestroyMenu(hmenu:Byte Ptr)
-Function EnableMenuItem(hmenu:Byte Ptr,uIDEnableItem,uEnable)
-Function CheckMenuItem(hmenu:Byte Ptr,uIDCheckItem,uCheck)
-
-Function AppendMenuA(hmenu:Byte Ptr,uFlags,uIDNewItem,lpNewItem:Byte Ptr)
-Function AppendMenuW(hmenu:Byte Ptr,uFlags,uIDNewItem,lpNewItem:Byte Ptr)
-Function SetMenuItemInfoA( hmenu:Byte Ptr,item,fByPosition,info:Byte Ptr )
-Function SetMenuItemInfoW( hmenu:Byte Ptr,item,fByPosition,info:Byte Ptr )
-Function GetMenuItemCount( hmenu:Byte Ptr )
-Function SetWindowTextA( hWnd:Byte Ptr,text$z )
-Function SetWindowTextW( hWnd:Byte Ptr,text$w )
-Function GetWindowTextA( hWnd:Byte Ptr, lpString:Byte Ptr, maxCount:Int)
-Function GetWindowTextW( hWnd:Byte Ptr, lpString:Short Ptr, maxCount:Int)
-Function SetWindowPos( hWnd:Byte Ptr,hWndInsertAfter:Byte Ptr,x,y,cx,cy,uFlags )
-Function GetForegroundWindow:Byte Ptr()
-Function SetForegroundWindow(hWnd:Byte Ptr)
-Function IsIconic(hWnd:Byte Ptr)
-Function GetParent_:Byte Ptr(hWnd:Byte Ptr)="GetParent" '"GetParent@4"
-Function GetWindowLongA( hWnd:Byte Ptr,index )
-Function SetWindowLongA( hWnd:Byte Ptr,index,newlong )
-Function GetWindowLongW( hWnd:Byte Ptr,index )
-Function SetWindowLongW( hWnd:Byte Ptr,index,newlong )
-Function SetWindowLongPtrW:Byte Ptr( hWnd:Byte Ptr,index,newlong:Byte Ptr)
-Function GetClassLongA( hWnd:Byte Ptr,index )
-Function SetClassLongA( hWnd:Byte Ptr,index,newlong )
-Function GetClassLongW( hWnd:Byte Ptr,index )
-Function SetClassLongW( hWnd:Byte Ptr,index,newlong )
-Function IsZoomed( hWnd:Byte Ptr )
-Function CallWindowProcA:Byte Ptr( proc:Byte Ptr,hWnd:Byte Ptr,msg:UInt,wp:WParam,lp:LParam)
-Function CallWindowProcW:Byte Ptr( proc:Byte Ptr,hWnd:Byte Ptr,msg:Uint,wp:WParam,lp:LParam )
-Function OleInitialize(pvReserved:Byte Ptr)
-Function OleUninitialize()
-Function InitCommonControlsEx(controlsex:Byte Ptr)
-Function SetScrollPos( hWnd:Byte Ptr,nBar,nPos,bRedraw )
-Function GetScrollPos( hWnd:Byte Ptr,nBar )
-Function SetScrollRange( hWnd:Byte Ptr,nBar,nMinPos,nMaxPos,bRedraw )
-Function GetScrollRange( hWnd:Byte Ptr,nBar,lpMinPos:Int Ptr,lpMaxPos:Int Ptr )
-Function ShowScrollBar( hWnd:Byte Ptr,wBar,bShow )
-Function EnableScrollBar( hWnd:Byte Ptr,wSBflags,wArrows )
-Function SetScrollInfo( hWnd:Byte Ptr,nBar,lpsi:Byte Ptr,redraw )
-Function GetScrollInfo( hWnd:Byte Ptr,nBar,lpsi:Byte Ptr)
-Function InvalidateRect( hWnd:Byte Ptr,lpRect:Int Ptr,bErase )
-Function ValidateRect( hWnd:Byte Ptr,lpRect:Int Ptr )
-Function BeginPaint( hWnd:Byte Ptr,lpPaint:Byte Ptr )
-Function FillRect( hdc:Byte Ptr,lpRect:Int Ptr,hbr:Byte Ptr )
-Function EndPaint( hWnd:Byte Ptr,lpPaint:Byte Ptr )
-Function SetFocus:Byte Ptr( hWnd:Byte Ptr )
-Function GetFocus:Byte Ptr()
-Function GetActiveWindow:Byte Ptr()
-Function SetActiveWindow( hWnd:Byte Ptr )
-Function MoveWindow( hWnd:Byte Ptr,x,y,w,h,bRepaint )
-Function SetParent_:Byte Ptr( hWnd:Byte Ptr,hWnd2:Byte Ptr )="SetParent" '"SetParent@8"
-Function WindowFromPoint:Byte Ptr( point:Int Ptr )
-Function GetKeyState(vkey)
-
-Function SetWindowsHookExW:Byte Ptr(idHook,lpfn:Byte Ptr,hmod:Byte Ptr,dwThreadId)
-Function CallNextHookEx(hhk:Byte Ptr,ncode,wp:WParam,lp:LParam)
-Function UnhookWindowsHookEx(hhk:Byte Ptr)
-
-Function EnableWindow( hWnd:Byte Ptr,enable )
-Function IsWindowEnabled( hWnd:Byte Ptr )
-Function IsWindowVisible( hWnd:Byte Ptr )
-Function GetWindowInfo( hWnd:Byte Ptr,winfo:Byte Ptr )
-Function GetCursorPos_( lpPoint:Int Ptr)="GetCursorPos" '"GetCursorPos@4"
-
-Function EnumChildWindows( hWnd:Byte Ptr,lpfn:Byte Ptr,lp:LParam )
-Function EnumWindows( lpfn:Byte Ptr,lp:LParam )
-
-Function OpenClipboard(hWnd:Byte Ptr)
-Function CloseClipboard()
-Function SetClipboardData:Byte Ptr(uFormat:UInt,hMem:Byte Ptr)
-Function GetClipboardData:Byte Ptr(uFormat:UInt)
-Function EmptyClipboard()
-Function IsClipboardFormatAvailable(format)
-
-Function DefDlgProcW(hDlg:Byte Ptr,Msg:UInt,wp:WParam,lp:LParam)
-
-Function GetModuleFileNameW:Int( hmodule:Byte Ptr, buffer:Short Ptr, sz:Int)
-Function GetWindowModuleFileNameW:UInt(hwnd:Byte Ptr, lpszFileName:Short Ptr, cchFileNameMax:UInt)
-Function GetClassNameW:Int( hwnd:Byte Ptr, dst:Short Ptr, maxlen:Int)
-
-Function MessageBoxW:Int(hWnd:Byte Ptr, lpText:Short Ptr, lpCaption:Short Ptr, uType:UInt)
+Function SetCapture:Byte Ptr( hWnd:Byte Ptr )="HWND SetCapture(HWND)!"
+Function ReleaseCapture()="BOOL ReleaseCapture()!"
+
+Function RegisterClassA( lpWndClass:Byte Ptr )="ATOM RegisterClassA(CONST WNDCLASSA*)!"
+Function RegisterClassW( lpWndClass:Byte Ptr )="ATOM RegisterClassW(CONST WNDCLASSW*)!"
+Function CreateWindowExA:Byte Ptr( dwExStyle,lpClassName:Byte Ptr,lpWindowName:Byte Ptr,dwStyle,x,y,nWidth,nHeight,hWndParent,hmenu:Byte Ptr,hInstance:Byte Ptr,lpParam:Byte Ptr )="HWND CreateWindowExA(DWORD,LPCSTR,LPCSTR,DWORD,int,int,int,int,HWND,HMENU,HINSTANCE,LPVOID)!"
+Function CreateWindowExW:Byte Ptr( dwExStyle,lpClassName$w,lpWindowName$w,dwStyle,x,y,nWidth,nHeight,hWndParent:Byte Ptr,hmenu:Byte Ptr,hInstance:Byte Ptr,lpParam:Byte Ptr )="HWND CreateWindowExW(DWORD,LPCWSTR,LPCWSTR,DWORD,int,int,int,int,HWND,HMENU,HINSTANCE,LPVOID)!"
+Function DefWindowProcA:Byte Ptr( hWnd:Byte Ptr,MSG:UInt,wp:WParam,lp:LParam)="LRESULT DefWindowProcA(HWND,UINT,WPARAM,LPARAM)!"
+Function DefWindowProcW:Byte Ptr( hWnd:Byte Ptr,MSG:UInt,wp:WParam,lp:LParam)="LRESULT DefWindowProcW(HWND,UINT,WPARAM,LPARAM)!"
+Function DispatchMessageA( lpMsg:Byte Ptr )="LONG DispatchMessageA(const MSG*)!"
+Function DispatchMessageW( lpMsg:Byte Ptr )="LONG DispatchMessageW(const MSG*)!"
+Function GetMessageA( lpMsg:Byte Ptr,hWnd:Byte Ptr,wMsgFilterMin,wMsgFilterMax )="BOOL GetMessageA(LPMSG,HWND,UINT,UINT)!"
+Function GetMessageW( lpMsg:Byte Ptr,hWnd:Byte Ptr,wMsgFilterMin,wMsgFilterMax )="BOOL GetMessageW(LPMSG,HWND,UINT,UINT)!"
+Function PeekMessageA( lpMsg:Byte Ptr,hWnd:Byte Ptr,wMsgFilterMin,wMsgFilterMax,wRemoveMsg )="BBINT PeekMessageA(BBBYTE * ,BBINT ,BBINT ,BBINT ,BBINT )!"
+Function PeekMessageW( lpMsg:Byte Ptr,hWnd:Byte Ptr,wMsgFilterMin,wMsgFilterMax,wRemoveMsg )="BBINT PeekMessageW(BBBYTE * ,BBINT ,BBINT ,BBINT ,BBINT )!"
+Function PostMessageA( hWnd:Byte Ptr,MSG,wp:WParam,lp:LParam )="BBINT PostMessageA(HWND ,UINT ,WPARAM ,LPARAM )!"
+Function PostMessageW( hWnd:Byte Ptr,MSG,wp:WParam,lp:LParam )="BBINT PostMessageW(HWND ,UINT ,WPARAM ,LPARAM )!"
+Function SendMessageA( hWnd:Byte Ptr,MSG:UInt,wp:WParam,lp:LParam )="BBINT SendMessageA(HWND ,UINT ,WPARAM ,LPARAM )!"
+Function SendMessageW( hWnd:Byte Ptr,MSG:UInt,wp:WParam,lp:LParam )="BBINT SendMessageW(HWND ,UINT ,WPARAM ,LPARAM )!"
+Function PostThreadMessageA( idThread,Msg,wp:WParam,lp:LParam )="BBINT PostThreadMessageA(BBINT ,UINT ,WPARAM ,LPARAM )!"
+Function PostThreadMessageW( idThread,Msg,wp:WParam,lp:LParam )="BBINT PostThreadMessageW(BBINT ,UINT ,WPARAM ,LPARAM )!"
+Function GetDC:Byte Ptr( hWnd:Byte Ptr )="BBINT GetDC(BBINT )!"
+Function PostQuitMessage( nExitCode )="BBINT PostQuitMessage(BBINT )!"
+Function TranslateMessage( lpMsg:Byte Ptr )="BBINT TranslateMessage(BBBYTE * )!"
+Function DestroyWindow( hWnd:Byte Ptr )="BBINT DestroyWindow(BBINT )!"
+Function MsgWaitForMultipleObjects( nCount,pHandles:Byte Ptr,fWaitAll,dwMilliseconds,dwWakeMask )="BBINT MsgWaitForMultipleObjects(BBINT ,BBBYTE * ,BBINT ,BBINT ,BBINT )!"
+Function MsgWaitForMultipleObjectsEx( nCount,pHandles:Byte Ptr,dwMilliseconds,dwWakeMask,dwFlags )="BBINT MsgWaitForMultipleObjectsEx(BBINT ,BBBYTE * ,BBINT ,BBINT ,BBINT )!"
+Function ChangeDisplaySettingsA( lpDevMode:Byte Ptr,dwFlags )="BBINT ChangeDisplaySettingsA(BBBYTE * ,BBINT )!"
+Function ChangeDisplaySettingsW( lpDevMode:Byte Ptr,dwFlags )="BBINT ChangeDisplaySettingsW(BBBYTE * ,BBINT )!"
+Function LoadCursorA:Byte Ptr( hInstance:Byte Ptr,lpCursorName:Byte Ptr )="HCURSOR LoadCursorA(BBINT ,BBBYTE * )!"
+Function LoadCursorW:Byte Ptr( hInstance:Byte Ptr,lpCursorName:Short Ptr )="HCURSOR LoadCursorW(BBINT ,BBSHORT * )!"
+Function ShowCursor( visible )="BBINT ShowCursor(BBINT )!"
+Function SetCursor( hCursor:Byte Ptr )="BBINT SetCursor(BBINT )!"
+Function LoadIconA:Byte Ptr( resourceid:Byte Ptr,lpIconName:Byte Ptr )="HICON LoadIconA(BBINT ,BBBYTE * )!"
+Function LoadIconW:Byte Ptr( resourceid:Byte Ptr,lpIconName:Short Ptr )="HICON LoadIconW(BBINT ,BBSHORT * )!"
+Function LoadLibraryA:Byte Ptr( dll$z )="HMODULE LoadLibraryA(BBBYTE * )!"
+Function GetProcAddress:Byte Ptr( libhandle:Byte Ptr,func$z )="FARPROC __stdcall GetProcAddress(HMODULE ,LPCSTR )!"
+Function LoadLibraryW:Byte Ptr( dll$w )="HMODULE __stdcall LoadLibraryW(LPCTSTR )!"
+Function GetClientRect( hWnd:Byte Ptr,lpRect:Int Ptr )="BBINT GetClientRect(BBINT ,BBINT * )!"
+Function GetWindowRect( hWnd:Byte Ptr,lpRect:Int Ptr )="BBINT GetWindowRect(BBINT ,BBINT * )!"
+Function GetDesktopWindow:Byte Ptr()="HWND GetDesktopWindow()!"
+Function AdjustWindowRect( rect:Int Ptr,style,menu )="BBINT AdjustWindowRect(BBINT * ,BBINT ,BBINT )!"
+Function AdjustWindowRectEx( rect:Int Ptr,style,menu:Int,exstyle )="BBINT AdjustWindowRectEx(BBINT * ,BBINT ,BBINT ,BBINT )!"
+Function ClientToScreen( hWnd:Byte Ptr,point:Byte Ptr )="BBINT ClientToScreen(BBINT ,BBBYTE * )!"
+Function ShowWindow( hWnd:Byte Ptr,nCmdShow )="BBINT ShowWindow(HWND ,BBINT )!"
+Function SetMenu( hWnd:Byte Ptr,hmenu:Byte Ptr )="BBINT SetMenu(HWND ,BBINT )!"
+Function DrawMenuBar( hWnd:Byte Ptr )="BBINT DrawMenuBar(HWND )!"
+Function CreateMenu_:Byte Ptr()="HMENU CreateMenu()!"
+Function CreatePopupMenu:Byte Ptr()="HMENU CreatePopupMenu()!"
+Function TrackPopupMenu(hmenu:Byte Ptr,uFLags,x,y,nReserved,hWnd:Byte Ptr,prcRect)="BBINT TrackPopupMenu(HMENU ,BBINT ,BBINT ,BBINT ,BBINT ,HWND ,BBINT )!"
+Function DestroyMenu(hmenu:Byte Ptr)="BBINT DestroyMenu(HMENU)!"
+Function EnableMenuItem(hmenu:Byte Ptr,uIDEnableItem,uEnable)="BBINT EnableMenuItem(HMENU ,BBINT ,BBINT )!"
+Function CheckMenuItem(hmenu:Byte Ptr,uIDCheckItem,uCheck)="BBINT CheckMenuItem(HMENU,BBINT ,BBINT )!"
+
+Function AppendMenuA(hmenu:Byte Ptr,uFlags,uIDNewItem,lpNewItem:Byte Ptr)="BBINT AppendMenuA(BBINT ,BBINT ,BBINT ,BBBYTE * )!"
+Function AppendMenuW(hmenu:Byte Ptr,uFlags,uIDNewItem,lpNewItem:Byte Ptr)="BBINT AppendMenuW(BBINT ,BBINT ,BBINT ,BBBYTE * )!"
+Function SetMenuItemInfoA( hmenu:Byte Ptr,item,fByPosition,info:Byte Ptr )="BBINT SetMenuItemInfoA(BBINT ,BBINT ,BBINT ,BBBYTE * )!"
+Function SetMenuItemInfoW( hmenu:Byte Ptr,item,fByPosition,info:Byte Ptr )="BBINT SetMenuItemInfoW(BBINT ,BBINT ,BBINT ,BBBYTE * )!"
+Function GetMenuItemCount( hmenu:Byte Ptr )="BBINT GetMenuItemCount(BBINT )!"
+Function SetWindowTextA( hWnd:Byte Ptr,text$z )="BBINT SetWindowTextA(HWND ,BBBYTE * )!"
+Function SetWindowTextW( hWnd:Byte Ptr,text$w )="BBINT SetWindowTextW(HWND ,BBSHORT * )!"
+Function GetWindowTextA( hWnd:Byte Ptr, lpString:Byte Ptr, maxCount:Int)="int __stdcall GetWindowTextA(HWND ,LPSTR ,int )!"
+Function GetWindowTextW( hWnd:Byte Ptr, lpString:Short Ptr, maxCount:Int)="int __stdcall GetWindowTextW(HWND ,LPWSTR ,int )!"
+Function SetWindowPos( hWnd:Byte Ptr,hWndInsertAfter:Byte Ptr,x,y,cx,cy,uFlags )="BBINT SetWindowPos(HWND ,HWND ,BBINT ,BBINT ,BBINT ,BBINT ,UINT )!"
+Function GetForegroundWindow:Byte Ptr()="HWND GetForegroundWindow()!"
+Function SetForegroundWindow(hWnd:Byte Ptr)="BBINT SetForegroundWindow(HWND )!"
+Function IsIconic(hWnd:Byte Ptr)="BBINT IsIconic(HWND )!"
+Function GetParent_:Byte Ptr(hWnd:Byte Ptr)="HWND GetParent(HWND )!"
+Function GetWindowLongA( hWnd:Byte Ptr,index )="BBINT GetWindowLongA(HWND ,BBINT )!"
+Function SetWindowLongA( hWnd:Byte Ptr,index,newlong )="BBINT SetWindowLongA(HWND ,BBINT ,BBINT )!"
+Function GetWindowLongW( hWnd:Byte Ptr,index )="BBINT GetWindowLongW(HWND ,BBINT )!"
+Function SetWindowLongW( hWnd:Byte Ptr,index,newlong )="BBINT SetWindowLongW(HWND ,BBINT ,BBINT )!"
+Function SetWindowLongPtrW:Byte Ptr( hWnd:Byte Ptr,index,newlong:Byte Ptr)="LONG_PTR __stdcall SetWindowLongPtrW(HWND ,int ,LONG_PTR )!"
+Function GetClassLongA( hWnd:Byte Ptr,index )="BBINT GetClassLongA(HWND ,BBINT )!"
+Function SetClassLongA( hWnd:Byte Ptr,index,newlong )="BBINT SetClassLongA(HWND ,BBINT ,BBINT )!"
+Function GetClassLongW( hWnd:Byte Ptr,index )="BBINT GetClassLongW(HWND ,BBINT )!"
+Function SetClassLongW( hWnd:Byte Ptr,index,newlong )="BBINT SetClassLongW(HWND ,BBINT ,BBINT )!"
+Function IsZoomed( hWnd:Byte Ptr )="BBINT IsZoomed(HWND )!"
+Function CallWindowProcA:Byte Ptr( proc:Byte Ptr,hWnd:Byte Ptr,msg:UInt,wp:WParam,lp:LParam)="BBINT CallWindowProcA(BBBYTE * ,HWND ,UINT ,WPARAM ,LPARAM )!"
+Function CallWindowProcW:Byte Ptr( proc:Byte Ptr,hWnd:Byte Ptr,msg:UInt,wp:WParam,lp:LParam )="BBINT CallWindowProcW(BBBYTE * ,HWND ,UINT ,WPARAM ,LPARAM )!"
+Function OleInitialize(pvReserved:Byte Ptr)="BBINT OleInitialize(BBBYTE * )!"
+Function OleUninitialize()="BBINT OleUninitialize()!"
+Function InitCommonControlsEx(controlsex:Byte Ptr)="BBINT InitCommonControlsEx(const INITCOMMONCONTROLSEX *)!"
+Function SetScrollPos( hWnd:Byte Ptr,nBar,nPos,bRedraw )="BBINT SetScrollPos(HWND ,BBINT ,BBINT ,BBINT )!"
+Function GetScrollPos( hWnd:Byte Ptr,nBar )="BBINT GetScrollPos(HWND ,BBINT )!"
+Function SetScrollRange( hWnd:Byte Ptr,nBar,nMinPos,nMaxPos,bRedraw )="BBINT SetScrollRange(HWND ,BBINT ,BBINT ,BBINT ,BBINT )!"
+Function GetScrollRange( hWnd:Byte Ptr,nBar,lpMinPos:Int Ptr,lpMaxPos:Int Ptr )="BBINT GetScrollRange(HWND ,BBINT ,BBINT * ,BBINT * )!"
+Function ShowScrollBar( hWnd:Byte Ptr,wBar,bShow )="BBINT ShowScrollBar(HWND ,BBINT ,BBINT )!"
+Function EnableScrollBar( hWnd:Byte Ptr,wSBflags,wArrows )="BBINT EnableScrollBar(HWND ,BBINT ,BBINT )!"
+Function SetScrollInfo( hWnd:Byte Ptr,nBar,lpsi:Byte Ptr,redraw )="BBINT SetScrollInfo(HWND ,BBINT ,void* ,BBINT )!"
+Function GetScrollInfo( hWnd:Byte Ptr,nBar,lpsi:Byte Ptr)="BBINT GetScrollInfo(HWND ,BBINT ,void* )!"
+Function InvalidateRect( hWnd:Byte Ptr,lpRect:Int Ptr,bErase )="BBINT InvalidateRect(HWND ,BBINT * ,BBINT )!"
+Function ValidateRect( hWnd:Byte Ptr,lpRect:Int Ptr )="BBINT ValidateRect(HWND ,BBINT * )!"
+Function BeginPaint( hWnd:Byte Ptr,lpPaint:Byte Ptr )="BBINT BeginPaint(HWND ,BBBYTE * )!"
+Function FillRect( hdc:Byte Ptr,lpRect:Int Ptr,hbr:Byte Ptr )="BBINT FillRect(BBINT ,BBINT * ,BBINT )!"
+Function EndPaint( hWnd:Byte Ptr,lpPaint:Byte Ptr )="BBINT EndPaint(HWND ,BBBYTE * )!"
+Function SetFocus:Byte Ptr( hWnd:Byte Ptr )="BBINT SetFocus(BBINT )!"
+Function GetFocus:Byte Ptr()="HWND GetFocus()!"
+Function GetActiveWindow:Byte Ptr()="HWND GetActiveWindow()!"
+Function SetActiveWindow( hWnd:Byte Ptr )="BBINT SetActiveWindow(HWND)!"
+Function MoveWindow( hWnd:Byte Ptr,x,y,w,h,bRepaint )="BBINT MoveWindow(HWND,BBINT ,BBINT ,BBINT ,BBINT ,BBINT )!"
+Function SetParent_:Byte Ptr( hWnd:Byte Ptr,hWnd2:Byte Ptr )="HWND SetParent(HWND, HWND)!"
+Function WindowFromPoint:Byte Ptr( point:Int Ptr )="HWND WindowFromPoint(BBINT * )!"
+Function GetKeyState(vkey)="BBINT GetKeyState(BBINT )!"
+
+Function SetWindowsHookExW:Byte Ptr(idHook,lpfn:Byte Ptr,hmod:Byte Ptr,dwThreadId)="HHOOK SetWindowsHookExW(BBINT ,BBBYTE * ,HINSTANCE ,BBINT )!"
+Function CallNextHookEx(hhk:Byte Ptr,ncode,wp:WParam,lp:LParam)="BBINT CallNextHookEx(HHOOK,BBINT ,WPARAM,LPARAM)!"
+Function UnhookWindowsHookEx(hhk:Byte Ptr)="BBINT UnhookWindowsHookEx(HHOOK)!"
+
+Function EnableWindow( hWnd:Byte Ptr,enable )="BBINT EnableWindow(HWND ,BBINT )!"
+Function IsWindowEnabled( hWnd:Byte Ptr )="BBINT IsWindowEnabled(HWND )!"
+Function IsWindowVisible( hWnd:Byte Ptr )="BBINT IsWindowVisible(HWND )!"
+Function GetWindowInfo( hWnd:Byte Ptr,winfo:Byte Ptr )="BBINT GetWindowInfo(HWND ,BBBYTE * )!"
+Function GetCursorPos_( lpPoint:Int Ptr)="BBINT GetCursorPos(BBINT * )!"
+
+Function EnumChildWindows( hWnd:Byte Ptr,lpfn:Byte Ptr,lp:LParam )="BBINT EnumChildWindows(HWND ,BBBYTE * ,LPARAM )!"
+Function EnumWindows( lpfn:Byte Ptr,lp:LParam )="BBINT EnumWindows(BBBYTE * ,LPARAM )!"
+
+Function OpenClipboard(hWnd:Byte Ptr)="BBINT OpenClipboard(HWND )!"
+Function CloseClipboard()="BBINT CloseClipboard()!"
+Function SetClipboardData:Byte Ptr(uFormat:UInt,hMem:Byte Ptr)="HANDLE SetClipboardData(BBINT ,HANDLE)!"
+Function GetClipboardData:Byte Ptr(uFormat:UInt)="HANDLE GetClipboardData(BBINT )!"
+Function EmptyClipboard()="BBINT EmptyClipboard()!"
+Function IsClipboardFormatAvailable(format)="BBINT IsClipboardFormatAvailable(BBINT )!"
+
+Function DefDlgProcW(hDlg:Byte Ptr,Msg:UInt,wp:WParam,lp:LParam)="BBINT DefDlgProcW(BBINT ,BBINT ,BBINT ,BBINT )!"
+
+Function GetModuleFileNameW:Int( hmodule:Byte Ptr, buffer:Short Ptr, sz:Int)="DWORD __stdcall GetModuleFileNameW(HMODULE , LPWSTR , DWORD )!"
+Function GetWindowModuleFileNameW:UInt(hwnd:Byte Ptr, lpszFileName:Short Ptr, cchFileNameMax:UInt)="UINT __stdcall GetWindowModuleFileNameW(HWND ,LPWSTR ,UINT )!"
+Function GetClassNameW:Int( hwnd:Byte Ptr, dst:Short Ptr, maxlen:Int)="int __stdcall GetClassNameW(HWND ,LPWSTR ,int )!"
+
+Function MessageBoxW:Int(hWnd:Byte Ptr, lpText:Short Ptr, lpCaption:Short Ptr, uType:UInt)="int __stdcall MessageBoxW(HWND ,LPCWSTR ,LPCWSTR ,UINT )!"
 
 
 'shellapi
 'shellapi
 
 
-Function DragAcceptFiles(hWnd:Byte Ptr,fAccept)
-Function DragQueryPoint(hDrop:Byte Ptr,lpPoint:Int Ptr)
-Function DragQueryFileW(hDrop:Byte Ptr,iFile:UInt,lpszFile:Short Ptr,cch:Uint)
-Function DragFinish(hDrop:Byte Ptr)
+Function DragAcceptFiles(hWnd:Byte Ptr,fAccept)="BBINT DragAcceptFiles(BBINT ,BBINT )!"
+Function DragQueryPoint(hDrop:Byte Ptr,lpPoint:Int Ptr)="BBINT DragQueryPoint(BBINT ,BBINT * )!"
+Function DragQueryFileW(hDrop:Byte Ptr,iFile:UInt,lpszFile:Short Ptr,cch:UInt)="BBINT DragQueryFileW(BBINT ,BBINT ,BBSHORT * ,BBINT )!"
+Function DragFinish(hDrop:Byte Ptr)="BBINT DragFinish(BBINT )!"
 
 
-Function _TrackMouseEvent( trackmouseeventstrunct:Byte Ptr )
+Function _TrackMouseEvent( trackmouseeventstrunct:Byte Ptr )="WINBOOL __stdcall _TrackMouseEvent(LPTRACKMOUSEEVENT )!"
 
 
 End Extern
 End Extern

+ 0 - 128
win32.mod/user32.x

@@ -1,128 +0,0 @@
-HWND SetCapture(HWND)!
-BOOL ReleaseCapture()!
-ATOM RegisterClassA(CONST WNDCLASSA*)!
-ATOM RegisterClassW(CONST WNDCLASSW*)!
-HWND CreateWindowExA(DWORD,LPCSTR,LPCSTR,DWORD,int,int,int,int,HWND,HMENU,HINSTANCE,LPVOID)!
-HWND CreateWindowExW(DWORD,LPCWSTR,LPCWSTR,DWORD,int,int,int,int,HWND,HMENU,HINSTANCE,LPVOID)!
-LRESULT DefWindowProcA(HWND,UINT,WPARAM,LPARAM)!
-LRESULT DefWindowProcW(HWND,UINT,WPARAM,LPARAM)!
-LONG DispatchMessageA(const MSG*)!
-LONG DispatchMessageW(const MSG*)!
-BOOL GetMessageA(LPMSG,HWND,UINT,UINT)!
-BOOL GetMessageW(LPMSG,HWND,UINT,UINT)!
-BBINT PeekMessageA(BBBYTE * ,BBINT ,BBINT ,BBINT ,BBINT )!
-BBINT PeekMessageW(BBBYTE * ,BBINT ,BBINT ,BBINT ,BBINT )!
-BBINT PostMessageA(HWND ,UINT ,WPARAM ,LPARAM )!
-BBINT PostMessageW(HWND ,UINT ,WPARAM ,LPARAM )!
-BBINT SendMessageA(HWND ,UINT ,WPARAM ,LPARAM )!
-BBINT SendMessageW(HWND ,UINT ,WPARAM ,LPARAM )!
-BBINT PostThreadMessageA(BBINT ,UINT ,WPARAM ,LPARAM )!
-BBINT PostThreadMessageW(BBINT ,UINT ,WPARAM ,LPARAM )!
-BBINT GetDC(BBINT )!
-BBINT PostQuitMessage(BBINT )!
-BBINT TranslateMessage(BBBYTE * )!
-BBINT DestroyWindow(BBINT )!
-BBINT MsgWaitForMultipleObjects(BBINT ,BBBYTE * ,BBINT ,BBINT ,BBINT )!
-BBINT MsgWaitForMultipleObjectsEx(BBINT ,BBBYTE * ,BBINT ,BBINT ,BBINT )!
-BBINT ChangeDisplaySettingsA(BBBYTE * ,BBINT )!
-BBINT ChangeDisplaySettingsW(BBBYTE * ,BBINT )!
-BBINT LoadCursorA(BBINT ,BBBYTE * )!
-BBINT LoadCursorW(BBINT ,BBSHORT * )!
-BBINT ShowCursor(BBINT )!
-BBINT SetCursor(BBINT )!
-BBINT LoadIconA(BBINT ,BBBYTE * )!
-BBINT LoadIconW(BBINT ,BBSHORT * )!
-BBINT LoadLibraryA(BBBYTE * )!
-FARPROC __stdcall GetProcAddress(HMODULE ,LPCSTR )!
-HMODULE __stdcall LoadLibraryW(LPCTSTR )!
-BBINT GetClientRect(BBINT ,BBINT * )!
-BBINT GetWindowRect(BBINT ,BBINT * )!
-HWND GetDesktopWindow()!
-BBINT AdjustWindowRect(BBINT * ,BBINT ,BBINT )!
-BBINT AdjustWindowRectEx(BBINT * ,BBINT ,BBINT ,BBINT )!
-BBINT ClientToScreen(BBINT ,BBBYTE * )!
-BBINT ShowWindow(BBINT ,BBINT )!
-BBINT SetMenu(BBINT ,BBINT )!
-BBINT DrawMenuBar(BBINT )!
-BBINT CreateMenu()!
-BBINT CreatePopupMenu()!
-BBINT TrackPopupMenu(BBINT ,BBINT ,BBINT ,BBINT ,BBINT ,BBINT ,BBINT )!
-BBINT DestroyMenu(BBINT )!
-BBINT EnableMenuItem(BBINT ,BBINT ,BBINT )!
-BBINT CheckMenuItem(BBINT ,BBINT ,BBINT )!
-BBINT AppendMenuA(BBINT ,BBINT ,BBINT ,BBBYTE * )!
-BBINT AppendMenuW(BBINT ,BBINT ,BBINT ,BBBYTE * )!
-BBINT SetMenuItemInfoA(BBINT ,BBINT ,BBINT ,BBBYTE * )!
-BBINT SetMenuItemInfoW(BBINT ,BBINT ,BBINT ,BBBYTE * )!
-BBINT GetMenuItemCount(BBINT )!
-BBINT SetWindowTextA(HWND ,BBBYTE * )!
-BBINT SetWindowTextW(HWND ,BBSHORT * )!
-BBINT SetWindowPos(HWND ,HWND ,BBINT ,BBINT ,BBINT ,BBINT ,UINT )!
-HWND GetForegroundWindow()!
-BBINT SetForegroundWindow(HWND )!
-BBINT IsIconic(HWND )!
-HWND GetParent(HWND )!
-BBINT GetWindowLongA(HWND ,BBINT )!
-BBINT SetWindowLongA(HWND ,BBINT ,BBINT )!
-BBINT GetWindowLongW(HWND ,BBINT )!
-BBINT SetWindowLongW(HWND ,BBINT ,BBINT )!
-BBINT GetClassLongA(HWND ,BBINT )!
-BBINT SetClassLongA(HWND ,BBINT ,BBINT )!
-BBINT GetClassLongW(HWND ,BBINT )!
-BBINT SetClassLongW(HWND ,BBINT ,BBINT )!
-BBINT IsZoomed(HWND )!
-BBINT CallWindowProcA(BBBYTE * ,HWND ,UINT ,WPARAM ,LPARAM )!
-BBINT CallWindowProcW(BBBYTE * ,HWND ,UINT ,WPARAM ,LPARAM )!
-BBINT OleInitialize(BBBYTE * )!
-BBINT OleUninitialize()!
-BBINT InitCommonControlsEx(const INITCOMMONCONTROLSEX *)!
-BBINT SetScrollPos(HWND ,BBINT ,BBINT ,BBINT )!
-BBINT GetScrollPos(HWND ,BBINT )!
-BBINT SetScrollRange(HWND ,BBINT ,BBINT ,BBINT ,BBINT )!
-BBINT GetScrollRange(HWND ,BBINT ,BBINT * ,BBINT * )!
-BBINT ShowScrollBar(HWND ,BBINT ,BBINT )!
-BBINT EnableScrollBar(HWND ,BBINT ,BBINT )!
-BBINT SetScrollInfo(HWND ,BBINT ,void* ,BBINT )!
-BBINT GetScrollInfo(HWND ,BBINT ,void* )!
-BBINT InvalidateRect(HWND ,BBINT * ,BBINT )!
-BBINT ValidateRect(HWND ,BBINT * )!
-BBINT BeginPaint(HWND ,BBBYTE * )!
-BBINT FillRect(BBINT ,BBINT * ,BBINT )!
-BBINT EndPaint(HWND ,BBBYTE * )!
-BBINT SetFocus(BBINT )!
-BBINT GetFocus()!
-BBINT GetActiveWindow()!
-BBINT SetActiveWindow(BBINT )!
-BBINT MoveWindow(BBINT ,BBINT ,BBINT ,BBINT ,BBINT ,BBINT )!
-BBINT SetParent(BBINT ,BBINT )!
-BBINT WindowFromPoint(BBINT * )!
-BBINT GetKeyState(BBINT )!
-BBINT SetWindowsHookExW(BBINT ,BBBYTE * ,BBINT ,BBINT )!
-BBINT CallNextHookEx(BBINT ,BBINT ,BBINT ,BBINT )!
-BBINT UnhookWindowsHookEx(BBINT )!
-BBINT EnableWindow(HWND ,BBINT )!
-BBINT IsWindowEnabled(HWND )!
-BBINT IsWindowVisible(HWND )!
-BBINT GetWindowInfo(HWND ,BBBYTE * )!
-BBINT GetCursorPos(BBINT * )!
-BBINT EnumChildWindows(HWND ,BBBYTE * ,LPARAM )!
-BBINT EnumWindows(BBBYTE * ,LPARAM )!
-BBINT OpenClipboard(BBINT )!
-BBINT CloseClipboard()!
-BBINT SetClipboardData(BBINT ,BBINT )!
-BBINT GetClipboardData(BBINT )!
-BBINT EmptyClipboard()!
-BBINT IsClipboardFormatAvailable(BBINT )!
-BBINT DefDlgProcW(BBINT ,BBINT ,BBINT ,BBINT )!
-BBINT DragAcceptFiles(BBINT ,BBINT )!
-BBINT DragQueryPoint(BBINT ,BBINT * )!
-BBINT DragQueryFileW(BBINT ,BBINT ,BBSHORT * ,BBINT )!
-BBINT DragFinish(BBINT )!
-WINBOOL __stdcall _TrackMouseEvent(LPTRACKMOUSEEVENT )!
-LONG_PTR __stdcall SetWindowLongPtrW(HWND ,int ,LONG_PTR )!
-UINT __stdcall GetWindowModuleFileNameW(HWND ,LPWSTR ,UINT )!
-DWORD __stdcall GetModuleFileNameW(HMODULE , LPWSTR , DWORD )!
-int __stdcall GetWindowTextA(HWND ,LPSTR ,int )!
-int __stdcall GetWindowTextW(HWND ,LPWSTR ,int )!
-int __stdcall GetClassNameW(HWND ,LPWSTR ,int )!
-int __stdcall MessageBoxW(HWND ,LPCWSTR ,LPCWSTR ,UINT )!

+ 1 - 1
win32.mod/winmm.bmx

@@ -1,6 +1,6 @@
 
 
 Extern "win32"
 Extern "win32"
 
 
-Function timeGetTime()
+Function timeGetTime()="BBINT timeGetTime()!"
 
 
 End Extern
 End Extern

+ 0 - 1
win32.mod/winmm.x

@@ -1 +0,0 @@
-BBINT timeGetTime()!