November 2010 - Wine-Commits

Eric Pouech : msvcrt: Use parameter checking macros in wcstombs_s_l.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 4c337fb49164611a0b1842b1e7361e34768de968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c337fb49164611a0b1842b1e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 29 15:39:36 2010 +0200 msvcrt: Use parameter checking macros in wcstombs_s_l. --- dlls/msvcrt/wcs.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 3dcfa1a..a100f31 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -298,8 +298,7 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr, return 0; } - if(!wcstr || !mbstr) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if (!MSVCRT_CHECK_PMT(wcstr != NULL) || !MSVCRT_CHECK_PMT(mbstr != NULL)) { if(mbstr && size) mbstr[0] = '\0'; *MSVCRT__errno() = MSVCRT_EINVAL; @@ -317,7 +316,7 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr, else if(conv==size && (count==MSVCRT__TRUNCATE || mbstr[conv-1]=='\0')) mbstr[conv-1] = '\0'; else { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + MSVCRT_INVALID_PMT("mbstr[size] is too small"); if(size) mbstr[0] = '\0'; *MSVCRT__errno() = MSVCRT_ERANGE;

1 0

Eric Pouech : msvcrt: Use the new parameter checking macros for f(w) open_s functions.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 00f07046c0be658d97c47f69e1b4c518bc06b3a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00f07046c0be658d97c47f69e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 29 15:38:57 2010 +0200 msvcrt: Use the new parameter checking macros for f(w)open_s functions. --- dlls/msvcrt/file.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index f906401..3eb93ac 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2686,8 +2686,8 @@ MSVCRT_FILE * CDECL MSVCRT_fopen(const char *path, const char *mode) int CDECL MSVCRT_fopen_s(MSVCRT_FILE** pFile, const char *filename, const char *mode) { - if(!pFile) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if (!MSVCRT_CHECK_PMT(pFile != NULL) || !MSVCRT_CHECK_PMT(filename != NULL) || + MSVCRT_CHECK_PMT(mode != NULL)) { *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; } @@ -2713,8 +2713,8 @@ MSVCRT_FILE * CDECL MSVCRT__wfopen(const MSVCRT_wchar_t *path, const MSVCRT_wcha int CDECL MSVCRT__wfopen_s(MSVCRT_FILE** pFile, const MSVCRT_wchar_t *filename, const MSVCRT_wchar_t *mode) { - if(!pFile) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if (!MSVCRT_CHECK_PMT(pFile != NULL) || !MSVCRT_CHECK_PMT(filename != NULL) || + MSVCRT_CHECK_PMT(mode != NULL)) { *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; }

1 0

Eric Pouech : msvcrt: Use parameter checking macros for string to number functions.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 1da9922ac322a8917d72719ce91395eefdcb9375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1da9922ac322a8917d72719ce… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 29 15:39:25 2010 +0200 msvcrt: Use parameter checking macros for string to number functions. --- dlls/msvcrt/string.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index fb02bd5..6b3725f 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -206,8 +206,7 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca double ret; BOOL found_digit = FALSE; - if(!str) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if (!MSVCRT_CHECK_PMT(str != NULL)) { *MSVCRT__errno() = MSVCRT_EINVAL; return 0; } @@ -529,8 +528,8 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR TRACE("(%s %p %d %p)\n", nptr, endptr, base, locale); - if(!nptr || base<0 || base>36 || base==1) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if (!MSVCRT_CHECK_PMT(nptr != NULL) || !MSVCRT_CHECK_PMT(base == 0 || base >= 2) || + !MSVCRT_CHECK_PMT(base <= 36)) { return 0; } @@ -609,8 +608,8 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b TRACE("(%s %p %d %p)\n", nptr, endptr, base, locale); - if(!nptr || base<0 || base>36 || base==1) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if (!MSVCRT_CHECK_PMT(nptr != NULL) || !MSVCRT_CHECK_PMT(base == 0 || base >= 2) || + !MSVCRT_CHECK_PMT(base <= 36)) { return 0; }

1 0

Gerald Pfeifer : urlmon: Fix typo in trace in validate_path.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 1c113961751f972c4bf09dc1e1a3c557329def86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c113961751f972c4bf09dc1e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 31 15:14:59 2010 +0100 urlmon: Fix typo in trace in validate_path. --- dlls/urlmon/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 77d14cd..49368b1 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3776,7 +3776,7 @@ static HRESULT validate_path(const UriBuilder *builder, parse_data *data, DWORD parse_path_opaque(pptr, data, flags) : parse_path_hierarchical(pptr, data, flags); if(!valid || (check_len && expected_len != data->path_len)) { - TRACE("(%p %p %x): Invalid path componet %s.\n", builder, data, flags, + TRACE("(%p %p %x): Invalid path component %s.\n", builder, data, flags, debugstr_wn(component, expected_len)); return INET_E_INVALID_URL; }

1 0

Vijay Kiran Kamuju : d3drm: Fix signature of LoadTextureFromResource macro of IDirect3DRM2 interface.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 60b1b1a646edfded8688232997a7c7ad7a13e727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b1b1a646edfded868823299… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Oct 31 15:25:09 2010 -0400 d3drm: Fix signature of LoadTextureFromResource macro of IDirect3DRM2 interface. --- include/d3drm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3drm.h b/include/d3drm.h index 240014e..1f84914 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -294,7 +294,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) #define IDirect3DRM2_CreateWrap(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) (p)->CreateWrap(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) #define IDirect3DRM2_CreateUserVisual(p,a,b,c) (p)->CreateUserVisual(a,b,c) #define IDirect3DRM2_LoadTexture(p,a,b) (p)->LoadTexture(a,b) -#define IDirect3DRM2_LoadTextureFromResource(p,a,b) (p)->LoadTextureFromResource(a,b) +#define IDirect3DRM2_LoadTextureFromResource(p,a,b,c,d) (p)->LoadTextureFromResource(a,b,c,d) #define IDirect3DRM2_SetSearchPath(p,a) (p)->SetSearchPath(a) #define IDirect3DRM2_AddSearchPath(p,a) (p)->AddSearchPath(a) #define IDirect3DRM2_GetSearchPath(p,a,b) (p)->GetSearchPath(a,b)

1 0

Erich Hoover : include: Add IP_PKTINFO response structure.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 886193c3b451b7ad72cc5cd31106901dbf5f27ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=886193c3b451b7ad72cc5cd31… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Oct 29 19:15:58 2010 -0600 include: Add IP_PKTINFO response structure. --- include/ws2ipdef.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 11b3689..40498c0 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -153,6 +153,11 @@ typedef struct WS(ip_msfilter) { struct WS(in_addr) imsf_slist[1]; } WS(IP_MSFILTER), *WS(PIP_MSFILTER); +typedef struct WS(in_pktinfo) { + IN_ADDR ipi_addr; + UINT ipi_ifindex; +} IN_PKTINFO, *PIN_PKTINFO; + #ifndef USE_WS_PREFIX #define IPV6_OPTIONS 1 #define IPV6_HDRINCL 2

1 0

Stefan Dösinger : wined3d: Don' t pass the texture stages to basetexture_apply_state_changes.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 5082c57e770d448d590b0f141ea5fdce0f87e187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5082c57e770d448d590b0f141… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Oct 31 22:09:38 2010 +0100 wined3d: Don't pass the texture stages to basetexture_apply_state_changes. --- dlls/wined3d/basetexture.c | 3 +-- dlls/wined3d/state.c | 1 - dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index f826f91..e49ba21 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -380,7 +380,6 @@ static void apply_wrap(const struct wined3d_gl_info *gl_info, GLenum target, /* GL locking is done by the caller (state handler) */ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, - const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], const struct wined3d_gl_info *gl_info) { @@ -391,7 +390,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, DWORD aniso; struct gl_texture *gl_tex; - TRACE("iface %p, textureStates %p, samplerStates %p\n", iface, textureStates, samplerStates); + TRACE("iface %p, samplerStates %p\n", iface, samplerStates); if(This->baseTexture.is_srgb) { gl_tex = &This->baseTexture.texture_srgb; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 44c1081..83ed0c6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3648,7 +3648,6 @@ static void sampler(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct w IWineD3DBaseTexture_BindTexture(texture, srgb); basetexture_apply_state_changes(texture, - state->texture_states[sampler], state->sampler_states[sampler], gl_info); if (gl_info->supported[EXT_TEXTURE_LOD_BIAS]) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6f6f0ce..3313963 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1920,7 +1920,6 @@ typedef struct IWineD3DBaseTextureImpl } IWineD3DBaseTextureImpl; void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, - const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN;

1 0

Paul Vriens : gdi32/tests: Fix crash and failures on Win95.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 6b73bee057cb3a3909db072417a260ef85e97b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b73bee057cb3a3909db07241… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Oct 31 19:27:49 2010 +0100 gdi32/tests: Fix crash and failures on Win95. --- dlls/gdi32/tests/icm.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index f201eab..16bec76 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -189,11 +189,16 @@ static void test_EnumICMProfilesA( HDC dc ) ret = EnumICMProfilesA( NULL, NULL, 0 ); ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret); - ret = EnumICMProfilesA( dc, NULL, 0 ); - ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret); - ret = EnumICMProfilesA( dc, enum_profiles_callbackA, 0 ); - ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret); + ok(ret == -1 || broken(ret == 0) /* nt4 */ || broken(ret == 1) /* win95 */, + "expected -1, got %d\n", ret); + + if (ret != 1) + { + /* Crashes on Win95 */ + ret = EnumICMProfilesA( dc, NULL, 0 ); + ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret); + } } static CALLBACK INT enum_profiles_callbackW( LPWSTR filename, LPARAM lparam ) @@ -251,7 +256,8 @@ static void test_SetICMProfileA( HDC dc ) ret = SetICMProfileA( dc, NULL ); error = GetLastError(); ok(!ret, "SetICMProfileA succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER || broken(error == 0xdeadbeef) /* win95 */, + "expected ERROR_INVALID_PARAMETER, got %u\n", error); ret = SetICMProfileA( dc, profile ); ok(ret, "SetICMProfileA failed %u\n", GetLastError());

1 0

Stefan Dösinger : wined3d: Don' t change GL_TEXTURE* when using the arb fragment pipeline.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 7173a56161575358fd7c0f8e35eae59167e36bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=7173a56161575358fd7c0f8e3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Oct 31 22:11:04 2010 +0100 wined3d: Don't change GL_TEXTURE* when using the arb fragment pipeline. --- dlls/wined3d/arb_program_shader.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f182a8f..2886180 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6428,14 +6428,6 @@ static const struct StateEntryTemplate arbfp_fragmentstate_template[] = { {STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT11), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlum_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler_texdim }, WINED3D_GL_EXT_NONE }, - {STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler_texdim }, WINED3D_GL_EXT_NONE }, - {STATE_SAMPLER(2), { STATE_SAMPLER(2), sampler_texdim }, WINED3D_GL_EXT_NONE }, - {STATE_SAMPLER(3), { STATE_SAMPLER(3), sampler_texdim }, WINED3D_GL_EXT_NONE }, - {STATE_SAMPLER(4), { STATE_SAMPLER(4), sampler_texdim }, WINED3D_GL_EXT_NONE }, - {STATE_SAMPLER(5), { STATE_SAMPLER(5), sampler_texdim }, WINED3D_GL_EXT_NONE }, - {STATE_SAMPLER(6), { STATE_SAMPLER(6), sampler_texdim }, WINED3D_GL_EXT_NONE }, - {STATE_SAMPLER(7), { STATE_SAMPLER(7), sampler_texdim }, WINED3D_GL_EXT_NONE }, {STATE_PIXELSHADER, { STATE_PIXELSHADER, fragment_prog_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3DRS_FOGENABLE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3DRS_FOGTABLEMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE },

1 0

Paul Vriens : localspl: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 3237f5871dc7ec8678454f979e85e3b1eaad4f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3237f5871dc7ec8678454f979… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Oct 31 19:02:43 2010 +0100 localspl: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/localspl/Makefile.in | 1 + dlls/localspl/spl_Sr.rc | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in index 52cf056..899c28a 100644 --- a/dlls/localspl/Makefile.in +++ b/dlls/localspl/Makefile.in @@ -27,6 +27,7 @@ RC_SRCS = \ spl_Ro.rc \ spl_Ru.rc \ spl_Si.rc \ + spl_Sr.rc \ spl_Sv.rc \ spl_Uk.rc \ spl_Zh.rc diff --git a/dlls/localspl/spl_Sr.rc b/dlls/localspl/spl_Sr.rc new file mode 100644 index 0000000..22860e2 --- /dev/null +++ b/dlls/localspl/spl_Sr.rc @@ -0,0 +1,41 @@ +/* + * Serbian resources for localspl + * + * Copyright 2005 Huw Davies + * Copyright 2006 Detlef Riekenberg + * Copyright 2010 Đorđe Vasiljević + * + * 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 "localspl_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_LOCALPORT "Локални порт" + IDS_LOCALMONITOR "Локални монитор" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_LOCALPORT "Lokalni port" + IDS_LOCALMONITOR "Lokalni monitor" +}

1 0