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

Huw Davies : user32: Scale the button size with screen resolution.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: master Commit: 9efcbd113d37e84edd802640187b23bd8f126fe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9efcbd113d37e84edd8026401… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 22 08:58:31 2016 +0100 user32: Scale the button size with screen resolution. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index b8a1cee..166b1a4 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -143,10 +143,6 @@ static const pfPaint btnPaintFunc[MAX_BTN_TYPE] = OB_Paint /* BS_OWNERDRAW */ }; -static HBITMAP hbitmapCheckBoxes = 0; -static WORD checkBoxWidth = 0, checkBoxHeight = 0; - - /********************************************************************* * button class descriptor */ @@ -243,14 +239,6 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, break; case WM_CREATE: - if (!hbitmapCheckBoxes) - { - BITMAP bmp; - hbitmapCheckBoxes = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_CHECKBOXES)); - GetObjectW( hbitmapCheckBoxes, sizeof(bmp), &bmp ); - checkBoxWidth = bmp.bmWidth / 4; - checkBoxHeight = bmp.bmHeight / 3; - } if (btn_type >= MAX_BTN_TYPE) return -1; /* abort */ @@ -851,7 +839,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) { RECT rbox, rtext, client; HBRUSH hBrush; - int delta, text_offset; + int delta, text_offset, checkBoxWidth, checkBoxHeight; UINT dtFlags; HFONT hFont; LONG state = get_button_state( hwnd ); @@ -868,6 +856,9 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) GetClientRect(hwnd, &client); rbox = rtext = client; + checkBoxWidth = 12 * GetDeviceCaps( hDC, LOGPIXELSX ) / 96 + 1; + checkBoxHeight = 12 * GetDeviceCaps( hDC, LOGPIXELSY ) / 96 + 1; + if ((hFont = get_button_font( hwnd ))) SelectObject( hDC, hFont ); GetCharWidthW( hDC, '0', '0', &text_offset ); text_offset /= 2;

1 0

Nikolay Sivov : comctl32/treeview: Fill full row for TVS_FULLROWSELECT style.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: master Commit: 382dc1ded8e13bb5d15d6d18e238b66f0997dffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=382dc1ded8e13bb5d15d6d18e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 22 12:50:14 2016 +0300 comctl32/treeview: Fill full row for TVS_FULLROWSELECT style. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 55e22e2..117b309 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -31,7 +31,7 @@ * missing notifications: TVN_GETINFOTIP, TVN_KEYDOWN, * TVN_SETDISPINFO * - * missing styles: TVS_FULLROWSELECT, TVS_INFOTIP, TVS_RTLREADING, + * missing styles: TVS_INFOTIP, TVS_RTLREADING, * * missing item styles: TVIS_EXPANDPARTIAL, TVIS_EX_FLAT, * TVIS_EX_DISABLED @@ -2577,6 +2577,13 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *item) if (cditem & CDRF_NEWFONT) TREEVIEW_ComputeTextWidth(infoPtr, item, hdc); + if (TREEVIEW_IsFullRowSelect(infoPtr)) + { + HBRUSH brush = CreateSolidBrush(nmcdhdr.clrTextBk); + FillRect(hdc, &item->rect, brush); + DeleteObject(brush); + } + TREEVIEW_DrawItemLines(infoPtr, hdc, item); /* Set colors. Custom draw handler can change these so we do this after it. */

1 0

Nikolay Sivov : include: Added some of newer Common Controls definitions.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: master Commit: 710a58da79a81a708042db81fdfecdd917c76b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=710a58da79a81a708042db81f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 22 12:50:50 2016 +0300 include: Added some of newer Common Controls definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 132 ++++++++++++++++++++++++++++++++++++++++++++-------- include/commctrl.rh | 3 ++ 2 files changed, 116 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=710a58da79a81a708042d…

1 0

Keno Fischer : ntdll: Tolerate null handle in DeregisterWait.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: master Commit: 90173ce448e5afe55627c2cbece28fb4f6bae99d URL: http://source.winehq.org/git/wine.git/?a=commit;h=90173ce448e5afe55627c2cbe… Author: Keno Fischer <keno(a)juliacomputing.com> Date: Fri Aug 19 17:24:44 2016 -0400 ntdll: Tolerate null handle in DeregisterWait. Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 4 ++++ dlls/ntdll/threadpool.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index a9a04df..0a5f0d3 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1245,6 +1245,10 @@ static void test_RegisterWaitForSingleObject(void) ret = pUnregisterWait(wait_handle); ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); + + ret = pUnregisterWait(0); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "UnregisterWait failed with unexpected error %d\n", GetLastError()); } static DWORD LS_main; diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 04790aa..173e865 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -637,6 +637,9 @@ NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) TRACE( "(%p)\n", WaitHandle ); + if (WaitHandle == NULL) + return STATUS_INVALID_HANDLE; + NtSetEvent( wait_work_item->CancelEvent, NULL ); if (wait_work_item->CallbackInProgress) {

1 0

Sebastian Lackner : ws2_32: Do not spawn a separate thread for each async task.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: master Commit: d638653f07b948da3a149fa8c72c837836971e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d638653f07b948da3a149fa8c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Aug 21 19:55:43 2016 +0200 ws2_32: Do not spawn a separate thread for each async task. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/async.c | 61 +++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c index 573349f..56c60fc 100644 --- a/dlls/ws2_32/async.c +++ b/dlls/ws2_32/async.c @@ -52,6 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); struct async_query_header { + LPARAM (*func)( struct async_query_header *query ); HWND hWnd; UINT uMsg; void *sbuf; @@ -128,13 +129,6 @@ static int list_dup(char** l_src, char* ref, int item_size) return (p - ref); } -static DWORD finish_query( struct async_query_header *query, LPARAM lparam ) -{ - PostMessageW( query->hWnd, query->uMsg, (WPARAM)query->handle, lparam ); - HeapFree( GetProcessHeap(), 0, query ); - return 0; -} - /* ----- hostent */ static LPARAM copy_he(void *base, int size, const struct WS_hostent *he) @@ -162,20 +156,20 @@ static LPARAM copy_he(void *base, int size, const struct WS_hostent *he) return MAKELPARAM( needed, 0 ); } -static DWORD WINAPI async_gethostbyname(LPVOID arg) +static LPARAM async_gethostbyname( struct async_query_header *query ) { - struct async_query_gethostbyname *aq = arg; + struct async_query_gethostbyname *aq = CONTAINING_RECORD( query, struct async_query_gethostbyname, query ); struct WS_hostent *he = WS_gethostbyname( aq->host_name ); - return finish_query( &aq->query, copy_he( aq->query.sbuf, aq->query.sbuflen, he )); + return copy_he( query->sbuf, query->sbuflen, he ); } -static DWORD WINAPI async_gethostbyaddr(LPVOID arg) +static LPARAM async_gethostbyaddr( struct async_query_header *query ) { - struct async_query_gethostbyaddr *aq = arg; + struct async_query_gethostbyaddr *aq = CONTAINING_RECORD( query, struct async_query_gethostbyaddr, query ); struct WS_hostent *he = WS_gethostbyaddr( aq->host_addr, aq->host_len, aq->host_type ); - return finish_query( &aq->query, copy_he( aq->query.sbuf, aq->query.sbuflen, he )); + return copy_he( query->sbuf, query->sbuflen, he ); } /* ----- protoent */ @@ -200,20 +194,20 @@ static LPARAM copy_pe(void *base, int size, const struct WS_protoent* pe) return MAKELPARAM( needed, 0 ); } -static DWORD WINAPI async_getprotobyname(LPVOID arg) +static LPARAM async_getprotobyname( struct async_query_header *query ) { - struct async_query_getprotobyname *aq = arg; + struct async_query_getprotobyname *aq = CONTAINING_RECORD( query, struct async_query_getprotobyname, query ); struct WS_protoent *pe = WS_getprotobyname( aq->proto_name ); - return finish_query( &aq->query, copy_pe( aq->query.sbuf, aq->query.sbuflen, pe )); + return copy_pe( query->sbuf, query->sbuflen, pe ); } -static DWORD WINAPI async_getprotobynumber(LPVOID arg) +static LPARAM async_getprotobynumber( struct async_query_header *query ) { - struct async_query_getprotobynumber *aq = arg; + struct async_query_getprotobynumber *aq = CONTAINING_RECORD( query, struct async_query_getprotobynumber, query ); struct WS_protoent *pe = WS_getprotobynumber( aq->proto_number ); - return finish_query( &aq->query, copy_pe( aq->query.sbuf, aq->query.sbuflen, pe )); + return copy_pe( query->sbuf, query->sbuflen, pe ); } /* ----- servent */ @@ -240,20 +234,29 @@ static LPARAM copy_se(void *base, int size, const struct WS_servent* se) return MAKELPARAM( needed, 0 ); } -static DWORD WINAPI async_getservbyname(LPVOID arg) +static LPARAM async_getservbyname( struct async_query_header *query ) { - struct async_query_getservbyname *aq = arg; + struct async_query_getservbyname *aq = CONTAINING_RECORD( query, struct async_query_getservbyname, query ); struct WS_servent *se = WS_getservbyname( aq->serv_name, aq->serv_proto ); - return finish_query( &aq->query, copy_se( aq->query.sbuf, aq->query.sbuflen, se )); + return copy_se( query->sbuf, query->sbuflen, se ); } -static DWORD WINAPI async_getservbyport(LPVOID arg) +static LPARAM async_getservbyport( struct async_query_header *query ) { - struct async_query_getservbyport *aq = arg; + struct async_query_getservbyport *aq = CONTAINING_RECORD( query, struct async_query_getservbyport, query ); struct WS_servent *se = WS_getservbyport( aq->serv_port, aq->serv_proto ); - return finish_query( &aq->query, copy_se( aq->query.sbuf, aq->query.sbuflen, se )); + return copy_se( query->sbuf, query->sbuflen, se ); +} + + +static void WINAPI async_worker( TP_CALLBACK_INSTANCE *instance, void *context ) +{ + struct async_query_header *query = context; + LPARAM lparam = query->func( query ); + PostMessageW( query->hWnd, query->uMsg, (WPARAM)query->handle, lparam ); + HeapFree( GetProcessHeap(), 0, query ); } @@ -264,30 +267,28 @@ static DWORD WINAPI async_getservbyport(LPVOID arg) * with no thread support. This relies on the fact that PostMessage() does * not actually call the windowproc before the function returns. */ -static HANDLE run_query( HWND hWnd, UINT uMsg, LPTHREAD_START_ROUTINE func, +static HANDLE run_query( HWND hWnd, UINT uMsg, LPARAM (*func)(struct async_query_header *), struct async_query_header *query, void *sbuf, INT sbuflen ) { static LONG next_handle = 0xdead; - HANDLE thread; ULONG handle; do handle = LOWORD( InterlockedIncrement( &next_handle )); while (!handle); /* avoid handle 0 */ + query->func = func; query->hWnd = hWnd; query->uMsg = uMsg; query->handle = UlongToHandle( handle ); query->sbuf = sbuf; query->sbuflen = sbuflen; - thread = CreateThread( NULL, 0, func, query, 0, NULL ); - if (!thread) + if (!TrySubmitThreadpoolCallback( async_worker, query, NULL )) { SetLastError( WSAEWOULDBLOCK ); HeapFree( GetProcessHeap(), 0, query ); return 0; } - CloseHandle( thread ); return UlongToHandle( handle ); }

1 0

André Hentschel : ntdll: Bump Win 10 version to 14393.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: master Commit: 24031fef653e8f5ad34a2bf4117a7cd516a32eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=24031fef653e8f5ad34a2bf41… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 19 16:17:36 2016 +0200 ntdll: Bump Win 10 version to 14393. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/version.c | 2 +- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 41b44f5..b6cafc6 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -187,7 +187,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN10 */ { - sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x2800, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3839, VER_PLATFORM_WIN32_NT, {' ',0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 82dc870..91478fc 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,7 +48,7 @@ static const struct const char *szProductType; } win_versions[] = { - { "win10", "Windows 10", 10, 0, 0x2800,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, + { "win10", "Windows 10", 10, 0, 0x3839,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},

1 0

Andrew Eikum : mshtml: Don't crash creating a URI if we have no document.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: master Commit: 22783dfef88acd506587ce183f8e9f791c31aa70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22783dfef88acd506587ce183… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 19 08:27:20 2016 -0500 mshtml: Don't crash creating a URI if we have no document. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 88164d0..0e2a748 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3463,7 +3463,8 @@ HRESULT create_doc_uri(HTMLOuterWindow *window, IUri *iuri, nsWineURI **ret) nsWineURI *uri; nsresult nsres; - nsres = create_nsuri(iuri, window, window->doc_obj->nscontainer, NULL, &uri); + nsres = create_nsuri(iuri, window, window->doc_obj ? window->doc_obj->nscontainer : NULL, + NULL, &uri); if(NS_FAILED(nsres)) return E_FAIL;

1 0

Colin Finck : include: Add a prototype for RpcBindingServerFromClient.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: master Commit: 8c900c8fb251ad15845980f15c9cb826fc9fa868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c900c8fb251ad15845980f15… Author: Colin Finck <mail(a)colinfinck.de> Date: Fri Aug 19 11:52:57 2016 +0200 include: Add a prototype for RpcBindingServerFromClient. Signed-off-by: Colin Finck <mail(a)colinfinck.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/rpcdce.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/rpcdce.h b/include/rpcdce.h index f5f031c..ee01d88 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -338,6 +338,8 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingReset( RPC_BINDING_HANDLE Binding ); RPCRTAPI RPC_STATUS RPC_ENTRY + RpcBindingServerFromClient( RPC_BINDING_HANDLE ClientBinding, RPC_BINDING_HANDLE* ServerBinding ); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingSetObject( RPC_BINDING_HANDLE Binding, UUID* ObjectUuid ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingSetOption( RPC_BINDING_HANDLE Binding, ULONG Option, ULONG_PTR OptionValue );

1 0

Colin Finck : rpcrt4: Add a test for RpcBindingServerFromClient (todo_wine ).
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: master Commit: b59c53fbffc1519d55224ad294c26d9148296cf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b59c53fbffc1519d55224ad29… Author: Colin Finck <mail(a)colinfinck.de> Date: Fri Aug 19 11:52:58 2016 +0200 rpcrt4: Add a test for RpcBindingServerFromClient (todo_wine). Signed-off-by: Colin Finck <mail(a)colinfinck.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 0b31d3d..2653f7a 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -744,6 +744,35 @@ void __cdecl s_context_handle_test(void) pNDRSContextUnmarshall2(binding, buf, NDR_LOCAL_DATA_REPRESENTATION, &server_if2.InterfaceId, 0); } + + binding = NULL; + status = RpcBindingServerFromClient(NULL, &binding); + + todo_wine + { + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + ok(binding != NULL, "binding is NULL\n"); + } + + if (status == RPC_S_OK && binding != NULL) + { + unsigned char* string_binding = NULL; + unsigned char* computer_name = NULL; + + status = RpcBindingToStringBindingA(binding, &string_binding); + + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + ok(string_binding != NULL, "string_binding is NULL\n"); + + status = RpcStringBindingParseA(string_binding, NULL, NULL, &computer_name, NULL, NULL); + + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + ok(computer_name != NULL, "computer_name is NULL\n"); + + RpcStringFreeA(&string_binding); + RpcStringFreeA(&computer_name); + RpcBindingFree(&binding); + } } void __cdecl s_get_numbers(int length, int size, pints_t n[])

1 0

Austin English : ntdll: Forward DecodeSystemPointer/ EncodeSystemPointer to DecodePointer/EncodePointer.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: master Commit: 0f137a0b89f5ead1ce9b0420c0f1562e8991f346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f137a0b89f5ead1ce9b0420c… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 19 03:27:18 2016 -0500 ntdll: Forward DecodeSystemPointer/EncodeSystemPointer to DecodePointer/EncodePointer. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec | 4 ++-- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernelbase/kernelbase.spec | 4 ++-- dlls/ntdll/ntdll.spec | 4 ++-- include/winbase.h | 6 ++++-- tools/make_specfiles | 1 + 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec b/dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec index 471ee42..587b06b 100644 --- a/dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec +++ b/dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec @@ -1,5 +1,5 @@ @ stdcall Beep(long long) kernel32.Beep @ stdcall DecodePointer(ptr) kernel32.DecodePointer -@ stub DecodeSystemPointer +@ stdcall DecodeSystemPointer(ptr) kernel32.DecodeSystemPointer @ stdcall EncodePointer(ptr) kernel32.EncodePointer -@ stub EncodeSystemPointer +@ stdcall EncodeSystemPointer(ptr) kernel32.EncodeSystemPointer diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 239965f..2d82c71 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -355,7 +355,7 @@ @ stdcall DebugBreakProcess(long) @ stdcall DebugSetProcessKillOnExit(long) @ stdcall DecodePointer(ptr) ntdll.RtlDecodePointer -# @ stub DecodeSystemPointer ( -> ntdll.RtlDecodeSystemPointer) +@ stdcall DecodeSystemPointer(ptr) ntdll.RtlDecodeSystemPointer @ stdcall DefineDosDeviceA(long str str) @ stdcall DefineDosDeviceW(long wstr wstr) @ stdcall DelayLoadFailureHook(str str) @@ -390,7 +390,7 @@ @ stdcall DuplicateHandle(long long long ptr long long long) # @ stub EnableThreadProfiling @ stdcall EncodePointer(ptr) ntdll.RtlEncodePointer -# @ stub EncodeSystemPointer ( -> ntdll.RtlEncodeSystemPointer) +@ stdcall EncodeSystemPointer(ptr) ntdll.RtlEncodeSystemPointer @ stdcall EndUpdateResourceA(long long) @ stdcall EndUpdateResourceW(long long) @ stdcall EnterCriticalSection(ptr) ntdll.RtlEnterCriticalSection diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e35ef8b..de9404c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -101,7 +101,7 @@ @ stdcall CreateWellKnownSid(long ptr ptr ptr) advapi32.CreateWellKnownSid @ stdcall DebugBreak() kernel32.DebugBreak @ stdcall DecodePointer(ptr) kernel32.DecodePointer -@ stub DecodeSystemPointer +@ stdcall DecodeSystemPointer(ptr) kernel32.DecodeSystemPointer @ stdcall DefineDosDeviceW(long wstr wstr) kernel32.DefineDosDeviceW @ stdcall DeleteAce(ptr long) advapi32.DeleteAce @ stdcall DeleteCriticalSection(ptr) kernel32.DeleteCriticalSection @@ -120,7 +120,7 @@ @ stdcall DuplicateToken(long long ptr) advapi32.DuplicateToken @ stdcall DuplicateTokenEx(long long ptr long long ptr) advapi32.DuplicateTokenEx @ stdcall EncodePointer(ptr) kernel32.EncodePointer -@ stub EncodeSystemPointer +@ stdcall EncodeSystemPointer(ptr) kernel32.EncodeSystemPointer @ stdcall EnterCriticalSection(ptr) kernel32.EnterCriticalSection @ stdcall EnumCalendarInfoExEx(ptr wstr long wstr long long) kernel32.EnumCalendarInfoExEx @ stdcall EnumCalendarInfoExW(ptr long long long) kernel32.EnumCalendarInfoExW diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 5f8ee54..244a721 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -519,7 +519,7 @@ @ stub RtlDeactivateActivationContextUnsafeFast @ stub RtlDebugPrintTimes @ stdcall RtlDecodePointer(ptr) -# @ stub RtlDecodeSystemPointer +@ stdcall RtlDecodeSystemPointer(ptr) RtlDecodePointer @ stdcall RtlDecompressBuffer(long ptr long ptr long ptr) @ stdcall RtlDecompressFragment(long ptr long ptr long long ptr ptr) @ stub RtlDefaultNpAcl @@ -562,7 +562,7 @@ @ stdcall RtlEmptyAtomTable(ptr long) # @ stub RtlEnableEarlyCriticalSectionEventCreation @ stdcall RtlEncodePointer(ptr) -# @ stub RtlEncodeSystemPointer +@ stdcall RtlEncodeSystemPointer(ptr) RtlEncodePointer @ stdcall -arch=win32 -ret64 RtlEnlargedIntegerMultiply(long long) @ stdcall -arch=win32 RtlEnlargedUnsignedDivide(int64 long ptr) @ stdcall -arch=win32 -ret64 RtlEnlargedUnsignedMultiply(long long) diff --git a/include/winbase.h b/include/winbase.h index 99e3107..521d2da 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1819,7 +1819,8 @@ WINBASEAPI BOOL WINAPI DebugActiveProcessStop(DWORD); WINBASEAPI void WINAPI DebugBreak(void); WINBASEAPI BOOL WINAPI DebugBreakProcess(HANDLE); WINBASEAPI BOOL WINAPI DebugSetProcessKillOnExit(BOOL); -WINBASEAPI PVOID WINAPI DecodePointer(PVOID); +WINBASEAPI void * WINAPI DecodePointer(void *); +WINBASEAPI void * WINAPI DecodeSystemPointer(void *); WINADVAPI BOOL WINAPI DecryptFileA(LPCSTR,DWORD); WINADVAPI BOOL WINAPI DecryptFileW(LPCWSTR,DWORD); #define DecryptFile WINELIB_NAME_AW(DecryptFile) @@ -1853,7 +1854,8 @@ WINBASEAPI BOOL WINAPI DuplicateHandle(HANDLE,HANDLE,HANDLE,HANDLE*,DWORD WINADVAPI BOOL WINAPI DuplicateToken(HANDLE,SECURITY_IMPERSONATION_LEVEL,PHANDLE); WINADVAPI BOOL WINAPI DuplicateTokenEx(HANDLE,DWORD,LPSECURITY_ATTRIBUTES,SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); WINBASEAPI BOOL WINAPI EscapeCommFunction(HANDLE,UINT); -WINBASEAPI PVOID WINAPI EncodePointer(PVOID); +WINBASEAPI void * WINAPI EncodePointer(void *); +WINBASEAPI void * WINAPI EncodeSystemPointer(void *); WINADVAPI BOOL WINAPI EncryptFileA(LPCSTR); WINADVAPI BOOL WINAPI EncryptFileW(LPCWSTR); #define EncryptFile WINELIB_NAME_AW(EncryptFile) diff --git a/tools/make_specfiles b/tools/make_specfiles index d658f30..947cde7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -177,6 +177,7 @@ my @dll_groups = "api-ms-win-core-wow64-l1-1-0", "api-ms-win-core-xstate-l2-1-0", "api-ms-win-core-errorhandling-l1-1-2", + "api-ms-win-core-util-l1-1-0", ], [ "kernel32",

1 0