Print

Please login or register.
1 Hour 1 Day 1 Week 1 Month Forever
Login with username, password and session length

[shaver]

It's just this in the is-authorized branch of DFInstance::authorize

Code: [Select]

diff --git a/src/dfinstanceosx.mm b/src/dfinstanceosx.mm
index 919846a..3f9319f 100644
--- a/src/dfinstanceosx.mm
+++ b/src/dfinstanceosx.mm
@@ -381,6 +381,10 @@ bool DFInstance::authorize() {
         dir.cdUp();
         chdir(dir.absolutePath().toLocal8Bit());
         fflush(stdout);
+
+        // Authorization for remote memory access on OS X trips Qt's setuid detection
+        QCoreApplication::setSetuidAllowed(true);
+
         return true;
     }

I'll get the sbcl stuff installed to calc the global addresses and see how far I get on the plane today.

[shaver]

Boy, the Lisp stuff really doesn't want to admit to the existence of osx. I'll ask on #dfhack if there's a good way to go other than manually adding osx cases everywhere. Sorry for the delay, I haven't done any Lisp in a long time.

[Schaluck]

I tried to get that script to work, however there is no winedump available under os x. Moreover, the metasm library is not available for os x. So I guess there is no way to do this directly on a mac .

the following offsets should work for os x. They are just linux offsets with a corrected checksum for 0.40.03. They shortly worked for me but I cant get them to work anymore with the old DT version.

How did you fix the Qt setuid issues?

Spoiler (click to show/hide)

[info]
checksum=0x81e2cb34
version_name=v0.40.03 osx
complete=true

[addresses]
translation_vector=0x09a20170
language_vector=0x09a20158
creature_vector=0x0992660c
active_creature_vector=0x09926618
dwarf_race_index=0x0990a274
squad_vector=0x09a1b6d0
current_year=0x09907d80
cur_year_tick=0x09907da0
dwarf_civ_index=0x0990a268
races_vector=0x09a1ff98
reactions_vector=0x09a24520
historical_figures_vector=0x09a25a24
fake_identities_vector=0x09a1cb38
fortress_entity=0x0990ed40
historical_entities_vector=0x09912d70
itemdef_weapons_vector=0x09a1ffd8
itemdef_trap_vector=0x09a1ffe4
itemdef_toy_vector=0x09a1fff0
itemdef_tool_vector=0x09a1fffc
itemdef_instrument_vector=0x09a200d4
itemdef_armor_vector=0x09a200e0
itemdef_ammo_vector=0x09a200ec
itemdef_siegeammo_vector=0x09a200f8
itemdef_glove_vector=0x09a20104
itemdef_shoe_vector=0x09a20110
itemdef_shield_vector=0x09a2011c
itemdef_helm_vector=0x09a20128
itemdef_pant_vector=0x09a20134
itemdef_food_vector=0x09a20140
colors_vector=0x09a244fc
shapes_vector=0x09a24508
base_materials=0x09a24a94
inorganics_vector=0x09a1fee4
plants_vector=0x09a1fefc
material_templates_vector=0x09a1fed8
all_syndromes_vector=0x09a25504
world_data=0x09a1f7b4
active_sites_vector=0x00048200
world_site_type=0x0044
weapons_vector=0x099266b8
shields_vector=0x09926700
quivers_vector=0x09926724
crutches_vector=0x09926748
backpacks_vector=0x09926754
ammo_vector=0x09926760
flasks_vector=0x099268b0
pants_vector=0x09926c1c
armor_vector=0x09926c4c
shoes_vector=0x09926c58
helms_vector=0x09926c64
gloves_vector=0x09926c70
artifacts_vector=0x09926cc4

[offsets]
word_table=0x001c
string_buffer_offset=0x0000

[word_offsets]
base=0x0000
noun_singular=0x0004
noun_plural=0x0008
adjective=0x000c
verb=0x0014
present_simple_verb=0x0018
past_simple_verb=0x001c
past_participle_verb=0x0020
present_participle_verb=0x0024
words=0x0008
word_type=0x0024
language_id=0x0034

[general_ref_offsets]
ref_type=0x0008
artifact_id=0x0004
item_id=0x0004

[race_offsets]
name_singular=0x0004
name_plural=0x0008
adjective=0x000c
baby_name_singular=0x0010
baby_name_plural=0x0014
child_name_singular=0x0018
child_name_plural=0x001c
pref_string_vector=0x0048
castes_vector=0x0060
pop_ratio_vector=0x006c
materials_vector=0x1cf4
flags=0x0078
tissues_vector=0x1d00

[caste_offsets]
caste_name=0x0004
caste_descr=0x0044
caste_trait_ranges=0x01a8
caste_phys_att_ranges=0x0b4c
caste_att_rates=0x0d60
caste_att_caps=0x0e90
baby_age=0x00ec
child_age=0x00f0
adult_size=0x0104
flags=0x02d4
extracts=0x13a4
skill_rates=0x03fc
body_info=0x02e0

[hist_entity_offsets]
squads=0x0884
positions=0x0800
assignments=0x0828
assign_hist_id=0x0004
assign_position_id=0x000c
position_id=0x0004
position_name=0x0040
position_female_name=0x0048
position_male_name=0x0050

[hist_figure_offsets]
hist_race=0x0002
hist_name=0x0038
id=0x0094
hist_fig_info=0x00c0
reputation=0x002c
current_ident=0x0018
fake_name=0x0004
fake_birth_year=0x0050
fake_birth_time=0x0054

[item_offsets]
item_def=0x00a4
id=0x0018
general_refs=0x0028
stack_size=0x005c
wear=0x0070
mat_type=0x0080
mat_index=0x0084
quality=0x008a

[item_subtype_offsets]
sub_type=0x0008
name=0x0024
name_plural=0x0028
adjective=0x002c

[item_filter_offsets]
item_subtype=0x0002
mat_class=0x0004
mat_type=0x0006
mat_index=0x0008

[weapon_subtype_offsets]
single_size=0x0040
multi_size=0x0044
ammo=0x003c
melee_skill=0x0038
ranged_skill=0x003a

[armor_subtype_offsets]
chest_armor_properties=0x0048
pants_armor_properties=0x0050
other_armor_properties=0x0044
layer=0x0008
mat_name=0x0030

[material_offsets]
solid_name=0x0044
liquid_name=0x0048
gas_name=0x004c
powder_name=0x0050
paste_name=0x0054
pressed_name=0x0058
inorganic_materials_vector=0x00c8
flags=0x00c8

[plant_offsets]
name=0x001c
name_plural=0x0020
name_leaf_plural=0x0034
name_seed_plural=0x002c
materials_vector=0x0148
flags=0x0014

[descriptor_offsets]
color_name=0x001c
shape_name_plural=0x0020

[health_offsets]
parent_id=0x0008
layers_vector=0x0014
number=0x0034
names_vector=0x003c
names_plural_vector=0x0048
layer_tissue=0x0004
layer_global_id=0x0034
tissue_name=0x000c
tissue_flags=0x0004

[dwarf_offsets]
first_name=0x0000
nick_name=0x0004
last_name=0x0008
custom_profession=0x003c
profession=0x0040
race=0x0044
flags1=0x008c
flags2=0x0090
flags3=0x0094
caste=0x00a4
sex=0x00a6
id=0x00a8
animal_type=0x00b0
civ=0x00b8
specific_refs=0x00f4
squad_id=0x010c
squad_position=0x0110
recheck_equipment=0x015c
mood=0x01e4
birth_year=0x0204
birth_time=0x0208
current_job=0x02e8
physical_attrs=0x0398
body_size=0x0470
curse=0x0548
curse_add_flags1=0x0534
turn_count=0x05b0
souls=0x0668
states=0x05f8
labors=0x0684
thoughts=0x06fc
happiness=0x0714
hist_id=0x076c
artifact_name=0x062c
active_syndrome_vector=0x07b4
syn_sick_flag=0x0030
unit_health_info=0x0814
counters1=0x0508
counters2=0x0524
counters3=0x05cc
limb_counters=0x0774
blood=0x0458
body_component_info=0x02f8
layer_status_vector=0x0024
wounds_vector=0x0358
mood_skill=0x02ec
used_items_vector=0x0818
affection_level=0x000c
inventory=0x027c
inventory_item_mode=0x0004
inventory_item_bodypart=0x0006

[syndrome_offsets]
cie_effects=0x0004
cie_end=0x0014
cie_first_perc=0x005c
cie_phys=0x0074
cie_ment=0x0090
syn_classes_vector=0x0058

[unit_wound_offsets]
parts=0x0004
id=0x0004
layer=0x0006
general_flags=0x001c
flags1=0x003c
flags2=0x0040
effects_vector=0x002c
bleeding=0x0044
pain=0x0048
cur_pen=0x0064
max_pen=0x0066

[soul_details]
name=0x0004
mental_attrs=0x006c
skills=0x01d8
preferences=0x01e4
personality=0x01f0
beliefs=0x0000
goals=0x0024
traits=0x0040

[job_details]
id=0x0008
mat_type=0x0024
mat_index=0x0028
mat_category=0x003c
on_break_flag=0x0011
sub_job_id=0x0040
reaction=0x0004
reaction_skill=0x0028

[squad_offsets]
id=0x0000
name=0x0004
alias=0x0040
members=0x0044
carry_food=0x00d4
carry_water=0x00d6
ammunition=0x0098
quiver=0x00a8
backpack=0x00ac
flask=0x00b0
armor_vector=0x0040
helm_vector=0x004c
pants_vector=0x0058
gloves_vector=0x0064
shoes_vector=0x0070
shield_vector=0x007c
weapon_vector=0x0088
uniform_item_filter=0x0004
uniform_indiv_choice=0x0020

[valid_flags_2]
size=0

[invalid_flags_1]
size=10
1\name=a zombie
1\value=0x00001000
2\name=a skeleton
2\value=0x00002000
3\name=a merchant
3\value=0x00000040
4\name=outpost liason or diplomat
4\value=0x00000800
5\name=an invader or hostile
5\value=0x00020000
6\name=an invader or hostile
6\value=0x00080000
7\name=an invader or hostile
7\value=0x000C0000
8\name=part of a merchant caravan
8\value=0x00000080
9\name="Dead, Jim."
9\value=0x00000002
10\name=marauder
10\value=0x00000010

[invalid_flags_2]
size=5
1\name="killed, Jim."
1\value=0x00000080
2\name=from the Underworld. SPOOKY!
2\value=0x00040000
3\name=resident
3\value=0x00080000
4\name=visitor_uninvited
4\value=0x00400000
5\name=visitor
5\value=0x00800000

[invalid_flags_3]
size=1
1\name=a ghost
1\value=0x00001000

the global [addresses] section may be different and have to be verified. i don't remember if those were identical between osx and linux, but i don't believe they were. this is the df-structures guide to reset and find the global offsets.

[splinterz]

I noticed that Running a large world made DT read and update dwarf data much much slower now compared to a pocket world. It takes maybe 20 seconds to update dwarves on my Wine setup for a large world. A pocket world is instant as before.

can you check the log file and see if maybe it's loading a lot of squads? i'm testing this now to see if i can duplicate it.

[Aloriel]

I seem to have broken Dwarf Therapist 23.0...

The last thing I did was enable the traits tab and reload my dwarves. It did a CTD, and keeps doing that on reload.

I have tried reinstalling.
I have tried removing the .ini from my appdata folder. (Dang if that thing isn't hard to find )
I have tried removing the .ini from appdata AND reinstalling.

Any further options? Is there some other file somewhere that I am missing? Perhaps one of the files in the main DF folder or something?

EDIT:
Further info...
I have attempted to run 0.6.12 and it works fine. So it's only the branch version that is broken.
It also loads if my fortress isn't running.

Windows crash log:
Problem Event Name:   APPCRASH
  Application Name:   DwarfTherapist.exe
  Application Version:   0.0.0.0
  Application Timestamp:   53c830c5
  Fault Module Name:   DwarfTherapist.exe
  Fault Module Version:   0.0.0.0
  Fault Module Timestamp:   53c830c5
  Exception Code:   c0000005
  Exception Offset:   0016ed82
  OS Version:   6.1.7601.2.1.0.256.48
  Locale ID:   1033
  Additional Information 1:   0a9e
  Additional Information 2:   0a9e372d3b4ad19135b953a78882e789
  Additional Information 3:   0a9e
  Additional Information 4:   0a9e372d3b4ad19135b953a78882e789

And I have to attach the run.log because it's just too large. (even in spoilers)
https://drive.google.com/file/d/0B6E_9hy-_29ta3QxOHhTcGE0Z1U/edit?usp=sharing


Another change I just realized: I had just had a wave of migrants come in. Could it have gotten overloaded?

[King Mir]

EDIT:Woops. Wrong save. The right one has a log too big to fit in a post.

Here's the right log:
http://pastebin.com/8zSvUX8P

Yeah there are a lot of squads found.

[shaver]

I got the winedump part sorted out, but didn't have df_misc checked out on the plane. That'll be the next step. I have a Linux VM to hand at home if I end up needing to go that route, but I'm not home until Tuesday.

Splinter: is the make-dt.pl in df-structures up to date, in terms of which symbols map to which of the global addresses? I'm not sure how else to tell which addresses to use.

[shaver]

Oh, do we need an OS X build of the latest v34 release? I could do that more easily!

[splinterz]

I seem to have broken Dwarf Therapist 23.0...

The last thing I did was enable the traits tab and reload my dwarves. It did a CTD, and keeps doing that on reload.

I have tried reinstalling.
I have tried removing the .ini from my appdata folder. (Dang if that thing isn't hard to find )
I have tried removing the .ini from appdata AND reinstalling.

Any further options? Is there some other file somewhere that I am missing? Perhaps one of the files in the main DF folder or something?

EDIT:
Further info...
I have attempted to run 0.6.12 and it works fine. So it's only the branch version that is broken.
It also loads if my fortress isn't running.

Windows crash log:
Problem Event Name:   APPCRASH
  Application Name:   DwarfTherapist.exe
  Application Version:   0.0.0.0
  Application Timestamp:   53c830c5
  Fault Module Name:   DwarfTherapist.exe
  Fault Module Version:   0.0.0.0
  Fault Module Timestamp:   53c830c5
  Exception Code:   c0000005
  Exception Offset:   0016ed82
  OS Version:   6.1.7601.2.1.0.256.48
  Locale ID:   1033
  Additional Information 1:   0a9e
  Additional Information 2:   0a9e372d3b4ad19135b953a78882e789
  Additional Information 3:   0a9e
  Additional Information 4:   0a9e372d3b4ad19135b953a78882e789

And I have to attach the run.log because it's just too large. (even in spoilers)
https://drive.google.com/file/d/0B6E_9hy-_29ta3QxOHhTcGE0Z1U/edit?usp=sharing


Another change I just realized: I had just had a wave of migrants come in. Could it have gotten overloaded?

if you just got migrants, it's probably the same issue as above with a squad. try adding and removing the new migrants to a squad.

[splinterz]

I got the winedump part sorted out, but didn't have df_misc checked out on the plane. That'll be the next step. I have a Linux VM to hand at home if I end up needing to go that route, but I'm not home until Tuesday.

Splinter: is the make-dt.pl in df-structures up to date, in terms of which symbols map to which of the global addresses? I'm not sure how else to tell which addresses to use.

this is the most recent make-dt.pl

[splinterz]

EDIT:Woops. Wrong save. The right one has a log too big to fit in a post.

Here's the right log:
http://pastebin.com/8zSvUX8P

Yeah there are a lot of squads found.

oh wow, that's a lot of squads! that's most likely the issue as it's building the uniforms and everything for every squad found there. i noticed this in one of my recent games as well and i've already implemented a fix (if that's the only cause).

[dennislp3]

Is that pulling sqauds from like...wandering groups or something?

[King Mir]

I kinda wanna know more about "The Adorable Whiskers" and "The Women of Showing" now. And their uniforms.

[splinterz]

it's pulling all the squads (in history?) instead of only the squads in the current fortress. this wasn't really a problem before, it would only have a list of old squads if you reclaimed, if i remember correctly. but with the new dynamic world changes, i believe it's keeping track of a lot more squads. so it's an easy fix, i just have to make sure the squad information should be loaded (ie that it's actually an active squad).

[shaver]

this is the most recent make-dt.pl

Excellent, that'll help a ton.