[DBGHELP] Sync with Wine Staging 1.9.23. CORE-12409

svn path=/trunk/; revision=73350

diff --git a/reactos/dll/win32/dbghelp/dbghelp_private.h b/reactos/dll/win32/dbghelp/dbghelp_private.h
index 5154636..41be44e 100644 (file)
--- a/reactos/dll/win32/dbghelp/dbghelp_private.h
+++ b/reactos/dll/win32/dbghelp/dbghelp_private.h
@@ -397,7 +397,6 @@ struct symt_idx_to_ptr
 };
 #endif
 
-extern const struct wine_rb_functions source_rb_functions DECLSPEC_HIDDEN;
 struct module
 {
     struct process*             process;

diff --git a/reactos/dll/win32/dbghelp/dwarf.c b/reactos/dll/win32/dbghelp/dwarf.c
index 5d5941c..ce50a16 100644 (file)
--- a/reactos/dll/win32/dbghelp/dwarf.c
+++ b/reactos/dll/win32/dbghelp/dwarf.c
@@ -2621,7 +2621,7 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info*
 
     /* parse the CIE first */
     version = dwarf2_parse_byte(ctx);
-    if (version != 1 && version != 3)
+    if (version != 1 && version != 3 && version != 4)
     {
         FIXME("unknown CIE version %u at %p\n", version, ctx->data - 1);
         return FALSE;
@@ -2629,12 +2629,21 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info*
     augmentation = (const char*)ctx->data;
     ctx->data += strlen(augmentation) + 1;
 
-    info->code_align = dwarf2_leb128_as_unsigned(ctx);
-    info->data_align = dwarf2_leb128_as_signed(ctx);
-    if (version == 1)
-        info->retaddr_reg = dwarf2_parse_byte(ctx);
-    else
-        info->retaddr_reg = dwarf2_leb128_as_unsigned(ctx);
+    switch (version)
+    {
+    case 4:
+        /* skip 'address_size' and 'segment_size' */
+        ctx->data += 2;
+        /* fallthrough */
+    case 1:
+    case 3:
+        info->code_align = dwarf2_leb128_as_unsigned(ctx);
+        info->data_align = dwarf2_leb128_as_signed(ctx);
+        info->retaddr_reg = version == 1 ? dwarf2_parse_byte(ctx) :dwarf2_leb128_as_unsigned(ctx);
+        break;
+    default:
+        ;
+    }
     info->state.cfa_rule = RULE_CFA_OFFSET;
 
     end = NULL;

diff --git a/reactos/dll/win32/dbghelp/module.c b/reactos/dll/win32/dbghelp/module.c
index 5845237..559c94f 100644 (file)
--- a/reactos/dll/win32/dbghelp/module.c
+++ b/reactos/dll/win32/dbghelp/module.c
@@ -683,7 +683,6 @@ BOOL module_remove(struct process* pcs, struct module* module)
     }
     hash_table_destroy(&module->ht_symbols);
     hash_table_destroy(&module->ht_types);
-    wine_rb_destroy(&module->sources_offsets_tree, NULL, NULL);
     HeapFree(GetProcessHeap(), 0, module->sources);
     HeapFree(GetProcessHeap(), 0, module->addr_sorttab);
     pool_destroy(&module->pool);

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index c317566..6735c43 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -63,7 +63,7 @@ reactos/dll/win32/cryptdlg            # Synced to WineStaging-1.9.11
 reactos/dll/win32/cryptdll            # Synced to WineStaging-1.9.11
 reactos/dll/win32/cryptnet            # Synced to WineStaging-1.9.11
 reactos/dll/win32/cryptui             # Synced to WineStaging-1.9.16
-reactos/dll/win32/dbghelp             # Synced to WineStaging-1.9.16
+reactos/dll/win32/dbghelp             # Synced to WineStaging-1.9.23
 reactos/dll/win32/dciman32            # Synced to WineStaging-1.9.11
 reactos/dll/win32/faultrep            # Synced to WineStaging-1.9.11
 reactos/dll/win32/fontsub             # Synced to WineStaging-1.9.13