wine-commits March 2008

wine-commits@winehq.org

4 participants
1001 discussions

Alexandre Julliard : qmgr: Avoid %ll printf formats.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 711275e2fc7e7ce6227bb17170a19a68c5850523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=711275e2fc7e7ce6227bb1717… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 26 18:00:37 2008 +0100 qmgr: Avoid %ll printf formats. --- dlls/qmgr/tests/file.c | 6 ++++-- dlls/qmgr/tests/job.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/qmgr/tests/file.c b/dlls/qmgr/tests/file.c index 05aec1c..033b2c5 100644 --- a/dlls/qmgr/tests/file.c +++ b/dlls/qmgr/tests/file.c @@ -158,8 +158,10 @@ static void test_GetProgress_PreTransfer(void) skip("Unable to get progress of test_file.\n"); return; } - ok(progress.BytesTotal == BG_SIZE_UNKNOWN, "Got incorrect total size: %llu\n", progress.BytesTotal); - ok(progress.BytesTransferred == 0, "Got incorrect number of transferred bytes: %llu\n", progress.BytesTransferred); + ok(progress.BytesTotal == BG_SIZE_UNKNOWN, "Got incorrect total size: %x%08x\n", + (DWORD)(progress.BytesTotal >> 32), (DWORD)progress.BytesTotal); + ok(progress.BytesTransferred == 0, "Got incorrect number of transferred bytes: %x%08x\n", + (DWORD)(progress.BytesTransferred >> 32), (DWORD)progress.BytesTransferred); ok(progress.Completed == FALSE, "Got incorret completion status\n"); } diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index e504b86..52d4e82 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -246,8 +246,10 @@ static void test_GetProgress_preTransfer(void) return; } - ok(progress.BytesTotal == 0, "Incorrect BytesTotal: %llu\n", progress.BytesTotal); - ok(progress.BytesTransferred == 0, "Incorrect BytesTransferred: %llu\n", progress.BytesTransferred); + ok(progress.BytesTotal == 0, "Incorrect BytesTotal: %x%08x\n", + (DWORD)(progress.BytesTotal >> 32), (DWORD)progress.BytesTotal); + ok(progress.BytesTransferred == 0, "Incorrect BytesTransferred: %x%08x\n", + (DWORD)(progress.BytesTransferred >> 32), (DWORD)progress.BytesTransferred); ok(progress.FilesTotal == 0, "Incorrect FilesTotal: %u\n", progress.FilesTotal); ok(progress.FilesTransferred == 0, "Incorrect FilesTransferred %u\n", progress.FilesTransferred); }

1 0

Alexandre Julliard : ntdll: Clear the process stack again after dll init and before calling the main entry point .
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 9b49cc289900fab134ba318c4e2859b7585817d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b49cc289900fab134ba318c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 26 17:08:57 2008 +0100 ntdll: Clear the process stack again after dll init and before calling the main entry point. --- dlls/ntdll/loader.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index f17c0c0..3b60d60 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2423,6 +2423,11 @@ void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, status = wine_call_on_stack( attach_process_dlls, wm, NtCurrentTeb()->Tib.StackBase ); if (status != STATUS_SUCCESS) goto error; + /* clear the stack contents before calling the main entry point, some broken apps need that */ + wine_anon_mmap( NtCurrentTeb()->Tib.StackLimit, + (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit, + PROT_READ | PROT_WRITE, MAP_FIXED ); + if (nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) VIRTUAL_UseLargeAddressSpace(); return;

1 0

Alexandre Julliard : kernel32: Moved the allocation of the process stack to ntdll.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 7a7ef6a64c5d69376c86303e7ce6bfc74ea48cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a7ef6a64c5d69376c86303e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 26 17:08:38 2008 +0100 kernel32: Moved the allocation of the process stack to ntdll. --- dlls/kernel32/process.c | 47 +------------------------- dlls/ntdll/loader.c | 82 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 71 insertions(+), 58 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 054fbc0..8d040bd 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -52,10 +52,6 @@ #include "wine/unicode.h" #include "wine/debug.h" -#ifdef HAVE_VALGRIND_MEMCHECK_H -#include <valgrind/memcheck.h> -#endif - WINE_DEFAULT_DEBUG_CHANNEL(process); WINE_DECLARE_DEBUG_CHANNEL(file); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -818,44 +814,6 @@ static HANDLE start_wineboot(void) /*********************************************************************** - * init_stack - * - * Allocate the stack of new process. - */ -static void *init_stack(void) -{ - void *base; - SIZE_T stack_size, page_size = getpagesize(); - IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); - - stack_size = max( nt->OptionalHeader.SizeOfStackReserve, nt->OptionalHeader.SizeOfStackCommit ); - stack_size += page_size; /* for the guard page */ - stack_size = (stack_size + 0xffff) & ~0xffff; /* round to 64K boundary */ - if (stack_size < 1024 * 1024) stack_size = 1024 * 1024; /* Xlib needs a large stack */ - - if (!(base = VirtualAlloc( NULL, stack_size, MEM_COMMIT, PAGE_READWRITE ))) - { - ERR( "failed to allocate main process stack\n" ); - ExitProcess( 1 ); - } - - /* note: limit is lower than base since the stack grows down */ - NtCurrentTeb()->DeallocationStack = base; - NtCurrentTeb()->Tib.StackBase = (char *)base + stack_size; - NtCurrentTeb()->Tib.StackLimit = (char *)base + page_size; - -#ifdef VALGRIND_STACK_REGISTER - /* no need to de-register the stack as it's the one of the main thread */ - VALGRIND_STACK_REGISTER(NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase); -#endif - - /* setup guard page */ - VirtualProtect( base, page_size, PAGE_NOACCESS, NULL ); - return NtCurrentTeb()->Tib.StackBase; -} - - -/*********************************************************************** * start_process * * Startup routine of a new process. Runs on the new process stack. @@ -868,8 +826,6 @@ static void start_process( void *arg ) IMAGE_NT_HEADERS *nt; LPTHREAD_START_ROUTINE entry; - LdrInitializeThunk( 0, 0, 0, 0 ); - nt = RtlImageNtHeader( peb->ImageBaseAddress ); entry = (LPTHREAD_START_ROUTINE)((char *)peb->ImageBaseAddress + nt->OptionalHeader.AddressOfEntryPoint); @@ -1000,8 +956,9 @@ void __wine_kernel_init(void) CloseHandle( boot_event ); } + LdrInitializeThunk( 0, 0, 0, 0 ); /* switch to the new stack */ - wine_switch_to_stack( start_process, NULL, init_stack() ); + wine_switch_to_stack( start_process, NULL, NtCurrentTeb()->Tib.StackBase ); error: ExitProcess( GetLastError() ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 811540b..f17c0c0 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -24,6 +24,12 @@ #include <assert.h> #include <stdarg.h> +#ifdef HAVE_SYS_MMAN_H +# include <sys/mman.h> +#endif +#ifdef HAVE_VALGRIND_MEMCHECK_H +# include <valgrind/memcheck.h> +#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -2313,6 +2319,65 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) } +/*********************************************************************** + * alloc_process_stack + * + * Allocate the stack of new process. + */ +static NTSTATUS alloc_process_stack( IMAGE_NT_HEADERS *nt ) +{ + NTSTATUS status; + void *base = NULL; + SIZE_T stack_size, page_size = getpagesize(); + + stack_size = max( nt->OptionalHeader.SizeOfStackReserve, nt->OptionalHeader.SizeOfStackCommit ); + stack_size += page_size; /* for the guard page */ + stack_size = (stack_size + 0xffff) & ~0xffff; /* round to 64K boundary */ + if (stack_size < 1024 * 1024) stack_size = 1024 * 1024; /* Xlib needs a large stack */ + + if ((status = NtAllocateVirtualMemory( GetCurrentProcess(), &base, 16, &stack_size, + MEM_COMMIT, PAGE_READWRITE ))) + return status; + + /* note: limit is lower than base since the stack grows down */ + NtCurrentTeb()->DeallocationStack = base; + NtCurrentTeb()->Tib.StackBase = (char *)base + stack_size; + NtCurrentTeb()->Tib.StackLimit = (char *)base + page_size; + +#ifdef VALGRIND_STACK_REGISTER + /* no need to de-register the stack as it's the one of the main thread */ + VALGRIND_STACK_REGISTER(NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase); +#endif + + /* setup guard page */ + NtProtectVirtualMemory( GetCurrentProcess(), &base, &page_size, PAGE_NOACCESS, NULL ); + return STATUS_SUCCESS; +} + + +/*********************************************************************** + * attach_process_dlls + * + * Initial attach to all the dlls loaded by the process. + */ +static NTSTATUS attach_process_dlls( void *wm ) +{ + NTSTATUS status; + + RtlEnterCriticalSection( &loader_section ); + if ((status = process_attach( wm, (LPVOID)1 )) != STATUS_SUCCESS) + { + if (last_failed_modref) + ERR( "%s failed to initialize, aborting\n", + debugstr_w(last_failed_modref->ldr.BaseDllName.Buffer) + 1 ); + return status; + } + attach_implicitly_loaded_dlls( (LPVOID)1 ); + RtlLeaveCriticalSection( &loader_section ); + return status; +} + + /****************************************************************** * LdrInitializeThunk (NTDLL.@) * @@ -2344,8 +2409,8 @@ void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList ); - status = server_init_process_done(); - if (status != STATUS_SUCCESS) goto error; + if ((status = alloc_process_stack( nt )) != STATUS_SUCCESS) goto error; + if ((status = server_init_process_done()) != STATUS_SUCCESS) goto error; actctx_init(); load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; @@ -2355,17 +2420,8 @@ void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, pthread_functions.sigprocmask( SIG_UNBLOCK, &server_block_set, NULL ); - RtlEnterCriticalSection( &loader_section ); - - if ((status = process_attach( wm, (LPVOID)1 )) != STATUS_SUCCESS) - { - if (last_failed_modref) - ERR( "%s failed to initialize, aborting\n", debugstr_w(last_failed_modref->ldr.BaseDllName.Buffer) + 1 ); - goto error; - } - attach_implicitly_loaded_dlls( (LPVOID)1 ); - - RtlLeaveCriticalSection( &loader_section ); + status = wine_call_on_stack( attach_process_dlls, wm, NtCurrentTeb()->Tib.StackBase ); + if (status != STATUS_SUCCESS) goto error; if (nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) VIRTUAL_UseLargeAddressSpace(); return;

1 0

Alexandre Julliard : libwine: Added a wine_call_on_stack function.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: c9f0bea910eb7d2a9ec9b395ef19c89e493e63cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f0bea910eb7d2a9ec9b395e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 26 15:38:00 2008 +0100 libwine: Added a wine_call_on_stack function. --- include/wine/library.h | 1 + libs/wine/port.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ libs/wine/wine.def | 3 +- libs/wine/wine.map | 1 + 4 files changed, 68 insertions(+), 1 deletions(-) diff --git a/include/wine/library.h b/include/wine/library.h index f00919e..2c3b7bb 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -66,6 +66,7 @@ extern void wine_init( int argc, char *argv[], char *error, int error_size ); /* portability */ extern void DECLSPEC_NORETURN wine_switch_to_stack( void (*func)(void *), void *arg, void *stack ); +extern int wine_call_on_stack( int (*func)(void *), void *arg, void *stack ); extern void wine_set_pe_load_area( void *base, size_t size ); extern void wine_free_pe_load_area(void); diff --git a/libs/wine/port.c b/libs/wine/port.c index 838c3ff..e2f7b0c 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -116,5 +116,69 @@ __ASM_GLOBAL_FUNC( wine_switch_to_stack, "callq *%rax\n\t" /* call func */ "int $3") #else +void DECLSPEC_NORETURN wine_switch_to_stack( void (*func)(void *), void *arg, void *stack ) +{ + wine_call_on_stack( (int (*)(void *))func, arg, stack ); + abort(); +} +#endif + + +/*********************************************************************** + * wine_call_on_stack + * + * Switch to the specified stack to call the function and return. + */ +int wine_call_on_stack( int (*func)(void *), void *arg, void *stack ); +#if defined(__i386__) && defined(__GNUC__) +__ASM_GLOBAL_FUNC( wine_call_on_stack, + "pushl %ebp\n\t" + "pushl %esi\n\t" + "movl 12(%esp),%ecx\n\t" /* func */ + "movl 16(%esp),%edx\n\t" /* arg */ + "movl 20(%esp),%esi\n\t" /* stack */ + "andl $~15,%esi\n\t" + "subl $12,%esi\n\t" + "xchgl %esi,%esp\n\t" + "pushl %edx\n\t" + "xorl %ebp,%ebp\n\t" + "call *%ecx\n\t" + "movl %esi,%esp\n\t" + "popl %esi\n\t" + "popl %ebp\n\t" + "ret" ) +#elif defined(__i386__) && defined(_MSC_VER) +__declspec(naked) int wine_call_on_stack( int (*func)(void *), void *arg, void *stack ) +{ + __asm push ebp; + __asm push esi; + __asm mov ecx, 12[esp]; + __asm mov edx, 16[esp]; + __asm mov esi, 20[esp]; + __asm xchg esp, esi; + __asm push edx; + __asm xor ebp, ebp; + __asm call [ecx]; + __asm mov esp, esi; + __asm pop esi; + __asm pop ebp + __asm ret; +} +#elif defined(__x86_64__) && defined(__GNUC__) +__ASM_GLOBAL_FUNC( wine_call_on_stack, + "pushq %rbp\n\t" + "pushq %rbx\n\t" + "movq %rsp,%rbx\n\t" + "movq %rdi,%rax\n\t" /* func */ + "movq %rsi,%rdi\n\t" /* arg */ + "andq $~15,%rdx\n\t" /* stack */ + "movq %rdx,%rsp\n\t" + "xorq %rbp,%rbp\n\t" + "callq *%rax\n\t" /* call func */ + "movq %rbx,%rsp\n\t" + "popq %rbx\n\t" + "popq %rbp\n\t" + "ret") +#else #error You must implement wine_switch_to_stack for your platform #endif diff --git a/libs/wine/wine.def b/libs/wine/wine.def index 462a619..6304113 100644 --- a/libs/wine/wine.def +++ b/libs/wine/wine.def @@ -50,6 +50,7 @@ EXPORTS vsnprintfW vsprintfW wine_anon_mmap + wine_call_on_stack wine_casemap_lower wine_casemap_upper wine_compare_string @@ -65,7 +66,7 @@ EXPORTS wine_dbgstr_an wine_dbgstr_wn wine_dlclose - wine_dll_enum_load_path; + wine_dll_enum_load_path wine_dll_get_owner wine_dll_load wine_dll_load_main_exe diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 47e58ce..ef8d823 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -50,6 +50,7 @@ WINE_1.0 vsnprintfW; vsprintfW; wine_anon_mmap; + wine_call_on_stack; wine_casemap_lower; wine_casemap_upper; wine_compare_string;

1 0

Jeremy Newman : adding news post about CrossOver Games
by Jeremy Newman 26 Mar '08

26 Mar '08

Module: website Branch: master Commit: 643bd9e0db27aefe49c84b9906237bb4e6f15e4b URL: http://source.winehq.org/git/website.git/?a=commit;h=643bd9e0db27aefe49c84b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Mar 26 17:23:04 2008 -0500 adding news post about CrossOver Games --- news/2008032601.xml | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/news/2008032601.xml b/news/2008032601.xml new file mode 100644 index 0000000..845c6bd --- /dev/null +++ b/news/2008032601.xml @@ -0,0 +1,9 @@ +<news> + <date>March 26, 2008</date> + <title>CodeWeavers Releases CrossOver Games for Mac and Linux</title> + <body> + <a href="http://www.codeweavers.com/products/cxgames/"><img src="http://www.codeweavers.com/images/products/cxlogo_games.png" /></a> + <a href="http://www.codeweavers.com/">CodeWeavers</a> has released a new product for Mac OS X and Linux dedicated to running Windows games. Out of the box CrossOver Games supports such popular Windows games as Team Fortress 2, CounterStrike: Source, Eve Online, Guild Wards, World of Warcraft, <a href="http://www.codeweavers.com/compatibility/browse/group/?app_parent=4100;">and more</a>. A trial version is available for <a href="http://www.codeweavers.com/products/cxgames/download_trial/">download</a>. + CodeWeavers proudly <a href="http://www.codeweavers.com/products/support_wine/">supports</a> the Wine project. + </body> +</news>

1 0

Alexandre Julliard : server: impersonation_level should be an int since we store -1 in it.
by Alexandre Julliard 26 Mar '08

26 Mar '08

Module: wine Branch: master Commit: f6d871eecf772ef5fb0a6f4e521cf15bfcb0555b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6d871eecf772ef5fb0a6f4e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 26 14:38:49 2008 +0100 server: impersonation_level should be an int since we store -1 in it. Make sure we don't check the impersonation level for primary tokens. --- server/security.h | 2 +- server/token.c | 25 ++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/server/security.h b/server/security.h index ebdf95f..39b1d2f 100644 --- a/server/security.h +++ b/server/security.h @@ -48,7 +48,7 @@ extern const PSID security_local_system_sid; extern struct token *token_create_admin(void); extern struct token *token_duplicate( struct token *src_token, unsigned primary, - SECURITY_IMPERSONATION_LEVEL impersonation_level ); + int impersonation_level ); extern int token_check_privileges( struct token *token, int all_required, const LUID_AND_ATTRIBUTES *reqprivs, unsigned int count, LUID_AND_ATTRIBUTES *usedprivs); diff --git a/server/token.c b/server/token.c index 72b3e29..7352ec2 100644 --- a/server/token.c +++ b/server/token.c @@ -90,7 +90,7 @@ struct token unsigned primary; /* is this a primary or impersonation token? */ ACL *default_dacl; /* the default DACL to assign to objects created by this user */ TOKEN_SOURCE source; /* source of the token */ - SECURITY_IMPERSONATION_LEVEL impersonation_level; /* impersonation level this token is capable of if non-primary token */ + int impersonation_level; /* impersonation level this token is capable of if non-primary token */ }; struct privilege @@ -421,7 +421,7 @@ static struct token *create_token( unsigned primary, const SID *user, const LUID_AND_ATTRIBUTES *privs, unsigned int priv_count, const ACL *default_dacl, TOKEN_SOURCE source, const luid_t *modified_id, - SECURITY_IMPERSONATION_LEVEL impersonation_level ) + int impersonation_level ) { struct token *token = alloc_object( &token_ops ); if (token) @@ -506,7 +506,7 @@ static struct token *create_token( unsigned primary, const SID *user, } struct token *token_duplicate( struct token *src_token, unsigned primary, - SECURITY_IMPERSONATION_LEVEL impersonation_level ) + int impersonation_level ) { const luid_t *modified_id = primary || (impersonation_level == src_token->impersonation_level) ? @@ -515,20 +515,19 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, struct privilege *privilege; struct group *group; - if ((impersonation_level < SecurityAnonymous) || - (impersonation_level > SecurityDelegation)) + if (!primary && + (impersonation_level < SecurityAnonymous || + impersonation_level > SecurityDelegation || + (!src_token->primary && (impersonation_level > src_token->impersonation_level)))) { set_error( STATUS_BAD_IMPERSONATION_LEVEL ); return NULL; } - if (primary || (impersonation_level <= src_token->impersonation_level)) - token = create_token( primary, src_token->user, NULL, 0, - NULL, 0, src_token->default_dacl, - src_token->source, modified_id, - impersonation_level ); - else set_error( STATUS_BAD_IMPERSONATION_LEVEL ); - + token = create_token( primary, src_token->user, NULL, 0, + NULL, 0, src_token->default_dacl, + src_token->source, modified_id, + impersonation_level ); if (!token) return token; /* copy groups */ @@ -1013,7 +1012,7 @@ DECL_HANDLER(open_token) { if (thread->token) { - if (thread->token->impersonation_level <= SecurityAnonymous) + if (!thread->token->primary && thread->token->impersonation_level <= SecurityAnonymous) set_error( STATUS_CANT_OPEN_ANONYMOUS ); else reply->token = alloc_handle( current->process, thread->token,

1 0

Stefan Leichter : advapi32: Partly implemented QueryServiceConfig2A/W.
by Alexandre Julliard 26 Mar '08

26 Mar '08

Module: wine Branch: master Commit: 6cb602c6db8534611da62465d2b595b9391c229e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cb602c6db8534611da62465d… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Mar 21 09:49:57 2008 +0100 advapi32: Partly implemented QueryServiceConfig2A/W. --- dlls/advapi32/advapi32.spec | 4 +- dlls/advapi32/service.c | 115 +++++++++++++++++++++++++++++++++++++++++ dlls/advapi32/tests/service.c | 7 +++ include/winsvc.h | 13 ++++- 4 files changed, 135 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index d066f5c..e9a3ccc 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -448,8 +448,8 @@ # @ stub QueryAllTracesA # @ stub QueryAllTracesW # @ stub QueryRecoveryAgentsOnEncryptedFile -# @ stub QueryServiceConfig2A -# @ stub QueryServiceConfig2W +@ stdcall QueryServiceConfig2A(long long ptr long ptr) +@ stdcall QueryServiceConfig2W(long long ptr long ptr) @ stdcall QueryServiceConfigA(long ptr long ptr) @ stdcall QueryServiceConfigW(long ptr long ptr) @ stdcall QueryServiceLockStatusA(long ptr long ptr) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index ae565ab..007d2b0 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2053,6 +2053,121 @@ QueryServiceConfigW( SC_HANDLE hService, } /****************************************************************************** + * QueryServiceConfig2A [ADVAPI32.@] + * + * Note + * observed unter win2k: + * The functions QueryServiceConfig2A and QueryServiceConfig2W return the same + * required buffer size (in byte) at least for dwLevel SERVICE_CONFIG_DESCRIPTION + */ +BOOL WINAPI QueryServiceConfig2A(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffer, + DWORD size, LPDWORD needed) +{ + BOOL ret; + LPBYTE bufferW = NULL; + + if(buffer && size) + bufferW = HeapAlloc( GetProcessHeap(), 0, size); + + ret = QueryServiceConfig2W(hService, dwLevel, bufferW, size, needed); + if(!ret) goto cleanup; + + switch(dwLevel) { + case SERVICE_CONFIG_DESCRIPTION: + { LPSERVICE_DESCRIPTIONA configA = (LPSERVICE_DESCRIPTIONA) buffer; + LPSERVICE_DESCRIPTIONW configW = (LPSERVICE_DESCRIPTIONW) bufferW; + if (configW->lpDescription) { + DWORD sz; + configA->lpDescription = (LPSTR)(configA + 1); + sz = WideCharToMultiByte( CP_ACP, 0, configW->lpDescription, -1, + configA->lpDescription, size - sizeof(SERVICE_DESCRIPTIONA), NULL, NULL ); + if (!sz) { + FIXME("WideCharToMultiByte failed for configW->lpDescription\n"); + ret = FALSE; + configA->lpDescription = NULL; + } + } + else configA->lpDescription = NULL; + } + break; + default: + FIXME("conversation W->A not implemented for level %d\n", dwLevel); + ret = FALSE; + } + +cleanup: + HeapFree( GetProcessHeap(), 0, bufferW); + return ret; +} + +/****************************************************************************** + * QueryServiceConfig2W [ADVAPI32.@] + */ +BOOL WINAPI QueryServiceConfig2W(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffer, + DWORD size, LPDWORD needed) +{ + DWORD sz, type; + HKEY hKey; + LONG r; + struct sc_service *hsvc; + + if(dwLevel != SERVICE_CONFIG_DESCRIPTION) { + if((dwLevel == SERVICE_CONFIG_DELAYED_AUTO_START_INFO) || + (dwLevel == SERVICE_CONFIG_FAILURE_ACTIONS) || + (dwLevel == SERVICE_CONFIG_FAILURE_ACTIONS_FLAG) || + (dwLevel == SERVICE_CONFIG_PRESHUTDOWN_INFO) || + (dwLevel == SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO) || + (dwLevel == SERVICE_CONFIG_SERVICE_SID_INFO)) + FIXME("Level %d not implemented\n", dwLevel); + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } + if(!needed || (!buffer && size)) { + SetLastError(ERROR_INVALID_ADDRESS); + return FALSE; + } + + TRACE("%p 0x%d %p 0x%d %p\n", hService, dwLevel, buffer, size, needed); + + hsvc = sc_handle_get_handle_data(hService, SC_HTYPE_SERVICE); + if (!hsvc) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + hKey = hsvc->hkey; + + switch(dwLevel) { + case SERVICE_CONFIG_DESCRIPTION: { + static const WCHAR szDescription[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; + LPSERVICE_DESCRIPTIONW config = (LPSERVICE_DESCRIPTIONW) buffer; + LPBYTE strbuf = NULL; + *needed = sizeof (SERVICE_DESCRIPTIONW); + sz = size - *needed; + if(config && (*needed <= size)) + strbuf = (LPBYTE) (config + 1); + r = RegQueryValueExW( hKey, szDescription, 0, &type, strbuf, &sz ); + if((r == ERROR_SUCCESS) && ( type != REG_SZ)) { + FIXME("SERVICE_CONFIG_DESCRIPTION: don't know how to handle type %d\n", type); + return FALSE; + } + *needed += sz; + if(config) { + if(r == ERROR_SUCCESS) + config->lpDescription = (LPWSTR) (config + 1); + else + config->lpDescription = NULL; + } + } + break; + } + if(*needed > size) + SetLastError(ERROR_INSUFFICIENT_BUFFER); + + return (*needed <= size); +} + +/****************************************************************************** * EnumServicesStatusA [ADVAPI32.@] */ BOOL WINAPI diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 8c71715..9b4eb72 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -947,6 +947,13 @@ static void test_queryconfig2(void) ok(ERROR_INVALID_ADDRESS == GetLastError(), "expected error ERROR_INVALID_ADDRESS, got %d\n", GetLastError()); needed = 0; + SetLastError(0xdeadbeef); + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer,sizeof(SERVICE_DESCRIPTIONA)-1,&needed); + ok(!ret, "expected QueryServiceConfig2A to fail\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(needed == sizeof(SERVICE_DESCRIPTIONA), "got %d\n", needed); + + needed = 0; pConfig->lpDescription = (LPSTR)0xdeadbeef; ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer,sizeof(SERVICE_DESCRIPTIONA),&needed); ok(ret, "expected QueryServiceConfig2A to succeed\n"); diff --git a/include/winsvc.h b/include/winsvc.h index fb77789..1031f0c 100644 --- a/include/winsvc.h +++ b/include/winsvc.h @@ -243,8 +243,14 @@ typedef struct _QUERY_SERVICE_CONFIGW { } QUERY_SERVICE_CONFIGW, *LPQUERY_SERVICE_CONFIGW; /* defines and structures for ChangeServiceConfig2 */ -#define SERVICE_CONFIG_DESCRIPTION 1 -#define SERVICE_CONFIG_FAILURE_ACTIONS 2 +#define SERVICE_CONFIG_DESCRIPTION 1 +#define SERVICE_CONFIG_FAILURE_ACTIONS 2 +#define SERVICE_CONFIG_DELAYED_AUTO_START_INFO 3 +#define SERVICE_CONFIG_FAILURE_ACTIONS_FLAG 4 +#define SERVICE_CONFIG_SERVICE_SID_INFO 5 +#define SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO 6 +#define SERVICE_CONFIG_PRESHUTDOWN_INFO 7 + typedef struct _SERVICE_DESCRIPTIONA { LPSTR lpDescription; @@ -351,6 +357,9 @@ WINADVAPI BOOL WINAPI QueryServiceStatusEx(SC_HANDLE,SC_STATUS_TYPE,LPBYT WINADVAPI BOOL WINAPI QueryServiceConfigA(SC_HANDLE,LPQUERY_SERVICE_CONFIGA,DWORD,LPDWORD); WINADVAPI BOOL WINAPI QueryServiceConfigW(SC_HANDLE,LPQUERY_SERVICE_CONFIGW,DWORD,LPDWORD); #define QueryServiceConfig WINELIB_NAME_AW(QueryServiceConfig) +WINADVAPI BOOL WINAPI QueryServiceConfig2A(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); +WINADVAPI BOOL WINAPI QueryServiceConfig2W(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); +#define QueryServiceConfig2 WINELIB_NAME_AW(QueryServiceConfig2) WINADVAPI BOOL WINAPI QueryServiceLockStatusA(SC_HANDLE,LPQUERY_SERVICE_LOCK_STATUSA,DWORD,LPDWORD); WINADVAPI BOOL WINAPI QueryServiceLockStatusW(SC_HANDLE,LPQUERY_SERVICE_LOCK_STATUSW,DWORD,LPDWORD); #define QueryServiceLockStatus WINELIB_NAME_AW(QueryServiceLockStatus)

1 0

Paul Vriens : setupapi: Forward SetupInstallServicesFromInfSectionA to W-function.
by Alexandre Julliard 26 Mar '08

26 Mar '08

Module: wine Branch: master Commit: f14eecded81cb576d2242e7405d338bcf88e8701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f14eecded81cb576d2242e740… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Mar 26 13:17:31 2008 +0100 setupapi: Forward SetupInstallServicesFromInfSectionA to W-function. --- dlls/setupapi/install.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index ad44640..3c55347 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1080,6 +1080,16 @@ BOOL WINAPI SetupInstallServicesFromInfSectionW( HINF Inf, PCWSTR SectionName, D */ BOOL WINAPI SetupInstallServicesFromInfSectionA( HINF Inf, PCSTR SectionName, DWORD Flags) { - FIXME("(%p, %s, %d) stub!\n", Inf, debugstr_a(SectionName), Flags); - return FALSE; + UNICODE_STRING SectionNameW; + BOOL ret = FALSE; + + if (RtlCreateUnicodeStringFromAsciiz( &SectionNameW, SectionName )) + { + ret = SetupInstallServicesFromInfSectionW( Inf, SectionNameW.Buffer, Flags ); + RtlFreeUnicodeString( &SectionNameW ); + } + else + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + + return ret; }

1 0

Hans Leidekker : wininet: Implement chunked reads.
by Alexandre Julliard 26 Mar '08

26 Mar '08

Module: wine Branch: master Commit: 0936601f5b2628c1e0dab4b8bd3c9d097ba14717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0936601f5b2628c1e0dab4b8b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Mar 26 11:31:21 2008 +0100 wininet: Implement chunked reads. --- dlls/wininet/http.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 98 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 2d16924..3bb8a76 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -107,7 +107,7 @@ struct HttpAuthInfo }; static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr); -static BOOL HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr); +static BOOL HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear); static BOOL HTTP_ProcessHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field, LPCWSTR value, DWORD dwModifier); static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer); static BOOL HTTP_InsertCustomHeader(LPWININETHTTPREQW lpwhr, LPHTTPHEADERW lpHdr); @@ -846,7 +846,7 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - responseLen = HTTP_GetResponseHeaders(lpwhr); + responseLen = HTTP_GetResponseHeaders(lpwhr, TRUE); if (responseLen) rc = TRUE; @@ -1573,8 +1573,7 @@ static DWORD HTTPREQ_Read(WININETHTTPREQW *req, void *buffer, DWORD size, DWORD if(req->dwContentLength != -1 && req->dwContentRead != req->dwContentLength) ERR("not all data received %d/%d\n", req->dwContentRead, req->dwContentLength); - /* always returns TRUE, even if the network layer returns an - * error */ + /* always return success, even if the network layer returns an error */ *read = 0; HTTP_FinishedReading(req); return ERROR_SUCCESS; @@ -1597,11 +1596,101 @@ static DWORD HTTPREQ_Read(WININETHTTPREQW *req, void *buffer, DWORD size, DWORD return ERROR_SUCCESS; } +static DWORD get_chunk_size(const char *buffer) +{ + const char *p; + DWORD size = 0; + + for (p = buffer; *p; p++) + { + if (*p >= '0' && *p <= '9') size = size * 16 + *p - '0'; + else if (*p >= 'a' && *p <= 'f') size = size * 16 + *p - 'a' + 10; + else if (*p >= 'A' && *p <= 'F') size = size * 16 + *p - 'A' + 10; + else if (*p == ';') break; + } + return size; +} + +static DWORD HTTPREQ_ReadChunked(WININETHTTPREQW *req, void *buffer, DWORD size, DWORD *read, BOOL sync) +{ + char reply[MAX_REPLY_LEN], *p = buffer; + DWORD buflen, to_write = size; + size_t to_read; + int bytes_read; + + *read = 0; + for (;;) + { + if (*read == size) break; + + if (req->dwContentLength == ~0UL) /* new chunk */ + { + buflen = sizeof(reply); + if (!NETCON_getNextLine(&req->netConnection, reply, &buflen)) break; + + if (!(req->dwContentLength = get_chunk_size(reply))) + { + /* zero sized chunk marks end of transfer; read any trailing headers and return */ + HTTP_GetResponseHeaders(req, FALSE); + break; + } + } + to_read = min(to_write, req->dwContentLength - req->dwContentRead); + + if (!NETCON_recv(&req->netConnection, p, to_read, sync ? MSG_WAITALL : 0, &bytes_read)) + { + if (bytes_read != to_read) + ERR("Not all data received %d/%d\n", bytes_read, to_read); + + /* always return success, even if the network layer returns an error */ + *read = 0; + break; + } + if (!bytes_read) break; + + req->dwContentRead += bytes_read; + to_write -= bytes_read; + *read += bytes_read; + + if (req->lpszCacheFile) + { + if (!WriteFile(req->hCacheFile, p, bytes_read, NULL, NULL)) + WARN("WriteFile failed: %u\n", GetLastError()); + } + p += bytes_read; + + if (req->dwContentRead == req->dwContentLength) /* chunk complete */ + { + req->dwContentRead = 0; + req->dwContentLength = ~0UL; + + buflen = sizeof(reply); + if (!NETCON_getNextLine(&req->netConnection, reply, &buflen)) + { + ERR("Malformed chunk\n"); + *read = 0; + break; + } + } + } + if (!*read) HTTP_FinishedReading(req); + return ERROR_SUCCESS; +} + static DWORD HTTPREQ_ReadFile(WININETHANDLEHEADER *hdr, void *buffer, DWORD size, DWORD *read) { WININETHTTPREQW *req = (WININETHTTPREQW*)hdr; + static WCHAR encoding[20]; + DWORD buflen = sizeof(encoding); + static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0}; - return HTTPREQ_Read(req, buffer, size, read, TRUE); + if (HTTP_HttpQueryInfoW(req, HTTP_QUERY_TRANSFER_ENCODING, encoding, &buflen, NULL) && + !strcmpiW(encoding, szChunked)) + { + return HTTPREQ_ReadChunked(req, buffer, size, read, TRUE); + } + else + return HTTPREQ_Read(req, buffer, size, read, TRUE); } static void HTTPREQ_AsyncReadFileExProc(WORKREQUEST *workRequest) @@ -3002,7 +3091,7 @@ static BOOL HTTP_SecureProxyConnect(LPWININETHTTPREQW lpwhr) if (!ret || cnt < 0) return FALSE; - responseLen = HTTP_GetResponseHeaders( lpwhr ); + responseLen = HTTP_GetResponseHeaders( lpwhr, TRUE ); if (!responseLen) return FALSE; @@ -3128,7 +3217,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, if (cnt < 0) goto lend; - responseLen = HTTP_GetResponseHeaders(lpwhr); + responseLen = HTTP_GetResponseHeaders(lpwhr, TRUE); if (responseLen) bSuccess = TRUE; @@ -3523,7 +3612,7 @@ static void HTTP_clear_response_headers( LPWININETHTTPREQW lpwhr ) * TRUE on success * FALSE on error */ -static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr) +static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear) { INT cbreaks = 0; WCHAR buffer[MAX_REPLY_LEN]; @@ -3541,7 +3630,7 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr) TRACE("-->\n"); /* clear old response headers (eg. from a redirect response) */ - HTTP_clear_response_headers( lpwhr ); + if (clear) HTTP_clear_response_headers( lpwhr ); if (!NETCON_connected(&lpwhr->netConnection)) goto lend;

1 0

Aric Stewart : imm: Implement ImmGetIMEFileNameW and ImmGetIMEFileNameA.
by Alexandre Julliard 26 Mar '08

26 Mar '08

Module: wine Branch: master Commit: 5035a85533ff374ff801596f3e159087164612ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=5035a85533ff374ff801596f3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 25 07:07:11 2008 -0500 imm: Implement ImmGetIMEFileNameW and ImmGetIMEFileNameA. --- dlls/imm32/Makefile.in | 2 +- dlls/imm32/imm.c | 81 ++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 72 insertions(+), 11 deletions(-) diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in index 4118422..909f29b 100644 --- a/dlls/imm32/Makefile.in +++ b/dlls/imm32/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = imm32.dll IMPORTLIB = imm32 -IMPORTS = user32 gdi32 kernel32 +IMPORTS = user32 gdi32 advapi32 kernel32 C_SRCS = \ imm.c diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index de217d1..89f7c47 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -30,6 +30,7 @@ #include "imm.h" #include "ddk/imm.h" #include "winnls.h" +#include "winreg.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); @@ -1178,23 +1179,83 @@ DWORD WINAPI ImmGetGuideLineW(HIMC hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD dwBu /*********************************************************************** * ImmGetIMEFileNameA (IMM32.@) */ -UINT WINAPI ImmGetIMEFileNameA( - HKL hKL, LPSTR lpszFileName, UINT uBufLen) +UINT WINAPI ImmGetIMEFileNameA( HKL hKL, LPSTR lpszFileName, UINT uBufLen) { - FIXME("(%p, %p, %d): stub\n", hKL, lpszFileName, uBufLen); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + LPWSTR bufW = NULL; + UINT wBufLen = uBufLen; + UINT rc; + + if (uBufLen && lpszFileName) + bufW = HeapAlloc(GetProcessHeap(),0,uBufLen * sizeof(WCHAR)); + else /* We need this to get the number of byte required */ + { + bufW = HeapAlloc(GetProcessHeap(),0,MAX_PATH * sizeof(WCHAR)); + wBufLen = MAX_PATH; + } + + rc = ImmGetIMEFileNameW(hKL,bufW,wBufLen); + + if (rc > 0) + { + if (uBufLen && lpszFileName) + rc = WideCharToMultiByte(CP_ACP, 0, bufW, -1, lpszFileName, + uBufLen, NULL, NULL); + else /* get the length */ + rc = WideCharToMultiByte(CP_ACP, 0, bufW, -1, NULL, 0, NULL, + NULL); + } + + HeapFree(GetProcessHeap(),0,bufW); + return rc; } /*********************************************************************** * ImmGetIMEFileNameW (IMM32.@) */ -UINT WINAPI ImmGetIMEFileNameW( - HKL hKL, LPWSTR lpszFileName, UINT uBufLen) +UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) { - FIXME("(%p, %p, %d): stub\n", hKL, lpszFileName, uBufLen); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + static const WCHAR szImeFileW[] = {'I','m','e',' ','F','i','l','e',0}; + static const WCHAR fmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','x',0}; + + HKEY hkey; + DWORD length; + DWORD rc; + WCHAR regKey[sizeof(fmt)/sizeof(WCHAR)+8]; + + wsprintfW( regKey, fmt, (unsigned)hKL ); + rc = RegOpenKeyW( HKEY_LOCAL_MACHINE, regKey, &hkey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + return 0; + } + + length = 0; + rc = RegGetValueW(hkey, NULL, szImeFileW, RRF_RT_REG_SZ, NULL, NULL, &length); + + if (rc != ERROR_SUCCESS) + { + RegCloseKey(hkey); + SetLastError(rc); + return 0; + } + if (length > uBufLen * sizeof(WCHAR) || !lpszFileName) + { + RegCloseKey(hkey); + if (lpszFileName) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + else + return length / sizeof(WCHAR); + } + + RegGetValueW(hkey, NULL, szImeFileW, RRF_RT_REG_SZ, NULL, lpszFileName, &length); + + RegCloseKey(hkey); + + return length / sizeof(WCHAR); } /***********************************************************************

1 0

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 March 2008