September 2017 - Wine-Commits

Sebastian Lackner : kernel32: Add stub for GetProcessWorkingSetSizeEx.
by Alexandre Julliard Sept. 13, 2017

Sept. 13, 2017

Module: wine Branch: master Commit: 59ecc9ccd9f6fc249ff107d96fa31d7afcfbcb79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ecc9ccd9f6fc249ff107d96… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 12 23:10:49 2017 -0600 kernel32: Add stub for GetProcessWorkingSetSizeEx. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-memory-l1-1-1.spec | 2 +- .../api-ms-win-core-memory-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 20 ++++++++++++++++---- dlls/kernelbase/kernelbase.spec | 2 +- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec index 959e65d..42630c1 100644 --- a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec +++ b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec @@ -4,7 +4,7 @@ @ stdcall CreateMemoryResourceNotification(long) kernel32.CreateMemoryResourceNotification @ stdcall FlushViewOfFile(ptr long) kernel32.FlushViewOfFile @ stdcall GetLargePageMinimum() kernel32.GetLargePageMinimum -@ stub GetProcessWorkingSetSizeEx +@ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr) kernel32.GetProcessWorkingSetSizeEx @ stdcall GetSystemFileCacheSize(ptr ptr ptr) kernel32.GetSystemFileCacheSize @ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch @ stdcall MapViewOfFile(long long long long long) kernel32.MapViewOfFile diff --git a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec index 866d20e..6100213 100644 --- a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec +++ b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec @@ -8,7 +8,7 @@ @ stdcall FreeUserPhysicalPages(long ptr ptr) kernel32.FreeUserPhysicalPages @ stdcall GetLargePageMinimum() kernel32.GetLargePageMinimum @ stub GetMemoryErrorHandlingCapabilities -@ stub GetProcessWorkingSetSizeEx +@ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr) kernel32.GetProcessWorkingSetSizeEx @ stdcall GetSystemFileCacheSize(ptr ptr ptr) kernel32.GetSystemFileCacheSize @ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch @ stub MapUserPhysicalPages diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c61e6ac..cf27aea 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -793,7 +793,7 @@ # @ stub GetProcessUserModeExceptionPolicy @ stdcall GetProcessVersion(long) @ stdcall GetProcessWorkingSetSize(long ptr ptr) -# @ stub GetProcessWorkingSetSizeEx +@ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr) @ stdcall GetProductInfo(long long long long ptr) @ stub GetProductName @ stdcall GetProfileIntA(str str long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 292317c..2c6229e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3424,21 +3424,33 @@ BOOL WINAPI K32EmptyWorkingSet(HANDLE hProcess) return SetProcessWorkingSetSize(hProcess, (SIZE_T)-1, (SIZE_T)-1); } + /*********************************************************************** - * GetProcessWorkingSetSize (KERNEL32.@) + * GetProcessWorkingSetSizeEx (KERNEL32.@) */ -BOOL WINAPI GetProcessWorkingSetSize(HANDLE hProcess, PSIZE_T minset, - PSIZE_T maxset) +BOOL WINAPI GetProcessWorkingSetSizeEx(HANDLE process, SIZE_T *minset, + SIZE_T *maxset, DWORD *flags) { - FIXME("(%p,%p,%p): stub\n",hProcess,minset,maxset); + FIXME("(%p,%p,%p,%p): stub\n", process, minset, maxset, flags); /* 32 MB working set size */ if (minset) *minset = 32*1024*1024; if (maxset) *maxset = 32*1024*1024; + if (flags) *flags = QUOTA_LIMITS_HARDWS_MIN_DISABLE | + QUOTA_LIMITS_HARDWS_MAX_DISABLE; return TRUE; } /*********************************************************************** + * GetProcessWorkingSetSize (KERNEL32.@) + */ +BOOL WINAPI GetProcessWorkingSetSize(HANDLE process, SIZE_T *minset, SIZE_T *maxset) +{ + return GetProcessWorkingSetSizeEx(process, minset, maxset, NULL); +} + + +/*********************************************************************** * SetProcessShutdownParameters (KERNEL32.@) */ BOOL WINAPI SetProcessShutdownParameters(DWORD level, DWORD flags) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index f7d1cc5..f508c25 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -637,7 +637,7 @@ @ stdcall GetProcessShutdownParameters(ptr ptr) kernel32.GetProcessShutdownParameters @ stdcall GetProcessTimes(long ptr ptr ptr ptr) kernel32.GetProcessTimes @ stdcall GetProcessVersion(long) kernel32.GetProcessVersion -# @ stub GetProcessWorkingSetSizeEx +@ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr) kernel32.GetProcessWorkingSetSizeEx # @ stub GetProcessorSystemCycleTime @ stdcall GetProductInfo(long long long long ptr) kernel32.GetProductInfo @ stub GetPtrCalData

1 0

Matteo Bruni : wined3d: Disable YUV formats when not supported.
by Alexandre Julliard Sept. 13, 2017

Sept. 13, 2017

Module: wine Branch: master Commit: 27f1d5ae8e07e0b0a0e43f1609f3b2a960b20b64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f1d5ae8e07e0b0a0e43f160… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 12 21:22:28 2017 +0200 wined3d: Disable YUV formats when not supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4c878b6..0d54334 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3224,7 +3224,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_W, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } - if (!gl_info->supported[APPLE_YCBCR_422]) + if (!gl_info->supported[APPLE_YCBCR_422] && gl_info->supported[ARB_FRAGMENT_PROGRAM] + && gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) { idx = get_format_idx(WINED3DFMT_YUY2); gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YUY2); @@ -3232,18 +3233,38 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ idx = get_format_idx(WINED3DFMT_UYVY); gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_UYVY); } + else if (!gl_info->supported[APPLE_YCBCR_422] && (!gl_info->supported[ARB_FRAGMENT_PROGRAM] + || !gl_info->supported[WINED3D_GL_LEGACY_CONTEXT])) + { + idx = get_format_idx(WINED3DFMT_YUY2); + gl_info->formats[idx].glInternal = 0; + + idx = get_format_idx(WINED3DFMT_UYVY); + gl_info->formats[idx].glInternal = 0; + } - idx = get_format_idx(WINED3DFMT_YV12); - format_set_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_HEIGHT_SCALE); - gl_info->formats[idx].height_scale.numerator = 3; - gl_info->formats[idx].height_scale.denominator = 2; - gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YV12); + if (gl_info->supported[ARB_FRAGMENT_PROGRAM] && gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + { + idx = get_format_idx(WINED3DFMT_YV12); + format_set_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_HEIGHT_SCALE); + gl_info->formats[idx].height_scale.numerator = 3; + gl_info->formats[idx].height_scale.denominator = 2; + gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YV12); - idx = get_format_idx(WINED3DFMT_NV12); - format_set_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_HEIGHT_SCALE); - gl_info->formats[idx].height_scale.numerator = 3; - gl_info->formats[idx].height_scale.denominator = 2; - gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_NV12); + idx = get_format_idx(WINED3DFMT_NV12); + format_set_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_HEIGHT_SCALE); + gl_info->formats[idx].height_scale.numerator = 3; + gl_info->formats[idx].height_scale.denominator = 2; + gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_NV12); + } + else + { + idx = get_format_idx(WINED3DFMT_YV12); + gl_info->formats[idx].glInternal = 0; + + idx = get_format_idx(WINED3DFMT_NV12); + gl_info->formats[idx].glInternal = 0; + } if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) {

1 0

Zebediah Figura : msi: Simplify message type processing.
by Alexandre Julliard Sept. 13, 2017

Sept. 13, 2017

Module: wine Branch: master Commit: d17fda090d26c27a728afbe61cf39d47596e3af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17fda090d26c27a728afbe61… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 12 20:51:17 2017 -0500 msi: Simplify message type processing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 4716461..3673069 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1884,7 +1884,8 @@ LPWSTR msi_get_error_message(MSIDATABASE *db, int error) INT MSI_ProcessMessageVerbatim(MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIRECORD *record) { LPWSTR message = {0}; - DWORD len, log_type = 0; + DWORD len; + DWORD log_type = 1 << (eMessageType >> 24); UINT res; INT rc = 0; char *msg; @@ -1892,35 +1893,6 @@ INT MSI_ProcessMessageVerbatim(MSIPACKAGE *package, INSTALLMESSAGE eMessageType, TRACE("%x\n", eMessageType); if (TRACE_ON(msi)) dump_record(record); - if ((eMessageType & 0xff000000) == INSTALLMESSAGE_FATALEXIT) - log_type |= INSTALLLOGMODE_FATALEXIT; - if ((eMessageType & 0xff000000) == INSTALLMESSAGE_ERROR) - log_type |= INSTALLLOGMODE_ERROR; - if ((eMessageType & 0xff000000) == INSTALLMESSAGE_WARNING) - log_type |= INSTALLLOGMODE_WARNING; - if ((eMessageType & 0xff000000) == INSTALLMESSAGE_USER) - log_type |= INSTALLLOGMODE_USER; - if ((eMessageType & 0xff000000) == INSTALLMESSAGE_INFO) - log_type |= INSTALLLOGMODE_INFO; - if ((eMessageType & 0xff000000) == INSTALLMESSAGE_RESOLVESOURCE) - log_type |= INSTALLLOGMODE_RESOLVESOURCE; - if ((eMessageType & 0xff000000) == INSTALLMESSAGE_OUTOFDISKSPACE) - log_type |= INSTALLLOGMODE_OUTOFDISKSPACE; - if ((eMessageType & 0xff000000) == INSTALLMESSAGE_COMMONDATA) - log_type |= INSTALLLOGMODE_COMMONDATA; - if ((eMessageType & 0xff000000) == INSTALLMESSAGE_ACTIONSTART) - log_type |= INSTALLLOGMODE_ACTIONSTART; - if ((eMessageType & 0xff000000) == INSTALLMESSAGE_ACTIONDATA) - log_type |= INSTALLLOGMODE_ACTIONDATA; - if ((eMessageType & 0xff000000) == INSTALLMESSAGE_PROGRESS) - log_type |= INSTALLLOGMODE_PROGRESS; - if ((eMessageType & 0xff000000) == INSTALLMESSAGE_INITIALIZE) - log_type |= INSTALLLOGMODE_INITIALIZE; - if ((eMessageType & 0xff000000) == INSTALLMESSAGE_TERMINATE) - log_type |= INSTALLLOGMODE_TERMINATE; - if ((eMessageType & 0xff000000) == INSTALLMESSAGE_SHOWDIALOG) - log_type |= INSTALLLOGMODE_SHOWDIALOG; - if (!package || !record) message = NULL; else {

1 0

Zebediah Figura : msi: Remove ACTION_PerformUIAction().
by Alexandre Julliard Sept. 13, 2017

Sept. 13, 2017

Module: wine Branch: master Commit: eb79fe1c3b21a8264ea7fe7b6dc45a5a7dda5421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb79fe1c3b21a8264ea7fe7b6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 12 20:51:16 2017 -0500 msi: Remove ACTION_PerformUIAction(). It was originally used to show dialogs, but this is now handled in ACTION_HandleCustomAction(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 27 ++------------------------- dlls/msi/install.c | 2 +- dlls/msi/msi.c | 6 +++--- dlls/msi/msipriv.h | 1 - 4 files changed, 6 insertions(+), 30 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 64e01c4..c4b35cc 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -504,10 +504,7 @@ static UINT ITERATE_Actions(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; } - if (needs_ui_sequence(package)) - rc = ACTION_PerformUIAction(package, action, SCRIPT_NONE); - else - rc = ACTION_PerformAction(package, action, SCRIPT_NONE); + rc = ACTION_PerformAction(package, action, SCRIPT_NONE); msi_dialog_check_messages( NULL ); @@ -7775,23 +7772,6 @@ UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script) TRACE("Performing action (%s)\n", debugstr_w(action)); - rc = ACTION_HandleStandardAction(package, action); - - if (rc == ERROR_FUNCTION_NOT_CALLED) - rc = ACTION_HandleCustomAction(package, action, script); - - if (rc == ERROR_FUNCTION_NOT_CALLED) - WARN("unhandled msi action %s\n", debugstr_w(action)); - - return rc; -} - -UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UINT script) -{ - UINT rc; - - TRACE("Performing action (%s)\n", debugstr_w(action)); - package->action_progress_increment = 0; rc = ACTION_HandleStandardAction(package, action); @@ -7849,10 +7829,7 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq) return ERROR_FUNCTION_FAILED; } - if (needs_ui_sequence(package)) - rc = ACTION_PerformUIAction(package, action, SCRIPT_NONE); - else - rc = ACTION_PerformAction(package, action, SCRIPT_NONE); + rc = ACTION_PerformAction(package, action, SCRIPT_NONE); msiobj_release(&row->hdr); } diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 0ccc8e3..261a259 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -105,7 +105,7 @@ UINT WINAPI MsiDoActionW( MSIHANDLE hInstall, LPCWSTR szAction ) return ERROR_SUCCESS; } - ret = ACTION_PerformUIAction( package, szAction, SCRIPT_NONE ); + ret = ACTION_PerformAction( package, szAction, SCRIPT_NONE ); msiobj_release( &package->hdr ); return ret; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 38f7ad2..7e5e23f 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3747,7 +3747,7 @@ UINT WINAPI MsiCollectUserInfoW(LPCWSTR szProduct) if (!package) return ERROR_CALL_NOT_IMPLEMENTED; - rc = ACTION_PerformUIAction(package, szFirstRun, SCRIPT_NONE); + rc = ACTION_PerformAction(package, szFirstRun, SCRIPT_NONE); msiobj_release( &package->hdr ); MsiCloseHandle(handle); @@ -3773,7 +3773,7 @@ UINT WINAPI MsiCollectUserInfoA(LPCSTR szProduct) if (!package) return ERROR_CALL_NOT_IMPLEMENTED; - rc = ACTION_PerformUIAction(package, szFirstRun, SCRIPT_NONE); + rc = ACTION_PerformAction(package, szFirstRun, SCRIPT_NONE); msiobj_release( &package->hdr ); MsiCloseHandle(handle); @@ -3854,7 +3854,7 @@ UINT WINAPI MsiConfigureFeatureW(LPCWSTR szProduct, LPCWSTR szFeature, INSTALLST MsiSetInternalUI( INSTALLUILEVEL_BASIC, NULL ); - r = ACTION_PerformUIAction( package, szCostInitialize, SCRIPT_NONE ); + r = ACTION_PerformAction( package, szCostInitialize, SCRIPT_NONE ); if (r != ERROR_SUCCESS) goto end; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index f316c0c..9b3d77c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -983,7 +983,6 @@ extern HINSTANCE msi_hInstance DECLSPEC_HIDDEN; /* action related functions */ extern UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script) DECLSPEC_HIDDEN; -extern UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UINT script) DECLSPEC_HIDDEN; extern void ACTION_FinishCustomActions( const MSIPACKAGE* package) DECLSPEC_HIDDEN; extern UINT ACTION_CustomAction(MSIPACKAGE *, const WCHAR *, UINT) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Forward IHTMLElement6:: get_nodeName to IHTMLDOMNode implementation.
by Alexandre Julliard Sept. 13, 2017

Sept. 13, 2017

Module: wine Branch: master Commit: d2607433e08cbee63329bcac7c633bfa8a9403fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2607433e08cbee63329bcac7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 13 13:17:30 2017 +0200 mshtml: Forward IHTMLElement6::get_nodeName to IHTMLDOMNode implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 6 ++++-- dlls/mshtml/tests/dom.c | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 247948c..59484e7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4099,8 +4099,10 @@ static HRESULT WINAPI HTMLElement6_get_tagName(IHTMLElement6 *iface, BSTR *p) static HRESULT WINAPI HTMLElement6_get_nodeName(IHTMLElement6 *iface, BSTR *p) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLDOMNode_get_nodeName(&This->node.IHTMLDOMNode_iface, p); } static HRESULT WINAPI HTMLElement6_getElementsByClassName(IHTMLElement6 *iface, BSTR v, IHTMLElementCollection **pel) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a3a3bfe..cd006e2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1091,15 +1091,26 @@ static IHTMLDOMAttribute2 *_get_attr2_iface(unsigned line, IUnknown *unk) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { IHTMLDOMNode *node = _get_node_iface(line, unk); + IHTMLElement6 *elem; BSTR name; HRESULT hres; hres = IHTMLDOMNode_get_nodeName(node, &name); - IHTMLDOMNode_Release(node); ok_(__FILE__, line) (hres == S_OK, "get_nodeName failed: %08x\n", hres); ok_(__FILE__, line) (!strcmp_wa(name, exname), "got name: %s, expected %s\n", wine_dbgstr_w(name), exname); - SysFreeString(name); + + hres = IHTMLDOMNode_QueryInterface(node, &IID_IHTMLElement6, (void**)&elem); + if(SUCCEEDED(hres)) { + hres = IHTMLElement6_get_nodeName(elem, &name); + ok_(__FILE__, line) (hres == S_OK, "(elem) get_nodeName failed: %08x\n", hres); + ok_(__FILE__, line) (!strcmp_wa(name, exname), "(elem) got name: %s, expected %s\n", + wine_dbgstr_w(name), exname); + SysFreeString(name); + IHTMLElement6_Release(elem); + } + + IHTMLDOMNode_Release(node); } #define get_owner_doc(u) _get_owner_doc(__LINE__,u)

1 0

Matteo Bruni : wined3d: Disable the ARBfp blitter on core profile.
by Alexandre Julliard Sept. 13, 2017

Sept. 13, 2017

Module: wine Branch: master Commit: 1378e623caa53e9f56d3e21c1dd35161e6d02814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1378e623caa53e9f56d3e21c1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 12 21:22:29 2017 +0200 wined3d: Disable the ARBfp blitter on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 677a5d1..8f2f0e8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7910,6 +7910,9 @@ void wined3d_arbfp_blitter_create(struct wined3d_blitter **next, const struct wi if (!gl_info->supported[ARB_FRAGMENT_PROGRAM]) return; + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + return; + if (!(blitter = HeapAlloc(GetProcessHeap(), 0, sizeof(*blitter)))) { ERR("Failed to allocate blitter.\n");

1 0

Alexandre Julliard : ntdll: Also release memory past the last view in remove_reserved_area.
by Alexandre Julliard Sept. 13, 2017

Sept. 13, 2017

Module: wine Branch: master Commit: 3f0362ec3c38d4723c7a8b51eb0cb79f437f1093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f0362ec3c38d4723c7a8b51e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 13 10:11:54 2017 +0200 ntdll: Also release memory past the last view in remove_reserved_area. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ce24698..b08bde7 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -544,17 +544,14 @@ static void remove_reserved_area( void *addr, size_t size ) /* unmap areas not covered by an existing view */ WINE_RB_FOR_EACH_ENTRY( view, &views_tree, struct file_view, entry ) { - if ((char *)view->base >= (char *)addr + size) - { - munmap( addr, size ); - break; - } + if ((char *)view->base >= (char *)addr + size) break; if ((char *)view->base + view->size <= (char *)addr) continue; if (view->base > addr) munmap( addr, (char *)view->base - (char *)addr ); - if ((char *)view->base + view->size > (char *)addr + size) break; + if ((char *)view->base + view->size > (char *)addr + size) return; size = (char *)addr + size - ((char *)view->base + view->size); addr = (char *)view->base + view->size; } + munmap( addr, size ); }

1 0

Jonathan Doron : ntdll: Apply owner and group regardless of the SE_OWNER_DEFAULTED or SE_GROUP_DEFAULTED flags.
by Alexandre Julliard Sept. 13, 2017

Sept. 13, 2017

Module: wine Branch: master Commit: fbf2631dcba08ac3084823ae2df83a35b80a670b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf2631dcba08ac3084823ae2… Author: Jonathan Doron <jond(a)wizery.com> Date: Tue Sep 12 15:33:37 2017 +0300 ntdll: Apply owner and group regardless of the SE_OWNER_DEFAULTED or SE_GROUP_DEFAULTED flags. Signed-off-by: Jonathan Doron <jond(a)wizery.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index cfb5cbc..8e406ce 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -77,9 +77,9 @@ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_a data_size_t *ret_len ) { unsigned int len = sizeof(**ret); - PSID owner, group; + PSID owner = NULL, group = NULL; ACL *dacl, *sacl; - BOOLEAN owner_present, group_present, dacl_present, sacl_present, defaulted; + BOOLEAN dacl_present, sacl_present, defaulted; PSECURITY_DESCRIPTOR sd; NTSTATUS status; @@ -94,12 +94,12 @@ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_a { len += sizeof(struct security_descriptor); - if ((status = RtlGetOwnerSecurityDescriptor( sd, &owner, &owner_present ))) return status; - if ((status = RtlGetGroupSecurityDescriptor( sd, &group, &group_present ))) return status; + if ((status = RtlGetOwnerSecurityDescriptor( sd, &owner, &defaulted ))) return status; + if ((status = RtlGetGroupSecurityDescriptor( sd, &group, &defaulted ))) return status; if ((status = RtlGetSaclSecurityDescriptor( sd, &sacl_present, &sacl, &defaulted ))) return status; if ((status = RtlGetDaclSecurityDescriptor( sd, &dacl_present, &dacl, &defaulted ))) return status; - if (owner_present) len += RtlLengthSid( owner ); - if (group_present) len += RtlLengthSid( group ); + if (owner) len += RtlLengthSid( owner ); + if (group) len += RtlLengthSid( group ); if (sacl_present && sacl) len += sacl->AclSize; if (dacl_present && dacl) len += dacl->AclSize; @@ -126,8 +126,8 @@ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_a unsigned char *ptr = (unsigned char *)(descr + 1); descr->control = ((SECURITY_DESCRIPTOR *)sd)->Control & ~SE_SELF_RELATIVE; - if (owner_present) descr->owner_len = RtlLengthSid( owner ); - if (group_present) descr->group_len = RtlLengthSid( group ); + if (owner) descr->owner_len = RtlLengthSid( owner ); + if (group) descr->group_len = RtlLengthSid( group ); if (sacl_present && sacl) descr->sacl_len = sacl->AclSize; if (dacl_present && dacl) descr->dacl_len = dacl->AclSize;

1 0

Fabian Maurer : comctl32/tests: Dump failed message sequence correctly.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: 6144addcf0fc26f187aa05e6bac6c4a0c3542199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6144addcf0fc26f187aa05e6b… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Sep 12 22:53:01 2017 +0300 comctl32/tests: Dump failed message sequence correctly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/msg.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/msg.h b/dlls/comctl32/tests/msg.h index 242d690..736125a 100644 --- a/dlls/comctl32/tests/msg.h +++ b/dlls/comctl32/tests/msg.h @@ -165,11 +165,12 @@ static void dump_sequence( struct msg_sequence **seq, int sequence_index, } static void ok_sequence_(struct msg_sequence **seq, int sequence_index, - const struct message *expected, const char *context, BOOL todo, + const struct message *expected_list, const char *context, BOOL todo, const char *file, int line) { - struct msg_sequence *msg_seq = seq[sequence_index]; static const struct message end_of_sequence = {0, 0, 0, 0}; + struct msg_sequence *msg_seq = seq[sequence_index]; + const struct message *expected = expected_list; const struct message *actual, *sequence; int failcount = 0, dump = 0; @@ -379,7 +380,7 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index, } done: - if (dump) dump_sequence( seq, sequence_index, expected, context, file, line ); + if (dump) dump_sequence( seq, sequence_index, expected_list, context, file, line ); flush_sequence(seq, sequence_index); }

1 0

Alex Henrie : shell32: Implement FolderItems_Item.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: 93dd50666f6cd7796530eafdbb17802eff838f71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93dd50666f6cd7796530eafdb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Sep 11 23:16:41 2017 -0600 shell32: Implement FolderItems_Item. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 146 +++++++++++++++++++++++++++++++++++-- dlls/shell32/tests/shelldispatch.c | 21 ------ 2 files changed, 140 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=93dd50666f6cd7796530e…

1 0