wine-commits July 2015

wine-commits@winehq.org

2 participants
567 discussions

Huw Davies : msi: Be more selective about which access modes are used to open or create keys.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: e1a65bed682aec5ca4e40d2ac0fc306949b09494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a65bed682aec5ca4e40d2ac… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 15 12:32:19 2015 +0100 msi: Be more selective about which access modes are used to open or create keys. An installer was failing when trying to create subkeys after denying delete access to their parent key. --- dlls/msi/action.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 22e97a7..3ad387a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2633,9 +2633,8 @@ static inline REGSAM get_registry_view( const MSICOMPONENT *comp ) return view; } -static HKEY open_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path, BOOL create ) +static HKEY open_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path, BOOL create, REGSAM access ) { - REGSAM access = KEY_ALL_ACCESS; WCHAR *subkey, *p, *q; HKEY hkey, ret = NULL; LONG res; @@ -2657,7 +2656,7 @@ static HKEY open_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path, BO } if (q && q[1]) { - ret = open_key( comp, hkey, q + 1, create ); + ret = open_key( comp, hkey, q + 1, create, access ); RegCloseKey( hkey ); } else ret = hkey; @@ -2882,7 +2881,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) strcpyW(uikey,szRoot); strcatW(uikey,deformated); - if (!(hkey = open_key( comp, root_key, deformated, TRUE ))) + if (!(hkey = open_key( comp, root_key, deformated, TRUE, KEY_QUERY_VALUE | KEY_SET_VALUE ))) { ERR("Could not create key %s\n", debugstr_w(deformated)); msi_free(uikey); @@ -2979,7 +2978,7 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) { *p = 0; if (!p[1]) continue; /* trailing backslash */ - hkey = open_key( comp, root, subkey, FALSE ); + hkey = open_key( comp, root, subkey, FALSE, access ); if (!hkey) break; res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); RegCloseKey( hkey ); @@ -3001,7 +3000,7 @@ static void delete_value( const MSICOMPONENT *comp, HKEY root, const WCHAR *path HKEY hkey; DWORD num_subkeys, num_values; - if ((hkey = open_key( comp, root, path, FALSE ))) + if ((hkey = open_key( comp, root, path, FALSE, KEY_SET_VALUE | KEY_QUERY_VALUE ))) { if ((res = RegDeleteValueW( hkey, value ))) TRACE("failed to delete value %s (%d)\n", debugstr_w(value), res); @@ -3022,7 +3021,7 @@ static void delete_tree( const MSICOMPONENT *comp, HKEY root, const WCHAR *path LONG res; HKEY hkey; - if (!(hkey = open_key( comp, root, path, FALSE ))) return; + if (!(hkey = open_key( comp, root, path, FALSE, KEY_ALL_ACCESS ))) return; res = RegDeleteTreeW( hkey, NULL ); if (res) TRACE("failed to delete subtree of %s (%d)\n", debugstr_w(path), res); delete_key( comp, root, path );

1 0

Huw Davies : msi: Fix a registry key leak.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 4a992fec01ab142063da2fc2f66b2a58c8845c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a992fec01ab142063da2fc2f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 15 12:32:18 2015 +0100 msi: Fix a registry key leak. --- dlls/msi/action.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 88bb1bb..22e97a7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2973,13 +2973,17 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) access |= get_registry_view( comp ); if (!(subkey = strdupW( path ))) return; - for (;;) + do { - if ((p = strrchrW( subkey, '\\' ))) *p = 0; - hkey = open_key( comp, root, subkey, FALSE ); - if (!hkey) break; - if (p && p[1]) + if ((p = strrchrW( subkey, '\\' ))) + { + *p = 0; + if (!p[1]) continue; /* trailing backslash */ + hkey = open_key( comp, root, subkey, FALSE ); + if (!hkey) break; res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); + RegCloseKey( hkey ); + } else res = RegDeleteKeyExW( root, subkey, access, 0 ); if (res) @@ -2987,9 +2991,7 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) TRACE("failed to delete key %s (%d)\n", debugstr_w(subkey), res); break; } - if (p && p[1]) RegCloseKey( hkey ); - else break; - } + } while (p); msi_free( subkey ); }

1 0

Henri Verbeet : d2d1: Properly trace "vertex_count" in d2d_path_geometry_triangulate().
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: bebee86da69b5981f0fb31035ded502b661866d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bebee86da69b5981f0fb31035… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 15 11:20:06 2015 +0200 d2d1: Properly trace "vertex_count" in d2d_path_geometry_triangulate(). --- dlls/d2d1/geometry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 6def218..a94277b 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -846,7 +846,7 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) if (vertex_count < 3) { - WARN("Geometry has %u vertices.\n", vertex_count); + WARN("Geometry has %lu vertices.\n", (long)vertex_count); return S_OK; }

1 0

Dmitry Timoshkov : windowscodecs: Properly handle empty GIF extension blocks.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 7eaff17786717f9816a40ee5417a57dd3264b331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eaff17786717f9816a40ee54… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 15 16:34:34 2015 +0800 windowscodecs: Properly handle empty GIF extension blocks. --- dlls/windowscodecs/ungif.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index b413ff0..c6711c8 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -932,9 +932,17 @@ DGifSlurp(GifFileType * GifFile) { Extensions->Function = Function; - /* Create an extension block with our data */ - if (AddExtensionBlock(Extensions, ExtData[0], &ExtData[1]) == GIF_ERROR) - return (GIF_ERROR); + if (ExtData) + { + /* Create an extension block with our data */ + if (AddExtensionBlock(Extensions, ExtData[0], &ExtData[1]) == GIF_ERROR) + return (GIF_ERROR); + } + else /* Empty extension block */ + { + if (AddExtensionBlock(Extensions, 0, NULL) == GIF_ERROR) + return (GIF_ERROR); + } while (ExtData != NULL) { int Len;

1 0

Nikolay Sivov : dwrite: Fix transform matrix usage for pixel snapping.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: f46aa66ca7c2874577edda6278c34c8c91b1da56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46aa66ca7c2874577edda627… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 15 10:44:15 2015 +0300 dwrite: Fix transform matrix usage for pixel snapping. --- dlls/dwrite/layout.c | 13 +++++++------ dlls/dwrite/tests/layout.c | 30 +++++++++++++++++++++++------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 1f7beb4..99ec7b4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2735,17 +2735,18 @@ static inline FLOAT renderer_apply_snapping(FLOAT coord, BOOL skiptransform, FLO if (!skiptransform) { /* apply transform */ vec[0] = 0.0; - vec[1] = coord; + vec[1] = coord * ppdip; - vec2[0] = m->m11 * vec[0] + m->m12 * vec[1] + m->dx; - vec2[1] = m->m21 * vec[0] + m->m22 * vec[1] + m->dy; + vec2[0] = m->m11 * vec[0] + m->m21 * vec[1] + m->dx; + vec2[1] = m->m12 * vec[0] + m->m22 * vec[1] + m->dy; /* snap */ - vec2[0] = floorf(vec2[0] * ppdip + 0.5f) / ppdip; - vec2[1] = floorf(vec2[1] * ppdip + 0.5f) / ppdip; + vec2[0] = floorf(vec2[0] + 0.5f); + vec2[1] = floorf(vec2[1] + 0.5f); /* apply inverted transform, we don't care about X component at this point */ - vec[1] = (-m->m21 * vec2[0] + m->m11 * vec2[1] - (m->m11 * m->dy - m->m12 * m->dx)) / det; + vec[1] = (-m->m12 * vec2[0] + m->m11 * vec2[1] - (m->m11 * m->dy - m->m12 * m->dx)) / det; + vec[1] /= ppdip; } else vec[1] = floorf(coord * ppdip + 0.5f) / ppdip; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 2423f8b..950b021 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -22,6 +22,7 @@ #include <assert.h> #include <math.h> +#include <limits.h> #include "windows.h" #include "dwrite.h" @@ -3271,17 +3272,18 @@ static FLOAT snap_coord(const DWRITE_MATRIX *m, FLOAT ppdip, FLOAT coord) if (transform) { /* apply transform */ vec[0] = 0.0; - vec[1] = coord; + vec[1] = coord * ppdip; - vec2[0] = m->m11 * vec[0] + m->m12 * vec[1] + m->dx; - vec2[1] = m->m21 * vec[0] + m->m22 * vec[1] + m->dy; + vec2[0] = m->m11 * vec[0] + m->m21 * vec[1] + m->dx; + vec2[1] = m->m12 * vec[0] + m->m22 * vec[1] + m->dy; /* snap */ - vec2[0] = floorf(vec2[0] * ppdip + 0.5f) / ppdip; - vec2[1] = floorf(vec2[1] * ppdip + 0.5f) / ppdip; + vec2[0] = floorf(vec2[0] + 0.5f); + vec2[1] = floorf(vec2[1] + 0.5f); /* apply inverted transform */ - vec[1] = (-m->m21 * vec2[0] + m->m11 * vec2[1] - (m->m11 * m->dy - m->m12 * m->dx)) / det; + vec[1] = (-m->m12 * vec2[0] + m->m11 * vec2[1] - (m->m11 * m->dy - m->m12 * m->dx)) / det; + vec[1] /= ppdip; } else vec[1] = floorf(coord * ppdip + 0.5f) / ppdip; @@ -3290,7 +3292,15 @@ static FLOAT snap_coord(const DWRITE_MATRIX *m, FLOAT ppdip, FLOAT coord) static inline BOOL float_eq(FLOAT left, FLOAT right) { - return fabsf(left - right) < 1e-6f; + int x = *(int *)&left; + int y = *(int *)&right; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + return abs(x - y) <= 16; } struct snapping_test { @@ -3319,8 +3329,14 @@ static struct snapping_test snapping_tests[] = { { { 0.0, 1.0, -1.0, 0.0, 0.2, 0.6 }, 1.0 }, /* 90 degrees rotation */ { { -1.0, 0.0, 0.0, -1.0, 0.2, 0.6 }, 1.0 }, /* 180 degrees rotation */ { { 0.0, -1.0, 1.0, 0.0, 0.2, 0.6 }, 1.0 }, /* 270 degrees rotation */ + { { 1.0, 0.0, 0.0, 1.0,-0.1, 0.2 }, 1.0 }, + { { 0.0, 1.0, -1.0, 0.0,-0.2,-0.3 }, 1.0 }, /* 90 degrees rotation */ + { { -1.0, 0.0, 0.0, -1.0,-0.3,-1.6 }, 1.0 }, /* 180 degrees rotation */ + { { 0.0, -1.0, 1.0, 0.0,-0.7, 0.6 }, 10.0 }, /* 270 degrees rotation */ { { 0.0, 2.0, 1.0, 0.0, 0.2, 0.6 }, 1.0 }, { { 0.0, 0.0, 1.0, 0.0, 0.0, 0.0 }, 1.0 }, + { { 3.0, 0.0, 0.0, 5.0, 0.2,-0.3 }, 10.0 }, + { { 0.0, -3.0, 5.0, 0.0,-0.1, 0.7 }, 10.0 }, }; static DWRITE_MATRIX compattransforms[] = {

1 0

Sebastian Lackner : kernel32/tests: Repeat test for SignalObjectAndWait multiple times to test wineserver wakeup cookie management.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 4ccdc0c03681dbdf4dd5239a923764f7555e2da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ccdc0c03681dbdf4dd5239a9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 15 06:20:08 2015 +0200 kernel32/tests: Repeat test for SignalObjectAndWait multiple times to test wineserver wakeup cookie management. --- dlls/kernel32/tests/sync.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index cbe0acb..a9d2377 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -64,6 +64,7 @@ static void test_signalandwait(void) HMODULE kernel32; DWORD r; HANDLE event[2], semaphore[2], file; + int i; kernel32 = GetModuleHandleA("kernel32.dll"); pSignalObjectAndWait = (void*) GetProcAddress(kernel32, "SignalObjectAndWait"); @@ -96,9 +97,13 @@ static void test_signalandwait(void) r = pSignalObjectAndWait(event[0], event[1], 0, FALSE); ok( r == WAIT_OBJECT_0, "should succeed\n"); - /* event[0] is now signalled */ - r = pSignalObjectAndWait(event[0], event[0], 0, FALSE); - ok( r == WAIT_OBJECT_0, "should succeed\n"); + /* event[0] is now signalled - we repeat this test multiple times + * to ensure that the wineserver handles this situation properly. */ + for (i = 0; i < 10000; i++) + { + r = pSignalObjectAndWait(event[0], event[0], 0, FALSE); + ok(r == WAIT_OBJECT_0, "should succeed\n"); + } /* event[0] is not signalled */ r = WaitForSingleObject(event[0], 0);

1 0

Sebastian Lackner : server: Avoid sending unexpected wakeup with uninitialized cookie value.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 3db6d1acafab6fbb22b5bcefee99099779653b5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db6d1acafab6fbb22b5bcefe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 15 06:19:54 2015 +0200 server: Avoid sending unexpected wakeup with uninitialized cookie value. The code for SELECT_SIGNAL_AND_WAIT in select_on() calls signal_object(). This might wake up the same thread which is currently in the wineserver call. The value for current->wait->cookie is initialized at the end of the function, and not defined yet at this point. --- server/thread.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/server/thread.c b/server/thread.c index 6c5d12d..8471651 100644 --- a/server/thread.c +++ b/server/thread.c @@ -601,6 +601,7 @@ static int wait_on( const select_op_t *select_op, unsigned int count, struct obj wait->count = count; wait->flags = flags; wait->select = select_op->op; + wait->cookie = 0; wait->user = NULL; wait->timeout = timeout; wait->abandoned = 0; @@ -719,7 +720,7 @@ int wake_thread( struct thread *thread ) cookie = thread->wait->cookie; if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=%d\n", thread->id, signaled ); end_wait( thread ); - if (send_thread_wakeup( thread, cookie, signaled ) == -1) /* error */ + if (cookie && send_thread_wakeup( thread, cookie, signaled ) == -1) /* error */ { if (!count) count = -1; break; @@ -749,7 +750,7 @@ int wake_thread_queue_entry( struct wait_queue_entry *entry ) if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=%d\n", thread->id, signaled ); end_wait( thread ); - if (send_thread_wakeup( thread, cookie, signaled ) != -1) + if (!cookie || send_thread_wakeup( thread, cookie, signaled ) != -1) wake_thread( thread ); /* check other waits too */ return 1; @@ -768,6 +769,8 @@ static void thread_timeout( void *ptr ) if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=TIMEOUT\n", thread->id ); end_wait( thread ); + + assert( cookie ); if (send_thread_wakeup( thread, cookie, STATUS_TIMEOUT ) == -1) return; /* check if other objects have become signaled in the meantime */ wake_thread( thread ); @@ -1429,6 +1432,12 @@ DECL_HANDLER(select) set_error( STATUS_INVALID_PARAMETER ); return; } + if (!req->cookie) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + op_size = min( get_req_data_size() - sizeof(*result), sizeof(select_op) ); memset( &select_op, 0, sizeof(select_op) ); memcpy( &select_op, result + 1, op_size );

1 0

Alexandre Julliard : winebuild: Add DllMain to the list of functions that should be private.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 8935863f550fd26e8cc111dd92a90d4c9b15ef01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8935863f550fd26e8cc111dd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 15:57:51 2015 +0900 winebuild: Add DllMain to the list of functions that should be private. --- dlls/acledit/acledit.spec | 2 +- dlls/gpkcsp/gpkcsp.spec | 2 +- dlls/xinput1_3/xinput1_3.spec | 2 +- dlls/xinput1_4/xinput1_4.spec | 2 +- tools/winebuild/parser.c | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/acledit/acledit.spec b/dlls/acledit/acledit.spec index e1a30a1..7343290 100644 --- a/dlls/acledit/acledit.spec +++ b/dlls/acledit/acledit.spec @@ -1,7 +1,7 @@ 1 stub EditAuditInfo 2 stub EditOwnerInfo 3 stub EditPermissionInfo -4 stdcall DllMain(long long ptr) +4 stdcall -private DllMain(long long ptr) 5 stdcall FMExtensionProcW(long long long) 6 stub SedDiscretionaryAclEditor 7 stub SedSystemAclEditor diff --git a/dlls/gpkcsp/gpkcsp.spec b/dlls/gpkcsp/gpkcsp.spec index af3cdee..7b21641 100644 --- a/dlls/gpkcsp/gpkcsp.spec +++ b/dlls/gpkcsp/gpkcsp.spec @@ -21,6 +21,6 @@ @ stub CPSetProvParam @ stub CPSignHash @ stub CPVerifySignature -@ stdcall DllMain(ptr long ptr) +@ stdcall -private DllMain(ptr long ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/xinput1_3/xinput1_3.spec b/dlls/xinput1_3/xinput1_3.spec index 5b7f1b9..af4f1e0 100644 --- a/dlls/xinput1_3/xinput1_3.spec +++ b/dlls/xinput1_3/xinput1_3.spec @@ -1,4 +1,4 @@ -1 stdcall DllMain(long long ptr) +1 stdcall -private DllMain(long long ptr) 2 stdcall XInputGetState(long ptr) 3 stdcall XInputSetState(long ptr) 4 stdcall XInputGetCapabilities(long long ptr) diff --git a/dlls/xinput1_4/xinput1_4.spec b/dlls/xinput1_4/xinput1_4.spec index a911666..9d08286 100644 --- a/dlls/xinput1_4/xinput1_4.spec +++ b/dlls/xinput1_4/xinput1_4.spec @@ -1,4 +1,4 @@ -1 stdcall DllMain(long long ptr) +1 stdcall -private DllMain(long long ptr) 2 stdcall XInputGetState(long ptr) xinput1_3.XInputGetState 3 stdcall XInputSetState(long ptr) xinput1_3.XInputSetState 4 stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 9252ee8..1d7b84e 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -603,6 +603,7 @@ static int parse_spec_ordinal( int ordinal, DLLSPEC *spec ) { if (!strcmp( odp->name, "DllRegisterServer" ) || !strcmp( odp->name, "DllUnregisterServer" ) || + !strcmp( odp->name, "DllMain" ) || !strcmp( odp->name, "DllGetClassObject" ) || !strcmp( odp->name, "DllGetVersion" ) || !strcmp( odp->name, "DllInstall" ) ||

1 0

Dmitry Timoshkov : ntdll: Cache contents of IMAGE_TLS_DIRECTORY instead of saving a directory pointer.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 21c37248135f6379e6af7aa3ec29997314e5c52d URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c37248135f6379e6af7aa3e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 14 16:36:12 2015 +0800 ntdll: Cache contents of IMAGE_TLS_DIRECTORY instead of saving a directory pointer. --- dlls/ntdll/loader.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 921bf57..bef0ab1 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -94,7 +94,7 @@ static struct builtin_load_info *builtin_load_info = &default_load_info; static HANDLE main_exe_file; static UINT tls_module_count; /* number of modules with TLS directory */ -static const IMAGE_TLS_DIRECTORY **tls_dirs; /* array of TLS directories */ +static IMAGE_TLS_DIRECTORY *tls_dirs; /* array of TLS directories */ LIST_ENTRY tls_links = { &tls_links, &tls_links }; static RTL_CRITICAL_SECTION loader_section; @@ -772,7 +772,12 @@ static SHORT alloc_tls_slot( LDR_MODULE *mod ) size = dir->EndAddressOfRawData - dir->StartAddressOfRawData; if (!size && !dir->SizeOfZeroFill && !dir->AddressOfCallBacks) return -1; - for (i = 0; i < tls_module_count; i++) if (!tls_dirs[i]) break; + for (i = 0; i < tls_module_count; i++) + { + if (!tls_dirs[i].StartAddressOfRawData && !tls_dirs[i].EndAddressOfRawData && + !tls_dirs[i].SizeOfZeroFill && !tls_dirs[i].AddressOfCallBacks) + break; + } TRACE( "module %p data %p-%p zerofill %u index %p callback %p flags %x -> slot %u\n", mod->BaseAddress, (void *)dir->StartAddressOfRawData, (void *)dir->EndAddressOfRawData, dir->SizeOfZeroFill, @@ -824,7 +829,7 @@ static SHORT alloc_tls_slot( LDR_MODULE *mod ) } *(DWORD *)dir->AddressOfIndex = i; - tls_dirs[i] = dir; + tls_dirs[i] = *dir; return i; } @@ -841,7 +846,7 @@ static void free_tls_slot( LDR_MODULE *mod ) if (mod->TlsIndex == -1) return; assert( i < tls_module_count ); - tls_dirs[i] = NULL; + memset( &tls_dirs[i], 0, sizeof(tls_dirs[i]) ); } @@ -987,7 +992,7 @@ static NTSTATUS alloc_thread_tls(void) for (i = 0; i < tls_module_count; i++) { - const IMAGE_TLS_DIRECTORY *dir = tls_dirs[i]; + const IMAGE_TLS_DIRECTORY *dir = &tls_dirs[i]; if (!dir) continue; size = dir->EndAddressOfRawData - dir->StartAddressOfRawData;

1 0

Sebastian Lackner : vcomp: Implement _vcomp_set_num_threads and omp_get_thread_num.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: f59551c22209e8b4116a5ccfdfb6c28c6144cbf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f59551c22209e8b4116a5ccfd… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jul 14 21:40:10 2015 +0200 vcomp: Implement _vcomp_set_num_threads and omp_get_thread_num. --- dlls/vcomp/main.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 4 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index b827920..8ec3616 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -29,10 +29,54 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcomp); +static DWORD vcomp_context_tls = TLS_OUT_OF_INDEXES; static int vcomp_max_threads; static int vcomp_num_threads; static BOOL vcomp_nested_fork = FALSE; +struct vcomp_thread_data +{ + int thread_num; + int fork_threads; +}; + +static inline struct vcomp_thread_data *vcomp_get_thread_data(void) +{ + return (struct vcomp_thread_data *)TlsGetValue(vcomp_context_tls); +} + +static inline void vcomp_set_thread_data(struct vcomp_thread_data *thread_data) +{ + TlsSetValue(vcomp_context_tls, thread_data); +} + +static struct vcomp_thread_data *vcomp_init_thread_data(void) +{ + struct vcomp_thread_data *thread_data = vcomp_get_thread_data(); + if (thread_data) return thread_data; + + if (!(thread_data = HeapAlloc(GetProcessHeap(), 0, sizeof(*thread_data)))) + { + ERR("could not create thread data\n"); + ExitProcess(1); + } + + thread_data->thread_num = 0; + thread_data->fork_threads = 0; + + vcomp_set_thread_data(thread_data); + return thread_data; +} + +static void vcomp_free_thread_data(void) +{ + struct vcomp_thread_data *thread_data = vcomp_get_thread_data(); + if (!thread_data) return; + + HeapFree(GetProcessHeap(), 0, thread_data); + vcomp_set_thread_data(NULL); +} + int CDECL omp_get_dynamic(void) { TRACE("stub\n"); @@ -65,8 +109,8 @@ int CDECL omp_get_num_threads(void) int CDECL omp_get_thread_num(void) { - TRACE("stub\n"); - return 0; + TRACE("()\n"); + return vcomp_init_thread_data()->thread_num; } /* Time in seconds since "some time in the past" */ @@ -100,7 +144,9 @@ void CDECL _vcomp_barrier(void) void CDECL _vcomp_set_num_threads(int num_threads) { - TRACE("(%d): stub\n", num_threads); + TRACE("(%d)\n", num_threads); + if (num_threads >= 1) + vcomp_init_thread_data()->fork_threads = num_threads; } int CDECL _vcomp_single_begin(int flags) @@ -126,13 +172,35 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) case DLL_PROCESS_ATTACH: { SYSTEM_INFO sysinfo; - DisableThreadLibraryCalls(instance); + + if ((vcomp_context_tls = TlsAlloc()) == TLS_OUT_OF_INDEXES) + { + ERR("Failed to allocate TLS index\n"); + return FALSE; + } GetSystemInfo(&sysinfo); vcomp_max_threads = sysinfo.dwNumberOfProcessors; vcomp_num_threads = sysinfo.dwNumberOfProcessors; break; } + + case DLL_PROCESS_DETACH: + { + if (reserved) break; + if (vcomp_context_tls != TLS_OUT_OF_INDEXES) + { + vcomp_free_thread_data(); + TlsFree(vcomp_context_tls); + } + break; + } + + case DLL_THREAD_DETACH: + { + vcomp_free_thread_data(); + break; + } } return TRUE;

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2015