March 2012 - Wine-commits - list.winehq.org

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: 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: 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 : 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

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

Akihiro Sagawa : msvcrt: Implement _mbcjmstojis.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: c9f1489cab159c882b7110fa8475d86a5b849124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f1489cab159c882b7110fa8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 15 23:41:33 2012 +0900 msvcrt: Implement _mbcjmstojis. --- dlls/msvcrt/mbcs.c | 18 +++++++++++++++++- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/tests/string.c | 8 ++------ 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index cde1e06..6d3e3fb 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -474,7 +474,23 @@ unsigned int CDECL _mbcjmstojis(unsigned int c) In all other cases, c is returned unchanged */ if(get_mbcinfo()->mbcodepage == 932) { - FIXME("(%x): stub\n", c); + if(_ismbclegal(c) && HIBYTE(c) < 0xf0) + { + if(HIBYTE(c) >= 0xe0) + c -= 0x4000; + + c = (((HIBYTE(c) - 0x81)*2 + 0x21) << 8) | LOBYTE(c); + + if(LOBYTE(c) > 0x7f) + c -= 0x1; + + if(LOBYTE(c) > 0x9d) + c += 0x83; + else + c -= 0x1f; + } + else + return 0; /* Codepage is 932, but c can't be converted */ } return c; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 76f558c..6103c1e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -913,6 +913,7 @@ int _setmbcp_l(int, LCID, MSVCRT_pthreadmbcinfo) DECLSPEC_HIDDEN; int __cdecl MSVCRT__write(int,const void*,unsigned int); int __cdecl _getch(void); int __cdecl _ismbblead(unsigned int); +int __cdecl _ismbclegal(unsigned int c); int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); MSVCRT_size_t __cdecl MSVCRT_mbstowcs(MSVCRT_wchar_t*,const char*,MSVCRT_size_t); MSVCRT_intptr_t __cdecl MSVCRT__spawnve(int,const char*,const char* const *,const char* const *); diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 659afc2..c40451c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -901,12 +901,8 @@ static void test_mbcjmsjis(void) 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]); + ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n", + exp, ret, jmsjis[j][0], cp[i]); } } _setmbcp(prev_cp);

1 0

Francois Gouget : mssign32: Add a trailing '\n' to a few FIXME() messages.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: a364a2f06799ac02aac25a769e30795fbfda619c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a364a2f06799ac02aac25a769… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 16 10:16:05 2012 +0100 mssign32: Add a trailing '\n' to a few FIXME() messages. --- dlls/mssign32/mssign32_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c index c58c1f0..ef1065f 100644 --- a/dlls/mssign32/mssign32_main.c +++ b/dlls/mssign32/mssign32_main.c @@ -50,7 +50,7 @@ HRESULT WINAPI PvkGetCryptProv(HWND hwnd, LPCWSTR pwszCaption, LPCWSTR pwszCapiP DWORD dwProviderType, LPCWSTR pwszPvkFile, LPCWSTR pwszKeyContainerName, DWORD *pdwKeySpec, LPWSTR *ppwszTmpContainer, HCRYPTPROV *phCryptProv) { - FIXME("%p %s %s %d %s %s %p %p %p stub", hwnd, debugstr_w(pwszCaption), debugstr_w(pwszCapiProvider), + FIXME("%p %s %s %d %s %s %p %p %p stub\n", hwnd, debugstr_w(pwszCaption), debugstr_w(pwszCapiProvider), dwProviderType, debugstr_w(pwszPvkFile), debugstr_w(pwszKeyContainerName), pdwKeySpec, ppwszTmpContainer, phCryptProv); @@ -61,7 +61,7 @@ BOOL WINAPI PvkPrivateKeyAcquireContextFromMemory(LPCWSTR pwszProvName, DWORD dw BYTE *pbData, DWORD cbData, HWND hwndOwner, LPCWSTR pwszKeyName, DWORD *pdwKeySpec, HCRYPTPROV *phCryptProv, LPWSTR *ppwszTmpContainer) { - FIXME("%s %d %p %d %p %s %p %p %p stub", debugstr_w(pwszProvName), dwProvType, + FIXME("%s %d %p %d %p %s %p %p %p stub\n", debugstr_w(pwszProvName), dwProvType, pbData, cbData, hwndOwner, debugstr_w(pwszKeyName), pdwKeySpec, phCryptProv, ppwszTmpContainer); @@ -71,6 +71,6 @@ BOOL WINAPI PvkPrivateKeyAcquireContextFromMemory(LPCWSTR pwszProvName, DWORD dw void WINAPI PvkFreeCryptProv(HCRYPTPROV hProv, LPCWSTR pwszCapiProvider, DWORD dwProviderType, LPWSTR pwszTmpContainer) { - FIXME("%08lx %s %d %s stub", hProv, debugstr_w(pwszCapiProvider), dwProviderType, + FIXME("%08lx %s %d %s stub\n", hProv, debugstr_w(pwszCapiProvider), dwProviderType, debugstr_w(pwszTmpContainer)); }

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: fbe6723391ed34664ac6f422190c2e2ccb438586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe6723391ed34664ac6f4221… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Mar 15 22:54:46 2012 +0900 po: Update Korean translation. --- po/ko.po | 27 +++++++-------------------- 1 files changed, 7 insertions(+), 20 deletions(-) diff --git a/po/ko.po b/po/ko.po index 8195586..e3f1ed2 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2182,16 +2182,12 @@ msgstr "" "목록을 가지고 있을 수 있음:" #: cryptui.rc:296 -#, fuzzy -#| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" -msgstr "암호화 메세지 문법 표준/PKCS #7 메시지 (.p7b)" +msgstr "암호화 메세지 문법 표준/PKCS #7 메시지 (*.p7b)" #: cryptui.rc:298 -#, fuzzy -#| msgid "Personal Information Exchange/PKCS #12 (.pfx, .p12)" msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" -msgstr "개인 정보 교환/PKCS #12 (.pfx, .p12)" +msgstr "개인 정보 교환/PKCS #12 (*.pfx;*.p12)" #: cryptui.rc:300 cryptui.rc:78 cryptui.rc:159 msgid "Microsoft Serialized Certificate Store (*.sst)" @@ -2332,32 +2328,24 @@ msgid "Select the format you want to use:" msgstr "사용할 파일 형식 선택:" #: cryptui.rc:405 -#, fuzzy -#| msgid "&DER-encoded X.509 (.cer)" msgid "&DER-encoded X.509 (*.cer)" -msgstr "&DER-암호화된 X.509 (.cer)" +msgstr "&DER-암호화된 X.509 (*.cer)" #: cryptui.rc:407 -#, fuzzy -#| msgid "Ba&se64-encoded X.509 (.cer):" msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64-암호화된 X.509 (.cer):" +msgstr "Ba&se64-암호화된 X.509 (*.cer):" #: cryptui.rc:409 -#, fuzzy -#| msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" -msgstr "암호 메시지 문법 표준/PKCS #7 메시지(&C) (.p7b)" +msgstr "암호 메시지 문법 표준/PKCS #7 메시지(&C) (*.p7b)" #: cryptui.rc:411 msgid "&Include all certificates in the certification path if possible" msgstr "가능한 인증서 경로에 있는 모든 인증서 포함(&I)" #: cryptui.rc:413 -#, fuzzy -#| msgid "&Personal Information Exchange/PKCS #12 (.pfx)" msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" -msgstr "개인 정보 교환(&P)/PKCS #12 (.pfx)" +msgstr "개인 정보 교환(&P)/PKCS #12 (*.pfx)" #: cryptui.rc:415 msgid "Incl&ude all certificates in the certification path if possible" @@ -12648,9 +12636,8 @@ msgid "Select an executable file" msgstr "실행 파일 선택" #: winecfg.rc:66 -#, fuzzy msgid "Autodetect" -msgstr "자동찾기(&D)" +msgstr "자동으로 찾기" #: winecfg.rc:67 msgid "Local hard disk"

1 0

Erich Hoover : ntdll: Fix mapping sections for applications that map over the section headers.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 3dd58d8bfbf266430130f49dd223e284e628b4bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd58d8bfbf266430130f49dd… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Mar 7 15:22:07 2012 -0700 ntdll: Fix mapping sections for applications that map over the section headers. --- dlls/ntdll/virtual.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 717917d..5271d18 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1122,7 +1122,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz { IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; - IMAGE_SECTION_HEADER *sec; + IMAGE_SECTION_HEADER *sec = NULL; IMAGE_DATA_DIRECTORY *imports; NTSTATUS status = STATUS_CONFLICTING_ADDRESSES; int i; @@ -1130,7 +1130,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz sigset_t sigset; struct stat st; struct file_view *view = NULL; - char *ptr, *header_end; + char *ptr, *header_end, *header_start; INT_PTR delta = 0; /* zero-map the whole range */ @@ -1167,8 +1167,17 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz header_end = ptr + ROUND_SIZE( 0, header_size ); memset( ptr + header_size, 0, header_end - (ptr + header_size) ); if ((char *)(nt + 1) > header_end) goto error; - sec = (IMAGE_SECTION_HEADER*)((char*)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader); - if ((char *)(sec + nt->FileHeader.NumberOfSections) > header_end) goto error; + header_start = (char*)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader; + if (header_start + sizeof(*sec) * nt->FileHeader.NumberOfSections > header_end) goto error; + /* Some applications (e.g. the Steam version of Borderlands) map over the top of the section headers, + * copying the headers into local memory is necessary to properly load such applications. */ + sec = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*sec) * nt->FileHeader.NumberOfSections); + if (!sec) + { + status = STATUS_NO_MEMORY; + goto error; + } + memcpy(sec, header_start, sizeof(*sec) * nt->FileHeader.NumberOfSections); imports = nt->OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_IMPORT; if (!imports->Size || !imports->VirtualAddress) imports = NULL; @@ -1364,6 +1373,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz } done: + RtlFreeHeap( GetProcessHeap(), 0, sec ); view->mapping = dup_mapping; view->map_protect = map_vprot; server_leave_uninterrupted_section( &csVirtual, &sigset ); @@ -1376,6 +1386,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz return STATUS_SUCCESS; error: + RtlFreeHeap( GetProcessHeap(), 0, sec ); if (view) delete_view( view ); server_leave_uninterrupted_section( &csVirtual, &sigset ); if (dup_mapping) NtClose( dup_mapping );

1 0

Carlo Bramini : shlwapi: Implemented StrToInt64ExA/W.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: a1af8395165a85c086745dd224f105c07c983fdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1af8395165a85c086745dd22… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Thu Mar 8 14:35:56 2012 +0100 shlwapi: Implemented StrToInt64ExA/W. --- dlls/shlwapi/shlwapi.spec | 2 + dlls/shlwapi/string.c | 42 ++++++++++++++++-- dlls/shlwapi/tests/string.c | 99 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 133 insertions(+), 10 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index deb8a48..40e2ee9 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -804,6 +804,8 @@ @ stdcall StrStrNW(wstr wstr long) @ stdcall StrStrNIW(wstr wstr long) @ stdcall StrStrW(wstr wstr) +@ stdcall StrToInt64ExA(str long ptr) +@ stdcall StrToInt64ExW(wstr long ptr) @ stdcall StrToIntA(str) @ stdcall StrToIntExA(str long ptr) @ stdcall StrToIntExW(wstr long ptr) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 903c981..c65d576 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -91,7 +91,7 @@ static void FillNumberFmt(NUMBERFMTW *fmt, LPWSTR decimal_buffer, int decimal_bu * Format an integer according to the current locale * * RETURNS - * The number of bytes written on success or 0 on failure + * The number of characters written on success or 0 on failure */ static int FormatInt(LONGLONG qdwValue, LPWSTR pszBuf, int cchBuf) { @@ -124,7 +124,7 @@ static int FormatInt(LONGLONG qdwValue, LPWSTR pszBuf, int cchBuf) * after the decimal point * * RETURNS - * The number of bytes written on success or 0 on failure + * The number of characters written on success or 0 on failure */ static int FormatDouble(double value, int decimals, LPWSTR pszBuf, int cchBuf) { @@ -855,8 +855,25 @@ int WINAPI StrToIntW(LPCWSTR lpszStr) */ BOOL WINAPI StrToIntExA(LPCSTR lpszStr, DWORD dwFlags, LPINT lpiRet) { + LONGLONG li; + BOOL bRes; + + TRACE("(%s,%08X,%p)\n", debugstr_a(lpszStr), dwFlags, lpiRet); + + bRes = StrToInt64ExA(lpszStr, dwFlags, &li); + if (bRes) *lpiRet = li; + return bRes; +} + +/************************************************************************* + * StrToInt64ExA [SHLWAPI.@] + * + * See StrToIntExA. + */ +BOOL WINAPI StrToInt64ExA(LPCSTR lpszStr, DWORD dwFlags, LONGLONG *lpiRet) +{ BOOL bNegative = FALSE; - int iRet = 0; + LONGLONG iRet = 0; TRACE("(%s,%08X,%p)\n", debugstr_a(lpszStr), dwFlags, lpiRet); @@ -922,8 +939,25 @@ BOOL WINAPI StrToIntExA(LPCSTR lpszStr, DWORD dwFlags, LPINT lpiRet) */ BOOL WINAPI StrToIntExW(LPCWSTR lpszStr, DWORD dwFlags, LPINT lpiRet) { + LONGLONG li; + BOOL bRes; + + TRACE("(%s,%08X,%p)\n", debugstr_w(lpszStr), dwFlags, lpiRet); + + bRes = StrToInt64ExW(lpszStr, dwFlags, &li); + if (bRes) *lpiRet = li; + return bRes; +} + +/************************************************************************* + * StrToInt64ExW [SHLWAPI.@] + * + * See StrToIntExA. + */ +BOOL WINAPI StrToInt64ExW(LPCWSTR lpszStr, DWORD dwFlags, LONGLONG *lpiRet) +{ BOOL bNegative = FALSE; - int iRet = 0; + LONGLONG iRet = 0; TRACE("(%s,%08X,%p)\n", debugstr_w(lpszStr), dwFlags, lpiRet); diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 5522137..c918bcc 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -65,6 +65,8 @@ static LPWSTR (WINAPI *pStrStrNIW)(LPCWSTR,LPCWSTR,UINT); static INT (WINAPIV *pwnsprintfA)(LPSTR,INT,LPCSTR, ...); static INT (WINAPIV *pwnsprintfW)(LPWSTR,INT,LPCWSTR, ...); static LPWSTR (WINAPI *pStrChrNW)(LPWSTR,WCHAR,UINT); +static BOOL (WINAPI *pStrToInt64ExA)(LPCSTR,DWORD,LONGLONG*); +static BOOL (WINAPI *pStrToInt64ExW)(LPCWSTR,DWORD,LONGLONG*); static int strcmpW(const WCHAR *str1, const WCHAR *str2) { @@ -77,17 +79,19 @@ typedef struct tagStrToIntResult { const char* string; int str_to_int; - int str_to_int_ex; - int str_to_int_hex; + LONGLONG str_to_int64_ex; + LONGLONG str_to_int64_hex; } StrToIntResult; static const StrToIntResult StrToInt_results[] = { { "1099", 1099, 1099, 1099 }, + { "4294967319", 23, ((LONGLONG)1 << 32) | 23, ((LONGLONG)1 << 32) | 23 }, { "+88987", 0, 88987, 88987 }, { "012", 12, 12, 12 }, { "-55", -55, -55, -55 }, { "-0", 0, 0, 0 }, { "0x44ff", 0, 0, 0x44ff }, + { "0x2bdc546291f4b1", 0, 0, ((LONGLONG)0x2bdc54 << 32) | 0x6291f4b1 }, { "+0x44f4", 0, 0, 0x44f4 }, { "-0x44fd", 0, 0, 0x44fd }, { "+ 88987", 0, 0, 0 }, @@ -480,7 +484,7 @@ static void test_StrToIntExA(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int_ex, "converted '%s' wrong (%d)\n", + ok(return_val == (int)result->str_to_int64_ex, "converted '%s' wrong (%d)\n", result->string, return_val); result++; } @@ -493,7 +497,7 @@ static void test_StrToIntExA(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int_hex, "converted '%s' wrong (%d)\n", + ok(return_val == (int)result->str_to_int64_hex, "converted '%s' wrong (%d)\n", result->string, return_val); result++; } @@ -514,7 +518,7 @@ static void test_StrToIntExW(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int_ex, "converted '%s' wrong (%d)\n", + ok(return_val == (int)result->str_to_int64_ex, "converted '%s' wrong (%d)\n", result->string, return_val); result++; } @@ -528,12 +532,91 @@ static void test_StrToIntExW(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int_hex, "converted '%s' wrong (%d)\n", + ok(return_val == (int)result->str_to_int64_hex, "converted '%s' wrong (%d)\n", result->string, return_val); result++; } } +static void test_StrToInt64ExA(void) +{ + const StrToIntResult *result = StrToInt_results; + LONGLONG return_val; + BOOL bRet; + + if (!pStrToInt64ExA) + { + win_skip("StrToInt64ExA() is not available\n"); + return; + } + + while (result->string) + { + return_val = -1; + bRet = pStrToInt64ExA(result->string,0,&return_val); + ok(!bRet || return_val != -1, "No result returned from '%s'\n", + result->string); + if (bRet) + ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%08x%08x)\n", + result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + result++; + } + + result = StrToInt_results; + while (result->string) + { + return_val = -1; + bRet = pStrToInt64ExA(result->string,STIF_SUPPORT_HEX,&return_val); + ok(!bRet || return_val != -1, "No result returned from '%s'\n", + result->string); + if (bRet) + ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%08x%08x)\n", + result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + result++; + } +} + +static void test_StrToInt64ExW(void) +{ + WCHAR szBuff[256]; + const StrToIntResult *result = StrToInt_results; + LONGLONG return_val; + BOOL bRet; + + if (!pStrToInt64ExW) + { + win_skip("StrToInt64ExW() is not available\n"); + return; + } + + while (result->string) + { + return_val = -1; + MultiByteToWideChar(0,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR)); + bRet = pStrToInt64ExW(szBuff, 0, &return_val); + ok(!bRet || return_val != -1, "No result returned from '%s'\n", + result->string); + if (bRet) + ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%08x%08x)\n", + result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + result++; + } + + result = StrToInt_results; + while (result->string) + { + return_val = -1; + MultiByteToWideChar(0,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR)); + bRet = pStrToInt64ExW(szBuff, STIF_SUPPORT_HEX, &return_val); + ok(!bRet || return_val != -1, "No result returned from '%s'\n", + result->string); + if (bRet) + ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%08x%08x)\n", + result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + result++; + } +} + static void test_StrDupA(void) { LPSTR lpszStr; @@ -1422,6 +1505,8 @@ START_TEST(string) pStrStrNIW = (void *)GetProcAddress(hShlwapi, "StrStrNIW"); pwnsprintfA = (void *)GetProcAddress(hShlwapi, "wnsprintfA"); pwnsprintfW = (void *)GetProcAddress(hShlwapi, "wnsprintfW"); + pStrToInt64ExA = (void *)GetProcAddress(hShlwapi, "StrToInt64ExA"); + pStrToInt64ExW = (void *)GetProcAddress(hShlwapi, "StrToInt64ExW"); test_StrChrA(); test_StrChrW(); @@ -1435,6 +1520,8 @@ START_TEST(string) test_StrToIntW(); test_StrToIntExA(); test_StrToIntExW(); + test_StrToInt64ExA(); + test_StrToInt64ExW(); test_StrDupA(); /* language-dependent test */

1 0