March 2014 - Wine-commits - list.winehq.org

Jacek Caban : urlmon: Fixed sec_mgr.c tests failing on some recent Windows.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: d7a4f0eb1f6d27dc64cd26d26428c459b133c431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a4f0eb1f6d27dc64cd26d26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 18 15:51:59 2014 +0100 urlmon: Fixed sec_mgr.c tests failing on some recent Windows. --- dlls/urlmon/tests/sec_mgr.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index f952780..91e1a3f 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -65,6 +65,11 @@ expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define SET_CALLED(func) \ + do { \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + DEFINE_EXPECT(ParseUrl_SECURITY_URL_input); DEFINE_EXPECT(ParseUrl_SECURITY_URL_input2); DEFINE_EXPECT(ParseUrl_SECURITY_URL_expected); @@ -509,15 +514,26 @@ static void test_url_action(IInternetSecurityManager *secmgr, IInternetZoneManag */ res = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\Zones\\3", &hkey); - if(res != ERROR_SUCCESS) { - ok(0, "Could not open zone key\n"); + ok(res == ERROR_SUCCESS, "Could not open zone key\n"); + if(res != ERROR_SUCCESS) return; - } wsprintfA(buf, "%X", action); size = sizeof(DWORD); res = RegQueryValueExA(hkey, buf, NULL, NULL, (BYTE*)&reg_policy, &size); RegCloseKey(hkey); + + /* Try settings from HKEY_LOCAL_MACHINE. */ + if(res != ERROR_SUCCESS || size != sizeof(DWORD)) { + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\Zones\\3", &hkey); + ok(res == ERROR_SUCCESS, "Could not open zone key\n"); + + size = sizeof(DWORD); + res = RegQueryValueExA(hkey, buf, NULL, NULL, (BYTE*)&reg_policy, &size); + RegCloseKey(hkey); + } + if(res != ERROR_SUCCESS || size != sizeof(DWORD)) { policy = 0xdeadbeef; hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url9, action, (BYTE*)&policy, @@ -1213,10 +1229,10 @@ static void test_GetZoneAttributes(void) ok((pZA->cbSize == 0xffffffff) || (pZA->cbSize == sizeof(ZONEATTRIBUTES)), "got cbSize = 0x%x (expected 0xffffffff)\n", pZA->cbSize); - /* IE8 no longer fail on invalid zones */ + /* IE8 up to IE10 don't fail on invalid zones */ memset(buffer, -1, sizeof(buffer)); hr = IInternetZoneManager_GetZoneAttributes(zonemgr, 0xdeadbeef, pZA); - ok(hr == S_OK || (hr == E_FAIL), + ok(hr == S_OK || hr == E_FAIL || hr == E_POINTER, "got 0x%x (expected S_OK or E_FAIL)\n", hr); hr = IInternetZoneManager_GetZoneAttributes(zonemgr, 0, NULL); @@ -1958,6 +1974,16 @@ static void test_CoInternetIsFeatureZoneElevationEnabled(void) testcases[i].policy_flags = URLPOLICY_ALLOW; } + /* IE10 does not seem to use passed ISecurityManager */ + SET_EXPECT(ProcessUrlAction); + pCoInternetIsFeatureZoneElevationEnabled(url1, url1, &security_manager, 0); + i = called_ProcessUrlAction; + SET_CALLED(ProcessUrlAction); + if(!i) { + skip("CoInternetIsFeatureZoneElevationEnabled does not use passed ISecurityManager\n"); + return; + } + for(i=0; i<sizeof(testcases)/sizeof(testcases[0]); i++) { url_from = a2w(testcases[i].url_from); url_to = a2w(testcases[i].url_to);

1 0

Jacek Caban : vbscript: Allow creating RegExp object by new expression.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: f123556f0701f5c1c36e24d4de74886e2deeb0a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f123556f0701f5c1c36e24d4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 18 15:52:13 2014 +0100 vbscript: Allow creating RegExp object by new expression. --- dlls/vbscript/interp.c | 11 +++++++++++ dlls/vbscript/tests/lang.vbs | 12 ++++++++++++ dlls/vbscript/tests/regexp.vbs | 6 ++++++ dlls/vbscript/vbregexp.c | 36 ++++++++++++++++++++++++------------ dlls/vbscript/vbscript.h | 2 ++ 5 files changed, 55 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 066d675..bc3e940 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -975,8 +975,19 @@ static HRESULT interp_new(exec_ctx_t *ctx) VARIANT v; HRESULT hres; + static const WCHAR regexpW[] = {'r','e','g','e','x','p',0}; + TRACE("%s\n", debugstr_w(arg)); + if(!strcmpiW(arg, regexpW)) { + V_VT(&v) = VT_DISPATCH; + hres = create_regexp(&V_DISPATCH(&v)); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); + } + for(class_desc = ctx->script->classes; class_desc; class_desc = class_desc->next) { if(!strcmpiW(class_desc->name, arg)) break; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 612c615..d3e8318 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1132,4 +1132,16 @@ Call testarrarg(1, "VT_I2*") Call testarrarg(false, "VT_BOOL*") Call testarrarg(Empty, "VT_EMPTY*") +' It's allowed to declare non-builtin RegExp class... +class RegExp + public property get Global() + Call ok(false, "Global called") + Global = "fail" + end property +end class + +' ...but there is no way to use it because builtin instance is always created +set x = new RegExp +Call ok(x.Global = false, "x.Global = " & x.Global) + reportSuccess() diff --git a/dlls/vbscript/tests/regexp.vbs b/dlls/vbscript/tests/regexp.vbs index 72fa108..0354fb7 100644 --- a/dlls/vbscript/tests/regexp.vbs +++ b/dlls/vbscript/tests/regexp.vbs @@ -168,4 +168,10 @@ Call ok(submatch.Count = 2, "submatch.Count = " & submatch.Count) Call ok(submatch.Item(0) = "a", "submatch.Item(0) = " & submatch.Item(0)) Call ok(submatch.Item(1) = "b", "submatch.Item(0) = " & submatch.Item(1)) +Set x = new regexp +Call ok(x.Pattern = "", "RegExp.Pattern = " & x.Pattern) +Call ok(x.IgnoreCase = false, "RegExp.IgnoreCase = " & x.IgnoreCase) +Call ok(x.Global = false, "RegExp.Global = " & x.Global) +Call ok(x.Multiline = false, "RegExp.Multiline = " & x.Multiline) + Call reportSuccess() diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index ada364f..0a399b9 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1599,29 +1599,41 @@ static IRegExpVtbl RegExpVtbl = { RegExp_Replace }; -HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) +HRESULT create_regexp(IDispatch **ret) { - RegExp2 *ret; + RegExp2 *regexp; HRESULT hres; - TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); - hres = init_regexp_typeinfo(RegExp2_tid); if(FAILED(hres)) return hres; - ret = heap_alloc_zero(sizeof(*ret)); - if(!ret) + regexp = heap_alloc_zero(sizeof(*regexp)); + if(!regexp) return E_OUTOFMEMORY; - ret->IRegExp2_iface.lpVtbl = &RegExp2Vtbl; - ret->IRegExp_iface.lpVtbl = &RegExpVtbl; + regexp->IRegExp2_iface.lpVtbl = &RegExp2Vtbl; + regexp->IRegExp_iface.lpVtbl = &RegExpVtbl; + regexp->ref = 1; + heap_pool_init(&regexp->pool); - ret->ref = 1; - heap_pool_init(&ret->pool); + *ret = (IDispatch*)&regexp->IRegExp2_iface; + return S_OK; +} + +HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) +{ + IDispatch *regexp; + HRESULT hres; + + TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); + + hres = create_regexp(&regexp); + if(FAILED(hres)) + return hres; - hres = IRegExp2_QueryInterface(&ret->IRegExp2_iface, riid, ppv); - IRegExp2_Release(&ret->IRegExp2_iface); + hres = IDispatch_QueryInterface(regexp, riid, ppv); + IDispatch_Release(regexp); return hres; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 94139bb..bf7a17c 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -382,6 +382,8 @@ static inline BOOL is_int32(double d) return INT32_MIN <= d && d <= INT32_MAX && (double)(int)d == d; } +HRESULT create_regexp(IDispatch**) DECLSPEC_HIDDEN; + HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;

1 0

Austin English : kernel32: Improve GetNumaHighestNodeNumber stub.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: 77bd74fa2515e8babb6cda2653a12adad65191dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=77bd74fa2515e8babb6cda265… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 18 10:47:09 2014 -0700 kernel32: Improve GetNumaHighestNodeNumber stub. --- dlls/kernel32/process.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 60156aa..3ff47e1 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3911,9 +3911,9 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK */ BOOL WINAPI GetNumaHighestNodeNumber(PULONG highestnode) { - FIXME("(%p): stub\n", highestnode); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + *highestnode = 0; + FIXME("(%p): semi-stub\n", highestnode); + return TRUE; } /**********************************************************************

1 0

Frédéric Delanoy : gdiplus: Use BOOL type where appropriate.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: 73288e110058b0460b6de6541fc052a93121998d URL: http://source.winehq.org/git/wine.git/?a=commit;h=73288e110058b0460b6de6541… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Mar 17 07:50:26 2014 +0100 gdiplus: Use BOOL type where appropriate. --- dlls/gdiplus/graphics.c | 30 +++++++++++++++--------------- dlls/gdiplus/image.c | 2 +- dlls/gdiplus/metafile.c | 4 ++-- dlls/gdiplus/pathiterator.c | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index d16c6c1..e3bf98e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1243,7 +1243,7 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, INT min_y, max_y, min_x, max_x; INT x, y; ARGB outer_color; - static int transform_fixme_once; + static BOOL transform_fixme_once; if (fill->focus.X != 0.0 || fill->focus.Y != 0.0) { @@ -1280,7 +1280,7 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, if (!is_identity) { FIXME("path gradient transform not implemented\n"); - transform_fixme_once = 1; + transform_fixme_once = TRUE; } } @@ -1314,7 +1314,7 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, for (i=0; i<flat_path->pathdata.Count; i++) { int start_center_line=0, end_center_line=0; - int seen_start=0, seen_end=0, seen_center=0; + BOOL seen_start = FALSE, seen_end = FALSE, seen_center = FALSE; REAL center_distance; ARGB start_color, end_color; REAL dy, dx; @@ -1374,17 +1374,17 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, if (!seen_start && yf >= start_point.Y) { - seen_start = 1; + seen_start = TRUE; start_center_line ^= 1; } if (!seen_end && yf >= end_point.Y) { - seen_end = 1; + seen_end = TRUE; end_center_line ^= 1; } if (!seen_center && yf >= center_point.Y) { - seen_center = 1; + seen_center = TRUE; start_center_line ^= 1; end_center_line ^= 1; } @@ -2839,7 +2839,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image else if (image->type == ImageTypeBitmap) { GpBitmap* bitmap = (GpBitmap*)image; - int use_software=0; + BOOL use_software = FALSE; TRACE("graphics: %.2fx%.2f dpi, fmt %#x, scale %f, image: %.2fx%.2f dpi, fmt %#x, color %08x\n", graphics->xres, graphics->yres, @@ -2853,7 +2853,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image ptf[1].X - ptf[0].X != srcwidth || ptf[2].Y - ptf[0].Y != srcheight || srcx < 0 || srcy < 0 || srcx + srcwidth > bitmap->width || srcy + srcheight > bitmap->height) - use_software = 1; + use_software = TRUE; if (use_software) { @@ -2980,7 +2980,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image else { HDC hdc; - int temp_hdc=0, temp_bitmap=0; + BOOL temp_hdc = FALSE, temp_bitmap = FALSE; HBITMAP hbitmap, old_hbm=NULL; if (!(bitmap->format == PixelFormat16bppRGB555 || @@ -2994,8 +2994,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image /* we can't draw a bitmap of this format directly */ hdc = CreateCompatibleDC(0); - temp_hdc = 1; - temp_bitmap = 1; + temp_hdc = TRUE; + temp_bitmap = TRUE; bih.biSize = sizeof(BITMAPINFOHEADER); bih.biWidth = bitmap->width; @@ -3029,7 +3029,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image else { GdipCreateHBITMAPFromBitmap(bitmap, &hbitmap, 0); - temp_bitmap = 1; + temp_bitmap = TRUE; } hdc = bitmap->hdc; @@ -4381,7 +4381,7 @@ GpStatus gdip_format_string(HDC hdc, INT *hotkeyprefix_offsets=NULL; INT hotkeyprefix_count=0; INT hotkeyprefix_pos=0, hotkeyprefix_end_pos=0; - int seen_prefix=0; + BOOL seen_prefix = FALSE; if(length == -1) length = lstrlenW(string); @@ -4428,11 +4428,11 @@ GpStatus gdip_format_string(HDC hdc, hotkeyprefix_offsets[hotkeyprefix_count++] = j; else if (!seen_prefix && hkprefix != HotkeyPrefixNone && string[i] == '&') { - seen_prefix = 1; + seen_prefix = TRUE; continue; } - seen_prefix = 0; + seen_prefix = FALSE; stringdup[j] = string[i]; j++; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index d57498c..f734274 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4714,7 +4714,7 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) GpBitmap *new_bitmap; GpBitmap *bitmap; int bpp, bytesperpixel; - int rotate_90, flip_x, flip_y; + BOOL rotate_90, flip_x, flip_y; int src_x_offset, src_y_offset; LPBYTE src_origin; UINT x, y, width, height; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index ed00a3e..24ab6be 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -363,7 +363,7 @@ GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, { EmfPlusFillRects *record; GpStatus stat; - BOOL integer_rects=1; + BOOL integer_rects = TRUE; int i; DWORD brushid; int flags = 0; @@ -383,7 +383,7 @@ GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, { if (!is_integer_rect(&rects[i])) { - integer_rects = 0; + integer_rects = FALSE; break; } } diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c index d0a4ed1..49d79d0 100644 --- a/dlls/gdiplus/pathiterator.c +++ b/dlls/gdiplus/pathiterator.c @@ -217,7 +217,7 @@ GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator* iterator, if(iterator->subpath_pos == count){ *startIndex = *endIndex = *resultCount = 0; - *isClosed = 1; + *isClosed = TRUE; return Ok; }

1 0

Matteo Bruni : d3dx9: Create shaders and strings.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: aef52a1d13336e668042a3daf258882ba3617cc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef52a1d13336e668042a3daf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 17 20:22:52 2014 +0100 d3dx9: Create shaders and strings. --- dlls/d3dx9_36/effect.c | 68 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 59 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 9530687..b3a2719 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4939,12 +4939,55 @@ err_out: return hr; } +static HRESULT d3dx9_create_object(struct d3dx9_base_effect *base, struct d3dx_object *object) +{ + struct d3dx_parameter *param = object->param; + struct IDirect3DDevice9 *device = base->effect->device; + HRESULT hr; + + if (*(char **)param->data) + ERR("Parameter data already allocated.\n"); + + switch (param->type) + { + case D3DXPT_STRING: + *(char **)param->data = HeapAlloc(GetProcessHeap(), 0, object->size); + if (!*(char **)param->data) + { + ERR("Out of memory.\n"); + return E_OUTOFMEMORY; + } + memcpy(*(char **)param->data, object->data, object->size); + break; + case D3DXPT_VERTEXSHADER: + if (FAILED(hr = IDirect3DDevice9_CreateVertexShader(device, object->data, + (IDirect3DVertexShader9 **)param->data))) + { + WARN("Failed to create vertex shader.\n"); + return hr; + } + break; + case D3DXPT_PIXELSHADER: + if (FAILED(hr = IDirect3DDevice9_CreatePixelShader(device, object->data, + (IDirect3DPixelShader9 **)param->data))) + { + WARN("Failed to create pixel shader.\n"); + return hr; + } + break; + default: + break; + } + return D3D_OK; +} + static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char *data, const char **ptr) { DWORD technique_index; DWORD index, state_index, usage, element_index; struct d3dx_state *state; struct d3dx_parameter *param; + struct d3dx_object *object; HRESULT hr = E_FAIL; read_dword(ptr, &technique_index); @@ -5022,21 +5065,26 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * state = &pass->states[state_index]; } + TRACE("State operation %#x (%s).\n", state->operation, state_table[state->operation].name); param = &state->parameter; + TRACE("Using object id %u.\n", param->object_id); + object = &base->objects[param->object_id]; - /* - * TODO: Do we need to create the shader/string here or later when we access them? - */ switch (usage) { case 0: - TRACE("usage 0: type %s\n", debug_d3dxparameter_type(param->type)); + TRACE("usage 0: class %s type %s.\n", debug_d3dxparameter_class(param->class), + debug_d3dxparameter_type(param->type)); switch (param->type) { case D3DXPT_VERTEXSHADER: case D3DXPT_PIXELSHADER: state->type = ST_CONSTANT; - hr = d3dx9_copy_data(&base->objects[param->object_id], ptr); + if (FAILED(hr = d3dx9_copy_data(&base->objects[param->object_id], ptr))) + return hr; + + if (object->data) + hr = d3dx9_create_object(base, object); break; case D3DXPT_BOOL: @@ -5153,11 +5201,13 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da read_dword(&ptr, &id); TRACE("Id: %u\n", id); - hr = d3dx9_copy_data(&base->objects[id], &ptr); - if (hr != D3D_OK) - { - WARN("Failed to parse data %u\n", i); + if (FAILED(hr = d3dx9_copy_data(&base->objects[id], &ptr))) goto err_out; + + if (base->objects[id].data) + { + if (FAILED(hr = d3dx9_create_object(base, &base->objects[id]))) + goto err_out; } }

1 0

Matteo Bruni : d3dx9: Store pointers to referenced parameters for "usage 1 " resources.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: 0e0b613192bc431232ce9c657bd37674bb097472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0b613192bc431232ce9c657… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 17 20:22:53 2014 +0100 d3dx9: Store pointers to referenced parameters for "usage 1" resources. --- dlls/d3dx9_36/effect.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b3a2719..73eb5c8 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -118,6 +118,8 @@ struct d3dx_parameter struct d3dx_parameter *annotations; struct d3dx_parameter *members; + + struct d3dx_parameter *referenced_param; }; struct d3dx_object @@ -5070,11 +5072,11 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * TRACE("Using object id %u.\n", param->object_id); object = &base->objects[param->object_id]; + TRACE("Usage %u: class %s, type %s.\n", usage, debug_d3dxparameter_class(param->class), + debug_d3dxparameter_type(param->type)); switch (usage) { case 0: - TRACE("usage 0: class %s type %s.\n", debug_d3dxparameter_class(param->class), - debug_d3dxparameter_type(param->type)); switch (param->type) { case D3DXPT_VERTEXSHADER: @@ -5103,7 +5105,20 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * case 1: state->type = ST_PARAMETER; - hr = d3dx9_copy_data(&base->objects[param->object_id], ptr); + if (FAILED(hr = d3dx9_copy_data(&base->objects[param->object_id], ptr))) + return hr; + + TRACE("Looking for parameter %s.\n", debugstr_a(object->data)); + param->referenced_param = get_parameter_by_name(base, NULL, object->data); + if (param->referenced_param) + { + TRACE("Mapping to parameter %p.\n", param->referenced_param); + } + else + { + FIXME("Referenced parameter %s not found.\n", (char *)object->data); + return D3DXERR_INVALIDDATA; + } break; default:

1 0

Matteo Bruni : d3dx9: Parse "usage 2" effect resources.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: babf0dca0395c6647146320f50035f1b4bf0a1b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=babf0dca0395c6647146320f5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 17 20:22:54 2014 +0100 d3dx9: Parse "usage 2" effect resources. --- dlls/d3dx9_36/effect.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 73eb5c8..d5258e9 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -96,6 +96,7 @@ enum STATE_TYPE ST_CONSTANT, ST_PARAMETER, ST_FXLC, + ST_ARRAY_SELECTOR, }; struct d3dx_parameter @@ -4983,6 +4984,32 @@ static HRESULT d3dx9_create_object(struct d3dx9_base_effect *base, struct d3dx_o return D3D_OK; } +static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct d3dx_parameter *param) +{ + DWORD string_size; + struct d3dx_object *object = &base->objects[param->object_id]; + char *ptr = object->data; + + TRACE("Parsing array entry selection state for parameter %p.\n", param); + + string_size = *(DWORD *)ptr; + param->referenced_param = get_parameter_by_name(base, NULL, ptr + 4); + if (param->referenced_param) + { + TRACE("Mapping to parameter %s.\n", debugstr_a(param->referenced_param->name)); + } + else + { + FIXME("Referenced parameter %s not found.\n", ptr + 4); + return D3DXERR_INVALIDDATA; + } + TRACE("Unknown DWORD: 0x%.8x.\n", *(DWORD *)(ptr + string_size)); + + FIXME("Parse preshader.\n"); + + return D3D_OK; +} + static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char *data, const char **ptr) { DWORD technique_index; @@ -5121,6 +5148,13 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * } break; + case 2: + state->type = ST_ARRAY_SELECTOR; + if (FAILED(hr = d3dx9_copy_data(object, ptr))) + return hr; + hr = d3dx9_parse_array_selector(base, param); + break; + default: FIXME("Unknown usage %x\n", usage); break;

1 0

Matteo Bruni : d3dx9: Split out set_matrix_transpose from set_matrix.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: 1e2fbcc99b745fe6b636d41a4b64225286882bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e2fbcc99b745fe6b636d41a4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 17 20:22:55 2014 +0100 d3dx9: Split out set_matrix_transpose from set_matrix. --- dlls/d3dx9_36/effect.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d5258e9..f505736 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -764,7 +764,7 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix, BOOL tr } } -static void set_matrix(struct d3dx_parameter *param, const D3DXMATRIX *matrix, BOOL transpose) +static void set_matrix(struct d3dx_parameter *param, const D3DXMATRIX *matrix) { UINT i, k; @@ -773,7 +773,21 @@ static void set_matrix(struct d3dx_parameter *param, const D3DXMATRIX *matrix, B for (k = 0; k < param->columns; ++k) { set_number((FLOAT *)param->data + i * param->columns + k, param->type, - transpose ? &matrix->u.m[k][i] : &matrix->u.m[i][k], D3DXPT_FLOAT); + &matrix->u.m[i][k], D3DXPT_FLOAT); + } + } +} + +static void set_matrix_transpose(struct d3dx_parameter *param, const D3DXMATRIX *matrix) +{ + UINT i, k; + + for (i = 0; i < param->rows; ++i) + { + for (k = 0; k < param->columns; ++k) + { + set_number((FLOAT *)param->data + i * param->columns + k, param->type, + &matrix->u.m[k][i], D3DXPT_FLOAT); } } } @@ -1916,7 +1930,7 @@ static HRESULT d3dx9_base_effect_set_matrix(struct d3dx9_base_effect *base, switch (param->class) { case D3DXPC_MATRIX_ROWS: - set_matrix(param, matrix, FALSE); + set_matrix(param, matrix); return D3D_OK; case D3DXPC_SCALAR: @@ -1984,7 +1998,7 @@ static HRESULT d3dx9_base_effect_set_matrix_array(struct d3dx9_base_effect *base case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - set_matrix(&param->members[i], &matrix[i], FALSE); + set_matrix(&param->members[i], &matrix[i]); } return D3D_OK; @@ -2058,7 +2072,7 @@ static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effe case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - set_matrix(&param->members[i], matrix[i], FALSE); + set_matrix(&param->members[i], matrix[i]); } return D3D_OK; @@ -2128,7 +2142,7 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose(struct d3dx9_base_effect * switch (param->class) { case D3DXPC_MATRIX_ROWS: - set_matrix(param, matrix, TRUE); + set_matrix_transpose(param, matrix); return D3D_OK; case D3DXPC_SCALAR: @@ -2199,7 +2213,7 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose_array(struct d3dx9_base_ef case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - set_matrix(&param->members[i], &matrix[i], TRUE); + set_matrix_transpose(&param->members[i], &matrix[i]); } return D3D_OK; @@ -2273,7 +2287,7 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose_pointer_array(struct d3dx9 case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - set_matrix(&param->members[i], matrix[i], TRUE); + set_matrix_transpose(&param->members[i], matrix[i]); } return D3D_OK;

1 0

Matteo Bruni : d3dx9: Copy the entire matrix at once if there is no need of type conversions.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: 5cfca92c5329bb795f5b619a7687a9602ab3f45f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cfca92c5329bb795f5b619a7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 17 20:22:56 2014 +0100 d3dx9: Copy the entire matrix at once if there is no need of type conversions. --- dlls/d3dx9_36/effect.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f505736..f136fb7 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -768,6 +768,16 @@ static void set_matrix(struct d3dx_parameter *param, const D3DXMATRIX *matrix) { UINT i, k; + if (param->type == D3DXPT_FLOAT) + { + if (param->columns == 4) + memcpy(param->data, matrix->u.m, param->rows * 4 * sizeof(float)); + else + for (i = 0; i < param->rows; ++i) + memcpy((float *)param->data + i * param->columns, matrix->u.m + i, param->columns * sizeof(float)); + return; + } + for (i = 0; i < param->rows; ++i) { for (k = 0; k < param->columns; ++k)

1 0

Nikolay Sivov : widl: Fix default value types.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: ea9e7b631832d892eeff1919c22f48f1c312620d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9e7b631832d892eeff1919c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 18 02:24:26 2014 +0400 widl: Fix default value types. --- tools/widl/write_msft.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 724be27..adffe85 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1191,6 +1191,8 @@ static void write_value(msft_typelib_t* typelib, int *out, int vt, const void *v case VT_UINT: case VT_HRESULT: case VT_PTR: + case VT_UNKNOWN: + case VT_DISPATCH: { const unsigned int lv = get_ulong_val(*(const unsigned int *)value, vt); if((lv & 0x3ffffff) == lv) { @@ -1257,6 +1259,33 @@ static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, return S_OK; } +/* It's possible to have a default value for pointer arguments too. + In this case default value has a referenced type, e.g. + 'LONG*' argument gets VT_I4, 'DOUBLE*' - VT_R8. IUnknown* and IDispatch* + are recognised too and stored as VT_UNKNOWN and VT_DISPATCH. + But IUnknown/IDispatch arguments can only have default value of 0 + (or expression that resolves to zero) while other pointers can have + any default value. */ +static int get_defaultvalue_vt(type_t *type) +{ + int vt = get_type_vt(type); + if (type_get_type(type) == TYPE_ENUM) + vt = VT_I4; + else + { + vt = get_type_vt(type); + if (vt == VT_PTR && is_ptr(type)) { + vt = get_type_vt(type_pointer_get_ref(type)); + /* The only acceptable value for pointers to non-basic types + is NULL, it's stored as VT_I4 for both 32 and 64 bit typelibs. */ + if (vt == VT_USERDEFINED) + vt = VT_I4; + } + } + + return vt; +} + static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) { int offset, name_offset; @@ -1481,10 +1510,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) { int vt; expr_t *expr = (expr_t *)attr->u.pval; - if (type_get_type(arg->type) == TYPE_ENUM) - vt = VT_INT; - else - vt = get_type_vt(arg->type); + vt = get_defaultvalue_vt(arg->type); paramflags |= 0x30; /* PARAMFLAG_FHASDEFAULT | PARAMFLAG_FOPT */ if (expr->type == EXPR_STRLIT || expr->type == EXPR_WSTRLIT) {

1 0