wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

Eric Pouech : msvcrt: Added macro to ease implementation of so called secure (_s postfix) APIs.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: fd3ad8cd2ae938189ddf460b159a6ab3ec936de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd3ad8cd2ae938189ddf460b1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 29 15:38:46 2010 +0200 msvcrt: Added macro to ease implementation of so called secure (_s postfix) APIs. --- dlls/msvcrt/msvcrt.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 167fa83..c36b5bd 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -847,6 +847,17 @@ void __cdecl _wsearchenv(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT MSVCRT_intptr_t __cdecl MSVCRT__spawnvpe(int, const char*, const char* const*, const char* const*); void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_wchar_t *func, const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg); + +/* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) + * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) + * #define MSVCRT_CHECK_PMT(x) ((x) ? TRUE : MSVCRT_INVALID_PMT(#x),FALSE) + * Until this is done, just keep the same semantics for CHECK_PMT(), but without generating / sending + * any information + * NB : MSVCRT_call_invalid_parameter_handler is a wrapper around MSVCRT__invalid_parameter in order + * to do the Ansi to Unicode transformation + */ +#define MSVCRT_INVALID_PMT(x) MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0) +#define MSVCRT_CHECK_PMT(x) ((x) || (MSVCRT_INVALID_PMT(0),FALSE)) #endif #endif /* __WINE_MSVCRT_H */

1 0

Gerald Pfeifer : comctl32: Fix test description in test_hittest.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 42b10069253b4a17e90a792cb890b48be49326c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42b10069253b4a17e90a792cb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 31 19:15:05 2010 +0100 comctl32: Fix test description in test_hittest. --- dlls/comctl32/tests/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index d249af8..0223167 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3025,7 +3025,7 @@ static void test_hittest(void) horiz = LOWORD(r); vert = HIWORD(r); ok(bounds.bottom - bounds.top == vert, - "Horizontal spacing inconsistent (%d != %d)\n", bounds.bottom - bounds.top, vert); + "Vertical spacing inconsistent (%d != %d)\n", bounds.bottom - bounds.top, vert); r = SendMessage(hwnd, LVM_GETITEMPOSITION, 0, (LPARAM)&pos); expect(TRUE, r);

1 0

Gerald Pfeifer : comctl32: Remove TOOLTIPS_WindowFromPoint, putting its functionality into its sole calling site.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: d25d6676277872321ff112725c4a9c276b01bd3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25d6676277872321ff112725… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 31 18:34:02 2010 +0100 comctl32: Remove TOOLTIPS_WindowFromPoint, putting its functionality into its sole calling site. --- dlls/comctl32/tooltips.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index e74c701..5b48d38 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1840,14 +1840,6 @@ TOOLTIPS_UpdateTipTextT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW static LRESULT -TOOLTIPS_WindowFromPoint (HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - return (LRESULT)WindowFromPoint (*((LPPOINT)lParam)); -} - - - -static LRESULT TOOLTIPS_Create (HWND hwnd) { TOOLTIPS_INFO *infoPtr; @@ -2268,8 +2260,7 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) uMsg == TTM_UPDATETIPTEXTW); case TTM_WINDOWFROMPOINT: - return TOOLTIPS_WindowFromPoint (hwnd, wParam, lParam); - + return (LRESULT)WindowFromPoint (*((LPPOINT)lParam)); case WM_CREATE: return TOOLTIPS_Create (hwnd);

1 0

Gerald Pfeifer : urlmon: Fix typo in trace in validate_path.
by Alexandre Julliard 01 Nov '10

01 Nov '10

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

Stefan Dösinger : wined3d: Don' t reapply lighting when vertex shaders are used.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: f89fdb4429883f869be3853a712cb14c876a5304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89fdb4429883f869be3853a7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 29 18:15:23 2010 +0200 wined3d: Don't reapply lighting when vertex shaders are used. If a vertex shader is used the GL_LIGHTING state is ignored. If the shader is turned off state_vdecl is called anyway, so it will adjust the lighting state to match the available fixed function vertex attributes. --- dlls/wined3d/state.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 83ed0c6..9e0df6a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4630,11 +4630,6 @@ static void vertexdeclaration(DWORD state_id, IWineD3DStateBlockImpl *stateblock updateFog = TRUE; } - /* Reapply lighting if it is not scheduled for reapplication already */ - if(!isStateDirty(context, STATE_RENDER(WINED3DRS_LIGHTING))) { - state_lighting(STATE_RENDER(WINED3DRS_LIGHTING), stateblock, context); - } - if (transformed) { context->last_was_rhw = TRUE; } else { @@ -4677,6 +4672,9 @@ static void vertexdeclaration(DWORD state_id, IWineD3DStateBlockImpl *stateblock if(!isStateDirty(context, STATE_RENDER(WINED3DRS_COLORVERTEX))) { state_colormat(STATE_RENDER(WINED3DRS_COLORVERTEX), stateblock, context); } + if(!isStateDirty(context, STATE_RENDER(WINED3DRS_LIGHTING))) { + state_lighting(STATE_RENDER(WINED3DRS_LIGHTING), stateblock, context); + } if(context->last_was_vshader) { updateFog = TRUE;

1 0

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

01 Nov '10

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

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

01 Nov '10

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

Erich Hoover : include: Add IP_PKTINFO response structure.
by Alexandre Julliard 01 Nov '10

01 Nov '10

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

Vijay Kiran Kamuju : d3drm: Fix signature of LoadTextureFromResource macro of IDirect3DRM2 interface.
by Alexandre Julliard 01 Nov '10

01 Nov '10

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

Paul Vriens : gdi32/tests: Fix crash and failures on Win95.
by Alexandre Julliard 01 Nov '10

01 Nov '10

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2010