May 2010 - Wine-commits - list.winehq.org

Detlef Riekenberg : msiexec: Use resource in msi for a help dialog to allow translation.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 2a9b4e0142ea3a2fc24c33bc7dfaa508ecfa8927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a9b4e0142ea3a2fc24c33bc7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu May 6 17:24:53 2010 +0200 msiexec: Use resource in msi for a help dialog to allow translation. --- dlls/msi/msi_Bg.rc | 28 +++++++++++++++++- dlls/msi/msi_Da.rc | 28 +++++++++++++++++- dlls/msi/msi_De.rc | 29 +++++++++++++++++- dlls/msi/msi_En.rc | 29 +++++++++++++++++- dlls/msi/msi_Eo.rc | 28 +++++++++++++++++- dlls/msi/msi_Es.rc | 28 +++++++++++++++++- dlls/msi/msi_Fi.rc | 28 +++++++++++++++++- dlls/msi/msi_Fr.rc | 28 +++++++++++++++++- dlls/msi/msi_Hu.rc | 28 +++++++++++++++++- dlls/msi/msi_It.rc | 28 +++++++++++++++++- dlls/msi/msi_Ko.rc | 28 +++++++++++++++++- dlls/msi/msi_Lt.rc | 28 +++++++++++++++++- dlls/msi/msi_Nl.rc | 28 +++++++++++++++++- dlls/msi/msi_No.rc | 28 +++++++++++++++++- dlls/msi/msi_Pl.rc | 28 +++++++++++++++++- dlls/msi/msi_Pt.rc | 56 ++++++++++++++++++++++++++++++++++- dlls/msi/msi_Ro.rc | 28 +++++++++++++++++- dlls/msi/msi_Ru.rc | 28 +++++++++++++++++- dlls/msi/msi_Si.rc | 28 +++++++++++++++++- dlls/msi/msi_Sv.rc | 28 +++++++++++++++++- dlls/msi/msi_Tr.rc | 28 +++++++++++++++++- dlls/msi/msi_Uk.rc | 28 +++++++++++++++++- dlls/msi/msi_Zh.rc | 56 ++++++++++++++++++++++++++++++++++- programs/msiexec/msiexec.c | 70 +++++++++++++++++++++++-------------------- 24 files changed, 714 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a9b4e0142ea3a2fc24c3…

1 0

Joel Holdsworth : shell32: Comitted a Tango icon for the control panel.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 7dfa965d95763ee054570e2a4d270bcb18ce5996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dfa965d95763ee054570e2a4… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed May 5 21:54:57 2010 +0100 shell32: Comitted a Tango icon for the control panel. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/control.ico | Bin 0 -> 25214 bytes dlls/shell32/control.svg | 237 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shres.rc | 3 + 4 files changed, 241 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7dfa965d95763ee054570…

1 0

Alexandre Julliard : shell32: Make use of the control panel icon.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: fa29e0f2907bcd04ac75ed91677ac5853738e76f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa29e0f2907bcd04ac75ed916… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 14:44:09 2010 +0200 shell32: Make use of the control panel icon. --- dlls/shell32/control.c | 8 ++++---- dlls/shell32/shresdef.h | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 898e0ed..b0d4089 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -475,8 +475,8 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, case IDM_CPANEL_ABOUT: { WCHAR appName[MAX_STRING_LEN]; - HICON icon = LoadImageW((HINSTANCE)GetWindowLongPtrW(hWnd, GWLP_HINSTANCE), - MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, 48, 48, LR_SHARED); + HICON icon = LoadImageW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_CONTROL_PANEL), + IMAGE_ICON, 48, 48, LR_SHARED); LoadStringW(shell32_hInstance, IDS_CPANEL_TITLE, appName, sizeof(appName) / sizeof(appName[0])); @@ -627,12 +627,12 @@ static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) wc.cbClsExtra = 0; wc.cbWndExtra = sizeof(CPlApplet*); wc.hInstance = panel->hInst = hInst; - wc.hIcon = LoadIconW( hInst, MAKEINTRESOURCEW(IDI_APPICON) ); + wc.hIcon = LoadIconW( shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_CONTROL_PANEL) ); wc.hCursor = LoadCursorW( 0, (LPWSTR)IDC_ARROW ); wc.hbrBackground = GetStockObject(WHITE_BRUSH); wc.lpszMenuName = NULL; wc.lpszClassName = className; - wc.hIconSm = LoadImageW( hInst, MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, + wc.hIconSm = LoadImageW( shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_CONTROL_PANEL), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); if (!RegisterClassExW(&wc)) return; diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 93fb518..88c93c8 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -178,8 +178,6 @@ #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_MY_DOCUMENTS 235 -#define IDI_APPICON 101 - /* AVI resources, windows shell32 has 14 of them: 150-152 and 160-170 FIXME: Need to add them, but for now just let them use the same: searching.avi

1 0

Matteo Bruni : d3dx9: Support all the remaining register types in the shader assembler.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 5f934aca62e37170b6904515e14b06c96ac25bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f934aca62e37170b6904515e… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed May 5 16:56:09 2010 +0200 d3dx9: Support all the remaining register types in the shader assembler. --- dlls/d3dx9_36/asmshader.l | 70 +++++++++++++ dlls/d3dx9_36/asmshader.y | 198 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/asmutils.c | 59 +++++++++++ dlls/d3dx9_36/d3dx9_36_private.h | 27 +++++- 4 files changed, 352 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f934aca62e37170b6904…

1 0

Matteo Bruni : d3dx9: Add relative addressing support to the shader assembler.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 399bde576ef9e456c9b8cc22cb89b66ce2431f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=399bde576ef9e456c9b8cc22c… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed May 5 19:55:26 2010 +0200 d3dx9: Add relative addressing support to the shader assembler. --- dlls/d3dx9_36/asmshader.l | 9 ++++ dlls/d3dx9_36/asmshader.y | 87 +++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/asmutils.c | 30 +++++++++++-- dlls/d3dx9_36/bytecodewriter.c | 42 +++++++++++++++++++ dlls/d3dx9_36/tests/asm.c | 12 +++--- 5 files changed, 168 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=399bde576ef9e456c9b8c…

1 0

Matteo Bruni : d3dx9: Support some more vs_3_0 instructions in the shader assembler.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: fb3ee6e0a66d48c5f5104db91670b2440f38873b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb3ee6e0a66d48c5f5104db91… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed May 5 20:21:10 2010 +0200 d3dx9: Support some more vs_3_0 instructions in the shader assembler. --- dlls/d3dx9_36/asmshader.l | 37 +++++++ dlls/d3dx9_36/asmshader.y | 208 +++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/asmutils.c | 68 ++++++++++++ dlls/d3dx9_36/bytecodewriter.c | 36 +++++++ dlls/d3dx9_36/d3dx9_36_private.h | 43 +++++++- dlls/d3dx9_36/tests/asm.c | 23 +++-- 6 files changed, 403 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb3ee6e0a66d48c5f5104…

1 0

Alexandre Julliard : wined3d: Don' t crash during initialization if the adapter doesn't have full GL info.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: e45926d582ea3887f8ade611365654174cdd754f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e45926d582ea3887f8ade6113… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 14:57:21 2010 +0200 wined3d: Don't crash during initialization if the adapter doesn't have full GL info. --- dlls/wined3d/device.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f001591..2b8f231 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7034,25 +7034,29 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, select_shader_mode(&adapter->gl_info, &device->ps_selected_mode, &device->vs_selected_mode); device->shader_backend = adapter->shader_backend; - device->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); - device->d3d_vshader_constantF = shader_caps.MaxVertexShaderConst; - device->d3d_pshader_constantF = shader_caps.MaxPixelShaderConst; - device->vs_clipping = shader_caps.VSClipping; - + if (device->shader_backend) + { + device->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); + device->d3d_vshader_constantF = shader_caps.MaxVertexShaderConst; + device->d3d_pshader_constantF = shader_caps.MaxPixelShaderConst; + device->vs_clipping = shader_caps.VSClipping; + } fragment_pipeline = adapter->fragment_pipe; device->frag_pipe = fragment_pipeline; - fragment_pipeline->get_caps(&adapter->gl_info, &ffp_caps); - device->max_ffp_textures = ffp_caps.MaxSimultaneousTextures; - - hr = compile_state_table(device->StateTable, device->multistate_funcs, &adapter->gl_info, - ffp_vertexstate_template, fragment_pipeline, misc_state_template); - if (FAILED(hr)) + if (fragment_pipeline) { - ERR("Failed to compile state table, hr %#x.\n", hr); - IWineD3D_Release(device->wined3d); - return hr; - } + fragment_pipeline->get_caps(&adapter->gl_info, &ffp_caps); + device->max_ffp_textures = ffp_caps.MaxSimultaneousTextures; + hr = compile_state_table(device->StateTable, device->multistate_funcs, &adapter->gl_info, + ffp_vertexstate_template, fragment_pipeline, misc_state_template); + if (FAILED(hr)) + { + ERR("Failed to compile state table, hr %#x.\n", hr); + IWineD3D_Release(device->wined3d); + return hr; + } + } device->blitter = adapter->blitter; return WINED3D_OK;

1 0

Alexandre Julliard : winex11: Create a window of the appropriate visual to initialize GL info.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: df6cd82ccf5dd03b0362a7ea571e14d66bbc5d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6cd82ccf5dd03b0362a7ea5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 14:57:44 2010 +0200 winex11: Create a window of the appropriate visual to initialize GL info. --- dlls/winex11.drv/opengl.c | 37 +++++++++++++++++++++++++------------ 1 files changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index d8f8d0a..584abb6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -297,16 +297,21 @@ static BOOL infoInitialized = FALSE; static BOOL X11DRV_WineGL_InitOpenglInfo(void) { int screen = DefaultScreen(gdi_display); - Window win = RootWindow(gdi_display, screen); + Window win = 0, root = 0; const char* str; XVisualInfo *vis; GLXContext ctx = NULL; + XSetWindowAttributes attr; + BOOL ret = FALSE; int attribList[] = {GLX_RGBA, GLX_DOUBLEBUFFER, None}; if (infoInitialized) return TRUE; infoInitialized = TRUE; + attr.override_redirect = True; + attr.colormap = None; + wine_tsx11_lock(); vis = pglXChooseVisual(gdi_display, screen, attribList); @@ -318,23 +323,26 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) if (wine_get_fs() != old_fs) { wine_set_fs( old_fs ); - wine_tsx11_unlock(); ERR( "%%fs register corrupted, probably broken ATI driver, disabling OpenGL.\n" ); ERR( "You need to set the \"UseFastTls\" option to \"2\" in your X config file.\n" ); - return FALSE; + goto done; } #else ctx = pglXCreateContext(gdi_display, vis, None, GL_TRUE); #endif } + if (!ctx) goto done; - if (ctx) { - pglXMakeCurrent(gdi_display, win, ctx); - } else { - ERR(" couldn't initialize OpenGL, expect problems\n"); - wine_tsx11_unlock(); - return FALSE; - } + root = RootWindow( gdi_display, vis->screen ); + if (vis->visual != DefaultVisual( gdi_display, vis->screen )) + attr.colormap = XCreateColormap( gdi_display, root, vis->visual, AllocNone ); + if ((win = XCreateWindow( gdi_display, root, -1, -1, 1, 1, 0, vis->depth, InputOutput, + vis->visual, CWOverrideRedirect | CWColormap, &attr ))) + XMapWindow( gdi_display, win ); + else + win = root; + + pglXMakeCurrent(gdi_display, win, ctx); WineGLInfo.glVersion = (const char *) pglGetString(GL_VERSION); str = (const char *) pglGetString(GL_EXTENSIONS); @@ -391,14 +399,19 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) if(!strcmp(gl_renderer, "Software Rasterizer") || !strcmp(gl_renderer, "Mesa X11")) ERR_(winediag)("The Mesa OpenGL driver is using software rendering, most likely your OpenGL drivers haven't been installed correctly\n"); } + ret = TRUE; +done: if(vis) XFree(vis); if(ctx) { pglXMakeCurrent(gdi_display, None, NULL); pglXDestroyContext(gdi_display, ctx); } + if (win != root) XDestroyWindow( gdi_display, win ); + if (attr.colormap) XFreeColormap( gdi_display, attr.colormap ); wine_tsx11_unlock(); - return TRUE; + if (!ret) ERR(" couldn't initialize OpenGL, expect problems\n"); + return ret; } void X11DRV_OpenGL_Cleanup(void) @@ -891,7 +904,7 @@ static int get_render_type_from_fbconfig(Display *display, GLXFBConfig fbconfig) render_type = GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT; break; default: - ERR("Unknown render_type: %x\n", render_type); + ERR("Unknown render_type: %x\n", render_type_bit); } return render_type; }

1 0

Piotr Caban : msvcrt: Added _mbstrlen_l implementation.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: d367314b463e47aa24dea801f0789f459b3dcf4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d367314b463e47aa24dea801f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 6 14:27:22 2010 +0200 msvcrt: Added _mbstrlen_l implementation. --- dlls/msvcrt/mbcs.c | 41 ++++++++++++++++++++++++----------------- dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index e558808..c562234 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1689,25 +1689,32 @@ int CDECL MSVCRT_mblen(const char* str, MSVCRT_size_t size) } /********************************************************************* + * _mbstrlen_l(MSVCRT.@) + */ +MSVCRT_size_t CDECL _mbstrlen_l(const char* str, MSVCRT__locale_t locale) +{ + if(!locale) + locale = get_locale(); + + if(locale->locinfo->mb_cur_max > 1) { + MSVCRT_size_t len = 0; + while(*str) { + /* FIXME: According to the documentation we are supposed to test for + * multi-byte character validity. Whatever that means + */ + str += MSVCRT_isleadbyte(*str) ? 2 : 1; + len++; + } + return len; + } + + return strlen(str); +} + +/********************************************************************* * _mbstrlen(MSVCRT.@) - * REMARKS - * Unlike most of the multibyte string functions this function uses - * the locale codepage, not the codepage set by _setmbcp */ MSVCRT_size_t CDECL _mbstrlen(const char* str) { - if(get_locale()->locinfo->mb_cur_max > 1) - { - MSVCRT_size_t len = 0; - while(*str) - { - /* FIXME: According to the documentation we are supposed to test for - * multi-byte character validity. Whatever that means - */ - str += MSVCRT_isleadbyte(*str) ? 2 : 1; - len++; - } - return len; - } - return strlen(str); /* ASCII CP */ + return _mbstrlen_l(str, NULL); } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4334b85..3437442 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -734,7 +734,7 @@ # stub _mbstowcs_l # stub _mbstowcs_s_l @ cdecl _mbstrlen(str) -# stub _mbstrlen_l +@ cdecl _mbstrlen_l(str ptr) # stub _mbstrnlen # stub _mbstrnlen_l @ cdecl _mbsupr(str)

1 0

Piotr Caban : msvcrt: Added mbstowcs(_s_l) implementation.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 7352ee844e98d03561fe31c9cc7b6d9e625b56c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7352ee844e98d03561fe31c9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 6 14:27:45 2010 +0200 msvcrt: Added mbstowcs(_s_l) implementation. --- dlls/msvcr80/msvcr80.spec | 6 ++-- dlls/msvcr90/msvcr90.spec | 6 ++-- dlls/msvcrt/mbcs.c | 89 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 8 ++-- 4 files changed, 99 insertions(+), 10 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b2a19c4..8b82783 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -785,8 +785,8 @@ @ stub _mbstok_l @ stub _mbstok_s @ stub _mbstok_s_l -@ stub _mbstowcs_l -@ stub _mbstowcs_s_l +@ cdecl _mbstowcs_l(ptr str long ptr) msvcrt._mbstowcs_l +@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcrt._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcrt._mbstrlen @ stub _mbstrlen_l @ stub _mbstrnlen @@ -1330,7 +1330,7 @@ @ stub mbsrtowcs @ stub mbsrtowcs_s @ cdecl mbstowcs(ptr str long) msvcrt.mbstowcs -@ stub mbstowcs_s +@ cdecl mbstowcs_s(ptr ptr long str long) msvcrt.mbstowcs_s @ cdecl mbtowc(wstr str long) msvcrt.mbtowc @ cdecl memchr(ptr long long) msvcrt.memchr @ cdecl memcmp(ptr ptr long) msvcrt.memcmp diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f41362d..9594535 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -773,8 +773,8 @@ @ stub _mbstok_l @ stub _mbstok_s @ stub _mbstok_s_l -@ stub _mbstowcs_l -@ stub _mbstowcs_s_l +@ cdecl _mbstowcs_l(ptr str long ptr) msvcrt._mbstowcs_l +@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcrt._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcrt._mbstrlen @ stub _mbstrlen_l @ stub _mbstrnlen @@ -1314,7 +1314,7 @@ @ stub mbsrtowcs @ stub mbsrtowcs_s @ cdecl mbstowcs(ptr str long) msvcrt.mbstowcs -@ stub mbstowcs_s +@ cdecl mbstowcs_s(ptr ptr long str long) msvcrt.mbstowcs_s @ cdecl mbtowc(wstr str long) msvcrt.mbtowc @ cdecl memchr(ptr long long) msvcrt.memchr @ cdecl memcmp(ptr ptr long) msvcrt.memcmp diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index c562234..837ac02 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1718,3 +1718,92 @@ MSVCRT_size_t CDECL _mbstrlen(const char* str) { return _mbstrlen_l(str, NULL); } + +/********************************************************************* + * _mbstowcs_l(MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, + MSVCRT_size_t count, MSVCRT__locale_t locale) +{ + MSVCRT_size_t tmp; + + if(!locale) + locale = get_locale(); + + tmp = _mbstrlen_l(mbstr, locale); + if(tmp>count && wcstr) + tmp = count; + + tmp = MultiByteToWideChar(locale->locinfo->lc_codepage, 0, + mbstr, tmp, wcstr, count); + + if(tmp<count && wcstr) + wcstr[tmp] = '\0'; + + return tmp; +} + +/********************************************************************* + * mbstowcs(MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_mbstowcs(MSVCRT_wchar_t *wcstr, + const char *mbstr, MSVCRT_size_t count) +{ + return MSVCRT__mbstowcs_l(wcstr, mbstr, count, NULL); +} + +/********************************************************************* + * _mbstowcs_s_l(MSVCRT.@) + */ +int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, + MSVCRT_size_t size, const char *mbstr, + MSVCRT_size_t count, MSVCRT__locale_t locale) +{ + MSVCRT_size_t conv; + + if(!wcstr && !size) { + conv = MSVCRT__mbstowcs_l(NULL, mbstr, 0, locale); + if(ret) + *ret = conv; + return 0; + } + + if(!mbstr || !wcstr) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if(wcstr && size) + wcstr[0] = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if(count==_TRUNCATE || size<count) + conv = size; + else + conv = count; + + conv = MSVCRT__mbstowcs_l(wcstr, mbstr, conv, locale); + if(conv<size) + wcstr[conv++] = '\0'; + else if(conv==size && (count==_TRUNCATE || wcstr[conv-1]=='\0')) + wcstr[conv-1] = '\0'; + else { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if(size) + wcstr[0] = '\0'; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + if(ret) + *ret = conv; + return 0; +} + +/********************************************************************* + * mbstowcs_s(MSVCRT.@) + */ +int CDECL MSVCRT__mbstowcs_s(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, + MSVCRT_size_t size, const char *mbstr, MSVCRT_size_t count) +{ + return MSVCRT__mbstowcs_s_l(ret, wcstr, size, mbstr, count, NULL); +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3437442..8655f6f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -731,8 +731,8 @@ # stub _mbstok_l # stub _mbstok_s # stub _mbstok_s_l -# stub _mbstowcs_l -# stub _mbstowcs_s_l +@ cdecl _mbstowcs_l(ptr str long ptr) MSVCRT__mbstowcs_l +@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) MSVCRT__mbstowcs_s_l @ cdecl _mbstrlen(str) @ cdecl _mbstrlen_l(str ptr) # stub _mbstrnlen @@ -1277,8 +1277,8 @@ # stub mbsdup_dbg # stub mbsrtowcs # stub mbsrtowcs_s -@ cdecl mbstowcs(ptr str long) ntdll.mbstowcs -# stub mbstowcs_s +@ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs +@ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(wstr str long) MSVCRT_mbtowc @ cdecl memchr(ptr long long) ntdll.memchr @ cdecl memcmp(ptr ptr long) ntdll.memcmp

1 0