wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Andrew Eikum : ieframe: Register CLSID_WebBrowser as an ActiveX control.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: b6570bb88c52f1edeb096a7b85a5ebd1cf1551a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6570bb88c52f1edeb096a7b8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 12 10:49:25 2013 -0500 ieframe: Register CLSID_WebBrowser as an ActiveX control. Also cleanup the RGS to not create an unintended '{}' registry entry for InternetShortcut. --- dlls/ieframe/ieframe.rgs | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/ieframe.rgs b/dlls/ieframe/ieframe.rgs index cf8f3b4..f99e6b6 100644 --- a/dlls/ieframe/ieframe.rgs +++ b/dlls/ieframe/ieframe.rgs @@ -34,9 +34,13 @@ HKCR { shellex { - MayChangeDefaultMenu {} + MayChangeDefaultMenu } } + '{8856f961-340a-11d0-a96b-00c04fd705a2}' + { + Control + } } 'InternetShortcut' {

1 0

Stefan Dösinger : d3d9/tests: D3DCMP_GREATER is broken on r500.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: 53741d2bb92b68379885e280c1b4c7c088478994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53741d2bb92b68379885e280c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 12 12:23:32 2013 +0200 d3d9/tests: D3DCMP_GREATER is broken on r500. --- dlls/d3d9/tests/visual.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1deba5f..f047cd7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2558,15 +2558,21 @@ static void z_range_test(IDirect3DDevice9 *device) else ok(color_match(color, 0x00ffff00, 0), "Z range failed: Got color 0x%08x, expected 0x00ffff00.\n", color); - /* Not clipped, > z buffer clear value(0.75) */ + /* Not clipped, > z buffer clear value(0.75). + * + * On the r500 driver on Windows D3DCMP_GREATER and D3DCMP_GREATEREQUAL are broken for depth + * values > 0.5. The range appears to be distorted, apparently an incoming value of ~0.875 is + * equal to a stored depth buffer value of 0.5. */ color = getPixelColor(device, 31, 238); ok(color_match(color, 0x00ff0000, 0), "Z range failed: Got color 0x%08x, expected 0x00ff0000.\n", color); color = getPixelColor(device, 31, 241); ok(color_match(color, 0x00ffff00, 0), "Z range failed: Got color 0x%08x, expected 0x00ffff00.\n", color); color = getPixelColor(device, 100, 238); - ok(color_match(color, 0x00ff0000, 0), "Z range failed: Got color 0x%08x, expected 0x00ff0000.\n", color); + ok(color_match(color, 0x00ff0000, 0) || broken(color_match(color, 0x00ffffff, 0)), + "Z range failed: Got color 0x%08x, expected 0x00ff0000.\n", color); color = getPixelColor(device, 100, 241); - ok(color_match(color, 0x00ffff00, 0), "Z range failed: Got color 0x%08x, expected 0x00ffff00.\n", color); + ok(color_match(color, 0x00ffff00, 0) || broken(color_match(color, 0x00ffffff, 0)), + "Z range failed: Got color 0x%08x, expected 0x00ffff00.\n", color); /* Not clipped, < z buffer clear value */ color = getPixelColor(device, 104, 238); @@ -2638,7 +2644,8 @@ static void z_range_test(IDirect3DDevice9 *device) color = getPixelColor(device, 31, 238); ok(color_match(color, 0x00ff0000, 0), "Z range failed: Got color 0x%08x, expected 0x00ff0000.\n", color); color = getPixelColor(device, 100, 238); - ok(color_match(color, 0x00ff0000, 0), "Z range failed: Got color 0x%08x, expected 0x00ff0000.\n", color); + ok(color_match(color, 0x00ff0000, 0) || broken(color_match(color, 0x00ffffff, 0)), + "Z range failed: Got color 0x%08x, expected 0x00ff0000.\n", color); /* 0.75 < z < 0.0 */ color = getPixelColor(device, 104, 238);

1 0

Stefan Dösinger : d3d9/tests: Clean up z_range_test a bit.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: ed504576941126464b3799f311f63df98224e8eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed504576941126464b3799f31… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 12 12:23:31 2013 +0200 d3d9/tests: Clean up z_range_test a bit. --- dlls/d3d9/tests/visual.c | 232 +++++++++++++++++++++------------------------- 1 files changed, 107 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed504576941126464b379…

1 0

Stefan Dösinger : wined3d: Explicitly pass the state information to buffer_internal_preload.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: b8eb171b6bd4f930aee265af981223fd7a557b52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8eb171b6bd4f930aee265af9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 12 12:23:30 2013 +0200 wined3d: Explicitly pass the state information to buffer_internal_preload. --- dlls/wined3d/buffer.c | 12 +++++++----- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 84fe45a..2deb7d2 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -728,7 +728,8 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined } /* Context activation is done by the caller. */ -void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context) +void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, + const struct wined3d_state *state) { DWORD flags = buffer->flags & (WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); struct wined3d_device *device = buffer->resource.device; @@ -763,12 +764,13 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte } } - /* Reading the declaration makes only sense if the stateblock is finalized and the buffer bound to a stream */ - if (device->isInDraw && buffer->resource.bind_count > 0) + /* Reading the declaration makes only sense if we have valid state information + * (i.e., if this function is called during draws). */ + if (state) { DWORD fixup_flags = 0; - if (!use_vs(&device->state)) + if (!use_vs(state)) { if (!context->gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) fixup_flags |= WINED3D_BUFFER_FIXUP_D3DCOLOR; @@ -935,7 +937,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) { struct wined3d_context *context; context = context_acquire(buffer->resource.device, NULL); - buffer_internal_preload(buffer, context); + buffer_internal_preload(buffer, context, NULL); context_release(context); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f870700..af3addc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2498,7 +2498,7 @@ void context_stream_info_from_declaration(struct wined3d_context *context, element = &stream_info->elements[i]; buffer = state->streams[element->stream_idx].buffer; - buffer_internal_preload(buffer, context); + buffer_internal_preload(buffer, context, state); /* If the preload dropped the buffer object, update the stream info. */ if (buffer->buffer_object != element->data.buffer_object) @@ -2583,7 +2583,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de if (state->index_buffer) { if (context->stream_info.all_vbo) - buffer_internal_preload(state->index_buffer, context); + buffer_internal_preload(state->index_buffer, context, state); else buffer_get_sysmem(state->index_buffer, context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a1b7238..a30db57 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2525,8 +2525,8 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *context) DECLSPEC_HIDDEN; -void buffer_internal_preload(struct wined3d_buffer *buffer, - struct wined3d_context *context) DECLSPEC_HIDDEN; +void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, + const struct wined3d_state *state) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view {

1 0

Stefan Dösinger : wined3d: Move the decoded stream info into the context.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: d8c43aabf7fb872ec07e2302be4cacbed65d9a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c43aabf7fb872ec07e2302b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 12 12:23:29 2013 +0200 wined3d: Move the decoded stream info into the context. --- dlls/wined3d/arb_program_shader.c | 13 +-- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context.c | 215 ++++++++++++++++++++++++++++++++++++- dlls/wined3d/device.c | 213 +------------------------------------ dlls/wined3d/drawprim.c | 10 +- dlls/wined3d/glsl_shader.c | 8 +- dlls/wined3d/state.c | 29 +++--- dlls/wined3d/wined3d_private.h | 19 ++-- 8 files changed, 252 insertions(+), 257 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8c43aabf7fb872ec07e2…

1 0

Stefan Dösinger : wined3d: Pass stream info and needed fixups to buffer_find_decl.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: a0b56d9c59335f72c252f4dec96305744c20fbb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b56d9c59335f72c252f4dec… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 12 12:23:28 2013 +0200 wined3d: Pass stream info and needed fixups to buffer_find_decl. --- dlls/wined3d/buffer.c | 63 +++++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f811a61..ecd47eb 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -269,9 +269,11 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *This, return ret; } +#define WINED3D_BUFFER_FIXUP_D3DCOLOR 0x01 +#define WINED3D_BUFFER_FIXUP_XYZRHW 0x02 + static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct wined3d_stream_info *si, - UINT attrib_idx, const BOOL check_d3dcolor, const BOOL check_position, const BOOL is_ffp_color, - DWORD *stride_this_run) + UINT attrib_idx, DWORD fixup_flags, DWORD *stride_this_run) { const struct wined3d_stream_info_element *attrib = &si->elements[attrib_idx]; enum wined3d_format_id format; @@ -286,13 +288,11 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct win format = attrib->format->id; /* Look for newly appeared conversion */ - if (check_d3dcolor && format == WINED3DFMT_B8G8R8A8_UNORM) + if (fixup_flags & WINED3D_BUFFER_FIXUP_D3DCOLOR && format == WINED3DFMT_B8G8R8A8_UNORM) { ret = buffer_process_converted_attribute(This, CONV_D3DCOLOR, attrib, stride_this_run); - - if (!is_ffp_color) FIXME("Test for non-color fixed function WINED3DFMT_B8G8R8A8_UNORM format\n"); } - else if (check_position && si->position_transformed) + else if (fixup_flags & WINED3D_BUFFER_FIXUP_XYZRHW && si->position_transformed) { if (format != WINED3DFMT_R32G32B32A32_FLOAT) { @@ -310,14 +310,9 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct win return ret; } -static BOOL buffer_find_decl(struct wined3d_buffer *This) +static BOOL buffer_find_decl(struct wined3d_buffer *This, const struct wined3d_stream_info *si, + DWORD fixup_flags) { - struct wined3d_device *device = This->resource.device; - const struct wined3d_adapter *adapter = device->adapter; - const struct wined3d_stream_info *si = &device->stream_info; - const struct wined3d_state *state = &device->state; - BOOL support_d3dcolor = adapter->gl_info.supported[ARB_VERTEX_ARRAY_BGRA]; - BOOL support_xyzrhw = adapter->d3d_info.xyzrhw; UINT stride_this_run = 0; BOOL ret = FALSE; @@ -330,9 +325,9 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) if(This->resource.usage & WINED3DUSAGE_STATICDECL) return FALSE; } - if (use_vs(state)) + if (!fixup_flags) { - TRACE("Vertex shaders used, no VBO conversion is needed\n"); + TRACE("No fixup required.\n"); if(This->conversion_map) { HeapFree(GetProcessHeap(), 0, This->conversion_map); @@ -391,29 +386,31 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) */ ret = buffer_check_attribute(This, si, WINED3D_FFP_POSITION, - TRUE, !support_xyzrhw, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; + fixup_flags &= ~WINED3D_BUFFER_FIXUP_XYZRHW; + ret = buffer_check_attribute(This, si, WINED3D_FFP_NORMAL, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_DIFFUSE, - !support_d3dcolor, FALSE, TRUE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_SPECULAR, - !support_d3dcolor, FALSE, TRUE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD0, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD1, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD2, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD3, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD4, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD5, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD6, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD7, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; if (!stride_this_run && This->conversion_map) { @@ -769,7 +766,17 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte /* Reading the declaration makes only sense if the stateblock is finalized and the buffer bound to a stream */ if (device->isInDraw && buffer->resource.bind_count > 0) { - decl_changed = buffer_find_decl(buffer); + DWORD fixup_flags = 0; + + if (!use_vs(&device->state)) + { + if (!context->gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) + fixup_flags |= WINED3D_BUFFER_FIXUP_D3DCOLOR; + if (!context->d3d_info->xyzrhw) + fixup_flags |= WINED3D_BUFFER_FIXUP_XYZRHW; + } + + decl_changed = buffer_find_decl(buffer, &device->stream_info, fixup_flags); buffer->flags |= WINED3D_BUFFER_HASDESC; }

1 0

Huw Davies : fonts: Add a few more glyphs in wingding.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: 66a4e6e33dec86c166c9ba0e1e32bcb9147a7455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66a4e6e33dec86c166c9ba0e1… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 12 12:34:07 2013 +0100 fonts: Add a few more glyphs in wingding. --- fonts/wingding.sfd | 449 +++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/wingding.ttf | Bin 4356 -> 6052 bytes 2 files changed, 445 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66a4e6e33dec86c166c9b…

1 0

Huw Davies : fonts: Fix glyph names and advance widths.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: 8460e6b3752e628cbaadadfe152cdf361e9b1f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8460e6b3752e628cbaadadfe1… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 12 12:34:06 2013 +0100 fonts: Fix glyph names and advance widths. --- fonts/wingding.sfd | 15 +++++++-------- fonts/wingding.ttf | Bin 4332 -> 4356 bytes 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/fonts/wingding.sfd b/fonts/wingding.sfd index 33573e5..4178988 100644 --- a/fonts/wingding.sfd +++ b/fonts/wingding.sfd @@ -13,7 +13,6 @@ Descent: 410 LayerCount: 2 Layer: 0 1 "Back" 1 Layer: 1 1 "Fore" 0 -NeedsXUIDChange: 1 FSType: 0 OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 @@ -75,9 +74,9 @@ SplineSet EndSplineSet EndChar -StartChar: ogonek +StartChar: boxcheckbld Encoding: 254 731 1 -Width: 1896 +Width: 1826 Flags: W LayerCount: 2 Fore @@ -104,9 +103,9 @@ SplineSet EndSplineSet EndChar -StartChar: registered +StartChar: box2 Encoding: 168 174 2 -Width: 1884 +Width: 1825 Flags: W LayerCount: 2 Fore @@ -124,10 +123,10 @@ SplineSet EndSplineSet EndChar -StartChar: G +StartChar: handptup Encoding: 71 71 3 -Width: 1581 -Flags: HW +Width: 1124 +Flags: W LayerCount: 2 Fore SplineSet diff --git a/fonts/wingding.ttf b/fonts/wingding.ttf index 0c963c0..2935d7d 100644 Binary files a/fonts/wingding.ttf and b/fonts/wingding.ttf differ

1 0

Piotr Caban : msvcrt: Add support for vtordisp functions demangling.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: 0df84ecf11cfeae695a95ba6887c69a02d67e186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df84ecf11cfeae695a95ba68… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 12 12:51:26 2013 +0200 msvcrt: Add support for vtordisp functions demangling. --- dlls/msvcrt/tests/cpp.c | 4 +++- dlls/msvcrt/undname.c | 42 +++++++++++++++++++++++++++++++++--------- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 3693014..fa6d4dd 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1309,7 +1309,9 @@ static void test_demangle(void) /* 122 */ {"?_R2@?BN@???$_Fabs@N@std@@YANAEBV?$complex@N@1@PEAH@Z@4NB", "double const `double __cdecl std::_Fabs<double>(class std::complex<double> const & __ptr64,int * __ptr64)'::`29'::_R2", "?_R2@?BN@???$_Fabs@N@std@@YANAEBV?$complex@N@1@PEAH@Z@4NB"}, - +/* 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"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index a997351..ec974a0 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -331,7 +331,7 @@ static const char* get_number(struct parsed_symbol* sym) if (*sym->current != '@') return NULL; ptr = und_alloc(sym, 17); - sprintf(ptr, "%s%d", sgn ? "-" : "", ret); + sprintf(ptr, "%s%u", sgn ? "-" : "", ret); sym->current++; } else return NULL; @@ -1103,13 +1103,24 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) * 'X' public: thunk * 'Y' * 'Z' + * "$0" private: thunk vtordisp + * "$1" private: thunk vtordisp + * "$2" protected: thunk vtordisp + * "$3" protected: thunk vtordisp + * "$4" public: thunk vtordisp + * "$5" public: thunk vtordisp */ accmem = *sym->current++; - if (accmem < 'A' || accmem > 'Z') goto done; + if (accmem == '$') + { + accmem = *sym->current++; + if (accmem < '0' || accmem > '5') goto done; + } + else if (accmem < 'A' || accmem > 'Z') goto done; if (!(sym->flags & UNDNAME_NO_ACCESS_SPECIFIERS)) { - switch ((accmem - 'A') / 8) + switch (accmem >= '0' && accmem <= '5' ? (accmem - '0') / 2 : (accmem - 'A') / 8) { case 0: access = "private: "; break; case 1: access = "protected: "; break; @@ -1118,7 +1129,12 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) } if (!(sym->flags & UNDNAME_NO_MEMBER_TYPE)) { - if (accmem <= 'X') + if (accmem >= '0' && accmem <= '5') + { + access = str_printf(sym, "[thunk]:%s", access); + member_type = "virtual "; + } + else if (accmem <= 'X') { switch ((accmem - 'A') % 8) { @@ -1134,7 +1150,15 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) name = get_class_string(sym, 0); - if ((accmem - 'A') % 8 == 6 || (accmem - '8') % 8 == 7) /* a thunk */ + if (accmem >= '0' && accmem <='5') /* vtordisp thunk */ + { + const char *n1 = get_number(sym); + const char *n2 = get_number(sym); + + if (!n1 || !n2) goto done; + name = str_printf(sym, "%s`vtordisp{%s,%s}' ", name, n1, n2); + } + 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') @@ -1194,7 +1218,7 @@ done: } /****************************************************************** - * handle_template + * handle_template * Does the final parsing and handling for a name with templates */ static BOOL handle_template(struct parsed_symbol* sym) @@ -1443,10 +1467,10 @@ 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 >= 'A' && *sym->current <= 'Z') - ret = handle_method(sym, do_after == 3); - else if (*sym->current == '$') + 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; done: if (ret) assert(sym->result);

1 0

Piotr Caban : msvcrt: Don't forward _wcsnicmp to ntdll.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: 2734ae07860b7c58d0d441155f1254f1c981e0df URL: http://source.winehq.org/git/wine.git/?a=commit;h=2734ae07860b7c58d0d441155… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 12 12:50:19 2013 +0200 msvcrt: Don't forward _wcsnicmp to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a8578bd..23d29a3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1112,7 +1112,7 @@ # stub _wcslwr_s_l(wstr long ptr) @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l -@ cdecl _wcsnicmp(wstr wstr long) ntdll._wcsnicmp +@ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp # stub _wcsnicmp_l(wstr wstr long ptr) @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll @ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a140e62..5f47ee5 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -86,6 +86,14 @@ INT CDECL MSVCRT__wcsicmp( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str } /********************************************************************* + * _wcsnicmp (MSVCRT.@) + */ +INT CDECL MSVCRT__wcsnicmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, INT n) +{ + return strncmpiW(str1, str2, n); +} + +/********************************************************************* * _wcsicoll_l (MSVCRT.@) */ int CDECL MSVCRT__wcsicoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, MSVCRT__locale_t locale)

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
65
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 September 2013