April 2016 - Wine-Commits - list.winehq.org

Aaryaman Vasishta : d3drm: Use sizeof instead of strlen in d3drm_texture3_GetClassName.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: 93c2196189fb1a358aae91a8f712378075ce8b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c2196189fb1a358aae91a8f… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Apr 24 21:38:19 2016 +0530 d3drm: Use sizeof instead of strlen in d3drm_texture3_GetClassName. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index f81fc03..60374d3 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -796,7 +796,7 @@ static HRESULT WINAPI d3drm_texture3_GetClassName(IDirect3DRMTexture3 *iface, DW { TRACE("iface %p, size %p, name %p.\n", iface, size, name); - if (!size || *size < strlen("Texture") || !name) + if (!size || *size < sizeof("Texture") || !name) return E_INVALIDARG; strcpy(name, "Texture");

1 0

Sebastian Lackner : server: Do not hold reference on parent process.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: bae3dcc2957683a4e2ca04a75ef10f91688300e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae3dcc2957683a4e2ca04a75… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 21 12:34:07 2016 +0200 server: Do not hold reference on parent process. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 +- server/console.c | 3 +-- server/process.c | 7 +++---- server/process.h | 2 +- server/snapshot.c | 2 +- server/thread.c | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 2708072..2631aa3 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1157,7 +1157,7 @@ static void test_Toolhelp(void) Sleep(100); } /* The following test fails randomly on some Windows versions, but Gothic 2 depends on it */ - todo_wine ok(i < 20 || broken(i == 20), "process object not released\n"); + ok(i < 20 || broken(i == 20), "process object not released\n"); snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError()); diff --git a/server/console.c b/server/console.c index 0d98b78..efb20da 100644 --- a/server/console.c +++ b/server/console.c @@ -1424,13 +1424,12 @@ DECL_HANDLER(alloc_console) case 0: /* renderer is current, console to be attached to parent process */ renderer = current; - if (!(process = current->process->parent)) + if (!(process = get_process_from_id( current->process->parent_id ))) { if (fd != -1) close( fd ); set_error( STATUS_ACCESS_DENIED ); return; } - grab_object( process ); attach = 1; break; case 0xffffffff: diff --git a/server/process.c b/server/process.c index d2eab45..52bd462 100644 --- a/server/process.c +++ b/server/process.c @@ -506,7 +506,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit close( fd ); goto error; } - process->parent = NULL; + process->parent_id = 0; process->debugger = NULL; process->handles = NULL; process->msg_fd = NULL; @@ -558,7 +558,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit else { struct process *parent = parent_thread->process; - process->parent = (struct process *)grab_object( parent ); + process->parent_id = parent->id; process->handles = inherit_all ? copy_handle_table( process, parent ) : alloc_handle_table( process, 0 ); /* Note: for security reasons, starting a new process does not attempt @@ -625,7 +625,6 @@ static void process_destroy( struct object *obj ) release_object( process->job ); } if (process->console) release_object( process->console ); - if (process->parent) release_object( process->parent ); if (process->msg_fd) release_object( process->msg_fd ); list_remove( &process->entry ); if (process->idle_event) release_object( process->idle_event ); @@ -1354,7 +1353,7 @@ DECL_HANDLER(get_process_info) if ((process = get_process_from_handle( req->handle, PROCESS_QUERY_LIMITED_INFORMATION ))) { reply->pid = get_process_id( process ); - reply->ppid = process->parent ? get_process_id( process->parent ) : 0; + reply->ppid = process->parent_id; reply->exit_code = process->exit_code; reply->priority = process->priority; reply->affinity = process->affinity; diff --git a/server/process.h b/server/process.h index fa7f60d..34b6ea6 100644 --- a/server/process.h +++ b/server/process.h @@ -56,7 +56,7 @@ struct process { struct object obj; /* object header */ struct list entry; /* entry in system-wide process list */ - struct process *parent; /* parent process */ + process_id_t parent_id; /* parent process id (at the time of creation) */ struct list thread_list; /* thread list */ struct thread *debugger; /* thread debugging this process */ struct handle_table *handles; /* handle entries */ diff --git a/server/snapshot.c b/server/snapshot.c index 3566b89..e35588a 100644 --- a/server/snapshot.c +++ b/server/snapshot.c @@ -115,7 +115,7 @@ static int snapshot_next_process( struct snapshot *snapshot, struct next_process ptr = &snapshot->processes[snapshot->process_pos++]; reply->count = ptr->count; reply->pid = get_process_id( ptr->process ); - reply->ppid = ptr->process->parent ? get_process_id( ptr->process->parent ) : 0; + reply->ppid = ptr->process->parent_id; reply->threads = ptr->threads; reply->priority = ptr->priority; reply->handles = ptr->handles; diff --git a/server/thread.c b/server/thread.c index ca02a8a..5f8405b 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1304,7 +1304,7 @@ DECL_HANDLER(init_thread) process->peb = req->entry; process->cpu = req->cpu; reply->info_size = init_process( current ); - if (!process->parent) + if (!process->parent_id) process->affinity = current->affinity = get_thread_affinity( current ); else set_thread_affinity( current, current->affinity );

1 0

Sebastian Lackner : server: Increase size of PID table and do not reuse recently freed ptids.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: 1025ed38c07102aa0bc4fb4e66b37ba35e5e9bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1025ed38c07102aa0bc4fb4e6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 21 12:34:00 2016 +0200 server: Increase size of PID table and do not reuse recently freed ptids. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/process.c b/server/process.c index 11d2987..d2eab45 100644 --- a/server/process.c +++ b/server/process.c @@ -338,6 +338,7 @@ static unsigned int used_ptid_entries; /* number of entries in use */ 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 unsigned int num_free_ptids; /* number of free ptids */ static void kill_all_processes(void); @@ -354,16 +355,17 @@ unsigned int alloc_ptid( void *ptr ) id = used_ptid_entries + PTID_OFFSET; entry = &ptid_entries[used_ptid_entries++]; } - else if (next_free_ptid) + else if (next_free_ptid && num_free_ptids >= 256) { id = next_free_ptid; entry = &ptid_entries[id - PTID_OFFSET]; if (!(next_free_ptid = entry->next)) last_free_ptid = 0; + num_free_ptids--; } else /* need to grow the array */ { unsigned int count = alloc_ptid_entries + (alloc_ptid_entries / 2); - if (!count) count = 64; + if (!count) count = 512; if (!(entry = realloc( ptid_entries, count * sizeof(*entry) ))) { set_error( STATUS_NO_MEMORY ); @@ -390,8 +392,8 @@ void free_ptid( unsigned int id ) /* append to end of free list so that we don't reuse it too early */ if (last_free_ptid) ptid_entries[last_free_ptid - PTID_OFFSET].next = id; else next_free_ptid = id; - last_free_ptid = id; + num_free_ptids++; } /* retrieve the pointer corresponding to a process or thread id */

1 0

Hugh McMaster : reg: Add /v and /ve support to reg query.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: 0c0d839aaaa9a48474a66dc04f4feb6cbcf2e0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0d839aaaa9a48474a66dc04… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 25 11:26:49 2016 +0000 reg: Add /v and /ve support to reg query. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 4ccc7dc..26a1288 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -655,6 +655,49 @@ static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, return subkey_path; } +static int query_value(HKEY key, WCHAR *value_name, WCHAR *path) +{ + LONG rc; + DWORD max_data_bytes, data_size; + DWORD type; + BYTE *data; + WCHAR fmt[] = {'%','1','\n',0}; + WCHAR newlineW[] = {'\n',0}; + + rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, &max_data_bytes, NULL, NULL); + if (rc) + { + ERR("RegQueryInfoKey failed: %d\n", rc); + return 1; + } + + data = HeapAlloc(GetProcessHeap(), 0, max_data_bytes); + if (!data) + { + ERR("Failed to allocate memory for data\n"); + return 1; + } + + data_size = max_data_bytes; + rc = RegQueryValueExW(key, value_name, NULL, &type, data, &data_size); + if (rc == ERROR_SUCCESS) + { + output_string(fmt, path); + output_value(value_name, type, data, data_size); + output_string(newlineW); + } + + HeapFree(GetProcessHeap(), 0, data); + + if (rc == ERROR_FILE_NOT_FOUND) + { + output_message(STRING_CANNOT_FIND); + return 1; + } + return 0; +} + static int query_all(HKEY key, WCHAR *path, BOOL recurse) { LONG rc; @@ -783,11 +826,16 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL if (value_name || value_empty) { - output_string(stubW, key_name, value_name, value_empty, recurse); - return 1; + if (recurse) + { + RegCloseKey(key); + output_string(stubW, key_name, value_name, value_empty, recurse); + return 1; + } + ret = query_value(key, value_name, key_name); } - - ret = query_all(key, key_name, recurse); + else + ret = query_all(key, key_name, recurse); RegCloseKey(key);

1 0

Austin English : kernel32: Add GetConsoleFontInfo stub.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: 77733651ad3b45a4eb0dbbeca4318714fa041116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77733651ad3b45a4eb0dbbeca… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 18 20:20:50 2016 -0500 kernel32: Add GetConsoleFontInfo stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 7 +++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 60e38bc..cc2936d 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3347,6 +3347,13 @@ COORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD index) } #endif /* !defined(__i386__) */ +BOOL WINAPI GetConsoleFontInfo(HANDLE hConsole, BOOL maximize, DWORD numfonts, CONSOLE_FONT_INFO *info) +{ + FIXME("(%p %d %u %p): stub!\n", hConsole, maximize, numfonts, info); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + BOOL WINAPI GetConsoleScreenBufferInfoEx(HANDLE hConsole, CONSOLE_SCREEN_BUFFER_INFOEX *csbix) { FIXME("(%p %p): stub!\n", hConsole, csbix); diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 73f2e88..71dbe4d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -599,7 +599,7 @@ @ stdcall GetConsoleCursorInfo(long ptr) @ stub GetConsoleCursorMode @ stdcall GetConsoleDisplayMode(ptr) -@ stub GetConsoleFontInfo +@ stdcall GetConsoleFontInfo(ptr long long ptr) @ stdcall GetConsoleFontSize(long long) @ stub GetConsoleHardwareState # @ stub GetConsoleHistoryInfo

1 0

Aaryaman Vasishta : d3drm: Use ref and appdata from d3drm_object in d3drm_texture.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: e5e499d399e405f533c1a322e3f9dc47a2864682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e499d399e405f533c1a322e… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Apr 24 21:38:20 2016 +0530 d3drm: Use ref and appdata from d3drm_object in d3drm_texture. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 2 -- dlls/d3drm/texture.c | 9 ++++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 3dae0bb..2eb8e4d 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -40,8 +40,6 @@ struct d3drm_texture IDirect3DRMTexture IDirect3DRMTexture_iface; IDirect3DRMTexture2 IDirect3DRMTexture2_iface; IDirect3DRMTexture3 IDirect3DRMTexture3_iface; - LONG ref; - DWORD app_data; }; void d3drm_object_init(struct d3drm_object *object) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 60374d3..886bb0b 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -707,7 +707,7 @@ static HRESULT WINAPI d3drm_texture3_QueryInterface(IDirect3DRMTexture3 *iface, static ULONG WINAPI d3drm_texture3_AddRef(IDirect3DRMTexture3 *iface) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); - ULONG refcount = InterlockedIncrement(&texture->ref); + ULONG refcount = InterlockedIncrement(&texture->obj.ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -717,7 +717,7 @@ static ULONG WINAPI d3drm_texture3_AddRef(IDirect3DRMTexture3 *iface) static ULONG WINAPI d3drm_texture3_Release(IDirect3DRMTexture3 *iface) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); - ULONG refcount = InterlockedDecrement(&texture->ref); + ULONG refcount = InterlockedDecrement(&texture->obj.ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -764,7 +764,7 @@ static HRESULT WINAPI d3drm_texture3_SetAppData(IDirect3DRMTexture3 *iface, DWOR TRACE("iface %p, data %#x.\n", iface, data); - texture->app_data = data; + texture->obj.appdata = data; return D3DRM_OK; } @@ -775,7 +775,7 @@ static DWORD WINAPI d3drm_texture3_GetAppData(IDirect3DRMTexture3 *iface) TRACE("iface %p.\n", iface); - return texture->app_data; + return texture->obj.appdata; } static HRESULT WINAPI d3drm_texture3_SetName(IDirect3DRMTexture3 *iface, const char *name) @@ -1056,7 +1056,6 @@ HRESULT d3drm_texture_create(struct d3drm_texture **texture) object->IDirect3DRMTexture_iface.lpVtbl = &d3drm_texture1_vtbl; object->IDirect3DRMTexture2_iface.lpVtbl = &d3drm_texture2_vtbl; object->IDirect3DRMTexture3_iface.lpVtbl = &d3drm_texture3_vtbl; - object->ref = 1; d3drm_object_init(&object->obj);

1 0

Alex Henrie : include: Add AMTimeline class and its dependencies.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: 9c2f28cf7f3f3782f60865d0e3814c1bd73d9cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c2f28cf7f3f3782f60865d0e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 24 21:40:26 2016 -0600 include: Add AMTimeline class and its dependencies. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/qedit.idl | 639 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 639 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c2f28cf7f3f3782f6086…

1 0

Francois Gouget : include: Remove duplicate Web Services declarations.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: 881fd6a565e0b94e1482c522174f457c6d0af2ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=881fd6a565e0b94e1482c5221… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 24 04:08:44 2016 +0200 include: Remove duplicate Web Services declarations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/webservices.h b/include/webservices.h index 6217105..6e30f50 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -49,10 +49,7 @@ typedef struct _WS_ENDPOINT_ADDRESS WS_ENDPOINT_ADDRESS; typedef struct _WS_ENDPOINT_IDENTITY WS_ENDPOINT_IDENTITY; typedef struct _WS_ENUM_DESCRIPTION WS_ENUM_DESCRIPTION; typedef struct _WS_ENUM_VALUE WS_ENUM_VALUE; -typedef struct _WS_OPERATION_DESCRIPTION WS_OPERATION_DESCRIPTION; typedef struct _WS_HTTP_POLICY_DESCRIPTION WS_HTTP_POLICY_DESCRIPTION; -typedef struct _WS_MESSAGE_PROPERTY WS_MESSAGE_PROPERTY; -typedef struct _WS_MESSAGE_PROPERTIES WS_MESSAGE_PROPERTIES; typedef struct _WS_MESSAGE WS_MESSAGE; typedef struct _WS_MESSAGE_DESCRIPTION WS_MESSAGE_DESCRIPTION; typedef struct _WS_OPERATION_DESCRIPTION WS_OPERATION_DESCRIPTION;

1 0

Francois Gouget : cmd: Fix a spelling erro in a TRACE() message.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: 003fb4b139e67a57e4bcb2511545ee9aeeef2531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=003fb4b139e67a57e4bcb2511… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 23 07:48:11 2016 +0200 cmd: Fix a spelling erro in a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a444330..49c366a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3938,7 +3938,7 @@ static int WCMD_handleExpression(WCHAR **expr, int *ret, int depth) case ',': { int prevresult = -1; - WINE_TRACE("Found expression delimiter - reducing exising stacks\n"); + WINE_TRACE("Found expression delimiter - reducing existing stacks\n"); while (!rc && opstackhead) { rc = WCMD_reduce(&opstackhead, &varstackhead); }

1 0

Francois Gouget : inetcomm/tests: Make test_BindToObject() static.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: 1163d431a0362e7fafb911304bfe10afb1f37397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1163d431a0362e7fafb911304… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 23 07:48:02 2016 +0200 inetcomm/tests: Make test_BindToObject() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index bd90a80..a0fc695 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -394,7 +394,7 @@ static void test_MessageOptions(void) IMimeMessage_Release(msg); } -void test_BindToObject(void) +static void test_BindToObject(void) { HRESULT hr; IMimeMessage *msg;

1 0