January 2008 - Wine-commits

Rob Shearman : ntdll: Add tests for the data and name returned by NtQueryValueKey.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: edab3a6ff109004b69ead41fd1bcb63661b5271e URL: http://source.winehq.org/git/wine.git/?a=commit;h=edab3a6ff109004b69ead41fd… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 6 15:35:45 2008 +0000 ntdll: Add tests for the data and name returned by NtQueryValueKey. --- dlls/ntdll/tests/reg.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 4a559a5..b5653d8 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -482,6 +482,15 @@ static void test_NtQueryValueKey(void) ok(partial_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", partial_info->Type); ok(partial_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %d\n", partial_info->DataLength); ok(len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[partial_info->DataLength]), "NtQueryValueKey returned wrong len %d\n", len); + + partial_info = HeapReAlloc(GetProcessHeap(), 0, partial_info, len); + status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformation, partial_info, len, &len); + ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08x\n", status); + ok(partial_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", partial_info->Type); + ok(partial_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", partial_info->Type); + ok(partial_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %d\n", partial_info->DataLength); + ok(len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[partial_info->DataLength]), "NtQueryValueKey returned wrong len %d\n", len); + ok(*(DWORD *)partial_info->Data == 711, "incorrect Data returned: 0x%x\n", *(DWORD *)partial_info->Data); HeapFree(GetProcessHeap(), 0, partial_info); len = FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]); @@ -495,6 +504,20 @@ static void test_NtQueryValueKey(void) todo_wine ok(len == FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]) + full_info->DataLength + full_info->NameLength, "NtQueryValueKey returned wrong len %d\n", len); + len = FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]) + full_info->DataLength + full_info->NameLength; + + full_info = HeapReAlloc(GetProcessHeap(), 0, full_info, len); + status = pNtQueryValueKey(key, &ValName, KeyValueFullInformation, full_info, len, &len); + ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08x\n", status); + ok(full_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", full_info->Type); + ok(full_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", full_info->Type); + ok(full_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %d\n", full_info->DataLength); + ok(full_info->NameLength == 20, "NtQueryValueKey returned wrong NameLength %d\n", full_info->NameLength); + todo_wine + ok(!memcmp(full_info->Name, ValName.Buffer, ValName.Length), "incorrect Name returned\n"); + todo_wine + ok(*(DWORD *)((char *)full_info + full_info->DataOffset) == 711, "incorrect Data returned: 0x%x\n", + *(DWORD *)((char *)full_info + full_info->DataOffset)); HeapFree(GetProcessHeap(), 0, full_info); pRtlFreeUnicodeString(&ValName);

1 0

Rob Shearman : ntdll: Fix the Data and Name returned by NtQueryValueKey for KeyValueFullInformation .
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: e958a570e5f40f3d288bf1c0a4366c5c7bb90f1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e958a570e5f40f3d288bf1c0a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 6 15:35:56 2008 +0000 ntdll: Fix the Data and Name returned by NtQueryValueKey for KeyValueFullInformation. --- dlls/ntdll/reg.c | 10 +++++++++- dlls/ntdll/tests/reg.c | 3 --- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 7620bdd..e2a3b91 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -485,9 +485,17 @@ NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, data_ptr = NULL; break; case KeyValueFullInformation: - data_ptr = (UCHAR *)((KEY_VALUE_FULL_INFORMATION *)info)->Name; + { + KEY_VALUE_FULL_INFORMATION *full_info = info; + if (FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name) < length) + { + memcpy(full_info->Name, name->Buffer, + min(length - FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name), name->Length)); + } + data_ptr = (UCHAR *)full_info->Name + name->Length; fixed_size = (char *)data_ptr - (char *)info; break; + } case KeyValuePartialInformation: data_ptr = ((KEY_VALUE_PARTIAL_INFORMATION *)info)->Data; fixed_size = (char *)data_ptr - (char *)info; diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index b5653d8..3b983ee 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -501,7 +501,6 @@ static void test_NtQueryValueKey(void) ok(full_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", full_info->Type); ok(full_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %d\n", full_info->DataLength); ok(full_info->NameLength == 20, "NtQueryValueKey returned wrong NameLength %d\n", full_info->NameLength); - todo_wine ok(len == FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]) + full_info->DataLength + full_info->NameLength, "NtQueryValueKey returned wrong len %d\n", len); len = FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]) + full_info->DataLength + full_info->NameLength; @@ -513,9 +512,7 @@ static void test_NtQueryValueKey(void) ok(full_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", full_info->Type); ok(full_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %d\n", full_info->DataLength); ok(full_info->NameLength == 20, "NtQueryValueKey returned wrong NameLength %d\n", full_info->NameLength); - todo_wine ok(!memcmp(full_info->Name, ValName.Buffer, ValName.Length), "incorrect Name returned\n"); - todo_wine ok(*(DWORD *)((char *)full_info + full_info->DataOffset) == 711, "incorrect Data returned: 0x%x\n", *(DWORD *)((char *)full_info + full_info->DataOffset)); HeapFree(GetProcessHeap(), 0, full_info);

1 0

Rob Shearman : ntdll: Fix NtQueryValueKey for KeyValueBasicInformation.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 526cb8c375022fd2f2339401abe7e31e2e99984f URL: http://source.winehq.org/git/wine.git/?a=commit;h=526cb8c375022fd2f2339401a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 6 15:36:11 2008 +0000 ntdll: Fix NtQueryValueKey for KeyValueBasicInformation. Add some tests for this. --- dlls/ntdll/reg.c | 14 +++++++++++--- dlls/ntdll/tests/reg.c | 27 +++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index e2a3b91..9c9509d 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -481,9 +481,17 @@ NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, switch(info_class) { case KeyValueBasicInformation: - fixed_size = (char *)((KEY_VALUE_BASIC_INFORMATION *)info)->Name - (char *)info; + { + KEY_VALUE_BASIC_INFORMATION *basic_info = info; + if (FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name) < length) + { + memcpy(basic_info->Name, name->Buffer, + min(length - FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name), name->Length)); + } + fixed_size = FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name) + name->Length; data_ptr = NULL; break; + } case KeyValueFullInformation: { KEY_VALUE_FULL_INFORMATION *full_info = info; @@ -509,12 +517,12 @@ NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, { req->hkey = handle; wine_server_add_data( req, name->Buffer, name->Length ); - if (length > fixed_size) wine_server_set_reply( req, data_ptr, length - fixed_size ); + if (length > fixed_size && data_ptr) wine_server_set_reply( req, data_ptr, length - fixed_size ); if (!(ret = wine_server_call( req ))) { copy_key_value_info( info_class, info, length, reply->type, name->Length, reply->total ); - *result_len = fixed_size + reply->total; + *result_len = fixed_size + (info_class == KeyValueBasicInformation ? 0 : reply->total); if (length < *result_len) ret = STATUS_BUFFER_OVERFLOW; } } diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 3b983ee..14cc79f 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -67,6 +67,13 @@ typedef struct _RTL_QUERY_REGISTRY_TABLE { ULONG DefaultLength; } RTL_QUERY_REGISTRY_TABLE, *PRTL_QUERY_REGISTRY_TABLE; +typedef struct _KEY_VALUE_BASIC_INFORMATION { + ULONG TitleIndex; + ULONG Type; + ULONG NameLength; + WCHAR Name[1]; +} KEY_VALUE_BASIC_INFORMATION, *PKEY_VALUE_BASIC_INFORMATION; + typedef struct _KEY_VALUE_PARTIAL_INFORMATION { ULONG TitleIndex; ULONG Type; @@ -464,6 +471,7 @@ static void test_NtQueryValueKey(void) NTSTATUS status; OBJECT_ATTRIBUTES attr; UNICODE_STRING ValName; + KEY_VALUE_BASIC_INFORMATION *basic_info; KEY_VALUE_PARTIAL_INFORMATION *partial_info; KEY_VALUE_FULL_INFORMATION *full_info; DWORD len; @@ -474,6 +482,25 @@ static void test_NtQueryValueKey(void) status = pNtOpenKey(&key, KEY_READ, &attr); ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); + len = FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0]); + basic_info = HeapAlloc(GetProcessHeap(), 0, len); + status = pNtQueryValueKey(key, &ValName, KeyValueBasicInformation, basic_info, len, &len); + ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08x\n", status); + ok(basic_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", basic_info->Type); + ok(basic_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", basic_info->Type); + ok(basic_info->NameLength == 20, "NtQueryValueKey returned wrong NameLength %d\n", basic_info->NameLength); + ok(len == FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[basic_info->NameLength/sizeof(WCHAR)]), "NtQueryValueKey returned wrong len %d\n", len); + + basic_info = HeapReAlloc(GetProcessHeap(), 0, basic_info, len); + status = pNtQueryValueKey(key, &ValName, KeyValueBasicInformation, basic_info, len, &len); + ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08x\n", status); + ok(basic_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", basic_info->Type); + ok(basic_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", basic_info->Type); + ok(basic_info->NameLength == 20, "NtQueryValueKey returned wrong NameLength %d\n", basic_info->NameLength); + ok(len == FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[basic_info->NameLength/sizeof(WCHAR)]), "NtQueryValueKey returned wrong len %d\n", len); + ok(!memcmp(basic_info->Name, ValName.Buffer, ValName.Length), "incorrect Name returned\n"); + HeapFree(GetProcessHeap(), 0, basic_info); + len = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]); partial_info = HeapAlloc(GetProcessHeap(), 0, len); status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformation, partial_info, len, &len);

1 0

Rob Shearman : widl: Fix context handle "cannot be null" detection.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 06ed169bc5b2d1f235c80138da6decfa4ca6cf92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ed169bc5b2d1f235c80138d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 13:27:05 2008 +0000 widl: Fix context handle "cannot be null" detection. The "cannot be null" attibute is applied to a parameter if and only if it is in-only. --- tools/widl/typegen.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index bed46aa..9f4d153 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2064,13 +2064,13 @@ static size_t write_contexthandle_tfs(FILE *file, const type_t *type, flags |= 0x08 /* strict */; if (is_ptr(type)) - { flags |= 0x80; - if (type->type != RPC_FC_RP) - flags |= 0x01; - } if (is_attr(var->attrs, ATTR_IN)) + { flags |= 0x40; + if (!is_attr(var->attrs, ATTR_OUT)) + flags |= 0x01; + } if (is_attr(var->attrs, ATTR_OUT)) flags |= 0x20;

1 0

Rob Shearman : widl: Use symbolic names for some of the context handle attributes.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: a3040cea58545f0faf765195696d44c7612d7d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3040cea58545f0faf7651956… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 7 13:27:19 2008 +0000 widl: Use symbolic names for some of the context handle attributes. --- tools/widl/typegen.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9f4d153..041e183 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2061,7 +2061,7 @@ static size_t write_contexthandle_tfs(FILE *file, const type_t *type, unsigned char flags = 0; if (is_attr(current_iface->attrs, ATTR_STRICTCONTEXTHANDLE)) - flags |= 0x08 /* strict */; + flags |= NDR_STRICT_CONTEXT_HANDLE; if (is_ptr(type)) flags |= 0x80; @@ -2069,20 +2069,21 @@ static size_t write_contexthandle_tfs(FILE *file, const type_t *type, { flags |= 0x40; if (!is_attr(var->attrs, ATTR_OUT)) - flags |= 0x01; + flags |= NDR_CONTEXT_HANDLE_CANNOT_BE_NULL; } if (is_attr(var->attrs, ATTR_OUT)) flags |= 0x20; WRITE_FCTYPE(file, FC_BIND_CONTEXT, *typeformat_offset); print_file(file, 2, "0x%x,\t/* Context flags: ", flags); - if (((flags & 0x21) != 0x21) && (flags & 0x01)) + /* return and can't be null values overlap */ + if (((flags & 0x21) != 0x21) && (flags & NDR_CONTEXT_HANDLE_CANNOT_BE_NULL)) print_file(file, 0, "can't be null, "); - if (flags & 0x02) + if (flags & NDR_CONTEXT_HANDLE_SERIALIZE) print_file(file, 0, "serialize, "); - if (flags & 0x04) + if (flags & NDR_CONTEXT_HANDLE_NO_SERIALIZE) print_file(file, 0, "no serialize, "); - if (flags & 0x08) + if (flags & NDR_STRICT_CONTEXT_HANDLE) print_file(file, 0, "strict, "); if ((flags & 0x21) == 0x20) print_file(file, 0, "out, ");

1 0

Alexandre Julliard : server: Accept utf-8 data as input in registry files.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 12717397b7f476f7980341731ad5569fc5b7fc4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=12717397b7f476f7980341731… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 7 20:17:24 2008 +0100 server: Accept utf-8 data as input in registry files. --- server/registry.c | 87 +++++-------------------------------- server/unicode.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++- server/unicode.h | 3 +- 3 files changed, 137 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12717397b7f476f798034…

1 0

Alexandre Julliard : server: Make the registry parser more tolerant about malformed hex values.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: fb9955da8c592f6d0fc6373399139b479b47c7aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb9955da8c592f6d0fc637339… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 7 21:06:01 2008 +0100 server: Make the registry parser more tolerant about malformed hex values. --- server/registry.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/server/registry.c b/server/registry.c index fa39279..bfcd3d2 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1092,12 +1092,12 @@ static int get_data_type( const char *buffer, int *type, int *parse_type ) for (ptr = data_types; ptr->tag; ptr++) { - if (memcmp( ptr->tag, buffer, ptr->len )) continue; + if (strncmp( ptr->tag, buffer, ptr->len )) continue; *parse_type = ptr->parse_type; if ((*type = ptr->type) != -1) return ptr->len; /* "hex(xx):" is special */ *type = (int)strtoul( buffer + 4, &end, 16 ); - if ((end <= buffer) || memcmp( end, "):", 2 )) return 0; + if ((end <= buffer) || strncmp( end, "):", 2 )) return 0; return end + 2 - buffer; } return 0; @@ -1146,17 +1146,18 @@ static int parse_hex( unsigned char *dest, data_size_t *len, const char *buffer { const char *p = buffer; data_size_t count = 0; + char *end; + while (isxdigit(*p)) { - int val; - char buf[3]; - memcpy( buf, p, 2 ); - buf[2] = 0; - sscanf( buf, "%x", &val ); + unsigned int val = strtoul( p, &end, 16 ); + if (end == p || val > 0xff) return -1; if (count++ >= *len) return -1; /* dest buffer overflow */ - *dest++ = (unsigned char )val; - p += 2; + *dest++ = val; + p = end; + while (isspace(*p)) p++; if (*p == ',') p++; + while (isspace(*p)) p++; } *len = count; return p - buffer; @@ -1227,7 +1228,7 @@ static int load_value( struct key *key, const char *buffer, struct file_load_inf len = 0; for (;;) { - maxlen = 1 + strlen(buffer)/3; /* 3 chars for one hex byte */ + maxlen = 1 + strlen(buffer) / 2; /* at least 2 chars for one hex byte */ if (!get_file_tmp_space( info, len + maxlen )) return 0; if ((res = parse_hex( (unsigned char *)info->tmp + len, &maxlen, buffer )) == -1) goto error; len += maxlen; @@ -1259,6 +1260,11 @@ static int load_value( struct key *key, const char *buffer, struct file_load_inf error: file_read_error( "Malformed value", info ); + free( value->data ); + value->data = NULL; + value->len = 0; + value->type = REG_NONE; + make_dirty( key ); return 0; }

1 0

Alexandre Julliard : server: Wait for the expiration of all the process SIGKILL timers before exiting the server .
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 2f1e73cb3576bf4e7b065dacca06c3196f8591ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f1e73cb3576bf4e7b065dacc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 7 17:19:05 2008 +0100 server: Wait for the expiration of all the process SIGKILL timers before exiting the server. --- server/process.c | 61 +++++++++++++++++++++++++++++++----------------------- server/request.c | 5 +--- 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/server/process.c b/server/process.c index c6f34ec..2236d83 100644 --- a/server/process.c +++ b/server/process.c @@ -55,7 +55,7 @@ static struct list process_list = LIST_INIT(process_list); static int running_processes, user_processes; static struct event *shutdown_event; /* signaled when shutdown starts */ static struct timeout_user *shutdown_timeout; /* timeout for server shutdown */ -static int shutting_down; /* are we in the process of shutting down the server? */ +static int shutdown_stage; /* current stage in the shutdown process */ /* process operations */ @@ -148,6 +148,8 @@ static unsigned int alloc_ptid_entries; /* number of allocated entries */ static unsigned int next_free_ptid; /* next free entry */ static unsigned int last_free_ptid; /* last free entry */ +static void kill_all_processes(void); + #define PTID_OFFSET 8 /* offset for first ptid value */ /* allocate a new process or thread id */ @@ -233,28 +235,49 @@ static void set_process_startup_state( struct process *process, enum startup_sta static void server_shutdown_timeout( void *arg ) { shutdown_timeout = NULL; - if (!running_processes) close_master_socket( 0 ); - else + if (!running_processes) { + close_master_socket( 0 ); + return; + } + switch(++shutdown_stage) + { + case 1: /* signal system processes to exit */ if (debug_level) fprintf( stderr, "wineserver: shutting down\n" ); if (shutdown_event) set_event( shutdown_event ); - /* leave 2 seconds for system processes to exit */ - close_master_socket( 2 * -TICKS_PER_SEC ); - shutting_down = 1; + shutdown_timeout = add_timeout_user( 2 * -TICKS_PER_SEC, server_shutdown_timeout, NULL ); + close_master_socket( 4 * -TICKS_PER_SEC ); + break; + case 2: /* now forcibly kill all processes (but still wait for SIGKILL timeouts) */ + kill_all_processes(); + break; } } +/* forced shutdown, used for wineserver -k */ +void shutdown_master_socket(void) +{ + kill_all_processes(); + shutdown_stage = 2; + if (shutdown_timeout) + { + remove_timeout_user( shutdown_timeout ); + shutdown_timeout = NULL; + } + close_master_socket( 2 * -TICKS_PER_SEC ); /* for SIGKILL timeouts */ +} + /* final cleanup once we are sure a process is really dead */ static void process_died( struct process *process ) { if (debug_level) fprintf( stderr, "%04x: *process killed*\n", process->id ); if (!process->is_system) { - if (!--user_processes && master_socket_timeout != TIMEOUT_INFINITE) + if (!--user_processes && !shutdown_stage && master_socket_timeout != TIMEOUT_INFINITE) shutdown_timeout = add_timeout_user( master_socket_timeout, server_shutdown_timeout, NULL ); } release_object( process ); - if (!--running_processes && shutting_down) close_master_socket( 0 ); + if (!--running_processes && shutdown_stage) close_master_socket( 0 ); } /* callback for process sigkill timeout */ @@ -575,7 +598,7 @@ static void terminate_process( struct process *process, struct thread *skip, int } /* kill all processes */ -static void kill_all_processes( struct process *skip, int exit_code ) +static void kill_all_processes(void) { for (;;) { @@ -583,25 +606,11 @@ static void kill_all_processes( struct process *skip, int exit_code ) LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) { - if (process == skip) continue; if (process->running_threads) break; } if (&process->entry == &process_list) break; /* no process found */ - terminate_process( process, NULL, exit_code ); - } -} - -/* forced shutdown, used for wineserver -k */ -void shutdown_master_socket(void) -{ - kill_all_processes( NULL, 1 ); - master_socket_timeout = 0; - if (shutdown_timeout) - { - remove_timeout_user( shutdown_timeout ); - shutdown_timeout = NULL; + terminate_process( process, NULL, 1 ); } - if (!shutting_down) server_shutdown_timeout( NULL ); } /* kill all processes being attached to a console renderer */ @@ -893,7 +902,7 @@ DECL_HANDLER(new_process) close( socket_fd ); return; } - if (shutting_down) + if (shutdown_stage) { set_error( STATUS_SHUTDOWN_IN_PROGRESS ); close( socket_fd ); @@ -1231,7 +1240,7 @@ DECL_HANDLER(make_process_system) { process->is_system = 1; close_process_desktop( process ); - if (!--user_processes && master_socket_timeout != TIMEOUT_INFINITE) + if (!--user_processes && !shutdown_stage && master_socket_timeout != TIMEOUT_INFINITE) shutdown_timeout = add_timeout_user( master_socket_timeout, server_shutdown_timeout, NULL ); } } diff --git a/server/request.c b/server/request.c index 7839de7..9a2c7b1 100644 --- a/server/request.c +++ b/server/request.c @@ -824,8 +824,5 @@ void close_master_socket( timeout_t timeout ) if (master_timeout) /* cancel previous timeout */ remove_timeout_user( master_timeout ); - if (timeout) - master_timeout = add_timeout_user( timeout, close_socket_timeout, NULL ); - else /* close it right away */ - close_socket_timeout( NULL ); + master_timeout = add_timeout_user( timeout, close_socket_timeout, NULL ); }

1 0

Andre Wisplinghoff : regedit: Refresh tree view on import.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 005b493619ec2ab2f7d13bd3e32d16fb531ca4c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=005b493619ec2ab2f7d13bd3e… Author: Andre Wisplinghoff <andre.wisplinghoff(a)gmail.com> Date: Fri Jan 4 17:14:19 2008 +0100 regedit: Refresh tree view on import. --- programs/regedit/framewnd.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index a2d94bf..3dd9d96 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -327,6 +327,7 @@ static BOOL ImportRegistryFile(HWND hWnd) } else { CheckCommDlgError(hWnd); } + RefreshTreeView(g_pChildWnd->hTreeWnd); return TRUE; }

1 0

Peter Oberndorfer : dwmapi: Add stub implementation for DwmSetWindowAttribute and DwmUnregisterThumbnail .
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 66960ba4bff88b9536d46f2d69af17f1547892ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=66960ba4bff88b9536d46f2d6… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Sun Jan 6 16:14:56 2008 +0100 dwmapi: Add stub implementation for DwmSetWindowAttribute and DwmUnregisterThumbnail. --- dlls/dwmapi/dwmapi.spec | 4 ++-- dlls/dwmapi/dwmapi_main.c | 20 ++++++++++++++++++++ include/dwmapi.h | 4 ++++ tools/winapi/win32.api | 5 +++++ 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index d6d675a..bce53e5 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -39,6 +39,6 @@ @ stub DwmRegisterThumbnail @ stub DwmSetDxFrameDuration @ stub DwmSetPresentParameters -@ stub DwmSetWindowAttribute -@ stub DwmUnregisterThumbnail +@ stdcall DwmSetWindowAttribute(long long ptr long) +@ stdcall DwmUnregisterThumbnail(long) @ stub DwmUpdateThumbnailProperties diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index dd8714b..6a87701 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -69,3 +69,23 @@ HRESULT WINAPI DwmEnableComposition(UINT uCompositionAction) return S_OK; } + +/********************************************************************** + * DwmSetWindowAttribute (DWMAPI.@) + */ +HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attribute, DWORD size) +{ + FIXME("(%p, %x, %p, %x) stub\n", hwnd, attributenum, attribute, size); + + return E_NOTIMPL; +} + +/********************************************************************** + * DwmUnregisterThumbnail (DWMAPI.@) + */ +HRESULT WINAPI DwmUnregisterThumbnail(HTHUMBNAIL thumbnail) +{ + FIXME("(%p) stub\n", thumbnail); + + return E_NOTIMPL; +} diff --git a/include/dwmapi.h b/include/dwmapi.h index b2a28b6..967efed 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -29,8 +29,12 @@ extern "C" { # define DWMAPI_(type) STDAPI_(type) #endif +DECLARE_HANDLE(HTHUMBNAIL); + DWMAPI DwmEnableComposition(UINT); DWMAPI DwmIsCompositionEnabled(BOOL*); +DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); +DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL); #ifdef __cplusplus } diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index f0a6490..067ee40 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1371,11 +1371,16 @@ REFIID %long +DWORD HRESULT +HTHUMBNAIL +HWND +UINT %ptr BOOL * +LPCVOID %%dxdiagn.dll

1 0