August 2010 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Use surface_color_fill() in IWineD3DDeviceImpl_ColorFill().
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: c689280beb52c8f44b59978c20af4080238fd467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c689280beb52c8f44b59978c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 29 21:57:43 2010 +0200 wined3d: Use surface_color_fill() in IWineD3DDeviceImpl_ColorFill(). --- dlls/wined3d/device.c | 18 +----------------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6deb552..cac6830 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5500,7 +5500,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD3DSurface *surface, const WINED3DRECT *pRect, const WINED3DCOLORVALUE *color) { IWineD3DSurfaceImpl *s = (IWineD3DSurfaceImpl *)surface; - WINEDDBLTFX BltFx; TRACE("iface %p, surface %p, rect %s, color {%.8e, %.8e, %.8e, %.8e}.\n", iface, surface, wine_dbgstr_rect((const RECT *)pRect), @@ -5512,22 +5511,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, return WINED3DERR_INVALIDCALL; } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - const RECT draw_rect = {0, 0, s->currentDesc.Width, s->currentDesc.Height}; - - return device_clear_render_targets((IWineD3DDeviceImpl *)iface, 1, &s, - !!pRect, (const RECT *)pRect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0); - } - else - { - /* Just forward this to the DirectDraw blitting engine */ - memset(&BltFx, 0, sizeof(BltFx)); - BltFx.dwSize = sizeof(BltFx); - BltFx.u5.dwFillColor = wined3d_format_convert_from_float(s->resource.format_desc, color); - return IWineD3DSurface_Blt(surface, (const RECT *)pRect, NULL, NULL, - WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_POINT); - } + return surface_color_fill(s, (const RECT *)pRect, color); } static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *iface, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6dcd590..9e4fc7c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3354,7 +3354,7 @@ static void surface_blt_fbo(IWineD3DDeviceImpl *device, const WINED3DTEXTUREFILT context_release(context); } -static HRESULT surface_color_fill(IWineD3DSurfaceImpl *s, const RECT *rect, const WINED3DCOLORVALUE *color) +HRESULT surface_color_fill(IWineD3DSurfaceImpl *s, const RECT *rect, const WINED3DCOLORVALUE *color) { IWineD3DDeviceImpl *device = s->resource.device; const struct blit_shader *blitter; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb743ae..e0a4dd4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2092,6 +2092,7 @@ extern const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl DECLSPEC_HIDDEN; extern const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl DECLSPEC_HIDDEN; void surface_add_dirty_rect(IWineD3DSurfaceImpl *surface, const RECT *dirty_rect) DECLSPEC_HIDDEN; +HRESULT surface_color_fill(IWineD3DSurfaceImpl *s, const RECT *rect, const WINED3DCOLORVALUE *color) DECLSPEC_HIDDEN; void surface_gdi_cleanup(IWineD3DSurfaceImpl *This) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN; HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, UINT alignment,

1 0

Sven Baars : ipconfig: Add the Dutch translation.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 535f7bde80231fc125402f3dff0fa1303bbf6fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=535f7bde80231fc125402f3df… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Aug 28 13:43:01 2010 +0200 ipconfig: Add the Dutch translation. --- programs/ipconfig/Makefile.in | 1 + programs/ipconfig/Nl.rc | 45 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in index a19bffa..40966a9 100644 --- a/programs/ipconfig/Makefile.in +++ b/programs/ipconfig/Makefile.in @@ -16,6 +16,7 @@ RC_SRCS = \ It.rc \ Ko.rc \ Lt.rc \ + Nl.rc \ Sv.rc \ Uk.rc diff --git a/programs/ipconfig/Nl.rc b/programs/ipconfig/Nl.rc new file mode 100644 index 0000000..cda3152 --- /dev/null +++ b/programs/ipconfig/Nl.rc @@ -0,0 +1,45 @@ +/* + * IP configuration utility + * Dutch language support + * + * Copyright 2010 Sven Baars + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "ipconfig.h" + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "Gebruik: ipconfig [ /? | /all ]\n" + STRING_INVALID_CMDLINE, "Fout: Onbekende of ongeldige commandoregelparameters gespecificeerd\n" + STRING_ADAPTER_FRIENDLY, "%s adapter %s\n" + STRING_ETHERNET, "Ethernet" + STRING_UNKNOWN, "Onbekend" + STRING_CONN_DNS_SUFFIX, "Verbindings-specifiek DNS-achtervoegsel" + STRING_IP_ADDRESS, "IP-adres" + STRING_HOSTNAME, "Hostnaam" + STRING_NODE_TYPE, "Node-type" + STRING_BROADCAST, "Broadcast" + STRING_PEER_TO_PEER, "Peer-to-peer" + STRING_MIXED, "Gemixt" + STRING_HYBRID, "Hybride" + STRING_IP_ROUTING, "IP-routing geactiveerd" + STRING_DESCRIPTION, "Beschrijving" + STRING_PHYS_ADDR, "Fysiek adres" + STRING_DHCP_ENABLED, "DHCP geactiveerd" +}

1 0

Andrew Talbot : dbghelp: Remove unused functions.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 9738f40e792838bbca71a6bc6dfa453608378cf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9738f40e792838bbca71a6bc6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 28 16:43:20 2010 +0100 dbghelp: Remove unused functions. --- dlls/dbghelp/pe_module.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index d41cdf4..1a41f94 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -463,17 +463,6 @@ static BOOL pe_load_coff_symbol_table(struct module* module) return TRUE; } -static inline void* pe_get_sect(IMAGE_NT_HEADERS* nth, void* mapping, - IMAGE_SECTION_HEADER* sect) -{ - return (sect) ? RtlImageRvaToVa(nth, mapping, sect->VirtualAddress, NULL) : NULL; -} - -static inline DWORD pe_get_sect_size(IMAGE_SECTION_HEADER* sect) -{ - return (sect) ? sect->SizeOfRawData : 0; -} - /****************************************************************** * pe_load_stabs *

1 0

Amine Khaldi : shlwapi: Fix translations.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 1848ae8d3ad34c4aeb2fa9f6aa794216e9e7e3fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1848ae8d3ad34c4aeb2fa9f6a… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sun Aug 29 16:16:16 2010 +0100 shlwapi: Fix translations. --- dlls/shlwapi/shlwapi_Da.rc | 8 ++++---- dlls/shlwapi/shlwapi_De.rc | 8 ++++---- dlls/shlwapi/shlwapi_En.rc | 8 ++++---- dlls/shlwapi/shlwapi_Eo.rc | 8 ++++---- dlls/shlwapi/shlwapi_Es.rc | 8 ++++---- dlls/shlwapi/shlwapi_Fi.rc | 8 ++++---- dlls/shlwapi/shlwapi_Fr.rc | 8 ++++---- dlls/shlwapi/shlwapi_Hu.rc | 8 ++++---- dlls/shlwapi/shlwapi_It.rc | 8 ++++---- dlls/shlwapi/shlwapi_Ja.rc | 8 ++++---- dlls/shlwapi/shlwapi_Ko.rc | 8 ++++---- dlls/shlwapi/shlwapi_Lt.rc | 8 ++++---- dlls/shlwapi/shlwapi_Nl.rc | 8 ++++---- dlls/shlwapi/shlwapi_No.rc | 8 ++++---- dlls/shlwapi/shlwapi_Pl.rc | 8 ++++---- dlls/shlwapi/shlwapi_Pt.rc | 8 ++++---- dlls/shlwapi/shlwapi_Ro.rc | 8 ++++---- dlls/shlwapi/shlwapi_Ru.rc | 8 ++++---- dlls/shlwapi/shlwapi_Si.rc | 8 ++++---- dlls/shlwapi/shlwapi_Sk.rc | 8 ++++---- dlls/shlwapi/shlwapi_Sv.rc | 8 ++++---- dlls/shlwapi/shlwapi_Tr.rc | 8 ++++---- dlls/shlwapi/shlwapi_Uk.rc | 8 ++++---- dlls/shlwapi/shlwapi_Zh.rc | 16 ++++++++-------- 24 files changed, 100 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1848ae8d3ad34c4aeb2fa…

1 0

Henri Verbeet : wined3d: Explicitly pass render targets to context_apply_draw_buffers().
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 08101957badab8196e37d64cbbcc51bfd3f3db2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=08101957badab8196e37d64cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 29 21:57:40 2010 +0200 wined3d: Explicitly pass render targets to context_apply_draw_buffers(). This avoids the special handling for blits. --- dlls/wined3d/context.c | 56 +++++++++++++++++++---------------------------- 1 files changed, 23 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0fa38c2..8236c63 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1961,17 +1961,12 @@ static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSur } /* Context activation is done by the caller. */ -static void context_apply_draw_buffer(struct wined3d_context *context, BOOL blit) +static void context_apply_draw_buffers(struct wined3d_context *context, UINT rt_count, IWineD3DSurfaceImpl **rts) { - const struct wined3d_gl_info *gl_info = context->gl_info; - IWineD3DSurfaceImpl *rt = context->current_rt; - IWineD3DDeviceImpl *device; - - device = rt->resource.device; - if (!surface_is_offscreen(rt)) + if (!surface_is_offscreen(rts[0])) { ENTER_GL(); - glDrawBuffer(surface_get_gl_buffer(rt)); + glDrawBuffer(surface_get_gl_buffer(rts[0])); checkGLcall("glDrawBuffer()"); LEAVE_GL(); } @@ -1980,36 +1975,31 @@ static void context_apply_draw_buffer(struct wined3d_context *context, BOOL blit ENTER_GL(); if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - if (!blit) - { - unsigned int i; - - for (i = 0; i < gl_info->limits.buffers; ++i) - { - if (device->render_targets[i]) - context->draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i; - else - context->draw_buffers[i] = GL_NONE; - } + const struct wined3d_gl_info *gl_info = context->gl_info; + unsigned int i; - if (gl_info->supported[ARB_DRAW_BUFFERS]) - { - GL_EXTCALL(glDrawBuffersARB(gl_info->limits.buffers, context->draw_buffers)); - checkGLcall("glDrawBuffers()"); - } + for (i = 0; i < gl_info->limits.buffers; ++i) + { + if (i < rt_count && rts[i]) + context->draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i; else - { - glDrawBuffer(context->draw_buffers[0]); - checkGLcall("glDrawBuffer()"); - } - } else { - glDrawBuffer(GL_COLOR_ATTACHMENT0); + context->draw_buffers[i] = GL_NONE; + } + + if (gl_info->supported[ARB_DRAW_BUFFERS]) + { + GL_EXTCALL(glDrawBuffersARB(gl_info->limits.buffers, context->draw_buffers)); + checkGLcall("glDrawBuffers()"); + } + else + { + glDrawBuffer(context->draw_buffers[0]); checkGLcall("glDrawBuffer()"); } } else { - glDrawBuffer(device->offscreenBuffer); + glDrawBuffer(rts[0]->resource.device->offscreenBuffer); checkGLcall("glDrawBuffer()"); } LEAVE_GL(); @@ -2122,7 +2112,7 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp if (context->draw_buffer_dirty) { - context_apply_draw_buffer(context, TRUE); + context_apply_draw_buffers(context, 1, &context->current_rt); if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) context->draw_buffer_dirty = FALSE; } @@ -2252,7 +2242,7 @@ void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp if (context->draw_buffer_dirty) { - context_apply_draw_buffer(context, FALSE); + context_apply_draw_buffers(context, context->gl_info->limits.buffers, device->render_targets); context->draw_buffer_dirty = FALSE; }

1 0

Alexandre Goujon : msvcrt: string Avoid size_t in ok().
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 7a1752013c9ccc79e602cab3d93e4ba1bd943be6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a1752013c9ccc79e602cab3d… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Sun Aug 29 10:44:26 2010 +0200 msvcrt: string Avoid size_t in ok(). --- dlls/msvcrt/tests/string.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 94c2fa3..ac157c3 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1185,22 +1185,22 @@ static void test_mbstowcs(void) mOut[4] = '!'; mOut[5] = '\0'; ret = mbstowcs(NULL, mSimple, 0); - ok(ret == 4, "ret = %d\n", ret); + ok(ret == 4, "mbstowcs did not return 4\n"); ret = mbstowcs(wOut, mSimple, 4); - ok(ret == 4, "ret = %d\n", ret); + ok(ret == 4, "mbstowcs did not return 4\n"); ok(!memcmp(wOut, wSimple, 4*sizeof(wchar_t)), "wOut = %s\n", wine_dbgstr_w(wOut)); ok(wOut[4] == '!', "wOut[4] != \'!\'\n"); ret = wcstombs(NULL, wSimple, 0); - ok(ret == 4, "ret = %d\n", ret); + ok(ret == 4, "wcstombs did not return 4\n"); ret = wcstombs(mOut, wSimple, 6); - ok(ret == 4, "ret = %d\n", ret); + ok(ret == 4, "wcstombs did not return 4\n"); ok(!memcmp(mOut, mSimple, 5*sizeof(char)), "mOut = %s\n", mOut); ret = wcstombs(mOut, wSimple, 2); - ok(ret == 2, "ret = %d\n", ret); + ok(ret == 2, "wcstombs did not return 2\n"); ok(!memcmp(mOut, mSimple, 5*sizeof(char)), "mOut = %s\n", mOut); if(!setlocale(LC_ALL, "Japanese_Japan.932")) { @@ -1209,11 +1209,11 @@ static void test_mbstowcs(void) } ret = mbstowcs(wOut, mHiragana, 6); - ok(ret == 2, "ret = %d\n", ret); + ok(ret == 2, "mbstowcs did not return 2\n"); ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); ret = wcstombs(mOut, wHiragana, 6); - ok(ret == 4, "ret = %d\n", ret); + ok(ret == 4, "wcstombs did not return 4\n"); ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); if(!pmbstowcs_s || !pwcstombs_s) {

1 0

Piotr Caban : msvcrt: Added _splitpath_s implementation.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 899d9a042b18a511aecd92dba72084e6d63cc28d URL: http://source.winehq.org/git/wine.git/?a=commit;h=899d9a042b18a511aecd92dba… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Aug 29 16:59:35 2010 +0200 msvcrt: Added _splitpath_s implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/dir.c | 105 ++++++++++++++++++++++++++++++++---------- dlls/msvcrt/msvcrt.h | 5 ++ dlls/msvcrt/msvcrt.spec | 4 +- 6 files changed, 90 insertions(+), 30 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 66c0f7b..100e78a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1116,7 +1116,7 @@ @ cdecl _spawnvp(long str ptr) msvcrt._spawnvp @ cdecl _spawnvpe(long str ptr ptr) msvcrt._spawnvpe @ cdecl _splitpath(str ptr ptr ptr ptr) msvcrt._splitpath -@ stub _splitpath_s +@ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) msvcrt._splitpath_s @ stub _sprintf_l @ stub _sprintf_p @ stub _sprintf_p_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index efc450d..206769a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -970,7 +970,7 @@ @ cdecl _spawnvp(long str ptr) msvcrt._spawnvp @ cdecl _spawnvpe(long str ptr ptr) msvcrt._spawnvpe @ cdecl _splitpath(str ptr ptr ptr ptr) msvcrt._splitpath -@ stub _splitpath_s +@ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) msvcrt._splitpath_s @ stub _sprintf_l @ stub _sprintf_p @ stub _sprintf_p_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e0d0068..b0e3df8 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -956,7 +956,7 @@ @ cdecl _spawnvp(long str ptr) msvcrt._spawnvp @ cdecl _spawnvpe(long str ptr ptr) msvcrt._spawnvpe @ cdecl _splitpath(str ptr ptr ptr ptr) msvcrt._splitpath -@ stub _splitpath_s +@ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) msvcrt._splitpath_s @ stub _sprintf_l @ stub _sprintf_p @ stub _sprintf_p_l diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index c5b6638..5beb91b 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -745,27 +745,42 @@ int CDECL _wrmdir(const MSVCRT_wchar_t * dir) return -1; } -/********************************************************************* - * _wsplitpath (MSVCRT.@) - * - * Unicode version of _splitpath. +/****************************************************************** + * _splitpath_s (MSVCRT.@) */ -void CDECL _wsplitpath(const MSVCRT_wchar_t *inpath, MSVCRT_wchar_t *drv, MSVCRT_wchar_t *dir, - MSVCRT_wchar_t *fname, MSVCRT_wchar_t *ext ) +int _splitpath_s(const char* inpath, + char* drive, MSVCRT_size_t sz_drive, + char* dir, MSVCRT_size_t sz_dir, + char* fname, MSVCRT_size_t sz_fname, + char* ext, MSVCRT_size_t sz_ext) { - const MSVCRT_wchar_t *p, *end; + const char *p, *end; + + if (!inpath || (!drive && sz_drive) || + (drive && !sz_drive) || + (!dir && sz_dir) || + (dir && !sz_dir) || + (!fname && sz_fname) || + (fname && !sz_fname) || + (!ext && sz_ext) || + (ext && !sz_ext)) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } if (inpath[0] && inpath[1] == ':') { - if (drv) + if (drive) { - drv[0] = inpath[0]; - drv[1] = inpath[1]; - drv[2] = 0; + if (sz_drive <= 2) goto do_error; + drive[0] = inpath[0]; + drive[1] = inpath[1]; + drive[2] = 0; } inpath += 2; } - else if (drv) drv[0] = 0; + else if (drive) drive[0] = '\0'; /* look for end of directory part */ end = NULL; @@ -775,7 +790,8 @@ void CDECL _wsplitpath(const MSVCRT_wchar_t *inpath, MSVCRT_wchar_t *drv, MSVCRT { if (dir) { - memcpy( dir, inpath, (end - inpath) * sizeof(MSVCRT_wchar_t) ); + if (sz_dir <= end - inpath) goto do_error; + memcpy( dir, inpath, (end - inpath) ); dir[end - inpath] = 0; } inpath = end; @@ -790,10 +806,33 @@ void CDECL _wsplitpath(const MSVCRT_wchar_t *inpath, MSVCRT_wchar_t *drv, MSVCRT if (fname) { - memcpy( fname, inpath, (end - inpath) * sizeof(MSVCRT_wchar_t) ); + if (sz_fname <= end - inpath) goto do_error; + memcpy( fname, inpath, (end - inpath) ); fname[end - inpath] = 0; } - if (ext) strcpyW( ext, end ); + if (ext) + { + if (sz_ext <= strlen(end)) goto do_error; + strcpy( ext, end ); + } + return 0; +do_error: + if (drive) drive[0] = '\0'; + if (dir) dir[0] = '\0'; + if (fname) fname[0]= '\0'; + if (ext) ext[0]= '\0'; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; +} + +/********************************************************************* + * _splitpath (MSVCRT.@) + */ +void CDECL _splitpath(const char *inpath, char *drv, char *dir, + char *fname, char *ext) +{ + _splitpath_s(inpath, drv, MSVCRT__MAX_DRIVE, dir, MSVCRT__MAX_DIR, + fname, MSVCRT__MAX_FNAME, ext, MSVCRT__MAX_EXT); } /****************************************************************** @@ -809,15 +848,18 @@ int _wsplitpath_s(const MSVCRT_wchar_t* inpath, { const MSVCRT_wchar_t *p, *end; - if (!inpath) return MSVCRT_EINVAL; - if (!drive && sz_drive) return MSVCRT_EINVAL; - if (drive && !sz_drive) return MSVCRT_EINVAL; - if (!dir && sz_dir) return MSVCRT_EINVAL; - if (dir && !sz_dir) return MSVCRT_EINVAL; - if (!fname && sz_fname) return MSVCRT_EINVAL; - if (fname && !sz_fname) return MSVCRT_EINVAL; - if (!ext && sz_ext) return MSVCRT_EINVAL; - if (ext && !sz_ext) return MSVCRT_EINVAL; + if (!inpath || (!drive && sz_drive) || + (drive && !sz_drive) || + (!dir && sz_dir) || + (dir && !sz_dir) || + (!fname && sz_fname) || + (fname && !sz_fname) || + (!ext && sz_ext) || + (ext && !sz_ext)) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } if (inpath[0] && inpath[1] == ':') { @@ -871,10 +913,23 @@ do_error: if (dir) dir[0] = '\0'; if (fname) fname[0]= '\0'; if (ext) ext[0]= '\0'; + *MSVCRT__errno() = MSVCRT_ERANGE; return MSVCRT_ERANGE; } /********************************************************************* + * _wsplitpath (MSVCRT.@) + * + * Unicode version of _splitpath. + */ +void CDECL _wsplitpath(const MSVCRT_wchar_t *inpath, MSVCRT_wchar_t *drv, MSVCRT_wchar_t *dir, + MSVCRT_wchar_t *fname, MSVCRT_wchar_t *ext) +{ + _wsplitpath_s(inpath, drv, MSVCRT__MAX_DRIVE, dir, MSVCRT__MAX_DIR, + fname, MSVCRT__MAX_FNAME, ext, MSVCRT__MAX_EXT); +} + +/********************************************************************* * _wfullpath (MSVCRT.@) * * Unicode version of _fullpath. diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 86df133..8e0bd43 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -47,6 +47,11 @@ #define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1) #define MSVCRT_UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) +#define MSVCRT__MAX_DRIVE 3 +#define MSVCRT__MAX_DIR 256 +#define MSVCRT__MAX_FNAME 256 +#define MSVCRT__MAX_EXT 256 + typedef unsigned short MSVCRT_wchar_t; typedef unsigned short MSVCRT_wint_t; typedef unsigned short MSVCRT_wctype_t; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 022b0bd..9c9ff7a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -892,8 +892,8 @@ @ cdecl _spawnve(long str ptr ptr) MSVCRT__spawnve @ cdecl _spawnvp(long str ptr) @ cdecl _spawnvpe(long str ptr ptr) MSVCRT__spawnvpe -@ cdecl _splitpath(str ptr ptr ptr ptr) ntdll._splitpath -# stub _splitpath_s +@ cdecl _splitpath(str ptr ptr ptr ptr) +@ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) # stub _sprintf_l # stub _sprintf_p_l # stub _sprintf_s_l

1 0

Amine Khaldi : shdoclc: Fix Spanish translation.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: ed2a02b7bea64d558142ed4624b58460ed4eb194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed2a02b7bea64d558142ed462… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sun Aug 29 12:25:31 2010 +0100 shdoclc: Fix Spanish translation. --- dlls/shdoclc/Es.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shdoclc/Es.rc b/dlls/shdoclc/Es.rc index e7700f0..52d6a23 100644 --- a/dlls/shdoclc/Es.rc +++ b/dlls/shdoclc/Es.rc @@ -68,7 +68,7 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "Guardar en&lace como...", IDM_SAVETARGET MENUITEM "&Imprimir enlace", IDM_PRINTTARGET MENUITEM SEPARATOR - MENUITEM "M&ostrar imagen" IDM_SHOWPICTURE + MENUITEM "M&ostrar imagen", IDM_SHOWPICTURE MENUITEM "G&uardar imagen como...", IDM_SAVEPICTURE MENUITEM "&Enviar por correo...", IDM_MP_EMAILPICTURE MENUITEM "I&mprimir imagen...", IDM_MP_PRINTPICTURE @@ -132,7 +132,7 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "&Guardar enlace como...", IDM_SAVETARGET MENUITEM "&Imprimir enlace", IDM_PRINTTARGET MENUITEM SEPARATOR - MENUITEM "Cor&tar" IDM_CUT + MENUITEM "Cor&tar", IDM_CUT MENUITEM "&Copiar", IDM_COPY MENUITEM "C&opiar acceso directo", IDM_COPYSHORTCUT MENUITEM "&Pegar", IDM_PASTE @@ -160,7 +160,7 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "Pon&er como fondo", IDM_SETWALLPAPER MENUITEM "A�a&dir al escritorio...", IDM_SETDESKTOPITEM MENUITEM SEPARATOR - MENUITEM "Cor&tar" IDM_CUT + MENUITEM "Cor&tar", IDM_CUT MENUITEM "&Copiar", IDM_COPY MENUITEM "C&opiar acceso directo", IDM_COPYSHORTCUT MENUITEM "Pe&gar", IDM_PASTE @@ -224,7 +224,7 @@ IDR_BROWSE_CONTEXT_MENU MENU { MENUITEM "Desplazar &aqu�", IDM_SCROLL_HERE MENUITEM SEPARATOR - MENUITEM "&Principio" IDM_SCROLL_TOP + MENUITEM "&Principio", IDM_SCROLL_TOP MENUITEM "&Final", IDM_SCROLL_BOTTOM MENUITEM SEPARATOR MENUITEM "P�gina a&rriba", IDM_SCROLL_PAGEUP

1 0

Alexandre Julliard : msvcrt: Add -ret64 flag on some functions that return a 64-bit value.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: dfdea6c4a59af94cfbf17367c703812a33c74b13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfdea6c4a59af94cfbf17367c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Aug 29 12:07:37 2010 +0200 msvcrt: Add -ret64 flag on some functions that return a 64-bit value. --- dlls/msvcr100/msvcr100.spec | 18 +++++++++--------- dlls/msvcr70/msvcr70.spec | 10 +++++----- dlls/msvcr71/msvcr71.spec | 10 +++++----- dlls/msvcr80/msvcr80.spec | 18 +++++++++--------- dlls/msvcr90/msvcr90.spec | 18 +++++++++--------- dlls/msvcrt/msvcrt.spec | 20 ++++++++++---------- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- 8 files changed, 49 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfdea6c4a59af94cfbf17…

1 0

Matteo Bruni : d3d10: Implement D3D10CompileShader, forward to d3dcompiler.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: da783ee57da68adc4285faf7b9efeb0bc872866f URL: http://source.winehq.org/git/wine.git/?a=commit;h=da783ee57da68adc4285faf7b… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu Aug 26 17:17:38 2010 +0200 d3d10: Implement D3D10CompileShader, forward to d3dcompiler. --- dlls/d3d10/Makefile.in | 2 +- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/shader.c | 9 +++++++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in index 79b2bbc..f48a1eb 100644 --- a/dlls/d3d10/Makefile.in +++ b/dlls/d3d10/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3d10.dll IMPORTLIB = d3d10 -IMPORTS = dxguid uuid d3d10core dxgi +IMPORTS = dxguid uuid d3d10core d3dcompiler dxgi C_SRCS = \ d3d10_main.c \ diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index e108a5c..1d62aea 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -1,5 +1,5 @@ @ stub D3D10CompileEffectFromMemory -@ stub D3D10CompileShader +@ stdcall D3D10CompileShader(ptr long str ptr ptr str str long ptr ptr) @ stdcall D3D10CreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob @ stdcall D3D10CreateDevice(ptr long ptr long long ptr) @ stdcall D3D10CreateDeviceAndSwapChain(ptr long ptr long long ptr ptr ptr) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 77a3529..20871ae 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -28,6 +28,7 @@ #include "objbase.h" #include "d3d10.h" +#include "d3dcompiler.h" /* * This doesn't belong here, but for some functions it is possible to return that value, diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index d5d9e16..29d7897 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -133,3 +133,12 @@ const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl = d3d10_shader_reflection_GetInputParameterDesc, d3d10_shader_reflection_GetOutputParameterDesc, }; + +HRESULT WINAPI D3D10CompileShader(const char *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entrypoint, + const char *profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages) +{ + /* Forward to d3dcompiler */ + return D3DCompile(data, data_size, filename, defines, include, + entrypoint, profile, flags, 0, shader, error_messages); +}

1 0