August 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : advapi32/tests: Skip some tests if EnumServicesStatusExA is missing.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: d34ff2623085c30c3523514ba7b7ecc7d9e6758d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d34ff2623085c30c3523514ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 25 11:19:56 2011 +0200 advapi32/tests: Skip some tests if EnumServicesStatusExA is missing. --- dlls/advapi32/tests/service.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index ddfae4d..eecc86a 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1402,6 +1402,11 @@ static void test_enum_svc(void) CloseServiceHandle(scm_handle); /* More or less the same for EnumServicesStatusExA */ + if (!pEnumServicesStatusExA) + { + win_skip( "EnumServicesStatusExA not available\n" ); + return; + } /* All NULL or wrong */ SetLastError(0xdeadbeef);

1 0

Michał Ziętek : wscript: Implemented Host_get_Arguments.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 2d2a91fd0183c7d2b751cee2251d0e9b67c85161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2a91fd0183c7d2b751cee22… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Tue Aug 23 15:15:48 2011 +0200 wscript: Implemented Host_get_Arguments. --- programs/wscript/Makefile.in | 1 + programs/wscript/arguments.c | 127 +++++++++++++++++++++++++++++++++++++++++ programs/wscript/host.c | 6 +- programs/wscript/main.c | 3 + programs/wscript/tests/run.js | 1 + programs/wscript/wscript.h | 4 + 6 files changed, 140 insertions(+), 2 deletions(-) diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in index 65fe3a4..49836b9 100644 --- a/programs/wscript/Makefile.in +++ b/programs/wscript/Makefile.in @@ -7,6 +7,7 @@ RC_SRCS = \ rsrc.rc C_SRCS = \ + arguments.c \ host.c \ main.c diff --git a/programs/wscript/arguments.c b/programs/wscript/arguments.c new file mode 100644 index 0000000..4b10d2f --- /dev/null +++ b/programs/wscript/arguments.c @@ -0,0 +1,127 @@ +/* + * Copyright 2011 Michal Zietek + * + * 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 <stdarg.h> + +#define COBJMACROS +#define CONST_VTABLE + +#include <windef.h> +#include <winbase.h> +#include <ole2.h> + +#include "wscript.h" + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(wscript); + +static HRESULT WINAPI Arguments2_QueryInterface(IArguments2 *iface, REFIID riid, void **ppv) +{ + WINE_TRACE("(%s %p)\n", wine_dbgstr_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid) + || IsEqualGUID(&IID_IDispatch, riid) + || IsEqualGUID(&IID_IArguments2, riid)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI Arguments2_AddRef(IArguments2 *iface) +{ + return 2; +} + +static ULONG WINAPI Arguments2_Release(IArguments2 *iface) +{ + return 1; +} + +static HRESULT WINAPI Arguments2_GetTypeInfoCount(IArguments2 *iface, UINT *pctinfo) +{ + WINE_TRACE("(%p)\n", pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI Arguments2_GetTypeInfo(IArguments2 *iface, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) +{ + WINE_TRACE("(%x %x %p\n", iTInfo, lcid, ppTInfo); + + ITypeInfo_AddRef(arguments_ti); + *ppTInfo = arguments_ti; + return S_OK; +} + +static HRESULT WINAPI Arguments2_GetIDsOfNames(IArguments2 *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WINE_TRACE("(%s %p %d %x %p)\n", wine_dbgstr_guid(riid), rgszNames, + cNames, lcid, rgDispId); + + return ITypeInfo_GetIDsOfNames(arguments_ti, rgszNames, cNames, rgDispId); +} + +static HRESULT WINAPI Arguments2_Invoke(IArguments2 *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WINE_TRACE("(%d %p %p)\n", dispIdMember, pDispParams, pVarResult); + + return ITypeInfo_Invoke(arguments_ti, iface, dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI Arguments2_Item(IArguments2 *iface, LONG index, BSTR *out_Value) +{ + WINE_FIXME("(%d %p)\n", index, out_Value); + return E_NOTIMPL; +} + +static HRESULT WINAPI Arguments2_Count(IArguments2 *iface, LONG *out_Count) +{ + WINE_FIXME("(%p)\n", out_Count); + return E_NOTIMPL; +} + +static HRESULT WINAPI Arguments2_get_length(IArguments2 *iface, LONG *out_Count) +{ + WINE_FIXME("(%p)\n", out_Count); + return E_NOTIMPL; +} + +static const IArguments2Vtbl Arguments2Vtbl = { + Arguments2_QueryInterface, + Arguments2_AddRef, + Arguments2_Release, + Arguments2_GetTypeInfoCount, + Arguments2_GetTypeInfo, + Arguments2_GetIDsOfNames, + Arguments2_Invoke, + Arguments2_Item, + Arguments2_Count, + Arguments2_get_length +}; + +IArguments2 arguments_obj = { &Arguments2Vtbl }; diff --git a/programs/wscript/host.c b/programs/wscript/host.c index d17e4b4..02a9291 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -185,8 +185,10 @@ static HRESULT WINAPI Host_get_ScriptFullName(IHost *iface, BSTR *out_ScriptFull static HRESULT WINAPI Host_get_Arguments(IHost *iface, IArguments2 **out_Arguments) { - WINE_FIXME("(%p)\n", out_Arguments); - return E_NOTIMPL; + WINE_TRACE("(%p)\n", out_Arguments); + + *out_Arguments = &arguments_obj; + return S_OK; } static HRESULT WINAPI Host_get_Version(IHost *iface, BSTR *out_Version) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 8bf0712..2f9b15c 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -39,6 +39,7 @@ static const WCHAR wshW[] = {'W','S','H',0}; WCHAR scriptFullName[MAX_PATH]; ITypeInfo *host_ti; +ITypeInfo *arguments_ti; static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) @@ -166,6 +167,8 @@ static BOOL load_typelib(void) return FALSE; hres = ITypeLib_GetTypeInfoOfGuid(typelib, &IID_IHost, &host_ti); + if(SUCCEEDED(hres)) + hres = ITypeLib_GetTypeInfoOfGuid(typelib, &IID_IArguments2, &arguments_ti); ITypeLib_Release(typelib); return SUCCEEDED(hres); diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 5e61d69..e1c9da8 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -32,5 +32,6 @@ ok(WScript.FullName === winetest.wscriptFullName, "WScript.FullName = ", WScript ok(WScript.Path === winetest.wscriptPath, "WScript.Path = ", WScript.Path); ok(WScript.ScriptName === winetest.wscriptScriptName, "WScript.ScriptName = " + WScript.ScriptName); ok(WScript.ScriptFullName === winetest.wscriptScriptFullName, "WScript.ScriptFullName = " + WScript.ScriptFullName); +ok(typeof(WScript.Arguments) === "object", "typeof(WScript.Arguments) = " + typeof(WScript.Arguments)); winetest.reportSuccess(); diff --git a/programs/wscript/wscript.h b/programs/wscript/wscript.h index 642784e..c4b2eb2 100644 --- a/programs/wscript/wscript.h +++ b/programs/wscript/wscript.h @@ -20,6 +20,10 @@ extern IHost host_obj; +extern IArguments2 arguments_obj; + extern ITypeInfo *host_ti; +extern ITypeInfo *arguments_ti; + extern WCHAR scriptFullName[];

1 0

Michał Ziętek : wscript: Implemented Arguments2_Item.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 1c293750313d9f6a173de8c21a02e6045d61ef57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c293750313d9f6a173de8c21… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Tue Aug 23 15:15:54 2011 +0200 wscript: Implemented Arguments2_Item. --- programs/wscript/arguments.c | 13 +++++++++++-- programs/wscript/main.c | 2 ++ programs/wscript/tests/run.c | 2 +- programs/wscript/tests/run.js | 7 +++++++ programs/wscript/wscript.h | 4 ++++ 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/programs/wscript/arguments.c b/programs/wscript/arguments.c index 4b10d2f..62d6ad0 100644 --- a/programs/wscript/arguments.c +++ b/programs/wscript/arguments.c @@ -31,6 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wscript); +WCHAR **argums; +int numOfArgs; + static HRESULT WINAPI Arguments2_QueryInterface(IArguments2 *iface, REFIID riid, void **ppv) { WINE_TRACE("(%s %p)\n", wine_dbgstr_guid(riid), ppv); @@ -95,8 +98,14 @@ static HRESULT WINAPI Arguments2_Invoke(IArguments2 *iface, DISPID dispIdMember, static HRESULT WINAPI Arguments2_Item(IArguments2 *iface, LONG index, BSTR *out_Value) { - WINE_FIXME("(%d %p)\n", index, out_Value); - return E_NOTIMPL; + WINE_TRACE("(%d %p)\n", index, out_Value); + + if(index<0 || index >= numOfArgs) + return E_INVALIDARG; + if(!(*out_Value = SysAllocString(argums[index]))) + return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI Arguments2_Count(IArguments2 *iface, LONG *out_Count) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 2f9b15c..3073445 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -343,6 +343,8 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm WINE_FIXME("Unsupported argument %s\n", wine_dbgstr_w(argv[i])); }else { filename = argv[i]; + argums = argv+i+1; + numOfArgs = argc-i-1; break; } } diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 7d43d66..b7d3c3c 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -336,7 +336,7 @@ static void run_test(const char *file_name) BOOL bres; script_name = file_name; - sprintf(command, "wscript.exe %s", file_name); + sprintf(command, "wscript.exe %s arg1 2 ar3", file_name); SET_EXPECT(reportSuccess); diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index e1c9da8..4b6014e 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -33,5 +33,12 @@ ok(WScript.Path === winetest.wscriptPath, "WScript.Path = ", WScript.Path); ok(WScript.ScriptName === winetest.wscriptScriptName, "WScript.ScriptName = " + WScript.ScriptName); ok(WScript.ScriptFullName === winetest.wscriptScriptFullName, "WScript.ScriptFullName = " + WScript.ScriptFullName); ok(typeof(WScript.Arguments) === "object", "typeof(WScript.Arguments) = " + typeof(WScript.Arguments)); +ok(WScript.Arguments.Item(0) === "arg1", "WScript.Arguments.Item(0) = " + WScript.Arguments.Item(0)); +ok(WScript.Arguments.Item(1) === "2", "WScript.Arguments.Item(1) = " + WScript.Arguments.Item(1)); +ok(WScript.Arguments.Item(2) === "ar3", "WScript.Arguments.Item(2) = " + WScript.Arguments.Item(2)); +try { + WScript.Arguments.Item(3); + ok(false, "expected exception"); +}catch(e) {} winetest.reportSuccess(); diff --git a/programs/wscript/wscript.h b/programs/wscript/wscript.h index c4b2eb2..3c9191f 100644 --- a/programs/wscript/wscript.h +++ b/programs/wscript/wscript.h @@ -27,3 +27,7 @@ extern ITypeInfo *host_ti; extern ITypeInfo *arguments_ti; extern WCHAR scriptFullName[]; + +extern WCHAR **argums; + +extern int numOfArgs;

1 0

Michał Ziętek : wscript: Implemented Arguments2_Count.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 5079fe98392813db7d59be560a156063059495b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5079fe98392813db7d59be560… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Tue Aug 23 15:15:58 2011 +0200 wscript: Implemented Arguments2_Count. --- programs/wscript/arguments.c | 6 ++++-- programs/wscript/tests/run.js | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/wscript/arguments.c b/programs/wscript/arguments.c index 62d6ad0..b50ed94 100644 --- a/programs/wscript/arguments.c +++ b/programs/wscript/arguments.c @@ -110,8 +110,10 @@ static HRESULT WINAPI Arguments2_Item(IArguments2 *iface, LONG index, BSTR *out_ static HRESULT WINAPI Arguments2_Count(IArguments2 *iface, LONG *out_Count) { - WINE_FIXME("(%p)\n", out_Count); - return E_NOTIMPL; + WINE_TRACE("(%p)\n", out_Count); + + *out_Count = numOfArgs; + return S_OK; } static HRESULT WINAPI Arguments2_get_length(IArguments2 *iface, LONG *out_Count) diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 4b6014e..dde3caf 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -40,5 +40,6 @@ try { WScript.Arguments.Item(3); ok(false, "expected exception"); }catch(e) {} +ok(WScript.Arguments.Count() === 3, "WScript.Arguments.Count() = " + WScript.Arguments.Count()); winetest.reportSuccess();

1 0

André Hentschel : mshtml: Remove obsolete proxy handling.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: da7f9ed16b6c1537a5a1933c0a545c63737542b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7f9ed16b6c1537a5a1933c0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 22 20:48:06 2011 +0200 mshtml: Remove obsolete proxy handling. --- dlls/mshtml/nsembed.c | 50 ------------------------------------------------- 1 files changed, 0 insertions(+), 50 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 2bebf8b..b6de72f 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -486,55 +486,6 @@ static void set_lang(nsIPrefBranch *pref) set_string_pref(pref, "intl.accept_languages", langs); } -static void set_proxy(nsIPrefBranch *pref) -{ - char proxy[512]; - char * proxy_port; - int proxy_port_num; - DWORD enabled = 0, res, size, type; - HKEY hkey; - - static const WCHAR proxy_keyW[] = - {'S','o','f','t','w','a','r','e', - '\\','M','i','c','r','o','s','o','f','t', - '\\','W','i','n','d','o','w','s', - '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', - '\\','I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0}; - - res = RegOpenKeyW(HKEY_CURRENT_USER, proxy_keyW, &hkey); - if(res != ERROR_SUCCESS) - return; - - size = sizeof(enabled); - res = RegQueryValueExA(hkey, "ProxyEnable", 0, &type, (LPBYTE)&enabled, &size); - if(res != ERROR_SUCCESS || type != REG_DWORD || enabled == 0) - { - RegCloseKey(hkey); - return; - } - - size = sizeof(proxy); - res = RegQueryValueExA(hkey, "ProxyServer", 0, &type, (LPBYTE)proxy, &size); - RegCloseKey(hkey); - if(res != ERROR_SUCCESS || type != REG_SZ) - return; - - proxy_port = strchr(proxy, ':'); - if (!proxy_port) - return; - - *proxy_port = 0; - proxy_port_num = atoi(proxy_port + 1); - TRACE("Setting proxy to %s, port %d\n", debugstr_a(proxy), proxy_port_num); - - set_string_pref(pref, "network.proxy.http", proxy); - set_string_pref(pref, "network.proxy.ssl", proxy); - - set_int_pref(pref, "network.proxy.type", 1); - set_int_pref(pref, "network.proxy.http_port", proxy_port_num); - set_int_pref(pref, "network.proxy.ssl_port", proxy_port_num); -} - static void set_preferences(void) { nsIPrefBranch *pref; @@ -548,7 +499,6 @@ static void set_preferences(void) } set_lang(pref); - set_proxy(pref); set_bool_pref(pref, "security.warn_entering_secure", FALSE); set_bool_pref(pref, "security.warn_submit_insecure", FALSE); set_int_pref(pref, "layout.spellcheckDefault", 0);

1 0

Matteo Bruni : wined3d: Make context_acquire() unconditional in a bunch of places.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: be8ea9c36ee94362d804695703734c98ae7c95c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be8ea9c36ee94362d80469570… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 27 23:14:34 2011 +0200 wined3d: Make context_acquire() unconditional in a bunch of places. --- dlls/wined3d/surface.c | 40 ++++++++++++++++++---------------------- dlls/wined3d/texture.c | 11 +++++------ 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0572b47..110d68a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3861,11 +3861,12 @@ void surface_internal_preload(struct wined3d_surface *surface, enum WINED3DSRGB } else { - struct wined3d_context *context = NULL; + struct wined3d_context *context; TRACE("(%p) : About to load surface\n", surface); - if (!device->isInDraw) context = context_acquire(device, NULL); + /* TODO: Use already acquired context when possible. */ + context = context_acquire(device, NULL); if (surface->resource.format->id == WINED3DFMT_P8_UINT || surface->resource.format->id == WINED3DFMT_P8_UINT_A8_UNORM) @@ -3892,7 +3893,7 @@ void surface_internal_preload(struct wined3d_surface *surface, enum WINED3DSRGB LEAVE_GL(); } - if (context) context_release(context); + context_release(context); } } @@ -5888,16 +5889,15 @@ static void surface_load_sysmem(struct wined3d_surface *surface, if (surface->flags & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX)) { struct wined3d_device *device = surface->resource.device; - struct wined3d_context *context = NULL; + struct wined3d_context *context; - if (!device->isInDraw) - context = context_acquire(device, NULL); + /* TODO: Use already acquired context when possible. */ + context = context_acquire(device, NULL); surface_bind_and_dirtify(surface, gl_info, !(surface->flags & SFLAG_INTEXTURE)); surface_download_data(surface, gl_info); - if (context) - context_release(context); + context_release(context); return; } @@ -5943,17 +5943,16 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, * called. */ if ((convert != NO_CONVERSION) && (surface->flags & SFLAG_PBO)) { - struct wined3d_context *context = NULL; + struct wined3d_context *context; TRACE("Removing the pbo attached to surface %p.\n", surface); - if (!device->isInDraw) - context = context_acquire(device, NULL); + /* TODO: Use already acquired context when possible. */ + context = context_acquire(device, NULL); surface_remove_pbo(surface, gl_info); - if (context) - context_release(context); + context_release(context); } if ((convert != NO_CONVERSION) && surface->resource.allocatedMemory) @@ -6003,7 +6002,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, const DWORD attach_flags = WINED3DFMT_FLAG_FBO_ATTACHABLE | WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB; RECT src_rect = {0, 0, surface->resource.width, surface->resource.height}; struct wined3d_device *device = surface->resource.device; - struct wined3d_context *context = NULL; + struct wined3d_context *context; UINT width, src_pitch, dst_pitch; struct wined3d_bo_address data; struct wined3d_format format; @@ -6067,8 +6066,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, surface_load_location(surface, SFLAG_INSYSMEM, rect); } - if (!device->isInDraw) - context = context_acquire(device, NULL); + /* TODO: Use already acquired context when possible. */ + context = context_acquire(device, NULL); surface_prepare_texture(surface, gl_info, srgb); surface_bind_and_dirtify(surface, gl_info, srgb); @@ -6104,8 +6103,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, if (!(mem = HeapAlloc(GetProcessHeap(), 0, dst_pitch * height))) { ERR("Out of memory (%u).\n", dst_pitch * height); - if (context) - context_release(context); + context_release(context); return E_OUTOFMEMORY; } format.convert(surface->resource.allocatedMemory, mem, src_pitch, width, height); @@ -6122,8 +6120,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, if (!(mem = HeapAlloc(GetProcessHeap(), 0, dst_pitch * height))) { ERR("Out of memory (%u).\n", dst_pitch * height); - if (context) - context_release(context); + context_release(context); return E_OUTOFMEMORY; } d3dfmt_convert_surface(surface->resource.allocatedMemory, mem, src_pitch, @@ -6138,8 +6135,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, data.addr = mem; surface_upload_data(surface, gl_info, &format, &src_rect, width, &dst_point, srgb, &data); - if (context) - context_release(context); + context_release(context); /* Don't delete PBO memory. */ if ((mem != surface->resource.allocatedMemory) && !(surface->flags & SFLAG_PBO)) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 31bb5b5..48d64c7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1068,15 +1068,15 @@ static HRESULT texture3d_bind(struct wined3d_texture *texture, static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB srgb) { struct wined3d_device *device = texture->resource.device; - struct wined3d_context *context = NULL; + struct wined3d_context *context; BOOL srgb_was_toggled = FALSE; unsigned int i; TRACE("texture %p, srgb %#x.\n", texture, srgb); - if (!device->isInDraw) - context = context_acquire(device, NULL); - else if (texture->bind_count > 0) + /* TODO: Use already acquired context when possible. */ + context = context_acquire(device, NULL); + if (texture->bind_count > 0) { BOOL texture_srgb = texture->flags & WINED3D_TEXTURE_IS_SRGB; BOOL sampler_srgb = texture_srgb_mode(texture, srgb); @@ -1115,8 +1115,7 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB TRACE("Texture %p not dirty, nothing to do.\n", texture); } - if (context) - context_release(context); + context_release(context); /* No longer dirty */ texture->texture_rgb.dirty = FALSE;

1 0

Matteo Bruni : wined3d: Pass around the context instead of gl_info.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: e53ae83d74248c2a7c37cd084f417eaac26a6836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e53ae83d74248c2a7c37cd084… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 27 23:21:25 2011 +0200 wined3d: Pass around the context instead of gl_info. --- dlls/wined3d/arb_program_shader.c | 5 ++- dlls/wined3d/context.c | 8 +++--- dlls/wined3d/device.c | 4 +- dlls/wined3d/state.c | 2 +- dlls/wined3d/surface.c | 54 ++++++++++++++++++------------------ dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 28 +++++++++--------- dlls/wined3d/volume.c | 16 +++++----- dlls/wined3d/wined3d_private.h | 10 +++--- 9 files changed, 65 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e53ae83d74248c2a7c37c…

1 0

Henri Verbeet : wined3d: Bind the system framebuffer based on the actual location in context_apply_fbo_state ().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: f65a1ed272a476a2df3c76d3f3ce944fd4eb0d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f65a1ed272a476a2df3c76d3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:47 2011 +0200 wined3d: Bind the system framebuffer based on the actual location in context_apply_fbo_state(). We can do this now because SFLAG_INDRAWABLE is no longer ambiguous. --- dlls/wined3d/context.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e13af5f..95ec3ea 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -415,15 +415,15 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ context->rebind_fbo = FALSE; } - if (render_targets) + if (location == SFLAG_INDRAWABLE) { - context->current_fbo = context_find_fbo_entry(context, target, render_targets, depth_stencil, location); - context_apply_fbo_entry(context, target, context->current_fbo); + context->current_fbo = NULL; + context_bind_fbo(context, target, NULL); } else { - context->current_fbo = NULL; - context_bind_fbo(context, target, NULL); + context->current_fbo = context_find_fbo_entry(context, target, render_targets, depth_stencil, location); + context_apply_fbo_entry(context, target, context->current_fbo); } }

1 0

Henri Verbeet : wined3d: Pass a gl_info pointer to select_shader_backend().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 9aa4f895f084c7384993f3f0a133ced9c1018a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa4f895f084c7384993f3f0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:49 2011 +0200 wined3d: Pass a gl_info pointer to select_shader_backend(). --- dlls/wined3d/directx.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8cb6d5b..efee8fb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2152,11 +2152,11 @@ static const struct fragment_pipeline *select_fragment_implementation(const stru else return &ffp_fragment_pipeline; } -static const struct wined3d_shader_backend_ops *select_shader_backend(struct wined3d_adapter *adapter) +static const struct wined3d_shader_backend_ops *select_shader_backend(const struct wined3d_gl_info *gl_info) { int vs_selected_mode, ps_selected_mode; - select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); + select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); if (vs_selected_mode == SHADER_GLSL || ps_selected_mode == SHADER_GLSL) return &glsl_shader_backend; if (vs_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_ARB) return &arb_program_shader_backend; return &none_shader_backend; @@ -2599,7 +2599,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) LEAVE_GL(); adapter->fragment_pipe = select_fragment_implementation(gl_info); - adapter->shader_backend = select_shader_backend(adapter); + adapter->shader_backend = select_shader_backend(gl_info); adapter->blitter = select_blit_implementation(adapter); adapter->fragment_pipe->get_caps(gl_info, &fragment_caps);

1 0

Henri Verbeet : wined3d: Pass a gl_info pointer to select_fragment_implementation().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 86af42a46a9a4af14c2f8fb12ebfdf18ba80145e URL: http://source.winehq.org/git/wine.git/?a=commit;h=86af42a46a9a4af14c2f8fb12… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:48 2011 +0200 wined3d: Pass a gl_info pointer to select_fragment_implementation(). --- dlls/wined3d/directx.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 48d27af..8cb6d5b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2138,9 +2138,8 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * return CARD_NVIDIA_RIVA_128; } -static const struct fragment_pipeline *select_fragment_implementation(struct wined3d_adapter *adapter) +static const struct fragment_pipeline *select_fragment_implementation(const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = &adapter->gl_info; int vs_selected_mode, ps_selected_mode; select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); @@ -2599,7 +2598,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) LEAVE_GL(); - adapter->fragment_pipe = select_fragment_implementation(adapter); + adapter->fragment_pipe = select_fragment_implementation(gl_info); adapter->shader_backend = select_shader_backend(adapter); adapter->blitter = select_blit_implementation(adapter);

1 0