Changeset 21327 for trunk/include

Timestamp:

Jul 4, 2009, 12:01:32 AM (16 years ago)

Author:

ydario

Message:

advapi32 and crypt32 updates.

Location:

trunk/include

Files:

• custombuild.h (modified) (1 diff)
• emxruntime (deleted)
• win/ntddk.h (modified) (1 diff)
• win/winbase.h (modified) (3 diffs)
• win/wincrypt.h (modified) (1 diff)
• win/winnt.h (modified) (2 diffs)
• win/winreg.h (modified) (3 diffs)

trunk/include/custombuild.h

@@ -529 +529 @@
 extern IMAGE_FILE_HEADER nt_oleaut32_header;
 extern IMAGE_FILE_HEADER nt_msvfw32_header;
-extern IMAGE_FILE_HEADER nt_imm32_header;
+extern IMAGE_FILE_HEADER nt_imm32os2_header;
 extern IMAGE_FILE_HEADER nt_mpr_header;
 extern IMAGE_FILE_HEADER nt_iphlpapi_header;

trunk/include/win/ntddk.h

@@ -971 +971 @@
                                    void*,DWORD,DWORD*);
 NTSTATUS    WINAPI NtLoadKey(const OBJECT_ATTRIBUTES*,const OBJECT_ATTRIBUTES*);
-
+NTSTATUS WINAPI NtDuplicateObject(
+        IN HANDLE SourceProcessHandle,
+        IN PHANDLE SourceHandle,
+        IN HANDLE TargetProcessHandle,
+        OUT PHANDLE TargetHandle,
+        IN ACCESS_MASK DesiredAccess,
+        IN BOOLEAN InheritHandle,
+        ULONG Options);
 
 NTSTATUS WINAPI NtEnumerateValueKey(

trunk/include/win/winbase.h

@@ -169 +169 @@
 #define DRIVE_CDROM                5
 #define DRIVE_RAMDISK              6
+
+#define MAX_COMPUTERNAME_LENGTH    15
 
 /* The security attributes structure */
@@ -1853 +1855 @@
 VOID        WINAPI SetFileApisToOEM(void);
 DWORD       WINAPI SetFilePointer(HANDLE,LONG,LPLONG,DWORD);
+BOOL        WINAPI SetFilePointerEx(HANDLE,LARGE_INTEGER,LARGE_INTEGER*,DWORD);
 BOOL        WINAPI SetFileSecurityA(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
 BOOL        WINAPI SetFileSecurityW(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
@@ -2139 +2142 @@
 BOOL        WINAPI SetVolumeLabelW(LPCWSTR,LPCWSTR);
 #define     SetVolumeLabel WINELIB_NAME_AW(SetVolumeLabel)
+BOOL        WINAPI SetWaitableTimer(HANDLE,const LARGE_INTEGER*,LONG,PTIMERAPCROUTINE,LPVOID,BOOL);
 DWORD       WINAPI SizeofResource(HMODULE,HRSRC);
 BOOL        WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED);

trunk/include/win/wincrypt.h

@@ -3808 +3808 @@
 WINADVAPI BOOL WINAPI CryptSetProviderExW (LPCWSTR, DWORD, DWORD *, DWORD);
 #define               CryptSetProviderEx WINELIB_NAME_AW(CryptSetProviderEx)
-//WINADVAPI BOOL WINAPI CryptSetProvParam (HCRYPTPROV, DWORD, CONST BYTE *, DWORD);
+WINADVAPI BOOL WINAPI CryptSetProvParam (HCRYPTPROV, DWORD, CONST BYTE *, DWORD);
 WINADVAPI BOOL WINAPI CryptSignHashA (HCRYPTHASH, DWORD, LPCSTR, DWORD, BYTE *, DWORD *);
 WINADVAPI BOOL WINAPI CryptSignHashW (HCRYPTHASH, DWORD, LPCWSTR, DWORD, BYTE *, DWORD *);

trunk/include/win/winnt.h

@@ -2480 +2480 @@
 #define FILE_512_BYTE_ALIGNMENT         0x000001ff
 
+#define MAILSLOT_NO_MESSAGE             ((DWORD)-1)
+#define MAILSLOT_WAIT_FOREVER           ((DWORD)-1)
+
+#define REG_NONE                0       /* no type */
+#define REG_SZ                  1       /* string type (ASCII) */
+#define REG_EXPAND_SZ           2       /* string, includes %ENVVAR% (expanded by caller) (ASCII) */
+#define REG_BINARY              3       /* binary format, callerspecific */
+/* YES, REG_DWORD == REG_DWORD_LITTLE_ENDIAN */
+#define REG_DWORD               4       /* DWORD in little endian format */
+#define REG_DWORD_LITTLE_ENDIAN 4       /* DWORD in little endian format */
+#define REG_DWORD_BIG_ENDIAN    5       /* DWORD in big endian format  */
+#define REG_LINK                6       /* symbolic link (UNICODE) */
+#define REG_MULTI_SZ            7       /* multiple strings, delimited by \0, terminated by \0\0 (ASCII) */
+#define REG_RESOURCE_LIST       8       /* resource list? huh? */
+#define REG_FULL_RESOURCE_DESCRIPTOR    9       /* full resource descriptor? huh? */
+#define REG_RESOURCE_REQUIREMENTS_LIST  10
+#define REG_QWORD               11      /* QWORD in little endian format */
+#define REG_QWORD_LITTLE_ENDIAN 11      /* QWORD in little endian format */
+
 /* Registry security values */
 #define OWNER_SECURITY_INFORMATION  0x00000001
@@ -2741 +2760 @@
 #define REG_QWORD               11      /* QWORD in little endian format */
 
+#define DECLSPEC_NORETURN
+
 #endif

trunk/include/win/winreg.h

@@ -7 +7 @@
 #include "winbase.h"
 #include "winnt.h"
+
+typedef LONG LSTATUS;
 
 /*
@@ -196 +198 @@
 LONG       WINAPI RegDeleteValueW(HKEY,LPWSTR);
 #define     RegDeleteValue WINELIB_NAME_AW(RegDeleteValue)
+LSTATUS   WINAPI RegDeleteTreeA(HKEY,LPCSTR);
+LSTATUS   WINAPI RegDeleteTreeW(HKEY,LPCWSTR);
+#define     RegDeleteTree WINELIB_NAME_AW(RegDeleteTree)
 LONG       WINAPI RegEnumKeyA(HKEY,DWORD,LPSTR,DWORD);
 LONG       WINAPI RegEnumKeyW(HKEY,DWORD,LPWSTR,DWORD);
@@ -222 +227 @@
 #define     RegQueryMultipleValues WINELIB_NAME_AW(RegQueryMultipleValues)
 
-typedef LONG LSTATUS;
-
 #endif  /* __WINE_WINREG_H */