Changeset 207

Timestamp:

09/03/07 10:09:43 (4 years ago)

Author:

smjg

Message:

Updated winbase.d to MinGW 3.10; tweaked a few other files

Files:

• trunk/win32/aclui.d (modified) (1 diff)
• trunk/win32/basetsd.d (modified) (3 diffs)
• trunk/win32/basetyps.d (modified) (2 diffs)
• trunk/win32/winbase.d (modified) (28 diffs)
• trunk/win32/windows.d (modified) (1 diff)

trunk/win32/aclui.d

@@ -4 +4 @@
-*                       Windows API header module                       *
-*                                                                       *
-    Translated from MinGW Windows headers    
+Translated from MinGW API for MS-Windows 3.10
-*                           by Stewart Gordon                           *
-*                                                                       *

trunk/win32/basetsd.d

@@ -1 +1 @@
-/***********************************************************************\
-st
+ts
-*                                                                       *
-*                       Windows API header module                       *
-*                                                                       *
-    Translated from MinGW Windows headers    
+Translated from MinGW API for MS-Windows 3.10
-*                           by Stewart Gordon                           *
-*                                                                       *
@@ -15 +15 @@
-version (Win64) {
-    alias long __int3264;
-enum : ulong { ADDRESS_TAG_BIT = 0x40000000000 }
+const ulong ADDRESS_TAG_BIT = 0x40000000000;
-
-    alias long INT_PTR, LONG_PTR;
@@ -25 +25 @@
-    alias uint UHALF_PTR;
-    alias uint* PUHALF_PTR;
-
+
+
+
+
+
-} else {
-    alias int __int3264;
-enum : uint { ADDRESS_TAG_BIT = 0x80000000 }
+const uint ADDRESS_TAG_BIT = 0x80000000;
-
-    alias int INT_PTR, LONG_PTR;

trunk/win32/basetyps.d

@@ -4 +4 @@
-*                       Windows API header module                       *
-*                                                                       *
-    Translated from MinGW Windows headers    
+Translated from MinGW API for MS-Windows 3.10
-*                                                                       *
-*                       Placed into public domain                       *
@@ -12 +12 @@
-private import win32.windef;
-
-        
+
-align(1):
-
-
-
-  Data4[8]
+  
+  
+  
+[8] Data4
-}
-alias GUID UUID, IID, CLSID, FMTID, uuid_t;

trunk/win32/winbase.d

@@ -4 +4 @@
-*                       Windows API header module                       *
-*                                                                       *
-    Translated from MinGW Windows headers    
+Translated from MinGW API for MS-Windows 3.10
-*                                                                       *
-*                       Placed into public domain                       *
@@ -537 +537 @@
-// used in EXCEPTION_RECORD
-enum : DWORD {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    CONTROL_C_EXIT                     = STATUS_CONTROL_C_EXIT,
@@ -617 +619 @@
-    LOCKFILE_EXCLUSIVE_LOCK   = 2;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -694 +700 @@
-
-// also in ddk/ntapi.h
+// To restore default error mode, call SetErrorMode(0)
-enum {
-    SEM_FAILCRITICALERRORS     = 0x0001,
@@ -886 +893 @@
-const DWORD TLS_OUT_OF_INDEXES = 0xFFFFFFFF;
-
+static if (WINVER >= 0x501) {
+    const DWORD
+        GET_MODULE_HANDLE_EX_FLAG_PIN                = 1,
+        GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT = 2,
+        GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS       = 4;
+}
+
-static if (_WIN32_WINNT >= 0x0501) {
-    // for ACTCTX
@@ -908 +922 @@
-}
-
- >= 0x0500) { // requires XP, or Win 2000 Pro.
+_ONLY && _WIN32_WINNT >= 0x0500) {
-    // ReplaceFile()
-    const DWORD
@@ -1141 +1155 @@
-
-struct OVERLAPPED {
-DWORD
-DWORD
-
-
-
+ULONG_PTR
+ULONG_PTR
+    
+    
+   
-}
-alias OVERLAPPED* POVERLAPPED, LPOVERLAPPED;
@@ -1245 +1259 @@
-
-struct WIN32_FIND_DATAA {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-alias WIN32_FIND_DATAA* PWIN32_FIND_DATAA, LPWIN32_FIND_DATAA;
-
-struct WIN32_FIND_DATAW {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-alias WIN32_FIND_DATAW* PWIN32_FIND_DATAW, LPWIN32_FIND_DATAW;
@@ -1556 +1582 @@
-    alias void function(PVOID) LPFIBER_START_ROUTINE;
-
-
-
-
+
+
+
+
+
+
-    alias void function(DWORD, DWORD, LPOVERLAPPED) LPOVERLAPPED_COMPLETION_ROUTINE;
-    alias LONG function(LPEXCEPTION_POINTERS) PTOP_LEVEL_EXCEPTION_FILTER;
-    alias PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER;
-
-DWORD
+ULONG_PTR
-    alias void function(PVOID, DWORD, DWORD) PTIMERAPCROUTINE;
-
@@ -1576 +1605 @@
-
-extern (Windows) {
-
-    BOOL AccessCheck(PSECURITY_DESCRIPTOR, HANDLE, DWORD, PGENERIC_MAPPING, PPRIVILEGE_SET, PDWORD, PDWORD, PBOOL);
-    BOOL AccessCheckAndAuditAlarmA(LPCSTR, LPVOID, LPSTR, LPSTR, PSECURITY_DESCRIPTOR, DWORD, PGENERIC_MAPPING, BOOL, PDWORD, PBOOL, PBOOL);
@@ -1657 +1685 @@
-    HANDLE CreateFileMappingA(HANDLE, LPSECURITY_ATTRIBUTES, DWORD, DWORD, DWORD, LPCSTR);
-    HANDLE CreateFileMappingW(HANDLE, LPSECURITY_ATTRIBUTES, DWORD, DWORD, DWORD, LPCWSTR);
-DWORD
+ULONG_PTR
-    HANDLE CreateMailslotA(LPCSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES);
-    HANDLE CreateMailslotW(LPCWSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES);
@@ -1777 +1805 @@
-    DWORD GetCurrentProcessId();
-    HANDLE GetCurrentThread();
+/* In MinGW:
+#ifdef _WIN32_WCE
+extern DWORD GetCurrentThreadId(void);
+#else
+WINBASEAPI DWORD WINAPI GetCurrentThreadId(void);
+#endif
+*/
-    DWORD GetCurrentThreadId();
-
@@ -1855 +1890 @@
-    DWORD GetProfileStringA(LPCSTR, LPCSTR, LPCSTR, LPSTR, DWORD);
-    DWORD GetProfileStringW(LPCWSTR, LPCWSTR, LPCWSTR, LPWSTR, DWORD);
-DWORD
+ULONG_PTR
-    BOOL GetSecurityDescriptorControl(PSECURITY_DESCRIPTOR, PSECURITY_DESCRIPTOR_CONTROL, PDWORD);
-    BOOL GetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR, LPBOOL, PACL*, LPBOOL);
@@ -1979 +2014 @@
-    BOOL LockFileEx(HANDLE, DWORD, DWORD, DWORD, DWORD, LPOVERLAPPED);
-    PVOID LockResource(HGLOBAL);
-
-
+ // *** NT only
+ // *** NT only
-    BOOL LookupAccountNameA(LPCSTR, LPCSTR, PSID, PDWORD, LPSTR, PDWORD, PSID_NAME_USE);
-    BOOL LookupAccountNameW(LPCWSTR, LPCWSTR, PSID, PDWORD, LPWSTR, PDWORD, PSID_NAME_USE);
@@ -2045 +2080 @@
-    void OutputDebugStringW(LPCWSTR);
-    BOOL PeekNamedPipe(HANDLE, PVOID, DWORD, PDWORD, PDWORD, PDWORD);
-DWORD
+ULONG_PTR
-    DWORD PrepareTape(HANDLE, DWORD, BOOL);
-    BOOL PrivilegeCheck (HANDLE, PPRIVILEGE_SET, PBOOL);
@@ -2056 +2091 @@
-    BOOL QueryPerformanceCounter(PLARGE_INTEGER);
-    BOOL QueryPerformanceFrequency(PLARGE_INTEGER);
-DWORD
+ULONG_PTR
-    void RaiseException(DWORD, DWORD, DWORD, DWORD*);
-    BOOL ReadDirectoryChangesW(HANDLE, PVOID, DWORD, BOOL, DWORD, PDWORD, LPOVERLAPPED, LPOVERLAPPED_COMPLETION_ROUTINE);
@@ -2073 +2108 @@
-    BOOL ReportEventA(HANDLE, WORD, WORD, DWORD, PSID, WORD, DWORD, LPCSTR*, PVOID);
-    BOOL ReportEventW(HANDLE, WORD, WORD, DWORD, PSID, WORD, DWORD, LPCWSTR*, PVOID);
+/* In MinGW:
+#ifdef _WIN32_WCE
+extern BOOL ResetEvent(HANDLE);
+#else
+WINBASEAPI BOOL WINAPI ResetEvent(HANDLE);
+#endif
+*/
-    BOOL ResetEvent(HANDLE);
-    UINT ResetWriteWatch(LPVOID, SIZE_T);
@@ -2095 +2137 @@
-    BOOL SetEnvironmentVariableW(LPCWSTR, LPCWSTR);
-    UINT SetErrorMode(UINT);
+/* In MinGW:
+#ifdef _WIN32_WCE
+extern BOOL SetEvent(HANDLE);
+#else
+WINBASEAPI BOOL WINAPI SetEvent(HANDLE);
+#endif
+*/
-    BOOL SetEvent(HANDLE);
-    VOID SetFileApisToANSI();
@@ -2118 +2167 @@
-    BOOL SetProcessPriorityBoost(HANDLE, BOOL);
-    BOOL SetProcessShutdownParameters(DWORD, DWORD);
-DWORD, DWORD
+SIZE_T, SIZE_T
-    BOOL SetSecurityDescriptorControl(PSECURITY_DESCRIPTOR, SECURITY_DESCRIPTOR_CONTROL, SECURITY_DESCRIPTOR_CONTROL);
-    BOOL SetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR, BOOL, PACL, BOOL);
@@ -2230 +2279 @@
-        BOOL TerminateJobObject(HANDLE, UINT);
-        BOOL AssignProcessToJobObject(HANDLE, HANDLE);
+
+        BOOL ChangeTimerQueueTimer(HANDLE,HANDLE,ULONG,ULONG);
-        BOOL DeleteTimerQueue(HANDLE);
-        BOOL DeleteTimerQueueEx(HANDLE, HANDLE);
@@ -2235 +2286 @@
-        BOOL DeleteVolumeMountPointA(LPCSTR);
-        BOOL DeleteVolumeMountPointW(LPCWSTR);
-
-
-
-
+
+
+
-        enum {
-            LOGON_WITH_PROFILE=0x00000001,
-            LOGON_NETCREDENTIALS_ONLY=0x00000002
-        }
+
-        HANDLE CreateTimerQueue();
-        BOOL CreateTimerQueueTimer(PHANDLE, HANDLE, WAITORTIMERCALLBACK, PVOID, DWORD, DWORD, ULONG);
@@ -2272 +2323 @@
-        BOOL SetVolumeMountPointA(LPCSTR, LPCSTR);
-        BOOL SetVolumeMountPointW(LPCWSTR, LPCWSTR);
+        BOOL UnregisterWait(HANDLE);
-        BOOL UnregisterWaitEx(HANDLE, HANDLE);
-        BOOL AllocateUserPhysicalPages(HANDLE, PULONG_PTR, PULONG_PTR);
@@ -2278 +2330 @@
-        BOOL MapUserPhysicalPagesScatter(PVOID*, ULONG_PTR, PULONG_PTR);
-        BOOL ProcessIdToSessionId(DWORD, DWORD*);
+        BOOL QueryInformationJobObject(HANDLE, JOBOBJECTINFOCLASS, LPVOID, DWORD,
+          LPDWORD);
-        ULONG RemoveVectoredExceptionHandler(PVOID);
-        BOOL ReplaceFileA(LPCSTR, LPCSTR, LPCSTR, DWORD, LPVOID, LPVOID);
@@ -2283 +2337 @@
-        BOOL SetComputerNameExA(COMPUTER_NAME_FORMAT, LPCSTR);
-        BOOL SetComputerNameExW(COMPUTER_NAME_FORMAT, LPCWSTR);
+        BOOL SetInformationJobObject(HANDLE, JOBOBJECTINFOCLASS, LPVOID, DWORD);
-    }
-
@@ -2329 +2384 @@
-        BOOL GetSystemRegistryQuota(PDWORD, PDWORD);
-        BOOL GetThreadIOPendingFlag(HANDLE, PBOOL);
+        HANDLE ReOpenFile(HANDLE, DWORD, DWORD, DWORD);
-        BOOL SetDllDirectoryA(LPCSTR);
-        BOOL SetDllDirectoryW(LPCWSTR);
-        BOOL SetFirmwareEnvironmentVariableA(LPCSTR, LPCSTR, PVOID, DWORD);
-        BOOL SetFirmwareEnvironmentVariableW(LPCWSTR, LPCWSTR, PVOID, DWORD);
-
+   
-
-    static if (_WIN32_WINNT >= 0x0510) {
-        VOID RestoreLastError(DWORD);
-    }
-
-
-
-
-
-
-
+
+
+
+
-    alias STARTUPINFOW STARTUPINFO;
-    alias WIN32_FIND_DATAW WIN32_FIND_DATA;
@@ -2351 +2404 @@
-    alias WIN32_FIND_DATA* LPWIN32_FIND_DATA;
-    alias HW_PROFILE_INFO* LPHW_PROFILE_INFO;
+    alias ENUMRESLANGPROCW ENUMRESLANGPROC;
+    alias ENUMRESNAMEPROCW ENUMRESNAMEPROC;
+    alias ENUMRESTYPEPROCW ENUMRESTYPEPROC;
-    alias AccessCheckAndAuditAlarmW AccessCheckAndAuditAlarm;
-    alias AddAtomW AddAtom;
@@ -2523 +2579 @@
-
-} else {
-    // --------
-    // Aliases for ASCII
-
-    alias STARTUPINFOA STARTUPINFO;
-    alias WIN32_FIND_DATAA WIN32_FIND_DATA;
@@ -2532 +2585 @@
-    alias WIN32_FIND_DATA* LPWIN32_FIND_DATA;
-    alias HW_PROFILE_INFO* LPHW_PROFILE_INFO;
+    alias ENUMRESLANGPROCW ENUMRESLANGPROC;
+    alias ENUMRESNAMEPROCW ENUMRESNAMEPROC;
+    alias ENUMRESTYPEPROCW ENUMRESTYPEPROC;
-    alias AccessCheckAndAuditAlarmA AccessCheckAndAuditAlarm;
-    alias AddAtomA AddAtom;

trunk/win32/windows.d

@@ -4 +4 @@
-*                       Windows API header module                       *
-*                                                                       *
-    Translated from MinGW Windows headers    
+Translated from MinGW API for MS-Windows 3.10
-*                                                                       *
-*                       Placed into public domain                       *