May 2022 - Wine-commits - list.winehq.org

Jacek Caban : winex11: Avoid using kernel32 functions in get_config_key.
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: 1a89cea4f6ccc153bb9030dae940ac8a1a9352ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a89cea4f6ccc153bb9030da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 15:36:18 2022 +0200 winex11: Avoid using kernel32 functions in get_config_key. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/x11drv_main.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 22f0f0a729f..f05885c316a 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -422,7 +422,7 @@ static inline DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, static void setup_options(void) { static const WCHAR x11driverW[] = {'\\','X','1','1',' ','D','r','i','v','e','r',0}; - WCHAR buffer[MAX_PATH+16]; + WCHAR buffer[MAX_PATH+16], *p, *appname; HKEY hkey, appkey = 0; DWORD len; @@ -431,18 +431,21 @@ static void setup_options(void) /* open the app-specific key */ - len = GetModuleFileNameW( 0, buffer, MAX_PATH ); + appname = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; + if ((p = strrchrW( appname, '/' ))) appname = p + 1; + if ((p = strrchrW( appname, '\\' ))) appname = p + 1; + len = lstrlenW( appname ); + if (len && len < MAX_PATH) { HKEY tmpkey; - WCHAR *p, *appname = buffer; - if ((p = strrchrW( appname, '/' ))) appname = p + 1; - if ((p = strrchrW( appname, '\\' ))) appname = p + 1; - CharLowerW(appname); - len = WideCharToMultiByte( CP_UNIXCP, 0, appname, -1, NULL, 0, NULL, NULL ); - if ((process_name = malloc( len ))) - WideCharToMultiByte( CP_UNIXCP, 0, appname, -1, process_name, len, NULL, NULL ); - strcatW( appname, x11driverW ); + int i; + for (i = 0; appname[i]; i++) buffer[i] = RtlDowncaseUnicodeChar( appname[i] ); + buffer[i] = 0; + appname = buffer; + if ((process_name = malloc( len * 3 + 1 ))) + ntdll_wcstoumbs( appname, len + 1, process_name, len * 3 + 1, FALSE ); + memcpy( appname + i, x11driverW, sizeof(x11driverW) ); /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\X11 Driver */ if ((tmpkey = open_hkcu_key( "Software\\Wine\\AppDefaults" ))) {

1 0

Jacek Caban : winex11: Avoid using kernel32 functions in user driver.
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: a34669b238b121313b6c3aecdcb1a1fbc231e8a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a34669b238b121313b6c3aec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 20:00:27 2022 +0200 winex11: Avoid using kernel32 functions in user driver. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 6 +++--- dlls/winex11.drv/x11drv_main.c | 3 ++- dlls/winex11.drv/xim.c | 25 +++++++++++++------------ dlls/winex11.drv/xrender.c | 6 +++--- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index edd6fb8d271..44d9c7698aa 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -736,7 +736,7 @@ NTSTATUS x11drv_tablet_load_info( void *hwnd ) Button = (XButtonInfoPtr) any; TRACE(" ButtonInput %d: [class %d|length %d|num_buttons %d]\n", class_loop, (int) Button->class, Button->length, Button->num_buttons); - cursor.BTNNAMES = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*cchBuf); + cursor.BTNNAMES = malloc( sizeof(WCHAR) * cchBuf ); for (i = 0; i < cursor.BUTTONS; i++) { /* FIXME - these names are probably incorrect */ @@ -744,14 +744,14 @@ NTSTATUS x11drv_tablet_load_info( void *hwnd ) while (cch > cchBuf - cchPos - 1) /* we want one extra byte for the last NUL */ { cchBuf *= 2; - cursor.BTNNAMES = HeapReAlloc(GetProcessHeap(), 0, cursor.BTNNAMES, sizeof(WCHAR)*cchBuf); + cursor.BTNNAMES = realloc( cursor.BTNNAMES, sizeof(WCHAR) * cchBuf ); } strcpyW(cursor.BTNNAMES + cchPos, cursor.NAME); cchPos += cch; } cursor.BTNNAMES[cchPos++] = 0; - cursor.BTNNAMES = HeapReAlloc(GetProcessHeap(), 0, cursor.BTNNAMES, sizeof(WCHAR)*cchPos); + cursor.BTNNAMES = realloc( cursor.BTNNAMES, sizeof(WCHAR)*cchPos ); cursor.cchBTNNAMES = cchPos; } break; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index f05885c316a..5347bc7c1a5 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -28,6 +28,7 @@ #include <string.h> #include <sys/time.h> #include <unistd.h> +#include <assert.h> #include <dlfcn.h> #include <X11/cursorfont.h> #include <X11/Xlib.h> @@ -293,7 +294,7 @@ static int error_handler( Display *display, XErrorEvent *error_evt ) { ERR( "X protocol error: serial=%ld, request_code=%d - breaking into debugger\n", error_evt->serial, error_evt->request_code ); - DebugBreak(); /* force an entry in the debugger */ + assert( 0 ); } old_error_handler( display, error_evt ); return 0; diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 81f420891ad..4b63a24cccf 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -72,13 +72,7 @@ static void X11DRV_ImmSetInternalString(DWORD dwOffset, if (byte_expansion + dwCompStringLength >= dwCompStringSize) { - if (CompositionString) - ptr_new = HeapReAlloc(GetProcessHeap(), 0, CompositionString, - dwCompStringSize + byte_expansion); - else - ptr_new = HeapAlloc(GetProcessHeap(), 0, - dwCompStringSize + byte_expansion); - + ptr_new = realloc( CompositionString, dwCompStringSize + byte_expansion ); if (ptr_new == NULL) { ERR("Couldn't expand composition string buffer\n"); @@ -150,7 +144,7 @@ static void XIMPreEditDoneCallback(XIC ic, XPointer client_data, XPointer call_d TRACE("PreeditDoneCallback %p\n",ic); ximInComposeMode = FALSE; if (dwCompStringSize) - HeapFree(GetProcessHeap(), 0, CompositionString); + free( CompositionString ); dwCompStringSize = 0; dwCompStringLength = 0; CompositionString = NULL; @@ -464,17 +458,24 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) XIC xic; XICCallback destroy = {(XPointer)data, X11DRV_DestroyIC}; XICCallback P_StateNotifyCB, P_StartCB, P_DoneCB, P_DrawCB, P_CaretCB; - LANGID langid = PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())); + LCID lcid; Window win = data->whole_window; XFontSet fontSet = x11drv_thread_data()->font_set; TRACE("xim = %p\n", xim); + lcid = NtCurrentTeb()->CurrentLocale; + if (!lcid) NtQueryDefaultLocale( TRUE, &lcid ); + /* use complex and slow XIC initialization method only for CJK */ - if (langid != LANG_CHINESE && - langid != LANG_JAPANESE && - langid != LANG_KOREAN) + switch (PRIMARYLANGID(LANGIDFROMLCID(lcid))) { + case LANG_CHINESE: + case LANG_JAPANESE: + case LANG_KOREAN: + break; + + default: xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, XNClientWindow, win, diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 2a694794397..33725338f60 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -774,7 +774,7 @@ static AA_Type aa_type_from_flags( UINT aa_flags ) static UINT get_xft_aa_flags( const LOGFONTW *lf ) { - char *value; + char *value, *p; UINT ret = 0; switch (lf->lfQuality) @@ -785,8 +785,8 @@ static UINT get_xft_aa_flags( const LOGFONTW *lf ) default: if (!(value = XGetDefault( gdi_display, "Xft", "antialias" ))) break; TRACE( "got antialias '%s'\n", value ); - if (tolower(value[0]) == 'f' || tolower(value[0]) == 'n' || - value[0] == '0' || !_strnicmp( value, "off", -1 )) + for (p = value; *p; p++) if ('A' <= *p && *p <= 'Z') *p += 'a' - 'A'; /* to lower */ + if (value[0] == 'f' || value[0] == 'n' || value[0] == '0' || !strcmp( value, "off" )) { ret = GGO_BITMAP; break;

1 0

Alistair Leslie-Hughes : msado15: Implement _Recordset get_EditMode.
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: d106b3c450cfa4af2a9fbcca4c640536ebd34bc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d106b3c450cfa4af2a9fbcca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 3 11:11:53 2022 +1000 msado15: Implement _Recordset get_EditMode. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 12 ++++++++++-- dlls/msado15/tests/msado15.c | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 766c17598ce..6d3b3ca352f 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -48,6 +48,7 @@ struct recordset CursorLocationEnum cursor_location; CursorTypeEnum cursor_type; IRowset *row_set; + EditModeEnum editmode; }; struct fields @@ -1575,8 +1576,14 @@ static HRESULT WINAPI recordset_put_AbsolutePage( _Recordset *iface, PositionEnu static HRESULT WINAPI recordset_get_EditMode( _Recordset *iface, EditModeEnum *mode ) { - FIXME( "%p, %p\n", iface, mode ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", iface, mode ); + + if (recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (recordset->index < 0) return MAKE_ADO_HRESULT( adErrNoCurrentRecord ); + + *mode = recordset->editmode; + return S_OK; } static HRESULT WINAPI recordset_get_Filter( _Recordset *iface, VARIANT *criteria ) @@ -2123,6 +2130,7 @@ HRESULT Recordset_create( void **obj ) recordset->cursor_location = adUseServer; recordset->cursor_type = adOpenForwardOnly; recordset->row_set = NULL; + recordset->editmode = adEditNone; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 94e9ae4fa09..b39adf58b22 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -60,6 +60,7 @@ static void test_Recordset(void) BSTR name; HRESULT hr; VARIANT bookmark; + EditModeEnum editmode; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08lx\n", hr ); @@ -110,6 +111,10 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08lx\n", hr ); ok( cursor == adOpenForwardOnly, "got %d\n", cursor ); + editmode = -1; + hr = _Recordset_get_EditMode( recordset, &editmode ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr ); + VariantInit( &bookmark ); hr = _Recordset_get_Bookmark( recordset, &bookmark ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr ); @@ -197,6 +202,10 @@ static void test_Recordset(void) ok( is_eof( recordset ), "not eof\n" ); ok( is_bof( recordset ), "not bof\n" ); + editmode = -1; + hr = _Recordset_get_EditMode( recordset, &editmode ); + ok( hr == MAKE_ADO_HRESULT( adErrNoCurrentRecord ), "got %08lx\n", hr ); + hr = _Recordset_Open( recordset, missing, missing, adOpenStatic, adLockBatchOptimistic, adCmdUnspecified ); ok( hr == MAKE_ADO_HRESULT( adErrObjectOpen ), "got %08lx\n", hr ); @@ -223,6 +232,11 @@ static void test_Recordset(void) ok( !is_eof( recordset ), "eof\n" ); ok( !is_bof( recordset ), "bof\n" ); + editmode = -1; + hr = _Recordset_get_EditMode( recordset, &editmode ); + ok( hr == S_OK, "got %08lx\n", hr ); + todo_wine ok( editmode == adEditAdd, "got %d\n", editmode ); + rec_count = -1; hr = _Recordset_get_RecordCount( recordset, &rec_count ); ok( hr == S_OK, "got %08lx\n", hr );

1 0

Eric Pouech : dbghelp: Introduce symt_find_symbol_at().
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: 99c78180979b32678bbd9395d00739108d73a87a URL: https://source.winehq.org/git/wine.git/?a=commit;h=99c78180979b32678bbd9395… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Apr 29 11:08:31 2022 +0200 dbghelp: Introduce symt_find_symbol_at(). To be used in place of symt_find_nearest(). symt_find_symbol_at() ensures that the address passed is within the boundaries of the returned symbol (while find_nearest() doesn't). This fixes erroneous backtraces in debugger like: $ ./wine winedbg notepad WineDbg starting on pid 0104 RtlDefaultNpAcl () at Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731 0x00000170054805 ntdll+0x54805 [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731]: ret 1731 } Wine-dbg>bt Backtrace: =>0 0x00000170054805 RtlDefaultNpAcl+0x2d5(pAcl=<internal error>) [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731] in ntdll (0x000001700701a4) 1 0x0000017002d6c4 __wine_pop_frame(pAcl=<internal error>) [Z:\home\eric\work\wine\include\wine\exception.h:273] in ntdll (0x000001700701a4) 2 0x0000017002d6c4 process_breakpoint+0x84() [Z:\home\eric\work\wine\dlls\ntdll\loader.c:3912] in ntdll (0x000001700701a4) 3 0x000001700354c9 LdrInitializeThunk+0x509(context=<register R13 not accessible in this frame>, unknown2=<internal error>, unknown3=<internal error>, unknown4=<internal error>) [Z:\home\eric\work\wine\dlls\ntdll\loader.c:4200] in ntdll (0x000001700701a4) where RtlDefaultNpAcl() has nothing to do here (it's the symbol below RIP and we don't have a symbol with debug information for that address). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 2 +- dlls/dbghelp/dbghelp_private.h | 2 ++ dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/msc.c | 8 ++++---- dlls/dbghelp/symbol.c | 24 +++++++++++++++++++----- 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 6d775b633f8..c154d8d9713 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -672,7 +672,7 @@ BOOL WINAPI SymSetScopeFromAddr(HANDLE hProcess, ULONG64 addr) if (!module_init_pair(&pair, hProcess, addr)) return FALSE; pair.pcs->localscope_pc = addr; - if ((sym = symt_find_nearest(pair.effective, addr)) != NULL && sym->symt.tag == SymTagFunction) + if ((sym = symt_find_symbol_at(pair.effective, addr)) != NULL && sym->symt.tag == SymTagFunction) pair.pcs->localscope_symt = &sym->symt; else pair.pcs->localscope_symt = NULL; diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index c9de237c4b9..507724414a5 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -811,6 +811,8 @@ extern void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si) DECLS extern void symbol_setname(SYMBOL_INFO* si, const char* name) DECLSPEC_HIDDEN; extern struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) DECLSPEC_HIDDEN; +extern struct symt_ht* + symt_find_symbol_at(struct module* module, DWORD_PTR addr) DECLSPEC_HIDDEN; extern struct symt_module* symt_new_module(struct module* module) DECLSPEC_HIDDEN; extern struct symt_compiland* diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 0076b19e5cb..b81f83ac90b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2584,7 +2584,7 @@ static void dwarf2_set_line_number(struct module* module, ULONG_PTR address, TRACE("%s %Ix %s %u\n", debugstr_w(module->modulename), address, debugstr_a(source_get(module, *psrc)), line); - symt = symt_find_nearest(module, address); + symt = symt_find_symbol_at(module, address); if (symt_check_tag(&symt->symt, SymTagFunction)) { func = (struct symt_function*)symt; diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 28b6bd12f2e..22ab1ecb230 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1461,7 +1461,7 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B */ if (!func || addr >= func->address + func->size) { - func = (struct symt_function*)symt_find_nearest(msc_dbg->module, addr); + func = (struct symt_function*)symt_find_symbol_at(msc_dbg->module, addr); /* FIXME: at least labels support line numbers */ if (!symt_check_tag(&func->symt, SymTagFunction) && !symt_check_tag(&func->symt, SymTagInlineSite)) { @@ -1534,7 +1534,7 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const lines = CV_RECORD_AFTER(files_hdr); for (i = 0; i < files_hdr->nLines; i++) { - func = (struct symt_function*)symt_find_nearest(msc_dbg->module, lineblk_base + lines[i].offset); + func = (struct symt_function*)symt_find_symbol_at(msc_dbg->module, lineblk_base + lines[i].offset); /* FIXME: at least labels support line numbers */ if (!symt_check_tag(&func->symt, SymTagFunction) && !symt_check_tag(&func->symt, SymTagInlineSite)) { @@ -1619,7 +1619,7 @@ static inline void codeview_add_variable(const struct msc_debug_info* msc_dbg, loc.kind = in_tls ? loc_tlsrel : loc_absolute; loc.reg = 0; loc.offset = in_tls ? offset : codeview_get_address(msc_dbg, segment, offset); - if (force || in_tls || !symt_find_nearest(msc_dbg->module, loc.offset)) + if (force || in_tls || !symt_find_symbol_at(msc_dbg->module, loc.offset)) { symt_new_global_variable(msc_dbg->module, compiland, name, is_local, loc, 0, @@ -2501,7 +2501,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, if (!top_func) { ULONG_PTR parent_addr = codeview_get_address(msc_dbg, sym->sepcode_v3.sectParent, sym->sepcode_v3.offParent); - struct symt_ht* parent = symt_find_nearest(msc_dbg->module, parent_addr); + struct symt_ht* parent = symt_find_symbol_at(msc_dbg->module, parent_addr); if (symt_check_tag(&parent->symt, SymTagFunction)) { struct symt_function* pfunc = (struct symt_function*)parent; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 64f376b42f0..a81feb56b8d 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1027,7 +1027,7 @@ static void symt_get_length(struct module* module, const struct symt* symt, ULON if (symt_get_info(module, symt, TI_GET_TYPE, &type_index) && symt_get_info(module, symt_index2ptr(module, type_index), TI_GET_LENGTH, size)) return; - *size = 0x1000; /* arbitrary value */ + *size = 1; /* no size info */ } /* needed by symt_find_nearest */ @@ -1104,6 +1104,20 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) return module->addr_sorttab[low]; } +struct symt_ht* symt_find_symbol_at(struct module* module, DWORD_PTR addr) +{ + struct symt_ht* nearest = symt_find_nearest(module, addr); + if (nearest) + { + ULONG64 symaddr, symsize; + symt_get_address(&nearest->symt, &symaddr); + symt_get_length(module, &nearest->symt, &symsize); + if (addr < symaddr || addr >= symaddr + symsize) + nearest = NULL; + } + return nearest; +} + static BOOL symt_enum_locals_helper(struct module_pair* pair, const WCHAR* match, const struct sym_enum* se, struct symt_function* func, const struct vector* v) @@ -1262,7 +1276,7 @@ struct symt* symt_get_upper_inlined(struct symt_inlinesite* inlined) /* lookup in module for an inline site (from addr and inline_ctx) */ struct symt_inlinesite* symt_find_inlined_site(struct module* module, DWORD64 addr, DWORD inline_ctx) { - struct symt_ht* symt = symt_find_nearest(module, addr); + struct symt_ht* symt = symt_find_symbol_at(module, addr); if (symt_check_tag(&symt->symt, SymTagFunction)) { @@ -1284,7 +1298,7 @@ DWORD symt_get_inlinesite_depth(HANDLE hProcess, DWORD64 addr) if (module_init_pair(&pair, hProcess, addr)) { - struct symt_ht* symt = symt_find_nearest(pair.effective, addr); + struct symt_ht* symt = symt_find_symbol_at(pair.effective, addr); if (symt_check_tag(&symt->symt, SymTagFunction)) { struct symt_inlinesite* inlined = symt_find_lowest_inlined((struct symt_function*)symt, addr); @@ -1518,7 +1532,7 @@ BOOL WINAPI SymFromAddr(HANDLE hProcess, DWORD64 Address, struct symt_ht* sym; if (!module_init_pair(&pair, hProcess, Address)) return FALSE; - if ((sym = symt_find_nearest(pair.effective, Address)) == NULL) return FALSE; + if ((sym = symt_find_symbol_at(pair.effective, Address)) == NULL) return FALSE; symt_fill_sym_info(&pair, NULL, &sym->symt, Symbol); if (Displacement) @@ -1905,7 +1919,7 @@ static BOOL get_line_from_addr(HANDLE hProcess, DWORD64 addr, struct symt_ht* symt; if (!module_init_pair(&pair, hProcess, addr)) return FALSE; - if ((symt = symt_find_nearest(pair.effective, addr)) == NULL) return FALSE; + if ((symt = symt_find_symbol_at(pair.effective, addr)) == NULL) return FALSE; if (symt->symt.tag != SymTagFunction && symt->symt.tag != SymTagInlineSite) return FALSE; return get_line_from_function(&pair, (struct symt_function*)symt, addr, pdwDisplacement, intl);

1 0

Zebediah Figura : ws2_32/tests: Test that sockets returned from accept() don't return FD_CONNECT from WSAEnumNetworkEvents().
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: a321a6721704183ff4495bb01545a3068c68f514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a321a6721704183ff4495bb0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 3 17:56:24 2022 -0500 ws2_32/tests: Test that sockets returned from accept() don't return FD_CONNECT from WSAEnumNetworkEvents(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 12 ++++++++++++ dlls/ws2_32/tests/sock.c | 3 +++ 2 files changed, 15 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 43c401c940a..184c7e0725a 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1819,6 +1819,18 @@ static void test_get_events(void) ok(!ret, "got error %lu\n", GetLastError()); ok(!events.lNetworkEvents, "got events %#lx\n", events.lNetworkEvents); + ret = WSAEventSelect(server, event, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + ok(!ret, "got error %lu\n", GetLastError()); + + memset(&params, 0xcc, sizeof(params)); + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)server, NULL, NULL, NULL, &io, + IOCTL_AFD_GET_EVENTS, NULL, 0, &params, sizeof(params)); + ok(!ret, "got %#x\n", ret); + ok(params.flags == AFD_POLL_WRITE, "got flags %#x\n", params.flags); + for (i = 0; i < ARRAY_SIZE(params.status); ++i) + ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); + closesocket(client); closesocket(server); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f17b4bb0ffa..5b3cc75f18c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5599,6 +5599,9 @@ static void test_connect_events(struct event_test_ctx *ctx) server = accept(listener, NULL, NULL); ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + select_events(ctx, server, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + check_events(ctx, FD_WRITE, 0, 200); + closesocket(client); closesocket(server);

1 0

Zebediah Figura : ws2_32/tests: Add more tests for selecting for events after they are signaled.
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: 934023d15ef05afdf3e800a032ef4edaf8f9f605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=934023d15ef05afdf3e800a0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 3 17:56:25 2022 -0500 ws2_32/tests: Add more tests for selecting for events after they are signaled. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5b3cc75f18c..f85b79611bd 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -219,6 +219,17 @@ static void check_poll_(int line, SOCKET s, short mask, short expect, BOOL todo) todo_wine_if (todo) ok_(__FILE__, line)(pollfd.revents == expect, "got wrong events %#x\n", pollfd.revents); } +static DWORD WINAPI poll_async_thread(void *arg) +{ + WSAPOLLFD *pollfd = arg; + int ret; + + ret = pWSAPoll(pollfd, 1, 500); + ok(ret == (pollfd->revents ? 1 : 0), "WSAPoll() returned %d\n", ret); + + return 0; +} + static void set_so_opentype ( BOOL overlapped ) { int optval = !overlapped, newval, len = sizeof (int); @@ -5740,6 +5751,26 @@ static void test_write_events(struct event_test_ctx *ctx) closesocket(server); closesocket(client); + /* Select on a subset not containing FD_WRITE first. */ + + tcp_socketpair(&client, &server); + set_blocking(client, FALSE); + + ret = send(client, "data", 5, 0); + ok(ret == 5, "got %d\n", ret); + + select_events(ctx, client, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ); + if (!ctx->is_message) + check_events(ctx, FD_CONNECT, 0, 200); + check_events(ctx, 0, 0, 0); + + select_events(ctx, client, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + check_events(ctx, FD_WRITE, 0, 200); + check_events(ctx, 0, 0, 0); + + closesocket(client); + closesocket(server); + /* Despite the documentation, and unlike FD_ACCEPT and FD_RECV, calling * send() doesn't clear the FD_WRITE bit. */ @@ -5763,9 +5794,11 @@ static void test_read_events(struct event_test_ctx *ctx) OVERLAPPED overlapped = {0}; SOCKET server, client; DWORD size, flags = 0; + WSAPOLLFD pollfd; unsigned int i; char buffer[8]; WSABUF wsabuf; + HANDLE thread; int ret; overlapped.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); @@ -5844,6 +5877,31 @@ static void test_read_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 200); + /* Send data while we're polling for data but not selecting for FD_READ. */ + + pollfd.fd = server; + pollfd.events = POLLIN; + thread = CreateThread(NULL, 0, poll_async_thread, &pollfd, 0, NULL); + + select_events(ctx, server, 0); + ret = send(client, "data", 5, 0); + ok(ret == 5, "got %d\n", ret); + + ret = WaitForSingleObject(thread, 1000); + ok(!ret, "wait timed out\n"); + CloseHandle(thread); + + /* And check events, to show that WSAEnumNetworkEvents() should not clear + * events we are not currently selecting for. */ + check_events(ctx, 0, 0, 0); + + select_events(ctx, server, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + check_events_todo(ctx, FD_READ, FD_WRITE, 200); + check_events(ctx, 0, 0, 0); + + ret = sync_recv(server, buffer, 5, 0); + ok(ret == 5, "got %d\n", ret); + /* Send data while there is a pending WSARecv(). */ select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ);

1 0

Zebediah Figura : server: Send AFD_POLL_READ messages before AFD_POLL_WRITE.
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: ad078be430615b9ae6911b61d6fdc8e1bf5bf6ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad078be430615b9ae6911b61… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 3 17:56:26 2022 -0500 server: Send AFD_POLL_READ messages before AFD_POLL_WRITE. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f85b79611bd..c88016c5404 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5896,7 +5896,7 @@ static void test_read_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 0); select_events(ctx, server, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); - check_events_todo(ctx, FD_READ, FD_WRITE, 200); + check_events_todo_event(ctx, FD_READ, FD_WRITE, 200); check_events(ctx, 0, 0, 0); ret = sync_recv(server, buffer, 5, 0); diff --git a/server/sock.c b/server/sock.c index a9d8d2ca2bd..9f9b9bdfcd9 100644 --- a/server/sock.c +++ b/server/sock.c @@ -505,8 +505,8 @@ static const enum afd_poll_bit event_bitorder[] = AFD_POLL_BIT_CONNECT_ERR, AFD_POLL_BIT_ACCEPT, AFD_POLL_BIT_OOB, - AFD_POLL_BIT_WRITE, AFD_POLL_BIT_READ, + AFD_POLL_BIT_WRITE, AFD_POLL_BIT_RESET, AFD_POLL_BIT_HUP, AFD_POLL_BIT_CLOSE,

1 0

Zebediah Figura : server: Clear only returned events in IOCTL_AFD_GET_EVENTS.
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: 683d46a2cdf08d999f07d13e048ac6bca98b46fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=683d46a2cdf08d999f07d13e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 3 17:56:27 2022 -0500 server: Clear only returned events in IOCTL_AFD_GET_EVENTS. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 6 +++--- server/sock.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c88016c5404..7bc2b2474ca 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5659,7 +5659,7 @@ static void test_connect_events(struct event_test_ctx *ctx) if (ctx->is_message) check_events(ctx, FD_WRITE, 0, 200); else - check_events_todo(ctx, FD_CONNECT, 0, 200); + check_events(ctx, FD_CONNECT, 0, 200); closesocket(client); closesocket(server); @@ -5896,7 +5896,7 @@ static void test_read_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 0); select_events(ctx, server, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); - check_events_todo_event(ctx, FD_READ, FD_WRITE, 200); + check_events(ctx, FD_READ, FD_WRITE, 200); check_events(ctx, 0, 0, 0); ret = sync_recv(server, buffer, 5, 0); @@ -6111,7 +6111,7 @@ static void test_close_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 200); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); - check_events_todo_event(ctx, FD_CLOSE, 0, 200); + check_events(ctx, FD_CLOSE, 0, 200); closesocket(server); } diff --git a/server/sock.c b/server/sock.c index 9f9b9bdfcd9..29dd1ca7fa8 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2516,7 +2516,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) for (i = 0; i < ARRAY_SIZE( params.status ); ++i) params.status[i] = sock_get_ntstatus( sock->errors[i] ); - sock->pending_events = 0; + sock->pending_events &= ~sock->mask; sock_reselect( sock ); set_reply_data( &params, sizeof(params) );

1 0

Zebediah Figura : ws2_32/tests: Add some more tests for reset TCP connections.
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: d280e8b9b78914a4509df426ede115ae8dabbd92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d280e8b9b78914a4509df426… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 3 17:56:28 2022 -0500 ws2_32/tests: Add some more tests for reset TCP connections. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 114 +++++++++++++++++++++++++++++++++- dlls/ws2_32/tests/sock.c | 155 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 237 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d280e8b9b78914a4509d…

1 0

Brendan Shanks : wrc: Support function macros where varargs are the only argument.
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: f214d0c44e08b1e454b7f02df7638a13dff1c5b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f214d0c44e08b1e454b7f02d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 28 21:13:15 2022 -0700 wrc: Support function macros where varargs are the only argument. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/ppl.l | 4 ++-- tools/wrc/ppy.y | 11 ++++++----- tools/wrc/wpp.c | 5 +++-- tools/wrc/wpp_private.h | 3 ++- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/wrc/ppl.l b/tools/wrc/ppl.l index 35c3fd6fb44..4748d735fa2 100644 --- a/tools/wrc/ppl.l +++ b/tools/wrc/ppl.l @@ -1071,9 +1071,9 @@ static void expand_macro(macexpstackentry_t *mep) assert(ppp->type == def_macro); assert(ppp->expanding == 0); - if((ppp->nargs >= 0 && nargs != ppp->nargs) || (ppp->nargs < 0 && nargs < -ppp->nargs)) + if((!ppp->variadic && nargs != ppp->nargs) || (ppp->variadic && nargs < ppp->nargs)) { - ppy_error("Too %s macro arguments (%d)", nargs < abs(ppp->nargs) ? "few" : "many", nargs); + ppy_error("Too %s macro arguments (%d)", nargs < ppp->nargs ? "few" : "many", nargs); return; } diff --git a/tools/wrc/ppy.y b/tools/wrc/ppy.y index ac4423d724f..ce3c409e735 100644 --- a/tools/wrc/ppy.y +++ b/tools/wrc/ppy.y @@ -112,6 +112,7 @@ static char *merge_text(char *s1, char *s2); */ static char **macro_args; /* Macro parameters array while parsing */ static int nmacro_args; +static int macro_variadic; /* Macro arguments end with (or consist entirely of) '...' */ %} @@ -267,7 +268,7 @@ preprocessor | tUNDEF tIDENT tNL { pp_del_define($2); free($2); } | tDEFINE opt_text tNL { pp_add_define($1, $2); free($1); free($2); } | tMACRO res_arg allmargs tMACROEND opt_mtexts tNL { - pp_add_macro($1, macro_args, nmacro_args, $5); + pp_add_macro($1, macro_args, nmacro_args, macro_variadic, $5); } | tLINE tSINT tDQSTRING tNL { if($3) fprintf(ppy_out, "# %d %s\n", $2 , $3); free($3); } | tGCCLINE tSINT tDQSTRING tNL { if($3) fprintf(ppy_out, "# %d %s\n", $2 , $3); free($3); } @@ -305,16 +306,16 @@ text : tLITERAL { $$ = $1; } | text tSQSTRING { $$ = merge_text($1, $2); } ; -res_arg : /* Empty */ { macro_args = NULL; nmacro_args = 0; } +res_arg : /* Empty */ { macro_args = NULL; nmacro_args = 0; macro_variadic = 0; } ; -allmargs: /* Empty */ { $$ = 0; macro_args = NULL; nmacro_args = 0; } +allmargs: /* Empty */ { $$ = 0; macro_args = NULL; nmacro_args = 0; macro_variadic = 0; } | emargs { $$ = nmacro_args; } ; emargs : margs { $$ = $1; } - | margs ',' tELLIPSIS { nmacro_args *= -1; } - | tELLIPSIS { macro_args = NULL; nmacro_args = 0; } + | margs ',' tELLIPSIS { macro_variadic = 1; } + | tELLIPSIS { macro_args = NULL; nmacro_args = 0; macro_variadic = 1; } ; margs : margs ',' tIDENT { $$ = add_new_marg($3); } diff --git a/tools/wrc/wpp.c b/tools/wrc/wpp.c index d8d5052870a..57baf44862b 100644 --- a/tools/wrc/wpp.c +++ b/tools/wrc/wpp.c @@ -239,7 +239,7 @@ pp_entry_t *pp_add_define(const char *def, const char *text) return ppp; } -pp_entry_t *pp_add_macro(char *id, char *args[], int nargs, mtext_t *exp) +pp_entry_t *pp_add_macro(char *id, char *args[], int nargs, int variadic, mtext_t *exp) { int idx; pp_entry_t *ppp; @@ -258,13 +258,14 @@ pp_entry_t *pp_add_macro(char *id, char *args[], int nargs, mtext_t *exp) ppp->type = def_macro; ppp->margs = args; ppp->nargs = nargs; + ppp->variadic = variadic; ppp->subst.mtext= exp; ppp->filename = xstrdup(pp_status.input ? pp_status.input : "<internal or cmdline>"); ppp->linenumber = pp_status.input ? pp_status.line_number : 0; list_add_head( &pp_defines[idx], &ppp->entry ); if(pp_status.debug) { - fprintf(stderr, "Added macro (%s, %d) <%s(%d)> to <", pp_status.input, pp_status.line_number, ppp->ident, nargs); + fprintf(stderr, "Added macro (%s, %d) <%s(%d%s)> to <", pp_status.input, pp_status.line_number, ppp->ident, nargs, variadic ? ",va" : ""); for(; exp; exp = exp->next) { switch(exp->type) diff --git a/tools/wrc/wpp_private.h b/tools/wrc/wpp_private.h index 435dbcc005a..9d92fa02fbb 100644 --- a/tools/wrc/wpp_private.h +++ b/tools/wrc/wpp_private.h @@ -80,6 +80,7 @@ typedef struct pp_entry { char *ident; /* The key */ char **margs; /* Macro arguments array or NULL if none */ int nargs; + int variadic; union { mtext_t *mtext; /* The substitution sequence or NULL if none */ char *text; @@ -156,7 +157,7 @@ typedef struct cval { pp_entry_t *pplookup(const char *ident); pp_entry_t *pp_add_define(const char *def, const char *text); -pp_entry_t *pp_add_macro(char *ident, char *args[], int nargs, mtext_t *exp); +pp_entry_t *pp_add_macro(char *ident, char *args[], int nargs, int variadic, mtext_t *exp); void pp_del_define(const char *name); void *pp_open_include(const char *name, int type, const char *parent_name, char **newpath); void pp_push_if(pp_if_state_t s);

1 0