September 2011 - Wine-Commits

Francois Gouget : ddraw/tests: Make enum_z_fmt_cb() static.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: 3a9343e520405df1d077c21e47c6542f3091a966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9343e520405df1d077c21e4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 2 10:51:00 2011 +0200 ddraw/tests: Make enum_z_fmt_cb() static. --- dlls/ddraw/tests/d3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index a916f29..4031a75 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -4369,7 +4369,7 @@ static void dump_format(const DDPIXELFORMAT *fmt) fmt->dwStencilBitMask, fmt->dwRGBZBitMask); } -HRESULT WINAPI enum_z_fmt_cb(DDPIXELFORMAT *fmt, void *ctx) +static HRESULT WINAPI enum_z_fmt_cb(DDPIXELFORMAT *fmt, void *ctx) { static const DDPIXELFORMAT formats[] = {

1 0

Alexandre Julliard : gdi32: Make the BITMAPINFO parameters non-const in driver entry points since we are always passing a copy .
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: a0f1b204649268bea8a2f99c384faee2813a7fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f1b204649268bea8a2f99c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 2 15:53:10 2011 +0200 gdi32: Make the BITMAPINFO parameters non-const in driver entry points since we are always passing a copy. --- dlls/gdi32/dib.c | 2 +- dlls/gdi32/driver.c | 4 ++-- dlls/gdi32/enhmfdrv/bitblt.c | 4 ++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 5 ++--- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/mfdrv/bitblt.c | 5 ++--- dlls/gdi32/mfdrv/metafiledrv.h | 5 ++--- dlls/wineps.drv/bitmap.c | 2 +- dlls/wineps.drv/psdrv.h | 2 +- dlls/winex11.drv/dib.c | 4 ++-- dlls/winex11.drv/x11drv.h | 4 ++-- include/wine/gdi_driver.h | 6 +++--- 12 files changed, 21 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0f1b204649268bea8a2f…

1 0

Stefan Dösinger : ddraw: Mark DepthFill blit failures between beginScene and EndScene broken.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: 5ce2e1f39e139070d648f30a914bbf82a16ffed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce2e1f39e139070d648f30a9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 28 16:23:49 2011 +0200 ddraw: Mark DepthFill blit failures between beginScene and EndScene broken. --- dlls/ddraw/tests/d3d.c | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 4031a75..c799678 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -706,20 +706,35 @@ static void SceneTest(void) /* Test a normal BeginScene / EndScene pair, this should work */ hr = IDirect3DDevice7_BeginScene(lpD3DDevice); ok(hr == D3D_OK, "IDirect3DDevice7_BeginScene failed with %08x\n", hr); - if(SUCCEEDED(hr)) + if (SUCCEEDED(hr)) + { + hr = IDirect3DDevice7_EndScene(lpD3DDevice); + ok(hr == D3D_OK, "IDirect3DDevice7_EndScene failed with %08x\n", hr); + } + + if (lpDDSdepth) { DDBLTFX fx; memset(&fx, 0, sizeof(fx)); fx.dwSize = sizeof(fx); - if(lpDDSdepth) { + hr = IDirectDrawSurface7_Blt(lpDDSdepth, NULL, NULL, NULL, DDBLT_DEPTHFILL, &fx); + ok(hr == D3D_OK, "Depthfill failed outside a BeginScene / EndScene pair, hr 0x%08x\n", hr); + + hr = IDirect3DDevice7_BeginScene(lpD3DDevice); + ok(hr == D3D_OK, "IDirect3DDevice7_BeginScene failed with %08x\n", hr); + if (SUCCEEDED(hr)) + { hr = IDirectDrawSurface7_Blt(lpDDSdepth, NULL, NULL, NULL, DDBLT_DEPTHFILL, &fx); - ok(hr == D3D_OK, "Depthfill failed in a BeginScene / EndScene pair\n"); - } else { - skip("Depth stencil creation failed at startup, skipping\n"); + ok(hr == D3D_OK || broken(hr == E_FAIL), + "Depthfill failed in a BeginScene / EndScene pair, hr 0x%08x\n", hr); + hr = IDirect3DDevice7_EndScene(lpD3DDevice); + ok(hr == D3D_OK, "IDirect3DDevice7_EndScene failed with %08x\n", hr); } - hr = IDirect3DDevice7_EndScene(lpD3DDevice); - ok(hr == D3D_OK, "IDirect3DDevice7_EndScene failed with %08x\n", hr); + } + else + { + skip("Depth stencil creation failed at startup, skipping depthfill test\n"); } /* Test another EndScene without having begun a new scene. Should return an error */

1 0

Jacek Caban : mshtml: Added support for text/vbscript script type.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: 3a268796b82a3ffc4f11c986d69a80066f620453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a268796b82a3ffc4f11c986d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 2 12:03:17 2011 +0200 mshtml: Added support for text/vbscript script type. --- dlls/mshtml/script.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 9b1a81e..25ae0b6 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -48,6 +48,8 @@ static const WCHAR emptyW[] = {0}; static const CLSID CLSID_JScript = {0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; +static const CLSID CLSID_VBScript = + {0xb54f3741,0x5b07,0x11cf,{0xa4,0xb0,0x00,0xaa,0x00,0x4a,0x55,0xe8}}; struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; @@ -718,10 +720,14 @@ static BOOL get_guid_from_type(LPCWSTR type, GUID *guid) { const WCHAR text_javascriptW[] = {'t','e','x','t','/','j','a','v','a','s','c','r','i','p','t',0}; + const WCHAR text_vbscriptW[] = + {'t','e','x','t','/','v','b','s','c','r','i','p','t',0}; /* FIXME: Handle more types */ if(!strcmpiW(type, text_javascriptW)) { *guid = CLSID_JScript; + }else if(!strcmpiW(type, text_vbscriptW)) { + *guid = CLSID_VBScript; }else { FIXME("Unknown type %s\n", debugstr_w(type)); return FALSE;

1 0

Jacek Caban : vbscript: Moved includes required by vbscript.h to the header .
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: 4f5b2a4c3acbd23c1da981523b674aae5f4c653c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f5b2a4c3acbd23c1da981523… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 2 13:16:27 2011 +0200 vbscript: Moved includes required by vbscript.h to the header. --- dlls/vbscript/vbscript.c | 10 +--------- dlls/vbscript/vbscript.h | 8 ++++++++ dlls/vbscript/vbscript_main.c | 11 +---------- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 04a513f..b50cbd6 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -16,19 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include <stdarg.h> #include <assert.h> -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "objsafe.h" - #include "vbscript.h" +#include "objsafe.h" #include "wine/debug.h" diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 98a4486..29909f2 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -16,7 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" #include "activscp.h" + #include "vbscript_classes.h" typedef struct { diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 71eaa86..fc31aed 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -16,20 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" #include "initguid.h" -#include "ole2.h" +#include "vbscript.h" #include "objsafe.h" #include "rpcproxy.h" -#include "vbscript.h" #include "vbscript_classes.h" #include "wine/debug.h"

1 0

André Hentschel : urlmon/tests: Print out the wrong mime.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: 62dca77bb3341846af010397c26adad34c66041b URL: http://source.winehq.org/git/wine.git/?a=commit;h=62dca77bb3341846af010397c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Sep 1 22:43:28 2011 +0200 urlmon/tests: Print out the wrong mime. --- dlls/urlmon/tests/misc.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index ecb0c87..cfa04f0 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -666,7 +666,7 @@ static void test_FindMimeFromData(void) hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, NULL, 0, &mime, 0); if(mime_tests[i].mime) { ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!lstrcmpW(mime, mime_tests[i].mime), "[%d] wrong mime\n", i); + ok(!lstrcmpW(mime, mime_tests[i].mime), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); }else { ok(hres == E_FAIL || hres == mime_tests[i].hres, @@ -678,13 +678,13 @@ static void test_FindMimeFromData(void) mime = (LPWSTR)0xf0f0f0f0; hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, mimeTextPlain, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!lstrcmpW(mime, mimeTextPlain), "[%d] wrong mime\n", i); + ok(!lstrcmpW(mime, mimeTextPlain), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); mime = (LPWSTR)0xf0f0f0f0; hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, mimeAppOctetStream, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!lstrcmpW(mime, mimeAppOctetStream), "[%d] wrong mime\n", i); + ok(!lstrcmpW(mime, mimeAppOctetStream), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); } @@ -700,16 +700,16 @@ static void test_FindMimeFromData(void) ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); if(!lstrcmpW(mimeAppOctetStream, mime_tests2[i].mime) || !lstrcmpW(mimeTextPlain, mime_tests2[i].mime)) - ok(!lstrcmpW(mime, mimeTextHtml), "[%d] wrong mime\n", i); + ok(!lstrcmpW(mime, mimeTextHtml), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); else - ok(!lstrcmpW(mime, mime_tests2[i].mime), "[%d] wrong mime\n", i); + ok(!lstrcmpW(mime, mime_tests2[i].mime), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, mimeImagePjpeg, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); if(!lstrcmpW(mimeAppOctetStream, mime_tests2[i].mime) || i == 17) - ok(!lstrcmpW(mime, mimeImagePjpeg), "[%d] wrong mime\n", i); + ok(!lstrcmpW(mime, mimeImagePjpeg), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); else ok(!lstrcmpW(mime, mime_tests2[i].mime) || (mime_tests2[i].mime_alt && !lstrcmpW(mime, mime_tests2[i].mime_alt)), @@ -720,17 +720,17 @@ static void test_FindMimeFromData(void) hres = pFindMimeFromData(NULL, url1, data1, sizeof(data1), NULL, 0, &mime, 0); ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime\n"); + ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, url1, data1, sizeof(data1), mimeAppOctetStream, 0, &mime, 0); ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime\n"); + ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, url4, data1, sizeof(data1), mimeAppOctetStream, 0, &mime, 0); ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime\n"); + ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, NULL, NULL, 0, NULL, 0, &mime, 0); @@ -747,7 +747,7 @@ static void test_FindMimeFromData(void) hres = pFindMimeFromData(NULL, NULL, data1, 0, mimeTextPlain, 0, &mime, 0); ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime\n"); + ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, NULL, data1, 0, mimeTextPlain, 0, NULL, 0);

1 0

Piotr Caban : jscript: Limit name hash computations number.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: 65a7f475313410cd6a9184700c9bdedb02925767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65a7f475313410cd6a9184700… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 2 12:24:35 2011 +0200 jscript: Limit name hash computations number. --- dlls/jscript/dispex.c | 38 ++++++++++++++++++++------------------ 1 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index b80f6f2..0d584f0 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -42,6 +42,7 @@ typedef enum { struct _dispex_prop_t { WCHAR *name; + unsigned hash; prop_type_t type; DWORD flags; @@ -139,7 +140,7 @@ static inline HRESULT resize_props(jsdisp_t *This) for(i=1; i<This->prop_cnt; i++) { props = This->props+i; - bucket = get_props_idx(This, string_hash(props->name)); + bucket = get_props_idx(This, props->hash); props->bucket_next = This->props[bucket].bucket_head; This->props[bucket].bucket_head = i; } @@ -161,8 +162,9 @@ static inline dispex_prop_t* alloc_prop(jsdisp_t *This, const WCHAR *name, prop_ return NULL; prop->type = type; prop->flags = flags; + prop->hash = string_hash(name); - bucket = get_props_idx(This, string_hash(name)); + bucket = get_props_idx(This, prop->hash); prop->bucket_next = This->props[bucket].bucket_head; This->props[bucket].bucket_head = This->prop_cnt++; return prop; @@ -180,13 +182,13 @@ static dispex_prop_t *alloc_protref(jsdisp_t *This, const WCHAR *name, DWORD ref return ret; } -static HRESULT find_prop_name(jsdisp_t *This, const WCHAR *name, dispex_prop_t **ret) +static HRESULT find_prop_name(jsdisp_t *This, unsigned hash, const WCHAR *name, dispex_prop_t **ret) { const builtin_prop_t *builtin; unsigned bucket, pos, prev = 0; dispex_prop_t *prop; - bucket = get_props_idx(This, string_hash(name)); + bucket = get_props_idx(This, hash); pos = This->props[bucket].bucket_head; while(pos != 0) { if(!strcmpW(name, This->props[pos].name)) { @@ -219,12 +221,12 @@ static HRESULT find_prop_name(jsdisp_t *This, const WCHAR *name, dispex_prop_t * return S_OK; } -static HRESULT find_prop_name_prot(jsdisp_t *This, const WCHAR *name, dispex_prop_t **ret) +static HRESULT find_prop_name_prot(jsdisp_t *This, unsigned hash, const WCHAR *name, dispex_prop_t **ret) { dispex_prop_t *prop, *del=NULL; HRESULT hres; - hres = find_prop_name(This, name, &prop); + hres = find_prop_name(This, hash, name, &prop); if(FAILED(hres)) return hres; if(prop && prop->type==PROP_DELETED) { @@ -235,7 +237,7 @@ static HRESULT find_prop_name_prot(jsdisp_t *This, const WCHAR *name, dispex_pro } if(This->prototype) { - hres = find_prop_name_prot(This->prototype, name, &prop); + hres = find_prop_name_prot(This->prototype, hash, name, &prop); if(FAILED(hres)) return hres; if(prop) { @@ -265,9 +267,9 @@ static HRESULT ensure_prop_name(jsdisp_t *This, const WCHAR *name, BOOL search_p HRESULT hres; if(search_prot) - hres = find_prop_name_prot(This, name, &prop); + hres = find_prop_name_prot(This, string_hash(name), name, &prop); else - hres = find_prop_name(This, name, &prop); + hres = find_prop_name(This, string_hash(name), name, &prop); if(SUCCEEDED(hres) && (!prop || prop->type==PROP_DELETED)) { TRACE("creating prop %s\n", debugstr_w(name)); @@ -482,7 +484,7 @@ static HRESULT fill_protrefs(jsdisp_t *This) for(iter = This->prototype->props; iter < This->prototype->props+This->prototype->prop_cnt; iter++) { if(!iter->name) continue; - hres = find_prop_name(This, iter->name, &prop); + hres = find_prop_name(This, iter->hash, iter->name, &prop); if(FAILED(hres)) return hres; if(!prop || prop->type==PROP_DELETED) { @@ -716,7 +718,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bst if(grfdex & ~(fdexNameCaseSensitive|fdexNameEnsure|fdexNameImplicit|FDEX_VERSION_MASK)) FIXME("Unsupported grfdex %x\n", grfdex); - hres = find_prop_name(This, bstrName, &prop); + hres = find_prop_name(This, string_hash(bstrName), bstrName, &prop); if(FAILED(hres)) return hres; if(!prop) { @@ -890,7 +892,7 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built static const WCHAR constructorW[] = {'c','o','n','s','t','r','u','c','t','o','r',0}; static const WCHAR prototypeW[] = {'p','r','o','t','o','t','y','p','e',0}; - hres = find_prop_name_prot(constr, prototypeW, &prop); + hres = find_prop_name_prot(constr, string_hash(prototypeW), prototypeW, &prop); if(SUCCEEDED(hres) && prop && prop->type!=PROP_DELETED) { jsexcept_t jsexcept; VARIANT var; @@ -950,7 +952,7 @@ HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID * if(flags & fdexNameEnsure) hres = ensure_prop_name(jsdisp, name, TRUE, PROPF_ENUM, &prop); else - hres = find_prop_name_prot(jsdisp, name, &prop); + hres = find_prop_name_prot(jsdisp, string_hash(name), name, &prop); if(FAILED(hres)) return hres; @@ -997,7 +999,7 @@ HRESULT jsdisp_call_name(jsdisp_t *disp, const WCHAR *name, WORD flags, DISPPARA dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(disp, name, &prop); + hres = find_prop_name_prot(disp, string_hash(name), name, &prop); if(FAILED(hres)) return hres; @@ -1123,7 +1125,7 @@ HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, VARIANT *var, jsex dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(obj, name, &prop); + hres = find_prop_name_prot(obj, string_hash(name), name, &prop); if(FAILED(hres)) return hres; @@ -1145,7 +1147,7 @@ HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, VARIANT *var, jsexcept_t *ei, I sprintfW(name, formatW, idx); - hres = find_prop_name_prot(obj, name, &prop); + hres = find_prop_name_prot(obj, string_hash(name), name, &prop); if(FAILED(hres)) return hres; @@ -1206,7 +1208,7 @@ HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx) sprintfW(buf, formatW, idx); - hres = find_prop_name(obj, buf, &prop); + hres = find_prop_name(obj, string_hash(buf), buf, &prop); if(FAILED(hres) || !prop) return hres; @@ -1218,7 +1220,7 @@ VARIANT_BOOL jsdisp_is_own_prop(jsdisp_t *obj, BSTR name) dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name(obj, name, &prop); + hres = find_prop_name(obj, string_hash(name), name, &prop); if(FAILED(hres)) return VARIANT_FALSE; else if(!prop)

1 0

Francois Gouget : msi: Make find_table() static.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: 2649761175fb4f787d17ffdf18c8452f91a525b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2649761175fb4f787d17ffdf1… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 2 10:51:16 2011 +0200 msi: Make find_table() static. --- dlls/msi/where.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index cc80a71..5304900 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -149,7 +149,7 @@ static UINT add_row(MSIWHEREVIEW *wv, UINT vals[]) return ERROR_SUCCESS; } -JOINTABLE *find_table(MSIWHEREVIEW *wv, UINT col, UINT *table_col) +static JOINTABLE *find_table(MSIWHEREVIEW *wv, UINT col, UINT *table_col) { JOINTABLE *table = wv->tables;

1 0

Michael Stefaniuc : oleaut32: COM cleanup in typelib2.c.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: 22521b5809a3b140dcd276fbb33261163326ed45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22521b5809a3b140dcd276fbb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 2 10:25:23 2011 +0200 oleaut32: COM cleanup in typelib2.c. --- dlls/oleaut32/typelib2.c | 79 ++++++++++++++++++++++----------------------- 1 files changed, 39 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22521b5809a3b140dcd27…

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_clip_plane() const.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: d23938de1e5bc0cbadff31502a89d539ed06af65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d23938de1e5bc0cbadff31502… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 20:20:57 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_clip_plane() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dfa96f6..6ab48f0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2278,7 +2278,7 @@ HRESULT CDECL wined3d_device_set_clip_plane(struct wined3d_device *device, UINT return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_clip_plane(struct wined3d_device *device, UINT plane_idx, float *plane) +HRESULT CDECL wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, float *plane) { TRACE("device %p, plane_idx %u, plane %p.\n", device, plane_idx, plane); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e22feb5..b519348 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2208,7 +2208,7 @@ UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_devic HRESULT __cdecl wined3d_device_get_back_buffer(struct wined3d_device *device, UINT swapchain_idx, UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer); INT __cdecl wined3d_device_get_base_vertex_index(struct wined3d_device *device); -HRESULT __cdecl wined3d_device_get_clip_plane(struct wined3d_device *device, UINT plane_idx, float *plane); +HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, float *plane); HRESULT __cdecl wined3d_device_get_clip_status(struct wined3d_device *device, WINED3DCLIPSTATUS *clip_status); HRESULT __cdecl wined3d_device_get_creation_parameters(struct wined3d_device *device, WINED3DDEVICE_CREATION_PARAMETERS *creation_parameters);

1 0