July 2022 - Wine-Commits - list.winehq.org

Connor McAdams : uiautomationcore: Add support for UIAutomationType_Double properties.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: d83c019102d8dc26e5223cf797b6a72bbea2274d URL: https://gitlab.winehq.org/wine/wine/-/commit/d83c019102d8dc26e5223cf797b6a7… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jun 20 16:05:12 2022 -0400 uiautomationcore: Add support for UIAutomationType_Double properties. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 10 ++-------- dlls/uiautomationcore/uia_client.c | 18 ++++++++++++++++++ dlls/uiautomationcore/uia_ids.c | 9 ++++++--- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 7dd598822a4..7378e78d73d 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -4237,19 +4237,13 @@ static void check_uia_prop_val(PROPERTYID prop_id, enum UIAutomationType type, V break; case UIAutomationType_Double: - todo_wine ok(V_VT(v) == VT_R8, "Unexpected VT %d\n", V_VT(v)); - if (V_VT(v) != VT_R8) - break; - + ok(V_VT(v) == VT_R8, "Unexpected VT %d\n", V_VT(v)); ok(V_R8(v) == uia_r8_prop_val, "Unexpected R8 %lf\n", V_R8(v)); ok_method_sequence(get_prop_seq, NULL); break; case UIAutomationType_DoubleArray: - todo_wine ok(V_VT(v) == (VT_ARRAY | VT_R8), "Unexpected VT %d\n", V_VT(v)); - if (V_VT(v) != (VT_ARRAY | VT_R8)) - break; - + ok(V_VT(v) == (VT_ARRAY | VT_R8), "Unexpected VT %d\n", V_VT(v)); for (idx = 0; idx < ARRAY_SIZE(uia_r8_arr_prop_val); idx++) { double val; diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index ba15ed0c1f1..d2f05648b11 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -369,6 +369,24 @@ static HRESULT WINAPI uia_provider_get_prop_val(IWineUiaProvider *iface, *ret_val = v; break; + case UIAutomationType_Double: + if (V_VT(&v) != VT_R8) + { + WARN("Invalid vt %d for UIAutomationType_Double\n", V_VT(&v)); + goto exit; + } + *ret_val = v; + break; + + case UIAutomationType_DoubleArray: + if (V_VT(&v) != (VT_R8 | VT_ARRAY)) + { + WARN("Invalid vt %d for UIAutomationType_DoubleArray\n", V_VT(&v)); + goto exit; + } + *ret_val = v; + break; + case UIAutomationType_Element: { IRawElementProviderSimple *elprov; diff --git a/dlls/uiautomationcore/uia_ids.c b/dlls/uiautomationcore/uia_ids.c index 72bc3ba6991..10eea31adc3 100644 --- a/dlls/uiautomationcore/uia_ids.c +++ b/dlls/uiautomationcore/uia_ids.c @@ -48,7 +48,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &Transform2_ZoomLevel_Property_GUID, UIA_Transform2ZoomLevelPropertyId, }, { &Name_Property_GUID, UIA_NamePropertyId, }, { &GridItem_RowSpan_Property_GUID, UIA_GridItemRowSpanPropertyId, }, - { &Size_Property_GUID, UIA_SizePropertyId, }, + { &Size_Property_GUID, UIA_SizePropertyId, + UIAutomationType_DoubleArray, }, { &IsTextPattern2Available_Property_GUID, UIA_IsTextPattern2AvailablePropertyId, }, { &Styles_FillPatternStyle_Property_GUID, UIA_StylesFillPatternStylePropertyId, }, { &FlowsTo_Property_GUID, UIA_FlowsToPropertyId, @@ -143,7 +144,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &Drag_DropEffect_Property_GUID, UIA_DragDropEffectPropertyId, }, { &MultipleView_CurrentView_Property_GUID, UIA_MultipleViewCurrentViewPropertyId, }, { &Styles_FillColor_Property_GUID, UIA_StylesFillColorPropertyId, }, - { &Rotation_Property_GUID, UIA_RotationPropertyId, }, + { &Rotation_Property_GUID, UIA_RotationPropertyId, + UIAutomationType_Double, }, { &SpreadsheetItem_Formula_Property_GUID, UIA_SpreadsheetItemFormulaPropertyId, }, { &IsEnabled_Property_GUID, UIA_IsEnabledPropertyId, }, { &LocalizedLandmarkType_Property_GUID, UIA_LocalizedLandmarkTypePropertyId, }, @@ -198,7 +200,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &Table_RowOrColumnMajor_Property_GUID, UIA_TableRowOrColumnMajorPropertyId, }, { &IsDockPatternAvailable_Property_GUID, UIA_IsDockPatternAvailablePropertyId, }, { &IsSynchronizedInputPatternAvailable_Property_GUID,UIA_IsSynchronizedInputPatternAvailablePropertyId, }, - { &OutlineThickness_Property_GUID, UIA_OutlineThicknessPropertyId, }, + { &OutlineThickness_Property_GUID, UIA_OutlineThicknessPropertyId, + UIAutomationType_DoubleArray, }, { &IsLegacyIAccessiblePatternAvailable_Property_GUID,UIA_IsLegacyIAccessiblePatternAvailablePropertyId, }, { &AnnotationObjects_Property_GUID, UIA_AnnotationObjectsPropertyId, UIAutomationType_ElementArray, },

1 0

Connor McAdams : uiautomationcore: Add support for UIAutomationType_Bool properties.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: 0bc1f6876183b6a695d2660de119c75b38e41cab URL: https://gitlab.winehq.org/wine/wine/-/commit/0bc1f6876183b6a695d2660de119c7… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jun 20 16:11:13 2022 -0400 uiautomationcore: Add support for UIAutomationType_Bool properties. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 4 +--- dlls/uiautomationcore/uia_client.c | 9 ++++++++ dlls/uiautomationcore/uia_ids.c | 36 ++++++++++++++++++++---------- 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 7378e78d73d..669e6d58b87 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -4200,9 +4200,7 @@ static void check_uia_prop_val(PROPERTYID prop_id, enum UIAutomationType type, V break; case UIAutomationType_Bool: - todo_wine ok(V_VT(v) == VT_BOOL, "Unexpected VT %d\n", V_VT(v)); - if (V_VT(v) != VT_BOOL) - break; + ok(V_VT(v) == VT_BOOL, "Unexpected VT %d\n", V_VT(v)); /* UIA_IsKeyboardFocusablePropertyId is broken on Win8 and Win10v1507. */ if (prop_id == UIA_IsKeyboardFocusablePropertyId) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index d2f05648b11..c800645da0c 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -387,6 +387,15 @@ static HRESULT WINAPI uia_provider_get_prop_val(IWineUiaProvider *iface, *ret_val = v; break; + case UIAutomationType_Bool: + if (V_VT(&v) != VT_BOOL) + { + WARN("Invalid vt %d for UIAutomationType_Bool\n", V_VT(&v)); + goto exit; + } + *ret_val = v; + break; + case UIAutomationType_Element: { IRawElementProviderSimple *elprov; diff --git a/dlls/uiautomationcore/uia_ids.c b/dlls/uiautomationcore/uia_ids.c index 10eea31adc3..90de0e21ce9 100644 --- a/dlls/uiautomationcore/uia_ids.c +++ b/dlls/uiautomationcore/uia_ids.c @@ -66,7 +66,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &LegacyIAccessible_DefaultAction_Property_GUID, UIA_LegacyIAccessibleDefaultActionPropertyId, }, { &Level_Property_GUID, UIA_LevelPropertyId, UIAutomationType_Int, }, - { &IsKeyboardFocusable_Property_GUID, UIA_IsKeyboardFocusablePropertyId, }, + { &IsKeyboardFocusable_Property_GUID, UIA_IsKeyboardFocusablePropertyId, + UIAutomationType_Bool, }, { &GridItem_Row_Property_GUID, UIA_GridItemRowPropertyId, }, { &IsSpreadsheetItemPatternAvailable_Property_GUID, UIA_IsSpreadsheetItemPatternAvailablePropertyId, }, { &Table_ColumnHeaders_Property_GUID, UIA_TableColumnHeadersPropertyId, }, @@ -82,7 +83,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &IsAnnotationPatternAvailable_Property_GUID, UIA_IsAnnotationPatternAvailablePropertyId, }, { &SpreadsheetItem_AnnotationObjects_Property_GUID, UIA_SpreadsheetItemAnnotationObjectsPropertyId, }, { &IsInvokePatternAvailable_Property_GUID, UIA_IsInvokePatternAvailablePropertyId, }, - { &HasKeyboardFocus_Property_GUID, UIA_HasKeyboardFocusPropertyId, }, + { &HasKeyboardFocus_Property_GUID, UIA_HasKeyboardFocusPropertyId, + UIAutomationType_Bool, }, { &ClickablePoint_Property_GUID, UIA_ClickablePointPropertyId, }, { &NewNativeWindowHandle_Property_GUID, UIA_NativeWindowHandlePropertyId, UIAutomationType_Int, }, @@ -104,7 +106,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &Annotation_AnnotationTypeId_Property_GUID, UIA_AnnotationAnnotationTypeIdPropertyId, }, { &FlowsFrom_Property_GUID, UIA_FlowsFromPropertyId, UIAutomationType_ElementArray, }, - { &OptimizeForVisualContent_Property_GUID, UIA_OptimizeForVisualContentPropertyId, }, + { &OptimizeForVisualContent_Property_GUID, UIA_OptimizeForVisualContentPropertyId, + UIAutomationType_Bool, }, { &IsVirtualizedItemPatternAvailable_Property_GUID, UIA_IsVirtualizedItemPatternAvailablePropertyId, }, { &GridItem_Parent_Property_GUID, UIA_GridItemContainingGridPropertyId, }, { &LegacyIAccessible_Help_Property_GUID, UIA_LegacyIAccessibleHelpPropertyId, }, @@ -123,7 +126,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &IsTablePatternAvailable_Property_GUID, UIA_IsTablePatternAvailablePropertyId, }, { &SelectionItem_IsSelected_Property_GUID, UIA_SelectionItemIsSelectedPropertyId, }, { &Window_WindowVisualState_Property_GUID, UIA_WindowWindowVisualStatePropertyId, }, - { &IsOffscreen_Property_GUID, UIA_IsOffscreenPropertyId, }, + { &IsOffscreen_Property_GUID, UIA_IsOffscreenPropertyId, + UIAutomationType_Bool, }, { &Annotation_Author_Property_GUID, UIA_AnnotationAuthorPropertyId, }, { &Orientation_Property_GUID, UIA_OrientationPropertyId, UIAutomationType_Int, }, @@ -139,7 +143,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &Grid_ColumnCount_Property_GUID, UIA_GridColumnCountPropertyId, }, { &AnnotationTypes_Property_GUID, UIA_AnnotationTypesPropertyId, UIAutomationType_IntArray, }, - { &IsPeripheral_Property_GUID, UIA_IsPeripheralPropertyId, }, + { &IsPeripheral_Property_GUID, UIA_IsPeripheralPropertyId, + UIAutomationType_Bool, }, { &Transform2_ZoomMaximum_Property_GUID, UIA_Transform2ZoomMaximumPropertyId, }, { &Drag_DropEffect_Property_GUID, UIA_DragDropEffectPropertyId, }, { &MultipleView_CurrentView_Property_GUID, UIA_MultipleViewCurrentViewPropertyId, }, @@ -147,10 +152,13 @@ static const struct uia_prop_info default_uia_properties[] = { { &Rotation_Property_GUID, UIA_RotationPropertyId, UIAutomationType_Double, }, { &SpreadsheetItem_Formula_Property_GUID, UIA_SpreadsheetItemFormulaPropertyId, }, - { &IsEnabled_Property_GUID, UIA_IsEnabledPropertyId, }, + { &IsEnabled_Property_GUID, UIA_IsEnabledPropertyId, + UIAutomationType_Bool, }, { &LocalizedLandmarkType_Property_GUID, UIA_LocalizedLandmarkTypePropertyId, }, - { &IsDataValidForForm_Property_GUID, UIA_IsDataValidForFormPropertyId, }, - { &IsControlElement_Property_GUID, UIA_IsControlElementPropertyId, }, + { &IsDataValidForForm_Property_GUID, UIA_IsDataValidForFormPropertyId, + UIAutomationType_Bool, }, + { &IsControlElement_Property_GUID, UIA_IsControlElementPropertyId, + UIAutomationType_Bool, }, { &HelpText_Property_GUID, UIA_HelpTextPropertyId, }, { &Table_RowHeaders_Property_GUID, UIA_TableRowHeadersPropertyId, }, { &ControllerFor_Property_GUID, UIA_ControllerForPropertyId, @@ -170,7 +178,8 @@ static const struct uia_prop_info default_uia_properties[] = { UIAutomationType_Int, }, { &Scroll_VerticalScrollPercent_Property_GUID, UIA_ScrollVerticalScrollPercentPropertyId, }, { &IsObjectModelPatternAvailable_Property_GUID, UIA_IsObjectModelPatternAvailablePropertyId, }, - { &IsDialog_Property_GUID, UIA_IsDialogPropertyId, }, + { &IsDialog_Property_GUID, UIA_IsDialogPropertyId, + UIAutomationType_Bool, }, { &IsTextPatternAvailable_Property_GUID, UIA_IsTextPatternAvailablePropertyId, }, { &LegacyIAccessible_Role_Property_GUID, UIA_LegacyIAccessibleRolePropertyId, }, { &Selection2_ItemCount_Property_GUID, UIA_Selection2ItemCountPropertyId, }, @@ -183,9 +192,11 @@ static const struct uia_prop_info default_uia_properties[] = { { &Transform_CanResize_Property_GUID, UIA_TransformCanResizePropertyId, }, { &IsValuePatternAvailable_Property_GUID, UIA_IsValuePatternAvailablePropertyId, }, { &IsItemContainerPatternAvailable_Property_GUID, UIA_IsItemContainerPatternAvailablePropertyId, }, - { &IsContentElement_Property_GUID, UIA_IsContentElementPropertyId, }, + { &IsContentElement_Property_GUID, UIA_IsContentElementPropertyId, + UIAutomationType_Bool, }, { &LegacyIAccessible_KeyboardShortcut_Property_GUID, UIA_LegacyIAccessibleKeyboardShortcutPropertyId, }, - { &IsPassword_Property_GUID, UIA_IsPasswordPropertyId, }, + { &IsPassword_Property_GUID, UIA_IsPasswordPropertyId, + UIAutomationType_Bool, }, { &IsWindowPatternAvailable_Property_GUID, UIA_IsWindowPatternAvailablePropertyId, }, { &RangeValue_Minimum_Property_GUID, UIA_RangeValueMinimumPropertyId, }, { &BoundingRectangle_Property_GUID, UIA_BoundingRectanglePropertyId, }, @@ -205,7 +216,8 @@ static const struct uia_prop_info default_uia_properties[] = { { &IsLegacyIAccessiblePatternAvailable_Property_GUID,UIA_IsLegacyIAccessiblePatternAvailablePropertyId, }, { &AnnotationObjects_Property_GUID, UIA_AnnotationObjectsPropertyId, UIAutomationType_ElementArray, }, - { &IsRequiredForForm_Property_GUID, UIA_IsRequiredForFormPropertyId, }, + { &IsRequiredForForm_Property_GUID, UIA_IsRequiredForFormPropertyId, + UIAutomationType_Bool, }, { &SpreadsheetItem_AnnotationTypes_Property_GUID, UIA_SpreadsheetItemAnnotationTypesPropertyId, }, { &FillColor_Property_GUID, UIA_FillColorPropertyId, UIAutomationType_Int, },

1 0

Eric Pouech : winedbg: Do proper error management when reallocating memory.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: 674ef559e0e1ce995fe00fe08ee25cd9f3eb2b49 URL: https://gitlab.winehq.org/wine/wine/-/commit/674ef559e0e1ce995fe00fe08ee25c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jul 20 14:28:42 2022 +0200 winedbg: Do proper error management when reallocating memory. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/break.c | 34 ++++++++++++++++++++-------------- programs/winedbg/dbg.y | 8 +++++++- programs/winedbg/display.c | 7 +++++-- programs/winedbg/info.c | 19 +++++++++++++++---- programs/winedbg/stack.c | 6 ++++-- 5 files changed, 51 insertions(+), 23 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index 27a11a00d33..90df7d1e8b5 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -202,6 +202,7 @@ BOOL break_add_break(const ADDRESS64* addr, BOOL verbose, BOOL swbp) */ BOOL break_add_break_from_lvalue(const struct dbg_lvalue* lvalue, BOOL swbp) { + struct dbg_delayed_bp* new; ADDRESS64 addr; types_extract_as_address(lvalue, &addr); @@ -215,13 +216,15 @@ BOOL break_add_break_from_lvalue(const struct dbg_lvalue* lvalue, BOOL swbp) return FALSE; } dbg_printf("Unable to add breakpoint, will check again any time a new DLL is loaded\n"); - dbg_curr_process->delayed_bp = - dbg_heap_realloc(dbg_curr_process->delayed_bp, - sizeof(struct dbg_delayed_bp) * ++dbg_curr_process->num_delayed_bp); - - dbg_curr_process->delayed_bp[dbg_curr_process->num_delayed_bp - 1].is_symbol = FALSE; - dbg_curr_process->delayed_bp[dbg_curr_process->num_delayed_bp - 1].software_bp = swbp; - dbg_curr_process->delayed_bp[dbg_curr_process->num_delayed_bp - 1].u.addr = addr; + new = dbg_heap_realloc(dbg_curr_process->delayed_bp, + sizeof(struct dbg_delayed_bp) * (dbg_curr_process->num_delayed_bp + 1)); + if (!new) return FALSE; + dbg_curr_process->delayed_bp = new; + + dbg_curr_process->delayed_bp[dbg_curr_process->num_delayed_bp].is_symbol = FALSE; + dbg_curr_process->delayed_bp[dbg_curr_process->num_delayed_bp].software_bp = swbp; + dbg_curr_process->delayed_bp[dbg_curr_process->num_delayed_bp].u.addr = addr; + dbg_curr_process->num_delayed_bp++; return TRUE; } return FALSE; @@ -234,6 +237,7 @@ BOOL break_add_break_from_lvalue(const struct dbg_lvalue* lvalue, BOOL swbp) */ void break_add_break_from_id(const char *name, int lineno, BOOL swbp) { + struct dbg_delayed_bp* new; struct dbg_lvalue lvalue; int i; @@ -256,13 +260,15 @@ void break_add_break_from_id(const char *name, int lineno, BOOL swbp) lineno == dbg_curr_process->delayed_bp[i].u.symbol.lineno) return; } - dbg_curr_process->delayed_bp = dbg_heap_realloc(dbg_curr_process->delayed_bp, - sizeof(struct dbg_delayed_bp) * ++dbg_curr_process->num_delayed_bp); - - dbg_curr_process->delayed_bp[dbg_curr_process->num_delayed_bp - 1].is_symbol = TRUE; - dbg_curr_process->delayed_bp[dbg_curr_process->num_delayed_bp - 1].software_bp = swbp; - dbg_curr_process->delayed_bp[dbg_curr_process->num_delayed_bp - 1].u.symbol.name = strcpy(HeapAlloc(GetProcessHeap(), 0, strlen(name) + 1), name); - dbg_curr_process->delayed_bp[dbg_curr_process->num_delayed_bp - 1].u.symbol.lineno = lineno; + new = dbg_heap_realloc(dbg_curr_process->delayed_bp, + sizeof(struct dbg_delayed_bp) * (dbg_curr_process->num_delayed_bp + 1)); + if (!new) return; + dbg_curr_process->delayed_bp = new; + dbg_curr_process->delayed_bp[dbg_curr_process->num_delayed_bp].is_symbol = TRUE; + dbg_curr_process->delayed_bp[dbg_curr_process->num_delayed_bp].software_bp = swbp; + dbg_curr_process->delayed_bp[dbg_curr_process->num_delayed_bp].u.symbol.name = strcpy(HeapAlloc(GetProcessHeap(), 0, strlen(name) + 1), name); + dbg_curr_process->delayed_bp[dbg_curr_process->num_delayed_bp].u.symbol.lineno = lineno; + dbg_curr_process->num_delayed_bp++; } struct cb_break_lineno diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 30701a660be..3a5392596de 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -514,8 +514,14 @@ static int input_fetch_entire_line(const char* pfx, char** line) if (len + 2 > alloc) { + char* new; while (len + 2 > alloc) alloc *= 2; - buffer = dbg_heap_realloc(buffer, alloc); + if (!(new = dbg_heap_realloc(buffer, alloc))) + { + HeapFree(GetProcessHeap(), 0, buffer); + return -1; + } + buffer = new; } buffer[len++] = ch; } diff --git a/programs/winedbg/display.c b/programs/winedbg/display.c index 11de3c12504..f38b3df206a 100644 --- a/programs/winedbg/display.c +++ b/programs/winedbg/display.c @@ -63,10 +63,13 @@ BOOL display_add(struct expr *exp, int count, char format) if (i == maxdisplays) { + struct display *new; /* no space left - expand */ + new = dbg_heap_realloc(displaypoints, + (maxdisplays + DISPTAB_DELTA) * sizeof(*displaypoints)); + if (!new) return FALSE; + displaypoints = new; maxdisplays += DISPTAB_DELTA; - displaypoints = dbg_heap_realloc(displaypoints, - maxdisplays * sizeof(*displaypoints)); } if (i == ndisplays) ndisplays++; diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index ae0fd90e938..2ba7c5950d0 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -199,8 +199,10 @@ static BOOL CALLBACK info_mod_cb(PCSTR mod_name, DWORD64 base, PVOID ctx) if (im->num_used + 1 > im->num_alloc) { + struct info_module* new = dbg_heap_realloc(im->modules, (im->num_alloc + 16) * sizeof(*im->modules)); + if (!new) return FALSE; /* stop enumeration in case of OOM */ im->num_alloc += 16; - im->modules = dbg_heap_realloc(im->modules, im->num_alloc * sizeof(*im->modules)); + im->modules = new; } im->modules[im->num_used].mi.SizeOfStruct = sizeof(im->modules[im->num_used].mi); if (SymGetModuleInfo64(dbg_curr_process->handle, base, &im->modules[im->num_used].mi)) @@ -315,8 +317,10 @@ static void class_walker(HWND hWnd, struct class_walker* cw) { if (cw->used >= cw->alloc) { + ATOM* new = dbg_heap_realloc(cw->table, (cw->alloc + 16) * sizeof(ATOM)); + if (!new) return; cw->alloc += 16; - cw->table = dbg_heap_realloc(cw->table, cw->alloc * sizeof(ATOM)); + cw->table = new; } cw->table[cw->used++] = atom; info_win32_class(hWnd, clsName); @@ -547,8 +551,15 @@ void info_win32_processes(void) dp.entries[dp.count++].children = -1; if (dp.count >= dp.alloc) { - dp.entries = HeapReAlloc(GetProcessHeap(), 0, dp.entries, sizeof(*dp.entries) * (dp.alloc *= 2)); - if (!dp.entries) return; + struct dump_proc_entry* new = HeapReAlloc(GetProcessHeap(), 0, dp.entries, sizeof(*dp.entries) * (dp.alloc * 2)); + if (!new) + { + CloseHandle(snap); + HeapFree(GetProcessHeap(), 0, dp.entries); + return; + } + dp.alloc *= 2; + dp.entries = new; } dp.entries[dp.count].proc.dwSize = sizeof(dp.entries[dp.count].proc); ok = Process32Next(snap, &dp.entries[dp.count].proc); diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 01a86108d6e..25328a867e2 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -204,8 +204,10 @@ unsigned stack_fetch_frames(const dbg_ctx_t* _ctx) SymFunctionTableAccess64, SymGetModuleBase64, NULL, SYM_STKWALK_DEFAULT)) || nf == 0) /* we always register first frame information */ { - dbg_curr_thread->frames = dbg_heap_realloc(dbg_curr_thread->frames, - (nf + 1) * sizeof(dbg_curr_thread->frames[0])); + struct dbg_frame* new = dbg_heap_realloc(dbg_curr_thread->frames, + (nf + 1) * sizeof(dbg_curr_thread->frames[0])); + if (!new) break; + dbg_curr_thread->frames = new; dbg_curr_thread->frames[nf].addr_pc = sf.AddrPC; dbg_curr_thread->frames[nf].linear_pc = (DWORD_PTR)memory_to_linear_addr(&sf.AddrPC);

1 0

Francois Gouget : include: Add some SPI_ constants.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: 04c7ff2c2f0d611ef37c125b554c993605794847 URL: https://gitlab.winehq.org/wine/wine/-/commit/04c7ff2c2f0d611ef37c125b554c99… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 16:04:12 2022 +0200 include: Add some SPI_ constants. They pop up in some failure messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/winuser.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index d2262b6d70a..b17f30debd3 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2502,6 +2502,10 @@ typedef struct tagDROPSTRUCT #define SPI_SETPENVISUALIZATION 0x201F #define SPI_GETPENARBITRATIONTYPE 0x2020 #define SPI_SETPENARBITRATIONTYPE 0x2021 +#define SPI_GETCARETTIMEOUT 0x2022 +#define SPI_SETCARETTIMEOUT 0x2023 +#define SPI_GETHANDEDNESS 0x2024 +#define SPI_SETHANDEDNESS 0x2025 #define FE_FONTSMOOTHINGSTANDARD 0x0001 #define FE_FONTSMOOTHINGCLEARTYPE 0x0002

1 0

Francois Gouget : dinput/tests: Add a trailing linefeed to some ok() calls.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: 1bf88f860e4eb5cd91a9280d173bc58ac9888824 URL: https://gitlab.winehq.org/wine/wine/-/commit/1bf88f860e4eb5cd91a9280d173bc5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 16:08:54 2022 +0200 dinput/tests: Add a trailing linefeed to some ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dinput/tests/joystick8.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index e73330815a0..90d7182a1fa 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -1682,8 +1682,8 @@ static void test_simple_joystick( DWORD version ) hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state ); ok( hr == DI_OK, "GetDeviceState returned: %#lx\n", hr ); - ok( state.lX == expect_state_abs[1].lX || broken( state.lX == 16853 ) /* w8 */, "got lX %ld", state.lX ); - ok( state.lY == expect_state_abs[1].lY || broken( state.lY == 16853 ) /* w8 */, "got lY %ld", state.lY ); + ok( state.lX == expect_state_abs[1].lX || broken( state.lX == 16853 ) /* w8 */, "got lX %ld\n", state.lX ); + ok( state.lY == expect_state_abs[1].lY || broken( state.lY == 16853 ) /* w8 */, "got lY %ld\n", state.lY ); check_member( state, expect_state_abs[1], "%ld", lZ ); check_member( state, expect_state_abs[1], "%ld", lRx ); check_member( state, expect_state_abs[1], "%ld", rgdwPOV[0] );

1 0

Francois Gouget : ws2_32/tests: Add comments to help identify the hint test indices.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: 5d8d9cd63d46380a74dd7fc09b38fb6e80d44b48 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d8d9cd63d46380a74dd7fc09b38fb… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 16:01:11 2022 +0200 ws2_32/tests: Add comments to help identify the hint test indices. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ws2_32/tests/protocol.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 0b14543606a..fac3cf57077 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1572,7 +1572,7 @@ static const struct addr_hint_tests } hinttests[] = { - {AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, 0}, + {AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, 0}, /* 0 */ {AF_UNSPEC, SOCK_STREAM, IPPROTO_UDP, 0}, {AF_UNSPEC, SOCK_STREAM, IPPROTO_IPV6,0}, {AF_UNSPEC, SOCK_DGRAM, IPPROTO_TCP, 0}, @@ -1582,7 +1582,7 @@ hinttests[] = {AF_INET, SOCK_STREAM, IPPROTO_UDP, 0}, {AF_INET, SOCK_STREAM, IPPROTO_IPV6,0}, {AF_INET, SOCK_DGRAM, IPPROTO_TCP, 0}, - {AF_INET, SOCK_DGRAM, IPPROTO_UDP, 0}, + {AF_INET, SOCK_DGRAM, IPPROTO_UDP, 0}, /* 10 */ {AF_INET, SOCK_DGRAM, IPPROTO_IPV6,0}, {AF_UNSPEC, 0, IPPROTO_TCP, 0}, {AF_UNSPEC, 0, IPPROTO_UDP, 0}, @@ -1592,7 +1592,7 @@ hinttests[] = {AF_INET, 0, IPPROTO_TCP, 0}, {AF_INET, 0, IPPROTO_UDP, 0}, {AF_INET, 0, IPPROTO_IPV6,0}, - {AF_INET, SOCK_STREAM, 0, 0}, + {AF_INET, SOCK_STREAM, 0, 0}, /* 20 */ {AF_INET, SOCK_DGRAM, 0, 0}, {AF_UNSPEC, 999, IPPROTO_TCP, WSAESOCKTNOSUPPORT}, {AF_UNSPEC, 999, IPPROTO_UDP, WSAESOCKTNOSUPPORT}, @@ -1602,7 +1602,7 @@ hinttests[] = {AF_INET, 999, IPPROTO_IPV6,WSAESOCKTNOSUPPORT}, {AF_UNSPEC, SOCK_STREAM, 999, 0}, {AF_UNSPEC, SOCK_STREAM, 999, 0}, - {AF_INET, SOCK_DGRAM, 999, 0}, + {AF_INET, SOCK_DGRAM, 999, 0}, /* 30 */ {AF_INET, SOCK_DGRAM, 999, 0}, };

1 0

Connor McAdams : uiautomationcore: Add support for UIAutomationType_String properties.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: c40bccb867c01b1d2e4d846be557f858869e2625 URL: https://gitlab.winehq.org/wine/wine/-/commit/c40bccb867c01b1d2e4d846be557f8… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jun 20 16:19:17 2022 -0400 uiautomationcore: Add support for UIAutomationType_String properties. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 10 ++----- dlls/uiautomationcore/uia_client.c | 9 +++++++ dlls/uiautomationcore/uia_ids.c | 42 ++++++++++++++++++++---------- 3 files changed, 39 insertions(+), 22 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for more sysparams functions.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: b20f39858c0eaf8300681637b6eab1055aa2c48a URL: https://gitlab.winehq.org/wine/wine/-/commit/b20f39858c0eaf8300681637b6eab1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 10 17:24:44 2022 +0200 win32u: Use syscall interface for more sysparams functions. --- dlls/win32u/gdiobj.c | 6 ---- dlls/win32u/syscall.c | 6 ++++ dlls/win32u/sysparams.c | 5 +++- dlls/win32u/win32u.spec | 12 ++++---- dlls/win32u/win32u_private.h | 17 ----------- dlls/win32u/wrappers.c | 40 -------------------------- dlls/wow64win/syscall.h | 6 ++++ dlls/wow64win/user.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 89 insertions(+), 70 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for winpos functions.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: 9639d0d6dbd73543a32c97776ed20b4832850af2 URL: https://gitlab.winehq.org/wine/wine/-/commit/9639d0d6dbd73543a32c97776ed20b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 21 19:43:17 2022 +0200 win32u: Use syscall interface for winpos functions. --- dlls/win32u/gdiobj.c | 5 ---- dlls/win32u/syscall.c | 5 ++++ dlls/win32u/win32u.spec | 10 ++++---- dlls/win32u/win32u_private.h | 7 ----- dlls/win32u/wrappers.c | 33 ------------------------ dlls/wow64win/syscall.h | 5 ++++ dlls/wow64win/user.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 76 insertions(+), 50 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for clipboard functions.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: b1ffc6ca74e40d9d0f6e258572b5177cb469d249 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1ffc6ca74e40d9d0f6e258572b517… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 22 13:05:00 2022 +0200 win32u: Use syscall interface for clipboard functions. --- dlls/win32u/gdiobj.c | 11 ----- dlls/win32u/syscall.c | 11 +++++ dlls/win32u/win32u.spec | 22 ++++----- dlls/win32u/win32u_private.h | 12 ----- dlls/win32u/wrappers.c | 67 -------------------------- dlls/wow64win/syscall.h | 11 +++++ dlls/wow64win/user.c | 109 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 142 insertions(+), 101 deletions(-)

1 0