wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Nikolay Sivov : vbscript: Fix potential crash if script site creation failed.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: dba0fe3614b2bf8002551a7636cc90c7315e2c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dba0fe3614b2bf8002551a763… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 16 11:30:11 2015 +0300 vbscript: Fix potential crash if script site creation failed. --- dlls/vbscript/global.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 77fc1d6..448b886 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -209,11 +209,12 @@ static HRESULT set_object_site(script_ctx_t *ctx, IUnknown *obj) return S_OK; ax_site = create_ax_site(ctx); - if(ax_site) + if(ax_site) { hres = IObjectWithSite_SetSite(obj_site, ax_site); + IUnknown_Release(ax_site); + } else hres = E_OUTOFMEMORY; - IUnknown_Release(ax_site); IObjectWithSite_Release(obj_site); return hres; }

1 0

Marcus Meissner : winex11.drv: Free uriList (Coverity).
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: ab854893aa68cb4878b36f86378f7a769c752b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab854893aa68cb4878b36f863… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Feb 16 08:34:08 2015 +0100 winex11.drv: Free uriList (Coverity). --- dlls/winex11.drv/clipboard.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index b2705b4..dad4a7a 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1590,8 +1590,10 @@ static HANDLE X11DRV_CLIPBOARD_ImportTextUriList(Display *display, Window w, Ato return 0; out = HeapAlloc(GetProcessHeap(), 0, capacity * sizeof(WCHAR)); - if (out == NULL) + if (out == NULL) { + HeapFree(GetProcessHeap(), 0, uriList); return 0; + } while (end < len) { @@ -1650,6 +1652,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportTextUriList(Display *display, Window w, Ato } } HeapFree(GetProcessHeap(), 0, out); + HeapFree(GetProcessHeap(), 0, uriList); return handle; }

1 0

Marcus Meissner : msi: Fix memory leak (Coverity).
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: c4bf8a85eea28f198e1ec8cc03fd6b7d0a2a12e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4bf8a85eea28f198e1ec8cc0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Feb 16 08:31:14 2015 +0100 msi: Fix memory leak (Coverity). --- dlls/msi/action.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index afded69..ed09be7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6968,6 +6968,7 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) data = msi_alloc(size); if (!data) { + msi_free(deformatted); RegCloseKey(env); return ERROR_OUTOFMEMORY; }

1 0

Gerald Pfeifer : vbscript: Avoid use of uninitialized variable in Global_InStrRev().
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 69a61383503c2c1ff55cefddae83c5f00b421c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69a61383503c2c1ff55cefdda… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Feb 16 02:11:40 2015 +0100 vbscript: Avoid use of uninitialized variable in Global_InStrRev(). --- dlls/vbscript/global.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9bcd2b2..77fc1d6 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1810,6 +1810,8 @@ static HRESULT Global_InStrRev(vbdisp_t *This, VARIANT *args, unsigned args_cnt, }else { start = SysStringLen(str1); } + } else { + str2 = NULL; } if(SUCCEEDED(hres)) {

1 0

Nikolay Sivov : wshom.ocx: Properly handle optional argument in Run().
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: f0e2ea988e666533dd9f5ba1a6e68b2853dd0038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e2ea988e666533dd9f5ba1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 15 14:30:00 2015 +0300 wshom.ocx: Properly handle optional argument in Run(). --- dlls/wshom.ocx/shell.c | 43 +++++++++++++++++++++++------------------- dlls/wshom.ocx/tests/wshom.c | 32 ++++++++++++++++++++++++++++++- dlls/wshom.ocx/tests/wshom.idl | 2 +- dlls/wshom.ocx/wshom.idl | 2 +- 4 files changed, 57 insertions(+), 22 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 09c7504..14eab75 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -912,14 +912,22 @@ static HRESULT WINAPI WshShell3_get_Environment(IWshShell3 *iface, VARIANT *type return WshEnvironment_Create(env); } -static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *WaitOnReturn, int *exit_code) +static inline BOOL is_optional_argument(const VARIANT *arg) +{ + return V_VT(arg) == VT_ERROR && V_ERROR(arg) == DISP_E_PARAMNOTFOUND; +} + +static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *wait, DWORD *exit_code) { SHELLEXECUTEINFOW info; int waitforprocess; - VARIANT s, w; + VARIANT s; HRESULT hr; - TRACE("(%s %s %s %p)\n", debugstr_w(cmd), debugstr_variant(style), debugstr_variant(WaitOnReturn), exit_code); + TRACE("(%s %s %s %p)\n", debugstr_w(cmd), debugstr_variant(style), debugstr_variant(wait), exit_code); + + if (!style || !wait || !exit_code) + return E_POINTER; VariantInit(&s); hr = VariantChangeType(&s, style, 0, VT_I4); @@ -929,19 +937,21 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, return hr; } - VariantInit(&w); - hr = VariantChangeType(&w, WaitOnReturn, 0, VT_I4); - if (FAILED(hr)) - { - ERR("failed to convert wait argument, 0x%08x\n", hr); - return hr; + if (is_optional_argument(wait)) + waitforprocess = 0; + else { + VARIANT w; + + VariantInit(&w); + hr = VariantChangeType(&w, wait, 0, VT_I4); + if (FAILED(hr)) + return hr; + + waitforprocess = V_I4(&w); } memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); - - waitforprocess = V_I4(&w); - info.fMask = waitforprocess ? SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS : SEE_MASK_DEFAULT; info.lpFile = cmd; info.nShow = V_I4(&s); @@ -955,16 +965,11 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, { if (waitforprocess) { - if (exit_code) - { - DWORD code; - GetExitCodeProcess(info.hProcess, &code); - *exit_code = code; - } + GetExitCodeProcess(info.hProcess, exit_code); CloseHandle(info.hProcess); } else - if (exit_code) *exit_code = 0; + *exit_code = 0; return S_OK; } diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 4c3581e..b2e9859 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -33,6 +33,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static void test_wshshell(void) { + static const WCHAR notepadW[] = {'n','o','t','e','p','a','d','.','e','x','e',0}; static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; static const WCHAR lnk1W[] = {'f','i','l','e','.','l','n','k',0}; static const WCHAR pathW[] = {'%','P','A','T','H','%',0}; @@ -51,8 +52,9 @@ static void test_wshshell(void) TYPEATTR *tattr; DISPPARAMS dp; EXCEPINFO ei; - VARIANT arg, res; + VARIANT arg, res, arg2; BSTR str, ret; + DWORD retval; UINT err; hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -171,6 +173,34 @@ static void test_wshshell(void) IWshEnvironment_Release(env); + V_VT(&arg) = VT_I2; + V_I2(&arg) = 0; + V_VT(&arg2) = VT_ERROR; + V_ERROR(&arg2) = DISP_E_PARAMNOTFOUND; + + str = SysAllocString(notepadW); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + retval = 10; + hr = IWshShell3_Run(sh3, str, NULL, &arg2, &retval); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(retval == 10, "got %u\n", retval); + + retval = 10; + hr = IWshShell3_Run(sh3, str, &arg, NULL, &retval); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(retval == 10, "got %u\n", retval); + + retval = 10; + V_VT(&arg2) = VT_ERROR; + V_ERROR(&arg2) = 0; + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hr); + ok(retval == 10, "got %u\n", retval); + + SysFreeString(str); + IWshCollection_Release(coll); IDispatch_Release(disp); IWshShell3_Release(sh3); diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index 6255dc6..6647b2b 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -526,7 +526,7 @@ library IWshRuntimeLibrary [in] BSTR Command, [in, optional] VARIANT* WindowStyle, [in, optional] VARIANT* WaitOnReturn, - [out, retval] int* out_ExitCode); + [out, retval] DWORD* out_ExitCode); [id(0x03e9)] HRESULT Popup( diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index 02224a3..aade499 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -528,7 +528,7 @@ library IWshRuntimeLibrary [in] BSTR Command, [in, optional] VARIANT* WindowStyle, [in, optional] VARIANT* WaitOnReturn, - [out, retval] int* out_ExitCode); + [out, retval] DWORD* out_ExitCode); [id(0x03e9)] HRESULT Popup(

1 0

Ken Thomases : gdi32: Change an ERR to a WARN for fonts with too-long names.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: e9c36154e35c66673199fb6aebd447a53a16ebe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9c36154e35c66673199fb6ae… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sat Feb 14 07:29:14 2015 -0600 gdi32: Change an ERR to a WARN for fonts with too-long names. The situation is commonplace on Macs and benign. --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5122fb5..fc19f51 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2026,7 +2026,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); if (strlenW(family->FamilyName) >= LF_FACESIZE) { - ERR("Ignoring %s because name is too long\n", debugstr_w(family->FamilyName)); + WARN("Ignoring %s because name is too long\n", debugstr_w(family->FamilyName)); release_face( face ); release_family( family ); return;

1 0

Jacek Caban : mshtml: Added execCommand("fontsize") support.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 32f177ae309ce6026ebb8214c5f386b67ee7dd1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f177ae309ce6026ebb8214c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 13 17:54:15 2015 +0100 mshtml: Added execCommand("fontsize") support. --- dlls/mshtml/htmldoc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 79dc5c1..a9ef3d9 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1141,6 +1141,8 @@ static const WCHAR cutW[] = {'c','u','t',0}; static const WCHAR fontnameW[] = {'f','o','n','t','n','a','m','e',0}; +static const WCHAR fontsizeW[] = + {'f','o','n','t','s','i','z','e',0}; static const WCHAR indentW[] = {'i','n','d','e','n','t',0}; static const WCHAR insertorderedlistW[] = @@ -1161,6 +1163,7 @@ static const struct { {copyW, IDM_COPY}, {cutW, IDM_CUT}, {fontnameW, IDM_FONTNAME}, + {fontsizeW, IDM_FONTSIZE}, {indentW, IDM_INDENT}, {insertorderedlistW, IDM_ORDERLIST}, {insertunorderedlistW, IDM_UNORDERLIST},

1 0

André Hentschel : Add WWN 385
by Jeremy Newman 13 Feb '15

13 Feb '15

Module: website Branch: master Commit: 343e6dc82aacf00d03a8cbc03147753130946523 URL: http://source.winehq.org/git/website.git/?a=commit;h=343e6dc82aacf00d03a8cb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 13 14:37:25 2015 +0100 Add WWN 385 --- news/de/2015021301.xml | 10 + news/en/2015021301.xml | 10 + wwn/en/wn20150213_385.xml | 596 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 616 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=343e6dc82aacf00d03…

1 0

Stefan Dösinger : d3d/tests: Geforce8+ GPUs abs() table fog.
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: f75d1b0c2f77d8c85f7c2a9bcc3545f14e271a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f75d1b0c2f77d8c85f7c2a9bc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 13 10:51:38 2015 +0100 d3d/tests: Geforce8+ GPUs abs() table fog. --- dlls/d3d8/tests/visual.c | 23 ++++++++++++++--------- dlls/d3d9/tests/visual.c | 23 ++++++++++++++--------- dlls/ddraw/tests/ddraw7.c | 28 +++++++++++++++++++--------- 3 files changed, 47 insertions(+), 27 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 40bbc59..c095463 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5458,26 +5458,30 @@ static void test_negative_fixedfunction_fog(void) DWORD d; } start, end; D3DFOGMODE vfog, tfog; - DWORD color, color_broken; + DWORD color, color_broken, color_broken2; } tests[] = { - /* Run the XYZRHW tests first. Depth clamping is broken after RHW draws on the testbot. */ + /* Run the XYZRHW tests first. Depth clamping is broken after RHW draws on the testbot. + * + * Geforce8+ GPUs on Windows abs() table fog, everything else does not. */ {D3DFVF_XYZRHW, tquad, sizeof(*tquad), &identity, { 0.0f}, {1.0f}, - D3DFOG_NONE, D3DFOG_LINEAR, 0x00ff0000, 0x00ff0000}, + D3DFOG_NONE, D3DFOG_LINEAR, 0x00ff0000, 0x00808000, 0x00808000}, /* r200 GPUs and presumably all d3d8 and older HW clamp the fog * parameters to 0.0 and 1.0 in the table fog case. */ {D3DFVF_XYZRHW, tquad, sizeof(*tquad), &identity, {-1.0f}, {0.0f}, - D3DFOG_NONE, D3DFOG_LINEAR, 0x00808000, 0x00ff0000}, + D3DFOG_NONE, D3DFOG_LINEAR, 0x00808000, 0x00ff0000, 0x0000ff00}, /* test_fog_interpolation shows that vertex fog evaluates the fog * equation in the vertex pipeline. Start = -1.0 && end = 0.0 shows - * that the abs happens before the fog equation is evaluated. */ + * that the abs happens before the fog equation is evaluated. + * + * Vertex fog abs() behavior is the same on all GPUs. */ {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, - D3DFOG_LINEAR, D3DFOG_NONE, 0x00808000, 0x00808000}, + D3DFOG_LINEAR, D3DFOG_NONE, 0x00808000, 0x00808000, 0x00808000}, {D3DFVF_XYZ, quad, sizeof(*quad), &zero, {-1.0f}, {0.0f}, - D3DFOG_LINEAR, D3DFOG_NONE, 0x0000ff00, 0x0000ff00}, + D3DFOG_LINEAR, D3DFOG_NONE, 0x0000ff00, 0x0000ff00, 0x0000ff00}, {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, - D3DFOG_EXP, D3DFOG_NONE, 0x009b6400, 0x009b6400}, + D3DFOG_EXP, D3DFOG_NONE, 0x009b6400, 0x009b6400, 0x009b6400}, }; D3DCAPS8 caps; @@ -5539,7 +5543,8 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - ok(color_match(color, tests[i].color, 2) || broken(color_match(color, tests[i].color_broken, 2)), + ok(color_match(color, tests[i].color, 2) || broken(color_match(color, tests[i].color_broken, 2)) + || broken(color_match(color, tests[i].color_broken2, 2)), "Got unexpected color 0x%08x, case %u.\n", color, i); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b4df9c4..a8cf55f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17057,26 +17057,30 @@ static void test_negative_fixedfunction_fog(void) DWORD d; } start, end; D3DFOGMODE vfog, tfog; - DWORD color, color_broken; + DWORD color, color_broken, color_broken2; } tests[] = { - /* Run the XYZRHW tests first. Depth clamping is broken after RHW draws on the testbot. */ + /* Run the XYZRHW tests first. Depth clamping is broken after RHW draws on the testbot. + * + * Geforce8+ GPUs on Windows abs() table fog, everything else does not. */ {D3DFVF_XYZRHW, tquad, sizeof(*tquad), &identity, { 0.0f}, {1.0f}, - D3DFOG_NONE, D3DFOG_LINEAR, 0x00ff0000, 0x00ff0000}, + D3DFOG_NONE, D3DFOG_LINEAR, 0x00ff0000, 0x00808000, 0x00808000}, /* r200 GPUs and presumably all d3d8 and older HW clamp the fog * parameters to 0.0 and 1.0 in the table fog case. */ {D3DFVF_XYZRHW, tquad, sizeof(*tquad), &identity, {-1.0f}, {0.0f}, - D3DFOG_NONE, D3DFOG_LINEAR, 0x00808000, 0x00ff0000}, + D3DFOG_NONE, D3DFOG_LINEAR, 0x00808000, 0x00ff0000, 0x0000ff00}, /* test_fog_interpolation shows that vertex fog evaluates the fog * equation in the vertex pipeline. Start = -1.0 && end = 0.0 shows - * that the abs happens before the fog equation is evaluated. */ + * that the abs happens before the fog equation is evaluated. + * + * Vertex fog abs() behavior is the same on all GPUs. */ {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, - D3DFOG_LINEAR, D3DFOG_NONE, 0x00808000, 0x00808000}, + D3DFOG_LINEAR, D3DFOG_NONE, 0x00808000, 0x00808000, 0x00808000}, {D3DFVF_XYZ, quad, sizeof(*quad), &zero, {-1.0f}, {0.0f}, - D3DFOG_LINEAR, D3DFOG_NONE, 0x0000ff00, 0x0000ff00}, + D3DFOG_LINEAR, D3DFOG_NONE, 0x0000ff00, 0x0000ff00, 0x0000ff00}, {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, - D3DFOG_EXP, D3DFOG_NONE, 0x009b6400, 0x009b6400}, + D3DFOG_EXP, D3DFOG_NONE, 0x009b6400, 0x009b6400, 0x009b6400}, }; D3DCAPS9 caps; @@ -17138,7 +17142,8 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - ok(color_match(color, tests[i].color, 2) || broken(color_match(color, tests[i].color_broken, 2)), + ok(color_match(color, tests[i].color, 2) || broken(color_match(color, tests[i].color_broken, 2)) + || broken(color_match(color, tests[i].color_broken2, 2)), "Got unexpected color 0x%08x, case %u.\n", color, i); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 01d0fcb..90ea739 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -8097,21 +8097,30 @@ static void test_negative_fixedfunction_fog(void) DWORD d; } start, end; D3DFOGMODE vfog, tfog; - DWORD color, color_broken; + DWORD color, color_broken, color_broken2; } tests[] = { - /* Run the XYZRHW tests first. Depth clamping is broken after RHW draws on the testbot. */ - {D3DFVF_XYZRHW, tquad, &identity, { 0.0f}, {1.0f}, D3DFOG_NONE, D3DFOG_LINEAR, 0x00ff0000, 0x00ff0000}, + /* Run the XYZRHW tests first. Depth clamping is broken after RHW draws on the testbot. + * + * Geforce8+ GPUs on Windows abs() table fog, everything else does not. */ + {D3DFVF_XYZRHW, tquad, &identity, { 0.0f}, {1.0f}, D3DFOG_NONE, D3DFOG_LINEAR, + 0x00ff0000, 0x00808000, 0x00808000}, /* r200 GPUs and presumably all d3d8 and older HW clamp the fog * parameters to 0.0 and 1.0 in the table fog case. */ - {D3DFVF_XYZRHW, tquad, &identity, {-1.0f}, {0.0f}, D3DFOG_NONE, D3DFOG_LINEAR, 0x00808000, 0x00ff0000}, + {D3DFVF_XYZRHW, tquad, &identity, {-1.0f}, {0.0f}, D3DFOG_NONE, D3DFOG_LINEAR, + 0x00808000, 0x00ff0000, 0x0000ff00}, /* test_fog_interpolation shows that vertex fog evaluates the fog * equation in the vertex pipeline. Start = -1.0 && end = 0.0 shows - * that the abs happens before the fog equation is evaluated. */ - {D3DFVF_XYZ, quad, &zero, { 0.0f}, {1.0f}, D3DFOG_LINEAR, D3DFOG_NONE, 0x00808000, 0x00808000}, - {D3DFVF_XYZ, quad, &zero, {-1.0f}, {0.0f}, D3DFOG_LINEAR, D3DFOG_NONE, 0x0000ff00, 0x0000ff00}, - {D3DFVF_XYZ, quad, &zero, { 0.0f}, {1.0f}, D3DFOG_EXP, D3DFOG_NONE, 0x009b6400, 0x009b6400}, + * that the abs happens before the fog equation is evaluated. + * + * Vertex fog abs() behavior is the same on all GPUs. */ + {D3DFVF_XYZ, quad, &zero, { 0.0f}, {1.0f}, D3DFOG_LINEAR, D3DFOG_NONE, + 0x00808000, 0x00808000, 0x00808000}, + {D3DFVF_XYZ, quad, &zero, {-1.0f}, {0.0f}, D3DFOG_LINEAR, D3DFOG_NONE, + 0x0000ff00, 0x0000ff00, 0x0000ff00}, + {D3DFVF_XYZ, quad, &zero, { 0.0f}, {1.0f}, D3DFOG_EXP, D3DFOG_NONE, + 0x009b6400, 0x009b6400, 0x009b6400}, }; D3DDEVICEDESC7 caps; @@ -8170,7 +8179,8 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = get_surface_color(rt, 0, 240); - ok(compare_color(color, tests[i].color, 2) || broken(compare_color(color, tests[i].color_broken, 2)), + ok(compare_color(color, tests[i].color, 2) || broken(compare_color(color, tests[i].color_broken, 2)) + || broken(compare_color(color, tests[i].color_broken2, 2)), "Got unexpected color 0x%08x, case %u.\n", color, i); }

1 0

Hans Leidekker : wbemprox: Implement Win32_SID.
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: 91c7a84af5b52c2b507cb5559a97362a79c7fa61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c7a84af5b52c2b507cb5559… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 13 13:40:36 2015 +0100 wbemprox: Implement Win32_SID. --- dlls/wbemprox/builtin.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 6b65c35..79ce561 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -39,6 +39,8 @@ #include "winioctl.h" #include "winsvc.h" #include "winver.h" +#include "sddl.h" +#include "ntsecapi.h" #include "wine/debug.h" #include "wbemprox_private.h" @@ -89,11 +91,15 @@ static const WCHAR class_processorW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; static const WCHAR class_processor2W[] = {'C','I','M','_','P','r','o','c','e','s','s','o','r',0}; +static const WCHAR class_sidW[] = + {'W','i','n','3','2','_','S','I','D',0}; static const WCHAR class_sounddeviceW[] = {'W','i','n','3','2','_','S','o','u','n','d','D','e','v','i','c','e',0}; static const WCHAR class_videocontrollerW[] = {'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; +static const WCHAR prop_accountnameW[] = + {'A','c','c','o','u','n','t','N','a','m','e',0}; static const WCHAR prop_acceptpauseW[] = {'A','c','c','e','p','t','P','a','u','s','e',0}; static const WCHAR prop_acceptstopW[] = @@ -110,6 +116,8 @@ static const WCHAR prop_addresswidthW[] = {'A','d','d','r','e','s','s','W','i','d','t','h',0}; static const WCHAR prop_availabilityW[] = {'A','v','a','i','l','a','b','i','l','i','t','y',0}; +static const WCHAR prop_binaryrepresentationW[] = + {'B','i','n','a','r','y','R','e','p','r','e','s','e','n','t','a','t','i','o','n',0}; static const WCHAR prop_bootableW[] = {'B','o','o','t','a','b','l','e',0}; static const WCHAR prop_bootpartitionW[] = @@ -248,6 +256,8 @@ static const WCHAR prop_productW[] = {'P','r','o','d','u','c','t',0}; static const WCHAR prop_productnameW[] = {'P','r','o','d','u','c','t','N','a','m','e',0}; +static const WCHAR prop_referenceddomainnameW[] = + {'R','e','f','e','r','e','n','c','e','d','D','o','m','a','i','n','N','a','m','e',0}; static const WCHAR prop_releasedateW[] = {'R','e','l','e','a','s','e','D','a','t','e',0}; static const WCHAR prop_serialnumberW[] = @@ -262,6 +272,10 @@ static const WCHAR prop_smbiosbiosversionW[] = {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; static const WCHAR prop_startmodeW[] = {'S','t','a','r','t','M','o','d','e',0}; +static const WCHAR prop_sidW[] = + {'S','I','D',0}; +static const WCHAR prop_sidlengthW[] = + {'S','i','d','L','e','n','g','t','h',0}; static const WCHAR prop_sizeW[] = {'S','i','z','e',0}; static const WCHAR prop_speedW[] = @@ -517,6 +531,14 @@ static const struct column col_service[] = { method_startserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { method_stopserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } }; +static const struct column col_sid[] = +{ + { prop_accountnameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_binaryrepresentationW, CIM_UINT8|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, + { prop_referenceddomainnameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_sidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_sidlengthW, CIM_UINT32 } +}; static const struct column col_sounddevice[] = { { prop_nameW, CIM_STRING }, @@ -855,6 +877,14 @@ struct record_service class_method *start_service; class_method *stop_service; }; +struct record_sid +{ + const WCHAR *accountname; + const UINT8 *binaryrepresentation; + const WCHAR *referenceddomainname; + const WCHAR *sid; + UINT32 sidlength; +}; struct record_sounddevice { const WCHAR *name; @@ -2421,6 +2451,91 @@ done: return fill_status; } +static WCHAR *get_accountname( LSA_TRANSLATED_NAME *name ) +{ + if (!name || !name->Name.Buffer) return NULL; + return heap_strdupW( name->Name.Buffer ); +} +static UINT8 *get_binaryrepresentation( PSID sid, UINT len ) +{ + UINT8 *ret = heap_alloc( len ); + if (!ret) return NULL; + memcpy( ret, sid, len ); + return ret; +} +static WCHAR *get_referenceddomainname( LSA_REFERENCED_DOMAIN_LIST *domain ) +{ + if (!domain || !domain->Domains || !domain->Domains->Name.Buffer) return NULL; + return heap_strdupW( domain->Domains->Name.Buffer ); +} +static const WCHAR *find_sid_str( const struct expr *cond ) +{ + const struct expr *left, *right; + const WCHAR *ret = NULL; + + if (!cond || cond->type != EXPR_COMPLEX || cond->u.expr.op != OP_EQ) return NULL; + + left = cond->u.expr.left; + right = cond->u.expr.right; + if (left->type == EXPR_PROPVAL && right->type == EXPR_SVAL && !strcmpiW( left->u.propval->name, prop_sidW )) + { + ret = right->u.sval; + } + else if (left->type == EXPR_SVAL && right->type == EXPR_PROPVAL && !strcmpiW( right->u.propval->name, prop_sidW )) + { + ret = left->u.sval; + } + return ret; +} + +static enum fill_status fill_sid( struct table *table, const struct expr *cond ) +{ + PSID sid; + LSA_REFERENCED_DOMAIN_LIST *domain; + LSA_TRANSLATED_NAME *name; + LSA_HANDLE handle; + LSA_OBJECT_ATTRIBUTES attrs; + const WCHAR *str; + struct record_sid *rec; + UINT len; + + if (!(str = find_sid_str( cond ))) return FILL_STATUS_FAILED; + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + + if (!ConvertStringSidToSidW( str, &sid )) return FILL_STATUS_FAILED; + len = GetLengthSid( sid ); + + memset( &attrs, 0, sizeof(attrs) ); + attrs.Length = sizeof(attrs); + if (LsaOpenPolicy( NULL, &attrs, POLICY_ALL_ACCESS, &handle )) + { + LocalFree( sid ); + return FILL_STATUS_FAILED; + } + if (LsaLookupSids( handle, 1, &sid, &domain, &name )) + { + LocalFree( sid ); + LsaClose( handle ); + return FILL_STATUS_FAILED; + } + + rec = (struct record_sid *)table->data; + rec->accountname = get_accountname( name ); + rec->binaryrepresentation = get_binaryrepresentation( sid, len ); + rec->referenceddomainname = get_referenceddomainname( domain ); + rec->sid = heap_strdupW( str ); + rec->sidlength = len; + + TRACE("created 1 row\n"); + table->num_rows = 1; + + LsaFreeMemory( domain ); + LsaFreeMemory( name ); + LocalFree( sid ); + LsaClose( handle ); + return FILL_STATUS_FILTERED; +} + static UINT32 get_bits_per_pixel( UINT *hres, UINT *vres ) { HDC hdc = GetDC( NULL ); @@ -2524,6 +2639,7 @@ static struct table builtin_classes[] = { class_processor2W, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, { class_qualifiersW, SIZEOF(col_qualifier), col_qualifier, SIZEOF(data_qualifier), 0, (BYTE *)data_qualifier }, { class_serviceW, SIZEOF(col_service), col_service, 0, 0, NULL, fill_service }, + { class_sidW, SIZEOF(col_sid), col_sid, 0, 0, NULL, fill_sid }, { class_sounddeviceW, SIZEOF(col_sounddevice), col_sounddevice, SIZEOF(data_sounddevice), 0, (BYTE *)data_sounddevice }, { class_stdregprovW, SIZEOF(col_stdregprov), col_stdregprov, SIZEOF(data_stdregprov), 0, (BYTE *)data_stdregprov }, { class_systemsecurityW, SIZEOF(col_systemsecurity), col_systemsecurity, SIZEOF(data_systemsecurity), 0, (BYTE *)data_systemsecurity },

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2015