From adbb6775da6266c03a92df5a50f9262d9a2229b8 Mon Sep 17 00:00:00 2001 From: "U-SLAVA-DFB8FF805\\Slava" Date: Mon, 9 Jun 2008 16:27:52 -0500 Subject: [PATCH] Fix Windows compile errors --- extra/alias/alias.factor | 16 +++++++ extra/io/windows/files/files.factor | 4 +- extra/io/windows/mmap/mmap.factor | 4 +- extra/ui/windows/windows.factor | 9 ++-- extra/windows/advapi32/advapi32.factor | 11 ++--- extra/windows/gdi32/gdi32.factor | 2 +- extra/windows/kernel32/kernel32.factor | 53 +++++++++++----------- extra/windows/opengl32/opengl32.factor | 2 +- extra/windows/user32/user32.factor | 62 +++++++++++++------------- extra/windows/winsock/winsock.factor | 10 ++--- 10 files changed, 94 insertions(+), 79 deletions(-) create mode 100755 extra/alias/alias.factor mode change 100644 => 100755 extra/windows/advapi32/advapi32.factor mode change 100644 => 100755 extra/windows/gdi32/gdi32.factor mode change 100644 => 100755 extra/windows/kernel32/kernel32.factor mode change 100644 => 100755 extra/windows/opengl32/opengl32.factor mode change 100644 => 100755 extra/windows/user32/user32.factor diff --git a/extra/alias/alias.factor b/extra/alias/alias.factor new file mode 100755 index 0000000000..f468340e53 --- /dev/null +++ b/extra/alias/alias.factor @@ -0,0 +1,16 @@ +USING: words quotations kernel effects sequences parser ; +IN: alias + +PREDICATE: alias < word "alias" word-prop ; + +M: alias reset-word + [ call-next-method ] [ f "alias" set-word-prop ] bi ; + +M: alias stack-effect + word-def first stack-effect ; + +: define-alias ( new old -- ) + [ 1quotation define-inline ] + [ drop t "alias" set-word-prop ] 2bi ; + +: ALIAS: CREATE-WORD scan-word define-alias ; parsing diff --git a/extra/io/windows/files/files.factor b/extra/io/windows/files/files.factor index ef3db0dcd1..6787936f96 100755 --- a/extra/io/windows/files/files.factor +++ b/extra/io/windows/files/files.factor @@ -146,7 +146,7 @@ SYMBOLS: +read-only+ +hidden+ +system+ : win32-file-type ( n -- symbol ) FILE_ATTRIBUTE_DIRECTORY mask? +directory+ +regular-file+ ? ; -: WIN32_FIND_DATA>file-info +: WIN32_FIND_DATA>file-info ( WIN32_FIND_DATA -- file-info ) { [ WIN32_FIND_DATA-dwFileAttributes win32-file-type ] [ @@ -167,7 +167,7 @@ SYMBOLS: +read-only+ +hidden+ +system+ FindClose win32-error=0/f ] keep ; -: BY_HANDLE_FILE_INFORMATION>file-info +: BY_HANDLE_FILE_INFORMATION>file-info ( HANDLE_FILE_INFORMATION -- file-info ) { [ BY_HANDLE_FILE_INFORMATION-dwFileAttributes win32-file-type ] [ diff --git a/extra/io/windows/mmap/mmap.factor b/extra/io/windows/mmap/mmap.factor index 72dfca9df3..660a4017be 100755 --- a/extra/io/windows/mmap/mmap.factor +++ b/extra/io/windows/mmap/mmap.factor @@ -5,10 +5,10 @@ windows windows.advapi32 windows.kernel32 io.backend system accessors locals ; IN: io.windows.mmap -: create-file-mapping +: create-file-mapping ( hFile lpAttributes flProtect dwMaximumSizeHigh dwMaximumSizeLow lpName -- HANDLE ) CreateFileMapping [ win32-error=0/f ] keep ; -: map-view-of-file +: map-view-of-file ( hFileMappingObject dwDesiredAccess dwFileOffsetHigh dwFileOffsetLow dwNumberOfBytesToMap -- HANDLE ) MapViewOfFile [ win32-error=0/f ] keep ; :: mmap-open ( path length access-mode create-mode protect access -- handle handle address ) diff --git a/extra/ui/windows/windows.factor b/extra/ui/windows/windows.factor index d42c679b22..4a9417fc6b 100755 --- a/extra/ui/windows/windows.factor +++ b/extra/ui/windows/windows.factor @@ -13,8 +13,11 @@ IN: ui.windows SINGLETON: windows-ui-backend -: crlf>lf CHAR: \r swap remove ; -: lf>crlf [ [ dup CHAR: \n = [ CHAR: \r , ] when , ] each ] "" make ; +: crlf>lf ( str -- str' ) + CHAR: \r swap remove ; + +: lf>crlf ( str -- str' ) + [ [ dup CHAR: \n = [ CHAR: \r , ] when , ] each ] "" make ; : enum-clipboard ( -- seq ) 0 @@ -127,7 +130,7 @@ SYMBOLS: msg-obj class-name-ptr mouse-captured ; { 123 "F12" } } ; -: key-state-down? +: key-state-down? ( key -- ? ) GetKeyState 16 bit? ; : left-shift? ( -- ? ) VK_LSHIFT key-state-down? ; diff --git a/extra/windows/advapi32/advapi32.factor b/extra/windows/advapi32/advapi32.factor old mode 100644 new mode 100755 index da0dfdb937..b7381968a5 --- a/extra/windows/advapi32/advapi32.factor +++ b/extra/windows/advapi32/advapi32.factor @@ -1,4 +1,4 @@ -USING: alien.syntax kernel math windows.types math.bitfields ; +USING: alias alien.syntax kernel math windows.types math.bitfields ; IN: windows.advapi32 LIBRARY: advapi32 @@ -336,8 +336,7 @@ FUNCTION: BOOL CryptAcquireContextW ( HCRYPTPROV* phProv, DWORD dwProvType, DWORD dwFlags ) ; -: CryptAcquireContext ( phProv pszContainer pszProvider dwProvType dwFlags -- BOOL ) - CryptAcquireContextW ; +ALIAS: CryptAcquireContext CryptAcquireContextW ! : CryptContextAddRef ; ! : CryptCreateHash ; @@ -498,8 +497,7 @@ FUNCTION: BOOL CryptReleaseContext ( HCRYPTPROV hProv, DWORD dwFlags ) ; ! : GetUserNameA ; FUNCTION: BOOL GetUserNameW ( LPCTSTR lpBuffer, LPDWORD lpnSize ) ; -: GetUserName ( lpBuffer lpnSize -- BOOL ) - GetUserNameW ; +ALIAS: GetUserName GetUserNameW ! : GetWindowsAccountDomainSid ; ! : I_ScIsSecurityProcess ; @@ -544,8 +542,7 @@ FUNCTION: BOOL InitializeAcl ( PACL pAcl, DWORD nAclLength, DWORD dwAclRevision FUNCTION: BOOL LookupPrivilegeValueW ( LPCTSTR lpSystemName, LPCTSTR lpName, PLUID lpLuid ) ; -: LookupPrivilegeValue ( lpSystemName lpname lpLuid -- BOOL ) - LookupPrivilegeValueW ; +ALIAS: LookupPrivilegeValue LookupPrivilegeValueW ! : LookupSecurityDescriptorPartsA ; ! : LookupSecurityDescriptorPartsW ; diff --git a/extra/windows/gdi32/gdi32.factor b/extra/windows/gdi32/gdi32.factor old mode 100644 new mode 100755 index b1f9d8a048..b9ba51844c --- a/extra/windows/gdi32/gdi32.factor +++ b/extra/windows/gdi32/gdi32.factor @@ -1,7 +1,7 @@ ! FUNCTION: AbortDoc ! Copyright (C) 2005, 2006 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: alien alien.syntax kernel windows.types ; +USING: alien alien.syntax kernel windows.types alias ; IN: windows.gdi32 ! Stock Logical Objects diff --git a/extra/windows/kernel32/kernel32.factor b/extra/windows/kernel32/kernel32.factor old mode 100644 new mode 100755 index 277e69bccf..0ac41a18ea --- a/extra/windows/kernel32/kernel32.factor +++ b/extra/windows/kernel32/kernel32.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2005, 2006 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: alien alien.syntax kernel windows.types ; +USING: alien alien.syntax kernel windows.types alias ; IN: windows.kernel32 : MAX_PATH 260 ; inline @@ -594,7 +594,7 @@ FUNCTION: BOOL ConnectNamedPipe ( HANDLE hNamedPipe, LPOVERLAPPED lpOverlapped ) ! FUNCTION: CopyFileExA ! FUNCTION: CopyFileExW FUNCTION: BOOL CopyFileW ( LPCTSTR lpExistingFileName, LPCTSTR lpNewFileName, BOOL bFailIfExists ) ; -: CopyFile CopyFileW ; inline +ALIAS: CopyFile CopyFileW ! FUNCTION: CopyLZFile ! FUNCTION: CreateActCtxA ! FUNCTION: CreateActCtxW @@ -603,7 +603,7 @@ FUNCTION: BOOL CopyFileW ( LPCTSTR lpExistingFileName, LPCTSTR lpNewFileName, BO ! FUNCTION: CreateDirectoryExA ! FUNCTION: CreateDirectoryExW FUNCTION: BOOL CreateDirectoryW ( LPCTSTR lpPathName, LPSECURITY_ATTRIBUTES lpSecurityAttribytes ) ; -: CreateDirectory CreateDirectoryW ; inline +ALIAS: CreateDirectory CreateDirectoryW ! FUNCTION: CreateEventA ! FUNCTION: CreateEventW @@ -612,7 +612,7 @@ FUNCTION: BOOL CreateDirectoryW ( LPCTSTR lpPathName, LPSECURITY_ATTRIBUTES lpSe FUNCTION: HANDLE CreateFileW ( LPCTSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttribures, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile ) ; -: CreateFile CreateFileW ; inline +ALIAS: CreateFile CreateFileW FUNCTION: HANDLE CreateFileMappingW ( HANDLE hFile, LPSECURITY_ATTRIBUTES lpAttributes, @@ -620,7 +620,7 @@ FUNCTION: HANDLE CreateFileMappingW ( HANDLE hFile, DWORD dwMaximumSizeHigh, DWORD dwMaximumSizeLow, LPCTSTR lpName ) ; -: CreateFileMapping ( hFile lpAttributes flProtect dwMaximumSizeHigh dwMaximumSizeLow lpName -- HANDLE ) CreateFileMappingW ; +ALIAS: CreateFileMapping CreateFileMappingW ! FUNCTION: CreateHardLinkA ! FUNCTION: CreateHardLinkW @@ -636,7 +636,7 @@ FUNCTION: HANDLE CreateIoCompletionPort ( HANDLE hFileHandle, HANDLE hExistingCo ! FUNCTION: CreateMutexW ! FUNCTION: CreateNamedPipeA FUNCTION: HANDLE CreateNamedPipeW ( LPCTSTR lpName, DWORD dwOpenMode, DWORD dwPipeMode, DWORD nMaxInstances, DWORD nOutBufferSize, DWORD nInBufferSize, DWORD nDefaultTimeOut, LPSECURITY_ATTRIBUTES lpSecurityAttributes ) ; -: CreateNamedPipe ( lpName dwOpenMode dwPipeMode nMaxInstances nOutBufferSize nInBufferSize nDefaultTimeOut lpSecurityAttributes -- HANDLE ) CreateNamedPipeW ; +ALIAS: CreateNamedPipe CreateNamedPipeW ! FUNCTION: CreateNlsSecurityDescriptor FUNCTION: BOOL CreatePipe ( PHANDLE hReadPipe, PHANDLE hWritePipe, LPSECURITY_ATTRIBUTES lpPipeAttributes, DWORD nSize ) ; @@ -675,7 +675,7 @@ FUNCTION: BOOL CreateProcessW ( LPCTSTR lpApplicationname, LPCTSTR lpCurrentDirectory, LPSTARTUPINFO lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation ) ; -: CreateProcess ( lpApplicationname lpCommandLine lpProcessAttributes lpThreadAttributes bInheritHandles dwCreationFlags lpEnvironment lpCurrentDirectory lpStartupInfo lpProcessInformation -- BOOL ) CreateProcessW ; +ALIAS: CreateProcess CreateProcessW ! FUNCTION: CreateProcessInternalA ! FUNCTION: CreateProcessInternalW ! FUNCTION: CreateProcessInternalWSecure @@ -713,7 +713,7 @@ FUNCTION: HANDLE CreateRemoteThread ( HANDLE hProcess, ! FUNCTION: DeleteFiber ! FUNCTION: DeleteFileA FUNCTION: BOOL DeleteFileW ( LPCTSTR lpFileName ) ; -: DeleteFile ( lpFileName -- BOOL ) DeleteFileW ; +ALIAS: DeleteFile DeleteFileW ! FUNCTION: DeleteTimerQueue ! FUNCTION: DeleteTimerQueueEx ! FUNCTION: DeleteTimerQueueTimer @@ -804,13 +804,12 @@ FUNCTION: BOOL FindCloseChangeNotification ( HANDLE hChangeHandle ) ; FUNCTION: HANDLE FindFirstChangeNotificationW ( LPCTSTR lpPathName, BOOL bWatchSubtree, DWORD dwNotifyFilter ) ; -: FindFirstChangeNotification ( lpPathName bWatchSubtree dwNotifyFilter -- BOOL ) - FindFirstChangeNotificationW ; +ALIAS: FindFirstChangeNotification FindFirstChangeNotificationW ! FUNCTION: FindFirstFileA ! FUNCTION: FindFirstFileExA ! FUNCTION: FindFirstFileExW FUNCTION: HANDLE FindFirstFileW ( LPCTSTR lpFileName, LPWIN32_FIND_DATA lpFindFileData ) ; -: FindFirstFile ( lpFileName lpFindFileData -- HANDLE ) FindFirstFileW ; +ALIAS: FindFirstFile FindFirstFileW ! FUNCTION: FindFirstVolumeA ! FUNCTION: FindFirstVolumeMountPointA ! FUNCTION: FindFirstVolumeMountPointW @@ -818,7 +817,7 @@ FUNCTION: HANDLE FindFirstFileW ( LPCTSTR lpFileName, LPWIN32_FIND_DATA lpFindFi FUNCTION: BOOL FindNextChangeNotification ( HANDLE hChangeHandle ) ; ! FUNCTION: FindNextFileA FUNCTION: BOOL FindNextFileW ( HANDLE hFindFile, LPWIN32_FIND_DATA lpFindFileData ) ; -: FindNextFile ( hFindFile lpFindFileData -- BOOL ) FindNextFileW ; +ALIAS: FindNextFile FindNextFileW ! FUNCTION: FindNextVolumeA ! FUNCTION: FindNextVolumeMountPointA ! FUNCTION: FindNextVolumeMountPointW @@ -868,7 +867,7 @@ FUNCTION: BOOL FindNextFileW ( HANDLE hFindFile, LPWIN32_FIND_DATA lpFindFileDat FUNCTION: BOOL GetComputerNameW ( LPTSTR lpBuffer, LPDWORD lpnSize ) ; ! FUNCTION: GetComputerNameExW ! FUNCTION: GetComputerNameW -: GetComputerName ( lpBuffer lpnSize -- BOOL ) GetComputerNameW ; +ALIAS: GetComputerName GetComputerNameW ! FUNCTION: GetConsoleAliasA ! FUNCTION: GetConsoleAliasesA ! FUNCTION: GetConsoleAliasesLengthA @@ -903,7 +902,7 @@ FUNCTION: BOOL GetComputerNameW ( LPTSTR lpBuffer, LPDWORD lpnSize ) ; ! FUNCTION: GetConsoleScreenBufferInfo ! FUNCTION: GetConsoleSelectionInfo FUNCTION: DWORD GetConsoleTitleW ( LPWSTR lpConsoleTitle, DWORD nSize ) ; -: GetConsoleTitle ( lpConsoleTitle nSize -- DWORD ) GetConsoleTitleW ; inline +ALIAS: GetConsoleTitle GetConsoleTitleW ! FUNCTION: GetConsoleWindow ! FUNCTION: GetCPFileNameFromRegistry ! FUNCTION: GetCPInfo @@ -915,7 +914,7 @@ FUNCTION: DWORD GetConsoleTitleW ( LPWSTR lpConsoleTitle, DWORD nSize ) ; ! FUNCTION: GetCurrentConsoleFont ! FUNCTION: GetCurrentDirectoryA FUNCTION: BOOL GetCurrentDirectoryW ( DWORD len, LPTSTR buf ) ; -: GetCurrentDirectory ( len buf -- BOOL ) GetCurrentDirectoryW ; inline +ALIAS: GetCurrentDirectory GetCurrentDirectoryW FUNCTION: HANDLE GetCurrentProcess ( ) ; FUNCTION: DWORD GetCurrentProcessId ( ) ; FUNCTION: HANDLE GetCurrentThread ( ) ; @@ -952,7 +951,7 @@ FUNCTION: DWORD GetFileAttributesW ( LPCTSTR lpFileName ) ; FUNCTION: BOOL GetFileAttributesExW ( LPCTSTR lpFileName, GET_FILEEX_INFO_LEVELS fInfoLevelId, LPVOID lpFileInformation ) ; -: GetFileAttributesEx ( lpFileName fInfoLevelId lpFileInformation -- BOOL ) GetFileAttributesExW ; +ALIAS: GetFileAttributesEx GetFileAttributesExW FUNCTION: BOOL GetFileInformationByHandle ( HANDLE hFile, LPBY_HANDLE_FILE_INFORMATION lpFileInformation ) ; FUNCTION: DWORD GetFileSize ( HANDLE hFile, LPDWORD lpFileSizeHigh ) ; @@ -963,7 +962,7 @@ FUNCTION: DWORD GetFileType ( HANDLE hFile ) ; ! FUNCTION: GetFirmwareEnvironmentVariableW ! FUNCTION: GetFullPathNameA FUNCTION: DWORD GetFullPathNameW ( LPCTSTR lpFileName, DWORD nBufferLength, LPTSTR lpBuffer, LPTSTR* lpFilePart ) ; -: GetFullPathName ( lpFileName nBufferLength lpBuffer lpFilePart -- DWORD ) GetFullPathNameW ; +ALIAS: GetFullPathName GetFullPathNameW ! clear "license.txt" 32768 "char[32768]" f over >r GetFullPathName r> swap 2 * head >string . @@ -986,7 +985,7 @@ FUNCTION: DWORD GetLastError ( ) ; ! FUNCTION: GetModuleFileNameA ! FUNCTION: GetModuleFileNameW FUNCTION: HMODULE GetModuleHandleW ( LPCWSTR lpModuleName ) ; -: GetModuleHandle ( lpModuleName -- HMODULE ) GetModuleHandleW ; inline +ALIAS: GetModuleHandle GetModuleHandleW ! FUNCTION: GetModuleHandleExA ! FUNCTION: GetModuleHandleExW ! FUNCTION: GetNamedPipeHandleStateA @@ -1052,7 +1051,7 @@ FUNCTION: HANDLE GetStdHandle ( DWORD nStdHandle ) ; ! FUNCTION: GetSystemDefaultUILanguage ! FUNCTION: GetSystemDirectoryA FUNCTION: UINT GetSystemDirectoryW ( LPTSTR lpBuffer, UINT uSize ) ; -: GetSystemDirectory ( lpBuffer uSize -- UINT ) GetSystemDirectoryW ; inline +ALIAS: GetSystemDirectory GetSystemDirectoryW FUNCTION: void GetSystemInfo ( LPSYSTEM_INFO lpSystemInfo ) ; ! FUNCTION: GetSystemPowerStatus ! FUNCTION: GetSystemRegistryQuota @@ -1062,7 +1061,7 @@ FUNCTION: void GetSystemTimeAsFileTime ( LPFILETIME lpSystemTimeAsFileTime ) ; ! FUNCTION: GetSystemTimes ! FUNCTION: GetSystemWindowsDirectoryA FUNCTION: UINT GetSystemWindowsDirectoryW ( LPTSTR lpBuffer, UINT uSize ) ; -: GetSystemWindowsDirectory ( lpBuffer uSize -- UINT ) GetSystemWindowsDirectoryW ; inline +ALIAS: GetSystemWindowsDirectory GetSystemWindowsDirectoryW ! FUNCTION: GetSystemWow64DirectoryA ! FUNCTION: GetSystemWow64DirectoryW ! FUNCTION: GetTapeParameters @@ -1090,7 +1089,7 @@ FUNCTION: DWORD GetTimeZoneInformation ( LPTIME_ZONE_INFORMATION lpTimeZoneInfor ! FUNCTION: GetVDMCurrentDirectories FUNCTION: DWORD GetVersion ( ) ; FUNCTION: BOOL GetVersionExW ( LPOSVERSIONINFO lpVersionInfo ) ; -: GetVersionEx ( lpVersionInfo -- BOOL ) GetVersionExW ; +ALIAS: GetVersionEx GetVersionExW ! FUNCTION: GetVolumeInformationA ! FUNCTION: GetVolumeInformationW ! FUNCTION: GetVolumeNameForVolumeMountPointA @@ -1101,7 +1100,7 @@ FUNCTION: BOOL GetVersionExW ( LPOSVERSIONINFO lpVersionInfo ) ; ! FUNCTION: GetVolumePathNameW ! FUNCTION: GetWindowsDirectoryA FUNCTION: UINT GetWindowsDirectoryW ( LPTSTR lpBuffer, UINT uSize ) ; -: GetWindowsDirectory ( lpBuffer uSize -- UINT ) GetWindowsDirectoryW ; inline +ALIAS: GetWindowsDirectory GetWindowsDirectoryW ! FUNCTION: GetWriteWatch ! FUNCTION: GlobalAddAtomA ! FUNCTION: GlobalAddAtomW @@ -1253,7 +1252,7 @@ FUNCTION: LPVOID MapViewOfFileEx ( HANDLE hFileMappingObject, ! FUNCTION: MoveFileExA ! FUNCTION: MoveFileExW FUNCTION: BOOL MoveFileW ( LPCTSTR lpExistingFileName, LPCTSTR lpNewFileName ) ; -: MoveFile ( lpExistingFileName lpNewFileName -- BOOL ) MoveFileW ; +ALIAS: MoveFile MoveFileW ! FUNCTION: MoveFileWithProgressA ! FUNCTION: MoveFileWithProgressW ! FUNCTION: MulDiv @@ -1271,7 +1270,7 @@ FUNCTION: BOOL MoveFileW ( LPCTSTR lpExistingFileName, LPCTSTR lpNewFileName ) ; FUNCTION: HANDLE OpenFileMappingW ( DWORD dwDesiredAccess, BOOL bInheritHandle, LPCTSTR lpName ) ; -: OpenFileMapping ( dwDesiredAccess bInheritHandle lpName -- HANDLE ) OpenFileMappingW ; +ALIAS: OpenFileMapping OpenFileMappingW ! FUNCTION: OpenJobObjectA ! FUNCTION: OpenJobObjectW ! FUNCTION: OpenMutexA @@ -1341,7 +1340,7 @@ FUNCTION: BOOL ReadProcessMemory ( HANDLE hProcess, void* lpBaseAddress, void* l ! FUNCTION: ReleaseSemaphore ! FUNCTION: RemoveDirectoryA FUNCTION: BOOL RemoveDirectoryW ( LPCTSTR lpPathName ) ; -: RemoveDirectory ( lpPathName -- BOOL ) RemoveDirectoryW ; +ALIAS: RemoveDirectory RemoveDirectoryW ! FUNCTION: RemoveLocalAlternateComputerNameA ! FUNCTION: RemoveLocalAlternateComputerNameW ! FUNCTION: RemoveVectoredExceptionHandler @@ -1405,13 +1404,13 @@ FUNCTION: BOOL RemoveDirectoryW ( LPCTSTR lpPathName ) ; ! FUNCTION: SetConsoleScreenBufferSize FUNCTION: BOOL SetConsoleTextAttribute ( HANDLE hConsoleOutput, WORD wAttributes ) ; FUNCTION: BOOL SetConsoleTitleW ( LPCWSTR lpConsoleTitle ) ; -: SetConsoleTitle ( lpConsoleTitle -- BOOL ) SetConsoleTitleW ; +ALIAS: SetConsoleTitle SetConsoleTitleW ! FUNCTION: SetConsoleWindowInfo ! FUNCTION: SetCPGlobal ! FUNCTION: SetCriticalSectionSpinCount ! FUNCTION: SetCurrentDirectoryA FUNCTION: BOOL SetCurrentDirectoryW ( LPCWSTR lpDirectory ) ; -: SetCurrentDirectory ( lpDirectory -- BOOL ) SetCurrentDirectoryW ; inline +ALIAS: SetCurrentDirectory SetCurrentDirectoryW ! FUNCTION: SetDefaultCommConfigA ! FUNCTION: SetDefaultCommConfigW ! FUNCTION: SetDllDirectoryA diff --git a/extra/windows/opengl32/opengl32.factor b/extra/windows/opengl32/opengl32.factor old mode 100644 new mode 100755 index c38579c95e..ca2206eac4 --- a/extra/windows/opengl32/opengl32.factor +++ b/extra/windows/opengl32/opengl32.factor @@ -71,7 +71,7 @@ IN: windows.opengl32 : WGL_SWAP_UNDERLAY14 HEX: 20000000 ; inline : WGL_SWAP_UNDERLAY15 HEX: 40000000 ; inline -: pfd-dwFlags +: pfd-dwFlags ( -- n ) { PFD_DRAW_TO_WINDOW PFD_SUPPORT_OPENGL PFD_DOUBLEBUFFER } flags ; ! TODO: compare to http://www.nullterminator.net/opengl32.html diff --git a/extra/windows/user32/user32.factor b/extra/windows/user32/user32.factor old mode 100644 new mode 100755 index e3e8a23ca7..49a04dcb48 --- a/extra/windows/user32/user32.factor +++ b/extra/windows/user32/user32.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2005, 2006 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: alien alien.syntax parser namespaces kernel math -windows.types shuffle math.bitfields ; +windows.types shuffle math.bitfields alias ; IN: windows.user32 ! HKL for ActivateKeyboardLayout @@ -32,7 +32,7 @@ IN: windows.user32 : WS_MAXIMIZEBOX HEX: 00010000 ; inline ! Common window styles -: WS_OVERLAPPEDWINDOW +: WS_OVERLAPPEDWINDOW ( -- n ) { WS_OVERLAPPED WS_CAPTION @@ -42,7 +42,7 @@ IN: windows.user32 WS_MAXIMIZEBOX } flags ; foldable -: WS_POPUPWINDOW +: WS_POPUPWINDOW ( -- n ) { WS_POPUP WS_BORDER WS_SYSMENU } flags ; foldable : WS_CHILDWINDOW WS_CHILD ; inline @@ -50,7 +50,7 @@ IN: windows.user32 : WS_TILED WS_OVERLAPPED ; inline : WS_ICONIC WS_MINIMIZE ; inline : WS_SIZEBOX WS_THICKFRAME ; inline -: WS_TILEDWINDOW WS_OVERLAPPEDWINDOW ; inline +: WS_TILEDWINDOW WS_OVERLAPPEDWINDOW ; inline ! Extended window styles @@ -606,14 +606,14 @@ FUNCTION: BOOL CloseClipboard ( ) ; ! FUNCTION: CloseWindowStation ! FUNCTION: CopyAcceleratorTableA FUNCTION: int CopyAcceleratorTableW ( HACCEL hAccelSrc, LPACCEL lpAccelDst, int cAccelEntries ) ; -: CopyAcceleratorTable CopyAcceleratorTableW ; inline +ALIAS: CopyAcceleratorTable CopyAcceleratorTableW ! FUNCTION: CopyIcon ! FUNCTION: CopyImage ! FUNCTION: CopyRect ! FUNCTION: CountClipboardFormats ! FUNCTION: CreateAcceleratorTableA FUNCTION: HACCEL CreateAcceleratorTableW ( LPACCEL lpaccl, int cEntries ) ; -: CreateAcceleratorTable CreateAcceleratorTableW ; inline +ALIAS: CreateAcceleratorTable CreateAcceleratorTableW ! FUNCTION: CreateCaret ! FUNCTION: CreateCursor ! FUNCTION: CreateDesktopA @@ -647,9 +647,9 @@ FUNCTION: HWND CreateWindowExW ( HINSTANCE hInstance, LPVOID lpParam ) ; -: CreateWindowEx CreateWindowExW ; inline +ALIAS: CreateWindowEx CreateWindowExW -: CreateWindow 0 12 -nrot CreateWindowEx ; +: CreateWindow 0 12 -nrot CreateWindowEx ; inline ! FUNCTION: CreateWindowStationA @@ -698,7 +698,7 @@ FUNCTION: HWND CreateWindowExW ( ! FUNCTION: DefMDIChildProcW ! FUNCTION: DefRawInputProc FUNCTION: LRESULT DefWindowProcW ( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam ) ; -: DefWindowProc DefWindowProcW ; inline +ALIAS: DefWindowProc DefWindowProcW ! FUNCTION: DeleteMenu ! FUNCTION: DeregisterShellHookWindow FUNCTION: BOOL DestroyAcceleratorTable ( HACCEL hAccel ) ; @@ -717,7 +717,7 @@ FUNCTION: BOOL DestroyWindow ( HWND hWnd ) ; ! FUNCTION: DisableProcessWindowsGhosting FUNCTION: LONG DispatchMessageW ( MSG* lpMsg ) ; -: DispatchMessage DispatchMessageW ; inline +ALIAS: DispatchMessage DispatchMessageW ! FUNCTION: DisplayExitWindowsWarnings ! FUNCTION: DlgDirListA @@ -808,14 +808,14 @@ FUNCTION: HWND GetCapture ( ) ; ! FUNCTION: GetCaretBlinkTime ! FUNCTION: GetCaretPos FUNCTION: BOOL GetClassInfoW ( HINSTANCE hInst, LPCWSTR lpszClass, LPWNDCLASS lpwcx ) ; -: GetClassInfo GetClassInfoW ; +ALIAS: GetClassInfo GetClassInfoW FUNCTION: BOOL GetClassInfoExW ( HINSTANCE hInst, LPCWSTR lpszClass, LPWNDCLASSEX lpwcx ) ; -: GetClassInfoEx GetClassInfoExW ; inline +ALIAS: GetClassInfoEx GetClassInfoExW FUNCTION: ULONG_PTR GetClassLongW ( HWND hWnd, int nIndex ) ; -: GetClassLong GetClassLongW ; inline -: GetClassLongPtr GetClassLongW ; inline +ALIAS: GetClassLong GetClassLongW +ALIAS: GetClassLongPtr GetClassLongW ! FUNCTION: GetClassNameA @@ -884,7 +884,7 @@ FUNCTION: SHORT GetKeyState ( int nVirtKey ) ; ! FUNCTION: GetMenuStringW FUNCTION: BOOL GetMessageW ( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax ) ; -: GetMessage GetMessageW ; inline +ALIAS: GetMessage GetMessageW ! FUNCTION: GetMessageExtraInfo ! FUNCTION: GetMessagePos @@ -1020,11 +1020,11 @@ FUNCTION: HACCEL LoadAcceleratorsW ( HINSTANCE hInstance, LPCTSTR lpTableName ) ! FUNCTION: HCURSOR LoadCursorW ( HINSTANCE hInstance, LPCWSTR lpCursorName ) ; FUNCTION: HCURSOR LoadCursorW ( HINSTANCE hInstance, ushort lpCursorName ) ; -: LoadCursor LoadCursorW ; inline +ALIAS: LoadCursor LoadCursorW ! FUNCTION: HICON LoadIconA ( HINSTANCE hInstance, LPCTSTR lpIconName ) ; FUNCTION: HICON LoadIconW ( HINSTANCE hInstance, LPCTSTR lpIconName ) ; -: LoadIcon LoadIconW ; inline +ALIAS: LoadIcon LoadIconW ! FUNCTION: LoadImageA ! FUNCTION: LoadImageW @@ -1048,10 +1048,10 @@ FUNCTION: HICON LoadIconW ( HINSTANCE hInstance, LPCTSTR lpIconName ) ; ! FUNCTION: MapDialogRect FUNCTION: UINT MapVirtualKeyW ( UINT uCode, UINT uMapType ) ; -: MapVirtualKey MapVirtualKeyW ; inline +ALIAS: MapVirtualKey MapVirtualKeyW FUNCTION: UINT MapVirtualKeyExW ( UINT uCode, UINT uMapType, HKL dwhkl ) ; -: MapVirtualKeyEx MapVirtualKeyExW ; inline +ALIAS: MapVirtualKeyEx MapVirtualKeyExW ! FUNCTION: MapWindowPoints ! FUNCTION: MB_GetString @@ -1093,9 +1093,9 @@ FUNCTION: int MessageBoxExW ( ! FUNCTION: int MessageBoxIndirectW ( MSGBOXPARAMSW* params ) ; -: MessageBox MessageBoxW ; +ALIAS: MessageBox MessageBoxW -: MessageBoxEx MessageBoxExW ; +ALIAS: MessageBoxEx MessageBoxExW ! : MessageBoxIndirect ! \ MessageBoxIndirectW \ MessageBoxIndirectA unicode-exec ; @@ -1140,7 +1140,7 @@ FUNCTION: BOOL OpenClipboard ( HWND hWndNewOwner ) ; ! FUNCTION: PaintMenuBar FUNCTION: BOOL PeekMessageA ( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax, UINT wRemoveMsg ) ; FUNCTION: BOOL PeekMessageW ( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax, UINT wRemoveMsg ) ; -: PeekMessage PeekMessageW ; +ALIAS: PeekMessage PeekMessageW ! FUNCTION: PostMessageA ! FUNCTION: PostMessageW @@ -1166,13 +1166,13 @@ FUNCTION: void PostQuitMessage ( int nExitCode ) ; ! FUNCTION: RecordShutdownReason ! FUNCTION: RedrawWindow -FUNCTION: ATOM RegisterClassA ( WNDCLASS* lpWndClass) ; +FUNCTION: ATOM RegisterClassA ( WNDCLASS* lpWndClass ) ; FUNCTION: ATOM RegisterClassW ( WNDCLASS* lpWndClass ) ; FUNCTION: ATOM RegisterClassExA ( WNDCLASSEX* lpwcx ) ; FUNCTION: ATOM RegisterClassExW ( WNDCLASSEX* lpwcx ) ; -: RegisterClass RegisterClassW ; -: RegisterClassEx RegisterClassExW ; +ALIAS: RegisterClass RegisterClassW +ALIAS: RegisterClassEx RegisterClassExW ! FUNCTION: RegisterClipboardFormatA ! FUNCTION: RegisterClipboardFormatW @@ -1208,7 +1208,7 @@ FUNCTION: int ReleaseDC ( HWND hWnd, HDC hDC ) ; ! FUNCTION: SendIMEMessageExW ! FUNCTION: UINT SendInput ( UINT nInputs, LPINPUT pInputs, int cbSize ) ; FUNCTION: LRESULT SendMessageW ( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ) ; -: SendMessage SendMessageW ; +ALIAS: SendMessage SendMessageW ! FUNCTION: SendMessageCallbackA ! FUNCTION: SendMessageCallbackW ! FUNCTION: SendMessageTimeoutA @@ -1221,8 +1221,8 @@ FUNCTION: HWND SetCapture ( HWND hWnd ) ; ! FUNCTION: SetCaretPos FUNCTION: ULONG_PTR SetClassLongW ( HWND hWnd, int nIndex, LONG_PTR dwNewLong ) ; -: SetClassLongPtr SetClassLongW ; -: SetClassLong SetClassLongW ; +ALIAS: SetClassLongPtr SetClassLongW +ALIAS: SetClassLong SetClassLongW ! FUNCTION: SetClassWord FUNCTION: HANDLE SetClipboardData ( UINT uFormat, HANDLE hMem ) ; @@ -1243,7 +1243,7 @@ FUNCTION: BOOL SetForegroundWindow ( HWND hWnd ) ; ! FUNCTION: SetKeyboardState ! type is ignored FUNCTION: void SetLastErrorEx ( DWORD dwErrCode, DWORD dwType ) ; -: SetLastError 0 SetLastErrorEx ; +: SetLastError 0 SetLastErrorEx ; inline ! FUNCTION: SetLayeredWindowAttributes ! FUNCTION: SetLogonNotifyWindow ! FUNCTION: SetMenu @@ -1330,7 +1330,7 @@ FUNCTION: BOOL TrackMouseEvent ( LPTRACKMOUSEEVENT lpEventTrack ) ; ! FUNCTION: TranslateAccelerator ! FUNCTION: TranslateAcceleratorA FUNCTION: int TranslateAcceleratorW ( HWND hWnd, HACCEL hAccTable, LPMSG lpMsg ) ; -: TranslateAccelerator TranslateAcceleratorW ; inline +ALIAS: TranslateAccelerator TranslateAcceleratorW ! FUNCTION: TranslateMDISysAccel FUNCTION: BOOL TranslateMessage ( MSG* lpMsg ) ; @@ -1343,7 +1343,7 @@ FUNCTION: BOOL TranslateMessage ( MSG* lpMsg ) ; ! FUNCTION: UnlockWindowStation ! FUNCTION: UnpackDDElParam FUNCTION: BOOL UnregisterClassW ( LPCWSTR lpClassName, HINSTANCE hInstance ) ; -: UnregisterClass UnregisterClassW ; +ALIAS: UnregisterClass UnregisterClassW ! FUNCTION: UnregisterDeviceNotification ! FUNCTION: UnregisterHotKey ! FUNCTION: UnregisterMessagePumpHook diff --git a/extra/windows/winsock/winsock.factor b/extra/windows/winsock/winsock.factor index 57181d2704..303aefeb5f 100755 --- a/extra/windows/winsock/winsock.factor +++ b/extra/windows/winsock/winsock.factor @@ -2,7 +2,7 @@ USING: alien alien.c-types alien.strings alien.syntax arrays byte-arrays kernel math sequences windows.types windows.kernel32 -windows.errors structs windows math.bitfields ; +windows.errors structs windows math.bitfields alias ; IN: windows.winsock USE: libc @@ -74,7 +74,7 @@ TYPEDEF: void* SOCKET : AI_PASSIVE 1 ; inline : AI_CANONNAME 2 ; inline : AI_NUMERICHOST 4 ; inline -: AI_MASK { AI_PASSIVE AI_CANONNAME AI_NUMERICHOST } flags ; +: AI_MASK ( -- n ) { AI_PASSIVE AI_CANONNAME AI_NUMERICHOST } flags ; : NI_NUMERICHOST 1 ; : NI_NUMERICSERV 2 ; @@ -138,7 +138,7 @@ C-STRUCT: addrinfo { "sockaddr*" "addr" } { "addrinfo*" "next" } ; -: hostent-addr hostent-addr-list *void* ; ! *uint ; +: hostent-addr ( hostent -- addr ) hostent-addr-list *void* ; ! *uint ; LIBRARY: winsock @@ -365,7 +365,7 @@ FUNCTION: SOCKET WSASocketW ( int af, LPWSAPROTOCOL_INFOW lpProtocolInfo, GROUP g, DWORD flags ) ; -: WSASocket WSASocketW ; +ALIAS: WSASocket WSASocketW FUNCTION: DWORD WSAWaitForMultipleEvents ( DWORD cEvents, WSAEVENT* lphEvents, @@ -384,7 +384,7 @@ FUNCTION: void GetAcceptExSockaddrs ( void* a, int b, int c, int d, void* e, voi : SIO_GET_EXTENSION_FUNCTION_POINTER -939524090 ; inline -: WSAID_CONNECTEX +: WSAID_CONNECTEX ( -- GUID ) "GUID" HEX: 25a207b9 over set-GUID-Data1 HEX: ddf3 over set-GUID-Data2