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

Sebastian Lackner : services: Sort autostart services by dwTagId config value.
by Alexandre Julliard Aug. 18, 2016

Aug. 18, 2016

Module: wine Branch: master Commit: 6fc42341ecdf71d80e3b7ac46961f29beb660c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fc42341ecdf71d80e3b7ac46… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 18 09:31:35 2016 +0200 services: Sort autostart services by dwTagId config value. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/services/services.c b/programs/services/services.c index 9156dbc..1092a25 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -318,6 +318,13 @@ static void scmdatabase_remove_service(struct scmdatabase *db, struct service_en service->entry.next = service->entry.prev = NULL; } +static int compare_tags(const void *a, const void *b) +{ + struct service_entry *service_a = *(struct service_entry **)a; + struct service_entry *service_b = *(struct service_entry **)b; + return service_a->config.dwTagId - service_b->config.dwTagId; +} + static void scmdatabase_autostart_services(struct scmdatabase *db) { struct service_entry **services_list; @@ -352,6 +359,7 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) size = i; scmdatabase_unlock(db); + qsort(services_list, size, sizeof(services_list[0]), compare_tags); while (!scmdatabase_lock_startup(db)) Sleep(10); for (i = 0; i < size; i++)

1 0

Sebastian Lackner : services: Track number of services per process.
by Alexandre Julliard Aug. 18, 2016

Aug. 18, 2016

Module: wine Branch: master Commit: 36ccc45db600f71b59c939988f06ee96427791c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36ccc45db600f71b59c939988… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 18 09:27:58 2016 +0200 services: Track number of services per process. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 9 +++++++-- programs/services/services.c | 5 ++++- programs/services/services.h | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 64d5879..977ddb6 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -761,7 +761,8 @@ DWORD __cdecl svcctl_SetServiceStatus( if (lpServiceStatus->dwCurrentState == SERVICE_STOPPED) { service->service_entry->process = NULL; - terminate_after_timeout(process, service_kill_timeout); + if (!--process->use_count) + terminate_after_timeout(process, service_kill_timeout); release_process(process); } else @@ -1135,7 +1136,11 @@ DWORD __cdecl svcctl_ControlService( { result = ERROR_SERVICE_CANNOT_ACCEPT_CTRL; if ((process = service->service_entry->process)) - process_terminate(process); + { + service->service_entry->process = NULL; + if (!--process->use_count) process_terminate(process); + release_process(process); + } } if (result != ERROR_SUCCESS) diff --git a/programs/services/services.c b/programs/services/services.c index 9be9bb8..177acf1 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -752,8 +752,9 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p service_unlock(service_entry); return ERROR_SERVICE_ALREADY_RUNNING; } - release_process(process); service_entry->process = NULL; + process->use_count--; + release_process(process); } service_entry->force_shutdown = FALSE; @@ -784,6 +785,7 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p service_entry->status.dwCurrentState = SERVICE_START_PENDING; scmdatabase_add_process(service_entry->db, process); service_entry->process = grab_process(process); + process->use_count++; service_unlock(service_entry); @@ -945,6 +947,7 @@ void process_terminate(struct process_entry *process) if (service->process != process) continue; service->status.dwCurrentState = SERVICE_STOPPED; service->process = NULL; + process->use_count--; release_process(process); } scmdatabase_unlock(db); diff --git a/programs/services/services.h b/programs/services/services.h index 59d8d00..a3ecdf2 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -37,6 +37,7 @@ struct process_entry struct list entry; struct scmdatabase *db; LONG ref_count; + LONG use_count; DWORD process_id; HANDLE process; HANDLE control_mutex;

1 0

Bruno Jesus : dinput: Use the correct index to remap the axis.
by Alexandre Julliard Aug. 18, 2016

Aug. 18, 2016

Module: wine Branch: master Commit: 299a6ce5bb1f607a6065eabd749ab68abf00da65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=299a6ce5bb1f607a6065eabd7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Aug 18 03:34:37 2016 -0300 dinput: Use the correct index to remap the axis. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index de76896..46ea316 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -291,6 +291,11 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF case (DWORD_PTR)DIPROP_RANGE: { LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph; if (ph->dwHow == DIPH_DEVICE) { + + /* Many games poll the joystick immediately after setting the range + * for calibration purposes, so the old values need to be remapped + * to the new range before it does so */ + TRACE("proprange(%d,%d) all\n", pr->lMin, pr->lMax); for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) { @@ -324,8 +329,6 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF TRACE("proprange(%d,%d) obj=%d\n", pr->lMin, pr->lMax, obj); if (obj >= 0) { - /*ePSXe polls the joystick immediately after setting the range for calibration purposes, so the old values need to be remapped to the new range before it does so*/ - remap_props.lDevMin = This->props[obj].lMin; remap_props.lDevMax = This->props[obj].lMax; @@ -335,7 +338,7 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF remap_props.lMin = pr->lMin; remap_props.lMax = pr->lMax; - switch (ph->dwObj) { + switch (This->base.data_format.wine_df->rgodf[obj].dwOfs) { case DIJOFS_X : This->js.lX = joystick_map_axis(&remap_props, This->js.lX); break; case DIJOFS_Y : This->js.lY = joystick_map_axis(&remap_props, This->js.lY); break; case DIJOFS_Z : This->js.lZ = joystick_map_axis(&remap_props, This->js.lZ); break;

1 0

Bruno Jesus : include: Add DIPROP_PRODUCTNAME and remove duplicate #defines from dinput.h.
by Alexandre Julliard Aug. 18, 2016

Aug. 18, 2016

Module: wine Branch: master Commit: b5159c6a2d387c9829571b019eea79615f41c3c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5159c6a2d387c9829571b019… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Aug 18 02:03:25 2016 -0300 include: Add DIPROP_PRODUCTNAME and remove duplicate #defines from dinput.h. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dinput.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/dinput.h b/include/dinput.h index a714eeb..beb81a7 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -908,9 +908,8 @@ typedef const DIPROPSTRING *LPCDIPROPSTRING; #define DIPROP_GUIDANDPATH MAKEDIPROP(12) #define DIPROP_INSTANCENAME MAKEDIPROP(13) +#define DIPROP_PRODUCTNAME MAKEDIPROP(14) #define DIPROP_JOYSTICKID MAKEDIPROP(15) -#define DIPROP_KEYNAME MAKEDIPROP(20) -#define DIPROP_VIDPID MAKEDIPROP(24) #define DIPROP_KEYNAME MAKEDIPROP(20) #define DIPROP_CPOINTS MAKEDIPROP(21)

1 0

Bruno Jesus : dinput: Implement GetDeviceInfo(A) using the W version in the event driver.
by Alexandre Julliard Aug. 18, 2016

Aug. 18, 2016

Module: wine Branch: master Commit: dd7b65730dbdea4992f8b4593f16d077ad79c310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd7b65730dbdea4992f8b4593… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Aug 17 21:49:55 2016 -0300 dinput: Implement GetDeviceInfo(A) using the W version in the event driver. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linuxinput.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index ff02849..aaed701 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -339,7 +339,7 @@ static void find_joydevs(void) } } -static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) +static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) { DWORD dwSize = lpddi->dwSize; @@ -356,29 +356,31 @@ static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver else lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); - strcpy(lpddi->tszInstanceName, joydevs[id].name); - strcpy(lpddi->tszProductName, joydevs[id].name); + MultiByteToWideChar(CP_ACP, 0, joydevs[id].name, -1, lpddi->tszInstanceName, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, joydevs[id].name, -1, lpddi->tszProductName, MAX_PATH); } -static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) +static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { + DIDEVICEINSTANCEW lpddiW; DWORD dwSize = lpddi->dwSize; + lpddiW.dwSize = sizeof(lpddiW); + fill_joystick_dideviceinstanceW(&lpddiW, version, id); + TRACE("%d %p\n", dwSize, lpddi); memset(lpddi, 0, dwSize); - lpddi->dwSize = dwSize; - lpddi->guidInstance = joydevs[id].guid; - lpddi->guidProduct = joydevs[id].guid_product; - lpddi->guidFFDriver = GUID_NULL; - - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); - - MultiByteToWideChar(CP_ACP, 0, joydevs[id].name, -1, lpddi->tszInstanceName, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, joydevs[id].name, -1, lpddi->tszProductName, MAX_PATH); + /* Convert W->A */ + lpddi->dwSize = dwSize; + lpddi->guidInstance = lpddiW.guidInstance; + lpddi->guidProduct = lpddiW.guidProduct; + lpddi->dwDevType = lpddiW.dwDevType; + strcpy(lpddi->tszInstanceName, joydevs[id].name); + strcpy(lpddi->tszProductName, joydevs[id].name); + lpddi->guidFFDriver = lpddiW.guidFFDriver; + lpddi->wUsagePage = lpddiW.wUsagePage; + lpddi->wUsage = lpddiW.wUsage; } static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id)

1 0

Józef Kucia : user32: Prevent resetting WS_MINIMIZE through SetWindowLong.
by Alexandre Julliard Aug. 18, 2016

Aug. 18, 2016

Module: wine Branch: master Commit: 4277b055dec37fb8da85d6b674e9b522c8bdbfd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4277b055dec37fb8da85d6b67… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 17 13:56:09 2016 +0200 user32: Prevent resetting WS_MINIMIZE through SetWindowLong. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 9 ++------- dlls/user32/win.c | 2 ++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f7ed6d5..2ba5f76 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6281,7 +6281,6 @@ static LRESULT WINAPI check_style_wnd_proc(HWND hwnd, UINT message, WPARAM wPara { ok(got->styleOld == expected[1].styleOld, "expected old style %#x, got %#x\n", expected[1].styleOld, got->styleOld); - todo_wine_if(expected[0].styleOld & WS_MINIMIZE) ok(got->styleNew == expected[1].styleNew, "expected new style %#x, got %#x\n", expected[1].styleNew, got->styleNew); } @@ -6330,13 +6329,9 @@ static void test_set_window_style(void) for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) { - BOOL todo = FALSE; expected_style = tests[i].style; - if ((tests[i].creation_style & WS_MINIMIZE) && !(tests[i].style & WS_MINIMIZE)) - { - todo = TRUE; + if (tests[i].creation_style & WS_MINIMIZE) expected_style |= WS_MINIMIZE; - } expected_stylestruct[0].styleOld = tests[i].creation_style; expected_stylestruct[0].styleNew = tests[i].style; @@ -6352,7 +6347,7 @@ static void test_set_window_style(void) ok(old_style == tests[i].creation_style, "expected old style %#x, got %#x\n", tests[i].creation_style, old_style); new_style = GetWindowLongA(hwnd, GWL_STYLE); - todo_wine_if(todo) ok(new_style == expected_style, "expected new style %#x, got %#x\n", + ok(new_style == expected_style, "expected new style %#x, got %#x\n", expected_style, new_style); SetWindowLongPtrA(hwnd, GWLP_USERDATA, 0); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index f69297c..8ece6a1 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2367,6 +2367,8 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B newval = style.styleNew; /* WS_CLIPSIBLINGS can't be reset on top-level windows */ if (wndPtr->parent == GetDesktopWindow()) newval |= WS_CLIPSIBLINGS; + /* WS_MINIMIZE can't be reset */ + if (wndPtr->dwStyle & WS_MINIMIZE) newval |= WS_MINIMIZE; /* FIXME: changing WS_DLGFRAME | WS_THICKFRAME is supposed to change WS_EX_WINDOWEDGE too */ break;

1 0

Piotr Caban : ntdll: Call exception handler with correct context.
by Alexandre Julliard Aug. 18, 2016

Aug. 18, 2016

Module: wine Branch: master Commit: 7c060d0061596c4370c4ccaa26c74b779783f14b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c060d0061596c4370c4ccaa2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 17 12:48:10 2016 +0200 ntdll: Call exception handler with correct context. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index e54f162..e50c8ed 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2256,13 +2256,13 @@ static RUNTIME_FUNCTION *lookup_function_info( ULONG64 pc, ULONG64 *base, LDR_MO * Call a single exception handler. * FIXME: Handle nested exceptions. */ -static DWORD call_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch ) +static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) { DWORD res; TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); - res = dispatch->LanguageHandler( rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); + res = dispatch->LanguageHandler( rec, dispatch->EstablisherFrame, context, dispatch ); TRACE( "handler at %p returned %u\n", dispatch->LanguageHandler, res ); return res; } @@ -2274,14 +2274,14 @@ static DWORD call_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch ) * Call a single exception handler from the TEB chain. * FIXME: Handle nested exceptions. */ -static DWORD call_teb_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch, +static DWORD call_teb_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch, EXCEPTION_REGISTRATION_RECORD *teb_frame ) { DWORD res; TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch ); - res = teb_frame->Handler( rec, teb_frame, dispatch->ContextRecord, (EXCEPTION_REGISTRATION_RECORD**)dispatch ); + res = teb_frame->Handler( rec, teb_frame, context, (EXCEPTION_REGISTRATION_RECORD**)dispatch ); TRACE( "handler at %p returned %u\n", teb_frame->Handler, res ); return res; } @@ -2385,7 +2385,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex if (dispatch.LanguageHandler) { - switch (call_handler( rec, &dispatch )) + switch (call_handler( rec, orig_context, &dispatch )) { case ExceptionContinueExecution: if (rec->ExceptionFlags & EH_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION; @@ -2414,8 +2414,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex TRACE( "found wine frame %p rsp %lx handler %p\n", teb_frame, new_context.Rsp, teb_frame->Handler ); dispatch.EstablisherFrame = (ULONG64)teb_frame; - context = *orig_context; - switch (call_teb_handler( rec, &dispatch, teb_frame )) + switch (call_teb_handler( rec, orig_context, &dispatch, teb_frame )) { case ExceptionContinueExecution: if (rec->ExceptionFlags & EH_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION;

1 0

John Sheu : kernel32/tests: Add thread tests for fiber-local storage.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 4e8f43f42307e74ec4e093eb83cb345dd6507ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e8f43f42307e74ec4e093eb8… Author: John Sheu <sheu(a)google.com> Date: Tue Aug 2 15:55:44 2016 -0700 kernel32/tests: Add thread tests for fiber-local storage. Signed-off-by: John Sheu <sheu(a)google.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 225 ++++++++++++++++++++++++++++--------------- 1 file changed, 148 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e8f43f42307e74ec4e09…

1 0

John Sheu : kernel32/tests: Add loader tests for fiber-local storage.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: ab11a5ae455400c4476fe4043a34aca6f56c307c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab11a5ae455400c4476fe4043… Author: John Sheu <sheu(a)google.com> Date: Tue Aug 2 15:55:43 2016 -0700 kernel32/tests: Add loader tests for fiber-local storage. Signed-off-by: John Sheu <sheu(a)google.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 111 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 28449ac..4f72c3e 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -70,6 +70,10 @@ static PVOID (WINAPI *pResolveDelayLoadedAPI)(PVOID, PCIMAGE_DELAYLOAD_DESCRI PDELAYLOAD_FAILURE_DLL_CALLBACK, PVOID, PIMAGE_THUNK_DATA ThunkAddress,ULONG); static PVOID (WINAPI *pRtlImageDirectoryEntryToData)(HMODULE,BOOL,WORD,ULONG *); +static DWORD (WINAPI *pFlsAlloc)(PFLS_CALLBACK_FUNCTION); +static BOOL (WINAPI *pFlsSetValue)(DWORD, PVOID); +static PVOID (WINAPI *pFlsGetValue)(DWORD); +static BOOL (WINAPI *pFlsFree)(DWORD); static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { @@ -1476,6 +1480,7 @@ static HANDLE attached_thread[MAX_COUNT]; static DWORD attached_thread_count; HANDLE stop_event, event, mutex, semaphore, loader_lock_event, peb_lock_event, heap_lock_event, ack_event; static int test_dll_phase, inside_loader_lock, inside_peb_lock, inside_heap_lock; +static LONG fls_callback_count; static DWORD WINAPI mutex_thread_proc(void *param) { @@ -1558,9 +1563,18 @@ static DWORD WINAPI noop_thread_proc(void *param) return 195; } +static VOID WINAPI fls_callback(PVOID lpFlsData) +{ + ok(lpFlsData == (void*) 0x31415, "lpFlsData is %p, expected %p\n", lpFlsData, (void*) 0x31415); + InterlockedIncrement(&fls_callback_count); +} + static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) { static LONG noop_thread_started; + static DWORD fls_index = FLS_OUT_OF_INDEXES; + static int fls_count = 0; + static int thread_detach_count = 0; DWORD ret; ok(!inside_loader_lock, "inside_loader_lock should not be set\n"); @@ -1574,6 +1588,23 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ret = pRtlDllShutdownInProgress(); ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); + /* Set up the FLS slot, if FLS is available */ + if (pFlsGetValue) + { + void* value; + BOOL bret; + ret = pFlsAlloc(&fls_callback); + ok(ret != FLS_OUT_OF_INDEXES, "FlsAlloc returned %d\n", ret); + fls_index = ret; + SetLastError(0xdeadbeef); + value = pFlsGetValue(fls_index); + ok(!value, "FlsGetValue returned %p, expected NULL\n", value); + ok(GetLastError() == ERROR_SUCCESS, "FlsGetValue failed with error %u\n", GetLastError()); + bret = pFlsSetValue(fls_index, (void*) 0x31415); + ok(bret, "FlsSetValue failed\n"); + fls_count++; + } + break; case DLL_PROCESS_DETACH: { @@ -1627,6 +1658,43 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ok(!ret || broken(ret) /* before Vista */, "RtlDllShutdownInProgress returned %d\n", ret); } + /* In the case that the process is terminating, FLS slots should still be accessible, but + * the callback should be already run for this thread and the contents already NULL. + * Note that this is broken for Win2k3, which runs the callbacks *after* the DLL entry + * point has already run. + */ + if (param && pFlsGetValue) + { + void* value; + SetLastError(0xdeadbeef); + value = pFlsGetValue(fls_index); + todo_wine + { + ok(broken(value == (void*) 0x31415) || /* Win2k3 */ + value == NULL, "FlsGetValue returned %p, expected NULL\n", value); + } + ok(GetLastError() == ERROR_SUCCESS, "FlsGetValue failed with error %u\n", GetLastError()); + todo_wine + { + ok(broken(fls_callback_count == thread_detach_count) || /* Win2k3 */ + fls_callback_count == thread_detach_count + 1, + "wrong FLS callback count %d, expected %d\n", fls_callback_count, thread_detach_count + 1); + } + } + if (pFlsFree) + { + BOOL ret; + /* Call FlsFree now and run the remaining callbacks from uncleanly terminated threads */ + ret = pFlsFree(fls_index); + ok(ret, "FlsFree failed with error %u\n", GetLastError()); + fls_index = FLS_OUT_OF_INDEXES; + todo_wine + { + ok(fls_callback_count == fls_count, + "wrong FLS callback count %d, expected %d\n", fls_callback_count, fls_count); + } + } + ok(attached_thread_count >= 2, "attached thread count should be >= 2\n"); for (i = 0; i < attached_thread_count; i++) @@ -1797,9 +1865,26 @@ todo_wine 0, TRUE, DUPLICATE_SAME_ACCESS); attached_thread_count++; } + + /* Make sure the FLS slot is empty, if FLS is available */ + if (pFlsGetValue) + { + void* value; + BOOL ret; + SetLastError(0xdeadbeef); + value = pFlsGetValue(fls_index); + ok(!value, "FlsGetValue returned %p, expected NULL\n", value); + todo_wine + ok(GetLastError() == ERROR_SUCCESS, "FlsGetValue failed with error %u\n", GetLastError()); + ret = pFlsSetValue(fls_index, (void*) 0x31415); + ok(ret, "FlsSetValue failed\n"); + fls_count++; + } + break; case DLL_THREAD_DETACH: trace("dll: %p, DLL_THREAD_DETACH, %p\n", hinst, param); + thread_detach_count++; ret = pRtlDllShutdownInProgress(); /* win7 doesn't allow creating a thread during process shutdown but @@ -1811,6 +1896,23 @@ todo_wine else ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); + /* FLS data should already be destroyed, if FLS is available. + * Note that this is broken for Win2k3, which runs the callbacks *after* the DLL entry + * point has already run. + */ + if (pFlsGetValue && fls_index != FLS_OUT_OF_INDEXES) + { + void* value; + SetLastError(0xdeadbeef); + value = pFlsGetValue(fls_index); + todo_wine + { + ok(broken(value == (void*) 0x31415) || /* Win2k3 */ + !value, "FlsGetValue returned %p, expected NULL\n", value); + } + ok(GetLastError() == ERROR_SUCCESS, "FlsGetValue failed with error %u\n", GetLastError()); + } + break; default: trace("dll: %p, %d, %p\n", hinst, reason, param); @@ -2909,10 +3011,11 @@ START_TEST(loader) { int argc; char **argv; - HANDLE ntdll, mapping; + HANDLE ntdll, mapping, kernel32; SYSTEM_INFO si; ntdll = GetModuleHandleA("ntdll.dll"); + kernel32 = GetModuleHandleA("kernel32.dll"); pNtCreateSection = (void *)GetProcAddress(ntdll, "NtCreateSection"); pNtQuerySection = (void *)GetProcAddress(ntdll, "NtQuerySection"); pNtMapViewOfSection = (void *)GetProcAddress(ntdll, "NtMapViewOfSection"); @@ -2929,7 +3032,11 @@ START_TEST(loader) pRtlAcquirePebLock = (void *)GetProcAddress(ntdll, "RtlAcquirePebLock"); pRtlReleasePebLock = (void *)GetProcAddress(ntdll, "RtlReleasePebLock"); pRtlImageDirectoryEntryToData = (void *)GetProcAddress(ntdll, "RtlImageDirectoryEntryToData"); - pResolveDelayLoadedAPI = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "ResolveDelayLoadedAPI"); + pFlsAlloc = (void *)GetProcAddress(kernel32, "FlsAlloc"); + pFlsSetValue = (void *)GetProcAddress(kernel32, "FlsSetValue"); + pFlsGetValue = (void *)GetProcAddress(kernel32, "FlsGetValue"); + pFlsFree = (void *)GetProcAddress(kernel32, "FlsFree"); + pResolveDelayLoadedAPI = (void *)GetProcAddress(kernel32, "ResolveDelayLoadedAPI"); GetSystemInfo( &si ); page_size = si.dwPageSize;

1 0

Hans Leidekker : webservices: Implement WsRemoveMappedHeader.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 95dd6a873860435b39424adf62f034c710b678f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95dd6a873860435b39424adf6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 17 14:24:02 2016 +0200 webservices: Implement WsRemoveMappedHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 29 +++++++++++++++++++++++++++++ dlls/webservices/tests/msg.c | 35 +++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index e55e861..f13e3cc 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -778,3 +778,32 @@ HRESULT WINAPI WsAddMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, msg->header[i] = header; return S_OK; } + +/************************************************************************** + * WsRemoveMappedHeader [webservices.@] + */ +HRESULT WINAPI WsRemoveMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + ULONG i; + + TRACE( "%p %s %p\n", handle, debugstr_xmlstr(name), error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle || !name) return E_INVALIDARG; + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; + + for (i = 0; i < msg->header_count; i++) + { + if (msg->header[i]->type || !msg->header[i]->mapped) continue; + if (WsXmlStringEquals( name, &msg->header[i]->name, NULL ) == S_OK) + { + free_header( msg->header[i] ); + memmove( &msg->header[i], &msg->header[i + 1], (msg->header_count - i) * sizeof(struct header *) ); + msg->header_count--; + break; + } + } + + return S_OK; +} diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 1458488..73fcfd6 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -703,6 +703,40 @@ static void test_WsAddMappedHeader(void) WsFreeMessage( msg ); } +static void test_WsRemoveMappedHeader(void) +{ + static const WS_XML_STRING header = {6, (BYTE *)"Header"}, value = {5, (BYTE *)"value"}; + WS_MESSAGE *msg; + HRESULT hr; + + hr = WsRemoveMappedHeader( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_1_0, WS_ENVELOPE_VERSION_SOAP_1_2, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsRemoveMappedHeader( msg, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsRemoveMappedHeader( msg, &header, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsAddMappedHeader( msg, &header, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &value, sizeof(value), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsRemoveMappedHeader( msg, &header, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* again */ + hr = WsRemoveMappedHeader( msg, &header, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeMessage( msg ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -715,4 +749,5 @@ START_TEST(msg) test_WsSetHeader(); test_WsRemoveHeader(); test_WsAddMappedHeader(); + test_WsRemoveMappedHeader(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index bdf6c3f..acf5167 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -129,7 +129,7 @@ @ stub WsRegisterOperationForCancel @ stub WsRemoveCustomHeader @ stdcall WsRemoveHeader(ptr long ptr) -@ stub WsRemoveMappedHeader +@ stdcall WsRemoveMappedHeader(ptr ptr ptr) @ stub WsRemoveNode @ stub WsRequestReply @ stub WsRequestSecurityToken

1 0