September 2010 - Wine-commits

Juan Lang : include: Add GAA_FLAG_* definitions.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 0f89a4f878a2be7d584975d720da1a8e7436dbbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f89a4f878a2be7d584975d72… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 16 13:42:26 2010 -0700 include: Add GAA_FLAG_* definitions. --- include/iptypes.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/iptypes.h b/include/iptypes.h index 16e7ffb..8ce7df6 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -265,6 +265,18 @@ typedef struct _IP_ADAPTER_ADDRESSES { ULONG Dhcpv6Iaid; } IP_ADAPTER_ADDRESSES, *PIP_ADAPTER_ADDRESSES; +#define GAA_FLAG_SKIP_UNICAST 0x00000001 +#define GAA_FLAG_SKIP_ANYCAST 0x00000002 +#define GAA_FLAG_SKIP_MULTICAST 0x00000004 +#define GAA_FLAG_SKIP_DNS_SERVER 0x00000008 +#define GAA_FLAG_INCLUDE_PREFIX 0x00000010 +#define GAA_FLAG_SKIP_FRIENDLY_NAME 0x00000020 +#define GAA_FLAG_INCLUDE_WINS_INFO 0x00000040 +#define GAA_FLAG_INCLUDE_ALL_GATEWAYS 0x00000080 +#define GAA_FLAG_INCLUDE_ALL_INTERFACES 0x00000100 +#define GAA_FLAG_INCLUDE_ALL_COMPARTMENTS 0x00000200 +#define GAA_FLAG_INCLUDE_TUNNEL_BINDINGORDER 0x00000400 + #endif /* _WINSOCK2API_ */ #endif /* WINE_IPTYPES_H_*/

1 0

Juan Lang : include: Add SCOPE_LEVEL definition.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 8da6bb6fb3f10978931af176f89caf0aeb78d9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8da6bb6fb3f10978931af176f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 16 13:44:48 2010 -0700 include: Add SCOPE_LEVEL definition. --- include/ws2def.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/ws2def.h b/include/ws2def.h index 585647b..00b10ab 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -68,4 +68,14 @@ typedef struct _SOCKET_ADDRESS_LIST { SOCKET_ADDRESS Address[1]; } SOCKET_ADDRESS_LIST, *LPSOCKET_ADDRESS_LIST; +typedef enum { + ScopeLevelInterface = 1, + ScopeLevelLink = 2, + ScopeLevelSubnet = 3, + ScopeLevelAdmin = 4, + ScopeLevelSite = 5, + ScopeLevelOrganization = 8, + ScopeLevelGlobal = 14 +} SCOPE_LEVEL; + #endif /* _WS2DEF_ */

1 0

Juan Lang : iphlpapi: Trace parameters to GetAdaptersAddresses.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: c297dd2facb799b0959f38c0b59a907569ae34da URL: http://source.winehq.org/git/wine.git/?a=commit;h=c297dd2facb799b0959f38c0b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 16 14:04:02 2010 -0700 iphlpapi: Trace parameters to GetAdaptersAddresses. --- dlls/iphlpapi/iphlpapi_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 88b699b..90101f7 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -927,6 +927,8 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, InterfaceIndexTable *table; ULONG i, size, total_size, ret = ERROR_NO_DATA; + TRACE("(%d, %08x, %p, %p, %p)\n", family, flags, reserved, aa, buflen); + if (!buflen) return ERROR_INVALID_PARAMETER; table = getInterfaceIndexTable();

1 0

Juan Lang : include: Define more IF_TYPEs.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 4ec277d8f4731903cf4201d85e6501ca6d1f461b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec277d8f4731903cf4201d85… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 16 14:24:25 2010 -0700 include: Define more IF_TYPEs. --- include/ipifcons.h | 228 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 200 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ec277d8f4731903cf420…

1 0

Juan Lang : iphlpapi: Set adapter description in GetAdaptersAddresses.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: e192beeb0d1da9b22eea45dd6e5ee7e56eb97222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e192beeb0d1da9b22eea45dd6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 20 09:47:25 2010 -0700 iphlpapi: Set adapter description in GetAdaptersAddresses. --- dlls/iphlpapi/iphlpapi_main.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 90101f7..d6e568f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -768,7 +768,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD total_size = sizeof(IP_ADAPTER_ADDRESSES); total_size += IF_NAMESIZE; - total_size += IF_NAMESIZE * sizeof(WCHAR); + total_size += 2 * IF_NAMESIZE * sizeof(WCHAR); total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v4addrs; total_size += sizeof(struct sockaddr_in) * num_v4addrs; total_size += (sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN)) * num_v4_gateways; @@ -796,6 +796,11 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD *dst = *src; *dst++ = 0; ptr = (char *)dst; + aa->Description = (WCHAR *)ptr; + for (src = name, dst = (WCHAR *)ptr; *src; src++, dst++) + *dst = *src; + *dst++ = 0; + ptr = (char *)dst; TRACE("%s: %d IPv4 addresses, %d IPv6 addresses:\n", name, num_v4addrs, num_v6addrs);

1 0

Alexandre Julliard : winedbg: Make BreakOnFirstChance default to FALSE to avoid user confusion.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 07898fe2fdf5bd97c830d9147fcb8f6e74ac8c56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07898fe2fdf5bd97c830d9147… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 24 11:34:11 2010 +0200 winedbg: Make BreakOnFirstChance default to FALSE to avoid user confusion. --- programs/winedbg/intvar.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/intvar.h b/programs/winedbg/intvar.h index 2771f23..4d1a80d 100644 --- a/programs/winedbg/intvar.h +++ b/programs/winedbg/intvar.h @@ -23,7 +23,7 @@ INTERNAL_VAR(BreakAllThreadsStartup, FALSE, NULL, dbg_itype_unsigned_int) INTERNAL_VAR(BreakOnCritSectTimeOut, FALSE, NULL, dbg_itype_unsigned_int) INTERNAL_VAR(BreakOnAttach, FALSE, NULL, dbg_itype_unsigned_int) -INTERNAL_VAR(BreakOnFirstChance, TRUE, NULL, dbg_itype_unsigned_int) +INTERNAL_VAR(BreakOnFirstChance, FALSE, NULL, dbg_itype_unsigned_int) INTERNAL_VAR(BreakOnDllLoad, FALSE, NULL, dbg_itype_unsigned_int) INTERNAL_VAR(CanDeferOnBPByAddr, FALSE, NULL, dbg_itype_unsigned_int)

1 0

Vincent Povirk : mscoree: Search for Mono in some predefined paths before using the registry.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: d0f7edd2c1df97f8cc858cf08a356a538bbad9dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f7edd2c1df97f8cc858cf08… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 21 13:26:04 2010 -0500 mscoree: Search for Mono in some predefined paths before using the registry. This makes it possible for distributions to install Mono in a shared location. --- dlls/mscoree/mscoree_main.c | 123 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 110 insertions(+), 13 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 1269f9c..7cc3887 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -22,6 +22,7 @@ #include <stdarg.h> #include "wine/unicode.h" +#include "wine/library.h" #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -40,7 +41,34 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); -static BOOL get_mono_path(LPWSTR path) +BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int* abi_version) +{ + static const WCHAR mono_dll[] = {'\\','b','i','n','\\','m','o','n','o','.','d','l','l',0}; + static const WCHAR libmono_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','.','d','l','l',0}; + DWORD attributes; + + strcpyW(dll_path, path); + strcatW(dll_path, mono_dll); + attributes = GetFileAttributesW(dll_path); + + if (attributes == INVALID_FILE_ATTRIBUTES) + { + strcpyW(dll_path, path); + strcatW(dll_path, libmono_dll); + attributes = GetFileAttributesW(dll_path); + } + + if (attributes != INVALID_FILE_ATTRIBUTES) + { + /* FIXME: Test for appropriate architecture. */ + *abi_version = 1; + return TRUE; + } + + return FALSE; +} + +static BOOL get_mono_path_from_registry(LPWSTR path) { static const WCHAR mono_key[] = {'S','o','f','t','w','a','r','e','\\','N','o','v','e','l','l','\\','M','o','n','o',0}; static const WCHAR defaul_clr[] = {'D','e','f','a','u','l','t','C','L','R',0}; @@ -50,6 +78,8 @@ static BOOL get_mono_path(LPWSTR path) WCHAR version[64], version_key[MAX_PATH]; DWORD len; HKEY key; + WCHAR dll_path[MAX_PATH]; + int abi_version; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, mono_key, 0, KEY_READ, &key)) return FALSE; @@ -77,7 +107,80 @@ static BOOL get_mono_path(LPWSTR path) } RegCloseKey(key); - return TRUE; + return find_mono_dll(path, dll_path, &abi_version); +} + +static BOOL get_mono_path_from_folder(LPCWSTR folder, LPWSTR mono_path) +{ + static const WCHAR mono_one_dot_zero[] = {'\\','m','o','n','o','-','1','.','0', 0}; + WCHAR mono_dll_path[MAX_PATH]; + int abi_version; + BOOL found = FALSE; + + strcpyW(mono_path, folder); + strcatW(mono_path, mono_one_dot_zero); + + found = find_mono_dll(mono_path, mono_dll_path, &abi_version); + + if (found && abi_version != 1) + { + ERR("found wrong ABI in %s\n", debugstr_w(mono_path)); + found = FALSE; + } + + return found; +} + +static BOOL get_mono_path(LPWSTR path) +{ + static const WCHAR subdir_mono[] = {'\\','m','o','n','o',0}; + static const WCHAR sibling_mono[] = {'\\','.','.','\\','m','o','n','o',0}; + WCHAR base_path[MAX_PATH]; + const char *unix_data_dir; + WCHAR *dos_data_dir; + int build_tree=0; + static WCHAR* (CDECL *wine_get_dos_file_name)(const char*); + + /* First try c:\windows\mono */ + GetWindowsDirectoryW(base_path, MAX_PATH); + strcatW(base_path, subdir_mono); + + if (get_mono_path_from_folder(base_path, path)) + return TRUE; + + /* Next: /usr/share/wine/mono */ + unix_data_dir = wine_get_data_dir(); + + if (!unix_data_dir) + { + unix_data_dir = wine_get_build_dir(); + build_tree = 1; + } + + if (unix_data_dir) + { + if (!wine_get_dos_file_name) + wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleA("kernel32"), "wine_get_dos_file_name"); + + if (wine_get_dos_file_name) + { + dos_data_dir = wine_get_dos_file_name(unix_data_dir); + + if (dos_data_dir) + { + strcpyW(base_path, dos_data_dir); + strcatW(base_path, build_tree ? sibling_mono : subdir_mono); + + HeapFree(GetProcessHeap(), 0, dos_data_dir); + + if (get_mono_path_from_folder(base_path, path)) + return TRUE; + } + } + } + + /* Last: the registry */ + return get_mono_path_from_registry(path); } static BOOL get_install_root(LPWSTR install_dir) @@ -139,8 +242,6 @@ static void set_environment(LPCWSTR bin_path) static HMODULE load_mono(void) { - static const WCHAR mono_dll[] = {'\\','b','i','n','\\','m','o','n','o','.','d','l','l',0}; - static const WCHAR libmono_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','.','d','l','l',0}; static const WCHAR bin[] = {'\\','b','i','n',0}; static const WCHAR lib[] = {'\\','l','i','b',0}; static const WCHAR etc[] = {'\\','e','t','c',0}; @@ -148,6 +249,7 @@ static HMODULE load_mono(void) WCHAR mono_path[MAX_PATH], mono_dll_path[MAX_PATH+16], mono_bin_path[MAX_PATH+4]; WCHAR mono_lib_path[MAX_PATH+4], mono_etc_path[MAX_PATH+4]; char mono_lib_path_a[MAX_PATH], mono_etc_path_a[MAX_PATH]; + int abi_version; EnterCriticalSection(&mono_lib_cs); @@ -167,16 +269,11 @@ static HMODULE load_mono(void) strcatW(mono_etc_path, etc); WideCharToMultiByte(CP_UTF8, 0, mono_etc_path, -1, mono_etc_path_a, MAX_PATH, NULL, NULL); - strcpyW(mono_dll_path, mono_path); - strcatW(mono_dll_path, mono_dll); - mono_handle = LoadLibraryW(mono_dll_path); + if (!find_mono_dll(mono_path, mono_dll_path, &abi_version)) goto end; - if (!mono_handle) - { - strcpyW(mono_dll_path, mono_path); - strcatW(mono_dll_path, libmono_dll); - mono_handle = LoadLibraryW(mono_dll_path); - } + if (abi_version != 1) goto end; + + mono_handle = LoadLibraryW(mono_dll_path); if (!mono_handle) goto end;

1 0

Henri Verbeet : wined3d: Pass a wined3d_state structure to set_tex_op().
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 67b7a573b98763c4c83cd3ab5aa275fc50cc6475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b7a573b98763c4c83cd3ab5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 23 21:33:26 2010 +0200 wined3d: Pass a wined3d_state structure to set_tex_op(). --- dlls/wined3d/state.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d824005..992638a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2057,10 +2057,9 @@ static void get_src_and_opr(DWORD arg, BOOL is_alpha, GLenum* source, GLenum* op } /* Setup the texture operations texture stage states */ -static void set_tex_op(const struct wined3d_context *context, IWineD3DDevice *iface, +static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, BOOL isAlpha, int Stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) { - const struct wined3d_gl_info *gl_info = context->gl_info; GLenum src1, src2, src3; GLenum opr1, opr2, opr3; GLenum comb_target; @@ -2069,7 +2068,6 @@ static void set_tex_op(const struct wined3d_context *context, IWineD3DDevice *if GLenum scal_target; GLenum opr=0, invopr, src3_target, opr3_target; BOOL Handled = FALSE; - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("Alpha?(%d), Stage:%d Op(%s), a1(%d), a2(%d), a3(%d)\n", isAlpha, Stage, debug_d3dtop(op), arg1, arg2, arg3); @@ -2109,13 +2107,13 @@ static void set_tex_op(const struct wined3d_context *context, IWineD3DDevice *if /* If a texture stage references an invalid texture unit the stage just * passes through the result from the previous stage */ - if (is_invalid_op(&This->stateBlock->state, Stage, op, arg1, arg2, arg3)) + if (is_invalid_op(state, Stage, op, arg1, arg2, arg3)) { arg1 = WINED3DTA_CURRENT; op = WINED3DTOP_SELECTARG1; } - if (isAlpha && !This->stateBlock->state.textures[Stage] && arg1 == WINED3DTA_TEXTURE) + if (isAlpha && !state->textures[Stage] && arg1 == WINED3DTA_TEXTURE) { get_src_and_opr(WINED3DTA_DIFFUSE, isAlpha, &src1, &opr1); } else { @@ -3058,9 +3056,9 @@ static void set_tex_op(const struct wined3d_context *context, IWineD3DDevice *if DWORD op2; if (isAlpha) - op2 = This->stateBlock->state.texture_states[Stage][WINED3DTSS_COLOROP]; + op2 = state->texture_states[Stage][WINED3DTSS_COLOROP]; else - op2 = This->stateBlock->state.texture_states[Stage][WINED3DTSS_ALPHAOP]; + op2 = state->texture_states[Stage][WINED3DTSS_ALPHAOP]; /* Note: If COMBINE4 in effect can't go back to combine! */ switch (op2) { @@ -3155,7 +3153,7 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, struct if (tex_used) texture_activate_dimensions(stage, stateblock, context); } - set_tex_op(context, (IWineD3DDevice *)stateblock->device, FALSE, stage, + set_tex_op(gl_info, &stateblock->state, FALSE, stage, stateblock->state.texture_states[stage][WINED3DTSS_COLOROP], stateblock->state.texture_states[stage][WINED3DTSS_COLORARG1], stateblock->state.texture_states[stage][WINED3DTSS_COLORARG2], @@ -3259,7 +3257,7 @@ void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d } else { - set_tex_op(context, (IWineD3DDevice *)stateblock->device, TRUE, stage, op, arg1, arg2, arg0); + set_tex_op(gl_info, &stateblock->state, TRUE, stage, op, arg1, arg2, arg0); } }

1 0

Henri Verbeet : wined3d: Directly pass the texture to texture_activate_dimensions().
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 23e286613ff688c8f0230301251bc24a7e90de5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e286613ff688c8f02303012… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 23 21:33:27 2010 +0200 wined3d: Directly pass the texture to texture_activate_dimensions(). --- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/state.c | 10 ++++------ dlls/wined3d/utils.c | 10 ++++------ dlls/wined3d/wined3d_private.h | 4 ++-- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 3498718..cf85608 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -838,7 +838,7 @@ static void set_tex_op_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, st { GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); checkGLcall("glActiveTextureARB"); - texture_activate_dimensions(i, stateblock, context); + texture_activate_dimensions(stateblock->state.textures[i], gl_info); } } diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 6576e61..0f1bbb1 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -532,7 +532,7 @@ static void nvrc_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, struct } else { - texture_activate_dimensions(stage, stateblock, context); + texture_activate_dimensions(stateblock->state.textures[stage], gl_info); } } } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 992638a..1e49d36 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3146,12 +3146,10 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, struct return; } - /* The sampler will also activate the correct texture dimensions, so no need to do it here - * if the sampler for this stage is dirty - */ - if(!isStateDirty(context, STATE_SAMPLER(stage))) { - if (tex_used) texture_activate_dimensions(stage, stateblock, context); - } + /* The sampler will also activate the correct texture dimensions, so no + * need to do it here if the sampler for this stage is dirty. */ + if (!isStateDirty(context, STATE_SAMPLER(stage)) && tex_used) + texture_activate_dimensions(stateblock->state.textures[stage], gl_info); set_tex_op(gl_info, &stateblock->state, FALSE, stage, stateblock->state.texture_states[stage][WINED3DTSS_COLOROP], diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 01ca1f9..1317abd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2979,13 +2979,11 @@ void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *des * Requires the caller to activate the correct unit before */ /* GL locking is done by the caller (state handler) */ -void texture_activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +void texture_activate_dimensions(IWineD3DBaseTextureImpl *texture, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = context->gl_info; - - if (stateblock->state.textures[stage]) + if (texture) { - switch (stateblock->state.textures[stage]->baseTexture.target) + switch (texture->baseTexture.target) { case GL_TEXTURE_2D: glDisable(GL_TEXTURE_3D); @@ -3079,7 +3077,7 @@ void sampler_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wine if (sampler >= stateblock->state.lowest_disabled_stage) return; if (isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP))) return; - texture_activate_dimensions(sampler, stateblock, context); + texture_activate_dimensions(stateblock->state.textures[sampler], context->gl_info); } void *wined3d_rb_alloc(size_t size) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6685412..61cd60d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2646,8 +2646,8 @@ void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d INT texture_idx, DWORD dst) DECLSPEC_HIDDEN; void set_texture_matrix(const float *smat, DWORD flags, BOOL calculatedCoords, BOOL transformed, enum wined3d_format_id coordtype, BOOL ffp_can_disable_proj) DECLSPEC_HIDDEN; -void texture_activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock, - struct wined3d_context *context) DECLSPEC_HIDDEN; +void texture_activate_dimensions(IWineD3DBaseTextureImpl *texture, + const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void sampler_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) DECLSPEC_HIDDEN; void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock,

1 0

Henri Verbeet : wined3d: Pass a wined3d_state structure to ffp_clip_emul().
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 7dd4174e05974a2fb58b76614b807319623c6b28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd4174e05974a2fb58b76614… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 23 21:33:28 2010 +0200 wined3d: Pass a wined3d_state structure to ffp_clip_emul(). --- dlls/wined3d/arb_program_shader.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6fa5fa7..ed80577 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -175,9 +175,9 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar } } -static inline BOOL ffp_clip_emul(IWineD3DStateBlockImpl *stateblock) +static inline BOOL ffp_clip_emul(const struct wined3d_state *state) { - return stateblock->state.lowest_disabled_stage < 7; + return state->lowest_disabled_stage < 7; } /* ARB_program_shader private data */ @@ -4450,12 +4450,14 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW WORD int_skip; IWineD3DDeviceImpl *dev = (IWineD3DDeviceImpl *)shader->baseShader.device; const struct wined3d_gl_info *gl_info = &dev->adapter->gl_info; + const struct wined3d_state *state = &stateblock->state; + find_vs_compile_args(shader, stateblock, &args->super); args->clip.boolclip_compare = 0; if(use_ps(stateblock)) { - IWineD3DPixelShaderImpl *ps = stateblock->state.pixel_shader; + IWineD3DPixelShaderImpl *ps = state->pixel_shader; struct arb_pshader_private *shader_priv = ps->baseShader.backend_data; args->ps_signature = shader_priv->input_signature_idx; @@ -4466,15 +4468,15 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW args->ps_signature = ~0; if(!dev->vs_clipping) { - args->clip.boolclip.clip_texcoord = ffp_clip_emul(stateblock) ? gl_info->limits.texture_stages : 0; + args->clip.boolclip.clip_texcoord = ffp_clip_emul(state) ? gl_info->limits.texture_stages : 0; } /* Otherwise: Setting boolclip_compare set clip_texcoord to 0 */ } if (args->clip.boolclip.clip_texcoord) { - if (stateblock->state.render_states[WINED3DRS_CLIPPING]) - args->clip.boolclip.clipplane_mask = (unsigned char)stateblock->state.render_states[WINED3DRS_CLIPPLANEENABLE]; + if (state->render_states[WINED3DRS_CLIPPING]) + args->clip.boolclip.clipplane_mask = (unsigned char)state->render_states[WINED3DRS_CLIPPLANEENABLE]; /* clipplane_mask was set to 0 by setting boolclip_compare to 0 */ } @@ -4483,7 +4485,7 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW /* TODO: Figure out if it would be better to store bool constants as bitmasks in the stateblock */ for(i = 0; i < MAX_CONST_B; i++) { - if (stateblock->state.vs_consts_b[i]) + if (state->vs_consts_b[i]) args->clip.boolclip.bools |= ( 1 << i); } @@ -4511,9 +4513,9 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW } else { - args->loop_ctrl[i][0] = stateblock->state.vs_consts_i[i * 4]; - args->loop_ctrl[i][1] = stateblock->state.vs_consts_i[i * 4 + 1]; - args->loop_ctrl[i][2] = stateblock->state.vs_consts_i[i * 4 + 2]; + args->loop_ctrl[i][0] = state->vs_consts_i[i * 4]; + args->loop_ctrl[i][1] = state->vs_consts_i[i * 4 + 1]; + args->loop_ctrl[i][2] = state->vs_consts_i[i * 4 + 2]; } } } @@ -5979,7 +5981,8 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi srgb_sub_high, 0.0, 0.0, 0.0); } - if(ffp_clip_emul(stateblock) && settings->emul_clipplanes) shader_addline(&buffer, "KIL fragment.texcoord[7];\n"); + if (ffp_clip_emul(&stateblock->state) && settings->emul_clipplanes) + shader_addline(&buffer, "KIL fragment.texcoord[7];\n"); /* Generate texture sampling instructions) */ for(stage = 0; stage < MAX_TEXTURES && settings->op[stage].cop != WINED3DTOP_DISABLE; stage++) {

1 0