November 2011 - Wine-commits

Francois Gouget : kernel32: Declare more TimerQueue functions in winbase.h.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 1c108d1acbe71dacb9ad3a6ed39380a8cd12c2a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c108d1acbe71dacb9ad3a6ed… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 10 14:38:27 2011 +0100 kernel32: Declare more TimerQueue functions in winbase.h. --- include/winbase.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index a37d073..c84c1f1 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1360,6 +1360,7 @@ WINBASEAPI BOOL WINAPI CallNamedPipeW(LPCWSTR,LPVOID,DWORD,LPVOID,DWORD,L #define CallNamedPipe WINELIB_NAME_AW(CallNamedPipe) WINBASEAPI BOOL WINAPI CancelIo(HANDLE); WINBASEAPI BOOL WINAPI CancelIoEx(HANDLE,LPOVERLAPPED); +WINBASEAPI BOOL WINAPI CancelTimerQueueTimer(HANDLE,HANDLE); WINBASEAPI BOOL WINAPI CancelWaitableTimer(HANDLE); WINBASEAPI BOOL WINAPI ChangeTimerQueueTimer(HANDLE,HANDLE,ULONG,ULONG); WINADVAPI BOOL WINAPI CheckTokenMembership(HANDLE,PSID,PBOOL); @@ -1477,6 +1478,7 @@ WINBASEAPI void WINAPI DeleteFiber(LPVOID); WINBASEAPI BOOL WINAPI DeleteFileA(LPCSTR); WINBASEAPI BOOL WINAPI DeleteFileW(LPCWSTR); #define DeleteFile WINELIB_NAME_AW(DeleteFile) +WINBASEAPI BOOL WINAPI DeleteTimerQueue(HANDLE); WINBASEAPI BOOL WINAPI DeleteTimerQueueEx(HANDLE,HANDLE); WINBASEAPI BOOL WINAPI DeleteTimerQueueTimer(HANDLE,HANDLE,HANDLE); WINBASEAPI BOOL WINAPI DeleteVolumeMountPointA(LPCSTR); @@ -2133,6 +2135,7 @@ WINBASEAPI DWORD WINAPI SetThreadIdealProcessor(HANDLE,DWORD); WINBASEAPI BOOL WINAPI SetThreadPriority(HANDLE,INT); WINBASEAPI BOOL WINAPI SetThreadPriorityBoost(HANDLE,BOOL); WINADVAPI BOOL WINAPI SetThreadToken(PHANDLE,HANDLE); +WINBASEAPI HANDLE WINAPI SetTimerQueueTimer(HANDLE,WAITORTIMERCALLBACK,PVOID,DWORD,DWORD,BOOL); WINBASEAPI BOOL WINAPI SetTimeZoneInformation(const TIME_ZONE_INFORMATION *); WINADVAPI BOOL WINAPI SetTokenInformation(HANDLE,TOKEN_INFORMATION_CLASS,LPVOID,DWORD); WINBASEAPI LPTOP_LEVEL_EXCEPTION_FILTER WINAPI SetUnhandledExceptionFilter(LPTOP_LEVEL_EXCEPTION_FILTER);

1 0

Andrew Talbot : advapi32: Remove an unused variable.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 8a1539ac98e31c629d30e454eddee6fe8ebf49bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a1539ac98e31c629d30e454e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 10 22:10:50 2011 +0000 advapi32: Remove an unused variable. --- dlls/advapi32/service.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 2fc3d71..bb5e49c 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -45,10 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(service); -static const WCHAR szServiceManagerKey[] = { 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'S','e','r','v','i','c','e','s',0 }; - void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len) { return HeapAlloc(GetProcessHeap(), 0, len);

1 0

Andrew Talbot : appwiz.cpl: Remove an unused function.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: cedeac3191eaab0fc53471fdfc8fb949ac459ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cedeac3191eaab0fc53471fdf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 10 22:11:24 2011 +0000 appwiz.cpl: Remove an unused function. --- dlls/appwiz.cpl/addons.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 3099ec8..0e3591b 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -74,19 +74,6 @@ static const WCHAR mshtml_keyW[] = static HWND install_dialog = NULL; static LPWSTR url = NULL; -static inline char *heap_strdupWtoA(LPCWSTR str) -{ - char *ret = NULL; - - if(str) { - DWORD size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); - ret = heap_alloc(size); - WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); - } - - return ret; -} - /* SHA definitions are copied from advapi32. They aren't available in headers. */ typedef struct {

1 0

Andrew Talbot : atl: Remove an unused variable.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: a41cbc1423e7317f51d6a3fc65552f0c3af502aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41cbc1423e7317f51d6a3fc6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 10 22:11:48 2011 +0000 atl: Remove an unused variable. --- dlls/atl/registrar.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 7edd739..4fcf28d 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -844,8 +844,6 @@ HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR return do_register_dll_server(pReg, module_name, lpszRes, bRegister, pMapEntries); } -static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; - /*********************************************************************** * DllRegisterServer (ATL.@) */

1 0

André Hentschel : unicows: Add GetRoleTextW from oleacc.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: ebde184b4c268a73a89b0593bd94b9637896f42c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebde184b4c268a73a89b0593b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 11 19:13:26 2011 +0100 unicows: Add GetRoleTextW from oleacc. --- dlls/unicows/Makefile.in | 2 +- dlls/unicows/unicows.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/unicows/Makefile.in b/dlls/unicows/Makefile.in index d368636..aa61da4 100644 --- a/dlls/unicows/Makefile.in +++ b/dlls/unicows/Makefile.in @@ -1,6 +1,6 @@ MODULE = unicows.dll IMPORTLIB = unicows IMPORTS = avicap32 msvfw32 oledlg comdlg32 shell32 winmm winspool \ - rasapi32 secur32 sensapi version user32 mpr gdi32 advapi32 + rasapi32 secur32 sensapi version oleacc user32 mpr gdi32 advapi32 @MAKE_DLL_RULES@ diff --git a/dlls/unicows/unicows.spec b/dlls/unicows/unicows.spec index 47ba26f..c008ea7 100644 --- a/dlls/unicows/unicows.spec +++ b/dlls/unicows/unicows.spec @@ -227,7 +227,7 @@ @ stdcall GetProfileStringW(wstr wstr wstr ptr long) @ stdcall GetPropA(long str) @ stdcall GetPropW(long wstr) -@ stub GetRoleTextW +@ stdcall GetRoleTextW(long ptr long) @ stdcall GetSaveFileNamePreviewW(ptr) @ stdcall GetSaveFileNameW(ptr) @ stdcall GetShortPathNameW(wstr ptr long)

1 0

Marcus Meissner : wmc: Increate allocated size to match \0 (Coverity).
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: af14cb60f7af67472cf7494eb5d0395cb7bd068e URL: http://source.winehq.org/git/wine.git/?a=commit;h=af14cb60f7af67472cf7494eb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Nov 12 09:04:51 2011 +0100 wmc: Increate allocated size to match \0 (Coverity). --- tools/wmc/wmc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 837cfa6..c9ad9c4 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -164,7 +164,7 @@ int main(int argc,char *argv[]) /* First rebuild the commandline to put in destination */ /* Could be done through env[], but not all OS-es support it */ - cmdlen = 4; /* for "wmc " */ + cmdlen = 5; /* for "wmc " and \0 */ for(i = 1; i < argc; i++) cmdlen += strlen(argv[i]) + 1; cmdline = xmalloc(cmdlen);

1 0

Marcus Meissner : gdi32: Fixed loop end setting (Coverity).
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 4222ccf1cf50618fb804fc3dcc492b6db0d3dff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4222ccf1cf50618fb804fc3dc… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Nov 12 12:09:33 2011 +0100 gdi32: Fixed loop end setting (Coverity). --- dlls/gdi32/freetype.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9137322..06350be 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4588,7 +4588,7 @@ static BOOL enum_face_charsets(Face *face, struct enum_charset_list *list, if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */ elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; load_script_name( IDS_OEM_DOS, elf.elfScript ); - i = 32; /* break out of loop */ + i = list->total; /* break out of loop after enumeration */ } else if(!(face->fs.fsCsb[0] & list->element[i].mask)) continue; else { @@ -4600,7 +4600,7 @@ static BOOL enum_face_charsets(Face *face, struct enum_charset_list *list, TRACE("enuming face %s full %s style %s charset = %d type %d script %s it %d weight %d ntmflags %08x\n", debugstr_w(elf.elfLogFont.lfFaceName), debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle), - list->element[i].charset, type, debugstr_w(elf.elfScript), + elf.elfLogFont.lfCharSet, type, debugstr_w(elf.elfScript), elf.elfLogFont.lfItalic, elf.elfLogFont.lfWeight, ntm.ntmTm.ntmFlags); /* release section before callback (FIXME) */

1 0

Nikolay Sivov : msxml3: Implement get_nodeTypeValue() for attributes without a type.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: dd9a2effd5efa09388e76e0282f2e3f206cbbdb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd9a2effd5efa09388e76e028… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 5 13:42:41 2011 +0300 msxml3: Implement get_nodeTypeValue() for attributes without a type. --- dlls/msxml3/attribute.c | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index b67a5b4..fc96658 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -448,11 +448,40 @@ static HRESULT WINAPI domattr_get_definition( static HRESULT WINAPI domattr_get_nodeTypedValue( IXMLDOMAttribute *iface, - VARIANT* var1) + VARIANT* value) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - FIXME("(%p)->(%p)\n", This, var1); - return return_null_var(var1); + IXMLDOMDocument *doc; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, value); + + hr = IXMLDOMAttribute_get_ownerDocument(iface, &doc); + if (hr == S_OK) + { + IXMLDOMDocument2 *doc2; + + hr = IXMLDOMDocument_QueryInterface(doc, &IID_IXMLDOMDocument2, (void**)&doc2); + IXMLDOMDocument_Release(doc); + + if (hr == S_OK) + { + VARIANT schemas; + + hr = IXMLDOMDocument2_get_schemas(doc2, &schemas); + IXMLDOMDocument2_Release(doc2); + + if (hr != S_OK) + return IXMLDOMAttribute_get_value(iface, value); + else + { + FIXME("need to query schema for attribute type\n"); + VariantClear(&schemas); + } + } + } + + return return_null_var(value); } static HRESULT WINAPI domattr_put_nodeTypedValue(

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: ccf369ad0897e8308cd97d04f121614826bcd0da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccf369ad0897e8308cd97d04f… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Nov 9 10:27:50 2011 +0100 po: Update Italian translation. --- po/it.po | 74 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 36 insertions(+), 38 deletions(-) diff --git a/po/it.po b/po/it.po index 50ab75e..c4b752b 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-10-31 19:18+0100\n" +"PO-Revision-Date: 2011-11-09 10:22+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -246,7 +246,7 @@ msgstr "Dettagli" #: comdlg32.rc:59 msgid "Browse to Desktop" -msgstr "Vai al desktop" +msgstr "Vai alla Scrivania" #: comdlg32.rc:123 msgid "Regular" @@ -1010,7 +1010,7 @@ msgstr "Ottieni CRL" #: crypt32.rc:132 msgid "Revoke Request" -msgstr "Revoca richiesta" +msgstr "Richiesta di revoca" #: crypt32.rc:133 msgid "Query Pending" @@ -2040,73 +2040,71 @@ msgstr "%uMB usati, %uMB disponibili" #: gdi32.rc:25 msgid "Western" -msgstr "" +msgstr "Ovest" #: gdi32.rc:26 msgid "Central European" -msgstr "" +msgstr "Europeo centrale" #: gdi32.rc:27 msgid "Cyrillic" -msgstr "" +msgstr "Cirillico" #: gdi32.rc:28 -#, fuzzy msgid "Greek" -msgstr "Verde" +msgstr "Greco" #: gdi32.rc:29 msgid "Turkish" -msgstr "" +msgstr "Turco" #: gdi32.rc:30 msgid "Hebrew" -msgstr "" +msgstr "Ebreo" #: gdi32.rc:31 msgid "Arabic" -msgstr "" +msgstr "Arabo" #: gdi32.rc:32 msgid "Baltic" -msgstr "" +msgstr "Baltico" #: gdi32.rc:33 msgid "Vietnamese" -msgstr "" +msgstr "Vietnamita" #: gdi32.rc:34 msgid "Thai" -msgstr "" +msgstr "Thai" #: gdi32.rc:35 -#, fuzzy msgid "Japanese" -msgstr "pannello" +msgstr "Giapponese" #: gdi32.rc:36 msgid "CHINESE_GB2312" -msgstr "" +msgstr "CHINESE_GB2312" #: gdi32.rc:37 msgid "Hangul" -msgstr "" +msgstr "Hangul" #: gdi32.rc:38 msgid "CHINESE_BIG5" -msgstr "" +msgstr "CHINESE_BIG5" #: gdi32.rc:39 msgid "Hangul(Johab)" -msgstr "" +msgstr "Hangul (Johab)" #: gdi32.rc:40 msgid "Symbol" -msgstr "" +msgstr "Symbol" #: gdi32.rc:41 msgid "OEM/DOS" -msgstr "" +msgstr "OEM/DOS" #: hhctrl.rc:56 msgid "S&ync" @@ -2284,7 +2282,7 @@ msgstr "&Informazioni su Internet Explorer..." #: ieframe.rc:67 msgctxt "home page" msgid "Home" -msgstr "Inizio" +msgstr "Pagina iniziale" #: ieframe.rc:68 winhlp32.rc:66 msgid "Print..." @@ -6119,7 +6117,7 @@ msgstr "&Copia sfondo" #: shdoclc.rc:44 msgid "Set as &Desktop Item" -msgstr "Aggiungi come &oggetto del Desktop" +msgstr "Aggiungi come &oggetto della Scrivania" #: shdoclc.rc:46 shdoclc.rc:95 shdoclc.rc:117 user32.rc:62 msgid "Select &All" @@ -6192,7 +6190,7 @@ msgstr "Im&posta come sfondo" #: shdoclc.rc:74 shdoclc.rc:154 shdoclc.rc:178 msgid "Set as &Desktop Item..." -msgstr "Aggiungi come &oggetto del Desktop..." +msgstr "Aggiungi come &oggetto della Scrivania..." #: shdoclc.rc:76 shdoclc.rc:90 shdoclc.rc:114 shdoclc.rc:156 shdoclc.rc:180 #: user32.rc:57 wordpad.rc:101 @@ -9636,7 +9634,7 @@ msgstr "&Linea di comando:" #: progman.rc:171 msgid "&Working directory:" -msgstr "&Directory di &lavoro:" +msgstr "Cartella di &lavoro:" #: progman.rc:173 msgid "&Key combination:" @@ -10510,11 +10508,11 @@ msgstr "Non si aggiorna automaticamente" #: taskmgr.rc:205 msgid "Tiles the windows horizontally on the desktop" -msgstr "Affianca le finestre orizzontalmente sul desktop" +msgstr "Affianca le finestre orizzontalmente sulla scrivania " #: taskmgr.rc:206 msgid "Tiles the windows vertically on the desktop" -msgstr "Affianca le finestre verticalmente sul desktop" +msgstr "Affianca le finestre verticalmente sulla scrivania " #: taskmgr.rc:207 msgid "Minimizes the windows" @@ -10526,7 +10524,7 @@ msgstr "Massimizza le finestre" #: taskmgr.rc:209 msgid "Cascades the windows diagonally on the desktop" -msgstr "Impila le finestre diagonalmente sul desktop" +msgstr "Impila le finestre diagonalmente sulla scrivania" #: taskmgr.rc:210 msgid "Brings the window front, but does not switch to it" @@ -10942,7 +10940,7 @@ msgstr "Grafica" #: winecfg.rc:38 msgid "Desktop Integration" -msgstr "Integrazione del desktop" +msgstr "Integrazione della Scrivania" #: winecfg.rc:39 msgid "Audio" @@ -11125,11 +11123,11 @@ msgstr "Controlli - Testo" #: winecfg.rc:99 msgid "Menu Background" -msgstr "Menu - Sfondo" +msgstr "Menù - Sfondo" #: winecfg.rc:100 msgid "Menu Text" -msgstr "Menu - Testo" +msgstr "Menù - Testo" #: winecfg.rc:101 msgid "Scrollbar" @@ -11233,11 +11231,11 @@ msgstr "Titolo inattivo - Gradiente della barra" #: winecfg.rc:126 msgid "Menu Highlight" -msgstr "Menu - Selezione" +msgstr "Menù - Selezione" #: winecfg.rc:127 msgid "Menu Bar" -msgstr "Menu - Barra" +msgstr "Menù - Barra" #: wineconsole.rc:57 msgid " Options " @@ -11265,7 +11263,7 @@ msgstr "Controlli" #: wineconsole.rc:66 msgid "Popup menu" -msgstr "Menu a comparsa" +msgstr "Menù a comparsa" #: wineconsole.rc:67 msgid "&Control" @@ -11281,7 +11279,7 @@ msgstr "Modifica rapida" #: wineconsole.rc:70 msgid "&enable" -msgstr "&Abilita" +msgstr "&abilita" #: wineconsole.rc:72 msgid "Command history" @@ -11313,7 +11311,7 @@ msgstr " Configurazione " #: wineconsole.rc:100 msgid "Buffer zone" -msgstr "Buffer" +msgstr "Zona del buffer" #: wineconsole.rc:101 msgid "&Width :" @@ -11325,7 +11323,7 @@ msgstr "&Altezza:" #: wineconsole.rc:108 msgid "Window size" -msgstr "Dimensione finestra" +msgstr "Dimensione della finestra" #: wineconsole.rc:109 msgid "W&idth :"

1 0

Michael Stefaniuc : include: Drop "l" modifiers from numeric constants in winternl.h.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 5337ad066f3d09f86ee88c120d87080c96e3d902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5337ad066f3d09f86ee88c120… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 10 01:39:59 2011 +0100 include: Drop "l" modifiers from numeric constants in winternl.h. --- include/winternl.h | 78 ++++++++++++++++++++++++++-------------------------- 1 files changed, 39 insertions(+), 39 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index cba5171..d8dd177 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1604,14 +1604,14 @@ typedef struct _RTL_HANDLE_TABLE #define LOGONID_CURRENT ((ULONG)-1) -#define OBJ_INHERIT 0x00000002L -#define OBJ_PERMANENT 0x00000010L -#define OBJ_EXCLUSIVE 0x00000020L -#define OBJ_CASE_INSENSITIVE 0x00000040L -#define OBJ_OPENIF 0x00000080L -#define OBJ_OPENLINK 0x00000100L -#define OBJ_KERNEL_HANDLE 0x00000200L -#define OBJ_VALID_ATTRIBUTES 0x000003F2L +#define OBJ_INHERIT 0x00000002 +#define OBJ_PERMANENT 0x00000010 +#define OBJ_EXCLUSIVE 0x00000020 +#define OBJ_CASE_INSENSITIVE 0x00000040 +#define OBJ_OPENIF 0x00000080 +#define OBJ_OPENLINK 0x00000100 +#define OBJ_KERNEL_HANDLE 0x00000200 +#define OBJ_VALID_ATTRIBUTES 0x000003F2 #define SERVERNAME_CURRENT ((HANDLE)NULL) @@ -1629,37 +1629,37 @@ typedef void (NTAPI *RTL_WAITORTIMERCALLBACKFUNC)(PVOID,BOOLEAN); /* FIXME: not #define DPFLTR_MASK 0x8000000 /* Well-known LUID values */ -#define SE_MIN_WELL_KNOWN_PRIVILEGE 2L -#define SE_CREATE_TOKEN_PRIVILEGE 2L -#define SE_ASSIGNPRIMARYTOKEN_PRIVILEGE 3L -#define SE_LOCK_MEMORY_PRIVILEGE 4L -#define SE_INCREASE_QUOTA_PRIVILEGE 5L -#define SE_UNSOLICITED_INPUT_PRIVILEGE 6L /* obsolete */ -#define SE_MACHINE_ACCOUNT_PRIVILEGE 6L -#define SE_TCB_PRIVILEGE 7L -#define SE_SECURITY_PRIVILEGE 8L -#define SE_TAKE_OWNERSHIP_PRIVILEGE 9L -#define SE_LOAD_DRIVER_PRIVILEGE 10L -#define SE_SYSTEM_PROFILE_PRIVILEGE 11L -#define SE_SYSTEMTIME_PRIVILEGE 12L -#define SE_PROF_SINGLE_PROCESS_PRIVILEGE 13L -#define SE_INC_BASE_PRIORITY_PRIVILEGE 14L -#define SE_CREATE_PAGEFILE_PRIVILEGE 15L -#define SE_CREATE_PERMANENT_PRIVILEGE 16L -#define SE_BACKUP_PRIVILEGE 17L -#define SE_RESTORE_PRIVILEGE 18L -#define SE_SHUTDOWN_PRIVILEGE 19L -#define SE_DEBUG_PRIVILEGE 20L -#define SE_AUDIT_PRIVILEGE 21L -#define SE_SYSTEM_ENVIRONMENT_PRIVILEGE 22L -#define SE_CHANGE_NOTIFY_PRIVILEGE 23L -#define SE_REMOTE_SHUTDOWN_PRIVILEGE 24L -#define SE_UNDOCK_PRIVILEGE 25L -#define SE_SYNC_AGENT_PRIVILEGE 26L -#define SE_ENABLE_DELEGATION_PRIVILEGE 27L -#define SE_MANAGE_VOLUME_PRIVILEGE 28L -#define SE_IMPERSONATE_PRIVILEGE 29L -#define SE_CREATE_GLOBAL_PRIVILEGE 30L +#define SE_MIN_WELL_KNOWN_PRIVILEGE 2 +#define SE_CREATE_TOKEN_PRIVILEGE 2 +#define SE_ASSIGNPRIMARYTOKEN_PRIVILEGE 3 +#define SE_LOCK_MEMORY_PRIVILEGE 4 +#define SE_INCREASE_QUOTA_PRIVILEGE 5 +#define SE_UNSOLICITED_INPUT_PRIVILEGE 6 /* obsolete */ +#define SE_MACHINE_ACCOUNT_PRIVILEGE 6 +#define SE_TCB_PRIVILEGE 7 +#define SE_SECURITY_PRIVILEGE 8 +#define SE_TAKE_OWNERSHIP_PRIVILEGE 9 +#define SE_LOAD_DRIVER_PRIVILEGE 10 +#define SE_SYSTEM_PROFILE_PRIVILEGE 11 +#define SE_SYSTEMTIME_PRIVILEGE 12 +#define SE_PROF_SINGLE_PROCESS_PRIVILEGE 13 +#define SE_INC_BASE_PRIORITY_PRIVILEGE 14 +#define SE_CREATE_PAGEFILE_PRIVILEGE 15 +#define SE_CREATE_PERMANENT_PRIVILEGE 16 +#define SE_BACKUP_PRIVILEGE 17 +#define SE_RESTORE_PRIVILEGE 18 +#define SE_SHUTDOWN_PRIVILEGE 19 +#define SE_DEBUG_PRIVILEGE 20 +#define SE_AUDIT_PRIVILEGE 21 +#define SE_SYSTEM_ENVIRONMENT_PRIVILEGE 22 +#define SE_CHANGE_NOTIFY_PRIVILEGE 23 +#define SE_REMOTE_SHUTDOWN_PRIVILEGE 24 +#define SE_UNDOCK_PRIVILEGE 25 +#define SE_SYNC_AGENT_PRIVILEGE 26 +#define SE_ENABLE_DELEGATION_PRIVILEGE 27 +#define SE_MANAGE_VOLUME_PRIVILEGE 28 +#define SE_IMPERSONATE_PRIVILEGE 29 +#define SE_CREATE_GLOBAL_PRIVILEGE 30 #define SE_MAX_WELL_KNOWN_PRIVILEGE SE_CREATE_GLOBAL_PRIVILEGE /* NtGlobalFlag bits */

1 0