wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Henri Verbeet : d3drm: Get rid of the IDirect3DRMFaceImpl typedef.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 7320f3b87e68b04df5dd819656131a21c80c78f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7320f3b87e68b04df5dd81965… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 7 22:15:50 2013 +0200 d3drm: Get rid of the IDirect3DRMFaceImpl typedef. --- dlls/d3drm/face.c | 561 +++++++++++++++++++++-------------------------------- 1 files changed, 223 insertions(+), 338 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7320f3b87e68b04df5dd8…

1 0

Henri Verbeet : wined3d: Send transformation matrix updates through the command stream.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: c6f8404bb67520abf6a8d12f768c8724fea59033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f8404bb67520abf6a8d12f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 7 22:15:49 2013 +0200 wined3d: Send transformation matrix updates through the command stream. --- dlls/wined3d/cs.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 4 +--- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index af23a47..16ffcf9 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -44,6 +44,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_RENDER_STATE, WINED3D_CS_OP_SET_TEXTURE_STATE, WINED3D_CS_OP_SET_SAMPLER_STATE, + WINED3D_CS_OP_SET_TRANSFORM, }; struct wined3d_cs_present @@ -169,6 +170,13 @@ struct wined3d_cs_set_sampler_state DWORD value; }; +struct wined3d_cs_set_transform +{ + enum wined3d_cs_op opcode; + enum wined3d_transform_state state; + const struct wined3d_matrix *matrix; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -661,6 +669,28 @@ void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, cs->ops->submit(cs); } +static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_transform *op = data; + + cs->state.transforms[op->state] = *op->matrix; + if (op->state < WINED3D_TS_WORLD_MATRIX(cs->device->adapter->gl_info.limits.blends)) + device_invalidate_state(cs->device, STATE_TRANSFORM(op->state)); +} + +void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, + const struct wined3d_matrix *matrix) +{ + struct wined3d_cs_set_transform *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_TRANSFORM; + op->state = state; + op->matrix = matrix; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -681,6 +711,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state, /* WINED3D_CS_OP_SET_TEXTURE_STATE */ wined3d_cs_exec_set_texture_state, /* WINED3D_CS_OP_SET_SAMPLER_STATE */ wined3d_cs_exec_set_sampler_state, + /* WINED3D_CS_OP_SET_TRANSFORM */ wined3d_cs_exec_set_transform, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cae3cfd..e37a28d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1360,9 +1360,7 @@ void CDECL wined3d_device_set_transform(struct wined3d_device *device, } device->state.transforms[d3dts] = *matrix; - - if (d3dts < WINED3D_TS_WORLD_MATRIX(device->adapter->gl_info.limits.blends)) - device_invalidate_state(device, STATE_TRANSFORM(d3dts)); + wined3d_cs_emit_set_transform(device->cs, d3dts, matrix); } void CDECL wined3d_device_get_transform(const struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9626c54..c28643a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2505,6 +2505,8 @@ void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_i void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, enum wined3d_texture_stage_state state, DWORD value) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, + const struct wined3d_matrix *matrix) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Send sampler state updates through the command stream.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: b2e75e27f368852e3c2497c7684d6913c472673a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e75e27f368852e3c2497c76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 7 22:15:48 2013 +0200 wined3d: Send sampler state updates through the command stream. --- dlls/wined3d/cs.c | 32 ++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3ddfeb1..af23a47 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -43,6 +43,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_PIXEL_SHADER, WINED3D_CS_OP_SET_RENDER_STATE, WINED3D_CS_OP_SET_TEXTURE_STATE, + WINED3D_CS_OP_SET_SAMPLER_STATE, }; struct wined3d_cs_present @@ -160,6 +161,14 @@ struct wined3d_cs_set_texture_state DWORD value; }; +struct wined3d_cs_set_sampler_state +{ + enum wined3d_cs_op opcode; + UINT sampler_idx; + enum wined3d_sampler_state state; + DWORD value; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -630,6 +639,28 @@ void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, cs->ops->submit(cs); } +static void wined3d_cs_exec_set_sampler_state(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_sampler_state *op = data; + + cs->state.sampler_states[op->sampler_idx][op->state] = op->value; + device_invalidate_state(cs->device, STATE_SAMPLER(op->sampler_idx)); +} + +void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, + enum wined3d_sampler_state state, DWORD value) +{ + struct wined3d_cs_set_sampler_state *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_SAMPLER_STATE; + op->sampler_idx = sampler_idx; + op->state = state; + op->value = value; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -649,6 +680,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_PIXEL_SHADER */ wined3d_cs_exec_set_pixel_shader, /* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state, /* WINED3D_CS_OP_SET_TEXTURE_STATE */ wined3d_cs_exec_set_texture_state, + /* WINED3D_CS_OP_SET_SAMPLER_STATE */ wined3d_cs_exec_set_sampler_state, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 73231da..cae3cfd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1990,7 +1990,7 @@ void CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, return; } - device_invalidate_state(device, STATE_SAMPLER(sampler_idx)); + wined3d_cs_emit_set_sampler_state(device->cs, sampler_idx, state, value); } DWORD CDECL wined3d_device_get_sampler_state(const struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 96e5d3b..9626c54 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2495,6 +2495,8 @@ void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_target(struct wined3d_cs *cs, UINT render_target_idx, struct wined3d_surface *render_target) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, + enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Send texture state updates through the command stream.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 8cf6d1a429428dcd64a3c76f0f0d6a8bf3d6b650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf6d1a429428dcd64a3c76f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 7 22:15:47 2013 +0200 wined3d: Send texture state updates through the command stream. --- dlls/wined3d/cs.c | 32 ++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index f295aa7..3ddfeb1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -42,6 +42,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_GEOMETRY_SHADER, WINED3D_CS_OP_SET_PIXEL_SHADER, WINED3D_CS_OP_SET_RENDER_STATE, + WINED3D_CS_OP_SET_TEXTURE_STATE, }; struct wined3d_cs_present @@ -151,6 +152,14 @@ struct wined3d_cs_set_render_state DWORD value; }; +struct wined3d_cs_set_texture_state +{ + enum wined3d_cs_op opcode; + UINT stage; + enum wined3d_texture_stage_state state; + DWORD value; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -599,6 +608,28 @@ void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render cs->ops->submit(cs); } +static void wined3d_cs_exec_set_texture_state(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_texture_state *op = data; + + cs->state.texture_states[op->stage][op->state] = op->value; + device_invalidate_state(cs->device, STATE_TEXTURESTAGE(op->stage, op->state)); +} + +void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, + enum wined3d_texture_stage_state state, DWORD value) +{ + struct wined3d_cs_set_texture_state *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_TEXTURE_STATE; + op->stage = stage; + op->state = state; + op->value = value; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -617,6 +648,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_GEOMETRY_SHADER */ wined3d_cs_exec_set_geometry_shader, /* WINED3D_CS_OP_SET_PIXEL_SHADER */ wined3d_cs_exec_set_pixel_shader, /* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state, + /* WINED3D_CS_OP_SET_TEXTURE_STATE */ wined3d_cs_exec_set_texture_state, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b050cd..73231da 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3074,7 +3074,7 @@ void CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *device, return; } - device_invalidate_state(device, STATE_TEXTURESTAGE(stage, state)); + wined3d_cs_emit_set_texture_state(device->cs, stage, state, value); } DWORD CDECL wined3d_device_get_texture_stage_state(const struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b31908d..96e5d3b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2501,6 +2501,8 @@ void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, UINT frequency, UINT flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, + enum wined3d_texture_stage_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN;

1 0

Piotr Caban : riched20: Set control content in WM_CREATE message.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: e660bf676c111ce20d9e868280094f1c5bb81c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e660bf676c111ce20d9e86828… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 7 15:28:00 2013 +0200 riched20: Set control content in WM_CREATE message. --- dlls/riched20/editor.c | 24 ++++++++++++++++++++++++ dlls/riched20/tests/editor.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 42f5770..6e7ffae 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3999,6 +3999,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case WM_CREATE: { + void *text = NULL; INT max; ME_SetDefaultFormatRect(editor); @@ -4024,6 +4025,29 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } } + if (lParam) + { + text = (unicode ? (void*)((CREATESTRUCTW*)lParam)->lpszName + : (void*)((CREATESTRUCTA*)lParam)->lpszName); + } + if (text) + { + WCHAR *textW; + int len; + + textW = ME_ToUnicode(unicode, text, &len); + if (!(editor->styleFlags & ES_MULTILINE)) + { + len = 0; + while(textW[len] != '0' && textW[len] != '\r' && textW[len] != '\n') + len++; + } + ME_InsertTextFromCursor(editor, 0, textW, len, editor->pBuffer->pDefaultStyle); + ME_EndToUnicode(unicode, textW); + ME_SetCursorToStart(editor, &editor->pCursors[0]); + ME_SetCursorToStart(editor, &editor->pCursors[1]); + } + ME_CommitUndo(editor); ME_WrapMarkedParagraphs(editor); ME_MoveCaret(editor); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 35684e6..4d9fde6 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7410,6 +7410,43 @@ static void test_enter(void) DestroyWindow(hwndRichEdit); } +static void test_WM_CREATE(void) +{ + static const WCHAR titleW[] = {'l','i','n','e','1','\n','l','i','n','e','2',0}; + static const char title[] = "line1\nline2"; + + HWND rich_edit; + LRESULT res; + char buf[64]; + int len; + + rich_edit = CreateWindowA(RICHEDIT_CLASS20A, title, WS_POPUP|WS_VISIBLE, + 0, 0, 200, 80, NULL, NULL, NULL, NULL); + ok(rich_edit != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS20A, (int) GetLastError()); + + len = GetWindowText(rich_edit, buf, sizeof(buf)); + ok(len == 5, "GetWindowText returned %d\n", len); + ok(!strcmp(buf, "line1"), "buf = %s\n", buf); + + res = SendMessage(rich_edit, EM_GETSEL, 0, 0); + ok(res == 0, "SendMessage(EM_GETSEL) returned %lx\n", res); + + DestroyWindow(rich_edit); + + rich_edit = CreateWindowW(RICHEDIT_CLASS20W, titleW, WS_POPUP|WS_VISIBLE|ES_MULTILINE, + 0, 0, 200, 80, NULL, NULL, NULL, NULL); + ok(rich_edit != NULL, "class: %s, error: %d\n", wine_dbgstr_w(RICHEDIT_CLASS20W), (int) GetLastError()); + + len = GetWindowText(rich_edit, buf, sizeof(buf)); + ok(len == 12, "GetWindowText returned %d\n", len); + ok(!strcmp(buf, "line1\r\nline2"), "buf = %s\n", buf); + + res = SendMessage(rich_edit, EM_GETSEL, 0, 0); + ok(res == 0, "SendMessage(EM_GETSEL) returned %lx\n", res); + + DestroyWindow(rich_edit); +} + START_TEST( editor ) { BOOL ret; @@ -7470,6 +7507,7 @@ START_TEST( editor ) test_EM_FINDWORDBREAK_W(); test_EM_FINDWORDBREAK_A(); test_enter(); + test_WM_CREATE(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Piotr Caban : msvcrt: Add support for vtordispex demangling.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 0aa72d880a9d6a3a72252f4e0d75cab4608185dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa72d880a9d6a3a72252f4e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 7 13:01:24 2013 +0200 msvcrt: Add support for vtordispex demangling. --- dlls/msvcrt/tests/cpp.c | 3 +++ dlls/msvcrt/undname.c | 32 +++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index f36641e..e545a5f 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1315,6 +1315,9 @@ static void test_demangle(void) /* 124 */ {"??_9CView@@$BBII@AE", "[thunk]: __thiscall CView::`vcall'{392,{flat}}' }'", "[thunk]: __thiscall CView::`vcall'{392,{flat}}' "}, +/* 125 */ {"?_dispatch@_impl_Engine@SalomeApp@@$R4CE@BA@PPPPPPPM@7AE_NAAVomniCallHandle@@@Z", + "[thunk]:public: virtual bool __thiscall SalomeApp::_impl_Engine::_dispatch`vtordispex{36,16,4294967292,8}' (class omniCallHandle &)", + "?_dispatch@_impl_Engine@SalomeApp@@$R4CE@BA@PPPPPPPM@7AE_NAAVomniCallHandle@@@Z"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index bc2a6fb..396a003 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1113,12 +1113,15 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) * "$4" public: thunk vtordisp * "$5" public: thunk vtordisp * "$B" vcall thunk + * "$R" thunk vtordispex */ accmem = *sym->current++; if (accmem == '$') { if (*sym->current >= '0' && *sym->current <= '5') access_id = (*sym->current - '0') / 2; + else if (*sym->current == 'R') + access_id = (sym->current[1] - '0') / 2; else if (*sym->current != 'B') goto done; } @@ -1136,7 +1139,7 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) if (accmem == '$' || (accmem - 'A') % 8 == 6 || (accmem - 'A') % 8 == 7) access = str_printf(sym, "[thunk]:%s", access ? access : " "); - if (accmem == '$' && *sym->current >= '0' && *sym->current <= '5') + if (accmem == '$' && *sym->current != 'B') member_type = "virtual "; else if (accmem <= 'X') { @@ -1154,19 +1157,38 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) name = get_class_string(sym, 0); - if (accmem == '$' && *sym->current++ == 'B') /* vcall thunk */ + if (accmem == '$' && *sym->current == 'B') /* vcall thunk */ { - const char *n = get_number(sym); + const char *n; + + sym->current++; + n = get_number(sym); if(!n || *sym->current++ != 'A') goto done; name = str_printf(sym, "%s{%s,{flat}}' }'", name, n); has_args = FALSE; has_ret = FALSE; } + else if (accmem == '$' && *sym->current == 'R') /* vtordispex thunk */ + { + const char *n1, *n2, *n3, *n4; + + sym->current += 2; + n1 = get_number(sym); + n2 = get_number(sym); + n3 = get_number(sym); + n4 = get_number(sym); + + if(!n1 || !n2 || !n3 || !n4) goto done; + name = str_printf(sym, "%s`vtordispex{%s,%s,%s,%s}' ", name, n1, n2, n3, n4); + } else if (accmem == '$') /* vtordisp thunk */ { - const char *n1 = get_number(sym); - const char *n2 = get_number(sym); + const char *n1, *n2; + + sym->current++; + n1 = get_number(sym); + n2 = get_number(sym); if (!n1 || !n2) goto done; name = str_printf(sym, "%s`vtordisp{%s,%s}' ", name, n1, n2);

1 0

Piotr Caban : msvcrt: Add support for vcall thunks demangling.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 501d60b020ee626f145dad601cd3fe8fa1f68eb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=501d60b020ee626f145dad601… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 7 13:01:10 2013 +0200 msvcrt: Add support for vcall thunks demangling. --- dlls/msvcrt/tests/cpp.c | 3 ++ dlls/msvcrt/undname.c | 93 ++++++++++++++++++++++++++--------------------- 2 files changed, 54 insertions(+), 42 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 92301ff..f36641e 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1312,6 +1312,9 @@ static void test_demangle(void) /* 123 */ {"?vtordisp_thunk@std@@$4PPPPPPPM@3EAA_NXZ", "[thunk]:public: virtual bool __cdecl std::vtordisp_thunk`vtordisp{4294967292,4}' (void) __ptr64", "[thunk]:public: virtual bool __cdecl std::vtordisp_thunk`vtordisp{-4,4}' (void) __ptr64"}, +/* 124 */ {"??_9CView@@$BBII@AE", + "[thunk]: __thiscall CView::`vcall'{392,{flat}}' }'", + "[thunk]: __thiscall CView::`vcall'{392,{flat}}' "}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index dfcf2ab..bc2a6fb 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1067,6 +1067,7 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) { char accmem; const char* access = NULL; + int access_id = -1; const char* member_type = NULL; struct datatype_t ct_ret; const char* call_conv; @@ -1074,7 +1075,7 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) const char* exported; const char* args_str = NULL; const char* name = NULL; - BOOL ret = FALSE; + BOOL ret = FALSE, has_args = TRUE, has_ret = TRUE; unsigned mark; struct array array_pmt; @@ -1111,48 +1112,58 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) * "$3" protected: thunk vtordisp * "$4" public: thunk vtordisp * "$5" public: thunk vtordisp + * "$B" vcall thunk */ accmem = *sym->current++; if (accmem == '$') { - accmem = *sym->current++; - if (accmem < '0' || accmem > '5') goto done; + if (*sym->current >= '0' && *sym->current <= '5') + access_id = (*sym->current - '0') / 2; + else if (*sym->current != 'B') + goto done; } - else if (accmem < 'A' || accmem > 'Z') goto done; + else if (accmem >= 'A' && accmem <= 'Z') + access_id = (accmem - 'A') / 8; + else + goto done; - if (!(sym->flags & UNDNAME_NO_ACCESS_SPECIFIERS)) + switch (access_id) { - switch (accmem >= '0' && accmem <= '5' ? (accmem - '0') / 2 : (accmem - 'A') / 8) - { - case 0: access = "private: "; break; - case 1: access = "protected: "; break; - case 2: access = "public: "; break; - } + case 0: access = "private: "; break; + case 1: access = "protected: "; break; + case 2: access = "public: "; break; } - if (!(sym->flags & UNDNAME_NO_MEMBER_TYPE)) + if (accmem == '$' || (accmem - 'A') % 8 == 6 || (accmem - 'A') % 8 == 7) + access = str_printf(sym, "[thunk]:%s", access ? access : " "); + + if (accmem == '$' && *sym->current >= '0' && *sym->current <= '5') + member_type = "virtual "; + else if (accmem <= 'X') { - if (accmem >= '0' && accmem <= '5') + switch ((accmem - 'A') % 8) { - access = str_printf(sym, "[thunk]:%s", access); - member_type = "virtual "; - } - else if (accmem <= 'X') - { - switch ((accmem - 'A') % 8) - { - case 2: case 3: member_type = "static "; break; - case 4: case 5: member_type = "virtual "; break; - case 6: case 7: - access = str_printf(sym, "[thunk]:%s", access); - member_type = "virtual "; - break; - } + case 2: case 3: member_type = "static "; break; + case 4: case 5: case 6: case 7: member_type = "virtual "; break; } } + if (sym->flags & UNDNAME_NO_ACCESS_SPECIFIERS) + access = NULL; + if (sym->flags & UNDNAME_NO_MEMBER_TYPE) + member_type = NULL; + name = get_class_string(sym, 0); - if (accmem >= '0' && accmem <='5') /* vtordisp thunk */ + if (accmem == '$' && *sym->current++ == 'B') /* vcall thunk */ + { + const char *n = get_number(sym); + + if(!n || *sym->current++ != 'A') goto done; + name = str_printf(sym, "%s{%s,{flat}}' }'", name, n); + has_args = FALSE; + has_ret = FALSE; + } + else if (accmem == '$') /* vtordisp thunk */ { const char *n1 = get_number(sym); const char *n2 = get_number(sym); @@ -1163,16 +1174,14 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) else if ((accmem - 'A') % 8 == 6 || (accmem - 'A') % 8 == 7) /* a thunk */ name = str_printf(sym, "%s`adjustor{%s}' ", name, get_number(sym)); - if (accmem <= 'X') + if (has_args && (accmem == '$' || + (accmem <= 'X' && (accmem - 'A') % 8 != 2 && (accmem - 'A') % 8 != 3))) { - if (((accmem - 'A') % 8) != 2 && ((accmem - 'A') % 8) != 3) - { - const char *ptr_modif; - /* Implicit 'this' pointer */ - /* If there is an implicit this pointer, const modifier follows */ - if (!get_modifier(sym, &modifier, &ptr_modif)) goto done; - if (modifier || ptr_modif) modifier = str_printf(sym, "%s %s", modifier, ptr_modif); - } + const char *ptr_modif; + /* Implicit 'this' pointer */ + /* If there is an implicit this pointer, const modifier follows */ + if (!get_modifier(sym, &modifier, &ptr_modif)) goto done; + if (modifier || ptr_modif) modifier = str_printf(sym, "%s %s", modifier, ptr_modif); } if (!get_calling_convention(*sym->current++, &call_conv, &exported, @@ -1182,18 +1191,18 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) str_array_init(&array_pmt); /* Return type, or @ if 'void' */ - if (*sym->current == '@') + if (has_ret && *sym->current == '@') { ct_ret.left = "void"; ct_ret.right = NULL; sym->current++; } - else + else if (has_ret) { if (!demangle_datatype(sym, &ct_ret, &array_pmt, FALSE)) goto done; } - if (sym->flags & UNDNAME_NO_FUNCTION_RETURNS) + if (!has_ret || sym->flags & UNDNAME_NO_FUNCTION_RETURNS) ct_ret.left = ct_ret.right = NULL; if (cast_op) { @@ -1202,7 +1211,7 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) } mark = sym->stack.num; - if (!(args_str = get_args(sym, &array_pmt, TRUE, '(', ')'))) goto done; + if (has_args && !(args_str = get_args(sym, &array_pmt, TRUE, '(', ')'))) goto done; if (sym->flags & UNDNAME_NAME_ONLY) args_str = modifier = NULL; sym->stack.num = mark; @@ -1210,7 +1219,7 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) * Yet!!! FIXME */ sym->result = str_printf(sym, "%s%s%s%s%s%s%s%s%s%s%s", - access, member_type, ct_ret.left, + access, member_type, ct_ret.left, (ct_ret.left && !ct_ret.right) ? " " : NULL, call_conv, call_conv ? " " : NULL, exported, name, args_str, modifier, ct_ret.right);

1 0

Piotr Caban : msvcrt: Don' t try to demangle template after function or variable name.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: d13436e048894e0a57cfe5a7cc89100c48956d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d13436e048894e0a57cfe5a7c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 7 13:00:54 2013 +0200 msvcrt: Don't try to demangle template after function or variable name. --- dlls/msvcrt/undname.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 057d40a..dfcf2ab 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1219,23 +1219,6 @@ done: return ret; } -/****************************************************************** - * handle_template - * Does the final parsing and handling for a name with templates - */ -static BOOL handle_template(struct parsed_symbol* sym) -{ - const char* name; - const char* args; - - assert(*sym->current == '$'); - sym->current++; - if (!(name = get_literal_string(sym))) return FALSE; - if (!(args = get_args(sym, NULL, FALSE, '<', '>'))) return FALSE; - sym->result = str_printf(sym, "%s%s", name, args); - return TRUE; -} - /******************************************************************* * symbol_demangle * Demangle a C++ linker symbol @@ -1469,8 +1452,6 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) /* Function/Data type and access level */ if (*sym->current >= '0' && *sym->current <= '9') ret = handle_data(sym); - else if (sym->current[0] == '$' && (sym->current[1] < '0' || sym->current[1] > '9')) - ret = handle_template(sym); else if ((*sym->current >= 'A' && *sym->current <= 'Z') || *sym->current == '$') ret = handle_method(sym, do_after == 3); else ret = FALSE;

1 0

Hans Leidekker : iphlpapi: Set the mask for gateway entries in GetAdaptersInfo.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: a873fdc66f57b13490606a1abfb6131b72753899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a873fdc66f57b13490606a1ab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 7 12:24:17 2013 +0200 iphlpapi: Set the mask for gateway entries in GetAdaptersInfo. --- dlls/iphlpapi/iphlpapi_main.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 9d23c82..141dbd8 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -564,8 +564,12 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) if (routeTable->table[i].dwForwardIfIndex == ptr->Index && routeTable->table[i].u1.ForwardType == MIB_IPROUTE_TYPE_INDIRECT) + { toIPAddressString(routeTable->table[i].dwForwardNextHop, ptr->GatewayList.IpAddress.String); + toIPAddressString(routeTable->table[i].dwForwardMask, + ptr->GatewayList.IpMask.String); + } if (winsEnabled) { ptr->HaveWins = TRUE; memcpy(ptr->PrimaryWinsServer.IpAddress.String,

1 0

Francois Gouget : mscoree/tests: Make test_createinstance() static.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: cd35ac901f2b2906813ee08b65c851bf7f0ffede URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd35ac901f2b2906813ee08b6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 7 09:29:46 2013 +0200 mscoree/tests: Make test_createinstance() static. --- dlls/mscoree/tests/mscoree.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 41844ef..19e8fdd 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -390,7 +390,7 @@ static void test_createconfigstream(void) DeleteFileW(file); } -void test_createinstance(void) +static void test_createinstance(void) { HRESULT hr; ICLRMetaHost *host;

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2013