wine-commits September 2007

wine-commits@winehq.org

7 participants
787 discussions

Francois Gouget : wintrust: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 9114bc1bd82562c0375029fc20249355528d05f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9114bc1bd82562c0375029fc2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 18 00:39:31 2007 +0200 wintrust: Fix compilation on systems that don't support nameless unions. --- dlls/wintrust/wintrust_main.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 503fbd9..44d2dc8 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -21,6 +21,8 @@ #include <stdarg.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -84,10 +86,10 @@ static LONG WINTRUST_DefaultVerify(HWND hwnd, GUID *actionID, goto oom; provData->cdwTrustStepErrors = TRUSTERROR_MAX_STEPS; - provData->pPDSip = WINTRUST_Alloc(sizeof(PROVDATA_SIP)); - if (!provData->pPDSip) + provData->u.pPDSip = WINTRUST_Alloc(sizeof(PROVDATA_SIP)); + if (!provData->u.pPDSip) goto oom; - provData->pPDSip->cbStruct = sizeof(PROVDATA_SIP); + provData->u.pPDSip->cbStruct = sizeof(PROVDATA_SIP); provData->psPfns = WINTRUST_Alloc(sizeof(CRYPT_PROVIDER_FUNCTIONS)); if (!provData->psPfns) @@ -130,7 +132,7 @@ error: if (provData) { WINTRUST_Free(provData->padwTrustStepErrors); - WINTRUST_Free(provData->pPDSip); + WINTRUST_Free(provData->u.pPDSip); WINTRUST_Free(provData->psPfns); WINTRUST_Free(provData); } @@ -151,7 +153,7 @@ static LONG WINTRUST_DefaultClose(HWND hwnd, GUID *actionID, { err = provData->psPfns->pfnCleanupPolicy(provData); WINTRUST_Free(provData->padwTrustStepErrors); - WINTRUST_Free(provData->pPDSip); + WINTRUST_Free(provData->u.pPDSip); WINTRUST_Free(provData->psPfns); WINTRUST_Free(provData); data->hWVTStateData = NULL; @@ -180,7 +182,7 @@ static LONG WINTRUST_PublishedSoftware(HWND hwnd, GUID *actionID, /* Undocumented: the published software action is passed a path, * and pSIPClientData points to a WIN_TRUST_SUBJECT_FILE. */ - LPCWSTR path = (LPCWSTR)data->pFile; + LPCWSTR path = (LPCWSTR)data->u.pFile; LPWIN_TRUST_SUBJECT_FILE subjectFile = (LPWIN_TRUST_SUBJECT_FILE)data->pSIPClientData; WINTRUST_FILE_INFO fileInfo = { sizeof(fileInfo), 0 }; @@ -189,7 +191,7 @@ static LONG WINTRUST_PublishedSoftware(HWND hwnd, GUID *actionID, TRACE("subjectFile->lpPath: %s\n", debugstr_w(subjectFile->lpPath)); fileInfo.pcwszFilePath = path; fileInfo.hFile = subjectFile->hFile; - wintrust_data.pFile = &fileInfo; + wintrust_data.u.pFile = &fileInfo; wintrust_data.dwUnionChoice = WTD_CHOICE_FILE; wintrust_data.dwUIChoice = WTD_UI_NONE;

1 0

Francois Gouget : dbghelp & imagehlp: Fix the PSYM_ENUMSYMBOLS_CALLBACK() and PSYM_ENUMERATESYMBOLS_CALLBACK() prototypes.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 98d63f3435854b8a8b5d43abb23aa15cfe969d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98d63f3435854b8a8b5d43abb… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 18 00:40:19 2007 +0200 dbghelp & imagehlp: Fix the PSYM_ENUMSYMBOLS_CALLBACK() and PSYM_ENUMERATESYMBOLS_CALLBACK() prototypes. Tweak the actual callbacks to better match the prototypes. --- include/dbghelp.h | 4 ++-- include/imagehlp.h | 8 ++++---- programs/winedbg/stack.c | 2 +- programs/winedbg/symbol.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/dbghelp.h b/include/dbghelp.h index c13dc7a..a5ed500 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1012,8 +1012,8 @@ BOOL WINAPI SymEnumSymbols(HANDLE, ULONG64, PCSTR, PSYM_ENUMERATESYMBOLS_CALLBAC PVOID); BOOL WINAPI SymEnumSymbolsW(HANDLE, ULONG64, PCWSTR, PSYM_ENUMERATESYMBOLS_CALLBACKW, PVOID); -typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK)(PCSTR, DWORD, ULONG, PVOID); -typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACKW)(PCWSTR, DWORD, ULONG, PVOID); +typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK)(PCSTR, ULONG, ULONG, PVOID); +typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACKW)(PCWSTR, ULONG, ULONG, PVOID); BOOL WINAPI SymEnumerateSymbols(HANDLE, ULONG, PSYM_ENUMSYMBOLS_CALLBACK, PVOID); BOOL WINAPI SymEnumerateSymbolsW(HANDLE, ULONG, PSYM_ENUMSYMBOLS_CALLBACKW, PVOID); typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK64)(PCSTR, DWORD64, ULONG, PVOID); diff --git a/include/imagehlp.h b/include/imagehlp.h index 028725b..1e33df4 100644 --- a/include/imagehlp.h +++ b/include/imagehlp.h @@ -666,10 +666,10 @@ typedef BOOL (CALLBACK *PIMAGEHLP_STATUS_ROUTINE64)( ); typedef BOOL (CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACK)( - PSYMBOL_INFO pSymInfo, DWORD SymbolSize, PVOID UserContext + PSYMBOL_INFO pSymInfo, ULONG SymbolSize, PVOID UserContext ); typedef BOOL (CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACKW)( - PSYMBOL_INFOW pSymInfo, DWORD SymbolSize, PVOID UserContext + PSYMBOL_INFOW pSymInfo, ULONG SymbolSize, PVOID UserContext ); typedef BOOL (CALLBACK* PSYM_ENUMLINES_CALLBACK)( @@ -697,10 +697,10 @@ typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACKW64)( ); typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK)( - PCSTR, DWORD, ULONG, PVOID + PCSTR, ULONG, ULONG, PVOID ); typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACKW)( - PCWSTR, DWORD, ULONG, PVOID + PCWSTR, ULONG, ULONG, PVOID ); typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK64)( PCSTR, DWORD64, ULONG, PVOID diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 668808f..86f682f 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -215,7 +215,7 @@ struct sym_enum BOOL first; }; -static BOOL WINAPI sym_enum_cb(SYMBOL_INFO* sym_info, ULONG size, void* user) +static BOOL WINAPI sym_enum_cb(PSYMBOL_INFO sym_info, ULONG size, PVOID user) { struct sym_enum* se = (struct sym_enum*)user; diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index d33e9e8..cd69a9c 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -144,7 +144,7 @@ struct sgv_data ULONG64 frame_offset; /* in : frame for local & parameter variables look up */ }; -static BOOL CALLBACK sgv_cb(SYMBOL_INFO* sym, ULONG size, void* ctx) +static BOOL CALLBACK sgv_cb(PSYMBOL_INFO sym, ULONG size, PVOID ctx) { struct sgv_data* sgv = (struct sgv_data*)ctx; unsigned insp; @@ -612,7 +612,7 @@ void symbol_print_local(const SYMBOL_INFO* sym, ULONG base, } } -static BOOL CALLBACK info_locals_cb(SYMBOL_INFO* sym, ULONG size, void* ctx) +static BOOL CALLBACK info_locals_cb(PSYMBOL_INFO sym, ULONG size, PVOID ctx) { struct dbg_type type; @@ -644,7 +644,7 @@ int symbol_info_locals(void) } -static BOOL CALLBACK symbols_info_cb(SYMBOL_INFO* sym, ULONG size, void* ctx) +static BOOL CALLBACK symbols_info_cb(PSYMBOL_INFO sym, ULONG size, PVOID ctx) { struct dbg_type type; IMAGEHLP_MODULE mi;

1 0

Francois Gouget : ntdll: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: bde9601ee10f1a4785d062efc32c208e03a9f717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde9601ee10f1a4785d062efc… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 18 00:39:43 2007 +0200 ntdll: Fix compilation on systems that don't support nameless unions. --- dlls/ntdll/nt.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8354fee..15fb507 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -27,6 +27,7 @@ #include <string.h> #include <time.h> +#define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS #include "wine/debug.h" @@ -387,8 +388,8 @@ NTSTATUS WINAPI NtQueryInformationToken( statistics->TokenId.HighPart = reply->token_id.high_part; statistics->AuthenticationId.LowPart = 0; /* FIXME */ statistics->AuthenticationId.HighPart = 0; /* FIXME */ - statistics->ExpirationTime.HighPart = 0x7fffffff; - statistics->ExpirationTime.LowPart = 0xffffffff; + statistics->ExpirationTime.u.HighPart = 0x7fffffff; + statistics->ExpirationTime.u.LowPart = 0xffffffff; statistics->TokenType = reply->primary ? TokenPrimary : TokenImpersonation; statistics->ImpersonationLevel = reply->impersonation_level;

1 0

Francois Gouget : dbghelp: Add some missing prototypes and types.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 4dbe1f91645091e2081a9161e54f05109102c9fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dbe1f91645091e2081a9161e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 18 00:40:28 2007 +0200 dbghelp: Add some missing prototypes and types. --- include/dbghelp.h | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/include/dbghelp.h b/include/dbghelp.h index 1528249..c13dc7a 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -303,6 +303,14 @@ typedef struct _IMAGEHLP_CBA_EVENT PVOID object; } IMAGEHLP_CBA_EVENT, *PIMAGEHLP_CBA_EVENT; +typedef struct _IMAGEHLP_CBA_EVENTW +{ + DWORD severity; + DWORD code; + PCWSTR desc; + PVOID object; +} IMAGEHLP_CBA_EVENTW, *PIMAGEHLP_CBA_EVENTW; + typedef struct _IMAGEHLP_DEFERRED_SYMBOL_LOAD { DWORD SizeOfStruct; @@ -879,6 +887,18 @@ typedef struct _SYMBOL_INFOW WCHAR Name[1]; } SYMBOL_INFOW, *PSYMBOL_INFOW; +typedef struct _SYMBOL_INFO_PACKAGE +{ + SYMBOL_INFO si; + CHAR name[MAX_SYM_NAME+1]; +} SYMBOL_INFO_PACKAGE, *PSYMBOL_INFO_PACKAGE; + +typedef struct _SYMBOL_INFO_PACKAGEW +{ + SYMBOL_INFOW si; + WCHAR name[MAX_SYM_NAME+1]; +} SYMBOL_INFO_PACKAGEW, *PSYMBOL_INFO_PACKAGEW; + typedef enum _IMAGEHLP_SYMBOL_TYPE_INFO { TI_GET_SYMTAG, @@ -987,6 +1007,7 @@ BOOL WINAPI SymGetSymNextW64(HANDLE, PIMAGEHLP_SYMBOLW64); BOOL WINAPI SymGetSymPrev(HANDLE, PIMAGEHLP_SYMBOL); BOOL WINAPI SymGetSymPrev64(HANDLE, PIMAGEHLP_SYMBOL64); BOOL WINAPI SymGetSymPrevW64(HANDLE, PIMAGEHLP_SYMBOLW64); +BOOL WINAPI SymEnumSym(HANDLE,ULONG64,PSYM_ENUMERATESYMBOLS_CALLBACK,PVOID); BOOL WINAPI SymEnumSymbols(HANDLE, ULONG64, PCSTR, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID); BOOL WINAPI SymEnumSymbolsW(HANDLE, ULONG64, PCWSTR, PSYM_ENUMERATESYMBOLS_CALLBACKW,

1 0

Francois Gouget : imagehlp: Fix the PTRANSLATE_ADDRESS_ROUTINE() and PREAD_PROCESS_MEMORY_ROUTINE() prototypes.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: faab0c78855c2289dcb44b787d14ff5ee9e3c891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faab0c78855c2289dcb44b787… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 18 00:40:34 2007 +0200 imagehlp: Fix the PTRANSLATE_ADDRESS_ROUTINE() and PREAD_PROCESS_MEMORY_ROUTINE() prototypes. --- include/imagehlp.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/imagehlp.h b/include/imagehlp.h index 93bbaee..028725b 100644 --- a/include/imagehlp.h +++ b/include/imagehlp.h @@ -226,7 +226,7 @@ typedef struct _ADDRESS { DWORD Offset; WORD Segment; ADDRESS_MODE Mode; -} ADDRESS, *PADDRESS; +} ADDRESS, *LPADDRESS; typedef struct _ADDRESS64 { DWORD64 Offset; @@ -729,7 +729,7 @@ typedef BOOL (CALLBACK *DIGEST_FUNCTION)( ); typedef BOOL (CALLBACK *PREAD_PROCESS_MEMORY_ROUTINE)( - HANDLE hProcess, LPCVOID lpBaseAddress, PVOID lpBuffer, + HANDLE hProcess, DWORD lpBaseAddress, PVOID lpBuffer, DWORD nSize, PDWORD lpNumberOfBytesRead ); @@ -753,7 +753,7 @@ typedef DWORD (CALLBACK *PGET_MODULE_BASE_ROUTINE64)( HANDLE hProcess, DWORD64 ReturnAddress); typedef DWORD (CALLBACK *PTRANSLATE_ADDRESS_ROUTINE)( - HANDLE hProcess, HANDLE hThread, PADDRESS lpaddr + HANDLE hProcess, HANDLE hThread, LPADDRESS lpaddr ); typedef DWORD (CALLBACK *PTRANSLATE_ADDRESS_ROUTINE64)(

1 0

Dmitry Timoshkov : winex11.drv: Use symbolic names for MapVirtualKey translation types.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 3407307a5002c84838e3526f931c3819e937b35d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3407307a5002c84838e3526f9… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 18 16:26:03 2007 +0900 winex11.drv: Use symbolic names for MapVirtualKey translation types. --- dlls/winex11.drv/keyboard.c | 31 ++++++++++++++++--------------- include/winuser.h | 7 +++++++ 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index f70aee5..2562103 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2094,25 +2094,32 @@ UINT X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) FIXME("keyboard layout %p is not supported\n", hkl); switch(wMapType) { - case 0: { /* vkey-code to scan-code */ + case MAPVK_VK_TO_VSC: /* vkey-code to scan-code */ + case MAPVK_VK_TO_VSC_EX: /* FIXME: should differentiate between + left and right keys */ + { /* let's do vkey -> keycode -> scan */ int keyc; for (keyc=min_keycode; keyc<=max_keycode; keyc++) if ((keyc2vkey[keyc] & 0xFF) == wCode) returnMVK (keyc2scan[keyc] & 0xFF); TRACE("returning no scan-code.\n"); - return 0; } - - case 1: { /* scan-code to vkey-code */ + return 0; + } + case MAPVK_VSC_TO_VK: /* scan-code to vkey-code */ + case MAPVK_VSC_TO_VK_EX: /* FIXME: should differentiate between + left and right keys */ + { /* let's do scan -> keycode -> vkey */ int keyc; for (keyc=min_keycode; keyc<=max_keycode; keyc++) if ((keyc2scan[keyc] & 0xFF) == (wCode & 0xFF)) returnMVK (keyc2vkey[keyc] & 0xFF); TRACE("returning no vkey-code.\n"); - return 0; } - - case 2: { /* vkey-code to unshifted ANSI code */ + return 0; + } + case MAPVK_VK_TO_CHAR: /* vkey-code to unshifted ANSI code */ + { /* we still don't know what "unshifted" means. in windows VK_W (0x57) * returns 0x57, which is upercase 'W'. So we have to return the uppercase * key.. Looks like something is wrong with the MS docs? @@ -2169,15 +2176,9 @@ UINT X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) TRACE("returning no ANSI.\n"); wine_tsx11_unlock(); return 0; - } - - case 3: /* **NT only** scan-code to vkey-code but distinguish between */ - /* left and right */ - FIXME(" stub for NT\n"); - return 0; - + } default: /* reserved */ - WARN("Unknown wMapType %d !\n", wMapType); + FIXME("Unknown wMapType %d !\n", wMapType); return 0; } return 0; diff --git a/include/winuser.h b/include/winuser.h index 4297a8d..b667aa5 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3729,6 +3729,13 @@ typedef struct tagCOMPAREITEMSTRUCT #define VK_PA1 0xFD #define VK_OEM_CLEAR 0xFE +/* MapVirtualKey translation types */ +#define MAPVK_VK_TO_VSC 0 +#define MAPVK_VSC_TO_VK 1 +#define MAPVK_VK_TO_CHAR 2 +#define MAPVK_VSC_TO_VK_EX 3 +#define MAPVK_VK_TO_VSC_EX 4 + /* Key status flags for mouse events */ #define MK_LBUTTON 0x0001 #define MK_RBUTTON 0x0002

1 0

Rob Shearman : widl: None of the non-fixed arrays have fixed sizes, so don' t set the alignment to anything and return a size of 0 from get_required_buffer_size_type .
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: aa649542e21b73f8abac9628cdca1b860d33b7e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa649542e21b73f8abac9628c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Sep 17 23:25:03 2007 +0100 widl: None of the non-fixed arrays have fixed sizes, so don't set the alignment to anything and return a size of 0 from get_required_buffer_size_type. --- tools/widl/typegen.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e90c9ec..7851b77 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2226,14 +2226,10 @@ static unsigned int get_required_buffer_size_type( case RPC_FC_SMVARRAY: case RPC_FC_LGVARRAY: - get_required_buffer_size_type(type->ref, name, alignment); - size = 0; - break; - case RPC_FC_CARRAY: case RPC_FC_CVARRAY: - get_required_buffer_size_type(type->ref, name, alignment); - size = sizeof(void *); + case RPC_FC_BOGUS_ARRAY: + size = 0; break; default:

1 0

Rob Shearman : widl: Missing size_is or length_is attributes should generate 0xffffffff for the correlation description .
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: cf983bf15d8f5ad69762c130d1b8fbc0c57ce549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf983bf15d8f5ad69762c130d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Sep 17 23:24:14 2007 +0100 widl: Missing size_is or length_is attributes should generate 0xffffffff for the correlation description. --- tools/widl/typegen.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f585c1f..e90c9ec 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -494,6 +494,12 @@ static size_t write_conf_or_var_desc(FILE *file, const type_t *structure, const char *operator_string = "no operators"; const expr_t *subexpr; + if (!expr) + { + print_file(file, 2, "NdrFcLong(0xffffffff),\t/* -1 */\n"); + return 4; + } + if (!structure) { /* Top-level conformance calculations are done inline. */

1 0

Mikolaj Zalewski : advapi32: QueryObjectSecurity should return a self-relative security descriptor and not overflow the buffer .
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: c5c0a26f601429dbcb303188d928a1ff80f3ac02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5c0a26f601429dbcb303188d… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Mon Sep 17 14:12:27 2007 -0700 advapi32: QueryObjectSecurity should return a self-relative security descriptor and not overflow the buffer. --- dlls/advapi32/service.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index a698f11..ce031ab 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2538,17 +2538,26 @@ BOOL WINAPI QueryServiceObjectSecurity(SC_HANDLE hService, PSECURITY_DESCRIPTOR lpSecurityDescriptor, DWORD cbBufSize, LPDWORD pcbBytesNeeded) { - PACL pACL = NULL; + SECURITY_DESCRIPTOR descriptor; + DWORD size; + BOOL succ; + ACL acl; - FIXME("%p %d %p %u %p\n", hService, dwSecurityInformation, + FIXME("%p %d %p %u %p - semi-stub\n", hService, dwSecurityInformation, lpSecurityDescriptor, cbBufSize, pcbBytesNeeded); - InitializeSecurityDescriptor(lpSecurityDescriptor, SECURITY_DESCRIPTOR_REVISION); + if (dwSecurityInformation != DACL_SECURITY_INFORMATION) + FIXME("information %d not supported\n", dwSecurityInformation); - pACL = HeapAlloc( GetProcessHeap(), 0, sizeof(ACL) ); - InitializeAcl(pACL, sizeof(ACL), ACL_REVISION); - SetSecurityDescriptorDacl(lpSecurityDescriptor, TRUE, pACL, TRUE); - return TRUE; + InitializeSecurityDescriptor(&descriptor, SECURITY_DESCRIPTOR_REVISION); + + InitializeAcl(&acl, sizeof(ACL), ACL_REVISION); + SetSecurityDescriptorDacl(&descriptor, TRUE, &acl, TRUE); + + size = cbBufSize; + succ = MakeSelfRelativeSD(&descriptor, lpSecurityDescriptor, &size); + *pcbBytesNeeded = size; + return succ; } /******************************************************************************

1 0

Gerald Pfeifer : README: Update minimal system requirements for FreeBSD.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: fef243cd8f37f497303276336b0c5bc1b8db5306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef243cd8f37f497303276336… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 16 21:19:48 2007 +0200 README: Update minimal system requirements for FreeBSD. --- README | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README b/README index 22a86b8..e3853ac 100644 --- a/README +++ b/README @@ -29,15 +29,14 @@ especially the wealth of information found at http://www.winehq.org. To compile and run Wine, you must have one of the following: Linux version 2.0.36 or above - FreeBSD 5.3 or later + FreeBSD 6.2 or later Solaris x86 2.5 or later NetBSD-current Mac OS X 10.4 or later As Wine requires kernel-level thread support to run, only the operating -systems mentioned above are supported. -Other operating systems which support kernel threads may be supported -in the future. +systems mentioned above are supported. Other operating systems which +support kernel threads may be supported in the future. Linux info: While Linux 2.2.x should still work and Linux 2.0.x may still work @@ -45,8 +44,8 @@ Linux info: it's best to have a current kernel such as 2.4.x or 2.6.x. FreeBSD info: - Wine should build on FreeBSD 4.x and FreeBSD 5.x, but versions before - FreeBSD 5.3 will generally not work properly. + Wine should build on FreeBSD 5.x, but versions before FreeBSD 6.2 will + generally not work properly. More information can be found in the FreeBSD ports tree at <ftp://ftp.freebsd.org/pub/FreeBSD/ports/ports/emulators/wine/>.

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2007