March 2006 - Wine-commits - list.winehq.org

Alexandre Julliard : gdi: In metafile test only print debug output if enabled.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: eb7ef83357a4acdcaf4ff39148cfcf8d59dbcc29 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eb7ef83357a4acdcaf4ff39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 21:03:41 2006 +0200 gdi: In metafile test only print debug output if enabled. --- dlls/gdi/tests/metafile.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/tests/metafile.c b/dlls/gdi/tests/metafile.c index b20fb30..eb10a07 100644 --- a/dlls/gdi/tests/metafile.c +++ b/dlls/gdi/tests/metafile.c @@ -612,6 +612,8 @@ static void dump_mf_bits (const HMETAFIL BYTE buf[MF_BUFSIZE]; UINT mfsize, i; + if (!winetest_debug) return; + mfsize = GetMetaFileBitsEx (mf, MF_BUFSIZE, buf); ok (mfsize > 0, "%s: GetMetaFileBitsEx failed.\n", desc); @@ -710,6 +712,8 @@ static void dump_emf_bits(const HENHMETA BYTE buf[MF_BUFSIZE]; UINT mfsize, i; + if (!winetest_debug) return; + mfsize = GetEnhMetaFileBits(mf, MF_BUFSIZE, buf); ok (mfsize > 0, "%s: GetEnhMetaFileBits failed\n", desc); @@ -733,6 +737,8 @@ static void dump_emf_records(const HENHM BYTE buf[MF_BUFSIZE]; UINT mfsize, offset; + if (!winetest_debug) return; + mfsize = GetEnhMetaFileBits(mf, MF_BUFSIZE, buf); ok (mfsize > 0, "%s: GetEnhMetaFileBits error %ld\n", desc, GetLastError());

1 0

Alexandre Julliard : loader: Hide the preloader from the ps output.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: c20d6c409569a916231d14acd8a5a104cfedf74b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c20d6c409569a916231d14a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 19:16:22 2006 +0200 loader: Hide the preloader from the ps output. --- loader/preloader.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 1ca6d83..9480ca9 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -287,6 +287,14 @@ static inline gid_t wld_getegid(void) return ret; } +static inline int wld_prctl( int code, int arg ) +{ + int ret; + __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" + : "=a" (ret) : "0" (SYS_prctl), "r" (code), "c" (arg) ); + return SYSCALL_RET(ret); +} + /* replacement for libc functions */ @@ -871,6 +879,26 @@ static int is_in_preload_range( const El return 0; } +/* set the process name if supported */ +static void set_process_name( int argc, char *argv[] ) +{ + unsigned int i, off; + char *p, *name, *end; + + /* set the process short name */ + for (p = name = argv[1]; *p; p++) if (p[0] == '/' && p[1]) name = p + 1; + if (wld_prctl( 15 /* PR_SET_NAME */, (int)name ) == -1) return; + + /* find the end of the argv array and move everything down */ + end = argv[argc - 1]; + while (*end) end++; + off = argv[1] - argv[0]; + for (p = argv[1]; p <= end; p++) *(p - off) = *p; + wld_memset( end - off, 0, off ); + for (i = 1; i < argc; i++) argv[i] -= off; +} + + /* * wld_start * @@ -956,6 +984,7 @@ void* wld_start( void **stack ) delete_av[i].a_type = AT_NULL; /* get rid of first argument */ + set_process_name( *pargc, argv ); pargc[1] = pargc[0] - 1; *stack = pargc + 1;

1 0

Alexandre Julliard : winewrapper: Remove a couple of variables that are no longer needed.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: bf463abfecb804eb5755f64b43d7c277b9aff03b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bf463abfecb804eb5755f64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 17:39:37 2006 +0200 winewrapper: Remove a couple of variables that are no longer needed. --- tools/winewrapper | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/tools/winewrapper b/tools/winewrapper index 7c49b38..92073d6 100755 --- a/tools/winewrapper +++ b/tools/winewrapper @@ -81,15 +81,8 @@ else export LD_LIBRARY_PATH fi -if [ -n "$WINEDLLPATH" ] -then - WINEDLLPATH="$topdir/dlls:$topdir/programs:$WINEDLLPATH" -else - WINEDLLPATH="$topdir/dlls:$topdir/programs" -fi -WINESERVER="$topdir/server/wineserver" WINELOADER="$topdir/loader/wine" -export WINEDLLPATH WINESERVER WINELOADER +export WINELOADER # any local settings ? if [ -f "$topdir/.winewrapper" ]

1 0

Alexandre Julliard : ntdll: Get rid of the loadorder wildcard support, builtin is always the default now.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: e17df7ae7f5d1b6bd346a4b6ec3e8150e01a781b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e17df7ae7f5d1b6bd346a4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 17:39:21 2006 +0200 ntdll: Get rid of the loadorder wildcard support, builtin is always the default now. --- dlls/ntdll/loadorder.c | 56 ------------------------------------------------ 1 files changed, 0 insertions(+), 56 deletions(-) diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index ac4dcb8..833c53c 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -51,28 +51,6 @@ struct loadorder_list module_loadorder_t *order; }; -/* dll to load as builtins if not explicitly specified otherwise */ -/* the list must remain sorted by dll name */ -static const WCHAR default_builtins[][10] = -{ - { 'g','d','i','3','2',0 }, - { 'i','c','m','p',0 }, - { 'k','e','r','n','e','l','3','2',0 }, - { 'n','t','d','l','l',0 }, - { 'o','d','b','c','3','2',0 }, - { 't','t','y','d','r','v',0 }, - { 'u','s','e','r','3','2',0 }, - { 'w','3','2','s','k','r','n','l',0 }, - { 'w','i','n','e','d','o','s',0 }, - { 'w','i','n','e','p','s',0 }, - { 'w','i','n','m','m',0 }, - { 'w','n','a','s','p','i','3','2',0 }, - { 'w','o','w','3','2',0 }, - { 'w','s','2','_','3','2',0 }, - { 'w','s','o','c','k','3','2',0 }, - { 'x','1','1','d','r','v',0 } -}; - static const WCHAR separatorsW[] = {',',' ','\t',0}; static int init_done; @@ -92,15 +70,6 @@ static int cmp_sort_func(const void *s1, /*************************************************************************** - * strcmp_func - */ -static int strcmp_func(const void *s1, const void *s2) -{ - return strcmpiW( (const WCHAR *)s1, (const WCHAR *)s2 ); -} - - -/*************************************************************************** * get_basename * * Return the base name of a file name (i.e. remove the path components). @@ -321,21 +290,6 @@ static inline enum loadorder get_env_loa /*************************************************************************** - * get_default_load_order - * - * Get the load order for a given module from the default list. - */ -static inline enum loadorder get_default_load_order( const WCHAR *module ) -{ - const int count = sizeof(default_builtins) / sizeof(default_builtins[0]); - if (!bsearch( module, default_builtins, count, sizeof(default_builtins[0]), strcmp_func )) - return FALSE; - TRACE( "got compiled-in builtin default for %s\n", debugstr_w(module) ); - return LO_BUILTIN; -} - - -/*************************************************************************** * get_standard_key * * Return a handle to the standard DllOverrides registry section. @@ -478,8 +432,6 @@ static enum loadorder get_load_order_val */ enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) { - static const WCHAR wildcardW[] = {'*',0}; - enum loadorder ret = LO_INVALID; HANDLE std_key, app_key = 0; WCHAR *module, *basename; @@ -522,14 +474,6 @@ enum loadorder get_load_order( const WCH if (basename != module+1 && ((ret = get_load_order_value( std_key, app_key, basename )) != LO_INVALID)) goto done; - /* then compiled-in defaults */ - if ((ret = get_default_load_order( basename )) != LO_INVALID) - goto done; - - /* then wildcard entry (only if no explicit path) */ - if (basename == module+1 && ((ret = get_load_order_value( std_key, app_key, wildcardW )) != LO_INVALID)) - goto done; - /* and last the hard-coded default */ ret = LO_DEFAULT; TRACE( "got hardcoded default %s for %s\n", debugstr_loadorder(ret), debugstr_w(path) );

1 0

Detlef Riekenberg : kernel: Fix handling of invalid parameter in GlobalSize ().
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 839f00a967045250ac5d77f7af4b0f00269ff76a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=839f00a967045250ac5d77f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 31 12:27:30 2006 +0200 kernel: Fix handling of invalid parameter in GlobalSize(). --- dlls/kernel/heap.c | 19 +++++++++++++------ dlls/kernel/tests/heap.c | 10 ++++++++++ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c index c76f876..730379c 100644 --- a/dlls/kernel/heap.c +++ b/dlls/kernel/heap.c @@ -751,13 +751,19 @@ HGLOBAL WINAPI GlobalFree(HGLOBAL hmem) * * Get the size of a global memory object. * + * PARAMS + * hmem [I] Handle of the global memory object + * * RETURNS - * Size in bytes of the global memory object - * 0: Failure + * Failure: 0 + * Success: Size in Bytes of the global memory object + * + * NOTES + * When the handle is invalid, last error is set to ERROR_INVALID_HANDLE + * */ -SIZE_T WINAPI GlobalSize( - HGLOBAL hmem /* [in] Handle of global memory object */ -) { +SIZE_T WINAPI GlobalSize(HGLOBAL hmem) +{ DWORD retval; PGLOBAL32_INTERN pintern; @@ -785,7 +791,8 @@ SIZE_T WINAPI GlobalSize( } else { - WARN("invalid handle\n"); + WARN("invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic); + SetLastError(ERROR_INVALID_HANDLE); retval=0; } RtlUnlockHeap(GetProcessHeap()); diff --git a/dlls/kernel/tests/heap.c b/dlls/kernel/tests/heap.c index fee1830..089c502 100644 --- a/dlls/kernel/tests/heap.c +++ b/dlls/kernel/tests/heap.c @@ -92,6 +92,11 @@ START_TEST(heap) ok( (flags == GMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), "returned 0x%04x with 0x%08lx (expected GMEM_INVALID_HANDLE with " \ "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); + SetLastError(MAGIC_DEAD); + size = GlobalSize(gbl); + ok( (size == 0) && (GetLastError() == ERROR_INVALID_HANDLE), + "returned %ld with 0x%08lx (expected '0' with ERROR_INVALID_HANDLE)\n", + size, GetLastError()); /* Local*() functions */ @@ -128,6 +133,11 @@ START_TEST(heap) ok( (flags == LMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), "returned 0x%04x with 0x%08lx (expected LMEM_INVALID_HANDLE with " \ "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); + SetLastError(MAGIC_DEAD); + size = LocalSize(gbl); + ok( (size == 0) && (GetLastError() == ERROR_INVALID_HANDLE), + "returned %ld with 0x%08lx (expected '0' with ERROR_INVALID_HANDLE)\n", + size, GetLastError()); /* trying to lock empty memory should give an error */

1 0

Robert Shearman : ole: Use ncalrpc instead of ncacn_np as the RPC transport .
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 714b66e9457dacf32e0bfefb9564e20e446bc44d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=714b66e9457dacf32e0bfef… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:34:25 2006 +0100 ole: Use ncalrpc instead of ncacn_np as the RPC transport. Use ncalrpc instead of ncacn_np as the transport as this is more similar to how ole32 from NT works and should also be compatible with rpcrt4 from Win9x, allowing more combinations of dlls to work. --- dlls/ole32/rpc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 6715f72..d849c6e 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -70,7 +70,7 @@ static CRITICAL_SECTION_DEBUG csRegIf_de }; static CRITICAL_SECTION csRegIf = { &csRegIf_debug, -1, 0, 0, 0, 0 }; -static WCHAR wszPipeTransport[] = {'n','c','a','c','n','_','n','p',0}; +static WCHAR wszRpcTransport[] = {'n','c','a','l','r','p','c',0}; struct registered_if @@ -447,7 +447,7 @@ HRESULT RPC_CreateClientChannel(const OX status = RpcStringBindingComposeW( NULL, - wszPipeTransport, + wszRpcTransport, NULL, endpoint, NULL, @@ -683,7 +683,7 @@ void RPC_StartRemoting(struct apartment get_rpc_endpoint(endpoint, &apt->oxid); status = RpcServerUseProtseqEpW( - wszPipeTransport, + wszRpcTransport, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, endpoint, NULL);

1 0

Robert Shearman : kernel: Add some documentation for simple process functions.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 1fd711c1920c0336a1e9dd942a2c90775466f2e7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1fd711c1920c0336a1e9dd9… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:33:04 2006 +0100 kernel: Add some documentation for simple process functions. --- dlls/kernel/process.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 60 insertions(+), 4 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 4263a22..7b656ac 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -1887,6 +1887,16 @@ HINSTANCE WINAPI LoadModule( LPCSTR name /****************************************************************************** * TerminateProcess (KERNEL32.@) + * + * Terminates a process. + * + * PARAMS + * handle [I] Process to terminate. + * exit_code [I] Exit code. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE, check GetLastError(). */ BOOL WINAPI TerminateProcess( HANDLE handle, DWORD exit_code ) { @@ -1898,6 +1908,14 @@ BOOL WINAPI TerminateProcess( HANDLE han /*********************************************************************** * ExitProcess (KERNEL32.@) + * + * Exits the current process. + * + * PARAMS + * status [I] Status code to exit with. + * + * RETURNS + * Nothing. */ void WINAPI ExitProcess( DWORD status ) { @@ -2247,6 +2265,17 @@ void WINAPI ExitProcess16( WORD status ) /********************************************************************* * OpenProcess (KERNEL32.@) + * + * Opens a handle to a process. + * + * PARAMS + * access [I] Desired access rights assigned to the returned handle. + * inherit [I] Determines whether or not child processes will inherit the handle. + * id [I] Process identifier of the process to get a handle to. + * + * RETURNS + * Success: Valid handle to the specified process. + * Failure: NULL, check GetLastError(). */ HANDLE WINAPI OpenProcess( DWORD access, BOOL inherit, DWORD id ) { @@ -2278,6 +2307,20 @@ HANDLE WINAPI OpenProcess( DWORD access, /********************************************************************* * MapProcessHandle (KERNEL.483) * GetProcessId (KERNEL32.@) + * + * Gets the a unique identifier of a process. + * + * PARAMS + * hProcess [I] Handle to the process. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE, check GetLastError(). + * + * NOTES + * + * The identifier is unique only on the machine and only until the process + * exits (including system shutdown). */ DWORD WINAPI GetProcessId( HANDLE hProcess ) { @@ -2295,6 +2338,15 @@ DWORD WINAPI GetProcessId( HANDLE hProce /********************************************************************* * CloseW32Handle (KERNEL.474) * CloseHandle (KERNEL32.@) + * + * Closes a handle. + * + * PARAMS + * handle [I] Handle to close. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE, check GetLastError(). */ BOOL WINAPI CloseHandle( HANDLE handle ) { @@ -2687,7 +2739,6 @@ BOOL WINAPI WriteProcessMemory( HANDLE p BOOL WINAPI FlushInstructionCache(HANDLE hProcess, LPCVOID lpBaseAddress, SIZE_T dwSize) { NTSTATUS status; - if (GetVersion() & 0x80000000) return TRUE; /* not NT, always TRUE */ status = NtFlushInstructionCache( hProcess, lpBaseAddress, dwSize ); if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; @@ -2755,9 +2806,14 @@ HANDLE WINAPI GetCurrentProcess(void) /*********************************************************************** * CmdBatNotification (KERNEL32.@) * - * Called by cmd.exe with - * (1) when a batch file is started - * (0) when a batch file finishes executing + * Notifies the system that a batch file has started or finished. + * + * PARAMS + * bBatchRunning [I] TRUE if a batch file has started or + * FALSE if a batch file has finished executing. + * + * RETURNS + * Unknown. */ BOOL WINAPI CmdBatNotification( BOOL bBatchRunning ) {

1 0

Robert Shearman : widl: There's no need to cast _StubMsg - it' s already of the correct type.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 837e830a264d6180eb3a577d023548790aba6cb4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=837e830a264d6180eb3a577… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:55:05 2006 +0100 widl: There's no need to cast _StubMsg - it's already of the correct type. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index ed47c04..a8ab982 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1422,7 +1422,7 @@ static void print_phase_function(FILE *f print_file(file, indent, "Ndr%s%s(\n", type, function); indent++; - print_file(file, indent, "(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_file(file, indent, "&_StubMsg,\n"); print_file(file, indent, "%s%s,\n", (phase == PHASE_UNMARSHAL) ? "(unsigned char **)&" : "(unsigned char *)", varname);

1 0

Robert Shearman : widl: Only assign variables if not a string and only create a local variable if not a sized parameter .
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 506404ba09fe5e7a4501d3f15f55df65e12d3531 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=506404ba09fe5e7a4501d3f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:50:46 2006 +0100 widl: Only assign variables if not a string and only create a local variable if not a sized parameter. Only assign variables if not a string and only create a local variable if not a sized parameter. Fixes type mismatches in the generated code due to differences in the algorithms between creating local variables and using them. --- tools/widl/server.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 9ffb6b5..5188965 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -101,12 +101,16 @@ static void declare_args(const func_t *f while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { + const expr_t *size_is = get_attrp(var->attrs, ATTR_SIZEIS); + int has_size = size_is && (size_is->type != EXPR_VOID); + int is_string = is_attr(var->attrs, ATTR_STRING); + in_attr = is_attr(var->attrs, ATTR_IN); out_attr = is_attr(var->attrs, ATTR_OUT); if (!out_attr && !in_attr) in_attr = 1; - if (!in_attr && !is_attr(var->attrs, ATTR_STRING)) + if (!in_attr && !has_size && !is_string) { int indirection; print_server(""); @@ -143,6 +147,7 @@ static void assign_out_args(const func_t while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { + int is_string = is_attr(var->attrs, ATTR_STRING); size_is = get_attrp(var->attrs, ATTR_SIZEIS); has_size = size_is && (size_is->type != EXPR_VOID); in_attr = is_attr(var->attrs, ATTR_IN); @@ -165,7 +170,7 @@ static void assign_out_args(const func_t write_expr(server, size_is, 1); fprintf(server, " * %u);\n", get_type_memsize(type)); } - else + else if (!is_string) { fprintf(server, " = &_W%u;\n", i); if (var->ptr_level > 1)

1 0

Robert Shearman : widl: Initialise the temporary variable to 0 for parameters with more than one level of indirection .
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 62eb9f4b0c88d02c05e3971b3be25833996de0a2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=62eb9f4b0c88d02c05e3971… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:50:10 2006 +0100 widl: Initialise the temporary variable to 0 for parameters with more than one level of indirection. --- tools/widl/server.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index b3c8c65..9ffb6b5 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -167,7 +167,10 @@ static void assign_out_args(const func_t } else { - fprintf(server, " = &_W%u;\n", i++); + fprintf(server, " = &_W%u;\n", i); + if (var->ptr_level > 1) + print_server("_W%u = 0;\n", i); + i++; } sep = 1;

1 0