May 2021 - Wine-Devel - list.winehq.org

[PATCH v2 4/4] gdi32: Return correct color depth for display DCs in GetDeviceCaps().
by Zhiyi Zhang May 18, 2021

May 18, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29184 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/driver.c | 19 ++++++++++++++++++- dlls/user32/tests/monitor.c | 1 - dlls/winex11.drv/init.c | 2 -- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index a2ebd018bca..2042701dd45 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -460,7 +460,24 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) return pGetSystemMetrics ? pGetSystemMetrics( SM_CYSCREEN ) : 480; } - case BITSPIXEL: return 32; + case BITSPIXEL: + { + DEVMODEW devmode; + WCHAR *display; + DC *dc; + + if (GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY && pEnumDisplaySettingsW) + { + dc = get_nulldrv_dc( dev ); + display = dc->display[0] ? dc->display : NULL; + memset( &devmode, 0, sizeof(devmode) ); + devmode.dmSize = sizeof(devmode); + if (pEnumDisplaySettingsW( display, ENUM_CURRENT_SETTINGS, &devmode ) + && devmode.dmFields & DM_BITSPERPEL && devmode.dmBitsPerPel) + return devmode.dmBitsPerPel; + } + return 32; + } case PLANES: return 1; case NUMBRUSHES: return -1; case NUMPENS: return -1; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index ab03837f5e6..654f77ed617 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2068,7 +2068,6 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ dm->dmDisplayFrequency, value); value = GetDeviceCaps(hdc, BITSPIXEL); - todo_wine_if(dm->dmBitsPerPel != 32) ok_(__FILE__, line)(value == dm->dmBitsPerPel, "Expected BITSPIXEL %d, got %d.\n", dm->dmBitsPerPel, value); diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index d070c0f1171..ff3d5317697 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -162,8 +162,6 @@ static INT CDECL X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) { switch(cap) { - case BITSPIXEL: - return screen_bpp; case SIZEPALETTE: return palette_size; default: -- 2.30.2

2 2

[PATCH 4/6] user32: Use get_primary_monitor_rect() helper.
by Zhiyi Zhang May 18, 2021

May 18, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/input.c | 16 +++++++--------- dlls/user32/sysparams.c | 6 ++---- dlls/user32/user_private.h | 1 + dlls/user32/win.c | 3 +-- dlls/user32/winpos.c | 7 ++++--- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index ba0292c8f88..b4e3579f5e8 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -195,17 +195,15 @@ static void update_mouse_coords( INPUT *input ) if (input->u.mi.dwFlags & MOUSEEVENTF_ABSOLUTE) { DPI_AWARENESS_CONTEXT context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); + RECT rc; + if (input->u.mi.dwFlags & MOUSEEVENTF_VIRTUALDESK) - { - RECT rc = get_virtual_screen_rect(); - input->u.mi.dx = rc.left + ((input->u.mi.dx * (rc.right - rc.left)) >> 16); - input->u.mi.dy = rc.top + ((input->u.mi.dy * (rc.bottom - rc.top)) >> 16); - } + rc = get_virtual_screen_rect(); else - { - input->u.mi.dx = (input->u.mi.dx * GetSystemMetrics( SM_CXSCREEN )) >> 16; - input->u.mi.dy = (input->u.mi.dy * GetSystemMetrics( SM_CYSCREEN )) >> 16; - } + rc = get_primary_monitor_rect(); + + input->u.mi.dx = rc.left + ((input->u.mi.dx * (rc.right - rc.left)) >> 16); + input->u.mi.dy = rc.top + ((input->u.mi.dy * (rc.bottom - rc.top)) >> 16); SetThreadDpiAwarenessContext( context ); } else diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3d0cb2a6566..015db0db50e 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -366,7 +366,7 @@ static BOOL CALLBACK get_primary_monitor_proc( HMONITOR monitor, HDC hdc, LPRECT return TRUE; } -static RECT get_primary_monitor_rect(void) +RECT get_primary_monitor_rect(void) { RECT rect = {0}; @@ -1818,9 +1818,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, spi_idx = SPI_SETWORKAREA_IDX; if (!spi_loaded[spi_idx]) { - SetRect( &work_area, 0, 0, - GetSystemMetrics( SM_CXSCREEN ), - GetSystemMetrics( SM_CYSCREEN ) ); + work_area = get_primary_monitor_rect(); EnumDisplayMonitors( 0, NULL, enum_monitors, (LPARAM)&work_area ); spi_loaded[spi_idx] = TRUE; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 974d18be482..82cf376ef54 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -261,6 +261,7 @@ extern void update_window_state( HWND hwnd ) DECLSPEC_HIDDEN; extern void wait_graphics_driver_ready(void) DECLSPEC_HIDDEN; extern void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; +extern RECT get_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern DWORD get_input_codepage( void ) DECLSPEC_HIDDEN; extern BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 680defc2071..86a1f50ca77 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -855,8 +855,7 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind } else { - rect.right = GetSystemMetrics(SM_CXSCREEN); - rect.bottom = GetSystemMetrics(SM_CYSCREEN); + rect = get_primary_monitor_rect(); } if (rectWindow) *rectWindow = rect; if (rectClient) *rectClient = rect; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index de5d50d4c3a..5a2b8ccdfe8 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -740,7 +740,7 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) if ((monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ))) { - RECT rc_work; + RECT rc_work, rc_primary; MONITORINFO mon_info; mon_info.cbSize = sizeof(mon_info); @@ -754,8 +754,9 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) rc_work = mon_info.rcWork; } - if (MinMax.ptMaxSize.x == GetSystemMetrics(SM_CXSCREEN) + 2 * xinc && - MinMax.ptMaxSize.y == GetSystemMetrics(SM_CYSCREEN) + 2 * yinc) + rc_primary = get_primary_monitor_rect(); + if (MinMax.ptMaxSize.x == (rc_primary.right - rc_primary.left) + 2 * xinc && + MinMax.ptMaxSize.y == (rc_primary.bottom - rc_primary.top) + 2 * yinc) { MinMax.ptMaxSize.x = (rc_work.right - rc_work.left) + 2 * xinc; MinMax.ptMaxSize.y = (rc_work.bottom - rc_work.top) + 2 * yinc; -- 2.30.2

1 0

[PATCH 3/6] user32: Optimize getting virtual screen rectangle with GetSystemMetrics().
by Zhiyi Zhang May 18, 2021

May 18, 2021

This saves calls to GetMonitorInfo(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 49 +++++++++++++---------------------------- 1 file changed, 15 insertions(+), 34 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index ab1c5af0c1b..3d0cb2a6566 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -337,38 +337,20 @@ static void SYSPARAMS_NonClientMetrics32ATo32W( const NONCLIENTMETRICSA* lpnm32A /* Helper functions to retrieve monitors info */ -struct monitor_info +static BOOL CALLBACK get_virtual_screen_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) { - int count; - RECT primary_rect; - RECT virtual_rect; -}; + RECT *virtual_rect = (RECT *)lp; -static BOOL CALLBACK monitor_info_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) -{ - MONITORINFO mi; - struct monitor_info *info = (struct monitor_info *)lp; - info->count++; - UnionRect( &info->virtual_rect, &info->virtual_rect, rect ); - mi.cbSize = sizeof(mi); - if (GetMonitorInfoW( monitor, &mi ) && (mi.dwFlags & MONITORINFOF_PRIMARY)) - info->primary_rect = mi.rcMonitor; + UnionRect( virtual_rect, virtual_rect, rect ); return TRUE; } -static void get_monitors_info( struct monitor_info *info ) -{ - info->count = 0; - SetRectEmpty( &info->primary_rect ); - SetRectEmpty( &info->virtual_rect ); - EnumDisplayMonitors( 0, NULL, monitor_info_proc, (LPARAM)info ); -} - RECT get_virtual_screen_rect(void) { - struct monitor_info info; - get_monitors_info( &info ); - return info.virtual_rect; + RECT rect = {0}; + + EnumDisplayMonitors( 0, NULL, get_virtual_screen_proc, (LPARAM)&rect ); + return rect; } static BOOL CALLBACK get_primary_monitor_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) @@ -2527,7 +2509,6 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam, */ INT WINAPI GetSystemMetrics( INT index ) { - struct monitor_info info; NONCLIENTMETRICSW ncm; MINIMIZEDMETRICS mm; ICONMETRICSW im; @@ -2743,17 +2724,17 @@ INT WINAPI GetSystemMetrics( INT index ) rect = get_primary_monitor_rect(); return rect.bottom - rect.top; case SM_XVIRTUALSCREEN: - get_monitors_info( &info ); - return info.virtual_rect.left; + rect = get_virtual_screen_rect(); + return rect.left; case SM_YVIRTUALSCREEN: - get_monitors_info( &info ); - return info.virtual_rect.top; + rect = get_virtual_screen_rect(); + return rect.top; case SM_CXVIRTUALSCREEN: - get_monitors_info( &info ); - return info.virtual_rect.right - info.virtual_rect.left; + rect = get_virtual_screen_rect(); + return rect.right - rect.left; case SM_CYVIRTUALSCREEN: - get_monitors_info( &info ); - return info.virtual_rect.bottom - info.virtual_rect.top; + rect = get_virtual_screen_rect(); + return rect.bottom - rect.top; case SM_CMONITORS: return get_monitor_count(); case SM_SAMEDISPLAYFORMAT: -- 2.30.2

1 0

[PATCH v4 1/2] ws2_32: Check if waiting asyncs exist in WSARecv/WSASend
by Dongwan Kim May 18, 2021

May 18, 2021

WSARecv call should not intercept message for the waiting overlapped WSARecv. To do that, We should know if waiting asyncs exist before trying ws2_recv/ws2_send. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/ws2_32/socket.c | 31 +++++++++++++++++++++++++++++-- include/wine/server_protocol.h | 20 +++++++++++++++++++- server/protocol.def | 8 ++++++++ server/request.h | 8 ++++++++ server/sock.c | 26 ++++++++++++++++++++++++++ server/trace.c | 12 ++++++++++++ 6 files changed, 102 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2ba1982b1d9..b3d5b92c610 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2016,6 +2016,23 @@ static void WINAPI ws2_async_apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserv release_async_io( &wsa->io ); } +/* query if the socket has pending asyncs */ +static int WS_QueryAsyncWaiting( SOCKET sock, int type ) +{ + int result=0; + + SERVER_START_REQ( query_async_waiting ) + { + req->handle = wine_server_obj_handle( SOCKET2HANDLE(sock) ); + req->type = type; + wine_server_call(req); + result = reply->state; + } + SERVER_END_REQ; + return result; + +} + /*********************************************************************** * WS2_recv (INTERNAL) * @@ -5048,7 +5065,12 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } flags = convert_flags(dwFlags); - n = WS2_send( fd, wsa, flags ); + if(WS_QueryAsyncWaiting(s , ASYNC_TYPE_WRITE)) + { + n = -1; errno = EAGAIN; + } + else + n = WS2_send( fd, wsa, flags ); if (n == -1 && errno != EAGAIN) { err = wsaErrno(); @@ -6128,7 +6150,12 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, flags = convert_flags(wsa->flags); for (;;) { - n = WS2_recv( fd, wsa, flags ); + if(WS_QueryAsyncWaiting(s, ASYNC_TYPE_READ)) + { + n = -1; errno = EAGAIN; + } + else + n = WS2_recv( fd, wsa, flags ); if (n == -1) { /* Unix-like systems return EINVAL when attempting to read OOB data from diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 27557f2c1d7..dd0b6f0ba65 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5403,6 +5403,21 @@ struct get_next_thread_reply char __pad_12[4]; }; +struct query_async_waiting_request +{ + struct request_header __header; + obj_handle_t handle; + int type; + char __pad_20[4]; + +}; +struct query_async_waiting_reply +{ + struct reply_header __header; + int state; + char __pad_12[4]; +}; + enum request { @@ -5680,6 +5695,7 @@ enum request REQ_suspend_process, REQ_resume_process, REQ_get_next_thread, + REQ_query_async_waiting, REQ_NB_REQUESTS }; @@ -5961,6 +5977,7 @@ union generic_request struct suspend_process_request suspend_process_request; struct resume_process_request resume_process_request; struct get_next_thread_request get_next_thread_request; + struct query_async_waiting_request query_async_waiting_request; }; union generic_reply { @@ -6240,11 +6257,12 @@ union generic_reply struct suspend_process_reply suspend_process_reply; struct resume_process_reply resume_process_reply; struct get_next_thread_reply get_next_thread_reply; + struct query_async_waiting_reply query_async_waiting_reply; }; /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 701 +#define SERVER_PROTOCOL_VERSION 702 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 6d8208b128b..da754cc89b6 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3711,3 +3711,11 @@ struct handle_info @REPLY obj_handle_t handle; /* next thread handle */ @END + +/* Query if there are waiting asyncs of the socket */ +(a)REQ(query_async_waiting) + obj_handle_t handle; /* socket handle */ + int type; /* async type */ +(a)REPLY + int state; /* waiting async exists */ +(a)END diff --git a/server/request.h b/server/request.h index 41810b89299..88eee241b9b 100644 --- a/server/request.h +++ b/server/request.h @@ -393,6 +393,7 @@ DECL_HANDLER(terminate_job); DECL_HANDLER(suspend_process); DECL_HANDLER(resume_process); DECL_HANDLER(get_next_thread); +DECL_HANDLER(query_async_waiting); #ifdef WANT_REQUEST_HANDLERS @@ -673,6 +674,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_suspend_process, (req_handler)req_resume_process, (req_handler)req_get_next_thread, + (req_handler)req_query_async_waiting, }; C_ASSERT( sizeof(abstime_t) == 8 ); @@ -2236,6 +2238,12 @@ C_ASSERT( FIELD_OFFSET(struct get_next_thread_request, flags) == 28 ); C_ASSERT( sizeof(struct get_next_thread_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_next_thread_reply, handle) == 8 ); C_ASSERT( sizeof(struct get_next_thread_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct query_async_waiting_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct query_async_waiting_request, type) == 16 ); +C_ASSERT( sizeof(struct query_async_waiting_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct query_async_waiting_reply, state) == 8 ); +C_ASSERT( sizeof(struct query_async_waiting_reply) == 16 ); + #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/sock.c b/server/sock.c index 565fb4c5a2c..c1142d75e2f 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1923,3 +1923,29 @@ DECL_HANDLER(get_socket_info) release_object( &sock->obj ); } + +DECL_HANDLER( query_async_waiting ) +{ + struct sock *sock; + struct async *async; + reply->state = 0; + + if (!(sock = (struct sock *)get_handle_obj( current->process, req->handle, + FILE_READ_ATTRIBUTES, &sock_ops))) return; + if (get_unix_fd( sock->fd ) == -1) return; + + if (is_fd_overlapped( sock->fd )) + { + if(req->type == ASYNC_TYPE_READ && ( async = find_pending_async(&sock->read_q) )) { + reply->state = 1; + release_object(async); + } + if(req->type == ASYNC_TYPE_WRITE && ( async = find_pending_async(&sock->write_q )) ) + { + reply->state = 1; + release_object(async); + } + } + release_object( &sock->obj ); + +} diff --git a/server/trace.c b/server/trace.c index ad7236dd393..63960a5fec4 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4478,6 +4478,15 @@ static void dump_get_next_thread_reply( const struct get_next_thread_reply *req { fprintf( stderr, " handle=%04x", req->handle ); } +static void dump_query_async_waiting_request( const struct query_async_waiting_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", type=%d", req->type ); +} +static void dump_query_async_waiting_reply( const struct query_async_waiting_reply *req ) +{ + fprintf( stderr, " state=%d", req->state ); +} static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, @@ -4754,6 +4763,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_suspend_process_request, (dump_func)dump_resume_process_request, (dump_func)dump_get_next_thread_request, + (dump_func)dump_query_async_waiting_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -5031,6 +5041,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, (dump_func)dump_get_next_thread_reply, + (dump_func)dump_query_async_waiting_reply, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -5308,6 +5319,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "suspend_process", "resume_process", "get_next_thread", + "query_async_waiting", }; static const struct -- 2.30.2

2 2

[PATCH v2 2/2] wbemprox: Partially implement Win32_Process.Create method.
by Hans Leidekker May 18, 2021

May 18, 2021

From: Paul Gofman <pgofman(a)codeweavers.com> Fixes FunCom launcher failure to launch games. v2: Keep table data sorted. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 14 +++- dlls/wbemprox/process.c | 110 +++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 123 ++++++++++++++++++++++++++++++- dlls/wbemprox/wbemprox_private.h | 1 + 4 files changed, 244 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3922331f650..862c461d8b7 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -312,6 +312,7 @@ static const struct column col_process[] = { L"ThreadCount", CIM_UINT32 }, { L"WorkingSetSize", CIM_UINT64 }, /* methods */ + { L"Create", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { L"GetOwner", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, }; static const struct column col_processor[] = @@ -725,6 +726,7 @@ struct record_process UINT32 thread_count; UINT64 workingsetsize; /* methods */ + class_method *create; class_method *get_owner; }; struct record_processor @@ -892,6 +894,9 @@ static const struct record_param data_param[] = { L"StdRegProv", L"CreateKey", 1, L"hDefKey", CIM_SINT32, 0x80000002 }, { L"StdRegProv", L"CreateKey", 1, L"sSubKeyName", CIM_STRING }, { L"StdRegProv", L"CreateKey", -1, L"ReturnValue", CIM_UINT32 }, + { L"StdRegProv", L"DeleteKey", 1, L"hDefKey", CIM_SINT32, 0x80000002 }, + { L"StdRegProv", L"DeleteKey", 1, L"sSubKeyName", CIM_STRING }, + { L"StdRegProv", L"DeleteKey", -1, L"ReturnValue", CIM_UINT32 }, { L"StdRegProv", L"EnumKey", 1, L"hDefKey", CIM_SINT32, 0x80000002 }, { L"StdRegProv", L"EnumKey", 1, L"sSubKeyName", CIM_STRING }, { L"StdRegProv", L"EnumKey", -1, L"ReturnValue", CIM_UINT32 }, @@ -916,13 +921,14 @@ static const struct record_param data_param[] = { L"StdRegProv", L"SetDWORDValue", 1, L"sValueName", CIM_STRING }, { L"StdRegProv", L"SetDWORDValue", 1, L"uValue", CIM_UINT32 }, { L"StdRegProv", L"SetDWORDValue", -1, L"ReturnValue", CIM_UINT32 }, - { L"StdRegProv", L"DeleteKey", 1, L"hDefKey", CIM_SINT32, 0x80000002 }, - { L"StdRegProv", L"DeleteKey", 1, L"sSubKeyName", CIM_STRING }, - { L"StdRegProv", L"DeleteKey", -1, L"ReturnValue", CIM_UINT32 }, { L"SystemRestore", L"Disable", 1, L"Drive", CIM_STRING }, { L"SystemRestore", L"Disable", -1, L"ReturnValue", CIM_UINT32 }, { L"SystemRestore", L"Enable", 1, L"Drive", CIM_STRING }, { L"SystemRestore", L"Enable", -1, L"ReturnValue", CIM_UINT32 }, + { L"Win32_Process", L"Create", 1, L"CommandLine", CIM_STRING }, + { L"Win32_Process", L"Create", 1, L"CurrentDirectory", CIM_STRING }, + { L"Win32_Process", L"Create", -1, L"ProcessId", CIM_UINT32 }, + { L"Win32_Process", L"Create", -1, L"ReturnValue", CIM_UINT32 }, { L"Win32_Process", L"GetOwner", -1, L"ReturnValue", CIM_UINT32 }, { L"Win32_Process", L"GetOwner", -1, L"User", CIM_STRING }, { L"Win32_Process", L"GetOwner", -1, L"Domain", CIM_STRING }, @@ -3162,6 +3168,8 @@ static enum fill_status fill_process( struct table *table, const struct expr *co rec->pprocess_id = entry.th32ParentProcessID; rec->thread_count = entry.cntThreads; rec->workingsetsize = 0; + /* methods */ + rec->create = process_create; rec->get_owner = process_get_owner; if (!match_row( table, row, cond, &status )) { diff --git a/dlls/wbemprox/process.c b/dlls/wbemprox/process.c index 2f11530da2f..5d8af54f217 100644 --- a/dlls/wbemprox/process.c +++ b/dlls/wbemprox/process.c @@ -110,3 +110,113 @@ done: if (out_params) IWbemClassObject_Release( out_params ); return hr; } + +HRESULT process_create( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) +{ + VARIANT command_line, current_directory, startup_info; + HRESULT ret = WBEM_E_INVALID_PARAMETER, hr; + IWbemClassObject *sig, *out_params = NULL; + PROCESS_INFORMATION pi; + STARTUPINFOW si; + UINT32 error; + VARIANT v; + BOOL bret; + CIMTYPE type; + + FIXME("%p, %p, %p, %p stub\n", obj, context, in, out); + + *out = NULL; + + if ((hr = create_signature( L"Win32_Process", L"Create", PARAM_OUT, &sig ))) return hr; + + VariantInit( &command_line ); + VariantInit( &current_directory ); + VariantInit( &startup_info ); + + if (FAILED(hr = IWbemClassObject_Get( in, L"CommandLine", 0, &command_line, &type, NULL )) + || V_VT( &command_line ) != VT_BSTR) + WARN( "Invalid CommandLine, hr %#x, type %u.\n", hr, V_VT( &command_line )); + else + TRACE( "CommandLine %s.\n", debugstr_w( V_BSTR( &command_line ))); + + if (FAILED(hr = IWbemClassObject_Get( in, L"CurrentDirectory", 0, &current_directory, &type, NULL )) + || V_VT( &current_directory ) != VT_BSTR) + WARN("Invalid CurrentDirectory, hr %#x, type %u.\n", hr, V_VT( &current_directory )); + else + TRACE( "CurrentDirectory %s.\n", debugstr_w( V_BSTR( &current_directory ))); + + if (SUCCEEDED(IWbemClassObject_Get( in, L"ProcessStartupInformation", 0, &startup_info, &type, NULL )) + && V_VT( &startup_info ) == VT_UNKNOWN && V_UNKNOWN( &startup_info )) + FIXME( "ProcessStartupInformation is not implemented, vt_type %u, type %u, val %p.\n", + V_VT( &startup_info ), type, V_UNKNOWN( &startup_info )); + + if (out && (hr = IWbemClassObject_SpawnInstance( sig, 0, &out_params ))) + { + ret = hr; + goto done; + } + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + + if (V_VT( &command_line ) == VT_BSTR && V_BSTR( &command_line )) + { + bret = CreateProcessW( NULL, V_BSTR( &command_line ), NULL, NULL, FALSE, 0L, + V_VT( &current_directory ) == VT_BSTR ? V_BSTR( &current_directory ) : NULL, + NULL, &si, &pi ); + TRACE( "CreateProcessW ret %#x, GetLastError() %u.\n", bret, GetLastError() ); + if (bret) + { + CloseHandle( pi.hThread ); + CloseHandle( pi.hProcess ); + error = 0; + } + else + { + switch (GetLastError()) + { + case ERROR_FILE_NOT_FOUND: + case ERROR_PATH_NOT_FOUND: + error = 9; + break; + case ERROR_ACCESS_DENIED: + error = 2; + break; + default: + error = 8; + break; + } + } + } + else + { + bret = FALSE; + error = 21; + } + + if (out) + { + VariantInit( &v ); + + V_VT( &v ) = VT_UI4; + V_UI4( &v ) = pi.dwProcessId; + + if (bret && (ret = IWbemClassObject_Put( out_params, L"ProcessId", 0, &v, 0 ))) goto done; + + V_UI4( &v ) = error; + if ((ret = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &v, 0 ))) goto done; + + *out = out_params; + IWbemClassObject_AddRef( out_params ); + } + ret = S_OK; + +done: + IWbemClassObject_Release( sig ); + if (out_params) IWbemClassObject_Release( out_params ); + VariantClear( &command_line ); + VariantClear( &current_directory ); + VariantClear( &startup_info ); + TRACE( "ret %#x.\n", ret ); + return ret; +} diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 85b242aba6f..784ebd3503d 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -453,6 +453,10 @@ static void test_Win32_Baseboard( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_Process_created_process(void) +{ +} + static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) { static const LONG expected_flavor = WBEM_FLAVOR_FLAG_PROPAGATE_TO_INSTANCE | @@ -460,15 +464,19 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) WBEM_FLAVOR_ORIGIN_PROPAGATED; WCHAR full_path[MAX_COMPUTERNAME_LENGTH + ARRAY_SIZE( L"\\\\%s\\ROOT\\CIMV2:" )]; BSTR class, method; - IWbemClassObject *process, *sig_in, *sig_out, *out; + IWbemClassObject *process, *sig_in, *sig_out, *out, *params; + WCHAR cmdlineW[MAX_PATH + 64 + 1]; IWbemQualifierSet *qualifiers; VARIANT retval, val; SAFEARRAY *names; LONG bound, i; DWORD full_path_len = 0; + ULONG refcount; LONG flavor; CIMTYPE type; HRESULT hr; + DWORD ret; + HANDLE h; if (use_full_path) { @@ -511,6 +519,109 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) ok( !sig_in, "Got unexpected sig_in %p.\n", sig_in ); ok( !sig_out, "Got unexpected sig_out %p.\n", sig_out ); + sig_in = (void *)0xdeadbeef; + sig_out = (void *)0xdeadbeef; + hr = IWbemClassObject_GetMethod( process, L"Create", 0, &sig_in, &sig_out ); + ok( hr == S_OK, "Got unexpected hr %#x\n", hr ); + ok( !!sig_in, "Got unexpected sig_in %p.\n", sig_in ); + ok( !!sig_out, "Got unexpected sig_out %p.\n", sig_out ); + + hr = IWbemClassObject_SpawnInstance( sig_in, 0, &params ); + ok( hr == S_OK, "got %08x\n", hr ); + + out = NULL; + class = SysAllocString( L"Win32_Process" ); + method = SysAllocString( L"Create" ); + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, params, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + SysFreeString( method ); + SysFreeString( class ); + + VariantInit( &retval ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); + ok( V_I4( &retval ) == 21, "unexpected error %u\n", V_I4( &retval ) ); + + IWbemClassObject_Release( out ); + + V_VT( &val ) = VT_BSTR; + V_BSTR( &val ) = SysAllocString( L"unknown" ); + hr = IWbemClassObject_Put( params, L"CommandLine", 0, &val, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + VariantClear( &val ); + + out = NULL; + class = SysAllocString( L"Win32_Process" ); + method = SysAllocString( L"Create" ); + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, params, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + SysFreeString( method ); + SysFreeString( class ); + + VariantInit( &retval ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); + ok( V_I4( &retval ) == 9, "unexpected error %u\n", V_I4( &retval ) ); + + VariantInit( &retval ); + V_VT( &retval ) = VT_I4; + hr = IWbemClassObject_Get( out, L"ProcessId", 0, &retval, &type, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + todo_wine ok( V_VT( &retval ) == VT_NULL && type == CIM_UINT32, "unexpected variant type 0x%x, type %u\n", + V_VT( &retval ), type ); + + IWbemClassObject_Release( out ); + + ret = GetModuleFileNameW( NULL, cmdlineW, MAX_PATH + 1 ); + ok( ret < MAX_PATH + 1, "Got unexpected ret %u.\n", ret ); + lstrcatW( cmdlineW, L" query created_process"); + V_VT( &val ) = VT_BSTR; + V_BSTR( &val ) = SysAllocString( cmdlineW ); + hr = IWbemClassObject_Put( params, L"CommandLine", 0, &val, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + VariantClear( &val ); + + out = NULL; + class = SysAllocString( L"Win32_Process" ); + method = SysAllocString( L"Create" ); + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, params, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + SysFreeString( method ); + SysFreeString( class ); + + VariantInit( &retval ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); + ok( !V_I4( &retval ), "unexpected error %u\n", V_I4( &retval ) ); + + VariantInit( &retval ); + V_VT( &retval ) = VT_I4; + hr = IWbemClassObject_Get( out, L"ProcessId", 0, &retval, &type, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_VT( &retval ) == VT_I4 && type == CIM_UINT32, "unexpected variant type 0x%x, type %u\n", + V_VT( &retval ), type ); + ok( !!V_UI4( &retval ), "unexpected zero pid\n" ); + + IWbemClassObject_Release( out ); + + h = OpenProcess( SYNCHRONIZE, FALSE, V_UI4( &retval )); + ok( !!h, "failed to open process %#x.\n", V_UI4( &retval )); + + ret = WaitForSingleObject( h, INFINITE ); + ok( ret == WAIT_OBJECT_0, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError() ); + CloseHandle( h ); + + refcount = IWbemClassObject_Release( params ); + ok( !refcount, "Got unexpected refcount %u.\n", refcount ); + + refcount = IWbemClassObject_Release( sig_in ); + ok( !refcount, "Got unexpected refcount %u.\n", refcount ); + refcount = IWbemClassObject_Release( sig_out ); + ok( !refcount, "Got unexpected refcount %u.\n", refcount ); + sig_in = (void*)0xdeadbeef; hr = IWbemClassObject_GetMethod( process, L"getowner", 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get GetOwner method %08x\n", hr ); @@ -1956,7 +2067,17 @@ START_TEST(query) IWbemLocator *locator; IWbemServices *services; DWORD authn_svc; + char **argv; HRESULT hr; + int argc; + + argc = winetest_get_mainargs( &argv ); + if (argc >= 3) + { + if (!strcmp( argv[2], "created_process" )) + test_Win32_Process_created_process(); + return; + } CoInitialize( NULL ); CoInitializeSecurity( NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_DEFAULT, diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index fec67f47e1b..ded413c99a7 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -245,6 +245,7 @@ HRESULT EnumWbemClassObject_create(struct query *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemQualifierSet_create(const WCHAR *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; HRESULT process_get_owner(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; +HRESULT process_create(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; HRESULT reg_create_key(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; HRESULT reg_enum_key(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; HRESULT reg_enum_values(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; -- 2.30.2

1 0

[PATCH v2 1/2] wbemprox: Check for method existence in class_object_GetMethod().
by Hans Leidekker May 18, 2021

May 18, 2021

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/class.c | 17 +++++++++++++++++ dlls/wbemprox/tests/query.c | 11 +++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index f48c815ef8d..2f2d3ef2bfb 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -875,10 +875,27 @@ static HRESULT WINAPI class_object_GetMethod( { struct class_object *co = impl_from_IWbemClassObject( iface ); IWbemClassObject *in, *out; + struct table *table; + unsigned int i; HRESULT hr; TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature); + if (ppInSignature) *ppInSignature = NULL; + if (ppOutSignature) *ppOutSignature = NULL; + + table = get_view_table( impl_from_IEnumWbemClassObject( co->iter )->query->view, co->index ); + + for (i = 0; i < table->num_cols; ++i) + { + if (is_method( table, i ) && !lstrcmpiW( table->columns[i].name, wszName )) break; + } + if (i == table->num_cols) + { + FIXME("Method %s not found in class %s.\n", debugstr_w(wszName), debugstr_w(co->name)); + return WBEM_E_NOT_FOUND; + } + hr = create_signature( co->name, wszName, PARAM_IN, &in ); if (hr != S_OK) return hr; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a79bc759bea..85b242aba6f 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -460,7 +460,7 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) WBEM_FLAVOR_ORIGIN_PROPAGATED; WCHAR full_path[MAX_COMPUTERNAME_LENGTH + ARRAY_SIZE( L"\\\\%s\\ROOT\\CIMV2:" )]; BSTR class, method; - IWbemClassObject *process, *sig_in, *out; + IWbemClassObject *process, *sig_in, *sig_out, *out; IWbemQualifierSet *qualifiers; VARIANT retval, val; SAFEARRAY *names; @@ -504,8 +504,15 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) } SafeArrayDestroy( names ); + sig_in = (void *)0xdeadbeef; + sig_out = (void *)0xdeadbeef; + hr = IWbemClassObject_GetMethod( process, L"unknown", 0, &sig_in, &sig_out ); + ok( hr == WBEM_E_NOT_FOUND, "Got unexpected hr %#x\n", hr ); + ok( !sig_in, "Got unexpected sig_in %p.\n", sig_in ); + ok( !sig_out, "Got unexpected sig_out %p.\n", sig_out ); + sig_in = (void*)0xdeadbeef; - hr = IWbemClassObject_GetMethod( process, L"GetOwner", 0, &sig_in, NULL ); + hr = IWbemClassObject_GetMethod( process, L"getowner", 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get GetOwner method %08x\n", hr ); ok( !sig_in, "sig_in != NULL\n"); IWbemClassObject_Release( process ); -- 2.30.2

1 0

[PATCH] winegstreamer: Advertise support for thinned or reverse playback.
by Giovanni Mascellani May 18, 2021

May 18, 2021

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index eb5b9e366ec..397f4224c9f 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -917,13 +917,7 @@ static HRESULT WINAPI media_source_rate_support_GetSlowestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - if (direction == MFRATE_REVERSE) - return MF_E_REVERSE_UNSUPPORTED; - - if (thin) - return MF_E_THINNING_UNSUPPORTED; - - *rate = 1.0f; + *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; return S_OK; } @@ -932,31 +926,21 @@ static HRESULT WINAPI media_source_rate_support_GetFastestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - if (direction == MFRATE_REVERSE) - return MF_E_REVERSE_UNSUPPORTED; - - if (thin) - return MF_E_THINNING_UNSUPPORTED; - - *rate = 1.0f; + *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; return S_OK; } static HRESULT WINAPI media_source_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, float *nearest_support_rate) { - TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_support_rate); + const float supported_rate = rate >= 0.0f ? 1.0f : -1.0f; - if (rate < 0.0f) - return MF_E_REVERSE_UNSUPPORTED; - - if (thin) - return MF_E_THINNING_UNSUPPORTED; + TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_support_rate); if (nearest_support_rate) - *nearest_support_rate = 1.0f; + *nearest_support_rate = supported_rate; - return rate == 1.0f ? S_OK : MF_E_UNSUPPORTED_RATE; + return rate == supported_rate ? S_OK : MF_E_UNSUPPORTED_RATE; } static const IMFRateSupportVtbl media_source_rate_support_vtbl = -- 2.31.1

3 3

Using native Chrome OS FilesApp for file chooser
by Joel Hockey May 18, 2021

May 18, 2021

I'm one of the Chrome OS developers. I would like to make it possible for wine apps running in the crostini linux VM to use the Chrome OS native FilesApp for file chooser when possible. Using the native FilesApp improves the UX consistency, and also allows us to let VM apps get access to files outside the VM which can be shared on-demand when a user selects. Does wine already have any APIs where a native file chooser dialog can be configured either during compile or at runtime? I don't see anything. I've been looking at the possibilities today, and doing some testing using Notepad2.exe (since it is the simplest windows app I know). I see that it calls GetOpenFilenameW() to launch a file chooser which is implemented in dlls/comdlg32/filedlg.c GetFileDialog95(). Do most (all) apps use this same API for a file chooser? Would GetFileDialog95() be a possible place to call out to a native file chooser? I'm not familiar with this space, but I've discovered today that xdg-desktop-portal dbus APIs (org.freedesktop.portal.FileChooser) could be a suitable approach. https://github.com/flatpak/xdg-desktop-portal I'm planning to look at this a little more and try and get some code running soon. I can send some patches then, but any help now to point me in a good direction is appreciated. Thanks Joel

5 9

[PATCH] ntdll/tests: Fix a copy-paste error in an ok message.
by Zebediah Figura May 17, 2021

May 17, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 2c604408943..453e77f9063 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3026,7 +3026,7 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, todo_wine ok( context->SegEs == context->SegSs, "%u: es %#x does not match ss %#x\n", entry, context->SegEs, context->SegSs ); todo_wine ok( context->SegGs == context->SegSs, - "%u: ds %#x does not match ss %#x\n", entry, context->SegGs, context->SegSs ); + "%u: gs %#x does not match ss %#x\n", entry, context->SegGs, context->SegSs ); todo_wine ok( context->SegFs && context->SegFs != context->SegSs, "%u: got fs %#x\n", entry, context->SegFs ); -- 2.30.2

1 0

[PATCH] advapi32: Quiet a couple of noisy FIXMEs.
by Zebediah Figura May 17, 2021

May 17, 2021

The .NET installers call these many times. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/lsa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 7b118733b50..7e6bfc74620 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -190,7 +190,7 @@ NTSTATUS WINAPI LsaAddAccountRights( */ NTSTATUS WINAPI LsaClose(IN LSA_HANDLE ObjectHandle) { - FIXME("(%p) stub\n", ObjectHandle); + WARN("(%p) stub\n", ObjectHandle); return STATUS_SUCCESS; } @@ -734,7 +734,7 @@ NTSTATUS WINAPI LsaOpenPolicy( IN ACCESS_MASK DesiredAccess, IN OUT PLSA_HANDLE PolicyHandle) { - FIXME("(%s,%p,0x%08x,%p) stub\n", + WARN("(%s,%p,0x%08x,%p) stub\n", SystemName?debugstr_w(SystemName->Buffer):"(null)", ObjectAttributes, DesiredAccess, PolicyHandle); -- 2.30.2

1 0