wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Akihiro Sagawa : msvcrt: Add semi stub _mbcjmstojis implementation.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 0800572257a1da4cb8a18c0017c3057e262903aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=0800572257a1da4cb8a18c001… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 15 23:41:30 2012 +0900 msvcrt: Add semi stub _mbcjmstojis implementation. --- dlls/msvcrt/mbcs.c | 17 +++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index a8cd237..cde1e06 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -464,6 +464,23 @@ unsigned int CDECL _mbcjistojms(unsigned int c) } /********************************************************************* + * _mbcjmstojis(MSVCRT.@) + * + * Converts a sjis character to jis. + */ +unsigned int CDECL _mbcjmstojis(unsigned int c) +{ + /* Conversion takes place only when codepage is 932. + In all other cases, c is returned unchanged */ + if(get_mbcinfo()->mbcodepage == 932) + { + FIXME("(%x): stub\n", c); + } + + return c; +} + +/********************************************************************* * _mbsdec(MSVCRT.@) */ unsigned char* CDECL _mbsdec(const unsigned char* start, const unsigned char* cur) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 393939e..04ef9ad 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -664,7 +664,7 @@ # stub _mbccpy_s_l(ptr long ptr str ptr) @ cdecl _mbcjistojms (long) # stub _mbcjistojms_l(long ptr) -@ stub _mbcjmstojis(long) +@ cdecl _mbcjmstojis(long) # stub _mbcjmstojis_l(long ptr) @ cdecl _mbclen(ptr) # stub _mbclen_l(ptr ptr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 8aa7a81..659afc2 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -880,6 +880,38 @@ static void test_mbcjisjms(void) } while(jisjms[i++][0] != 0); } +static void test_mbcjmsjis(void) +{ + /* List of value-pairs to test. The test assumes the last pair to be {0, ..} */ + unsigned int jmsjis[][2] = { {0x80fc, 0}, {0x813f, 0}, {0x8140, 0x2121}, + {0x817e, 0x215f}, {0x817f, 0}, {0x8180, 0x2160}, + {0x819e, 0x217e}, {0x819f, 0x2221}, {0x81fc, 0x227e}, + {0x81fd, 0}, {0x9ffc, 0x5e7e}, {0x9ffd, 0}, + {0xa040, 0}, {0xdffc, 0}, {0xe040, 0x5f21}, + {0xeffc, 0x7e7e}, {0xf040, 0}, {0x21, 0}, {0, 0}}; + int cp[] = { 932, 936, 939, 950, 1361, _MB_CP_SBCS }; + unsigned int i, j; + int prev_cp = _getmbcp(); + + for (i = 0; i < sizeof(cp)/sizeof(cp[0]); i++) + { + _setmbcp(cp[i]); + for (j = 0; jmsjis[j][0] != 0; j++) + { + unsigned int ret, exp; + ret = _mbcjmstojis(jmsjis[j][0]); + exp = (cp[i] == 932) ? jmsjis[j][1] : jmsjis[j][0]; + if (cp[i] == 932) + todo_wine ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n", + exp, ret, jmsjis[j][0], cp[i]); + else + ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n", + exp, ret, jmsjis[j][0], cp[i]); + } + } + _setmbcp(prev_cp); +} + static void test_mbctombb(void) { static const unsigned int mbcmbb_932[][2] = { @@ -2105,6 +2137,7 @@ START_TEST(string) test_strcat_s(); test__mbsnbcpy_s(); test_mbcjisjms(); + test_mbcjmsjis(); test_mbctombb(); test_ismbclegal(); test_strtok();

1 0

Henri Verbeet : ddraw: Get rid of IDirect3DMaterialImpl.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: fefb5a943d60b5f98f33162f7ce53fc5ec72e1ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=fefb5a943d60b5f98f33162f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 15 21:49:58 2012 +0100 ddraw: Get rid of IDirect3DMaterialImpl. --- dlls/ddraw/ddraw.c | 6 +- dlls/ddraw/ddraw_private.h | 11 +- dlls/ddraw/device.c | 4 +- dlls/ddraw/executebuffer.c | 2 +- dlls/ddraw/material.c | 278 +++++++++++++++++++++---------------------- dlls/ddraw/viewport.c | 2 +- 6 files changed, 147 insertions(+), 156 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fefb5a943d60b5f98f331…

1 0

Henri Verbeet : wined3d: Move the WGL extension detection code to the same place as regular GL extension detection .
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: a0264eb101ec38fdebc32673ef3d6a55c58b8399 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0264eb101ec38fdebc32673e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 15 21:49:57 2012 +0100 wined3d: Move the WGL extension detection code to the same place as regular GL extension detection. --- dlls/wined3d/directx.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f36c6ad..a00a42c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2452,6 +2452,16 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) /* Now work out what GL support this card really has */ load_gl_funcs( gl_info, gl_version ); + hdc = pwglGetCurrentDC(); + /* Not all GL drivers might offer WGL extensions e.g. VirtualBox. */ + if (GL_EXTCALL(wglGetExtensionsStringARB)) + WGL_Extensions = GL_EXTCALL(wglGetExtensionsStringARB(hdc)); + if (!WGL_Extensions) + WARN_(d3d_caps)("WGL extensions not supported.\n"); + else + parse_extension_string(gl_info, WGL_Extensions, wgl_extension_map, + sizeof(wgl_extension_map) / sizeof(*wgl_extension_map)); + ENTER_GL(); /* Now mark all the extensions supported which are included in the opengl core version. Do this *after* @@ -2843,16 +2853,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP] = gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; - hdc = pwglGetCurrentDC(); - /* Not all GL drivers might offer WGL extensions e.g. VirtualBox. */ - if (GL_EXTCALL(wglGetExtensionsStringARB)) - WGL_Extensions = GL_EXTCALL(wglGetExtensionsStringARB(hdc)); - if (!WGL_Extensions) - WARN_(d3d_caps)("WGL extensions not supported.\n"); - else - parse_extension_string(gl_info, WGL_Extensions, wgl_extension_map, - sizeof(wgl_extension_map) / sizeof(*wgl_extension_map)); - fixup_extensions(gl_info, gl_renderer_str, gl_vendor, card_vendor, device); init_driver_info(driver_info, card_vendor, device); add_gl_compat_wrappers(gl_info);

1 0

Henri Verbeet : wined3d: Use the same code for parsing the WGL extension string as for the regular GL extension string .
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: bb08fafdf0f2c0e4f8e98ec8b9f0e22922c87e13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb08fafdf0f2c0e4f8e98ec8b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 15 21:49:56 2012 +0100 wined3d: Use the same code for parsing the WGL extension string as for the regular GL extension string. --- dlls/wined3d/directx.c | 72 ++++++++++++++--------------------------------- 1 files changed, 22 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d63abf5..f36c6ad 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -79,7 +79,7 @@ struct wined3d_extension_map DWORD version; }; -static const struct wined3d_extension_map EXTENSION_MAP[] = +static const struct wined3d_extension_map gl_extension_map[] = { /* APPLE */ {"GL_APPLE_client_storage", APPLE_CLIENT_STORAGE, 0 }, @@ -200,6 +200,13 @@ static const struct wined3d_extension_map EXTENSION_MAP[] = {"GL_SGIS_generate_mipmap", SGIS_GENERATE_MIPMAP, 0 }, }; +static const struct wined3d_extension_map wgl_extension_map[] = +{ + {"WGL_ARB_pixel_format", WGL_ARB_PIXEL_FORMAT, 0 }, + {"WGL_EXT_swap_control", WGL_EXT_SWAP_CONTROL, 0 }, + {"WGL_WINE_pixel_format_passthrough", WGL_WINE_PIXEL_FORMAT_PASSTHROUGH, 0 }, +}; + /********************************************************** * Utility functions follow **********************************************************/ @@ -447,10 +454,11 @@ static inline BOOL test_arb_vs_offset_limit(const struct wined3d_gl_info *gl_inf static DWORD ver_for_ext(enum wined3d_gl_extension ext) { unsigned int i; - for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) { - if(EXTENSION_MAP[i].extension == ext) { - return EXTENSION_MAP[i].version; - } + + for (i = 0; i < (sizeof(gl_extension_map) / sizeof(*gl_extension_map)); ++i) + { + if (gl_extension_map[i].extension == ext) + return gl_extension_map[i].version; } return 0; } @@ -2346,7 +2354,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) unsigned i; HDC hdc; DWORD gl_version; - size_t len; TRACE_(d3d_caps)("(%p)\n", gl_info); @@ -2439,7 +2446,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->supported[WINED3D_GL_EXT_NONE] = TRUE; - parse_extension_string(gl_info, GL_Extensions, EXTENSION_MAP, sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); + parse_extension_string(gl_info, GL_Extensions, gl_extension_map, + sizeof(gl_extension_map) / sizeof(*gl_extension_map)); /* Now work out what GL support this card really has */ load_gl_funcs( gl_info, gl_version ); @@ -2449,13 +2457,13 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) /* Now mark all the extensions supported which are included in the opengl core version. Do this *after* * loading the functions, otherwise the code above will load the extension entry points instead of the * core functions, which may not work. */ - for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) + for (i = 0; i < (sizeof(gl_extension_map) / sizeof(*gl_extension_map)); ++i) { - if (!gl_info->supported[EXTENSION_MAP[i].extension] - && EXTENSION_MAP[i].version <= gl_version && EXTENSION_MAP[i].version) + if (!gl_info->supported[gl_extension_map[i].extension] + && gl_extension_map[i].version <= gl_version && gl_extension_map[i].version) { - TRACE_(d3d_caps)(" GL CORE: %s support.\n", EXTENSION_MAP[i].extension_string); - gl_info->supported[EXTENSION_MAP[i].extension] = TRUE; + TRACE_(d3d_caps)(" GL CORE: %s support.\n", gl_extension_map[i].extension_string); + gl_info->supported[gl_extension_map[i].extension] = TRUE; } } @@ -2842,44 +2850,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) if (!WGL_Extensions) WARN_(d3d_caps)("WGL extensions not supported.\n"); else - { - TRACE_(d3d_caps)("WGL_Extensions reported:\n"); - while (*WGL_Extensions) - { - const char *start; - char current_ext[256]; - - while (isspace(*WGL_Extensions)) - ++WGL_Extensions; - start = WGL_Extensions; - while (!isspace(*WGL_Extensions) && *WGL_Extensions) - ++WGL_Extensions; - - len = WGL_Extensions - start; - if (!len || len >= sizeof(current_ext)) - continue; - - memcpy(current_ext, start, len); - current_ext[len] = '\0'; - TRACE_(d3d_caps)("- %s\n", debugstr_a(current_ext)); - - if (!strcmp(current_ext, "WGL_ARB_pixel_format")) - { - gl_info->supported[WGL_ARB_PIXEL_FORMAT] = TRUE; - TRACE_(d3d_caps)("FOUND: WGL_ARB_pixel_format support\n"); - } - if (!strcmp(current_ext, "WGL_EXT_swap_control")) - { - gl_info->supported[WGL_EXT_SWAP_CONTROL] = TRUE; - TRACE_(d3d_caps)("FOUND: WGL_EXT_swap_control support\n"); - } - if (!strcmp(current_ext, "WGL_WINE_pixel_format_passthrough")) - { - gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH] = TRUE; - TRACE_(d3d_caps)("FOUND: WGL_WINE_pixel_format_passthrough support\n"); - } - } - } + parse_extension_string(gl_info, WGL_Extensions, wgl_extension_map, + sizeof(wgl_extension_map) / sizeof(*wgl_extension_map)); fixup_extensions(gl_info, gl_renderer_str, gl_vendor, card_vendor, device); init_driver_info(driver_info, card_vendor, device);

1 0

Henri Verbeet : wined3d: Introduce a separate function for parsing the GL extension string.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 00ba167c71b63bc356e05cdfef87108a688b13a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ba167c71b63bc356e05cdfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 15 21:49:55 2012 +0100 wined3d: Introduce a separate function for parsing the GL extension string. --- dlls/wined3d/directx.c | 66 ++++++++++++++++++++++++++++------------------- 1 files changed, 39 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 92a2298..d63abf5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -72,13 +72,14 @@ enum wined3d_gl_vendor static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } }; /* Extension detection */ -static const struct +struct wined3d_extension_map { const char *extension_string; enum wined3d_gl_extension extension; DWORD version; -} -EXTENSION_MAP[] = +}; + +static const struct wined3d_extension_map EXTENSION_MAP[] = { /* APPLE */ {"GL_APPLE_client_storage", APPLE_CLIENT_STORAGE, 0 }, @@ -2277,6 +2278,40 @@ static const struct blit_shader *select_blit_implementation(const struct wined3d else return &ffp_blit; } +static void parse_extension_string(struct wined3d_gl_info *gl_info, const char *extensions, + const struct wined3d_extension_map *map, UINT entry_count) +{ + while (*extensions) + { + const char *start; + size_t len; + UINT i; + + while (isspace(*extensions)) + ++extensions; + start = extensions; + while (!isspace(*extensions) && *extensions) + ++extensions; + + len = extensions - start; + if (!len) + continue; + + TRACE_(d3d_caps)("- %s\n", debugstr_an(start, len)); + + for (i = 0; i < entry_count; ++i) + { + if (len == strlen(map[i].extension_string) + && !memcmp(start, map[i].extension_string, len)) + { + TRACE_(d3d_caps)(" FOUND: %s support.\n", map[i].extension_string); + gl_info->supported[map[i].extension] = TRUE; + break; + } + } + } +} + static void load_gl_funcs(struct wined3d_gl_info *gl_info, DWORD gl_version) { DWORD ver; @@ -2404,30 +2439,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->supported[WINED3D_GL_EXT_NONE] = TRUE; - while (*GL_Extensions) - { - const char *start; - - while (isspace(*GL_Extensions)) ++GL_Extensions; - start = GL_Extensions; - while (!isspace(*GL_Extensions) && *GL_Extensions) ++GL_Extensions; - - len = GL_Extensions - start; - if (!len) continue; - - TRACE_(d3d_caps)("- %s\n", debugstr_an(start, len)); - - for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) - { - if (len == strlen(EXTENSION_MAP[i].extension_string) - && !memcmp(start, EXTENSION_MAP[i].extension_string, len)) - { - TRACE_(d3d_caps)(" FOUND: %s support.\n", EXTENSION_MAP[i].extension_string); - gl_info->supported[EXTENSION_MAP[i].extension] = TRUE; - break; - } - } - } + parse_extension_string(gl_info, GL_Extensions, EXTENSION_MAP, sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); /* Now work out what GL support this card really has */ load_gl_funcs( gl_info, gl_version );

1 0

Henri Verbeet : wined3d: The current WGL DC should never be NULL in wined3d_adapter_init_gl_caps().
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 02ae22d984b95b0f25ba83821030d37f1a7bd968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ae22d984b95b0f25ba83821… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 15 21:49:54 2012 +0100 wined3d: The current WGL DC should never be NULL in wined3d_adapter_init_gl_caps(). --- dlls/wined3d/directx.c | 73 +++++++++++++++++++++++------------------------ 1 files changed, 36 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5c46d07..92a2298 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2823,49 +2823,48 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP] = gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; - /* Make sure there's an active HDC else the WGL extensions will fail */ hdc = pwglGetCurrentDC(); - if (hdc) { - /* Not all GL drivers might offer WGL extensions e.g. VirtualBox */ - if(GL_EXTCALL(wglGetExtensionsStringARB)) - WGL_Extensions = GL_EXTCALL(wglGetExtensionsStringARB(hdc)); - - if (!WGL_Extensions) - { - ERR(" WGL_Extensions returns NULL\n"); - } - else + /* Not all GL drivers might offer WGL extensions e.g. VirtualBox. */ + if (GL_EXTCALL(wglGetExtensionsStringARB)) + WGL_Extensions = GL_EXTCALL(wglGetExtensionsStringARB(hdc)); + if (!WGL_Extensions) + WARN_(d3d_caps)("WGL extensions not supported.\n"); + else + { + TRACE_(d3d_caps)("WGL_Extensions reported:\n"); + while (*WGL_Extensions) { - TRACE_(d3d_caps)("WGL_Extensions reported:\n"); - while (*WGL_Extensions) - { - const char *Start; - char ThisExtn[256]; + const char *start; + char current_ext[256]; - while (isspace(*WGL_Extensions)) WGL_Extensions++; - Start = WGL_Extensions; - while (!isspace(*WGL_Extensions) && *WGL_Extensions) ++WGL_Extensions; + while (isspace(*WGL_Extensions)) + ++WGL_Extensions; + start = WGL_Extensions; + while (!isspace(*WGL_Extensions) && *WGL_Extensions) + ++WGL_Extensions; - len = WGL_Extensions - Start; - if (!len || len >= sizeof(ThisExtn)) - continue; + len = WGL_Extensions - start; + if (!len || len >= sizeof(current_ext)) + continue; - memcpy(ThisExtn, Start, len); - ThisExtn[len] = '\0'; - TRACE_(d3d_caps)("- %s\n", debugstr_a(ThisExtn)); + memcpy(current_ext, start, len); + current_ext[len] = '\0'; + TRACE_(d3d_caps)("- %s\n", debugstr_a(current_ext)); - if (!strcmp(ThisExtn, "WGL_ARB_pixel_format")) { - gl_info->supported[WGL_ARB_PIXEL_FORMAT] = TRUE; - TRACE_(d3d_caps)("FOUND: WGL_ARB_pixel_format support\n"); - } - if (!strcmp(ThisExtn, "WGL_EXT_swap_control")) { - gl_info->supported[WGL_EXT_SWAP_CONTROL] = TRUE; - TRACE_(d3d_caps)("FOUND: WGL_EXT_swap_control support\n"); - } - if (!strcmp(ThisExtn, "WGL_WINE_pixel_format_passthrough")) { - gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH] = TRUE; - TRACE_(d3d_caps)("FOUND: WGL_WINE_pixel_format_passthrough support\n"); - } + if (!strcmp(current_ext, "WGL_ARB_pixel_format")) + { + gl_info->supported[WGL_ARB_PIXEL_FORMAT] = TRUE; + TRACE_(d3d_caps)("FOUND: WGL_ARB_pixel_format support\n"); + } + if (!strcmp(current_ext, "WGL_EXT_swap_control")) + { + gl_info->supported[WGL_EXT_SWAP_CONTROL] = TRUE; + TRACE_(d3d_caps)("FOUND: WGL_EXT_swap_control support\n"); + } + if (!strcmp(current_ext, "WGL_WINE_pixel_format_passthrough")) + { + gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH] = TRUE; + TRACE_(d3d_caps)("FOUND: WGL_WINE_pixel_format_passthrough support\n"); } } }

1 0

Alexandre Julliard : msvcrt: Add entry points for the C++ exception functions on x86_64.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 881374ee962bd73ba2df71b678983baa0a88610d URL: http://source.winehq.org/git/wine.git/?a=commit;h=881374ee962bd73ba2df71b67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 13 15:50:40 2012 +0100 msvcrt: Add entry points for the C++ exception functions on x86_64. --- dlls/msvcr100/msvcr100.spec | 12 +++--- dlls/msvcr70/msvcr70.spec | 6 ++-- dlls/msvcr71/msvcr71.spec | 8 ++-- dlls/msvcr80/msvcr80.spec | 12 +++--- dlls/msvcr90/msvcr90.spec | 12 +++--- dlls/msvcrt/except_x86_64.c | 77 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 12 +++--- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 10 files changed, 111 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=881374ee962bd73ba2df7…

1 0

Alexandre Julliard : msvcrt: Add a new file for the x86_64 exception handling.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: b8467c5f69abd9a5f8daef3da5680544d8b30323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8467c5f69abd9a5f8daef3da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 13 15:40:27 2012 +0100 msvcrt: Add a new file for the x86_64 exception handling. --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/except.c | 97 ------------------------------- dlls/msvcrt/except_x86_64.c | 135 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 136 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8467c5f69abd9a5f8dae…

1 0

Alexandre Julliard : msvcrt: Move more i386-specific exception code to except_i386.c.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 89b2dd08ffb16d92da900f0682fdca81ec79e790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b2dd08ffb16d92da900f068… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 13 15:24:18 2012 +0100 msvcrt: Move more i386-specific exception code to except_i386.c. --- dlls/msvcrt/cppexcept.h | 61 +----- dlls/msvcrt/except.c | 489 +----------------------------------------- dlls/msvcrt/except_i386.c | 536 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 542 insertions(+), 544 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89b2dd08ffb16d92da900…

1 0

Alexandre Julliard : msvcrt: Create an i386-specific file for exception handling.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: aba6423b830939ad98f755f2a54104626483db9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba6423b830939ad98f755f2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 13 15:10:15 2012 +0100 msvcrt: Create an i386-specific file for exception handling. --- dlls/msvcrt/Makefile.in | 2 +- dlls/msvcrt/cpp.c | 14 ++++++++++++++ dlls/msvcrt/{cppexcept.c => except_i386.c} | 22 ++++------------------ dlls/msvcrt/msvcrt.spec | 8 ++++---- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index 1f4860a..ba8cdbb 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -6,13 +6,13 @@ DELAYIMPORTS = advapi32 user32 C_SRCS = \ console.c \ cpp.c \ - cppexcept.c \ ctype.c \ data.c \ dir.c \ environ.c \ errno.c \ except.c \ + except_i386.c \ exit.c \ file.c \ heap.c \ diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index d5c0c64..dc609c1 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1270,3 +1270,17 @@ void* CDECL MSVCRT___RTCastToVoid(void *cppobj) __ENDTRY return ret; } + + +/********************************************************************* + * _CxxThrowException (MSVCRT.@) + */ +void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type ) +{ + ULONG_PTR args[3]; + + args[0] = CXX_FRAME_MAGIC_VC6; + args[1] = (ULONG_PTR)object; + args[2] = (ULONG_PTR)type; + RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 3, args ); +} diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/except_i386.c similarity index 97% rename from dlls/msvcrt/cppexcept.c rename to dlls/msvcrt/except_i386.c index 18e5aa0..c95f49b 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/except_i386.c @@ -26,6 +26,8 @@ #include "config.h" #include "wine/port.h" +#ifdef __i386__ + #include <stdarg.h> #include "windef.h" @@ -38,8 +40,6 @@ #include "cppexcept.h" -#ifdef __i386__ /* CxxFrameHandler is not supported on non-i386 */ - WINE_DEFAULT_DEBUG_CHANNEL(seh); DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, @@ -455,9 +455,6 @@ void __stdcall __CxxLongjmpUnwind( const struct MSVCRT___JUMP_BUFFER *buf ) cxx_local_unwind( frame, descr, buf->TryLevel ); } -#endif /* __i386__ */ - - /********************************************************************* * __CppXcptFilter (MSVCRT.@) */ @@ -469,19 +466,6 @@ int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) } /********************************************************************* - * _CxxThrowException (MSVCRT.@) - */ -void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type ) -{ - ULONG_PTR args[3]; - - args[0] = CXX_FRAME_MAGIC_VC6; - args[1] = (ULONG_PTR)object; - args[2] = (ULONG_PTR)type; - RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 3, args ); -} - -/********************************************************************* * __CxxDetectRethrow (MSVCRT.@) */ BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) @@ -511,3 +495,5 @@ unsigned int CDECL __CxxQueryExceptionSize(void) { return sizeof(cxx_exception_type); } + +#endif /* __i386__ */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1260dfa..c893382 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -145,18 +145,18 @@ @ extern _HUGE MSVCRT__HUGE @ cdecl _Strftime(str long str ptr ptr) @ cdecl _XcptFilter(long ptr) -@ cdecl __CppXcptFilter(long ptr) +@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ cdecl -i386 __CppXcptFilter(long ptr) # stub __CxxCallUnwindDelDtor # stub __CxxCallUnwindDtor # stub __CxxCallUnwindVecDtor -@ cdecl __CxxDetectRethrow(ptr) +@ cdecl -i386 __CxxDetectRethrow(ptr) # stub __CxxExceptionFilter @ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) @ cdecl -i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler @ cdecl -i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ stdcall -i386 __CxxLongjmpUnwind(ptr) -@ cdecl __CxxQueryExceptionSize() +@ cdecl -i386 __CxxQueryExceptionSize() # stub __CxxRegisterExceptionObject # stub __CxxUnregisterExceptionObject # stub __DestructExceptionObject

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
71
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 March 2012