wine-devel November 2017

wine-devel@winehq.org

68 participants
380 discussions

Start a nNew thread

[website] German translation for release 2.20
by Julian Rüger 17 Nov '17

17 Nov '17

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 2.0.3
by Julian Rüger 17 Nov '17

17 Nov '17

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 2.19
by Julian Rüger 17 Nov '17

17 Nov '17

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH v2] webservices: Stub WsAbortChannel().
by Zebediah Figura 17 Nov '17

17 Nov '17

Powerpoint 2016 calls this while loading some themes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: fix trace parameters, use E_NOTIMPL dlls/webservices/channel.c | 9 +++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 2662cd7cf7a..95bfe95bdc4 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1271,3 +1271,12 @@ HRESULT channel_accept_udp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE LeaveCriticalSection( &channel->cs ); return hr; } + +/************************************************************************** + * WsAbortChannel [webservices.@] + */ +HRESULT WINAPI WsAbortChannel( WS_CHANNEL *handle, WS_ERROR *error ) +{ + FIXME( "%p %p: stub!\n", handle, error ); + return E_NOTIMPL; +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 8aa9fe9ad33..3469fedbfe6 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -1,6 +1,6 @@ @ stub WsAbandonCall @ stub WsAbandonMessage -@ stub WsAbortChannel +@ stdcall WsAbortChannel(ptr ptr) @ stub WsAbortListener @ stub WsAbortServiceHost @ stdcall WsAbortServiceProxy(ptr ptr) -- 2.15.0

2 1

[PATCH v2 1/2] kernel32/tests: Trace thread IDs in hexadecimal.
by Zebediah Figura 17 Nov '17

17 Nov '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/loader.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 1f6f317..6d532eb 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1523,7 +1523,7 @@ static DWORD WINAPI mutex_thread_proc(void *param) wait_list[2] = peb_lock_event; wait_list[3] = heap_lock_event; - trace("%04u: mutex_thread_proc: starting\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: starting\n", GetCurrentThreadId()); while (1) { ret = WaitForMultipleObjects(sizeof(wait_list)/sizeof(wait_list[0]), wait_list, FALSE, 50); @@ -1531,7 +1531,7 @@ static DWORD WINAPI mutex_thread_proc(void *param) else if (ret == WAIT_OBJECT_0 + 1) { ULONG_PTR loader_lock_magic; - trace("%04u: mutex_thread_proc: Entering loader lock\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: Entering loader lock\n", GetCurrentThreadId()); ret = pLdrLockLoaderLock(0, NULL, &loader_lock_magic); ok(!ret, "LdrLockLoaderLock error %#x\n", ret); inside_loader_lock++; @@ -1539,21 +1539,21 @@ static DWORD WINAPI mutex_thread_proc(void *param) } else if (ret == WAIT_OBJECT_0 + 2) { - trace("%04u: mutex_thread_proc: Entering PEB lock\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: Entering PEB lock\n", GetCurrentThreadId()); pRtlAcquirePebLock(); inside_peb_lock++; SetEvent(ack_event); } else if (ret == WAIT_OBJECT_0 + 3) { - trace("%04u: mutex_thread_proc: Entering heap lock\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: Entering heap lock\n", GetCurrentThreadId()); HeapLock(GetProcessHeap()); inside_heap_lock++; SetEvent(ack_event); } } - trace("%04u: mutex_thread_proc: exiting\n", GetCurrentThreadId()); + trace("%04x: mutex_thread_proc: exiting\n", GetCurrentThreadId()); return 196; } @@ -1569,11 +1569,11 @@ static DWORD WINAPI semaphore_thread_proc(void *param) while (1) { if (winetest_debug > 1) - trace("%04u: semaphore_thread_proc: still alive\n", GetCurrentThreadId()); + trace("%04x: semaphore_thread_proc: still alive\n", GetCurrentThreadId()); if (WaitForSingleObject(stop_event, 50) != WAIT_TIMEOUT) break; } - trace("%04u: semaphore_thread_proc: exiting\n", GetCurrentThreadId()); + trace("%04x: semaphore_thread_proc: exiting\n", GetCurrentThreadId()); return 196; } @@ -1585,7 +1585,7 @@ static DWORD WINAPI noop_thread_proc(void *param) InterlockedIncrement(noop_thread_started); } - trace("%04u: noop_thread_proc: exiting\n", GetCurrentThreadId()); + trace("%04x: noop_thread_proc: exiting\n", GetCurrentThreadId()); return 195; } -- 2.7.4

1 1

[PATCH 1/2] kernel32/tests: Trace thread IDs in hexadecimal.
by Zebediah Figura 17 Nov '17

17 Nov '17

2 3

[PATCH 2/2] libwine: Reserve memory areas for ARM64 in case we don't have a preloader
by André Hentschel 16 Nov '17

16 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- libs/wine/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 1a3ca59..458cc13 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -398,7 +398,7 @@ void mmap_init(void) } reserve_dos_area(); -#elif defined(__x86_64__) +#elif defined(__x86_64__) || defined(__aarch64__) if (!list_head( &reserved_areas )) { -- 2.7.4

1 0

[PATCH 1/2] loader: We now have a preloader on ARM64
by André Hentschel 16 Nov '17

16 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- loader/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/main.c b/loader/main.c index a560ec3..0a25272 100644 --- a/loader/main.c +++ b/loader/main.c @@ -195,11 +195,11 @@ static int pre_exec(void) #endif } -#elif defined(__linux__) && defined(__x86_64__) +#elif defined(__linux__) && (defined(__x86_64__) || defined(__aarch64__)) static int pre_exec(void) { - return 1; /* we have a preloader on x86-64 */ + return 1; /* we have a preloader on x86-64/arm64 */ } #elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__)) -- 2.7.4

1 0

[PATCH 1/2] twain_32: Implement source selection dialog.
by Vincent Povirk 16 Nov '17

16 Nov '17

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/twain_32/Makefile.in | 2 + dlls/twain_32/dsm_ctrl.c | 114 ++++++++++++++++++++++++++++++++++++++----- dlls/twain_32/resource.h | 25 ++++++++++ dlls/twain_32/twain.rc | 34 +++++++++++++ dlls/twain_32/twain32_main.c | 18 +++++++ dlls/twain_32/twain_i.h | 2 + 6 files changed, 182 insertions(+), 13 deletions(-) create mode 100644 dlls/twain_32/resource.h create mode 100644 dlls/twain_32/twain.rc diff --git a/dlls/twain_32/Makefile.in b/dlls/twain_32/Makefile.in index cadaf8081d8..c82b5a74453 100644 --- a/dlls/twain_32/Makefile.in +++ b/dlls/twain_32/Makefile.in @@ -4,3 +4,5 @@ IMPORTS = user32 C_SRCS = \ dsm_ctrl.c \ twain32_main.c + +RC_SRCS = twain.rc diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 9b878676656..bfd0651cb46 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -30,6 +30,7 @@ #include "winuser.h" #include "twain.h" #include "twain_i.h" +#include "resource.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(twain); @@ -345,24 +346,111 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) return TWRC_SUCCESS; } +typedef struct { + pTW_IDENTITY origin; + pTW_IDENTITY result; +} userselect_data; + +INT_PTR CALLBACK userselect_dlgproc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + userselect_data *data = (userselect_data*)lparam; + int i; + HWND sourcelist; + BOOL any_devices = FALSE; + + SetWindowLongPtrW(hwnd, DWLP_USER, (LONG_PTR)data); + + sourcelist = GetDlgItem(hwnd, IDC_LISTSOURCE); + + for (i=0; i<nrdevices; i++) + { + TW_IDENTITY *id = &devices[i].identity; + LRESULT index; + + if ((id->SupportedGroups & data->origin->SupportedGroups) == 0) + continue; + + index = SendMessageA(sourcelist, LB_ADDSTRING, 0, (LPARAM)id->ProductName); + SendMessageW(sourcelist, LB_SETITEMDATA, (WPARAM)index, (LPARAM)i); + any_devices = TRUE; + } + + if (any_devices) + { + EnableWindow(GetDlgItem(hwnd, IDOK), TRUE); + + /* FIXME: Select the supplied product name or default source. */ + SendMessageW(sourcelist, LB_SETCURSEL, 0, 0); + } + + return TRUE; + } + case WM_CLOSE: + EndDialog(hwnd, 0); + return TRUE; + case WM_COMMAND: + if (wparam == MAKEWPARAM(IDCANCEL, BN_CLICKED)) + { + EndDialog(hwnd, 0); + return TRUE; + } + else if (wparam == MAKEWPARAM(IDOK, BN_CLICKED) || + wparam == MAKEWPARAM(IDC_LISTSOURCE, LBN_DBLCLK)) + { + userselect_data *data = (userselect_data*)GetWindowLongPtrW(hwnd, DWLP_USER); + HWND sourcelist; + LRESULT index; + + sourcelist = GetDlgItem(hwnd, IDC_LISTSOURCE); + + index = SendMessageW(sourcelist, LB_GETCURSEL, 0, 0); + + if (index == LB_ERR) + return TRUE; + + index = SendMessageW(sourcelist, LB_GETITEMDATA, (WPARAM)index, 0); + + *data->result = devices[index].identity; + + /* FIXME: Save this as the default source */ + + EndDialog(hwnd, 1); + return TRUE; + } + break; + } + return FALSE; +} + /* DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT */ TW_UINT16 TWAIN_UserSelect (pTW_IDENTITY pOrigin, TW_MEMREF pData) { - pTW_IDENTITY selected = (pTW_IDENTITY)pData; + userselect_data param = {pOrigin, pData}; + HWND parent = DSM_parent; - TRACE("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%x ProductName=%s\n", - selected->SupportedGroups, wine_dbgstr_a(selected->ProductName)); + TRACE("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%x ProductName=%s\n", + pOrigin->SupportedGroups, wine_dbgstr_a(param.result->ProductName)); - twain_autodetect(); - if (!nrdevices) { - TRACE("<-- TWRC_FAILURE\n"); - DSM_twCC = TWCC_OPERATIONERROR; - return TWRC_FAILURE; - } - *selected = devices[0].identity; - TRACE("<-- %s\n", wine_dbgstr_a(selected->ProductName)); - DSM_twCC = TWCC_SUCCESS; - return TWRC_SUCCESS; + twain_autodetect(); + + if (!IsWindow(parent)) + parent = NULL; + + if (DialogBoxParamW(DSM_hinstance, MAKEINTRESOURCEW(DLG_USERSELECT), + parent, userselect_dlgproc, (LPARAM)&param) == 0) + { + TRACE("canceled\n"); + DSM_twCC = TWCC_SUCCESS; + return TWRC_CANCEL; + } + + TRACE("<-- %s\n", wine_dbgstr_a(param.result->ProductName)); + DSM_twCC = TWCC_SUCCESS; + return TWRC_SUCCESS; } /* DG_CONTROL/DAT_PARENT/MSG_CLOSEDSM */ diff --git a/dlls/twain_32/resource.h b/dlls/twain_32/resource.h new file mode 100644 index 00000000000..366f52f181c --- /dev/null +++ b/dlls/twain_32/resource.h @@ -0,0 +1,25 @@ +/* + * Copyright 2017 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> +#include <winuser.h> + +#define DLG_USERSELECT 1 + +#define IDC_LISTSOURCE 1001 + diff --git a/dlls/twain_32/twain.rc b/dlls/twain_32/twain.rc new file mode 100644 index 00000000000..2c5939308d5 --- /dev/null +++ b/dlls/twain_32/twain.rc @@ -0,0 +1,34 @@ +/* + * Copyright 2017 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma makedep po + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +DLG_USERSELECT DIALOG 0, 0, 140, 140 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_NOIDLEMSG +FONT 8, "MS Shell Dlg" +CAPTION "Select Source" +{ + LISTBOX IDC_LISTSOURCE, 7, 7, 126, 104 + DEFPUSHBUTTON "OK", IDOK, 29, 118, 50, 15, BS_DEFPUSHBUTTON|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "Cancel", IDCANCEL, 83, 118, 50, 15 +} + diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c index d1977b4d75f..016680b96eb 100644 --- a/dlls/twain_32/twain32_main.c +++ b/dlls/twain_32/twain32_main.c @@ -31,6 +31,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +extern HINSTANCE DSM_hinstance; + +BOOL WINAPI DllMain (HINSTANCE hinstance, DWORD reason, LPVOID reserved) +{ + TRACE("%p,%x,%p\n", hinstance, reason, reserved); + + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstance); + DSM_hinstance = hinstance; + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + /* A helper function that looks up a destination identity in the active source list */ static activeDS *TWAIN_LookupSource (const TW_IDENTITY *pDest) diff --git a/dlls/twain_32/twain_i.h b/dlls/twain_32/twain_i.h index f46999c6fa1..4d33135344e 100644 --- a/dlls/twain_32/twain_i.h +++ b/dlls/twain_32/twain_i.h @@ -53,6 +53,8 @@ TW_UINT16 DSM_twCC DECLSPEC_HIDDEN; /* current condition code of Sou activeDS *activeSources DECLSPEC_HIDDEN; /* list of active data sources */ +HINSTANCE DSM_hinstance DECLSPEC_HIDDEN; + /* Implementation of operation triplets (From Application to Source Manager) */ extern TW_UINT16 TWAIN_CloseDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH] advapi32: add initial Perf* stubs
by Austin English 16 Nov '17

16 Nov '17

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/advapi32/Makefile.in | 1 + dlls/advapi32/advapi32.spec | 14 ++++----- dlls/advapi32/perf.c | 71 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 7 deletions(-) create mode 100644 dlls/advapi32/perf.c diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index ff6452a91b..224286f28c 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -16,6 +16,7 @@ C_SRCS = \ crypt_sha.c \ eventlog.c \ lsa.c \ + perf.c \ registry.c \ security.c \ service.c \ diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 359efc9ad1..4645f3c573 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -553,11 +553,11 @@ # @ stub OperationStart # @ stub PerfAddCounters # @ stub PerfCloseQueryHandle -# @ stub PerfCreateInstance +@ stdcall PerfCreateInstance(long ptr wstr long) # @ stub PerfDecrementULongCounterValue # @ stub PerfDecrementULongLongCounterValue # @ stub PerfDeleteCounters -# @ stub PerfDeleteInstance +@ stdcall PerfDeleteInstance(long ptr) # @ stub PerfEnumerateCounterSet # @ stub PerfEnumerateCounterSetInstances # @ stub PerfIncrementULongCounterValue @@ -573,13 +573,13 @@ # @ stub PerfRegQueryInfoKey # @ stub PerfRegQueryValue # @ stub PerfRegSetValue -# @ stub PerfSetCounterRefValue -# @ stub PerfSetCounterSetInfo +@ stdcall PerfSetCounterRefValue(long ptr long ptr) +@ stdcall PerfSetCounterSetInfo(long ptr long) # @ stub PerfSetULongCounterValue # @ stub PerfSetULongLongCounterValue -# @ stub PerfStartProvider -# @ stub PerfStartProviderEx -# @ stub PerfStopProvider +@ stdcall PerfStartProvider(ptr ptr ptr) +@ stdcall PerfStartProviderEx(ptr ptr ptr) +@ stdcall PerfStopProvider(long) @ stdcall PrivilegeCheck(ptr ptr ptr) @ stdcall PrivilegedServiceAuditAlarmA(str str long ptr long) @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) diff --git a/dlls/advapi32/perf.c b/dlls/advapi32/perf.c new file mode 100644 index 0000000000..0f23c92fdd --- /dev/null +++ b/dlls/advapi32/perf.c @@ -0,0 +1,71 @@ +/* + * win32 advapi perf functions + * + * Copyright 2017 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "perflib.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); + +PPERF_COUNTERSET_INSTANCE WINAPI PerfCreateInstance(HANDLE handle, LPCGUID guid, const WCHAR *name, ULONG id) +{ + FIXME("%p %s %s %u: stub\n", handle, debugstr_guid(guid), debugstr_w(name), id); + return NULL; +} + +ULONG WINAPI PerfDeleteInstance(HANDLE provider, PPERF_COUNTERSET_INSTANCE block) +{ + FIXME("%p %p: stub\n", provider, block); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfSetCounterSetInfo(HANDLE handle, PPERF_COUNTERSET_INFO template, ULONG size) +{ + FIXME("%p %p %u: stub\n", handle, template, size); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PPERF_COUNTERSET_INSTANCE instance, ULONG counterid, void *address) +{ + FIXME("%p %p %u %p: stub\n", provider, instance, counterid, address); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfStartProvider(GUID *guid, PERFLIBREQUEST callback, HANDLE *provider) +{ + FIXME("%s %p %p: stub\n", debugstr_guid(guid), callback, provider); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfStartProviderEx(GUID *guid, PPERF_PROVIDER_CONTEXT context, HANDLE *provider) +{ + FIXME("%s %p %p: stub\n", debugstr_guid(guid), context, provider); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +ULONG WINAPI PerfStopProvider(HANDLE handle) +{ + FIXME("%p: stub\n", handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} -- 2.13.6

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
38
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-devel November 2017