- wine-devel - winehq.org

[PATCH] dsound/tests: Use GetModuleHandleA instead of LoadLibraryA.
by Andrey Gusev 22 Jan '18

22 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/dsound/tests/capture.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 4eae28bd4e..de60aa9dae 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -755,11 +755,8 @@ static void test_COM(void) START_TEST(capture) { - HMODULE hDsound; + HMODULE hDsound = GetModuleHandleA("dsound.dll"); - CoInitialize(NULL); - - hDsound = LoadLibraryA("dsound.dll"); if (!hDsound) { skip("dsound.dll not found - skipping all tests\n"); return; @@ -772,10 +769,11 @@ START_TEST(capture) return; } + CoInitialize(); + test_COM(); test_capture(); test_enumerate(); - FreeLibrary(hDsound); CoUninitialize(); } -- 2.13.6

2 1

[Translation] Wine trranslations into Korean .po file
by 김건우 22 Jan '18

22 Jan '18

2 1

[PATCH v2 2/8] dhtmled.ocx: Add DLL and stub DHTMLEdit object
by Alex Henrie 22 Jan '18

22 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Call QueryInterface from dhtml_edit_create to make sure to return the right interface configure.ac | 1 + dlls/dhtmled.ocx/Makefile.in | 8 + dlls/dhtmled.ocx/dhtmled.ocx.spec | 4 + dlls/dhtmled.ocx/dhtmled_private.h | 19 ++ dlls/dhtmled.ocx/dhtmled_tlb.idl | 22 ++ dlls/dhtmled.ocx/edit.c | 536 +++++++++++++++++++++++++++++++++++++ dlls/dhtmled.ocx/main.c | 162 +++++++++++ 7 files changed, 752 insertions(+) create mode 100644 dlls/dhtmled.ocx/Makefile.in create mode 100644 dlls/dhtmled.ocx/dhtmled.ocx.spec create mode 100644 dlls/dhtmled.ocx/dhtmled_private.h create mode 100644 dlls/dhtmled.ocx/dhtmled_tlb.idl create mode 100644 dlls/dhtmled.ocx/edit.c create mode 100644 dlls/dhtmled.ocx/main.c diff --git a/configure.ac b/configure.ac index 9aa32280f4..e4072f0fe7 100644 --- a/configure.ac +++ b/configure.ac @@ -3109,6 +3109,7 @@ WINE_CONFIG_TEST(dlls/ddrawex/tests) WINE_CONFIG_DLL(devenum,,[clean]) WINE_CONFIG_TEST(dlls/devenum/tests) WINE_CONFIG_DLL(dhcpcsvc) +WINE_CONFIG_DLL(dhtmled.ocx) WINE_CONFIG_DLL(difxapi) WINE_CONFIG_DLL(dinput,,[clean,implib,staticimplib]) WINE_CONFIG_TEST(dlls/dinput/tests) diff --git a/dlls/dhtmled.ocx/Makefile.in b/dlls/dhtmled.ocx/Makefile.in new file mode 100644 index 0000000000..17850f8107 --- /dev/null +++ b/dlls/dhtmled.ocx/Makefile.in @@ -0,0 +1,8 @@ +MODULE = dhtmled.ocx +IMPORTS = uuid + +C_SRCS = \ + edit.c \ + main.c + +IDL_SRCS = dhtmled_tlb.idl diff --git a/dlls/dhtmled.ocx/dhtmled.ocx.spec b/dlls/dhtmled.ocx/dhtmled.ocx.spec new file mode 100644 index 0000000000..b16365d0c9 --- /dev/null +++ b/dlls/dhtmled.ocx/dhtmled.ocx.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dhtmled.ocx/dhtmled_private.h b/dlls/dhtmled.ocx/dhtmled_private.h new file mode 100644 index 0000000000..5a9e89b997 --- /dev/null +++ b/dlls/dhtmled.ocx/dhtmled_private.h @@ -0,0 +1,19 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +extern HRESULT dhtml_edit_create(REFIID iid, void **out); diff --git a/dlls/dhtmled.ocx/dhtmled_tlb.idl b/dlls/dhtmled.ocx/dhtmled_tlb.idl new file mode 100644 index 0000000000..96a9444a13 --- /dev/null +++ b/dlls/dhtmled.ocx/dhtmled_tlb.idl @@ -0,0 +1,22 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register +#pragma makedep regtypelib + +#include "dhtmled.idl" diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c new file mode 100644 index 0000000000..428fd7af30 --- /dev/null +++ b/dlls/dhtmled.ocx/edit.c @@ -0,0 +1,536 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "dhtmled.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dhtmled); + +typedef struct +{ + IDHTMLEdit IDHTMLEdit_iface; + LONG ref; +} DHTMLEditImpl; + +static inline DHTMLEditImpl *impl_from_IDHTMLEdit(IDHTMLEdit *iface) +{ + return CONTAINING_RECORD(iface, DHTMLEditImpl, IDHTMLEdit_iface); +} + +static HRESULT WINAPI DHTMLEdit_QueryInterface(IDHTMLEdit *iface, REFIID iid, void **out) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IDispatch) || + IsEqualGUID(iid, &IID_IDHTMLSafe) || + IsEqualGUID(iid, &IID_IDHTMLEdit)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + *out = NULL; + ERR("no interface for %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI DHTMLEdit_AddRef(IDHTMLEdit *iface) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI DHTMLEdit_Release(IDHTMLEdit *iface) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI DHTMLEdit_GetTypeInfoCount(IDHTMLEdit *iface, UINT *count) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, count); + *count = 0; + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_GetTypeInfo(IDHTMLEdit *iface, UINT type_index, LCID lcid, ITypeInfo **type_info) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%u, %08x, %p) stub\n", This, type_index, lcid, type_info); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_GetIDsOfNames(IDHTMLEdit *iface, REFIID iid, OLECHAR **names, UINT name_count, + LCID lcid, DISPID *disp_ids) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%s, %p, %u, %08x, %p) stub\n", This, debugstr_guid(iid), names, name_count, lcid, disp_ids); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_Invoke(IDHTMLEdit *iface, DISPID member, REFIID iid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *ret, EXCEPINFO *exception_info, UINT *error_index) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%d, %s, %08x, 0x%x, %p, %p, %p, %p) stub\n", + This, member, debugstr_guid(iid), lcid, flags, params, ret, exception_info, error_index); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_ExecCommand(IDHTMLEdit *iface, DHTMLEDITCMDID cmd_id, OLECMDEXECOPT options, + VARIANT *code_in, VARIANT *code_out) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%u, %u, %s, %p) stub\n", This, cmd_id, options, debugstr_variant(code_in), code_out); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_QueryStatus(IDHTMLEdit *iface, DHTMLEDITCMDID cmd_id, DHTMLEDITCMDF *status) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%u, %p) stub\n", This, cmd_id, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_SetContextMenu(IDHTMLEdit *iface, VARIANT *strings, VARIANT *states) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p, %p) stub\n", This, strings, states); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_NewDocument(IDHTMLEdit *iface) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->() stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_LoadURL(IDHTMLEdit *iface, BSTR url) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(url)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_FilterSourceCode(IDHTMLEdit *iface, BSTR in, BSTR *out) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%s, %p)\n", This, debugstr_w(in), out); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_Refresh(IDHTMLEdit *iface) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->() stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_DOM(IDHTMLEdit *iface, IHTMLDocument2 **value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_DocumentHTML(IDHTMLEdit *iface, BSTR *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_DocumentHTML(IDHTMLEdit *iface, BSTR html) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%s) stub\n", This, debugstr_w(html)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_ActivateApplets(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_ActivateApplets(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_ActivateActiveXControls(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_ActivateActiveXControls(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_ActivateDTCs(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_ActivateDTCs(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_ShowDetails(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_ShowDetails(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_ShowBorders(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_ShowBorders(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_Appearance(IDHTMLEdit *iface, DHTMLEDITAPPEARANCE *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_Appearance(IDHTMLEdit *iface, DHTMLEDITAPPEARANCE value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%u) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_Scrollbars(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_Scrollbars(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_ScrollbarAppearance(IDHTMLEdit *iface, DHTMLEDITAPPEARANCE *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_ScrollbarAppearance(IDHTMLEdit *iface, DHTMLEDITAPPEARANCE value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%u) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_SourceCodePreservation(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_SourceCodePreservation(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_AbsoluteDropMode(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_AbsoluteDropMode(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_SnapToGridX(IDHTMLEdit *iface, LONG *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_SnapToGridX(IDHTMLEdit *iface, LONG value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%d) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_SnapToGridY(IDHTMLEdit *iface, LONG *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_SnapToGridY(IDHTMLEdit *iface, LONG value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%d) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_SnapToGrid(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_SnapToGrid(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_IsDirty(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_CurrentDocumentPath(IDHTMLEdit *iface, BSTR *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_BaseURL(IDHTMLEdit *iface, BSTR *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_BaseURL(IDHTMLEdit *iface, BSTR value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%s) stub\n", This, debugstr_w(value)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_DocumentTitle(IDHTMLEdit *iface, BSTR *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_UseDivOnCarriageReturn(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_UseDivOnCarriageReturn(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_Busy(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_LoadDocument(IDHTMLEdit *iface, VARIANT *path, VARIANT *prompt) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%s, %s) stub\n", This, debugstr_variant(path), debugstr_variant(prompt)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_SaveDocument(IDHTMLEdit *iface, VARIANT *path, VARIANT *prompt) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%s, %s) stub\n", This, debugstr_variant(path), debugstr_variant(prompt)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_PrintDocument(IDHTMLEdit *iface, VARIANT *prompt) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%s) stub\n", This, debugstr_variant(prompt)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_BrowseMode(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_BrowseMode(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static const IDHTMLEditVtbl DHTMLEditVtbl = { + DHTMLEdit_QueryInterface, + DHTMLEdit_AddRef, + DHTMLEdit_Release, + DHTMLEdit_GetTypeInfoCount, + DHTMLEdit_GetTypeInfo, + DHTMLEdit_GetIDsOfNames, + DHTMLEdit_Invoke, + DHTMLEdit_ExecCommand, + DHTMLEdit_QueryStatus, + DHTMLEdit_SetContextMenu, + DHTMLEdit_NewDocument, + DHTMLEdit_LoadURL, + DHTMLEdit_FilterSourceCode, + DHTMLEdit_Refresh, + DHTMLEdit_get_DOM, + DHTMLEdit_get_DocumentHTML, + DHTMLEdit_put_DocumentHTML, + DHTMLEdit_get_ActivateApplets, + DHTMLEdit_put_ActivateApplets, + DHTMLEdit_get_ActivateActiveXControls, + DHTMLEdit_put_ActivateActiveXControls, + DHTMLEdit_get_ActivateDTCs, + DHTMLEdit_put_ActivateDTCs, + DHTMLEdit_get_ShowDetails, + DHTMLEdit_put_ShowDetails, + DHTMLEdit_get_ShowBorders, + DHTMLEdit_put_ShowBorders, + DHTMLEdit_get_Appearance, + DHTMLEdit_put_Appearance, + DHTMLEdit_get_Scrollbars, + DHTMLEdit_put_Scrollbars, + DHTMLEdit_get_ScrollbarAppearance, + DHTMLEdit_put_ScrollbarAppearance, + DHTMLEdit_get_SourceCodePreservation, + DHTMLEdit_put_SourceCodePreservation, + DHTMLEdit_get_AbsoluteDropMode, + DHTMLEdit_put_AbsoluteDropMode, + DHTMLEdit_get_SnapToGridX, + DHTMLEdit_put_SnapToGridX, + DHTMLEdit_get_SnapToGridY, + DHTMLEdit_put_SnapToGridY, + DHTMLEdit_get_SnapToGrid, + DHTMLEdit_put_SnapToGrid, + DHTMLEdit_get_IsDirty, + DHTMLEdit_get_CurrentDocumentPath, + DHTMLEdit_get_BaseURL, + DHTMLEdit_put_BaseURL, + DHTMLEdit_get_DocumentTitle, + DHTMLEdit_get_UseDivOnCarriageReturn, + DHTMLEdit_put_UseDivOnCarriageReturn, + DHTMLEdit_get_Busy, + DHTMLEdit_LoadDocument, + DHTMLEdit_SaveDocument, + DHTMLEdit_PrintDocument, + DHTMLEdit_get_BrowseMode, + DHTMLEdit_put_BrowseMode +}; + +HRESULT dhtml_edit_create(REFIID iid, void **out) +{ + DHTMLEditImpl *This; + HRESULT ret; + + TRACE("(%s, %p)\n", debugstr_guid(iid), out); + + *out = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + + This->IDHTMLEdit_iface.lpVtbl = &DHTMLEditVtbl; + This->ref = 1; + + ret = IDHTMLEdit_QueryInterface(&This->IDHTMLEdit_iface, iid, out); + IDHTMLEdit_Release(&This->IDHTMLEdit_iface); + return ret; +} diff --git a/dlls/dhtmled.ocx/main.c b/dlls/dhtmled.ocx/main.c new file mode 100644 index 0000000000..4640884934 --- /dev/null +++ b/dlls/dhtmled.ocx/main.c @@ -0,0 +1,162 @@ +/* + * Dynamic HyperText Markup Language Editing Control + * + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "initguid.h" +#include "dhtmled.h" +#include "dhtmled_private.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dhtmled); + +typedef struct +{ + IClassFactory IClassFactory_iface; + HRESULT (*create)(REFIID iid, void **out); +} ClassFactoryImpl; + +static inline ClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, ClassFactoryImpl, IClassFactory_iface); +} + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID iid, void **out) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(&IID_IUnknown, iid) || IsEqualGUID(&IID_IClassFactory, iid)) + { + *out = iface; + IClassFactory_AddRef(iface); + return S_OK; + } + + *out = NULL; + WARN("no interface for %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + return 2; /* non-heap based object */ +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + return 1; /* non-heap based object */ +} + +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID iid, void **out) +{ + ClassFactoryImpl *This = impl_from_IClassFactory(iface); + + TRACE("(%p)->(%p, %s, %p)\n", iface, outer, debugstr_guid(iid), out); + + if (outer) + return CLASS_E_NOAGGREGATION; + + return This->create(iid, out); +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL lock) +{ + TRACE("(%p)->(%x)\n", iface, lock); + return S_OK; +} + +static const IClassFactoryVtbl ClassFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + +static HINSTANCE dhtmled_instance; + +/****************************************************************** + * DllMain (dhtmled.ocx.@) + */ +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, VOID *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + /* Applications that use dhtmled.ocx usually install and register it + * themselves, but do not install its dependency triedit.dll. + * Because Wine's (currently nonexistent) triedit.dll implementation + * is not sufficient for native dhtmled.ocx, prefer our own. */ + return TRUE; + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + dhtmled_instance = instance; + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject (dhtmled.ocx.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *out) +{ + static ClassFactoryImpl dhtml_edit_cf = { {&ClassFactoryVtbl}, dhtml_edit_create }; + + TRACE("(%s, %s, %p)\n", debugstr_guid(clsid), debugstr_guid(iid), out); + + if (IsEqualGUID(clsid, &CLSID_DHTMLEdit)) + return IClassFactory_QueryInterface(&dhtml_edit_cf.IClassFactory_iface, iid, out); + + FIXME("no class for %s\n", debugstr_guid(clsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow (dhtmled.ocx.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + TRACE("()\n"); + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (dhtmled.ocx.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + TRACE("()\n"); + return __wine_register_resources(dhtmled_instance); +} + +/*********************************************************************** + * DllUnregisterServer (dhtmled.ocx.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + TRACE("()\n"); + return __wine_unregister_resources(dhtmled_instance); +} -- 2.16.0

1 0

[PATCH] testbot: Try to reconnect to the database in case of error.
by Francois Gouget 22 Jan '18

22 Jan '18

We set RaiseError in our DBI options so programming errors are easier to debug and have a better chance of being caught. However this means DBI::connect() will raise an exception if the database server is not running (like if it's being upgraded just at the wrong time). Furthermore the higher layers cannot meaningfully deal with a broken connection. So catch these exceptions and try reconnecting until successful. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This patch should prevent last friday's outage from re-occuring. At least the admin page to access the log worked great! Also I have updated a local script to not only notify me when a VM goes offline, but also when the TestBot Engine is no longer responding. testbot/lib/ObjectModel/DBIBackEnd.pm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 4082a0ac..0594951b 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -53,9 +53,18 @@ sub GetDb($) } if (!defined $self->{Db}) { - $self->{Db} = DBI->connect(@{$self->{ConnectArgs}}); + while (1) + { + # Protect this call so we can retry in case RaiseError is set + eval { $self->{Db} = DBI->connect(@{$self->{ConnectArgs}}) }; + last if ($self->{Db}); + + # Prints errors on stderr like DBI normally does + $@ ||= "DBI::connect() returned undef without setting an error"; + print STDERR "$@\n"; + sleep(30); + } } - return $self->{Db}; } -- 2.15.1

1 0

[PATCH] winetest: Remove unneeded colons in titles.
by Francois Gouget 22 Jan '18

22 Jan '18

Removing the colon makes the titles flow more naturally and improves the chance they are fully visible when multiple tabs are open. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is really a cosmetic patch but it's also very simple. In practice it means the tab titles will be something like 'Jan 19 Win7 results' instead of 'Jan 19: Win7 results' and so on. winetest/gather | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/winetest/gather b/winetest/gather index ac6c3501..a894377e 100755 --- a/winetest/gather +++ b/winetest/gather @@ -732,14 +732,14 @@ sub write_build_index_and_summary($) { $group_name = $group->{name}; $header_footer = build_header_footer($group->{reports}); - $title = "$short_date: $group_name results"; + $title = "$short_date $group_name results"; $filename = "index_$group_name.html"; } else { $group_name = "global"; $header_footer = build_header_footer(\@groups); - $title = "$short_date: Summary"; + $title = "$short_date Summary"; $filename = "index.html"; } @@ -773,7 +773,7 @@ EOF print OUT " | <a href=\"..\">index</a>\n"; print OUT "</div>\n"; print OUT "<div class=\"group\">\n"; - print OUT "<h1>$short_date: $group_name results for build <a href=\".\" title=\"$build\">$short_build</a></h1>\n"; + print OUT "<h1>$short_date $group_name results for build <a href=\".\" title=\"$build\">$short_build</a></h1>\n"; print OUT "<table class=\"report\">\n$header_footer\n <tbody>\n"; } else @@ -784,7 +784,7 @@ EOF print OUT " | <a href=\"..\">index</a>"; print OUT "</div>\n"; print OUT "<div class=\"main\">\n"; - print OUT "<h1>$short_date: Summary for build $short_build</h1>\n"; + print OUT "<h1>$short_date Summary for build $short_build</h1>\n"; print OUT "<table class=\"report\">\n$header_footer\n <tbody>\n"; } -- 2.15.1

1 0

[PATCH] ucrtbase: Hook up __intrinsic_setjmpex for x86_64 and arm64
by Martin Storsjo 21 Jan '18

21 Jan '18

Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 5e67f92..cb6fd4e 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -39,7 +39,7 @@ @ stub __dcrt_initial_narrow_environment @ stub __intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp -@ stub __intrinsic_setjmpex +@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b142a17..5d12b4c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -94,7 +94,7 @@ @ cdecl __initialize_lconv_for_unsigned_char() __lconv_init @ stub __intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp -@ stub __intrinsic_setjmpex +@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) MSVCRT__setjmpex @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym @ cdecl __iscsymf(long) MSVCRT___iscsymf diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index b2d11bc..c4f9f6a 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -33,7 +33,7 @@ @ stub __current_exception @ stub __current_exception_context @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp -@ stub __intrinsic_setjmpex +@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy -- 2.7.4

1 0

[PATCH] ntdll: Implement NtFlushInstructionCache using __clear_cache where available
by Martin Storsjo 21 Jan '18

21 Jan '18

The configure check needs to be done with a more elaborate test than just AC_CHECK_FUNC, since it's a built-in function in clang and errors out if invoked with no parameters. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- configure.ac | 8 ++++++++ dlls/ntdll/process.c | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/configure.ac b/configure.ac index 223c985..25d88d8 100644 --- a/configure.ac +++ b/configure.ac @@ -2717,6 +2717,14 @@ then AC_DEFINE(HAVE___BUILTIN_POPCOUNT, 1, [Define to 1 if you have the `__builtin_popcount' built-in function.]) fi +AC_CACHE_CHECK([for __clear_cache], ac_cv_have___clear_cache, + AC_LINK_IFELSE([AC_LANG_PROGRAM(,[[__clear_cache((void*)0, (void*)0); return 0;]])], + [ac_cv_have___clear_cache="yes"], [ac_cv_have___clear_cache="no"])) +if test "$ac_cv_have___clear_cache" = "yes" +then + AC_DEFINE(HAVE___CLEAR_CACHE, 1, [Define to 1 if you have the `__clear_cache' (potentially built-in) function.]) +fi + dnl *** check for the need to define platform-specific symbols case $host_cpu in diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index f615ce2..47a389a 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -658,6 +658,17 @@ NTSTATUS WINAPI NtFlushInstructionCache( IN LPCVOID BaseAddress, IN SIZE_T Size) { +#ifdef HAVE___CLEAR_CACHE + if (ProcessHandle == GetCurrentProcess()) + { + __clear_cache(BaseAddress, (char*)BaseAddress + Size); + } + else + { + FIXME("%p %p %ld - Flush for other process not supported\n", + ProcessHandle, BaseAddress, Size); + } +#else static int once; if (!once++) { @@ -667,6 +678,7 @@ NTSTATUS WINAPI NtFlushInstructionCache( FIXME("%p %p %ld\n", ProcessHandle, BaseAddress, Size ); #endif } +#endif return STATUS_SUCCESS; } -- 2.7.4

1 0

[PATCH] dmusic: Use the new global HeapReAlloc wrappers in CreatePort()
by Michael Stefaniuc 21 Jan '18

21 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Actually I remembered one of my dmusic patches where the new heap_realloc() semantics (alloc for NULL ptr and free for 0 size) could have come in handy. Also I used there the "nofail" approach aka did not check for memory failure as the alloc size it at most a handful of (void*) sizes. That are also tests that exercise those code paths. Of course I could have added a heap_reallocarray() too, but don't want to start with the scope creep already... dlls/dmusic/dmusic.c | 21 +++++---------------- dlls/dmusic/dmusic_private.h | 1 + 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 58dcd9d952..eb3bc71af2 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -159,12 +159,7 @@ static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSI return hr; } This->num_ports++; - if (!This->ports) - This->ports = HeapAlloc(GetProcessHeap(), 0, - sizeof(*This->ports) * This->num_ports); - else - This->ports = HeapReAlloc(GetProcessHeap(), 0, This->ports, - sizeof(*This->ports) * This->num_ports); + This->ports = heap_realloc_nofail(This->ports, sizeof(*This->ports) * This->num_ports); This->ports[This->num_ports - 1] = new_port; *port = new_port; return S_OK; @@ -195,16 +190,10 @@ void dmusic_remove_port(IDirectMusic8Impl *dmusic, IDirectMusicPort *port) return; } - if (!--dmusic->num_ports) { - HeapFree(GetProcessHeap(), 0, dmusic->ports); - dmusic->ports = NULL; - return; - } - - memmove(&dmusic->ports[i], &dmusic->ports[i + 1], - (dmusic->num_ports - i) * sizeof(*dmusic->ports)); - dmusic->ports = HeapReAlloc(GetProcessHeap(), 0, dmusic->ports, - sizeof(*dmusic->ports) * dmusic->num_ports); + if (--dmusic->num_ports) + memmove(&dmusic->ports[i], &dmusic->ports[i + 1], + (dmusic->num_ports - i) * sizeof(*dmusic->ports)); + dmusic->ports = heap_realloc_nofail(dmusic->ports, sizeof(*dmusic->ports) * dmusic->num_ports); } static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DWORD index, LPDMUS_CLOCKINFO clock_info) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index f9839edfda..f948099bbd 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -35,6 +35,7 @@ #include "winuser.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "winreg.h" -- 2.14.3

1 0

[PATCH 2/2] vbscript: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 21 Jan '18

21 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- I did not bother to find the locations where the _nofail variants can be used. Will start working on that stuff only after the patch implementing the generic HeapAlloc wrappers is in. dlls/vbscript/interp.c | 6 +++--- dlls/vbscript/vbdisp.c | 8 ++++---- dlls/vbscript/vbregexp.c | 10 +++++----- dlls/vbscript/vbscript.c | 4 ++-- dlls/vbscript/vbscript.h | 21 +-------------------- 5 files changed, 15 insertions(+), 34 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 9ec329924c..8853ef9ee5 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1034,7 +1034,7 @@ static HRESULT interp_dim(exec_ctx_t *ctx) assert(array_id < ctx->func->array_cnt); if(!ctx->arrays) { - ctx->arrays = heap_alloc_zero(ctx->func->array_cnt * sizeof(SAFEARRAY*)); + ctx->arrays = heap_calloc(ctx->func->array_cnt, sizeof(SAFEARRAY*)); if(!ctx->arrays) return E_OUTOFMEMORY; } @@ -2087,7 +2087,7 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, vbdisp_t *vbthis, DISPP VARIANT *v; unsigned i; - exec.args = heap_alloc_zero(func->arg_cnt * sizeof(VARIANT)); + exec.args = heap_calloc(func->arg_cnt, sizeof(VARIANT)); if(!exec.args) { release_exec(&exec); return E_OUTOFMEMORY; @@ -2113,7 +2113,7 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, vbdisp_t *vbthis, DISPP } if(func->var_cnt) { - exec.vars = heap_alloc_zero(func->var_cnt * sizeof(VARIANT)); + exec.vars = heap_calloc(func->var_cnt, sizeof(VARIANT)); if(!exec.vars) { release_exec(&exec); return E_OUTOFMEMORY; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 9c0c4c1d9a..714bab6e05 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -564,7 +564,7 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) vbdisp_t *vbdisp; HRESULT hres = S_OK; - vbdisp = heap_alloc_zero( FIELD_OFFSET( vbdisp_t, props[desc->prop_cnt] )); + vbdisp = heap_zalloc( offsetof( vbdisp_t, props[desc->prop_cnt] )); if(!vbdisp) return E_OUTOFMEMORY; @@ -575,7 +575,7 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) list_add_tail(&desc->ctx->objects, &vbdisp->entry); if(desc->array_cnt) { - vbdisp->arrays = heap_alloc_zero(desc->array_cnt * sizeof(*vbdisp->arrays)); + vbdisp->arrays = heap_calloc(desc->array_cnt, sizeof(*vbdisp->arrays)); if(vbdisp->arrays) { unsigned i, j; @@ -642,7 +642,7 @@ HRESULT create_procedure_disp(script_ctx_t *ctx, vbscode_t *code, IDispatch **re vbdisp_t *vbdisp; HRESULT hres; - desc = heap_alloc_zero(sizeof(*desc)); + desc = heap_zalloc(sizeof(*desc)); if(!desc) return E_OUTOFMEMORY; @@ -960,7 +960,7 @@ HRESULT create_script_disp(script_ctx_t *ctx, ScriptDisp **ret) { ScriptDisp *script_disp; - script_disp = heap_alloc_zero(sizeof(*script_disp)); + script_disp = heap_zalloc(sizeof(*script_disp)); if(!script_disp) return E_OUTOFMEMORY; diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 800ea5e74f..ad0f60944c 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -307,7 +307,7 @@ static HRESULT create_sub_matches(DWORD pos, match_state_t *result, SubMatches * if(FAILED(hres)) return hres; - ret = heap_alloc_zero(sizeof(*ret)); + ret = heap_zalloc(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; @@ -605,7 +605,7 @@ static HRESULT create_match2(DWORD pos, match_state_t **result, IMatch2 **match) if(FAILED(hres)) return hres; - ret = heap_alloc_zero(sizeof(*ret)); + ret = heap_zalloc(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; @@ -754,7 +754,7 @@ static HRESULT create_enum_variant_mc2(IMatchCollection2 *mc, ULONG pos, IEnumVA { MatchCollectionEnum *ret; - ret = heap_alloc_zero(sizeof(*ret)); + ret = heap_zalloc(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; @@ -1051,7 +1051,7 @@ static HRESULT create_match_collection2(IMatchCollection2 **match_collection) if(FAILED(hres)) return hres; - ret = heap_alloc_zero(sizeof(*ret)); + ret = heap_zalloc(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; @@ -1602,7 +1602,7 @@ HRESULT create_regexp(IDispatch **ret) if(FAILED(hres)) return hres; - regexp = heap_alloc_zero(sizeof(*regexp)); + regexp = heap_zalloc(sizeof(*regexp)); if(!regexp) return E_OUTOFMEMORY; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 645068e347..1aae7f23a9 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -565,7 +565,7 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) if(This->ctx) return E_UNEXPECTED; - ctx = heap_alloc_zero(sizeof(script_ctx_t)); + ctx = heap_zalloc(sizeof(script_ctx_t)); if(!ctx) return E_OUTOFMEMORY; @@ -757,7 +757,7 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); - ret = heap_alloc_zero(sizeof(*ret)); + ret = heap_zalloc(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index ec41737083..5e935ff76a 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -28,6 +28,7 @@ #include "vbscript_classes.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" @@ -430,26 +431,6 @@ HRESULT create_safearray_iter(SAFEARRAY *sa, IEnumVARIANT **ev) DECLSPEC_HIDDEN; HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL; -- 2.14.3

1 0

[PATCH] kernel32/tests: Fix the HeapReAlloc name in two comments
by Michael Stefaniuc 21 Jan '18

21 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 2c91bb95aa..67dc8b6df4 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -568,7 +568,7 @@ static void test_HeapCreate(void) ok(HeapFree(heap,0,mem3),"HeapFree didn't pass successfully\n"); } - /* Check that HeapRealloc works */ + /* Check that HeapReAlloc works */ mem2a=HeapReAlloc(heap,HEAP_ZERO_MEMORY,mem2,memchunk+5*sysInfo.dwPageSize); ok(mem2a!=NULL,"HeapReAlloc failed\n"); if(mem2a) { @@ -582,7 +582,7 @@ static void test_HeapCreate(void) ok(!error,"HeapReAlloc should have zeroed out its allocated memory\n"); } - /* Check that HeapRealloc honours HEAP_REALLOC_IN_PLACE_ONLY */ + /* Check that HeapReAlloc honours HEAP_REALLOC_IN_PLACE_ONLY */ error=FALSE; mem1a=HeapReAlloc(heap,HEAP_REALLOC_IN_PLACE_ONLY,mem1,memchunk+sysInfo.dwPageSize); if(mem1a!=NULL) { -- 2.14.3

1 0

[PATCH] ntdll: Determine write fault based on failed instruction on ARM64
by André Hentschel 21 Jan '18

21 Jan '18

Based on code from Qemu Reported-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/signal_arm64.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index a04fe93..57ec13a 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -568,6 +568,23 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f return STATUS_SUCCESS; } +static inline DWORD is_write_fault( ucontext_t *context ) +{ + DWORD inst = *(DWORD *)PC_sig(context); + if ((inst & 0xbfff0000) == 0x0c000000 /* C3.3.1 */ || + (inst & 0xbfe00000) == 0x0c800000 /* C3.3.2 */ || + (inst & 0xbfdf0000) == 0x0d000000 /* C3.3.3 */ || + (inst & 0xbfc00000) == 0x0d800000 /* C3.3.4 */ || + (inst & 0x3f400000) == 0x08000000 /* C3.3.6 */ || + (inst & 0x3bc00000) == 0x38000000 /* C3.3.8-12 */ || + (inst & 0x3fe00000) == 0x3c800000 /* C3.3.8-12 128bit */ || + (inst & 0x3bc00000) == 0x39000000 /* C3.3.13 */ || + (inst & 0x3fc00000) == 0x3d800000 /* C3.3.13 128bit */ || + (inst & 0x3a400000) == 0x28000000) /* C3.3.7,14-16 */ + return EXCEPTION_WRITE_FAULT; + return EXCEPTION_READ_FAULT; +} + /********************************************************************** * segv_handler * @@ -604,8 +621,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) case SIGSEGV: /* Segmentation fault */ rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->NumberParameters = 2; - /* FIXME: Currently the kernel provides no way to determine if it's read or write */ - rec->ExceptionInformation[0] = 0; + rec->ExceptionInformation[0] = is_write_fault(context); rec->ExceptionInformation[1] = (ULONG_PTR)info->si_addr; break; case SIGBUS: /* Alignment check exception */ -- 2.7.4

1 0

[PATCH] ws2_32/tests: Fix the printed value in a few ok lines.
by Stefan Dösinger 21 Jan '18

21 Jan '18

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 96631aea37..e188724203 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1768,8 +1768,8 @@ todo_wine ok(!csinfoA.cs.LocalAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); ok(csinfoA.cs.LocalAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); /* Socket is not connected, no information provided */ - ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); - ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); + ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.RemoteAddr.iSockaddrLength); + ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.RemoteAddr.lpSockaddr); err = bind(s, (struct sockaddr*)&saddr, sizeof(saddr)); ok(!err, "Expected 0, got %d\n", err); @@ -1781,8 +1781,8 @@ todo_wine ok(csinfoA.cs.LocalAddr.iSockaddrLength, "Expected non-zero\n"); ok(csinfoA.cs.LocalAddr.lpSockaddr != NULL, "Expected non-null\n"); /* Socket is not connected, no information provided */ - ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); - ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); + ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.RemoteAddr.iSockaddrLength); + ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.RemoteAddr.lpSockaddr); err = bind(s2, (struct sockaddr*)&saddr, sizeof(saddr)); ok(!err, "Expected 0, got %d\n", err); -- 2.13.6

1 0

[PATCH] ole2disp: Implement SafeArrayDestroyData()
by Nikolay Sivov 21 Jan '18

21 Jan '18

Based on patch by Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole2disp.dll16/ole2disp.c | 19 +++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 98aca3dbee..b98148550f 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -270,6 +270,25 @@ HRESULT WINAPI SafeArrayDestroyDescriptor16(SEGPTR s) return S_OK; } +/****************************************************************************** + * SafeArrayDestroyData [OLE2DISP.41] + */ +HRESULT WINAPI SafeArrayDestroyData16(SAFEARRAY16 *sa) +{ + TRACE("%p\n", sa); + + if (!sa) + return S_OK; + + if (sa->cLocks) + return DISP_E_ARRAYISLOCKED; + + if (!(sa->fFeatures & FADF_STATIC)) + safearray_free(sa->pvData); + + return S_OK; +} + /* This implementation of the BSTR API is 16-bit only. It represents BSTR as a 16:16 far pointer, and the strings as ISO-8859 */ diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 7b00ac353b..57d2254afd 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -38,7 +38,7 @@ 38 pascal SafeArrayAllocDescriptor(word ptr) SafeArrayAllocDescriptor16 39 pascal SafeArrayAllocData(ptr) SafeArrayAllocData16 40 pascal SafeArrayDestroyDescriptor(segptr) SafeArrayDestroyDescriptor16 -41 stub SAFEARRAYDESTROYDATA +41 pascal SafeArrayDestroyData(ptr) SafeArrayDestroyData16 42 stub SAFEARRAYREDIM 43 stub VARI2FROMI4 44 stub VARI2FROMR4 -- 2.15.1

1 0

[PATCH] comctl32/listview: Always return zero state mask for subitems
by Nikolay Sivov 21 Jan '18

21 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listview.c | 11 +++++++---- dlls/comctl32/tests/listview.c | 43 ++++++++++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 589d5c4a7e..c085578062 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6679,16 +6679,19 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, /* make a local copy */ isubitem = lpLVItem->iSubItem; + if (isubitem && (lpLVItem->mask & LVIF_STATE)) + lpLVItem->state = 0; + /* a quick optimization if all we're asked is the focus state * these queries are worth optimising since they are common, * and can be answered in constant time, without the heavy accesses */ if ( (lpLVItem->mask == LVIF_STATE) && (lpLVItem->stateMask == LVIS_FOCUSED) && !(infoPtr->uCallbackMask & LVIS_FOCUSED) ) { - lpLVItem->state = 0; - if (infoPtr->nFocusedItem == lpLVItem->iItem) - lpLVItem->state |= LVIS_FOCUSED; - return TRUE; + lpLVItem->state = 0; + if (infoPtr->nFocusedItem == lpLVItem->iItem && isubitem == 0) + lpLVItem->state |= LVIS_FOCUSED; + return TRUE; } ZeroMemory(&dispInfo, sizeof(dispInfo)); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8efd3dab69..18e874a00f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6152,16 +6152,17 @@ static void test_state_image(void) insert_column(hwnd, 0); insert_column(hwnd, 1); - item.mask = LVIF_TEXT; + item.mask = LVIF_TEXT | LVIF_PARAM; item.iItem = 0; item.iSubItem = 0; item.pszText = text; + item.lParam = 123456; r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(r == 0, "Failed to insert an item.\n"); item.mask = LVIF_STATE; - item.state = INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.state = INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED | LVIS_FOCUSED; + item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED | LVIS_FOCUSED; item.iItem = 0; item.iSubItem = 0; r = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); @@ -6174,27 +6175,49 @@ static void test_state_image(void) r = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); ok(r, "Failed to set subitem text.\n"); - item.mask = LVIF_STATE; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.mask = LVIF_STATE | LVIF_PARAM; + item.stateMask = ~0u; item.state = 0; item.iItem = 0; item.iSubItem = 0; + item.lParam = 0; r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); ok(r, "Failed to get item state.\n"); - ok(item.state == (INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED), "Unexpected item state %#x.\n", item.state); + ok(item.state == (INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED | LVIS_FOCUSED), + "Unexpected item state %#x.\n", item.state); + ok(item.lParam == 123456, "Unexpected lParam %ld.\n", item.lParam); - item.mask = LVIF_STATE; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.mask = 0; + item.stateMask = ~0u; item.state = INDEXTOSTATEIMAGEMASK(2); item.iItem = 0; item.iSubItem = 1; r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); ok(r, "Failed to get subitem state.\n"); - todo_wine + ok(item.state == INDEXTOSTATEIMAGEMASK(2), "Unexpected state %#x.\n", item.state); + + item.mask = LVIF_STATE | LVIF_PARAM; + item.stateMask = ~0u; + item.state = INDEXTOSTATEIMAGEMASK(2); + item.iItem = 0; + item.iSubItem = 1; + item.lParam = 0; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get subitem state.\n"); + ok(item.state == 0, "Unexpected state %#x.\n", item.state); + ok(item.lParam == 123456, "Unexpected lParam %ld.\n", item.lParam); + + item.mask = LVIF_STATE; + item.stateMask = LVIS_FOCUSED; + item.state = 0; + item.iItem = 0; + item.iSubItem = 1; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get subitem state.\n"); ok(item.state == 0, "Unexpected state %#x.\n", item.state); item.mask = LVIF_STATE; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.stateMask = ~0u; item.state = INDEXTOSTATEIMAGEMASK(2); item.iItem = 0; item.iSubItem = 2; -- 2.15.1

1 0

[PATCH] shell32: Reduce code duplication in GetCommandString()
by Nikolay Sivov 21 Jan '18

21 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/shlview_cmenu.c | 167 ++++++++++++++++++------------------------- 1 file changed, 68 insertions(+), 99 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 5c5ba1b002..3f09413f61 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -471,111 +471,80 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( return S_OK; } -static HRESULT WINAPI ItemMenu_GetCommandString( - IContextMenu3 *iface, - UINT_PTR idCommand, - UINT uFlags, - UINT* lpReserved, - LPSTR lpszName, - UINT uMaxNameLen) +static HRESULT WINAPI ItemMenu_GetCommandString(IContextMenu3 *iface, UINT_PTR cmdid, UINT flags, + UINT *reserved, LPSTR name, UINT maxlen) { - ContextMenu *This = impl_from_IContextMenu3(iface); - HRESULT hr = E_INVALIDARG; + static const WCHAR openW[] = {'o','p','e','n',0}; + static const WCHAR exploreW[] = {'e','x','p','l','o','r','e',0}; + static const WCHAR cutW[] = {'c','u','t',0}; + static const WCHAR copyW[] = {'c','o','p','y',0}; + static const WCHAR linkW[] = {'l','i','n','k',0}; + static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; + static const WCHAR propertiesW[] = {'p','r','o','p','e','r','t','i','e','s',0}; + static const WCHAR renameW[] = {'r','e','n','a','m','e',0}; + ContextMenu *This = impl_from_IContextMenu3(iface); + const WCHAR *cmdW = NULL; + HRESULT hr = S_OK; - TRACE("(%p)->(%lx flags=%x %p name=%p len=%x)\n", This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); + TRACE("(%p)->(%lx, %#x, %p, %p, %u)\n", This, cmdid, flags, reserved, name, maxlen); - switch(uFlags) - { - case GCS_HELPTEXTA: - case GCS_HELPTEXTW: - hr = E_NOTIMPL; - break; + switch (flags) + { + case GCS_HELPTEXTA: + case GCS_HELPTEXTW: + hr = E_NOTIMPL; + break; + + case GCS_VERBA: + case GCS_VERBW: + switch (cmdid) + { + case FCIDM_SHVIEW_OPEN: + cmdW = openW; + break; + case FCIDM_SHVIEW_EXPLORE: + cmdW = exploreW; + break; + case FCIDM_SHVIEW_CUT: + cmdW = cutW; + break; + case FCIDM_SHVIEW_COPY: + cmdW = copyW; + break; + case FCIDM_SHVIEW_CREATELINK: + cmdW = linkW; + break; + case FCIDM_SHVIEW_DELETE: + cmdW = deleteW; + break; + case FCIDM_SHVIEW_PROPERTIES: + cmdW = propertiesW; + break; + case FCIDM_SHVIEW_RENAME: + cmdW = renameW; + break; + } - case GCS_VERBA: - switch(idCommand) - { - case FCIDM_SHVIEW_OPEN: - strcpy(lpszName, "open"); - hr = S_OK; - break; - case FCIDM_SHVIEW_EXPLORE: - strcpy(lpszName, "explore"); - hr = S_OK; - break; - case FCIDM_SHVIEW_CUT: - strcpy(lpszName, "cut"); - hr = S_OK; - break; - case FCIDM_SHVIEW_COPY: - strcpy(lpszName, "copy"); - hr = S_OK; - break; - case FCIDM_SHVIEW_CREATELINK: - strcpy(lpszName, "link"); - hr = S_OK; - break; - case FCIDM_SHVIEW_DELETE: - strcpy(lpszName, "delete"); - hr = S_OK; - break; - case FCIDM_SHVIEW_PROPERTIES: - strcpy(lpszName, "properties"); - hr = S_OK; - break; - case FCIDM_SHVIEW_RENAME: - strcpy(lpszName, "rename"); - hr = S_OK; - break; - } - break; + if (!cmdW) + { + hr = E_INVALIDARG; + break; + } - /* NT 4.0 with IE 3.0x or no IE will always call This with GCS_VERBW. In This - case, you need to do the lstrcpyW to the pointer passed.*/ - case GCS_VERBW: - switch(idCommand) - { - case FCIDM_SHVIEW_OPEN: - MultiByteToWideChar(CP_ACP, 0, "open", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_EXPLORE: - MultiByteToWideChar(CP_ACP, 0, "explore", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_CUT: - MultiByteToWideChar(CP_ACP, 0, "cut", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_COPY: - MultiByteToWideChar(CP_ACP, 0, "copy", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_CREATELINK: - MultiByteToWideChar(CP_ACP, 0, "link", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_DELETE: - MultiByteToWideChar(CP_ACP, 0, "delete", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_PROPERTIES: - MultiByteToWideChar(CP_ACP, 0, "properties", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_RENAME: - MultiByteToWideChar( CP_ACP, 0, "rename", -1, (LPWSTR)lpszName, uMaxNameLen ); - hr = S_OK; - break; - } - break; + if (flags == GCS_VERBA) + WideCharToMultiByte(CP_ACP, 0, cmdW, -1, name, maxlen, NULL, NULL); + else + lstrcpynW((WCHAR *)name, cmdW, maxlen); - case GCS_VALIDATEA: - case GCS_VALIDATEW: - hr = S_OK; - break; - } - TRACE("-- (%p)->(name=%s)\n", This, lpszName); - return hr; + TRACE("name %s\n", flags == GCS_VERBA ? debugstr_a(name) : debugstr_w((WCHAR *)name)); + break; + + case GCS_VALIDATEA: + case GCS_VALIDATEW: + break; + } + + return hr; } /************************************************************************** -- 2.15.1

1 0

[PATCH] user32: Convert dialog procedure arguments basing on window type not procedure type
by Nikolay Sivov 21 Jan '18

21 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/dialog.c | 6 ------ dlls/user32/winproc.c | 28 +++++++++++++++++++--------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index cbe4b2b1d8..900ffc7b9c 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1252,10 +1252,8 @@ static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM case LB_ADDFILE: case EM_REPLACESEL: if (IsWindowUnicode(hdlg)) - todo_wine ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); else - todo_wine ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); break; }; @@ -1333,13 +1331,11 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM w memset(buff, 'A', sizeof(buff)); len = GetWindowTextA(hdlg, buff, sizeof(buff)); - todo_wine ok(buff[0] == 0 && buff[1] == 'A' && len == 0, "Unexpected window text %#x, %#x, len %d\n", (BYTE)buff[0], (BYTE)buff[1], len); memset(buffW, 0xff, sizeof(buffW)); len = GetWindowTextW(hdlg, buffW, 64); - todo_wine ok(!lstrcmpW(buffW, testtextW) && len == 0, "Unexpected window text %s, len %d\n", wine_dbgstr_w(buffW), len); dlg_test_aw_message(hdlg, WM_WININICHANGE); @@ -1449,12 +1445,10 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc2(HWND hdlg, UINT msg, WPARAM memset(buff, 'A', sizeof(buff)); len = GetWindowTextA(hdlg, buff, sizeof(buff)); - todo_wine ok(!strcmp(buff, "WndText") && len == 0, "Unexpected window text %s, len %d\n", buff, len); memset(buffW, 0xff, sizeof(buffW)); len = GetWindowTextW(hdlg, buffW, sizeof(buffW)/sizeof(buffW[0])); - todo_wine ok(buffW[0] == 0 && buffW[1] == 0xffff && len == 0, "Unexpected window text %#x, %#x, len %d\n", buffW[0], buffW[1], len); diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 73bbe95028..3d00a09233 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -993,6 +993,10 @@ LRESULT WINAPI CallWindowProcW( WNDPROC func, HWND hwnd, UINT msg, return result; } +static WNDPROC WINPROC_GetDlgProcFunc(const WINDOWPROC *proc) +{ + return proc->procW ? proc->procW : proc->procA; +} /********************************************************************** * WINPROC_CallDlgProcA @@ -1006,20 +1010,23 @@ INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, if (!func) return 0; if (!(proc = handle_to_proc( func ))) - ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, func ); + return call_dialog_proc( hwnd, msg, wParam, lParam, &result, func ); else if (proc == WINPROC_PROC16) { ret = wow_handlers.call_dialog_proc( hwnd, msg, wParam, lParam, &result, func ); SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, result ); + return ret; } - else if (proc->procW) + + if (IsWindowUnicode( hwnd )) { ret = WINPROC_CallProcAtoW( call_dialog_proc, hwnd, msg, wParam, lParam, &result, - proc->procW, WMCHAR_MAP_CALLWINDOWPROC ); + WINPROC_GetDlgProcFunc( proc ), WMCHAR_MAP_CALLWINDOWPROC ); SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, result ); } else - ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, proc->procA ); + ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, WINPROC_GetDlgProcFunc( proc )); + return ret; } @@ -1036,19 +1043,22 @@ INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, if (!func) return 0; if (!(proc = handle_to_proc( func ))) - ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, func ); + return call_dialog_proc( hwnd, msg, wParam, lParam, &result, func ); else if (proc == WINPROC_PROC16) { ret = WINPROC_CallProcWtoA( wow_handlers.call_dialog_proc, hwnd, msg, wParam, lParam, &result, func ); SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, result ); + return ret; } - else if (proc->procA) + + if (IsWindowUnicode( hwnd )) + ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, WINPROC_GetDlgProcFunc( proc )); + else { - ret = WINPROC_CallProcWtoA( call_dialog_proc, hwnd, msg, wParam, lParam, &result, proc->procA ); + ret = WINPROC_CallProcWtoA( call_dialog_proc, hwnd, msg, wParam, lParam, &result, WINPROC_GetDlgProcFunc( proc )); SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, result ); } - else - ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, proc->procW ); + return ret; } -- 2.15.1

1 0

[PATCH] comctl32/updown: Remove window subclass right before window is destroyed
by Nikolay Sivov 21 Jan '18

21 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/updown.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 4f44b9032a..67b646da0e 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -592,14 +592,22 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, switch(uMsg) { case WM_KEYDOWN: - UPDOWN_KeyPressed(infoPtr, (int)wParam); - if ((wParam == VK_UP) || (wParam == VK_DOWN)) return 0; - break; + if (infoPtr) + { + UPDOWN_KeyPressed(infoPtr, (int)wParam); + if (wParam == VK_UP || wParam == VK_DOWN) + return 0; + } + break; case WM_MOUSEWHEEL: - UPDOWN_MouseWheel(infoPtr, (int)wParam); - break; + if (infoPtr) + UPDOWN_MouseWheel(infoPtr, (int)wParam); + break; + case WM_NCDESTROY: + RemoveWindowSubclass(hwnd, UPDOWN_Buddy_SubclassProc, BUDDY_SUBCLASSID); + break; default: break; } @@ -607,6 +615,11 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, return DefSubclassProc(hwnd, uMsg, wParam, lParam); } +static void UPDOWN_ResetSubclass (UPDOWN_INFO *infoPtr) +{ + SetWindowSubclass(infoPtr->Buddy, UPDOWN_Buddy_SubclassProc, BUDDY_SUBCLASSID, 0); +} + /*********************************************************************** * UPDOWN_SetBuddy * @@ -628,9 +641,8 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) old_buddy = infoPtr->Buddy; - /* there is already a buddy assigned */ - if (infoPtr->Buddy) RemoveWindowSubclass(infoPtr->Buddy, UPDOWN_Buddy_SubclassProc, - BUDDY_SUBCLASSID); + UPDOWN_ResetSubclass (infoPtr); + if (!IsWindow(bud)) bud = NULL; /* Store buddy window handle */ @@ -942,10 +954,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L case WM_DESTROY: Free (infoPtr->AccelVect); - - if (infoPtr->Buddy) - RemoveWindowSubclass(infoPtr->Buddy, UPDOWN_Buddy_SubclassProc, - BUDDY_SUBCLASSID); + UPDOWN_ResetSubclass (infoPtr); Free (infoPtr); SetWindowLongPtrW (hwnd, 0, 0); theme = GetWindowTheme (hwnd); -- 2.15.1

1 0

[PATCH] ws2_32/tests: Fix the printed value in a few ok lines.
by Stefan Dösinger 21 Jan '18

21 Jan '18

--- dlls/ws2_32/tests/sock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 96631aea37..e188724203 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1768,8 +1768,8 @@ todo_wine ok(!csinfoA.cs.LocalAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); ok(csinfoA.cs.LocalAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); /* Socket is not connected, no information provided */ - ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); - ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); + ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.RemoteAddr.iSockaddrLength); + ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.RemoteAddr.lpSockaddr); err = bind(s, (struct sockaddr*)&saddr, sizeof(saddr)); ok(!err, "Expected 0, got %d\n", err); @@ -1781,8 +1781,8 @@ todo_wine ok(csinfoA.cs.LocalAddr.iSockaddrLength, "Expected non-zero\n"); ok(csinfoA.cs.LocalAddr.lpSockaddr != NULL, "Expected non-null\n"); /* Socket is not connected, no information provided */ - ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); - ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); + ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.RemoteAddr.iSockaddrLength); + ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.RemoteAddr.lpSockaddr); err = bind(s2, (struct sockaddr*)&saddr, sizeof(saddr)); ok(!err, "Expected 0, got %d\n", err); -- 2.13.6

1 0

[PATCH] comctl32/treeview: Make textWidth in struct _TREEITEM compatible with native one.
by Zhiyi Zhang 21 Jan '18

21 Jan '18

Hi Nikolay, This fixes https://bugs.winehq.org/show_bug.cgi?id=35127 As I was working through bug 35127, I noticed that you had once changed the layout of struct _TREEITEM in commit 6ec621e835e03f715d5fee27c5de5b0d361814de. Now I am sure that textWidth in struct _TREEITEM is a WORD and is at the offset 0x1a. You can check out the bug comments for details. I tried to find out what is at 0x18 but no luck, thus I am adding a unknown member to make textWidth at the right offset. What do you think of the patch? Do you know what member is at struct _TREEITEM+0x18? I can use your opinion with this patch. Thanks, Zhiyi Zhang Signed-off-by: Zhiyi Zhang <yi.gd.cn(a)gmail.com> --- dlls/comctl32/tests/treeview.c | 58 ++++++++++++++++++++++++++++++++++++------ dlls/comctl32/treeview.c | 3 ++- 2 files changed, 52 insertions(+), 9 deletions(-)

3 3

[PATCH] quartz: Wait for the PullPin thread to terminate.
by Zebediah Figura 19 Jan '18

19 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/pin.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 355d87d..5197d5c 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -541,11 +541,7 @@ static void PullPin_Thread_Stop(PullPin *This) TRACE("(%p)->()\n", This); EnterCriticalSection(This->pin.pCritSec); - { - CloseHandle(This->hThread); - This->hThread = NULL; - SetEvent(This->hEventStateChanged); - } + SetEvent(This->hEventStateChanged); LeaveCriticalSection(This->pin.pCritSec); IBaseFilter_Release(This->pin.pinInfo.pFilter); @@ -831,6 +827,10 @@ HRESULT WINAPI PullPin_Disconnect(IPin *iface) } LeaveCriticalSection(This->pin.pCritSec); + WaitForSingleObject(This->hThread, INFINITE); + CloseHandle(This->hThread); + This->hThread = NULL; + return hr; } -- 2.7.4

1 0

[PATCH 3/3] winex11: Failing to create a context in X11DRV_wglCreateContextAttribsARB() is not an internal error.
by Henri Verbeet 19 Jan '18

19 Jan '18

In particular, without WGL_WINE_query_renderer, the only way to determine whether a particular context version is supported or not is by attempting to create a context with that version. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/winex11.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5a7cfcc7a9c..e6652867800 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2143,7 +2143,7 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg if ((err = X11DRV_check_error()) || !ret->ctx) { /* In the future we should convert the GLX error to a win32 one here if needed */ - ERR("Context creation failed (error %x)\n", err); + WARN("Context creation failed (error %#x).\n", err); HeapFree( GetProcessHeap(), 0, ret ); ret = NULL; } -- 2.11.0

1 0

[PATCH 2/3] d3d11: Validate the DXBC version.
by Henri Verbeet 19 Jan '18

19 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index c9e137c66e5..c72216def53 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -789,6 +789,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, DWORD chunk_count; DWORD total_size; unsigned int i; + DWORD version; DWORD tag; read_dword(&ptr, &tag); @@ -803,7 +804,13 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, WARN("Ignoring DXBC checksum.\n"); skip_dword_unknown(&ptr, 4); - skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000001. */ + read_dword(&ptr, &version); + TRACE("version: %#x.\n", version); + if (version != 0x00000001) + { + WARN("Got unexpected DXBC version %#x.\n", version); + return E_INVALIDARG; + } read_dword(&ptr, &total_size); TRACE("total size: %#x\n", total_size); -- 2.11.0

1 0

[PATCH 1/3] d3d10: Validate the DXBC version.
by Henri Verbeet 19 Jan '18

19 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 39b0902184b..223b33a8017 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -159,6 +159,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, DWORD chunk_count; DWORD total_size; unsigned int i; + DWORD version; DWORD tag; if (!data) @@ -179,7 +180,13 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, /* checksum? */ skip_dword_unknown("DXBC header", &ptr, 4); - skip_dword_unknown("DXBC header", &ptr, 1); + read_dword(&ptr, &version); + TRACE("version: %#x.\n", version); + if (version != 0x00000001) + { + WARN("Got unexpected DXBC version %#x.\n", version); + return E_FAIL; + } read_dword(&ptr, &total_size); TRACE("total size: %#x\n", total_size); -- 2.11.0

1 0

[PATCH 2/2] schtests: Added /create command implementation.
by Jacek Caban 19 Jan '18

19 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/schtasks/schtasks.c | 127 +++++++++++++++++++++++++++++++++++++ programs/schtasks/tests/schtasks.c | 72 ++++++++++++++++----- 2 files changed, 182 insertions(+), 17 deletions(-)

1 0

[PATCH 1/2] schtasks: Added /delete command implementation.
by Jacek Caban 19 Jan '18

19 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/schtasks/schtasks.c | 87 +++++++++++++++++++++++++++++++++----- programs/schtasks/tests/schtasks.c | 3 +- 2 files changed, 79 insertions(+), 11 deletions(-)

1 0

[PATCH v2 1/7] dxgi/tests: Add test for creating IDXGIFactory2.
by Józef Kucia 19 Jan '18

19 Jan '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Use pCreateDXGIFactory1(). --- dlls/dxgi/tests/device.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index a102ed89aa6d..89e9279fd535 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -19,6 +19,7 @@ #include <assert.h> #define COBJMACROS #include "initguid.h" +#include "dxgi1_6.h" #include "d3d11.h" #include "wine/test.h" @@ -2305,6 +2306,7 @@ static void test_create_factory(void) { IDXGIFactory1 *factory; IUnknown *iface; + ULONG refcount; HRESULT hr; iface = (void *)0xdeadbeef; @@ -2333,6 +2335,17 @@ static void test_create_factory(void) ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); ok(!iface, "Got unexpected iface %p.\n", iface); + iface = NULL; + hr = CreateDXGIFactory(&IID_IDXGIFactory2, (void **)&iface); + todo_wine + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + refcount = IUnknown_Release(iface); + ok(!refcount, "Factory has %u references left.\n", refcount); + } + if (!pCreateDXGIFactory1) { win_skip("CreateDXGIFactory1 not available, skipping tests.\n"); @@ -2362,6 +2375,17 @@ static void test_create_factory(void) hr = pCreateDXGIFactory1(&IID_IDXGIFactory1, (void **)&iface); ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory1, hr %#x.\n", hr); IUnknown_Release(iface); + + iface = NULL; + hr = pCreateDXGIFactory1(&IID_IDXGIFactory2, (void **)&iface); + todo_wine + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + refcount = IUnknown_Release(iface); + ok(!refcount, "Factory has %u references left.\n", refcount); + } } static void test_private_data(void) -- 2.13.6

3 14

[PATCH] d3d8/tests: Use GetModuleHandleA instead of LoadLibraryA.
by Andrey Gusev 19 Jan '18

19 Jan '18

Supersedes 140322 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/d3d8/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a9188f0ee4..9efa943298 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8494,7 +8494,7 @@ static void test_clip_planes_limits(void) START_TEST(device) { - HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); + HMODULE d3d8_handle = GetModuleHandleA( "d3d8.dll" ); WNDCLASSA wc = {0}; IDirect3D8 *d3d8; DEVMODEW current_mode; -- 2.13.6

2 1

[PATCH] dbghelp: Fix memory leak.
by Andrey Gusev 19 Jan '18

19 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/dbghelp/msc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index eba26498cb..8b66a0811f 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2740,6 +2740,7 @@ static BOOL pdb_process_internal(const struct process* pcs, { WARN("Unable to open .PDB file: %s\n", pdb_lookup->filename); CloseHandle(hMap); + UnmapViewOfFile(image); return FALSE; } if (!pdb_init(pdb_lookup, pdb_file, image, &matched) || matched != 2) -- 2.13.6

2 1

[PATCH v2] msvcrt: Introduce vsprintf & vswprintf helper functions.
by Gijs Vermeulen 19 Jan '18

19 Jan '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/msvcrt/wcs.c | 318 +++++++++++++++++++++++------------------------------- 1 file changed, 132 insertions(+), 186 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 098e0d5ba8..fb1173c859 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -720,20 +720,117 @@ printf_arg arg_clbk_positional(void *ctx, int pos, int type, __ms_va_list *valis return args[pos]; } +static int vsprintf_helper(DWORD options, char *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, + const char *format, MSVCRT__locale_t locale, __ms_va_list valist) +{ + static const char nullbyte = '\0'; + printf_arg args_ctx[MSVCRT__ARGMAX+1]; + struct _str_ctx_a puts_ctx; + int len, ret; + BOOL postional, secure, initially_positional; + + len = sizeOfBuffer; + postional = options & MSVCRT_PRINTF_POSITIONAL_PARAMS; + initially_positional = postional; + secure = options & MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER; + + if(secure && !postional) + if(sizeOfBuffer>count+1 && count!=-1) len = count+1; + + puts_ctx.len = len; + puts_ctx.buf = str; + + if(postional) { + memset(args_ctx, 0, sizeof(args_ctx)); + + ret = create_positional_ctx_a(args_ctx, format, valist); + if(ret < 0) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return ret; + } else if(!ret) + postional = FALSE; + } + + ret = pf_printf_a(puts_clbk_str_a, + &puts_ctx, format, locale, options, + postional ? arg_clbk_positional : arg_clbk_valist, + postional ? args_ctx : NULL, + postional ? NULL : &valist); + puts_clbk_str_a(&puts_ctx, 1, &nullbyte); + + if((secure && !initially_positional) && (ret<0 || ret==len)) { + if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { + MSVCRT_INVALID_PMT("str[sizeOfBuffer] is too small", MSVCRT_ERANGE); + memset(str, 0, sizeOfBuffer); + } else + str[len-1] = '\0'; + + return -1; + } + + return ret; +} + +static int vswprintf_helper(DWORD options, MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist) +{ + static const MSVCRT_wchar_t nullbyte = '\0'; + printf_arg args_ctx[MSVCRT__ARGMAX+1]; + struct _str_ctx_w puts_ctx; + int len, ret; + BOOL postional, secure, initially_positional; + + len = sizeOfBuffer; + postional = options & MSVCRT_PRINTF_POSITIONAL_PARAMS; + initially_positional = postional; + secure = options & MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER; + + if(secure && !postional) + if(sizeOfBuffer>count+1 && count!=-1) len = count+1; + + puts_ctx.len = len; + puts_ctx.buf = str; + + if(postional) { + memset(args_ctx, 0, sizeof(args_ctx)); + + ret = create_positional_ctx_w(args_ctx, format, valist); + if(ret < 0) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return ret; + } else if(!ret) + postional = FALSE; + } + + ret = pf_printf_w(puts_clbk_str_w, + &puts_ctx, format, locale, options, + postional ? arg_clbk_positional : arg_clbk_valist, + postional ? args_ctx : NULL, + postional ? NULL : &valist); + puts_clbk_str_w(&puts_ctx, 1, &nullbyte); + + if((secure && !initially_positional) && (ret<0 || ret==len)) { + if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { + MSVCRT_INVALID_PMT("str[sizeOfBuffer] is too small", MSVCRT_ERANGE); + memset(str, 0, sizeOfBuffer*sizeof(MSVCRT_wchar_t)); + } else + str[len-1] = '\0'; + + return -1; + } + + return ret; +} + /********************************************************************* * _vsnprintf (MSVCRT.@) */ int CDECL MSVCRT_vsnprintf( char *str, MSVCRT_size_t len, const char *format, __ms_va_list valist ) { - static const char nullbyte = '\0'; - struct _str_ctx_a ctx = {len, str}; - int ret; - - ret = pf_printf_a(puts_clbk_str_a, &ctx, format, NULL, 0, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_a(&ctx, 1, &nullbyte); - return ret; + return vsprintf_helper(0, str, len, 0, format, NULL, valist); } #if _MSVCR_VER>=140 @@ -793,14 +890,7 @@ int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MS int CDECL MSVCRT_vsnprintf_l( char *str, MSVCRT_size_t len, const char *format, MSVCRT__locale_t locale, __ms_va_list valist ) { - static const char nullbyte = '\0'; - struct _str_ctx_a ctx = {len, str}; - int ret; - - ret = pf_printf_a(puts_clbk_str_a, &ctx, format, locale, 0, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_a(&ctx, 1, &nullbyte); - return ret; + return vsprintf_helper(0, str, len, 0, format, locale, valist); } /********************************************************************* @@ -826,69 +916,6 @@ int WINAPIV MSVCRT_sprintf_l(char *str, const char *format, return retval; } -static int CDECL MSVCRT_vsnprintf_s_l_opt( char *str, MSVCRT_size_t sizeOfBuffer, - MSVCRT_size_t count, const char *format, DWORD options, - MSVCRT__locale_t locale, __ms_va_list valist ) -{ - static const char nullbyte = '\0'; - struct _str_ctx_a ctx; - int len, ret; - - if(sizeOfBuffer<count+1 || count==-1) - len = sizeOfBuffer; - else - len = count+1; - - ctx.len = len; - ctx.buf = str; - ret = pf_printf_a(puts_clbk_str_a, &ctx, format, locale, MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_a(&ctx, 1, &nullbyte); - - if(ret<0 || ret==len) { - if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { - MSVCRT_INVALID_PMT("str[sizeOfBuffer] is too small", MSVCRT_ERANGE); - memset(str, 0, sizeOfBuffer); - } else - str[len-1] = '\0'; - - return -1; - } - - return ret; -} - -static int MSVCRT_vsnwprintf_s_l_opt( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, - MSVCRT_size_t count, const MSVCRT_wchar_t *format, DWORD options, - MSVCRT__locale_t locale, __ms_va_list valist) -{ - static const MSVCRT_wchar_t nullbyte = '\0'; - struct _str_ctx_w ctx; - int len, ret; - - len = sizeOfBuffer; - if(count!=-1 && len>count+1) - len = count+1; - - ctx.len = len; - ctx.buf = str; - ret = pf_printf_w(puts_clbk_str_w, &ctx, format, locale, MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_w(&ctx, 1, &nullbyte); - - if(ret<0 || ret==len) { - if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { - MSVCRT_INVALID_PMT("str[sizeOfBuffer] is too small", MSVCRT_ERANGE); - memset(str, 0, sizeOfBuffer*sizeof(MSVCRT_wchar_t)); - } else - str[len-1] = '\0'; - - return -1; - } - - return ret; -} - /********************************************************************* * _vsnprintf_s_l (MSVCRT.@) */ @@ -896,7 +923,8 @@ int CDECL MSVCRT_vsnprintf_s_l( char *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, const char *format, MSVCRT__locale_t locale, __ms_va_list valist ) { - return MSVCRT_vsnprintf_s_l_opt(str, sizeOfBuffer, count, format, 0, locale, valist); + return vsprintf_helper(MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, str, sizeOfBuffer, count, format, + locale, valist); } /********************************************************************* @@ -942,7 +970,8 @@ int CDECL MSVCRT__stdio_common_vsnprintf_s( unsigned __int64 options, { if (options & ~UCRTBASE_PRINTF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - return MSVCRT_vsnprintf_s_l_opt(str, sizeOfBuffer, count, format, options & UCRTBASE_PRINTF_MASK, locale, valist); + return vsprintf_helper((options & UCRTBASE_PRINTF_MASK) | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, str, + sizeOfBuffer, count, format, locale, valist); } /********************************************************************* @@ -954,7 +983,8 @@ int CDECL MSVCRT__stdio_common_vsnwprintf_s( unsigned __int64 options, { if (options & ~UCRTBASE_PRINTF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - return MSVCRT_vsnwprintf_s_l_opt(str, sizeOfBuffer, count, format, options & UCRTBASE_PRINTF_MASK, locale, valist); + return vswprintf_helper((options & UCRTBASE_PRINTF_MASK) | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, str, + sizeOfBuffer, count, format, locale, valist); } /********************************************************************* @@ -974,9 +1004,7 @@ int CDECL MSVCRT__stdio_common_vsprintf_s( unsigned __int64 options, char *str, MSVCRT_size_t count, const char *format, MSVCRT__locale_t locale, __ms_va_list valist ) { - if (options & ~UCRTBASE_PRINTF_MASK) - FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - return MSVCRT_vsnprintf_s_l_opt(str, INT_MAX, count, format, options & UCRTBASE_PRINTF_MASK, locale, valist); + return MSVCRT__stdio_common_vsnprintf_s(options, str, INT_MAX, count, format, locale, valist); } #endif /* _MSVCR_VER>=140 */ @@ -1011,28 +1039,8 @@ int CDECL MSVCRT__vscprintf( const char *format, __ms_va_list valist ) int CDECL MSVCRT__vscprintf_p_l(const char *format, MSVCRT__locale_t locale, __ms_va_list args) { - printf_arg args_ctx[MSVCRT__ARGMAX+1]; - struct _str_ctx_a puts_ctx = {INT_MAX, NULL}; - int ret; - - memset(args_ctx, 0, sizeof(args_ctx)); - - ret = create_positional_ctx_a(args_ctx, format, args); - if(ret < 0) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); - *MSVCRT__errno() = MSVCRT_EINVAL; - return ret; - } else if(ret == 0) { - ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, - MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, - arg_clbk_valist, NULL, &args); - } else { - ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, - MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, - arg_clbk_positional, args_ctx, NULL); - } - - return ret; + return vsprintf_helper(MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, + NULL, INT_MAX, 0, format, locale, args); } /********************************************************************* @@ -1103,14 +1111,7 @@ int WINAPIV MSVCRT__scprintf(const char *format, ...) int CDECL MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, __ms_va_list valist) { - static const MSVCRT_wchar_t nullbyte = '\0'; - struct _str_ctx_w ctx = {len, str}; - int ret; - - ret = pf_printf_w(puts_clbk_str_w, &ctx, format, NULL, 0, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_w(&ctx, 1, &nullbyte); - return ret; + return vswprintf_helper(0, str, len, 0, format, NULL, valist); } /********************************************************************* @@ -1120,41 +1121,7 @@ int CDECL MSVCRT_vsnwprintf_l(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist) { - static const MSVCRT_wchar_t nullbyte = '\0'; - struct _str_ctx_w ctx = {len, str}; - int ret; - - ret = pf_printf_w(puts_clbk_str_w, &ctx, format, locale, 0, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_w(&ctx, 1, &nullbyte); - return ret; -} - -static int MSVCRT_vswprintf_p_l_opt(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, - const MSVCRT_wchar_t *format, DWORD options, MSVCRT__locale_t locale, __ms_va_list args) -{ - static const MSVCRT_wchar_t nullbyte = '\0'; - printf_arg args_ctx[MSVCRT__ARGMAX+1]; - struct _str_ctx_w puts_ctx = {length, buffer}; - int ret; - - memset(args_ctx, 0, sizeof(args_ctx)); - - ret = create_positional_ctx_w(args_ctx, format, args); - if(ret < 0) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); - *MSVCRT__errno() = MSVCRT_EINVAL; - return ret; - } else if(ret == 0) - ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, - arg_clbk_valist, NULL, &args); - else - ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, - MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, - arg_clbk_positional, args_ctx, NULL); - - puts_clbk_str_w(&puts_ctx, 1, &nullbyte); - return ret; + return vswprintf_helper(0, str, len, 0, format, locale, valist); } /********************************************************************* @@ -1163,7 +1130,8 @@ static int MSVCRT_vswprintf_p_l_opt(MSVCRT_wchar_t *buffer, MSVCRT_size_t length int CDECL MSVCRT_vswprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list args) { - return MSVCRT_vswprintf_p_l_opt(buffer, length, format, 0, locale, args); + return vswprintf_helper(MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, + buffer, length, 0, format, locale, args); } #if _MSVCR_VER>=80 @@ -1173,7 +1141,7 @@ int CDECL MSVCRT_vswprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, int CDECL MSVCRT__vswprintf_p(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, const MSVCRT_wchar_t *format, __ms_va_list args) { - return MSVCRT_vswprintf_p_l_opt(buffer, length, format, 0, NULL, args); + return MSVCRT_vswprintf_p_l(buffer, length, format, NULL, args); } #endif @@ -1187,7 +1155,8 @@ int CDECL MSVCRT__stdio_common_vswprintf_p( unsigned __int64 options, { if (options & ~UCRTBASE_PRINTF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - return MSVCRT_vswprintf_p_l_opt(str, count, format, options & UCRTBASE_PRINTF_MASK, locale, valist); + return vswprintf_helper((options & UCRTBASE_PRINTF_MASK) | (MSVCRT_PRINTF_POSITIONAL_PARAMS | + MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER), str, count, 0, format, locale, valist); } #endif @@ -1198,7 +1167,8 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer MSVCRT_size_t count, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist) { - return MSVCRT_vsnwprintf_s_l_opt(str, sizeOfBuffer, count, format, 0, locale, valist); + return vswprintf_helper(MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, str, sizeOfBuffer, count, format, + locale, valist); } /********************************************************************* @@ -1444,7 +1414,8 @@ int CDECL MSVCRT__vscwprintf_l( const MSVCRT_wchar_t *format, MSVCRT__locale_t l */ int CDECL MSVCRT__vscwprintf_p_l( const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list args ) { - return MSVCRT_vswprintf_p_l_opt( NULL, INT_MAX, format, 0, locale, args ); + return vswprintf_helper(MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, NULL, INT_MAX, + 0, format, locale, args); } #if _MSVCR_VER>=80 @@ -1453,7 +1424,7 @@ int CDECL MSVCRT__vscwprintf_p_l( const MSVCRT_wchar_t *format, MSVCRT__locale_t */ int CDECL MSVCRT__vscwprintf_p(const MSVCRT_wchar_t *format, __ms_va_list args) { - return MSVCRT_vswprintf_p_l_opt(NULL, INT_MAX, format, 0, NULL, args); + return MSVCRT__vscwprintf_p_l(format, NULL, args); } #endif @@ -1476,40 +1447,14 @@ int CDECL MSVCRT_vswprintf_s_l(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElemen format, locale, args ); } -static int MSVCRT_vsprintf_p_l_opt(char *buffer, MSVCRT_size_t length, const char *format, - DWORD options, MSVCRT__locale_t locale, __ms_va_list args) -{ - static const char nullbyte = '\0'; - printf_arg args_ctx[MSVCRT__ARGMAX+1]; - struct _str_ctx_a puts_ctx = {length, buffer}; - int ret; - - memset(args_ctx, 0, sizeof(args_ctx)); - - ret = create_positional_ctx_a(args_ctx, format, args); - if(ret < 0) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); - *MSVCRT__errno() = MSVCRT_EINVAL; - return ret; - } else if(ret == 0) - ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, - MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, arg_clbk_valist, NULL, &args); - else - ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, - MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, - arg_clbk_positional, args_ctx, NULL); - - puts_clbk_str_a(&puts_ctx, 1, &nullbyte); - return ret; -} - /********************************************************************* * _vsprintf_p_l (MSVCRT.@) */ int CDECL MSVCRT_vsprintf_p_l(char *buffer, MSVCRT_size_t length, const char *format, MSVCRT__locale_t locale, __ms_va_list args) { - return MSVCRT_vsprintf_p_l_opt(buffer, length, format, 0, locale, args); + return vsprintf_helper(MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, buffer, length, + 0, format, locale, args); } /********************************************************************* @@ -1530,7 +1475,8 @@ int CDECL MSVCRT__stdio_common_vsprintf_p(unsigned __int64 options, char *buffer { if (options & ~UCRTBASE_PRINTF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - return MSVCRT_vsprintf_p_l_opt(buffer, length, format, options & UCRTBASE_PRINTF_MASK, locale, args); + return vsprintf_helper((options & UCRTBASE_PRINTF_MASK) | (MSVCRT_PRINTF_POSITIONAL_PARAMS | + MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER), buffer, length, 0, format, locale, args); } #endif @@ -1591,7 +1537,7 @@ int WINAPIV MSVCRT_swprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, int r; __ms_va_start(valist, locale); - r = MSVCRT_vswprintf_p_l_opt(buffer, length, format, 0, locale, valist); + r = MSVCRT_vswprintf_p_l(buffer, length, format, locale, valist); __ms_va_end(valist); return r; -- 2.15.1

2 1

[PATCH vkd3d 1/5] libs/vkd3d: Simplify vkd3d_restrict_format_support_for_feature_level().
by Józef Kucia 19 Jan '18

19 Jan '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index b93c1696e649..c6971e33ed3a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1292,8 +1292,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList(ID3D12Device *if } /* Direct3D feature levels restrict which formats can be optionally supported. */ -static void vkd3d_restrict_format_support_for_feature_level( - D3D12_FEATURE_DATA_FORMAT_SUPPORT *format_support, const struct vkd3d_format *format) +static void vkd3d_restrict_format_support_for_feature_level(D3D12_FEATURE_DATA_FORMAT_SUPPORT *format_support) { static const D3D12_FEATURE_DATA_FORMAT_SUPPORT blacklisted_format_features[] = { @@ -1306,7 +1305,7 @@ static void vkd3d_restrict_format_support_for_feature_level( for (i = 0; i < ARRAY_SIZE(blacklisted_format_features); ++i) { - if (blacklisted_format_features[i].Format == format->dxgi_format) + if (blacklisted_format_features[i].Format == format_support->Format) { format_support->Support1 &= ~blacklisted_format_features[i].Support1; format_support->Support2 &= ~blacklisted_format_features[i].Support2; @@ -1463,7 +1462,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * | D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_SIGNED_MIN_OR_MAX | D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_UNSIGNED_MIN_OR_MAX; - vkd3d_restrict_format_support_for_feature_level(data, format); + vkd3d_restrict_format_support_for_feature_level(data); return S_OK; } -- 2.13.6

2 9

[PATCH 3/3] [ole2disp.dll16] add SafeArrayDestroyData implementation
by Vijay Kiran Kamuju 19 Jan '18

19 Jan '18

This helps bug #9805

3 2

[PATCH] xaudio2: Partially implement XA2SRC_SetChannelVolumes().
by Masanori Kakura 19 Jan '18

19 Jan '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=44277 Thanks to Fabian Maurer and Andrew Eikum. Signed-off-by: Masanori Kakura <kakurasan(a)gmail.com> --- dlls/xaudio2_7/tests/xaudio2.c | 65 ++++++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 26 +++++++++++++++++ 2 files changed, 91 insertions(+) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index ff402f87c4..1927c1942b 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -1165,6 +1165,70 @@ static void test_xapo_creation(void) test_xapo_creation_modern("xaudio2_8.dll"); } +static void test_setchannelvolumes(IXAudio2 *xa) +{ + HRESULT hr; + IXAudio2MasteringVoice *master; + IXAudio2SourceVoice *src_2ch, *src_8ch; + WAVEFORMATEX fmt_2ch, fmt_8ch; + float volumes[] = {0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f}; + + if(xaudio27) + hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 8, 44100, 0, 0, NULL); + else + hr = IXAudio2_CreateMasteringVoice(xa, &master, 8, 44100, 0, NULL, NULL, AudioCategory_GameEffects); + ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + + fmt_2ch.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + fmt_2ch.nChannels = 2; + fmt_2ch.nSamplesPerSec = 44100; + fmt_2ch.wBitsPerSample = 32; + fmt_2ch.nBlockAlign = fmt_2ch.nChannels * fmt_2ch.wBitsPerSample / 8; + fmt_2ch.nAvgBytesPerSec = fmt_2ch.nSamplesPerSec * fmt_2ch.nBlockAlign; + fmt_2ch.cbSize = 0; + + fmt_8ch.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + fmt_8ch.nChannels = 8; + fmt_8ch.nSamplesPerSec = 44100; + fmt_8ch.wBitsPerSample = 32; + fmt_8ch.nBlockAlign = fmt_8ch.nChannels * fmt_8ch.wBitsPerSample / 8; + fmt_8ch.nAvgBytesPerSec = fmt_8ch.nSamplesPerSec * fmt_8ch.nBlockAlign; + fmt_8ch.cbSize = 0; + + XA2CALL(CreateSourceVoice, &src_2ch, &fmt_2ch, 0, 1.f, NULL, NULL, NULL); + ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + + XA2CALL(CreateSourceVoice, &src_8ch, &fmt_8ch, 0, 1.f, NULL, NULL, NULL); + ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + + /* the number of channels must be the same as the number of channels on the source voice */ + hr = IXAudio2SourceVoice_SetChannelVolumes(src_2ch, 2, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "SetChannelVolumes failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_SetChannelVolumes(src_8ch, 8, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "SetChannelVolumes failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_SetChannelVolumes(src_2ch, 1, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_SetChannelVolumes(src_8ch, 2, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08x\n", hr); + + /* volumes must not be NULL */ + hr = IXAudio2SourceVoice_SetChannelVolumes(src_2ch, 2, NULL, XAUDIO2_COMMIT_NOW); + ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08x\n", hr); + + if(xaudio27){ + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src_2ch); + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src_8ch); + }else{ + IXAudio2SourceVoice_DestroyVoice(src_2ch); + IXAudio2SourceVoice_DestroyVoice(src_8ch); + } + + IXAudio2MasteringVoice_DestroyVoice(master); +} + static UINT32 check_has_devices(IXAudio2 *xa) { HRESULT hr; @@ -1237,6 +1301,7 @@ START_TEST(xaudio2) test_looping(xa); test_submix(xa); test_flush(xa); + test_setchannelvolumes(xa); }else skip("No audio devices available\n"); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index bc5cf1cae9..5c2aad956d 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -337,7 +337,33 @@ static HRESULT WINAPI XA2SRC_SetChannelVolumes(IXAudio2SourceVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + ALfloat al_gain; + UINT32 i; + BOOL same_volumes_given = TRUE; + TRACE("%p, %u, %p, 0x%x\n", This, Channels, pVolumes, OperationSet); + + if(Channels != This->fmt->nChannels || !pVolumes) + return COMPAT_E_INVALID_CALL; + + al_gain = *pVolumes; + + /* check whether all volumes are the same */ + for(i = 1; i < Channels; ++i){ + if(al_gain != *(pVolumes + i)){ + same_volumes_given = FALSE; + break; + } + } + if(!same_volumes_given){ + WARN("Different volumes for channels unsupported, setting the highest volume.\n"); + for(; i < Channels; ++i) + al_gain = max(al_gain, *(pVolumes + i)); + } + + palcSetThreadContext(This->xa2->al_ctx); + alSourcef(This->al_src, AL_GAIN, al_gain); + return S_OK; } -- 2.14.1

2 1

[PATCH] kernel32: Return the list of module handles even if the last argument is null. (resend)
by Akihiro Sagawa 19 Jan '18

19 Jan '18

Touhou Shinpiroku relays on this behaviour. Fixes Bug 44347. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/module.c | 14 ++++++++++---- dlls/psapi/tests/psapi_main.c | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-)

1 0

[PATCH] wininet: Fix crash when secure_proxy_connect use a rewrite
by Wei Xie 19 Jan '18

19 Jan '18

------------------ Original ------------------ From: "Jacek Caban"<jacek(a)codeweavers.com>; Date: Thu, Jan 11, 2018 05:04 AM To: "Wei Xie"<xiewei(a)deepin.com>; "wine-devel"<wine-devel(a)winehq.org>; Subject: Re: [PATCH 1/1] wininet: Fix crash when connection is null inNETCON_secure_connect Hi Wei, On 05.01.2018 02:03, Wei Xie wrote: > request->netconn may be released before call NETCON_secure_connect. > > 5029 if(!request->contentLength) > 5030 http_release_netconn(request, TRUE); > > 5121 if (secure_proxy_connect && request->status_code == > HTTP_STATUS_OK) > 5122 { > 5123 res = NETCON_secure_connect(request->netconn, > request->server); > > I don't know how write a test patch The whole secure_proxy_connect could really use a rewrite, but for this particular problem, I think that the right solution would be to not release connection in line 5030 if secure_proxy_connect is TRUE. Thanks, Jacek

2 1

[PATCH v5 5/5] loader: Add LNXEV to the critical event database
by Aric Stewart 19 Jan '18

19 Jan '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH] winmm/tests: Fix memory leak.
by Andrey Gusev 19 Jan '18

19 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/winmm/tests/wave.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index a8a5e8d199..2a127526ae 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -977,7 +977,10 @@ static void wave_out_test_device(UINT_PTR device) "waveOutGetDevCapsA(%s): MMSYSERR_NOERROR expected, got %s\n", dev_name(device),wave_out_error(rc)); if (rc!=MMSYSERR_NOERROR) + { + HeapFree(GetProcessHeap(), 0, nameA); return; + } trace(" %s: \"%s\" (%s) %d.%d (%d:%d)\n",dev_name(device),capsA.szPname, (nameA?nameA:"failed"),capsA.vDriverVersion >> 8, -- 2.13.6

2 1

[PATCH 1/8] include: Add WIDL attributes to dhtmled.idl
by Alex Henrie 19 Jan '18

19 Jan '18

--- include/dhtmled.idl | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/include/dhtmled.idl b/include/dhtmled.idl index 25f3ea9432..28064f29cb 100644 --- a/include/dhtmled.idl +++ b/include/dhtmled.idl @@ -23,6 +23,12 @@ import "mshtml.idl"; #include "dhtmldid.h" +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ uuid(683364a1-b37d-11d1-adc5-006008a5848c), version(1.0) @@ -557,7 +563,10 @@ library DHTMLEDLib }; [ - uuid(2d360201-fff5-11d1-8d03-00a0c959bc0a) + uuid(2d360201-fff5-11d1-8d03-00a0c959bc0a), + threading(apartment), + progid("DHTMLSafe.DHTMLSafe.1"), + vi_progid("DHTMLSafe.DHTMLSafe") ] coclass DHTMLSafe { @@ -706,7 +715,10 @@ library DHTMLEDLib }; [ - uuid(2d360200-fff5-11d1-8d03-00a0c959bc0a) + uuid(2d360200-fff5-11d1-8d03-00a0c959bc0a), + threading(apartment), + progid("DHTMLEdit.DHTMLEdit.1"), + vi_progid("DHTMLEdit.DHTMLEdit") ] coclass DHTMLEdit { -- 2.15.1

2 10

[website] German translation for release 3.0
by Julian Rüger 19 Jan '18

19 Jan '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 2/2] [shdocvw] Add stub DoOrganizeFavDlg (try 3)
by Vijay Kiran Kamuju 19 Jan '18

19 Jan '18

For bug #44270 Changes from try2: update the patch file correctly Changes from try1: rename variables and use heap_alloc Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/shdocvw/shdocvw.spec | 4 ++-- dlls/shdocvw/shdocvw_main.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 0d581b26d2fa..485d1608dbab 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -113,8 +113,8 @@ @ stub DoAddToFavDlgW @ stdcall DoFileDownload(wstr) @ stub DoFileDownloadEx -@ stub DoOrganizeFavDlg -@ stub DoOrganizeFavDlgW +@ stdcall DoOrganizeFavDlg(long str) +@ stdcall DoOrganizeFavDlgW(long wstr) @ stub DoPrivacyDlg @ stub HlinkFrameNavigate @ stub HlinkFrameNavigateNHL diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 5d89f77e919f..52c622c6099f 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -560,3 +560,32 @@ BOOL WINAPI DoFileDownload(LPWSTR filename) FIXME("(%s) stub\n", debugstr_w(filename)); return FALSE; } + +/****************************************************************** + * DoOrganizeFavDlgW (SHDOCVW.@) + */ +BOOL WINAPI DoOrganizeFavDlgW(HWND hwnd, LPCWSTR initDir) +{ + FIXME("(%p %s) stub\n", hwnd, debugstr_w(initDir)); + return FALSE; +} + +/****************************************************************** + * DoOrganizeFavDlg (SHDOCVW.@) + */ +BOOL WINAPI DoOrganizeFavDlg(HWND hwnd, LPCSTR initDir) +{ + LPWSTR initDirW = NULL; + BOOL res; + + TRACE("(%p %s)\n", hwnd, debugstr_a(initDir)); + + if (initDir) { + DWORD len = MultiByteToWideChar(CP_ACP, 0, initDir, -1, NULL, 0); + initDirW = heap_alloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, initDir, -1, initDirW, len); + } + res = DoOrganizeFavDlgW(hwnd, initDirW); + heap_free(initDirW); + return res; +} -- 2.15.1

2 1

[PATCH 1/7] dxgi/tests: Add test for creating IDXGIFactory2.
by Józef Kucia 19 Jan '18

19 Jan '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/device.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index a102ed89aa6d..daa4f657e0b8 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -19,6 +19,7 @@ #include <assert.h> #define COBJMACROS #include "initguid.h" +#include "dxgi1_6.h" #include "d3d11.h" #include "wine/test.h" @@ -2305,6 +2306,7 @@ static void test_create_factory(void) { IDXGIFactory1 *factory; IUnknown *iface; + ULONG refcount; HRESULT hr; iface = (void *)0xdeadbeef; @@ -2333,6 +2335,17 @@ static void test_create_factory(void) ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); ok(!iface, "Got unexpected iface %p.\n", iface); + iface = NULL; + hr = CreateDXGIFactory(&IID_IDXGIFactory2, (void **)&iface); + todo_wine + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + refcount = IUnknown_Release(iface); + ok(!refcount, "Factory has %u references left.\n", refcount); + } + if (!pCreateDXGIFactory1) { win_skip("CreateDXGIFactory1 not available, skipping tests.\n"); @@ -2362,6 +2375,17 @@ static void test_create_factory(void) hr = pCreateDXGIFactory1(&IID_IDXGIFactory1, (void **)&iface); ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory1, hr %#x.\n", hr); IUnknown_Release(iface); + + iface = NULL; + hr = CreateDXGIFactory1(&IID_IDXGIFactory2, (void **)&iface); + todo_wine + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + refcount = IUnknown_Release(iface); + ok(!refcount, "Factory has %u references left.\n", refcount); + } } static void test_private_data(void) -- 2.13.6

1 6

[PATCH] wininet/tests: Fix memory leak.
by Andrey Gusev 19 Jan '18

19 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/wininet/tests/internet.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index dd15a4b8a0..a07d7a11d8 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1236,6 +1236,8 @@ static void test_Option_PerConnectionOption(void) ok(ret == TRUE, "InternetQueryOption should've succeeded\n"); orig_settings = list.pOptions; + HeapFree(GetProcessHeap(), 0, list.pOptions); + /* set the global IE proxy server */ list.dwOptionCount = 2; list.pOptions = HeapAlloc(GetProcessHeap(), 0, 2 * sizeof(INTERNET_PER_CONN_OPTIONW)); @@ -1364,6 +1366,8 @@ static void test_Option_PerConnectionOptionA(void) ok(ret == TRUE, "InternetQueryOption should've succeeded\n"); orig_settings = list.pOptions; + HeapFree(GetProcessHeap(), 0, list.pOptions); + /* set the global IE proxy server */ list.dwOptionCount = 2; list.pOptions = HeapAlloc(GetProcessHeap(), 0, 2 * sizeof(INTERNET_PER_CONN_OPTIONA)); -- 2.13.6

2 1

[PATCH 1/3] winedbg: Detect and handle identical stack frames when printing a backtrace.
by Zebediah Figura 19 Jan '18

19 Jan '18

Same as gdb, minus the 'corrupt stack?' message. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- programs/winedbg/stack.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index f49480a..519aa69 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -322,6 +322,15 @@ static void backtrace(void) dbg_curr_thread->curr_frame < dbg_curr_thread->num_frames; dbg_curr_thread->curr_frame++) { + if (dbg_curr_thread->curr_frame > 0 && + !memcmp(&dbg_curr_thread->frames[dbg_curr_thread->curr_frame].addr_frame, + &dbg_curr_thread->frames[dbg_curr_thread->curr_frame-1].addr_frame, + sizeof(ADDRESS64))) + { + dbg_printf("Backtrace stopped: previous frame identical to this frame\n"); + break; + } + dbg_printf("%s%d ", (cf == dbg_curr_thread->curr_frame ? "=>" : " "), dbg_curr_thread->curr_frame); -- 2.7.4

2 3

[PATCH 2/2] comctl32: Unset the toolbar's hot item when deleting a button.
by Thomas Faber 19 Jan '18

19 Jan '18

Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/comctl32/tests/toolbar.c | 10 ++++++++++ dlls/comctl32/toolbar.c | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 1dfd4b2fb5d6..2c1b78948476 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -923,6 +923,16 @@ static void test_hotitem(void) ok(ret == 1, "TB_GETHOTITEM returned %ld, expected 1\n", ret); ok(g_fReceivedHotItemChange == FALSE, "Unexpected TBN_HOTITEMCHANGE\n"); + /* deleting a button unsets the hot item */ + ret = SendMessageA(hToolbar, TB_SETHOTITEM, 0, 0); + ok(ret == 1, "TB_SETHOTITEM returned %ld, expected 1\n", ret); + g_fReceivedHotItemChange = FALSE; + ret = SendMessageA(hToolbar, TB_DELETEBUTTON, 1, 0); + ok(ret == TRUE, "TB_DELETEBUTTON returned %ld, expected TRUE\n", ret); + ret = SendMessageA(hToolbar, TB_GETHOTITEM, 0, 0); + ok(ret == -1, "TB_GETHOTITEM returned %ld, expected -1\n", ret); + ok(g_fReceivedHotItemChange == FALSE, "Unexpected TBN_HOTITEMCHANGE\n"); + DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 8a035979d289..f9a2220b5b66 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3233,6 +3233,7 @@ TOOLBAR_DeleteButton (TOOLBAR_INFO *infoPtr, INT nIndex) TOOLBAR_TooltipDelTool(infoPtr, &infoPtr->buttons[nIndex]); + infoPtr->nHotItem = -1; if (infoPtr->nNumButtons == 1) { TRACE(" simple delete\n"); free_string( infoPtr->buttons ); -- 2.16.0

1 0

[PATCH 1/2] comctl32/tests: Fix broken ok() messages.
by Thomas Faber 19 Jan '18

19 Jan '18

Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/comctl32/tests/toolbar.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index e2c29f45c6a1..1dfd4b2fb5d6 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -871,7 +871,7 @@ static void test_hotitem(void) ok(ret == 3, "Hot item: %lx, expected 3\n", ret); g_fBlockHotItemChange = TRUE; ret = SendMessageA(hToolbar, TB_SETHOTITEM, 2, 0); - ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 2\n", ret); + ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 3\n", ret); ret = SendMessageA(hToolbar, TB_GETHOTITEM, 0, 0); ok(ret == 3, "Hot item: %lx, expected 3\n", ret); g_fBlockHotItemChange = FALSE; @@ -902,7 +902,7 @@ static void test_hotitem(void) /* enabling the button won't change that */ SendMessageA(hToolbar, TB_ENABLEBUTTON, 9, TRUE); ret = SendMessageA(hToolbar, TB_GETHOTITEM, 0, 0); - ok(ret == -1, "TB_SETHOTITEM returned %ld, expected -1\n", ret); + ok(ret == -1, "TB_GETHOTITEM returned %ld, expected -1\n", ret); /* disabling a hot button works */ ret = SendMessageA(hToolbar, TB_SETHOTITEM, 3, 0); @@ -910,7 +910,7 @@ static void test_hotitem(void) g_fReceivedHotItemChange = FALSE; SendMessageA(hToolbar, TB_ENABLEBUTTON, 7, FALSE); ret = SendMessageA(hToolbar, TB_GETHOTITEM, 0, 0); - ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 3\n", ret); + ok(ret == 3, "TB_GETHOTITEM returned %ld, expected 3\n", ret); ok(g_fReceivedHotItemChange == FALSE, "Unexpected TBN_HOTITEMCHANGE\n"); SendMessageA(hToolbar, TB_SETHOTITEM, 1, 0); @@ -920,7 +920,7 @@ static void test_hotitem(void) g_fReceivedHotItemChange = FALSE; ok(SendMessageA(hToolbar, TB_SETBUTTONINFOA, 1, (LPARAM)&tbinfo) == TRUE, "TB_SETBUTTONINFOA failed\n"); ret = SendMessageA(hToolbar, TB_GETHOTITEM, 0, 0); - ok(ret == 1, "TB_SETHOTITEM returned %ld, expected 1\n", ret); + ok(ret == 1, "TB_GETHOTITEM returned %ld, expected 1\n", ret); ok(g_fReceivedHotItemChange == FALSE, "Unexpected TBN_HOTITEMCHANGE\n"); DestroyWindow(hToolbar); -- 2.16.0

1 0

[PATCH 03/20] kerberos: User kerberos prefix instead of krb5.
by Dmitry Timoshkov 19 Jan '18

19 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 0134b94f6d..27da4d7d32 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -37,9 +37,9 @@ #include "wine/library.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(krb5); +WINE_DEFAULT_DEBUG_CHANNEL(kerberos); -static ULONG krb5_package_id; +static ULONG kerberos_package_id; static LSA_DISPATCH_TABLE lsa_dispatch; #ifdef SONAME_LIBKRB5 @@ -84,34 +84,34 @@ static void load_krb5(void) #endif /* SONAME_LIBKRB5 */ -static NTSTATUS NTAPI krb5_LsaApInitializePackage(ULONG package_id, PLSA_DISPATCH_TABLE dispatch, +static NTSTATUS NTAPI kerberos_LsaApInitializePackage(ULONG package_id, PLSA_DISPATCH_TABLE dispatch, PLSA_STRING database, PLSA_STRING confidentiality, PLSA_STRING *package_name) { - char *krb5_name; + char *kerberos_name; load_krb5(); - krb5_package_id = package_id; + kerberos_package_id = package_id; lsa_dispatch = *dispatch; - krb5_name = lsa_dispatch.AllocateLsaHeap(sizeof(MICROSOFT_KERBEROS_NAME_A)); - if (!krb5_name) return STATUS_NO_MEMORY; + kerberos_name = lsa_dispatch.AllocateLsaHeap(sizeof(MICROSOFT_KERBEROS_NAME_A)); + if (!kerberos_name) return STATUS_NO_MEMORY; - memcpy(krb5_name, MICROSOFT_KERBEROS_NAME_A, sizeof(MICROSOFT_KERBEROS_NAME_A)); + memcpy(kerberos_name, MICROSOFT_KERBEROS_NAME_A, sizeof(MICROSOFT_KERBEROS_NAME_A)); *package_name = lsa_dispatch.AllocateLsaHeap(sizeof(**package_name)); if (!*package_name) { - lsa_dispatch.FreeLsaHeap(krb5_name); + lsa_dispatch.FreeLsaHeap(kerberos_name); return STATUS_NO_MEMORY; } - RtlInitString(*package_name, krb5_name); + RtlInitString(*package_name, kerberos_name); return STATUS_SUCCESS; } -static NTSTATUS NTAPI krb5_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST request, +static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST request, PVOID in_buffer, PVOID client_buffer_base, ULONG in_buffer_length, PVOID *out_buffer, PULONG out_buffer_length, PNTSTATUS status) { @@ -122,13 +122,13 @@ static NTSTATUS NTAPI krb5_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST request return STATUS_NOT_IMPLEMENTED; } -static SECPKG_FUNCTION_TABLE krb5_table = +static SECPKG_FUNCTION_TABLE kerberos_table = { - krb5_LsaApInitializePackage, /* InitializePackage */ + kerberos_LsaApInitializePackage, /* InitializePackage */ NULL, /* LsaLogonUser */ NULL, /* CallPackage */ NULL, /* LogonTerminated */ - krb5_LsaApCallPackageUntrusted, /* CallPackageUntrusted */ + kerberos_LsaApCallPackageUntrusted, /* CallPackageUntrusted */ NULL, /* CallPackagePassthrough */ NULL, /* LogonUserEx */ NULL, /* LogonUserEx2 */ @@ -168,7 +168,7 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, TRACE("%#x,%p,%p,%p\n", lsa_version, package_version, table, table_count); *package_version = SECPKG_INTERFACE_VERSION; - *table = &krb5_table; + *table = &kerberos_table; *table_count = 1; return STATUS_SUCCESS; -- 2.15.1

3 2

[PATCH 06/20] kerberos: Add stubs for SpInitialize and SpShutdown.
by Dmitry Timoshkov 19 Jan '18

19 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 68d111a0bc..72c7027428 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -144,6 +144,21 @@ static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST req return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, + LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) +{ + FIXME("%lu,%p,%p: stub\n", package_id, params, lsa_function_table); + + return STATUS_SUCCESS; +} + +static NTSTATUS NTAPI kerberos_SpShutdown(void) +{ + TRACE("\n"); + + return STATUS_SUCCESS; +} + static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) { static WCHAR kerberos_name_W[] = MICROSOFT_KERBEROS_NAME_W; @@ -178,8 +193,8 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* CallPackagePassthrough */ NULL, /* LogonUserEx */ NULL, /* LogonUserEx2 */ - NULL, /* Initialize */ - NULL, /* Shutdown */ + kerberos_SpInitialize, + kerberos_SpShutdown, kerberos_SpGetInfo, NULL, /* AcceptCredentials */ NULL, /* SpAcquireCredentialsHandle */ -- 2.15.1

2 1

[PATCH 05/20] include: Fix the SpInitializeFn typedef.
by Dmitry Timoshkov 19 Jan '18

19 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/ntsecpkg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index 937882641d..7f64d06134 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -325,7 +325,7 @@ typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER_EX2)(PLSA_CLIENT_REQUEST, SECURITY_LOGON_TYPE, PVOID, PVOID, ULONG, PVOID *, PULONG, PLUID, PNTSTATUS, PLSA_TOKEN_INFORMATION_TYPE, PVOID *, PUNICODE_STRING *, PUNICODE_STRING *, PUNICODE_STRING *, PSECPKG_PRIMARY_CRED, PSECPKG_SUPPLEMENTAL_CRED_ARRAY *); -typedef NTSTATUS (SpInitializeFn)(ULONG_PTR, PSECPKG_PARAMETERS, +typedef NTSTATUS (NTAPI SpInitializeFn)(ULONG_PTR, PSECPKG_PARAMETERS, PLSA_SECPKG_FUNCTION_TABLE); typedef NTSTATUS (NTAPI SpShutDownFn)(void); typedef NTSTATUS (NTAPI SpGetInfoFn)(PSecPkgInfoW); -- 2.15.1

2 1

[PATCH 04/20] kerberos: Implement SpGetInfo.
by Dmitry Timoshkov 19 Jan '18

19 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 27da4d7d32..68d111a0bc 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -30,6 +30,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "rpc.h" #include "sspi.h" #include "ntsecapi.h" #include "ntsecpkg.h" @@ -39,6 +40,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(kerberos); +#define KERBEROS_MAX_BUF 12000 + +#define KERBEROS_CAPS \ + ( SECPKG_FLAG_INTEGRITY \ + | SECPKG_FLAG_PRIVACY \ + | SECPKG_FLAG_TOKEN_ONLY \ + | SECPKG_FLAG_DATAGRAM \ + | SECPKG_FLAG_CONNECTION \ + | SECPKG_FLAG_MULTI_REQUIRED \ + | SECPKG_FLAG_EXTENDED_ERROR \ + | SECPKG_FLAG_IMPERSONATION \ + | SECPKG_FLAG_ACCEPT_WIN32_NAME \ + | SECPKG_FLAG_NEGOTIABLE \ + | SECPKG_FLAG_GSS_COMPATIBLE \ + | SECPKG_FLAG_LOGON \ + | SECPKG_FLAG_MUTUAL_AUTH \ + | SECPKG_FLAG_DELEGATION \ + | SECPKG_FLAG_READONLY_WITH_CHECKSUM \ + | SECPKG_FLAG_RESTRICTED_TOKENS \ + | SECPKG_FLAG_APPCONTAINER_CHECKS) + static ULONG kerberos_package_id; static LSA_DISPATCH_TABLE lsa_dispatch; @@ -122,6 +144,30 @@ static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST req return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) +{ + static WCHAR kerberos_name_W[] = MICROSOFT_KERBEROS_NAME_W; + static WCHAR kerberos_comment_W[] = {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0}; + static const SecPkgInfoW infoW = + { + KERBEROS_CAPS, + 1, + RPC_C_AUTHN_GSS_KERBEROS, + KERBEROS_MAX_BUF, + kerberos_name_W, + kerberos_comment_W + }; + + TRACE("%p\n", info); + + /* LSA will make a copy before forwarding the structure, so + * it's safe to put pointers to dynamic or constant data there. + */ + *info = infoW; + + return STATUS_SUCCESS; +} + static SECPKG_FUNCTION_TABLE kerberos_table = { kerberos_LsaApInitializePackage, /* InitializePackage */ @@ -134,7 +180,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* LogonUserEx2 */ NULL, /* Initialize */ NULL, /* Shutdown */ - NULL, /* SpGetInfoUnified */ + kerberos_SpGetInfo, NULL, /* AcceptCredentials */ NULL, /* SpAcquireCredentialsHandle */ NULL, /* SpQueryCredentialsAttributes */ -- 2.15.1

2 1

[PATCH 02/20] Include: MICROSOFT_KERBEROS_NAME_A definition should be available regardless of UNICODE.
by Dmitry Timoshkov 19 Jan '18

19 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/ntsecapi.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/include/ntsecapi.h b/include/ntsecapi.h index 36357c61b4..d0339a97ef 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -340,7 +340,7 @@ typedef enum _POLICY_NOTIFICATION_INFORMATION_CLASS PolicyNotifyMachineAccountPasswordInformation } POLICY_NOTIFICATION_INFORMATION_CLASS, *PPOLICY_NOTIFICATION_INFORMATION_CLASS; -#ifdef UNICODE +#define MICROSOFT_KERBEROS_NAME_A "Kerberos" #if defined(_MSC_VER) #define MICROSOFT_KERBEROS_NAME_W L"Kerberos" #elif defined(__GNUC__) @@ -348,9 +348,6 @@ typedef enum _POLICY_NOTIFICATION_INFORMATION_CLASS #else /* _MSC_VER/__GNUC__ */ static const WCHAR MICROSOFT_KERBEROS_NAME_W[] = { 'K','e','r','b','e','r','o','s',0 }; #endif -#else /* UNICODE */ -#define MICROSOFT_KERBEROS_NAME_A "Kerberos" -#endif #define RtlGenRandom SystemFunction036 #define RtlEncryptMemory SystemFunction040 -- 2.15.1

2 1

[PATCH 01/20] include: Fix the LSA_SEC_HANDLE definition.
by Dmitry Timoshkov 19 Jan '18

19 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/ntsecpkg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index 0df345dbe3..937882641d 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -165,7 +165,7 @@ typedef VOID (NTAPI *PLSA_CALLBACK_FUNCTION)(ULONG_PTR, ULONG_PTR, PSecBuffer, /* misc typedefs used in the below prototypes */ typedef PVOID *PLSA_CLIENT_REQUEST; -typedef ULONG LSA_SEC_HANDLE, *PLSA_SEC_HANDLE; +typedef ULONG_PTR LSA_SEC_HANDLE, *PLSA_SEC_HANDLE; typedef LPTHREAD_START_ROUTINE SEC_THREAD_START; typedef PSECURITY_ATTRIBUTES SEC_ATTRS; -- 2.15.1

2 1

[PATCH] oleaut32/tests: Use SafeArraySetIID() directly
by Nikolay Sivov 19 Jan '18

19 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/tests/safearray.c | 117 ++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 76 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 651a0c3975..5ff29b3c3e 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -47,8 +47,6 @@ static HMODULE hOleaut32; static HRESULT (WINAPI *pSafeArrayAllocDescriptorEx)(VARTYPE,UINT,SAFEARRAY**); static HRESULT (WINAPI *pSafeArrayCopyData)(SAFEARRAY*,SAFEARRAY*); -static HRESULT (WINAPI *pSafeArrayGetIID)(SAFEARRAY*,GUID*); -static HRESULT (WINAPI *pSafeArraySetIID)(SAFEARRAY*,REFGUID); static HRESULT (WINAPI *pSafeArrayGetVartype)(SAFEARRAY*,VARTYPE*); static HRESULT (WINAPI *pSafeArrayGetRecordInfo)(SAFEARRAY*,IRecordInfo**); static SAFEARRAY* (WINAPI *pSafeArrayCreateEx)(VARTYPE,UINT,SAFEARRAYBOUND*,LPVOID); @@ -686,24 +684,22 @@ static void test_safearray(void) hres = SafeArrayDestroyDescriptor(a); ok(hres == S_OK,"SADD with data in array failed with hres %x\n",hres); - /* IID functions */ - /* init a small stack safearray */ - if (pSafeArraySetIID) { - memset(&b, 0, sizeof(b)); - b.cDims = 1; - memset(&iid, 0x42, sizeof(IID)); - hres = pSafeArraySetIID(&b,&iid); - ok(hres == E_INVALIDARG,"SafeArraySetIID of non IID capable safearray did not return E_INVALIDARG, but %x\n",hres); - - hres = SafeArrayAllocDescriptor(1,&a); - ok(hres == S_OK,"SafeArrayAllocDescriptor should return S_OK, but got %x\n",hres); - ok((a->fFeatures & FADF_HAVEIID) == 0,"newly allocated descriptor with SAAD should not have FADF_HAVEIID\n"); - hres = pSafeArraySetIID(a,&iid); - ok(hres == E_INVALIDARG,"SafeArraySetIID of newly allocated descriptor with SAAD should return E_INVALIDARG, but got %x\n",hres); - - hres = SafeArrayDestroyDescriptor(a); - ok(hres == S_OK,"SADD failed with hres %x\n",hres); - } + /* IID functions */ + /* init a small stack safearray */ + memset(&b, 0, sizeof(b)); + b.cDims = 1; + memset(&iid, 0x42, sizeof(IID)); + hres = SafeArraySetIID(&b, &iid); + ok(hres == E_INVALIDARG, "Unexpected ret value %#x.\n", hres); + + hres = SafeArrayAllocDescriptor(1, &a); + ok(hres == S_OK, "Failed to allocate array descriptor, hr %#x.\n", hres); + ok((a->fFeatures & FADF_HAVEIID) == 0, "Unexpected features mask %#x.\n", a->fFeatures); + hres = SafeArraySetIID(a, &iid); + ok(hres == E_INVALIDARG, "Unexpected ret value %#x.\n", hres); + + hres = SafeArrayDestroyDescriptor(a); + ok(hres == S_OK,"SADD failed with hres %x\n",hres); if (!pSafeArrayAllocDescriptorEx) return; @@ -714,7 +710,7 @@ static void test_safearray(void) ok(hres == S_OK, "SafeArrayAllocDescriptorEx gave hres 0x%x\n", hres); ok(a->fFeatures == vttypes[i].expflags,"SAADE(%d) resulted with flags %x, expected %x\n", vttypes[i].vt, a->fFeatures, vttypes[i].expflags); if (a->fFeatures & FADF_HAVEIID) { - hres = pSafeArrayGetIID(a, &iid); + hres = SafeArrayGetIID(a, &iid); ok(hres == S_OK,"SAGIID failed for vt %d with hres %x\n", vttypes[i].vt,hres); switch (vttypes[i].vt) { case VT_UNKNOWN: @@ -730,7 +726,7 @@ static void test_safearray(void) break; } } else { - hres = pSafeArrayGetIID(a, &iid); + hres = SafeArrayGetIID(a, &iid); ok(hres == E_INVALIDARG,"SAGIID did not fail for vt %d with hres %x\n", vttypes[i].vt,hres); } if (a->fFeatures & FADF_RECORD) { @@ -751,13 +747,13 @@ static void test_safearray(void) } if (a->fFeatures & FADF_HAVEIID) { - hres = pSafeArraySetIID(a, &IID_IStorage); /* random IID */ + hres = SafeArraySetIID(a, &IID_IStorage); /* random IID */ ok(hres == S_OK,"SASIID failed with FADF_HAVEIID set for vt %d with %x\n", vttypes[i].vt, hres); - hres = pSafeArrayGetIID(a, &iid); + hres = SafeArrayGetIID(a, &iid); ok(hres == S_OK,"SAGIID failed with FADF_HAVEIID set for vt %d with %x\n", vttypes[i].vt, hres); ok(IsEqualGUID(&iid, &IID_IStorage),"returned iid is not IID_IStorage\n"); } else { - hres = pSafeArraySetIID(a, &IID_IStorage); /* random IID */ + hres = SafeArraySetIID(a, &IID_IStorage); /* random IID */ ok(hres == E_INVALIDARG,"SASIID did not failed with !FADF_HAVEIID set for vt %d with %x\n", vttypes[i].vt, hres); } hres = SafeArrayDestroyDescriptor(a); @@ -885,12 +881,8 @@ static void test_SafeArrayCreateLockDestroy(void) { ok((sa->fFeatures & FADF_HAVEIID) == 0, "Non interface type should not have FADF_HAVEIID\n"); - if (pSafeArraySetIID) - { - hres = pSafeArraySetIID(sa, &IID_IUnknown); - ok(hres == E_INVALIDARG, - "Non interface type allowed SetIID(), hres %x\n", hres); - } + hres = SafeArraySetIID(sa, &IID_IUnknown); + ok(hres == E_INVALIDARG, "Unexpected ret value %#x.\n", hres); if (vt != VT_RECORD) { VARTYPE aVt; @@ -908,12 +900,8 @@ static void test_SafeArrayCreateLockDestroy(void) else { ok(sa->fFeatures & FADF_HAVEIID, "Interface type should have FADF_HAVEIID\n"); - if (pSafeArraySetIID) - { - hres = pSafeArraySetIID(sa, &IID_IUnknown); - ok(hres == S_OK, - "Non interface type disallowed SetIID(), hres %x\n", hres); - } + hres = SafeArraySetIID(sa, &IID_IUnknown); + ok(hres == S_OK, "Failed to set array IID, hres %#x.\n", hres); ok((sa->fFeatures & FADF_HAVEVARTYPE) == 0, "Interface type %d should not have FADF_HAVEVARTYPE\n", vt); } @@ -1544,25 +1532,14 @@ static void test_SafeArrayCreateEx(void) if (sa) { GUID guid; - if (pSafeArrayGetIID) - { - hres = pSafeArrayGetIID(sa, &guid); - ok(hres == S_OK, "CreateEx (ITypeInfo) no IID hres 0x%x\n", hres); - if (hres == S_OK) - { - ok(IsEqualGUID(&guid, &IID_ITypeInfo), "CreateEx (ITypeInfo) bad IID\n"); - } - } - if (pSafeArraySetIID) - { - hres = pSafeArraySetIID(sa, &IID_IUnknown); - ok(hres == S_OK, "Failed to set IID, hres = %8x\n", hres); - if (hres == S_OK && pSafeArrayGetIID) - { - hres = pSafeArrayGetIID(sa, &guid); - ok(hres == S_OK && IsEqualGUID(&guid, &IID_IUnknown), "Set bad IID\n"); - } - } + + hres = SafeArrayGetIID(sa, &guid); + ok(hres == S_OK, "Failed to get array IID, hres %#x.\n", hres); + ok(IsEqualGUID(&guid, &IID_ITypeInfo), "CreateEx (ITypeInfo) bad IID\n"); + hres = SafeArraySetIID(sa, &IID_IUnknown); + ok(hres == S_OK, "Failed to set IID, hres = %8x\n", hres); + hres = SafeArrayGetIID(sa, &guid); + ok(hres == S_OK && IsEqualGUID(&guid, &IID_IUnknown), "Set bad IID\n"); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); } @@ -1573,15 +1550,10 @@ static void test_SafeArrayCreateEx(void) if (sa) { GUID guid; - if (pSafeArrayGetIID) - { - hres = pSafeArrayGetIID(sa, &guid); - ok(hres == S_OK, "CreateEx (NULL) no IID hres 0x%x\n", hres); - if (hres == S_OK) - { - ok(IsEqualGUID(&guid, &IID_IDispatch), "CreateEx (NULL) bad IID\n"); - } - } + + hres = SafeArrayGetIID(sa, &guid); + ok(hres == S_OK, "Failed to get array IID, hres %#x.\n", hres); + ok(IsEqualGUID(&guid, &IID_IDispatch), "CreateEx (NULL) bad IID\n"); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); } @@ -1592,15 +1564,10 @@ static void test_SafeArrayCreateEx(void) if (sa) { GUID guid; - if (pSafeArrayGetIID) - { - hres = pSafeArrayGetIID(sa, &guid); - ok(hres == S_OK, "CreateEx (NULL-Unk) no IID hres 0x%x\n", hres); - if (hres == S_OK) - { - ok(IsEqualGUID(&guid, &IID_IUnknown), "CreateEx (NULL-Unk) bad IID\n"); - } - } + + hres = SafeArrayGetIID(sa, &guid); + ok(hres == S_OK, "Failed to get array IID, hres %#x.\n", hres); + ok(IsEqualGUID(&guid, &IID_IUnknown), "CreateEx (NULL-Unk) bad IID\n"); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); } @@ -2125,8 +2092,6 @@ START_TEST(safearray) GETPTR(SafeArrayAllocDescriptorEx); GETPTR(SafeArrayCopyData); - GETPTR(SafeArrayGetIID); - GETPTR(SafeArraySetIID); GETPTR(SafeArrayGetVartype); GETPTR(SafeArrayCreateEx); GETPTR(SafeArrayCreateVector); -- 2.15.1

1 0

[PATCH v2] ole2disp.dll16: Implement SafeArrayGet[UBound|LBound].
by Gijs Vermeulen 19 Jan '18

19 Jan '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- v2: fixed sa parameter type, fixed TRACE message, removed out param check (crashes on Windows). I would like to thank Nikolay Sivov for providing tests and other help. dlls/ole2disp.dll16/ole2disp.c | 36 +++++++++++++++++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 4 ++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index d61b5e8c5a..98aca3dbee 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -116,6 +116,42 @@ USHORT WINAPI SafeArrayGetElemsize16(SAFEARRAY16 *sa) return sa->cbElements; } +/****************************************************************************** + * SafeArrayGetUBound [OLE2DISP.19] + */ +HRESULT WINAPI SafeArrayGetUBound16(SAFEARRAY16 *sa, UINT16 dim, LONG *ubound) +{ + TRACE("(%p, %u, %p)\n", sa, dim, ubound); + + if (!sa) + return E_INVALIDARG16; + + if (!dim || dim > sa->cDims) + return DISP_E_BADINDEX; + + *ubound = sa->rgsabound[sa->cDims - dim].lLbound + sa->rgsabound[sa->cDims - dim].cElements - 1; + + return S_OK; +} + +/****************************************************************************** + * SafeArrayGetLBound [OLE2DISP.20] + */ +HRESULT WINAPI SafeArrayGetLBound16(SAFEARRAY16 *sa, UINT16 dim, LONG *lbound) +{ + TRACE("(%p, %u, %p)\n", sa, dim, lbound); + + if (!sa) + return E_INVALIDARG16; + + if (!dim || dim > sa->cDims) + return DISP_E_BADINDEX; + + *lbound = sa->rgsabound[sa->cDims - dim].lLbound; + + return S_OK; +} + /****************************************************************************** * SafeArrayLock [OLE2DISP.21] */ diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 4b8af41172..7b00ac353b 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -16,8 +16,8 @@ 16 stub SAFEARRAYDESTROY 17 pascal -ret16 SafeArrayGetDim(ptr) SafeArrayGetDim16 18 pascal -ret16 SafeArrayGetElemsize(ptr) SafeArrayGetElemsize16 -19 stub SAFEARRAYGETUBOUND -20 stub SAFEARRAYGETLBOUND +19 pascal SafeArrayGetUBound(ptr word ptr) SafeArrayGetUBound16 +20 pascal SafeArrayGetLBound(ptr word ptr) SafeArrayGetLBound16 21 pascal SafeArrayLock(ptr) SafeArrayLock16 22 pascal SafeArrayUnlock(ptr) SafeArrayUnlock16 23 pascal SafeArrayAccessData(ptr ptr) SafeArrayAccessData16 -- 2.15.1

2 1

[PATCH 2/2] hhctrl: Fix loading of the wintype data on 64-bit.
by Huw Davies 19 Jan '18

19 Jan '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/hhctrl.ocx/chm.c | 88 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 74 insertions(+), 14 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 39c1ecae25..8cf2539d71 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -353,6 +353,52 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) static const WCHAR index_extW[] = {'h','h','k',0}; static const WCHAR windowsW[] = {'#','W','I','N','D','O','W','S',0}; + /* HH_WINTYPE as stored on disk. It's identical to HH_WINTYPE except that the pointer fields + have been changed to DWORDs, so that the layout on 64-bit remains unchanged. */ + struct file_wintype + { + int cbStruct; + BOOL fUniCodeStrings; + DWORD pszType; + DWORD fsValidMembers; + DWORD fsWinProperties; + DWORD pszCaption; + DWORD dwStyles; + DWORD dwExStyles; + RECT rcWindowPos; + int nShowState; + DWORD hwndHelp; + DWORD hwndCaller; + DWORD paInfoTypes; + DWORD hwndToolBar; + DWORD hwndNavigation; + DWORD hwndHTML; + int iNavWidth; + RECT rcHTML; + DWORD pszToc; + DWORD pszIndex; + DWORD pszFile; + DWORD pszHome; + DWORD fsToolBarFlags; + BOOL fNotExpanded; + int curNavType; + int tabpos; + int idNotify; + BYTE tabOrder[HH_MAX_TABS+1]; + int cHistory; + DWORD pszJump1; + DWORD pszJump2; + DWORD pszUrlJump1; + DWORD pszUrlJump2; + RECT rcMinSize; + int cbInfoTypes; + DWORD pszCustomTabs; + } file_wintype; + + memset(&wintype, 0, sizeof(wintype)); + wintype.cbStruct = sizeof(wintype); + wintype.fUniCodeStrings = TRUE; + hr = IStorage_OpenStream(pStorage, windowsW, NULL, STGM_READ, 0, &pStream); if (SUCCEEDED(hr)) { @@ -363,28 +409,42 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) if (FAILED(hr)) goto done; /* read the HH_WINTYPE struct data */ - hr = IStream_Read(pStream, &wintype, sizeof(wintype), &cbRead); + hr = IStream_Read(pStream, &file_wintype, sizeof(file_wintype), &cbRead); if (FAILED(hr)) goto done; /* convert the #STRINGS offsets to actual strings */ - wintype.pszType = ConvertChmString(info, (DWORD)wintype.pszType); - wintype.pszFile = ConvertChmString(info, (DWORD)wintype.pszFile); - wintype.pszToc = ConvertChmString(info, (DWORD)wintype.pszToc); - wintype.pszIndex = ConvertChmString(info, (DWORD)wintype.pszIndex); - wintype.pszCaption = ConvertChmString(info, (DWORD)wintype.pszCaption); - wintype.pszHome = ConvertChmString(info, (DWORD)wintype.pszHome); - wintype.pszJump1 = ConvertChmString(info, (DWORD)wintype.pszJump1); - wintype.pszJump2 = ConvertChmString(info, (DWORD)wintype.pszJump2); - wintype.pszUrlJump1 = ConvertChmString(info, (DWORD)wintype.pszUrlJump1); - wintype.pszUrlJump2 = ConvertChmString(info, (DWORD)wintype.pszUrlJump2); + wintype.pszType = ConvertChmString(info, file_wintype.pszType); + wintype.fsValidMembers = file_wintype.fsValidMembers; + wintype.fsWinProperties = file_wintype.fsWinProperties; + wintype.pszCaption = ConvertChmString(info, file_wintype.pszCaption); + wintype.dwStyles = file_wintype.dwStyles; + wintype.dwExStyles = file_wintype.dwExStyles; + wintype.rcWindowPos = file_wintype.rcWindowPos; + wintype.nShowState = file_wintype.nShowState; + wintype.iNavWidth = file_wintype.iNavWidth; + wintype.rcHTML = file_wintype.rcHTML; + wintype.pszToc = ConvertChmString(info, file_wintype.pszToc); + wintype.pszIndex = ConvertChmString(info, file_wintype.pszIndex); + wintype.pszFile = ConvertChmString(info, file_wintype.pszFile); + wintype.pszHome = ConvertChmString(info, file_wintype.pszHome); + wintype.fsToolBarFlags = file_wintype.fsToolBarFlags; + wintype.fNotExpanded = file_wintype.fNotExpanded; + wintype.curNavType = file_wintype.curNavType; + wintype.tabpos = file_wintype.tabpos; + wintype.idNotify = file_wintype.idNotify; + memcpy(&wintype.tabOrder, file_wintype.tabOrder, sizeof(wintype.tabOrder)); + wintype.cHistory = file_wintype.cHistory; + wintype.pszJump1 = ConvertChmString(info, file_wintype.pszJump1); + wintype.pszJump2 = ConvertChmString(info, file_wintype.pszJump2); + wintype.pszUrlJump1 = ConvertChmString(info, file_wintype.pszUrlJump1); + wintype.pszUrlJump2 = ConvertChmString(info, file_wintype.pszUrlJump2); + wintype.rcMinSize = file_wintype.rcMinSize; + wintype.cbInfoTypes = file_wintype.cbInfoTypes; } else { /* no defined window types so use (hopefully) sane defaults */ static const WCHAR defaultwinW[] = {'d','e','f','a','u','l','t','w','i','n','\0'}; - memset(&wintype, 0, sizeof(wintype)); - wintype.cbStruct = sizeof(wintype); - wintype.fUniCodeStrings = TRUE; wintype.pszType = strdupW(info->pCHMInfo->defWindow ? info->pCHMInfo->defWindow : defaultwinW); wintype.pszToc = strdupW(info->pCHMInfo->defToc ? info->pCHMInfo->defToc : empty); wintype.pszIndex = strdupW(empty); -- 2.12.0

1 0

[PATCH 1/2] hhctrl: Use a helper to free the wintype structure.
by Huw Davies 19 Jan '18

19 Jan '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/hhctrl.ocx/chm.c | 67 +++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 641fe95cbd..39c1ecae25 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -308,15 +308,31 @@ void MergeChmProperties(HH_WINTYPEW *src, HHInfo *info, BOOL override) #endif } -static inline WCHAR *ConvertChmString(HHInfo *info, const WCHAR **str) +static inline WCHAR *ConvertChmString(HHInfo *info, DWORD id) { WCHAR *ret = NULL; - if(*str) - *str = ret = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)*str)); + if(id) + ret = strdupAtoW(GetChmString(info->pCHMInfo, id)); return ret; } +static inline void wintype_free(HH_WINTYPEW *wintype) +{ + heap_free((void *)wintype->pszType); + heap_free((void *)wintype->pszCaption); + heap_free(wintype->paInfoTypes); + heap_free((void *)wintype->pszToc); + heap_free((void *)wintype->pszIndex); + heap_free((void *)wintype->pszFile); + heap_free((void *)wintype->pszHome); + heap_free((void *)wintype->pszJump1); + heap_free((void *)wintype->pszJump2); + heap_free((void *)wintype->pszUrlJump1); + heap_free((void *)wintype->pszUrlJump2); + heap_free((void *)wintype->pszCustomTabs); +} + /* Loads the HH_WINTYPE data from the CHM file * * FIXME: There may be more than one window type in the file, so @@ -325,8 +341,6 @@ static inline WCHAR *ConvertChmString(HHInfo *info, const WCHAR **str) BOOL LoadWinTypeFromCHM(HHInfo *info) { LARGE_INTEGER liOffset; - WCHAR *pszType = NULL, *pszFile = NULL, *pszToc = NULL, *pszIndex = NULL, *pszCaption = NULL; - WCHAR *pszHome = NULL, *pszJump1 = NULL, *pszJump2 = NULL, *pszUrlJump1 = NULL, *pszUrlJump2 = NULL; IStorage *pStorage = info->pCHMInfo->pStorage; IStream *pStream = NULL; HH_WINTYPEW wintype; @@ -334,7 +348,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) DWORD cbRead; BOOL ret = FALSE; - static const WCHAR null[] = {0}; + static const WCHAR empty[] = {0}; static const WCHAR toc_extW[] = {'h','h','c',0}; static const WCHAR index_extW[] = {'h','h','k',0}; static const WCHAR windowsW[] = {'#','W','I','N','D','O','W','S',0}; @@ -353,16 +367,16 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) if (FAILED(hr)) goto done; /* convert the #STRINGS offsets to actual strings */ - pszType = ConvertChmString(info, &wintype.pszType); - pszFile = ConvertChmString(info, &wintype.pszFile); - pszToc = ConvertChmString(info, &wintype.pszToc); - pszIndex = ConvertChmString(info, &wintype.pszIndex); - pszCaption = ConvertChmString(info, &wintype.pszCaption); - pszHome = ConvertChmString(info, &wintype.pszHome); - pszJump1 = ConvertChmString(info, &wintype.pszJump1); - pszJump2 = ConvertChmString(info, &wintype.pszJump2); - pszUrlJump1 = ConvertChmString(info, &wintype.pszUrlJump1); - pszUrlJump2 = ConvertChmString(info, &wintype.pszUrlJump2); + wintype.pszType = ConvertChmString(info, (DWORD)wintype.pszType); + wintype.pszFile = ConvertChmString(info, (DWORD)wintype.pszFile); + wintype.pszToc = ConvertChmString(info, (DWORD)wintype.pszToc); + wintype.pszIndex = ConvertChmString(info, (DWORD)wintype.pszIndex); + wintype.pszCaption = ConvertChmString(info, (DWORD)wintype.pszCaption); + wintype.pszHome = ConvertChmString(info, (DWORD)wintype.pszHome); + wintype.pszJump1 = ConvertChmString(info, (DWORD)wintype.pszJump1); + wintype.pszJump2 = ConvertChmString(info, (DWORD)wintype.pszJump2); + wintype.pszUrlJump1 = ConvertChmString(info, (DWORD)wintype.pszUrlJump1); + wintype.pszUrlJump2 = ConvertChmString(info, (DWORD)wintype.pszUrlJump2); } else { @@ -371,9 +385,9 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) memset(&wintype, 0, sizeof(wintype)); wintype.cbStruct = sizeof(wintype); wintype.fUniCodeStrings = TRUE; - wintype.pszType = pszType = strdupW(info->pCHMInfo->defWindow ? info->pCHMInfo->defWindow : defaultwinW); - wintype.pszToc = pszToc = strdupW(info->pCHMInfo->defToc ? info->pCHMInfo->defToc : null); - wintype.pszIndex = pszIndex = strdupW(null); + wintype.pszType = strdupW(info->pCHMInfo->defWindow ? info->pCHMInfo->defWindow : defaultwinW); + wintype.pszToc = strdupW(info->pCHMInfo->defToc ? info->pCHMInfo->defToc : empty); + wintype.pszIndex = strdupW(empty); wintype.fsValidMembers = 0; wintype.fsWinProperties = HHWIN_PROP_TRI_PANE; wintype.dwStyles = WS_POPUP; @@ -385,24 +399,15 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) /* merge the new data with any pre-existing HH_WINTYPE structure */ MergeChmProperties(&wintype, info, FALSE); if (!info->WinType.pszCaption) - info->WinType.pszCaption = info->stringsW.pszCaption = strdupW(info->pCHMInfo->defTitle ? info->pCHMInfo->defTitle : null); + info->WinType.pszCaption = info->stringsW.pszCaption = strdupW(info->pCHMInfo->defTitle ? info->pCHMInfo->defTitle : empty); if (!info->WinType.pszFile) - info->WinType.pszFile = info->stringsW.pszFile = strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : null); + info->WinType.pszFile = info->stringsW.pszFile = strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : empty); if (!info->WinType.pszToc) info->WinType.pszToc = info->stringsW.pszToc = FindHTMLHelpSetting(info, toc_extW); if (!info->WinType.pszIndex) info->WinType.pszIndex = info->stringsW.pszIndex = FindHTMLHelpSetting(info, index_extW); - heap_free(pszType); - heap_free(pszFile); - heap_free(pszToc); - heap_free(pszIndex); - heap_free(pszCaption); - heap_free(pszHome); - heap_free(pszJump1); - heap_free(pszJump2); - heap_free(pszUrlJump1); - heap_free(pszUrlJump2); + wintype_free(&wintype); ret = TRUE; done: -- 2.12.0

1 0

[PATCH v2] ole32: Make CoWaitForMultipleHandles peek at all posted messages
by Anton Romanov 19 Jan '18

19 Jan '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=43728 This matches Windows behaviour and also avoids making CoWaitForMultipleHandles's message_loop constantly spin because of unpeeked/unpumped message in the queue Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/ole32/compobj.c | 10 ++++++++++ dlls/ole32/tests/compobj.c | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d136ee623a..48030aee71 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4547,6 +4547,16 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, } } + if (!apt->win) + { + /* If window is NULL on apartment we don't pump every + * single POSTMESSAGE message. Windows doesn't either but it peeks at + * them so that it will not trigger + * MsgWaitForMultipleObjects next time. + * If we don't do this and happen to have a message that is + * not pumped below we end up in a tight loop */ + PeekMessageW(NULL, NULL, 0, 0, PM_QS_POSTMESSAGE | PM_NOREMOVE | PM_NOYIELD); + } /* some apps (e.g. Visio 2010) don't handle WM_PAINT properly and loop forever, * so after processing 100 messages we go back to checking the wait handles */ while (count++ < 100 && COM_PeekMessage(apt, &msg)) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b46ff03853..83595cb8a4 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2648,7 +2648,9 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) DWORD index; HRESULT hr; HWND hWnd; + UINT uMSG = 0xc065; MSG msg; + int ret; hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); @@ -2672,6 +2674,23 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) success = PeekMessageA(&msg, hWnd, WM_USER, WM_USER, PM_REMOVE); ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + /* Even if CoWaitForMultipleHandles does not pump a message it peeks + * at ALL of them */ + index = 0xdeadbeef; + PostMessageA(NULL, uMSG, 0, 0); + + hr = CoWaitForMultipleHandles(COWAIT_ALERTABLE, 50, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + + /* Make sure message was peeked at */ + ret = MsgWaitForMultipleObjectsEx(0, NULL, 2, QS_ALLPOSTMESSAGE, MWMO_ALERTABLE); + ok(ret == WAIT_TIMEOUT, "MsgWaitForMultipleObjects returned %x\n", ret); + + /* But not pumped */ + success = PeekMessageA(&msg, NULL, uMSG, uMSG, PM_REMOVE); + ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + DestroyWindow(hWnd); CoUninitialize(); return 0; -- 2.15.1

2 1

[PATCH] ddraw/tests: Make test_depth_readback work on Nvidia GPUs on Windows.
by Stefan Dösinger 19 Jan '18

19 Jan '18

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- I consider the behavior of these GPUs generally broken, but at least one format is working on all of them. We just don't know in advance which one, and on at least my Geforce 9 an actual game is broken too. This test accepts a few known failure conditions as broken, but expects at least one format to pass in ddraw2 - ddraw4. ddraw1 only has D16, which fails on GF9, so don't even attempt to run the test. I previously seemed to have results with "reversed" 32 bit formats (S8D24/X8D24 instead of D24S8/D24X8), but I could not reproduce this any more today. I suspect I did something wrong with adjusting the expected results for the shifted depth mask. --- dlls/ddraw/tests/ddraw1.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw2.c | 16 ++++++++++++++-- dlls/ddraw/tests/ddraw4.c | 21 +++++++++++++++++---- dlls/ddraw/tests/ddraw7.c | 33 ++++++++++++++++++++++++++++++--- 4 files changed, 73 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index fb56980800..bb954e1d59 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -10840,6 +10840,18 @@ static void test_depth_readback(void) ok(!!window, "Failed to create a window.\n"); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (broken(ddraw_is_nvidia(ddraw))) + { + /* ddraw1 only has access to D16 Z buffers (and D24 ones, which are even more + * broken on Nvidia), so don't even attempt to run this test on Nvidia cards + * because some of them have broken D16 readback. See the ddraw7 version of + * this test for a more detailed comment. */ + skip("Some Nvidia GPUs have broken D16 readback, skipping.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create a D3D device, skipping tests.\n"); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index faf7cefdc8..41e6fbb55b 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -12211,7 +12211,7 @@ static void test_set_render_state(void) static void test_depth_readback(void) { - DWORD depth, expected_depth, max_diff; + DWORD depth, expected_depth, max_diff, passed_fmts = 0; IDirect3DMaterial2 *blue_background; IDirectDrawSurface *rt, *ds; IDirect3DViewport2 *viewport; @@ -12223,6 +12223,7 @@ static void test_depth_readback(void) HWND window; HRESULT hr; void *ptr; + BOOL all_pass; static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; static D3DLVERTEX quad[] = @@ -12307,6 +12308,7 @@ static void test_depth_readback(void) hr = IDirectDrawSurface_Lock(ds, NULL, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + all_pass = TRUE; for (y = 60; y < 480; y += 120) { for (x = 80; x < 640; x += 160) @@ -12317,20 +12319,30 @@ static void test_depth_readback(void) depth = *((DWORD *)ptr) & tests[i].z_mask; expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; - ok(abs(expected_depth - depth) <= max_diff, + /* The ddraw2 version of this test behaves similarly to the ddraw7 version on Nvidia GPUs, + * except that we only have D16 (broken on geforce 9) and D24X8 (broken on geforce 7) available. + * Accept all nvidia GPUs as broken here, but still expect one of the formats to pass. */ + ok(abs(expected_depth - depth) <= max_diff || broken(ddraw_is_nvidia(ddraw)), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + if (abs(expected_depth - depth) > max_diff) + all_pass = FALSE; } } hr = IDirectDrawSurface_Unlock(ds, NULL); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + if (all_pass) + passed_fmts++; + hr = IDirectDrawSurface_DeleteAttachedSurface(rt, 0, ds); ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); IDirectDrawSurface_Release(ds); } + ok(passed_fmts, "Not a single format passed the tests, this is bad even by Nvidia's standards.\n"); + destroy_viewport(device, viewport); destroy_material(blue_background); IDirectDrawSurface_Release(rt); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1f0b01bdde..f8bf9b7fe1 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -14313,7 +14313,7 @@ static void test_map_synchronisation(void) static void test_depth_readback(void) { - DWORD depth, expected_depth, max_diff; + DWORD depth, expected_depth, max_diff, passed_fmts = 0; IDirectDrawSurface4 *rt, *ds; IDirect3DViewport3 *viewport; DDSURFACEDESC2 surface_desc; @@ -14325,6 +14325,7 @@ static void test_depth_readback(void) HWND window; HRESULT hr; RECT r; + BOOL all_pass; static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; static struct @@ -14421,6 +14422,7 @@ static void test_depth_readback(void) hr = IDirect3DDevice3_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + all_pass = TRUE; for (y = 60; y < 480; y += 120) { for (x = 80; x < 640; x += 160) @@ -14434,21 +14436,32 @@ static void test_depth_readback(void) depth = *((DWORD *)surface_desc.lpSurface) & tests[i].z_mask; expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; + /* The ddraw4 version of this test behaves similarly to the ddraw7 version on Nvidia GPUs, + * except that Geforce 7 also returns garbage data in D24S8, whereas the ddraw7 version + * returns 0 for that format. Give up on pre-filtering formats, accept Nvidia as generally + * broken here, but still expect at least one format (D16 or D24X8 in practise) to pass. */ todo_wine_if(tests[i].todo) - ok(abs(expected_depth - depth) <= max_diff, - "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", - i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + ok(abs(expected_depth - depth) <= max_diff || broken(ddraw_is_nvidia(ddraw)), + "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", + i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + if (abs(expected_depth - depth) > max_diff) + all_pass = FALSE; hr = IDirectDrawSurface4_Unlock(ds, &r); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); } } + if (all_pass) + passed_fmts++; + hr = IDirectDrawSurface4_DeleteAttachedSurface(rt, 0, ds); ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); IDirectDrawSurface4_Release(ds); } + ok(passed_fmts, "Not a single format passed the tests, this is bad even by Nvidia's standards.\n"); + destroy_viewport(device, viewport); IDirectDrawSurface4_Release(rt); IDirectDraw4_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 2e41ff3715..aa68f4a0e0 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13689,7 +13689,7 @@ done: static void test_depth_readback(void) { - DWORD depth, expected_depth, max_diff; + DWORD depth, expected_depth, max_diff, raw_value, passed_fmts = 0; IDirectDrawSurface7 *rt, *ds; DDSURFACEDESC2 surface_desc; IDirect3DDevice7 *device; @@ -13700,6 +13700,7 @@ static void test_depth_readback(void) HWND window; HRESULT hr; RECT r; + BOOL all_zero, all_one, all_pass; static struct { @@ -13791,6 +13792,7 @@ static void test_depth_readback(void) hr = IDirect3DDevice7_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + all_zero = all_one = all_pass = TRUE; for (y = 60; y < 480; y += 120) { for (x = 80; x < 640; x += 160) @@ -13801,24 +13803,49 @@ static void test_depth_readback(void) hr = IDirectDrawSurface7_Lock(ds, &r, &surface_desc, DDLOCK_READONLY, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); - depth = *((DWORD *)surface_desc.lpSurface) & tests[i].z_mask; + raw_value = *((DWORD *)surface_desc.lpSurface); + if (raw_value) + all_zero = FALSE; + if (raw_value != 0x00ffffff) + all_one = FALSE; + + depth = raw_value & tests[i].z_mask; expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; + /* This test is very reliably on AMD, but fails in a number of interesting ways on Nvidia GPUs: + * + * Geforce 7 GPUs work only with D16. D24 and D24S8 return 0, D24X8 broken data. + * + * Geforce 9 GPUs return return broken data for D16 that resembles the expected data in + * the lower 8 bits and has 0xff in the upper 8 bits. D24X8 works, D24 and D24S8 return + * 0x00ffffff. + * + * Geforce GTX 650 has working D16 and D24, but D24S8 returns 0. + * + * Arx Fatalis is broken on the Geforce 9 in the same way it was broken in Wine (bug 43654). + * The !tests[i].s_depth is supposed to rule out D16 on GF9 and D24X8 on GF7. */ todo_wine_if(tests[i].todo) - ok(abs(expected_depth - depth) <= max_diff, + ok(abs(expected_depth - depth) <= max_diff + || broken(ddraw_is_nvidia(ddraw) && (all_zero || all_one || !tests[i].s_depth)), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + if (abs(expected_depth - depth) > max_diff) + all_pass = FALSE; hr = IDirectDrawSurface7_Unlock(ds, &r); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); } } + if (all_pass) + passed_fmts++; hr = IDirectDrawSurface7_DeleteAttachedSurface(rt, 0, ds); ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); IDirectDrawSurface7_Release(ds); } + ok(passed_fmts, "Not a single format passed the tests, this is bad even by Nvidia's standards.\n"); + IDirectDrawSurface7_Release(rt); IDirectDraw7_Release(ddraw); IDirect3D7_Release(d3d); -- 2.13.6

2 2

[PATCH] [ole32] Make CoWaitForMultipleHandles peek at all posted messages
by Anton Romanov 19 Jan '18

19 Jan '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=43728 This matches Windows behaviour and also avoids making CoWaitForMultipleHandles's message_loop constantly spin because of unpeeked/unpumped message in the queue Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/ole32/compobj.c | 10 ++++++++++ dlls/ole32/tests/compobj.c | 20 ++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d136ee623a..48030aee71 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4547,6 +4547,16 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, } } + if (!apt->win) + { + /* If window is NULL on apartment we don't pump every + * single POSTMESSAGE message. Windows doesn't either but it peeks at + * them so that it will not trigger + * MsgWaitForMultipleObjects next time. + * If we don't do this and happen to have a message that is + * not pumped below we end up in a tight loop */ + PeekMessageW(NULL, NULL, 0, 0, PM_QS_POSTMESSAGE | PM_NOREMOVE | PM_NOYIELD); + } /* some apps (e.g. Visio 2010) don't handle WM_PAINT properly and loop forever, * so after processing 100 messages we go back to checking the wait handles */ while (count++ < 100 && COM_PeekMessage(apt, &msg)) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b46ff03853..127f387e4a 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2648,7 +2648,9 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) DWORD index; HRESULT hr; HWND hWnd; + UINT uMSG = 0xc065; MSG msg; + int ret; hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); @@ -2672,6 +2674,23 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) success = PeekMessageA(&msg, hWnd, WM_USER, WM_USER, PM_REMOVE); ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + /* Even if CoWaitForMultipleHandles does not pump a message it peeks + * at ALL of them */ + index = 0xdeadbeef; + PostMessageA(NULL, uMSG, 0, 0); + + hr = CoWaitForMultipleHandles(COWAIT_ALERTABLE, 50, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); + + /* Make sure message was peeked at */ + ret = MsgWaitForMultipleObjectsEx(0, NULL, 2, QS_ALLPOSTMESSAGE, MWMO_ALERTABLE); + ok(ret == WAIT_TIMEOUT, "MsgWaitForMultipleObjects returned %x\n", ret); + + /* But not pumped */ + success = PeekMessageA(&msg, NULL, uMSG, uMSG, PM_REMOVE); + ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + DestroyWindow(hWnd); CoUninitialize(); return 0; @@ -2854,6 +2873,7 @@ static void test_CoWaitForMultipleHandles(void) success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); + index = 0xdeadbeef; PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_NOREMOVE); -- 2.15.1

2 2

[PATCH] user32: Add SysLink to known classes list
by Nikolay Sivov 18 Jan '18

18 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/class.c | 1 + dlls/user32/tests/class.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index e0edb768d0..2aa189733f 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -139,6 +139,7 @@ static BOOL is_comctl32_class( const WCHAR *name ) {'S','y','s','D','a','t','e','T','i','m','e','P','i','c','k','3','2',0}, {'S','y','s','H','e','a','d','e','r','3','2',0}, {'S','y','s','I','P','A','d','d','r','e','s','s','3','2',0}, + {'S','y','s','L','i','n','k',0}, {'S','y','s','L','i','s','t','V','i','e','w','3','2',0}, {'S','y','s','M','o','n','t','h','C','a','l','3','2',0}, {'S','y','s','P','a','g','e','r',0}, diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 5a66ede49e..88e4bfcfa4 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1093,6 +1093,7 @@ static void test_comctl32_classes(void) PROGRESS_CLASSA, REBARCLASSNAMEA, STATUSCLASSNAMEA, + "SysLink", WC_TABCONTROLA, TOOLBARCLASSNAMEA, TOOLTIPS_CLASSA, -- 2.15.1

1 0

[PATCH] joy.cpl: Add parameters for Condition FF effects
by Aric Stewart 18 Jan '18

18 Jan '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/joy.cpl/main.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)

1 0

[PATCH resend] msxml3: Remove CRs in domtext_put_data and add them in domtext_get_xml
by Alex Henrie 18 Jan '18

18 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=42468 dlls/msxml3/tests/domdoc.c | 153 +++++++++++++++++++++++++++++++++++++++------ dlls/msxml3/text.c | 34 +++++++--- 2 files changed, 161 insertions(+), 26 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7c56015235..4f5e536c45 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12108,34 +12108,148 @@ static void test_put_data(void) type++; } - /* \r\n sequence is never escaped */ + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + +static void test_newline_normalization(void) +{ + const struct msxmlsupported_data_t *table = domdoc_support_data; + IXMLDOMDocument *doc; + IXMLDOMText *text; + IXMLDOMNode *node; + VARIANT v; + VARIANT_BOOL b; + BSTR s; + HRESULT hr; + LONG length; + V_VT(&v) = VT_I2; V_I2(&v) = NODE_TEXT; - hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); - ok(hr == S_OK, "got 0x%08x\n", hr); + while (table->clsid) + { + if (!is_clsid_supported(table->clsid, &IID_IXMLDOMDocument)) + { + table++; + continue; + } - IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc); + ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); + ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXMLDOMText_get_data(text, &get_data); - ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine - ok(!lstrcmpW(get_data, _bstr_("\n")), "got %s\n", wine_dbgstr_w(get_data)); - SysFreeString(get_data); + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); - hr = IXMLDOMText_get_xml(text, &get_data); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(get_data, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(get_data)); - SysFreeString(get_data); + /* \r\n is normalized to \n and back to \r\n */ - IXMLDOMText_Release(text); - IXMLDOMNode_Release(node); + hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); + ok(hr == S_OK, "got 0x%08x\n", hr); - IXMLDOMDocument_Release(doc); - free_bstrs(); + hr = IXMLDOMText_get_data(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMText_get_length(text, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 1, "got %d, expected 1\n", length); + + hr = IXMLDOMText_get_xml(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* \r\r\n is normalized to \n\n and back to \r\n\r\n */ + + hr = IXMLDOMText_put_data(text, _bstr_("\r\r\n")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMText_get_data(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\n\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMText_get_length(text, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 2, "got %d, expected 2\n", length); + + hr = IXMLDOMText_get_xml(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\r\n\r\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* the same normalizations are applied when loading a document as a whole */ + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?><root>foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n<root>foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* even if xml:space="preserve" */ + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?>" + "<root xml:space=\"preserve\">foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n" + "<root xml:space=\"preserve\">foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* or preserveWhiteSpace is set */ + + hr = IXMLDOMDocument_put_preserveWhiteSpace(doc, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?><root>foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (IsEqualGUID(table->clsid, &CLSID_DOMDocument60)) + { + /* DOMDocument60 does the newline normalization but does not insert line breaks around the root node */ +todo_wine + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?><root>foo\r\n\r\n\r\n\r\nbar</root>")), + "got %s\n", wine_dbgstr_w(s)); + } + else + { + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n<root>foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + } + SysFreeString(s); + + IXMLDOMText_Release(text); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); + free_bstrs(); + table++; + } } static void test_putref_schemas(void) @@ -12719,6 +12833,7 @@ START_TEST(domdoc) test_nodeValue(); test_get_namespaces(); test_put_data(); + test_newline_normalization(); test_putref_schemas(); test_namedmap_newenum(); test_xmlns_attribute(); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 3a12d4bf62..abd89dbd6b 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -522,7 +522,7 @@ static HRESULT WINAPI domtext_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, p); + return node_get_xml(&This->node, TRUE, p); } static HRESULT WINAPI domtext_transformNode( @@ -616,15 +616,35 @@ static HRESULT WINAPI domtext_put_data( BSTR data) { domtext *This = impl_from_IXMLDOMText( iface ); - static const WCHAR rnW[] = {'\r','\n',0}; + BSTR normalized_data = NULL; + HRESULT hr; + size_t i, j; TRACE("(%p)->(%s)\n", This, debugstr_w(data)); - if (data && !strcmpW(rnW, data)) - This->node.node->name = xmlStringTextNoenc; - else - domtext_reset_noenc(This); - return node_set_content(&This->node, data); + if (data) + { + /* normalize line endings */ + normalized_data = SysAllocStringLen(NULL, SysStringLen(data)); + if (!normalized_data) return E_OUTOFMEMORY; + for (i = 0, j = 0; data[i]; i++) + { + if (data[i] == '\r') + { + if (data[i + 1] == '\n') i++; /* change \r\n to just \n */ + normalized_data[j++] = '\n'; /* change \r by itself to \n */ + } + else + normalized_data[j++] = data[i]; + } + normalized_data[j] = 0; + } + + domtext_reset_noenc(This); + hr = node_set_content(&This->node, normalized_data); + + SysFreeString(normalized_data); + return hr; } static HRESULT WINAPI domtext_get_length( -- 2.15.1

1 0

[PATCH 20/20] kerberos: Don't fail InitializeSecurityContext if there are unsupported flags.
by Dmitry Timoshkov 18 Jan '18

18 Jan '18

Kerberos Authentication Tester passes ISC_REQ_CONNECTION along with some other flags that currently lead InitializeSecurityContext to fail. With this patch applied, and the patch that implements switch between NTLM and Kerberos in Negotiate provider Kerberos Authentication Tester works in the real Kerberos environment. This is another fix to make Kerberos Authentication Tester work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index cdfbbd66bc..640eff7855 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -471,10 +471,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, context_req, target_data_rep, input, new_context, output, context_attr, ts_expiry, mapped_context, context_data ); if (context_req & ~supported) - { FIXME( "flags 0x%08x not supported\n", context_req & ~supported ); - return SEC_E_UNSUPPORTED_FUNCTION; - } if (!context && !input && !credential) return SEC_E_INVALID_HANDLE; cred_handle = credhandle_sspi_to_gss( credential ); -- 2.15.1

1 0

[PATCH 19/20] kerberos: Don't include GSS_C_DCE_STYLE in default gss_init_sec_context() flags.
by Dmitry Timoshkov 18 Jan '18

18 Jan '18

Otherwise the returned ticket won't be accepted by WWW server when wrapped in an HTTP request. Original Rob's patch doesn't have this flag either. This patch is one of the fixes to make Kerberos Authentication Tester work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 277e15e615..cdfbbd66bc 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -326,7 +326,7 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam static ULONG flags_isc_req_to_gss( ULONG flags ) { - ULONG ret = GSS_C_DCE_STYLE; + ULONG ret = 0; if (flags & ISC_REQ_DELEGATE) ret |= GSS_C_DELEG_FLAG; if (flags & ISC_REQ_MUTUAL_AUTH) ret |= GSS_C_MUTUAL_FLAG; if (flags & ISC_REQ_REPLAY_DETECT) ret |= GSS_C_REPLAY_FLAG; -- 2.15.1

1 0

[PATCH 18/20] kerberos: Implement SpUnsealMessage.
by Dmitry Timoshkov 18 Jan '18

18 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 295e23f4c5..277e15e615 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -196,6 +196,7 @@ MAKE_FUNCPTR(gss_release_buffer); MAKE_FUNCPTR(gss_release_cred); MAKE_FUNCPTR(gss_release_iov_buffer); MAKE_FUNCPTR(gss_release_name); +MAKE_FUNCPTR(gss_unwrap_iov); MAKE_FUNCPTR(gss_verify_mic); MAKE_FUNCPTR(gss_wrap_iov); #undef MAKE_FUNCPTR @@ -225,6 +226,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_release_cred) LOAD_FUNCPTR(gss_release_iov_buffer) LOAD_FUNCPTR(gss_release_name) + LOAD_FUNCPTR(gss_unwrap_iov) LOAD_FUNCPTR(gss_verify_mic) LOAD_FUNCPTR(gss_wrap_iov) #undef LOAD_FUNCPTR @@ -875,6 +877,52 @@ static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG qual #endif } +static NTSTATUS NTAPI kerberos_SpUnsealMessage( LSA_SEC_HANDLE context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + gss_ctx_id_t ctxt_handle; + gss_iov_buffer_desc iov[4]; + OM_uint32 ret, minor_status; + int token_idx, data_idx, conf_state; + + TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); + if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + + if (context) return SEC_E_INVALID_HANDLE; + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + + iov[0].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY; + iov[0].buffer.length = 0; + iov[0].buffer.value = NULL; + + iov[1].type = GSS_IOV_BUFFER_TYPE_DATA; + iov[1].buffer.length = message->pBuffers[data_idx].cbBuffer; + iov[1].buffer.value = message->pBuffers[data_idx].pvBuffer; + + iov[2].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY; + iov[2].buffer.length = 0; + iov[2].buffer.value = NULL; + + iov[3].type = GSS_IOV_BUFFER_TYPE_HEADER; + iov[3].buffer.length = message->pBuffers[token_idx].cbBuffer; + iov[3].buffer.value = message->pBuffers[token_idx].pvBuffer; + + ret = pgss_unwrap_iov( &minor_status, ctxt_handle, &conf_state, NULL, iov, 4 ); + TRACE( "gss_unwrap_iov returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE && quality_of_protection) *quality_of_protection = (conf_state ? 0 : SECQOP_WRAP_NO_ENCRYPT); + + return status_gss_to_sspi( ret ); + +#else + FIXME( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, @@ -882,7 +930,7 @@ static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = kerberos_SpMakeSignature, kerberos_SpVerifySignature, kerberos_SpSealMessage, - NULL, /* SpUnsealMessage */ + kerberos_SpUnsealMessage, NULL, /* SpGetContextToken */ NULL, /* SpQueryContextAttributes */ NULL, /* SpCompleteAuthToken */ -- 2.15.1

1 0

[PATCH 17/20] kerberos: Implement SpSealMessage.
by Dmitry Timoshkov 18 Jan '18

18 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 23f84628e6..295e23f4c5 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -194,8 +194,10 @@ MAKE_FUNCPTR(gss_import_name); MAKE_FUNCPTR(gss_init_sec_context); MAKE_FUNCPTR(gss_release_buffer); MAKE_FUNCPTR(gss_release_cred); +MAKE_FUNCPTR(gss_release_iov_buffer); MAKE_FUNCPTR(gss_release_name); MAKE_FUNCPTR(gss_verify_mic); +MAKE_FUNCPTR(gss_wrap_iov); #undef MAKE_FUNCPTR static BOOL load_gssapi_krb5(void) @@ -221,8 +223,10 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_init_sec_context) LOAD_FUNCPTR(gss_release_buffer) LOAD_FUNCPTR(gss_release_cred) + LOAD_FUNCPTR(gss_release_iov_buffer) LOAD_FUNCPTR(gss_release_name) LOAD_FUNCPTR(gss_verify_mic) + LOAD_FUNCPTR(gss_wrap_iov) #undef LOAD_FUNCPTR return TRUE; @@ -815,13 +819,69 @@ static SECURITY_STATUS SEC_ENTRY kerberos_SpVerifySignature( LSA_SEC_HANDLE cont #endif } +static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + gss_ctx_id_t ctxt_handle; + gss_iov_buffer_desc iov[4]; + OM_uint32 ret, minor_status; + int token_idx, data_idx, conf_state; + + TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + if (quality_of_protection) + { + FIXME( "flags %08x not supported\n", quality_of_protection ); + return SEC_E_UNSUPPORTED_FUNCTION; + } + if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + + if (!context) return SEC_E_INVALID_HANDLE; + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + /* FIXME: multiple data buffers, read-only buffers */ + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + + iov[0].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[0].buffer.length = 0; + iov[0].buffer.value = NULL; + + iov[1].type = GSS_IOV_BUFFER_TYPE_DATA; + iov[1].buffer.length = message->pBuffers[data_idx].cbBuffer; + iov[1].buffer.value = message->pBuffers[data_idx].pvBuffer; + + iov[2].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[2].buffer.length = 0; + iov[2].buffer.value = NULL; + + iov[3].type = GSS_IOV_BUFFER_TYPE_HEADER | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[3].buffer.length = 0; + iov[3].buffer.value = NULL; + + ret = pgss_wrap_iov( &minor_status, ctxt_handle, 1, GSS_C_QOP_DEFAULT, &conf_state, iov, 4 ); + TRACE( "gss_wrap_iov returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE) + { + memcpy( message->pBuffers[token_idx].pvBuffer, iov[3].buffer.value, iov[3].buffer.length ); + message->pBuffers[token_idx].cbBuffer = iov[3].buffer.length; + pgss_release_iov_buffer( &minor_status, iov, 4 ); + } + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ kerberos_SpMakeSignature, kerberos_SpVerifySignature, - NULL, /* SpSealMessage */ + kerberos_SpSealMessage, NULL, /* SpUnsealMessage */ NULL, /* SpGetContextToken */ NULL, /* SpQueryContextAttributes */ -- 2.15.1

1 0

[PATCH 16/20] kerberos: Implement SpVerifySignature.
by Dmitry Timoshkov 18 Jan '18

18 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 1cc21706e2..23f84628e6 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -195,6 +195,7 @@ MAKE_FUNCPTR(gss_init_sec_context); MAKE_FUNCPTR(gss_release_buffer); MAKE_FUNCPTR(gss_release_cred); MAKE_FUNCPTR(gss_release_name); +MAKE_FUNCPTR(gss_verify_mic); #undef MAKE_FUNCPTR static BOOL load_gssapi_krb5(void) @@ -221,6 +222,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_release_buffer) LOAD_FUNCPTR(gss_release_cred) LOAD_FUNCPTR(gss_release_name) + LOAD_FUNCPTR(gss_verify_mic) #undef LOAD_FUNCPTR return TRUE; @@ -779,12 +781,46 @@ static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULON #endif } +static SECURITY_STATUS SEC_ENTRY kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status; + gss_buffer_desc data_buffer, token_buffer; + gss_ctx_id_t ctxt_handle; + int data_idx, token_idx; + + TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); + if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + + if (!context) return SEC_E_INVALID_HANDLE; + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + data_buffer.length = message->pBuffers[data_idx].cbBuffer; + data_buffer.value = message->pBuffers[data_idx].pvBuffer; + + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + token_buffer.length = message->pBuffers[token_idx].cbBuffer; + token_buffer.value = message->pBuffers[token_idx].pvBuffer; + + ret = pgss_verify_mic( &minor_status, ctxt_handle, &data_buffer, &token_buffer, NULL ); + TRACE( "gss_verify_mic returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE && quality_of_protection) *quality_of_protection = 0; + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ kerberos_SpMakeSignature, - NULL, /* SpVerifySignature */ + kerberos_SpVerifySignature, NULL, /* SpSealMessage */ NULL, /* SpUnsealMessage */ NULL, /* SpGetContextToken */ -- 2.15.1

1 0

[PATCH 15/20] kerberos: Implement SpMakeSignature.
by Dmitry Timoshkov 18 Jan '18

18 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 5e9f49d6a1..1cc21706e2 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -189,6 +189,7 @@ static void *libgssapi_krb5_handle; MAKE_FUNCPTR(gss_accept_sec_context); MAKE_FUNCPTR(gss_acquire_cred); MAKE_FUNCPTR(gss_delete_sec_context); +MAKE_FUNCPTR(gss_get_mic); MAKE_FUNCPTR(gss_import_name); MAKE_FUNCPTR(gss_init_sec_context); MAKE_FUNCPTR(gss_release_buffer); @@ -214,6 +215,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_accept_sec_context) LOAD_FUNCPTR(gss_acquire_cred) LOAD_FUNCPTR(gss_delete_sec_context) + LOAD_FUNCPTR(gss_get_mic) LOAD_FUNCPTR(gss_import_name) LOAD_FUNCPTR(gss_init_sec_context) LOAD_FUNCPTR(gss_release_buffer) @@ -736,11 +738,52 @@ static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTION return STATUS_SUCCESS; } +static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status; + gss_buffer_desc data_buffer, token_buffer; + gss_ctx_id_t ctxt_handle; + int data_idx, token_idx; + + TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + if (quality_of_protection) FIXME( "ignoring quality_of_protection 0x%08x\n", quality_of_protection ); + if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + + if (!context) return SEC_E_INVALID_HANDLE; + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + /* FIXME: multiple data buffers, read-only buffers */ + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + data_buffer.length = message->pBuffers[data_idx].cbBuffer; + data_buffer.value = message->pBuffers[data_idx].pvBuffer; + + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + token_buffer.length = 0; + token_buffer.value = NULL; + + ret = pgss_get_mic( &minor_status, ctxt_handle, GSS_C_QOP_DEFAULT, &data_buffer, &token_buffer ); + TRACE( "gss_get_mic returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE) + { + memcpy( message->pBuffers[token_idx].pvBuffer, token_buffer.value, token_buffer.length ); + message->pBuffers[token_idx].cbBuffer = token_buffer.length; + pgss_release_buffer( &minor_status, &token_buffer ); + } + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ - NULL, /* SpMakeSignature */ + kerberos_SpMakeSignature, NULL, /* SpVerifySignature */ NULL, /* SpSealMessage */ NULL, /* SpUnsealMessage */ -- 2.15.1

1 0

[PATCH 14/20] kerberos: Add SpInstanceInit stub.
by Dmitry Timoshkov 18 Jan '18

18 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index ceba31608b..5e9f49d6a1 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -729,9 +729,16 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, return STATUS_SUCCESS; } +static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTIONS *dll_function_table, void **user_functions) +{ + FIXME("%u,%p,%p: stub\n", version, dll_function_table, user_functions); + + return STATUS_SUCCESS; +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { - NULL, /* SpInstanceInit */ + kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ NULL, /* SpMakeSignature */ NULL, /* SpVerifySignature */ -- 2.15.1

1 0

[PATCH 13/20] kerberos: Add SpUserModeInitialize implementation.
by Dmitry Timoshkov 18 Jan '18

18 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/kerberos.spec | 2 +- dlls/kerberos/krb5_ap.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/kerberos.spec b/dlls/kerberos/kerberos.spec index c41b830e46..7f765b1206 100644 --- a/dlls/kerberos/kerberos.spec +++ b/dlls/kerberos/kerberos.spec @@ -1,7 +1,7 @@ 1 stub SpInitialize 2 stub KerbDomainChangeCallback 3 stdcall SpLsaModeInitialize(long ptr ptr ptr) -4 stub SpUserModeInitialize +4 stdcall SpUserModeInitialize(long ptr ptr ptr) 32 stub SpInstanceInit @ stdcall -private DllMain(long long ptr) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index ddd48df5d1..ceba31608b 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -728,3 +728,33 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, return STATUS_SUCCESS; } + +static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = +{ + NULL, /* SpInstanceInit */ + NULL, /* SpInitUserModeContext */ + NULL, /* SpMakeSignature */ + NULL, /* SpVerifySignature */ + NULL, /* SpSealMessage */ + NULL, /* SpUnsealMessage */ + NULL, /* SpGetContextToken */ + NULL, /* SpQueryContextAttributes */ + NULL, /* SpCompleteAuthToken */ + NULL, /* SpDeleteContext */ + NULL, /* SpFormatCredentialsFn */ + NULL, /* SpMarshallSupplementalCreds */ + NULL, /* SpExportSecurityContext */ + NULL /* SpImportSecurityContext */ +}; + +NTSTATUS NTAPI SpUserModeInitialize(ULONG lsa_version, PULONG package_version, + PSECPKG_USER_FUNCTION_TABLE *table, PULONG table_count) +{ + TRACE("%#x,%p,%p,%p\n", lsa_version, package_version, table, table_count); + + *package_version = SECPKG_INTERFACE_VERSION; + *table = &kerberos_user_table; + *table_count = 1; + + return STATUS_SUCCESS; +} -- 2.15.1

1 0

[PATCH] winebrowser: Fix calling convention for wine_get_unix_file_name().
by Huw Davies 18 Jan '18

18 Jan '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- programs/winebrowser/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 304ac14bbc..b1c49e7cd1 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -54,7 +54,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winebrowser); -typedef LPSTR (*wine_get_unix_file_name_t)(LPCWSTR unixname); +typedef LPSTR (*CDECL wine_get_unix_file_name_t)(LPCWSTR unixname); static const WCHAR browser_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', -- 2.12.0

1 0

[PATCH 2/2] testbot: Purge old jobs based on their Submitted timestamp.
by Francois Gouget 18 Jan '18

18 Jan '18

Although it would only happen in case of a major TestBot malfunction, a Job could end up in a state where it will never complete and thus where its Ended field never gets set. So deleting old jobs based on their Ended field could leave us with zombies. This cannot happen with the Submitted timestamp since that field is not nullable. Also, a Job run time is normally very small compared to the expiration time (under a couple of hours compared to several days) so this does not make a significant difference in when a job actually gets deleted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I did get a Job zombie once on my local TestBot but it was due to bugs in the TestBot code (those did not make it to the production server fortunately). Sill, better safe than sorry. testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 6ac22ded..0f126e87 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -61,7 +61,7 @@ if ($JobPurgeDays != 0) my $Jobs = CreateJobs(); foreach my $Job (@{$Jobs->GetItems()}) { - if (defined($Job->Ended) && $Job->Ended < $DeleteBefore) + if ($Job->Submitted < $DeleteBefore) { LogMsg "Deleting job ", $Job->Id, "\n"; $Job->RmTree(); -- 2.15.1

1 0

[PATCH 1/2] testbot: Require that a Job's Submitted field always be set.
by Francois Gouget 18 Jan '18

18 Jan '18

This guarantees we have at least one field to purge old jobs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This requires updating the database schema using update30.sql and restarting the web server and TestBot Engine. testbot/ddl/update30.sql | 4 ++++ testbot/ddl/winetestbot.sql | 2 +- testbot/doc/winetestbot-schema.dia | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 testbot/ddl/update30.sql diff --git a/testbot/ddl/update30.sql b/testbot/ddl/update30.sql new file mode 100644 index 00000000..892d8d18 --- /dev/null +++ b/testbot/ddl/update30.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Jobs + MODIFY Submitted DATETIME NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index ad8d1a92..cebc2655 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -114,7 +114,7 @@ CREATE TABLE Jobs Priority INT(1) NOT NULL, Status ENUM('queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled') NOT NULL, Remarks VARCHAR(128) NULL, - Submitted DATETIME NULL, + Submitted DATETIME NOT NULL, Ended DATETIME NULL, PatchId INT(7) NULL, FOREIGN KEY (BranchName) REFERENCES Branches(Name), diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index ef7c3ca7..7a948346 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -1450,7 +1450,7 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="nullable"> - <dia:boolean val="true"/> + <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="unique"> <dia:boolean val="false"/> -- 2.15.1

1 0

[PATCH vkd3d 1/8] libs/vkd3d: Add simple format support restrictions.
by Józef Kucia 17 Jan '18

17 Jan '18

From: Józef Kucia <jkucia(a)codeweavers.com> In the long term, we may need more complex format support filtering. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- After this change all tests passes with recent Nvidia drivers. --- libs/vkd3d/device.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5cf2ecfe8bdc..d84c5796a91b 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1230,6 +1230,30 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList(ID3D12Device *if &IID_ID3D12GraphicsCommandList, riid, command_list); } +/* Direct3D feature levels restrict which formats can be optionally supported. */ +static void vkd3d_restrict_format_support_for_feature_level( + D3D12_FEATURE_DATA_FORMAT_SUPPORT *format_support, const struct vkd3d_format *format) +{ + static const D3D12_FEATURE_DATA_FORMAT_SUPPORT blacklisted_format_features[] = + { + {DXGI_FORMAT_B8G8R8A8_TYPELESS, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, + D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, + {DXGI_FORMAT_B8G8R8A8_UNORM, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, + D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(blacklisted_format_features); ++i) + { + if (blacklisted_format_features[i].Format == format->dxgi_format) + { + format_support->Support1 &= ~blacklisted_format_features[i].Support1; + format_support->Support2 &= ~blacklisted_format_features[i].Support2; + break; + } + } +} + static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device *iface, D3D12_FEATURE feature, void *feature_data, UINT feature_data_size) { @@ -1378,6 +1402,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * | D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_SIGNED_MIN_OR_MAX | D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_UNSIGNED_MIN_OR_MAX; + vkd3d_restrict_format_support_for_feature_level(data, format); + return S_OK; } -- 2.13.6

3 17

[PATCH v2] usp10: Re-use script caches for the same font.
by Thomas Faber 17 Jan '18

17 Jan '18

v2: use the LOGFONT as the comparison key, not the HDC; add more tests

3 2

[PATCH] po: Update German translation.
by Julian Rüger 17 Jan '18

17 Jan '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] testbot/Janitor: Don't undefine variables that are going out of scope.
by Francois Gouget 17 Jan '18

17 Jan '18

There is no point. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 4f0e4de0..6ac22ded 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -72,7 +72,6 @@ if ($JobPurgeDays != 0) } } } - $Jobs = undef; } # Delete PatchSets that are more than a day old @@ -123,7 +122,6 @@ if ($JobPurgeDays != 0) } } } - $Patches = undef; } # Archive old Jobs, that is remove all their associated files @@ -146,7 +144,6 @@ if ($JobArchiveDays != 0) $Job->Save(); } } - $Jobs = undef; } # Purge the deleted users and VMs if they are not referenced anymore @@ -286,5 +283,4 @@ if ($JobPurgeDays != 0) } } } - $RecordGroups = undef; } -- 2.15.1

1 0

[PATCH] testbot: Fix the CompareRecordGroups() documentation and variable names.
by Francois Gouget 17 Jan '18

17 Jan '18

The RecordGroup Id is an AUTO_INCREMENT field. These never wrap! Also, while that field is defined as an INT(6), it is a 32 bit integer anyway so we will not run out of ids for a long time. Generally speaking, for integers the display width (6 here) is meaningless as far as the TestBot is concerned. Also use more descriptive variable names. $a and $b were a bit misleading too since they have special meaning in the context of the sort() function, meaning which they don't have here. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/RecordGroups.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index fc1c2528..707d0acd 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -95,12 +95,12 @@ sub CreateRecordGroups(;$) sub CompareRecordGroups($$) { - my ($a, $b) = @_; + my ($RecordGroup1, $RecordGroup2) = @_; - # The Id will wrap eventually so sort by Timestamp - # and only use the Id to break ties. - return $a->Timestamp <=> $b->Timestamp || - $a->Id <=> $b->Id; + # The Timestamps have a 1 second granularity and may have duplicates. + # So use the Id to break ties. + return $RecordGroup1->Timestamp <=> $RecordGroup2->Timestamp || + $RecordGroup1->Id <=> $RecordGroup2->Id; } =pod -- 2.15.1

1 0

[PATCH] testbot: Return the activity records as a sorted list.
by Francois Gouget 17 Jan '18

17 Jan '18

The callers need a sorted list rather than a random access structure. So this avoids forcing them to deal with sorting the activity records again and mildly speeds things up. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 33 ++++++++++++++++++--------------- testbot/web/Activity.pl | 4 ++-- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 5a5d2328..58169aee 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -44,9 +44,13 @@ require Exporter; =item C<GetActivity()> Loads the records for the specified VMs and processes them to build a structure -describing the TestBot activity. The structure is as follows: +describing the TestBot activity. - { <GroupNo1> => { +Returns a list of the activity records, sorted from the oldest to the newest. +Each entry contains a structure grouping all the state and event information +for the specified timestamp. Entries have the following structure: + + { start => <StartTimestamp>, end => <EndTimestamp>, runnable => <RunnableTasksCount>, @@ -78,12 +82,10 @@ describing the TestBot activity. The structure is as follows: ... }, }, - }, - <GroupNo2> => { - ... - }, - ... - } + } + +GetActivity() also returns a table with the number of records and record groups +that were processed. =back =cut @@ -91,14 +93,16 @@ describing the TestBot activity. The structure is as follows: sub GetActivity($) { my ($VMs) = @_; - my ($Activity, $Counters) = ({}, {}); + my ($ActivityHash, $Activity, $Counters) = ({}, [], {}); ### First load all the RecordGroups my $RecordGroups = CreateRecordGroups(); $Counters->{recordgroups} = $RecordGroups->GetItemsCount(); - foreach my $RecordGroup (@{$RecordGroups->GetItems()}) + foreach my $RecordGroup (sort CompareRecordGroups @{$RecordGroups->GetItems()}) { - $Activity->{$RecordGroup->Id} = { start => $RecordGroup->Timestamp }; + my $Group = { start => $RecordGroup->Timestamp }; + $ActivityHash->{$RecordGroup->Id} = $Group; + push @$Activity, $Group; } ### And then load all the Records in one go @@ -110,7 +114,7 @@ sub GetActivity($) $Counters->{records} = $Records->GetItemsCount(); foreach my $Record (@{$Records->GetItems()}) { - my $Group = $Activity->{$Record->RecordGroupId}; + my $Group = $ActivityHash->{$Record->RecordGroupId}; if ($Record->Type eq "tasks" and $Record->Name eq "counters") { ($Group->{runnable}, $Group->{queued}) = split / /, $Record->Value; @@ -196,9 +200,8 @@ sub GetActivity($) ### Fill the holes in the table, compute end times, etc. my ($LastGroup, %LastStatusVMs); - foreach my $RecordGroup (sort CompareRecordGroups @{$RecordGroups->GetItems()}) + foreach my $Group (@$Activity) { - my $Group = $Activity->{$RecordGroup->Id}; my $StatusVMs = $Group->{statusvms}; my $ResultVMs = $Group->{resultvms}; next if (!$StatusVMs and !$ResultVMs); @@ -380,7 +383,7 @@ sub GetStatistics($) my ($Activity, $Counters) = GetActivity($VMs); $GlobalStats->{"recordgroups.count"} = $Counters->{recordgroups}; $GlobalStats->{"records.count"} = $Counters->{records}; - foreach my $Group (values %$Activity) + foreach my $Group (@$Activity) { if (!$VMsStats->{start} or $VMsStats->{start} > $Group->{start}) { diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 5a730df4..f8b7b5ad 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -133,9 +133,9 @@ EOF print "<tbody>\n"; my ($Activity, $_Counters) = GetActivity($VMs); - foreach my $GroupNo (sort { $b <=> $a } keys %$Activity) + for (my $Index = @$Activity; $Index--; ) { - my $Group = $Activity->{$GroupNo}; + my $Group = $Activity->[$Index]; next if (!$Group->{statusvms}); print "<tr><td>", _GetHtmlTime($Group->{start}), "</td>"; -- 2.15.1

1 0

[PATCH] ntdll: Handle RtlReAllocateHeap failure in com_class_add_progid (Coverity).
by Thomas Faber 16 Jan '18

16 Jan '18

Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/ntdll/actctx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 323ee68fc09b..dc65e374b9ad 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1444,6 +1444,7 @@ static DWORD parse_com_class_misc(const xmlstr_t *value) static BOOL com_class_add_progid(const xmlstr_t *progid, struct entity *entity) { struct progids *progids = &entity->u.comclass.progids; + WCHAR **new_progids; if (progids->allocated == 0) { @@ -1453,8 +1454,10 @@ static BOOL com_class_add_progid(const xmlstr_t *progid, struct entity *entity) if (progids->allocated == progids->num) { + new_progids = RtlReAllocateHeap(GetProcessHeap(), 0, progids->progids, 2 * progids->allocated * sizeof(WCHAR*)); + if (!new_progids) return FALSE; progids->allocated *= 2; - progids->progids = RtlReAllocateHeap(GetProcessHeap(), 0, progids->progids, progids->allocated * sizeof(WCHAR*)); + progids->progids = new_progids; } if (!(progids->progids[progids->num] = xmlstrdupW(progid))) return FALSE; -- 2.15.1

1 0

[PATCH] ole2disp.dll16: Implement SafeArrayGet[UBound|LBound].
by Gijs Vermeulen 16 Jan '18

16 Jan '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ole2disp.dll16/ole2disp.c | 36 +++++++++++++++++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 4 ++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index d61b5e8c5a..fb2dde6db2 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -116,6 +116,42 @@ USHORT WINAPI SafeArrayGetElemsize16(SAFEARRAY16 *sa) return sa->cbElements; } +/****************************************************************************** + * SafeArrayGetUBound [OLE2DISP.19] + */ +HRESULT WINAPI SafeArrayGetUBound16(SAFEARRAY *sa, UINT16 dim, LONG *ubound) +{ + TRACE("(%p,%u,%p)\n", sa, dim, ubound); + + if (!sa || !ubound) + return E_INVALIDARG16; + + if(!dim || dim > sa->cDims) + return DISP_E_BADINDEX; + + *ubound = sa->rgsabound[sa->cDims - dim].lLbound + sa->rgsabound[sa->cDims - dim].cElements - 1; + + return S_OK; +} + +/****************************************************************************** + * SafeArrayGetLBound [OLE2DISP.20] + */ +HRESULT WINAPI SafeArrayGetLBound16(SAFEARRAY *sa, UINT16 dim, LONG *lbound) +{ + TRACE("(%p,%u,%p)\n", sa, dim, lbound); + + if (!sa || !lbound) + return E_INVALIDARG16; + + if(!dim || dim > sa->cDims) + return DISP_E_BADINDEX; + + *lbound = sa->rgsabound[sa->cDims - dim].lLbound; + + return S_OK; +} + /****************************************************************************** * SafeArrayLock [OLE2DISP.21] */ diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 4b8af41172..7b00ac353b 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -16,8 +16,8 @@ 16 stub SAFEARRAYDESTROY 17 pascal -ret16 SafeArrayGetDim(ptr) SafeArrayGetDim16 18 pascal -ret16 SafeArrayGetElemsize(ptr) SafeArrayGetElemsize16 -19 stub SAFEARRAYGETUBOUND -20 stub SAFEARRAYGETLBOUND +19 pascal SafeArrayGetUBound(ptr word ptr) SafeArrayGetUBound16 +20 pascal SafeArrayGetLBound(ptr word ptr) SafeArrayGetLBound16 21 pascal SafeArrayLock(ptr) SafeArrayLock16 22 pascal SafeArrayUnlock(ptr) SafeArrayUnlock16 23 pascal SafeArrayAccessData(ptr ptr) SafeArrayAccessData16 -- 2.15.1

2 1

[PATCH vkd3d 1/7] libs/vkd3d-shader: Fix uninitialized error code in vkd3d_shader_parser_init().
by Józef Kucia 16 Jan '18

16 Jan '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6522dd69258d..bf1a3916888d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -41,9 +41,9 @@ static HRESULT vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, if (!(parser->data = shader_sm4_init(shader_desc->byte_code, shader_desc->byte_code_size, &shader_desc->output_signature))) { - WARN("Failed to initialize shader parser, hr %#x.\n", hr); + WARN("Failed to initialize shader parser.\n"); free_shader_desc(shader_desc); - return hr; + return E_INVALIDARG; } shader_sm4_read_header(parser->data, &parser->ptr, &parser->shader_version); -- 2.13.6

2 13

[PATCH] urlmon/tests: Add some more PARSE_PATH_FROM_URL tests
by Nikolay Sivov 16 Jan '18

16 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/urlmon/tests/uri.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index fd82c0b1f8..a0e3f61606 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -7389,6 +7389,9 @@ static const uri_parse_test uri_parse_tests[] = { {"file:///c:/te%XX t/",0,PARSE_PATH_FROM_URL,0,"c:\\te%XX t\\",S_OK,FALSE}, {"file://server/test",0,PARSE_PATH_FROM_URL,0,"\\\\server\\test",S_OK,FALSE}, {"http://google.com/",0,PARSE_PATH_FROM_URL,0,"",E_INVALIDARG,FALSE}, + {"file:/c:/dir/test.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\dir\\test.mp3",S_OK}, + {"file:/c:/test.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\test.mp3",S_OK}, + {"file://c:\\test.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\test.mp3",S_OK}, /* PARSE_URL_FROM_PATH tests. */ /* This function almost seems to useless (just returns the absolute uri). */ @@ -10566,11 +10569,11 @@ static void test_CoInternetParseIUri(void) { if(SUCCEEDED(hr)) { DWORD len = lstrlenA(test.property); ok(!strcmp_aw(test.property, result) || (test.property2 && !strcmp_aw(test.property2, result)), - "Error: Expected %s but got %s instead on uri_parse_tests[%d].\n", - test.property, wine_dbgstr_w(result), i); + "Error: Expected %s but got %s instead on uri_parse_tests[%d] - %s.\n", + test.property, wine_dbgstr_w(result), i, wine_dbgstr_w(uriW)); ok(len == result_len || (test.property2 && lstrlenA(test.property2) == result_len), - "Error: Expected %d, but got %d instead on uri_parse_tests[%d].\n", - len, result_len, i); + "Error: Expected %d, but got %d instead on uri_parse_tests[%d] - %s.\n", + len, result_len, i, wine_dbgstr_w(uriW)); } else { ok(!result_len, "Error: Expected 'result_len' to be 0, but was %d on uri_parse_tests[%d].\n", -- 2.15.1

2 1

[PATCH] winetest/gather: Remove support for obsolete statuses.
by Francois Gouget 16 Jan '18

16 Jan '18

dissect is now responsible for detecting crashes and reporting them as 'failed crash' in the summary file. So gather no longer needs to assume negative exit codes identify crashes. 'failed -2' should not happen at all. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The obsolete statuses were removed over 6 months ago (see commit ee648b52fea5) so we no longer have any file containing them. This means it should now be safe to remove support for them. winetest/gather | 4 ---- 1 file changed, 4 deletions(-) diff --git a/winetest/gather b/winetest/gather index fbf03975..ac6c3501 100755 --- a/winetest/gather +++ b/winetest/gather @@ -633,8 +633,6 @@ sub get_result_title($$) if ($result->{status} eq "missing") { return "Test did not run for an unknown reason"; } if ($result->{status} eq "mixed") { return "Mixed results"; } if ($result->{status} eq "crash") { return "Test crashed"; } - if ($result->{status} eq "-2") { return "Test failed"; } - if ($result->{status} =~ /^-/) { return "Test crashed"; } if ($result->{status} eq "258") { return "Test timed out"; } return ""; } @@ -701,8 +699,6 @@ sub singletest($$$) { else { $msg = $status eq "crash" ? "crashed" : - $status eq "-2" ? "failed" : - $status =~ /^-/ ? "crashed" : $status eq "258" ? "timeout": "failed"; } $title = join(" | ", $prefix, $title); -- 2.15.1

1 0

[PATCH] testbot: Document Item::OnDelete().
by Francois Gouget 16 Jan '18

16 Jan '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Item.pm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 88c9d1ae..62961308 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -433,6 +433,25 @@ sub Validate($) return (undef, undef); } +=pod +=over 12 + +=item C<OnDelete()> + +Prepares the item for deletion. + +The default implementation deletes any related 'Detailref' object as these +have a foreign key referencing this Item, which would prevent its deletion. +This allows the deletion of Items even if the database does not support +'ON DELETE CASCADE'. To preserve this behavior OnDelete() implementations +should remove any other foreign key that would prevent the deletion of an Item. + +Returns undef if successful, or an error message if the Item should not be +deleted or something prevents its deletion. + +=back +=cut + sub OnDelete($) { my ($self) = @_; -- 2.15.1

1 0

[PATCH vkd3d 1/7] build: Use linker version scripts to control visibility.
by Józef Kucia 15 Jan '18

15 Jan '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- This should help us to not leak libvkd3d-shader symbols from libvkd3d in the next commit. ld-version-script.m4 is imported from gnulib. It's used in a lot of projects. --- Makefile.am | 9 +++++++ configure.ac | 2 ++ libs/vkd3d-shader/vkd3d_shader.map | 14 +++++++++++ libs/vkd3d-utils/vkd3d_utils.map | 13 +++++++++++ libs/vkd3d/vkd3d.map | 18 ++++++++++++++ m4/ld-version-script.m4 | 48 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 104 insertions(+) create mode 100644 libs/vkd3d-shader/vkd3d_shader.map create mode 100644 libs/vkd3d-utils/vkd3d_utils.map create mode 100644 libs/vkd3d/vkd3d.map create mode 100644 m4/ld-version-script.m4 diff --git a/Makefile.am b/Makefile.am index 2876f6486df4..190a7ac8d134 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,9 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ +if HAVE_LD_VERSION_SCRIPT +libvkd3d_shader_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map +endif libvkd3d_la_SOURCES = \ include/d3d12.idl \ @@ -85,11 +88,17 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vulkan_procs.h libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @PTHREAD_LIBS@ @VULKAN_LIBS@ +if HAVE_LD_VERSION_SCRIPT +libvkd3d_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map +endif libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la +if HAVE_LD_VERSION_SCRIPT +libvkd3d_utils_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map +endif EXTRA_DIST = LICENSE diff --git a/configure.ac b/configure.ac index 5614f791fe64..b886058fef51 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,8 @@ AM_SILENT_RULES([yes]) LT_PREREQ([2.4.2]) LT_INIT +gl_LD_VERSION_SCRIPT + dnl Check compiler specific flags AC_SUBST([VKD3D_CFLAGS]) AS_IF([test "x${GCC}" = "xyes"], diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map new file mode 100644 index 000000000000..31ee4a90c970 --- /dev/null +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -0,0 +1,14 @@ +{ +global: + vkd3d_shader_compile_dxbc; + vkd3d_shader_find_signature_element; + vkd3d_shader_free_root_signature; + vkd3d_shader_free_shader_code; + vkd3d_shader_free_shader_signature; + vkd3d_shader_parse_input_signature; + vkd3d_shader_parse_root_signature; + vkd3d_shader_scan_dxbc; + vkd3d_shader_serialize_root_signature; + +local: *; +}; diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map new file mode 100644 index 000000000000..42df666bd6a7 --- /dev/null +++ b/libs/vkd3d-utils/vkd3d_utils.map @@ -0,0 +1,13 @@ +{ +global: + D3D12CreateDevice; + D3D12CreateRootSignatureDeserializer; + D3D12GetDebugInterface; + D3D12SerializeRootSignature; + vkd3d_create_event; + vkd3d_destroy_event; + vkd3d_signal_event; + vkd3d_wait_event; + +local: *; +}; diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map new file mode 100644 index 000000000000..db638f6dd35c --- /dev/null +++ b/libs/vkd3d/vkd3d.map @@ -0,0 +1,18 @@ +{ +global: + vkd3d_create_device; + vkd3d_create_image_resource; + vkd3d_create_instance; + vkd3d_create_root_signature_deserializer; + vkd3d_get_vk_device; + vkd3d_get_vk_format; + vkd3d_get_vk_instance; + vkd3d_get_vk_physical_device; + vkd3d_get_vk_queue; + vkd3d_get_vk_queue_family_index; + vkd3d_instance_decref; + vkd3d_instance_incref; + vkd3d_serialize_root_signature; + +local: *; +}; diff --git a/m4/ld-version-script.m4 b/m4/ld-version-script.m4 new file mode 100644 index 000000000000..4364f9f7a81e --- /dev/null +++ b/m4/ld-version-script.m4 @@ -0,0 +1,48 @@ +# ld-version-script.m4 serial 4 +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Simon Josefsson + +# FIXME: The test below returns a false positive for mingw +# cross-compiles, 'local:' statements does not reduce number of +# exported symbols in a DLL. Use --disable-ld-version-script to work +# around the problem. + +# gl_LD_VERSION_SCRIPT +# -------------------- +# Check if LD supports linker scripts, and define automake conditional +# HAVE_LD_VERSION_SCRIPT if so. +AC_DEFUN([gl_LD_VERSION_SCRIPT], +[ + AC_ARG_ENABLE([ld-version-script], + [AS_HELP_STRING([--enable-ld-version-script], + [enable linker version script (default is enabled when possible)])], + [have_ld_version_script=$enableval], + [AC_CACHE_CHECK([if LD -Wl,--version-script works], + [gl_cv_sys_ld_version_script], + [gl_cv_sys_ld_version_script=no + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map" + echo foo >conftest.map + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], + [], + [cat > conftest.map <<EOF +VERS_1 { + global: sym; +}; + +VERS_2 { + global: sym; +} VERS_1; +EOF + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], + [gl_cv_sys_ld_version_script=yes])]) + rm -f conftest.map + LDFLAGS=$save_LDFLAGS]) + have_ld_version_script=$gl_cv_sys_ld_version_script]) + AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT], + [test "$have_ld_version_script" = yes]) +]) -- 2.13.6

3 17

[PATCH] d3d8/tests: Fix resource leak.
by Andrey Gusev 15 Jan '18

15 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/d3d8/tests/device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a9188f0ee4..e372c25dc8 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8514,6 +8514,7 @@ START_TEST(device) || current_mode.dmPelsHeight != registry_mode.dmPelsHeight) { skip("Current mode does not match registry mode, skipping test.\n"); + FreeLibrary(d3d8_handle); return; } @@ -8527,6 +8528,7 @@ START_TEST(device) if (!(d3d8 = Direct3DCreate8(D3D_SDK_VERSION))) { skip("could not create D3D8\n"); + FreeLibrary(d3d8_handle); return; } IDirect3D8_Release(d3d8); @@ -8602,4 +8604,5 @@ START_TEST(device) test_clip_planes_limits(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); + FreeLibrary(d3d8_handle); } -- 2.13.6

2 1

[PATCH] libs/vkd3d-shader: Validate the DXBC version.
by Henri Verbeet 15 Jan '18

15 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6aa2ffa..331b619 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1814,6 +1814,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, DWORD chunk_count; DWORD total_size; unsigned int i; + DWORD version; DWORD tag; read_dword(&ptr, &tag); @@ -1828,7 +1829,13 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, WARN("Ignoring DXBC checksum.\n"); skip_dword_unknown(&ptr, 4); - skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000001. */ + read_dword(&ptr, &version); + TRACE("version: %#x.\n", version); + if (version != 0x00000001) + { + WARN("Got unexpected DXBC version %#x.\n", version); + return E_INVALIDARG; + } read_dword(&ptr, &total_size); TRACE("total size: %#x\n", total_size); -- 2.1.4

2 1

[website] German translation for release 3.0-rc6
by Julian Rüger 15 Jan '18

15 Jan '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

d3d8:device test timeout
by Alex Henrie 15 Jan '18

15 Jan '18

Hi all, I spent some time today trying to figure out why the d3d8:device tests are timing out (it's the #1 bug on Jeremy's list [1]). The timeout occurs within test_lost_device, which changes the foreground window to the desktop, then changes it back to the controlling window of the D3D device. Usually that's not a problem, but this particular machine is so traumatized by the experience that it locks up when you try to reset or release the device afterwards. The exact hangup occurs in d3d8/tests/device.c:7721.[2] By the way, despite the comments in this function, the test machine does return D3DERR_DEVICELOST. Also, the Windows 8 d3d8:device failures are a completely unrelated crash that happens intermittently on Windows 10 as well. I regret that I was only able to narrow down the problem and could not come up with a good solution. Hopefully another one of you will know how to fix this. -Alex [1] https://www.winehq.org/~jwhite/320152b06de1.html [2] https://source.winehq.org/git/wine.git/blob/320152b06de1d08f6f13b9edeca467f…

2 2

[PATCH] schannel/tests: Avoid dereferencing a null function pointer
by Alex Henrie 15 Jan '18

15 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes a test crash on my Windows 10 machine. We have seen the same crash at least once on the test VMs too. dlls/schannel/tests/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index 4240dd76cb..fb350d5e62 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -213,6 +213,11 @@ static void testGetInfo(void) pTables = getNextSecPkgTable(pTables, Version); if (!pTables) return; + if (!pTables->GetInfo) + { + win_skip("GetInfo function missing\n"); + return; + } status = pTables->GetInfo(&PackageInfo); ok(status == STATUS_SUCCESS || status == SEC_E_UNSUPPORTED_FUNCTION, /* win2k3 */ -- 2.15.1

2 3

[PATCH] usp10: Re-use script caches for the same DC.
by Thomas Faber 15 Jan '18

15 Jan '18

This significantly (50% in my tests) speeds up loading large files in notepad. Tests show that native seems to do something similar.

2 3

[PATCH] compobj.dll16: Add StringFromIID.
by Gijs Vermeulen 14 Jan '18

14 Jan '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- StringFromIID is also forwarded to StringFromCLSID in ole32. Helps for bug 9805. dlls/compobj.dll16/compobj.c | 1 + dlls/compobj.dll16/compobj.dll16.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index af69bf8bc4..4eddacece3 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -434,6 +434,7 @@ _xmalloc16(DWORD size, SEGPTR *ptr) { /****************************************************************************** * StringFromCLSID [COMPOBJ.19] + * StringFromIID [COMPOBJ.14] * Converts a GUID into the respective string representation. * The target string is allocated using the OLE IMalloc. * diff --git a/dlls/compobj.dll16/compobj.dll16.spec b/dlls/compobj.dll16/compobj.dll16.spec index 71dba80fdf..2ef011fcb0 100644 --- a/dlls/compobj.dll16/compobj.dll16.spec +++ b/dlls/compobj.dll16/compobj.dll16.spec @@ -11,7 +11,7 @@ 11 stub COFREELIBRARY 12 stub COFREEALLLIBRARIES 13 pascal CoCreateInstance(ptr ptr long ptr ptr) CoCreateInstance16 -14 stub STRINGFROMIID +14 pascal StringFromIID(ptr ptr) StringFromCLSID16 15 pascal CoDisconnectObject(ptr long) CoDisconnectObject16 16 stub CORELEASEMARSHALDATA 17 pascal -ret16 CoFreeUnusedLibraries() CoFreeUnusedLibraries16 -- 2.15.1

1 0

Re: [PATCH 2/2] [shdocvw] Add stub DoOrganizeFavDlg
by Nikolay Sivov 14 Jan '18

14 Jan '18

On 1/13/2018 8:31 PM, Vijay Kiran Kamuju wrote: > For bug #44270 > > Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> > --- > dlls/shdocvw/shdocvw.spec | 4 ++-- > dlls/shdocvw/shdocvw_main.c | 27 +++++++++++++++++++++++++++ > 2 files changed, 29 insertions(+), 2 deletions(-) > > diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec > index 0d581b26d2fa..485d1608dbab 100644 > --- a/dlls/shdocvw/shdocvw.spec > +++ b/dlls/shdocvw/shdocvw.spec > @@ -113,8 +113,8 @@ > @ stub DoAddToFavDlgW > @ stdcall DoFileDownload(wstr) > @ stub DoFileDownloadEx > -@ stub DoOrganizeFavDlg > -@ stub DoOrganizeFavDlgW > +@ stdcall DoOrganizeFavDlg(long str) > +@ stdcall DoOrganizeFavDlgW(long wstr) > @ stub DoPrivacyDlg > @ stub HlinkFrameNavigate > @ stub HlinkFrameNavigateNHL > diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c > index 5d89f77e919f..151aac039f1d 100644 > --- a/dlls/shdocvw/shdocvw_main.c > +++ b/dlls/shdocvw/shdocvw_main.c > @@ -560,3 +560,30 @@ BOOL WINAPI DoFileDownload(LPWSTR filename) > FIXME("(%s) stub\n", debugstr_w(filename)); > return FALSE; > } > + > +/****************************************************************** > + * DoOrganizeFavDlgW (SHDOCVW.@) > + */ > +BOOL WINAPI DoOrganizeFavDlgW(HWND handle, LPCWSTR path) > +{ > + FIXME("(%p %s) stub\n", handle, debugstr_w(path)); > + return FALSE; > +} > + > +/****************************************************************** > + * DoOrganizeFavDlg (SHDOCVW.@) > + */ > +BOOL WINAPI DoOrganizeFavDlg(HWND handle, LPCSTR path) Did you check that it takes A-string? Please add a TRACE() too, and use better names for arguments. > +{ > + LPWSTR pathW = NULL; > + DWORD res; 'res' should be BOOL. > + > + if (pathW) { > + DWORD len = MultiByteToWideChar(CP_ACP, 0, path, -1, NULL, 0); > + pathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); > + MultiByteToWideChar(CP_ACP, 0, path, -1, pathW, len); > + } For consistency please use heap_alloc(). Also this block is never executed. > + res = DoOrganizeFavDlgW(handle, pathW); > + heap_free(pathW); > + return res; > +} > P.S. I see you're sending patches to wine-patches still, please use wine-devel instead, wine-patches is not actively used anymore.

2 3

[PATCH 2/2] [shdocvw] Add stub DoOrganizeFavDlg (try 2)
by Vijay Kiran Kamuju 14 Jan '18

14 Jan '18

For bug #44270 Changes from try1: rename variables and use heap_alloc Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/shdocvw/shdocvw.spec | 4 ++-- dlls/shdocvw/shdocvw_main.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 0d581b26d2fa..485d1608dbab 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -113,8 +113,8 @@ @ stub DoAddToFavDlgW @ stdcall DoFileDownload(wstr) @ stub DoFileDownloadEx -@ stub DoOrganizeFavDlg -@ stub DoOrganizeFavDlgW +@ stdcall DoOrganizeFavDlg(long str) +@ stdcall DoOrganizeFavDlgW(long wstr) @ stub DoPrivacyDlg @ stub HlinkFrameNavigate @ stub HlinkFrameNavigateNHL diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 5d89f77e919f..52c622c6099f 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -560,3 +560,32 @@ BOOL WINAPI DoFileDownload(LPWSTR filename) FIXME("(%s) stub\n", debugstr_w(filename)); return FALSE; } + +/****************************************************************** + * DoOrganizeFavDlgW (SHDOCVW.@) + */ +BOOL WINAPI DoOrganizeFavDlgW(HWND hwnd, LPCWSTR initDir) +{ + FIXME("(%p %s) stub\n", hwnd, debugstr_w(initDir)); + return FALSE; +} + +/****************************************************************** + * DoOrganizeFavDlg (SHDOCVW.@) + */ +BOOL WINAPI DoOrganizeFavDlg(HWND hwnd, LPCSTR initDir) +{ + LPWSTR initDirW = NULL; + BOOL res; + + TRACE("(%p %s)\n", hwnd, debugstr_a(initDir)); + + if (initDir) { + DWORD len = MultiByteToWideChar(CP_ACP, 0, initDir, -1, NULL, 0); + initDirW = heap_alloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, initDir, -1, initDirW, len); + } + res = DoOrganizeFavDlgW(hwnd, initDirW); + heap_free(initDirW); + return res; +} -- 2.15.1

1 0

[PATCH 2/2] [shdocvw] Add stub DoOrganizeFavDlg (try 2)
by Vijay Kiran Kamuju 14 Jan '18

14 Jan '18

For bug #44270 Changes from try1: rename variables and use heap_alloc Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/shdocvw/shdocvw.spec | 4 ++-- dlls/shdocvw/shdocvw_main.c | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 0d581b26d2fa..485d1608dbab 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -113,8 +113,8 @@ @ stub DoAddToFavDlgW @ stdcall DoFileDownload(wstr) @ stub DoFileDownloadEx -@ stub DoOrganizeFavDlg -@ stub DoOrganizeFavDlgW +@ stdcall DoOrganizeFavDlg(long str) +@ stdcall DoOrganizeFavDlgW(long wstr) @ stub DoPrivacyDlg @ stub HlinkFrameNavigate @ stub HlinkFrameNavigateNHL diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 5d89f77e919f..151aac039f1d 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -560,3 +560,30 @@ BOOL WINAPI DoFileDownload(LPWSTR filename) FIXME("(%s) stub\n", debugstr_w(filename)); return FALSE; } + +/****************************************************************** + * DoOrganizeFavDlgW (SHDOCVW.@) + */ +BOOL WINAPI DoOrganizeFavDlgW(HWND handle, LPCWSTR path) +{ + FIXME("(%p %s) stub\n", handle, debugstr_w(path)); + return FALSE; +} + +/****************************************************************** + * DoOrganizeFavDlg (SHDOCVW.@) + */ +BOOL WINAPI DoOrganizeFavDlg(HWND handle, LPCSTR path) +{ + LPWSTR pathW = NULL; + DWORD res; + + if (pathW) { + DWORD len = MultiByteToWideChar(CP_ACP, 0, path, -1, NULL, 0); + pathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, path, -1, pathW, len); + } + res = DoOrganizeFavDlgW(handle, pathW); + heap_free(pathW); + return res; +} -- 2.15.1

1 0

[PATCH] msvcrt: Introduce vsprintf & vswprintf helper functions.
by Gijs Vermeulen 14 Jan '18

14 Jan '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/msvcrt/wcs.c | 436 +++++++++++++++++++++++------------------------------- 1 file changed, 189 insertions(+), 247 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 098e0d5ba8..a6c586eb97 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -720,22 +720,6 @@ printf_arg arg_clbk_positional(void *ctx, int pos, int type, __ms_va_list *valis return args[pos]; } -/********************************************************************* - * _vsnprintf (MSVCRT.@) - */ -int CDECL MSVCRT_vsnprintf( char *str, MSVCRT_size_t len, - const char *format, __ms_va_list valist ) -{ - static const char nullbyte = '\0'; - struct _str_ctx_a ctx = {len, str}; - int ret; - - ret = pf_printf_a(puts_clbk_str_a, &ctx, format, NULL, 0, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_a(&ctx, 1, &nullbyte); - return ret; -} - #if _MSVCR_VER>=140 static int puts_clbk_str_c99_a(void *ctx, int len, const char *str) @@ -758,94 +742,69 @@ static int puts_clbk_str_c99_a(void *ctx, int len, const char *str) return len; } -/********************************************************************* - * __stdio_common_vsprintf (UCRTBASE.@) - */ -int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MSVCRT_size_t len, const char *format, - MSVCRT__locale_t locale, __ms_va_list valist ) +static int puts_clbk_str_c99_w(void *ctx, int len, const MSVCRT_wchar_t *str) { - static const char nullbyte = '\0'; - struct _str_ctx_a ctx = {len, str}; - int ret; + struct _str_ctx_w *out = ctx; - if (options & ~UCRTBASE_PRINTF_MASK) - FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - ret = pf_printf_a(puts_clbk_str_c99_a, - &ctx, format, locale, options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist); - puts_clbk_str_a(&ctx, 1, &nullbyte); + if(!out->buf) + return len; - if(!str) - return ret; - if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) - return ret>len ? -1 : ret; - if(ret>=len) { - if(len) str[len-1] = 0; - return (options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) ? ret : -2; + if(out->len < len) { + memcpy(out->buf, str, out->len*sizeof(MSVCRT_wchar_t)); + out->buf += out->len; + out->len = 0; + return len; } - return ret; -} - -#endif /* _MSVCR_VER>=140 */ - -/********************************************************************* - * _vsnprintf_l (MSVCRT.@) - */ -int CDECL MSVCRT_vsnprintf_l( char *str, MSVCRT_size_t len, const char *format, - MSVCRT__locale_t locale, __ms_va_list valist ) -{ - static const char nullbyte = '\0'; - struct _str_ctx_a ctx = {len, str}; - int ret; - ret = pf_printf_a(puts_clbk_str_a, &ctx, format, locale, 0, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_a(&ctx, 1, &nullbyte); - return ret; -} - -/********************************************************************* - * _vsprintf_l (MSVCRT.@) - */ -int CDECL MSVCRT_vsprintf_l( char *str, const char *format, - MSVCRT__locale_t locale, __ms_va_list valist ) -{ - return MSVCRT_vsnprintf_l(str, INT_MAX, format, locale, valist); + memcpy(out->buf, str, len*sizeof(MSVCRT_wchar_t)); + out->buf += len; + out->len -= len; + return len; } -/********************************************************************* - * _sprintf_l (MSVCRT.@) - */ -int WINAPIV MSVCRT_sprintf_l(char *str, const char *format, - MSVCRT__locale_t locale, ...) -{ - int retval; - __ms_va_list valist; - __ms_va_start(valist, locale); - retval = MSVCRT_vsnprintf_l(str, INT_MAX, format, locale, valist); - __ms_va_end(valist); - return retval; -} +#endif /* _MSVCR_VER>=140 */ -static int CDECL MSVCRT_vsnprintf_s_l_opt( char *str, MSVCRT_size_t sizeOfBuffer, - MSVCRT_size_t count, const char *format, DWORD options, - MSVCRT__locale_t locale, __ms_va_list valist ) +static int vsprintf_helper(DWORD options, char *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, + const char *format, MSVCRT__locale_t locale, __ms_va_list valist) { static const char nullbyte = '\0'; - struct _str_ctx_a ctx; + printf_arg args_ctx[MSVCRT__ARGMAX+1]; + struct _str_ctx_a puts_ctx; int len, ret; + BOOL postional, secure, c99, initially_positional; - if(sizeOfBuffer<count+1 || count==-1) - len = sizeOfBuffer; - else - len = count+1; + len = sizeOfBuffer; + postional = options & MSVCRT_PRINTF_POSITIONAL_PARAMS; + initially_positional = postional; + secure = options & MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER; + c99 = (options & UCRTBASE_PRINTF_MASK) && !secure; + + if(secure && !postional) + if(sizeOfBuffer>count+1 && count!=-1) len = count+1; + + puts_ctx.len = len; + puts_ctx.buf = str; + + if(postional) { + memset(args_ctx, 0, sizeof(args_ctx)); + + ret = create_positional_ctx_a(args_ctx, format, valist); + if(ret < 0) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return ret; + } else if(!ret) + postional = FALSE; + } - ctx.len = len; - ctx.buf = str; - ret = pf_printf_a(puts_clbk_str_a, &ctx, format, locale, MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_a(&ctx, 1, &nullbyte); + ret = pf_printf_a(c99 ? puts_clbk_str_c99_a : puts_clbk_str_a, + &puts_ctx, format, locale, options, + postional ? arg_clbk_positional : arg_clbk_valist, + postional ? args_ctx : NULL, + postional ? NULL : &valist); + puts_clbk_str_a(&puts_ctx, 1, &nullbyte); - if(ret<0 || ret==len) { + if((secure && !initially_positional) && (ret<0 || ret==len)) { if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { MSVCRT_INVALID_PMT("str[sizeOfBuffer] is too small", MSVCRT_ERANGE); memset(str, 0, sizeOfBuffer); @@ -855,28 +814,61 @@ static int CDECL MSVCRT_vsnprintf_s_l_opt( char *str, MSVCRT_size_t sizeOfBuffer return -1; } + if(c99){ + if(!str) + return ret; + if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) + return ret>len ? -1 : ret; + if(ret>=len) { + if(len) str[len-1] = 0; + return (options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) ? ret : -2; + } + } + return ret; } -static int MSVCRT_vsnwprintf_s_l_opt( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, - MSVCRT_size_t count, const MSVCRT_wchar_t *format, DWORD options, - MSVCRT__locale_t locale, __ms_va_list valist) +static int vswprintf_helper(DWORD options, MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist) { - static const MSVCRT_wchar_t nullbyte = '\0'; - struct _str_ctx_w ctx; + static const char nullbyte = '\0'; + printf_arg args_ctx[MSVCRT__ARGMAX+1]; + struct _str_ctx_w puts_ctx; int len, ret; + BOOL postional, secure, c99, initially_positional; len = sizeOfBuffer; - if(count!=-1 && len>count+1) - len = count+1; + postional = options & MSVCRT_PRINTF_POSITIONAL_PARAMS; + initially_positional = postional; + secure = options & MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER; + c99 = (options & UCRTBASE_PRINTF_MASK) && !secure; + + if(secure && !postional) + if(sizeOfBuffer>count+1 && count!=-1) len = count+1; + + puts_ctx.len = len; + puts_ctx.buf = str; + + if(postional) { + memset(args_ctx, 0, sizeof(args_ctx)); + + ret = create_positional_ctx_w(args_ctx, format, valist); + if(ret < 0) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return ret; + } else if(!ret) + postional = FALSE; + } - ctx.len = len; - ctx.buf = str; - ret = pf_printf_w(puts_clbk_str_w, &ctx, format, locale, MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_w(&ctx, 1, &nullbyte); + ret = pf_printf_w(c99 ? puts_clbk_str_c99_w : puts_clbk_str_w, + &puts_ctx, format, locale, options, + postional ? arg_clbk_positional : arg_clbk_valist, + postional ? args_ctx : NULL, + postional ? NULL : &valist); + puts_clbk_str_w(&puts_ctx, 1, &nullbyte); - if(ret<0 || ret==len) { + if((secure && !initially_positional) && (ret<0 || ret==len)) { if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { MSVCRT_INVALID_PMT("str[sizeOfBuffer] is too small", MSVCRT_ERANGE); memset(str, 0, sizeOfBuffer*sizeof(MSVCRT_wchar_t)); @@ -886,9 +878,76 @@ static int MSVCRT_vsnwprintf_s_l_opt( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfB return -1; } + if(c99){ + if(!str) + return ret; + if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) + return ret>len ? -1 : ret; + if(ret>=len) { + if(len) str[len-1] = 0; + return (options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) ? ret : -2; + } + } + return ret; } +/********************************************************************* + * _vsnprintf (MSVCRT.@) + */ +int CDECL MSVCRT_vsnprintf( char *str, MSVCRT_size_t len, + const char *format, __ms_va_list valist ) +{ + return vsprintf_helper(0, str, len, 0, format, NULL, valist); +} + +#if _MSVCR_VER>=140 + +/********************************************************************* + * __stdio_common_vsprintf (UCRTBASE.@) + */ +int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MSVCRT_size_t len, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist ) +{ + if (options & ~UCRTBASE_PRINTF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + return vsprintf_helper(options & UCRTBASE_PRINTF_MASK, str, len, 0, format, locale, valist); +} + +#endif /* _MSVCR_VER>=140 */ + +/********************************************************************* + * _vsnprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT_vsnprintf_l( char *str, MSVCRT_size_t len, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist ) +{ + return vsprintf_helper(0, str, len, format, locale, valist); +} + +/********************************************************************* + * _vsprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT_vsprintf_l( char *str, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist ) +{ + return MSVCRT_vsnprintf_l(str, INT_MAX, format, locale, valist); +} + +/********************************************************************* + * _sprintf_l (MSVCRT.@) + */ +int WINAPIV MSVCRT_sprintf_l(char *str, const char *format, + MSVCRT__locale_t locale, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, locale); + retval = MSVCRT_vsnprintf_l(str, INT_MAX, format, locale, valist); + __ms_va_end(valist); + return retval; +} + /********************************************************************* * _vsnprintf_s_l (MSVCRT.@) */ @@ -896,7 +955,8 @@ int CDECL MSVCRT_vsnprintf_s_l( char *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, const char *format, MSVCRT__locale_t locale, __ms_va_list valist ) { - return MSVCRT_vsnprintf_s_l_opt(str, sizeOfBuffer, count, format, 0, locale, valist); + return vsprintf_helper(MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, str, sizeOfBuffer, count, format, + locale, valist); } /********************************************************************* @@ -942,7 +1002,8 @@ int CDECL MSVCRT__stdio_common_vsnprintf_s( unsigned __int64 options, { if (options & ~UCRTBASE_PRINTF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - return MSVCRT_vsnprintf_s_l_opt(str, sizeOfBuffer, count, format, options & UCRTBASE_PRINTF_MASK, locale, valist); + return vsprintf_helper((options & UCRTBASE_PRINTF_MASK) | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, str, + sizeOfBuffer, count, format, locale, valist); } /********************************************************************* @@ -954,7 +1015,8 @@ int CDECL MSVCRT__stdio_common_vsnwprintf_s( unsigned __int64 options, { if (options & ~UCRTBASE_PRINTF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - return MSVCRT_vsnwprintf_s_l_opt(str, sizeOfBuffer, count, format, options & UCRTBASE_PRINTF_MASK, locale, valist); + return vswprintf_helper((options & UCRTBASE_PRINTF_MASK) | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, str, + sizeOfBuffer, count, format, locale, valist); } /********************************************************************* @@ -974,9 +1036,7 @@ int CDECL MSVCRT__stdio_common_vsprintf_s( unsigned __int64 options, char *str, MSVCRT_size_t count, const char *format, MSVCRT__locale_t locale, __ms_va_list valist ) { - if (options & ~UCRTBASE_PRINTF_MASK) - FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - return MSVCRT_vsnprintf_s_l_opt(str, INT_MAX, count, format, options & UCRTBASE_PRINTF_MASK, locale, valist); + return MSVCRT__stdio_common_vsnprintf_s(options, str, INT_MAX, count, format, locale, valist); } #endif /* _MSVCR_VER>=140 */ @@ -1011,28 +1071,8 @@ int CDECL MSVCRT__vscprintf( const char *format, __ms_va_list valist ) int CDECL MSVCRT__vscprintf_p_l(const char *format, MSVCRT__locale_t locale, __ms_va_list args) { - printf_arg args_ctx[MSVCRT__ARGMAX+1]; - struct _str_ctx_a puts_ctx = {INT_MAX, NULL}; - int ret; - - memset(args_ctx, 0, sizeof(args_ctx)); - - ret = create_positional_ctx_a(args_ctx, format, args); - if(ret < 0) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); - *MSVCRT__errno() = MSVCRT_EINVAL; - return ret; - } else if(ret == 0) { - ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, - MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, - arg_clbk_valist, NULL, &args); - } else { - ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, - MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, - arg_clbk_positional, args_ctx, NULL); - } - - return ret; + return vsprintf_helper(MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, + NULL, INT_MAX, 0, format, locale, args); } /********************************************************************* @@ -1103,14 +1143,7 @@ int WINAPIV MSVCRT__scprintf(const char *format, ...) int CDECL MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, __ms_va_list valist) { - static const MSVCRT_wchar_t nullbyte = '\0'; - struct _str_ctx_w ctx = {len, str}; - int ret; - - ret = pf_printf_w(puts_clbk_str_w, &ctx, format, NULL, 0, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_w(&ctx, 1, &nullbyte); - return ret; + return vswprintf_helper(0, str, len, 0, format, NULL, valist); } /********************************************************************* @@ -1120,41 +1153,7 @@ int CDECL MSVCRT_vsnwprintf_l(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist) { - static const MSVCRT_wchar_t nullbyte = '\0'; - struct _str_ctx_w ctx = {len, str}; - int ret; - - ret = pf_printf_w(puts_clbk_str_w, &ctx, format, locale, 0, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_w(&ctx, 1, &nullbyte); - return ret; -} - -static int MSVCRT_vswprintf_p_l_opt(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, - const MSVCRT_wchar_t *format, DWORD options, MSVCRT__locale_t locale, __ms_va_list args) -{ - static const MSVCRT_wchar_t nullbyte = '\0'; - printf_arg args_ctx[MSVCRT__ARGMAX+1]; - struct _str_ctx_w puts_ctx = {length, buffer}; - int ret; - - memset(args_ctx, 0, sizeof(args_ctx)); - - ret = create_positional_ctx_w(args_ctx, format, args); - if(ret < 0) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); - *MSVCRT__errno() = MSVCRT_EINVAL; - return ret; - } else if(ret == 0) - ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, - arg_clbk_valist, NULL, &args); - else - ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, - MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, - arg_clbk_positional, args_ctx, NULL); - - puts_clbk_str_w(&puts_ctx, 1, &nullbyte); - return ret; + return vswprintf_helper(0, str, len, 0, format, locale, valist); } /********************************************************************* @@ -1163,7 +1162,8 @@ static int MSVCRT_vswprintf_p_l_opt(MSVCRT_wchar_t *buffer, MSVCRT_size_t length int CDECL MSVCRT_vswprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list args) { - return MSVCRT_vswprintf_p_l_opt(buffer, length, format, 0, locale, args); + return vswprintf_helper(MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, + buffer, length, 0, format, locale, args); } #if _MSVCR_VER>=80 @@ -1173,7 +1173,7 @@ int CDECL MSVCRT_vswprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, int CDECL MSVCRT__vswprintf_p(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, const MSVCRT_wchar_t *format, __ms_va_list args) { - return MSVCRT_vswprintf_p_l_opt(buffer, length, format, 0, NULL, args); + return MSVCRT_vswprintf_p_l(buffer, length, format, NULL, args); } #endif @@ -1187,7 +1187,8 @@ int CDECL MSVCRT__stdio_common_vswprintf_p( unsigned __int64 options, { if (options & ~UCRTBASE_PRINTF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - return MSVCRT_vswprintf_p_l_opt(str, count, format, options & UCRTBASE_PRINTF_MASK, locale, valist); + return vswprintf_helper((options & UCRTBASE_PRINTF_MASK) | (MSVCRT_PRINTF_POSITIONAL_PARAMS | + MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER), str, count, 0, format, locale, valist); } #endif @@ -1198,7 +1199,8 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer MSVCRT_size_t count, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist) { - return MSVCRT_vsnwprintf_s_l_opt(str, sizeOfBuffer, count, format, 0, locale, valist); + return vswprintf_helper(MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, str, sizeOfBuffer, count, format, + locale, valist); } /********************************************************************* @@ -1268,26 +1270,6 @@ int WINAPIV MSVCRT__snwprintf_s_l( MSVCRT_wchar_t *str, unsigned int len, unsign #if _MSVCR_VER>=140 -static int puts_clbk_str_c99_w(void *ctx, int len, const MSVCRT_wchar_t *str) -{ - struct _str_ctx_w *out = ctx; - - if(!out->buf) - return len; - - if(out->len < len) { - memcpy(out->buf, str, out->len*sizeof(MSVCRT_wchar_t)); - out->buf += out->len; - out->len = 0; - return len; - } - - memcpy(out->buf, str, len*sizeof(MSVCRT_wchar_t)); - out->buf += len; - out->len -= len; - return len; -} - /********************************************************************* * __stdio_common_vswprintf (UCRTBASE.@) */ @@ -1295,25 +1277,9 @@ int CDECL MSVCRT__stdio_common_vswprintf( unsigned __int64 options, MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist ) { - static const MSVCRT_wchar_t nullbyte = '\0'; - struct _str_ctx_w ctx = {len, str}; - int ret; - if (options & ~UCRTBASE_PRINTF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - ret = pf_printf_w(puts_clbk_str_c99_w, - &ctx, format, locale, options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist); - puts_clbk_str_w(&ctx, 1, &nullbyte); - - if(!str) - return ret; - if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) - return ret>len ? -1 : ret; - if(ret>=len) { - if(len) str[len-1] = 0; - return (options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) ? ret : -2; - } - return ret; + return vswprintf_helper(options & UCRTBASE_PRINTF_MASK, str, len, 0, format, locale, valist); } #endif /* _MSVCR_VER>=140 */ @@ -1444,7 +1410,8 @@ int CDECL MSVCRT__vscwprintf_l( const MSVCRT_wchar_t *format, MSVCRT__locale_t l */ int CDECL MSVCRT__vscwprintf_p_l( const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list args ) { - return MSVCRT_vswprintf_p_l_opt( NULL, INT_MAX, format, 0, locale, args ); + return vswprintf_helper(MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, NULL, INT_MAX, + 0, format, locale, args); } #if _MSVCR_VER>=80 @@ -1453,7 +1420,7 @@ int CDECL MSVCRT__vscwprintf_p_l( const MSVCRT_wchar_t *format, MSVCRT__locale_t */ int CDECL MSVCRT__vscwprintf_p(const MSVCRT_wchar_t *format, __ms_va_list args) { - return MSVCRT_vswprintf_p_l_opt(NULL, INT_MAX, format, 0, NULL, args); + return MSVCRT__vscwprintf_p_l(NULL, INT_MAX, format, 0, NULL, args); } #endif @@ -1476,40 +1443,14 @@ int CDECL MSVCRT_vswprintf_s_l(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElemen format, locale, args ); } -static int MSVCRT_vsprintf_p_l_opt(char *buffer, MSVCRT_size_t length, const char *format, - DWORD options, MSVCRT__locale_t locale, __ms_va_list args) -{ - static const char nullbyte = '\0'; - printf_arg args_ctx[MSVCRT__ARGMAX+1]; - struct _str_ctx_a puts_ctx = {length, buffer}; - int ret; - - memset(args_ctx, 0, sizeof(args_ctx)); - - ret = create_positional_ctx_a(args_ctx, format, args); - if(ret < 0) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); - *MSVCRT__errno() = MSVCRT_EINVAL; - return ret; - } else if(ret == 0) - ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, - MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, arg_clbk_valist, NULL, &args); - else - ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, - MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, - arg_clbk_positional, args_ctx, NULL); - - puts_clbk_str_a(&puts_ctx, 1, &nullbyte); - return ret; -} - /********************************************************************* * _vsprintf_p_l (MSVCRT.@) */ int CDECL MSVCRT_vsprintf_p_l(char *buffer, MSVCRT_size_t length, const char *format, MSVCRT__locale_t locale, __ms_va_list args) { - return MSVCRT_vsprintf_p_l_opt(buffer, length, format, 0, locale, args); + return vsprintf_helper(MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, buffer, length, + 0, format, locale, args); } /********************************************************************* @@ -1530,7 +1471,8 @@ int CDECL MSVCRT__stdio_common_vsprintf_p(unsigned __int64 options, char *buffer { if (options & ~UCRTBASE_PRINTF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - return MSVCRT_vsprintf_p_l_opt(buffer, length, format, options & UCRTBASE_PRINTF_MASK, locale, args); + return vsprintf_helper((options & UCRTBASE_PRINTF_MASK) | (MSVCRT_PRINTF_POSITIONAL_PARAMS | + MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER), buffer, length, 0, format, locale, args); } #endif @@ -1591,7 +1533,7 @@ int WINAPIV MSVCRT_swprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, int r; __ms_va_start(valist, locale); - r = MSVCRT_vswprintf_p_l_opt(buffer, length, format, 0, locale, valist); + r = MSVCRT_vswprintf_p_l(buffer, length, format, locale, valist); __ms_va_end(valist); return r; -- 2.15.1

1 1

Introducing Hybrid Synchronization Objects
by Daniel Santos 13 Jan '18

13 Jan '18

Hello, After putting this project down for a little while I've finally picked it back up and have it working and passing its tests. This is still a proof-of-concept and needs a lot more cleanup before it's ready for staging or any serious review. I would be most interested to discover additional programs whos performance improves with this patch set (the Star Wars Battlefronts I and II by Pandemic were the original impetus of this). You must start your program with STAGING_SHARED_MEMORY=1 STAGING_SHM_SYNC=1 to enable it and I have hosted the patches on my github to anyone interested in trying it out: git clone https://github.com/daniel-santos/wine git checkout hybrid-sync Although somewhat complex, this implements a fast synchronization framework that: * Can support semaphores, mutexes and events (only semaphores implemented right now) * Is scaleable, * Can share objects with other processes, * Can perform most operations without a server call, and * Provides reasonably strong shared memory integrity guarantees with well-defined behaviour when shared memory is corrupted or altered incorrectly. I have called them "Hybrid" objects because they have a private and shared memory portion. When another process opens one, the shared memory portion is migrated to a new memory region shared only by the processes that have access to the object. This migration works even when multiple threads and processes are performing operations on the object. Scaleability is achieved through the use of memfd-backed shared memory slab caches on the server, from which all shared memory is allocated. Since it uses memfd and futexes it's only supported on Linux. Initial support is for x86 systems, but ARM, PPC, can be added without too much effort. I have not yet closely examined a BSD implementation. How It Works Every struct process in the server can have one or more struct process_group objects associated with it. These represent unique sets of processes that are sharing objects. When a client requests a new synchronization object, the server looks for a process_group that only contains the calling process and creates one if none exists -- this also creates a new slab cache, which allocates a block of shared memory. When another process later requests to open the object, the server finds or creates a process_group with exactly the two processes in it and then migrates the shared portion of the object to the new shared memory slab. The migration is transparent to the client -- if a process is waiting (natively) on the object it awakens its threads when the migration is done so that one of them can request the new shared memory data, map it into memory and continue its operation. Similarly, when a process closes such an object, it is again migrated back to a process_group that only contains the remaining processes who have access to it (or destroys it). Sometimes traditional server-side synchronization objects are needed (e.g., for a critical section) and these are created by adding a new SYNC_OBJECT_ACCESS_SERVER_ONLY access flag to the request. The shared portion of the object is 64-bits: * 32-bits of data, * 4-bits of flags, and * a 28-bit FNV1a hash The 28 bits of hash are verified with every operation to detect if the shared memory portion of the object has been incorrectly modified. Although not infallible, the chances are somewhere around one in a million that an incorrect modification would not be detected. Other Solutions I should note that the addition of SGX extensions, although intended for cryptography and sensitive data, might provide a superior solution to optimizing synchronization objects as well as many other operations that require a server call. An SGX enclave provides a mechanism to share memory in userspace while restricting, at the CPU level, what code is allowed to read or alter that memory. This could be exploited to write a sort-of Wine Demi-Kernel that lives in the process space of each client process, reading and manipulating memory shared from wineserver with exceptional integrity guarantees. Thanks, Daniel

1 0

Release
by Alexandre Julliard 12 Jan '18

12 Jan '18

Folks, I think that at this point, we have fixed most of the bugs that could be fixed during code freeze, so it looks like rc6 is going to be the last rc. Please test it to confirm that there are no last minute issues. Unless something major comes up, I'm planning to release the final 3.0 in a few days (as soon as I'm done writing the release notes...) Thank you all for your work! -- Alexandre Julliard julliard(a)winehq.org

2 1

[PATCH vkd3d 01/12] libs/vkd3d: Validate miplevel count while creating resources.
by Józef Kucia 12 Jan '18

12 Jan '18

From: Józef Kucia <jkucia(a)codeweavers.com> vkd3d_log2i() is imported from wined3d. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 1 + include/private/vkd3d_common.h | 32 ++++++++++++++++++++++++++++++++ libs/vkd3d/resource.c | 40 +++++++++++++++++++++++++++++++++++----- m4/check-builtin-functions.m4 | 10 ++++++++++ tests/d3d12.c | 25 +++++++++++++++++++++++++ 5 files changed, 103 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 27c03a6c9400..d13b440755cd 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,7 @@ AS_IF([test "x$with_spirv_tools" = "xyes"], PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms]) dnl Check for functions +VKD3D_CHECK_BUILTIN_CLZ VKD3D_CHECK_BUILTIN_POPCOUNT VKD3D_CHECK_SYNC_ADD_AND_FETCH_FUNC VKD3D_CHECK_SYNC_SUB_AND_FETCH_FUNC diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index ce8f32e1b1aa..2e3873b82440 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -50,6 +50,38 @@ static inline unsigned int vkd3d_popcount(unsigned int v) #endif } +/* Undefined for x == 0. */ +static inline unsigned int vkd3d_log2i(unsigned int x) +{ +#ifdef HAVE_BUILTIN_CLZ + return __builtin_clz(x) ^ 0x1f; +#else + static const unsigned int l[] = + { + ~0u, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + }; + unsigned int i; + + return (i = x >> 16) ? (x = i >> 8) ? l[x] + 24 + : l[i] + 16 : (i = x >> 8) ? l[i] + 8 : l[x]; +#endif +} + #ifndef _WIN32 # if HAVE_SYNC_ADD_AND_FETCH static inline LONG InterlockedIncrement(LONG volatile *x) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 72848a4457b7..264578bd31a8 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -103,14 +103,16 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, } static HRESULT vkd3d_create_image(struct d3d12_resource *resource, struct d3d12_device *device, - const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - const D3D12_RESOURCE_DESC *desc) + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_format *format; + const D3D12_RESOURCE_DESC *desc; VkImageCreateInfo image_info; VkResult vr; + desc = &resource->desc; + if (!(format = vkd3d_format_from_d3d12_resource_desc(desc, 0))) { WARN("Invalid DXGI format %#x.\n", desc->Format); @@ -606,6 +608,30 @@ struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface) return impl_from_ID3D12Resource(iface); } +static HRESULT validate_buffer_desc(const D3D12_RESOURCE_DESC *desc) +{ + if (desc->MipLevels != 1) + { + WARN("Invalid miplevel count %u for buffer.\n", desc->MipLevels); + return E_INVALIDARG; + } + + return S_OK; +} + +static HRESULT validate_texture_desc(D3D12_RESOURCE_DESC *desc) +{ + if (!desc->MipLevels) + { + unsigned int size = max(desc->Width, desc->Height); + if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + size = max(size, desc->DepthOrArraySize); + desc->MipLevels = vkd3d_log2i(size) + 1; + } + + return S_OK; +} + static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, @@ -658,8 +684,10 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st switch (desc->Dimension) { case D3D12_RESOURCE_DIMENSION_BUFFER: - if (FAILED(hr = vkd3d_create_buffer(device, heap_properties, heap_flags, desc, - &resource->u.vk_buffer))) + if (FAILED(hr = validate_buffer_desc(&resource->desc))) + return hr; + if (FAILED(hr = vkd3d_create_buffer(device, heap_properties, heap_flags, + &resource->desc, &resource->u.vk_buffer))) return hr; if (!(resource->gpu_address = vkd3d_gpu_va_allocator_allocate(&device->gpu_va_allocator, desc->Width, resource))) @@ -679,8 +707,10 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st case D3D12_RESOURCE_DIMENSION_TEXTURE1D: case D3D12_RESOURCE_DIMENSION_TEXTURE2D: case D3D12_RESOURCE_DIMENSION_TEXTURE3D: + if (FAILED(hr = validate_texture_desc(&resource->desc))) + return hr; resource->flags |= VKD3D_RESOURCE_INITIAL_STATE_TRANSITION; - if (FAILED(hr = vkd3d_create_image(resource, device, heap_properties, heap_flags, desc))) + if (FAILED(hr = vkd3d_create_image(resource, device, heap_properties, heap_flags))) return hr; if (FAILED(hr = vkd3d_allocate_image_memory(resource, device, heap_properties, heap_flags))) { diff --git a/m4/check-builtin-functions.m4 b/m4/check-builtin-functions.m4 index c09eb4748a3a..2b24a802a3e3 100644 --- a/m4/check-builtin-functions.m4 +++ b/m4/check-builtin-functions.m4 @@ -18,6 +18,16 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([int main(void) { return __sync_sub_and_fetch((in [Define to 1 if you have __sync_sub_and_fetch.])], [AC_MSG_RESULT([no])])]) +dnl VKD3D_CHECK_BUILTIN_CLZ +AC_DEFUN([VKD3D_CHECK_BUILTIN_CLZ], +[AC_MSG_CHECKING([for __builtin_clz]) +AC_LINK_IFELSE([AC_LANG_SOURCE([int main(void) { return __builtin_clz(0); }])], + [AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_BUILTIN_CLZ], + [1], + [Define to 1 if you have __builtin_clz.])], + [AC_MSG_RESULT([no])])]) + dnl VKD3D_CHECK_BUILTIN_POPCOUNT AC_DEFUN([VKD3D_CHECK_BUILTIN_POPCOUNT], [AC_MSG_CHECKING([for __builtin_popcount]) diff --git a/tests/d3d12.c b/tests/d3d12.c index dfc9257bff61..55116204a209 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2213,6 +2213,24 @@ static void test_create_committed_resource(void) refcount = ID3D12Resource_Release(resource); ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount); + resource_desc.MipLevels = 0; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(SUCCEEDED(hr), "Failed to create committed resource, hr %#x.\n", hr); + resource_desc = ID3D12Resource_GetDesc(resource); + ok(resource_desc.MipLevels == 6, "Got unexpected miplevels %u.\n", resource_desc.MipLevels); + ID3D12Resource_Release(resource); + resource_desc.MipLevels = 10; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(SUCCEEDED(hr), "Failed to create committed resource, hr %#x.\n", hr); + resource_desc = ID3D12Resource_GetDesc(resource); + ok(resource_desc.MipLevels == 10, "Got unexpected miplevels %u.\n", resource_desc.MipLevels); + ID3D12Resource_Release(resource); + resource_desc.MipLevels = 1; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, &clear_value, &IID_ID3D12Resource, (void **)&resource); @@ -2291,6 +2309,13 @@ static void test_create_committed_resource(void) refcount = ID3D12Resource_Release(resource); ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount); + resource_desc.MipLevels = 0; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Failed to create committed resource, hr %#x.\n", hr); + resource_desc.MipLevels = 1; + /* The clear value must be NULL for buffers. */ hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, &clear_value, -- 2.13.6

3 25

[PATCH] comctl32/tests: Add EM_GETLINE test
by Nikolay Sivov 12 Jan '18

12 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/edit.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 9feb9b42bc..77116837df 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -558,6 +558,17 @@ static HWND create_editcontrol (DWORD style, DWORD exstyle) return handle; } +static HWND create_editcontrolW(DWORD style, DWORD exstyle) +{ + static const WCHAR testtextW[] = {'T','e','s','t',' ','t','e','x','t',0}; + HWND handle; + + handle = CreateWindowExW(exstyle, WC_EDITW, testtextW, style, 10, 10, 300, 300, + NULL, NULL, hinst, NULL); + ok(handle != NULL, "Failed to create Edit control.\n"); + return handle; +} + static HWND create_child_editcontrol (DWORD style, DWORD exstyle) { HWND parentWnd; @@ -2922,6 +2933,55 @@ static void test_paste(void) DestroyWindow(hMultilineEdit); } +static void test_EM_GETLINE(void) +{ + HWND hwnd[2]; + int i; + + hwnd[0] = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + hwnd[1] = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + for (i = 0; i < sizeof(hwnd)/sizeof(hwnd[0]); i++) + { + static const WCHAR strW[] = {'t','e','x','t',0}; + static const char *str = "text"; + WCHAR buffW[16]; + char buff[16]; + int r; + + todo_wine_if(i == 0) + ok(IsWindowUnicode(hwnd[i]), "Expected unicode window.\n"); + + SendMessageA(hwnd[i], WM_SETTEXT, 0, (LPARAM)str); + + memset(buff, 0, sizeof(buff)); + *(WORD *)buff = sizeof(buff); + r = SendMessageA(hwnd[i], EM_GETLINE, 0, (LPARAM)buff); + ok(r == strlen(str), "Failed to get a line %d.\n", r); + ok(!strcmp(buff, str), "Unexpected line data %s.\n", buff); + + memset(buff, 0, sizeof(buff)); + *(WORD *)buff = sizeof(buff); + r = SendMessageA(hwnd[i], EM_GETLINE, 1, (LPARAM)buff); + ok(r == strlen(str), "Failed to get a line %d.\n", r); + ok(!strcmp(buff, str), "Unexpected line data %s.\n", buff); + + memset(buffW, 0, sizeof(buffW)); + *(WORD *)buffW = sizeof(buffW)/sizeof(buffW[0]); + r = SendMessageW(hwnd[i], EM_GETLINE, 0, (LPARAM)buffW); + ok(r == lstrlenW(strW), "Failed to get a line %d.\n", r); + ok(!lstrcmpW(buffW, strW), "Unexpected line data %s.\n", wine_dbgstr_w(buffW)); + + memset(buffW, 0, sizeof(buffW)); + *(WORD *)buffW = sizeof(buffW)/sizeof(buffW[0]); + r = SendMessageW(hwnd[i], EM_GETLINE, 1, (LPARAM)buffW); + ok(r == lstrlenW(strW), "Failed to get a line %d.\n", r); + ok(!lstrcmpW(buffW, strW), "Unexpected line data %s.\n", wine_dbgstr_w(buffW)); + + DestroyWindow(hwnd[i]); + } +} + START_TEST(edit) { ULONG_PTR ctx_cookie; @@ -2961,6 +3021,7 @@ START_TEST(edit) test_contextmenu(); test_EM_GETHANDLE(); test_paste(); + test_EM_GETLINE(); UnregisterWindowClasses(); -- 2.15.1

1 0

[PATCH] user32/tests: Add EM_GETLINE test
by Nikolay Sivov 12 Jan '18

12 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/edit.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index e334be1ddd..de8a349e13 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -557,6 +557,18 @@ static HWND create_editcontrol (DWORD style, DWORD exstyle) return handle; } +static HWND create_editcontrolW(DWORD style, DWORD exstyle) +{ + static const WCHAR testtextW[] = {'T','e','s','t',' ','t','e','x','t',0}; + static const WCHAR editW[] = {'E','d','i','t',0}; + HWND handle; + + handle = CreateWindowExW(exstyle, editW, testtextW, style, 10, 10, 300, 300, + NULL, NULL, hinst, NULL); + ok(handle != NULL, "Failed to create Edit control.\n"); + return handle; +} + static HWND create_child_editcontrol (DWORD style, DWORD exstyle) { HWND parentWnd; @@ -2936,6 +2948,57 @@ static void test_paste(void) DestroyWindow(hMultilineEdit); } +static void test_EM_GETLINE(void) +{ + HWND hwnd[2]; + int i; + + hwnd[0] = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + hwnd[1] = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + for (i = 0; i < sizeof(hwnd)/sizeof(hwnd[0]); i++) + { + static const WCHAR strW[] = {'t','e','x','t',0}; + static const char *str = "text"; + WCHAR buffW[16]; + char buff[16]; + int r; + + if (i == 0) + ok(!IsWindowUnicode(hwnd[i]), "Expected ansi window.\n"); + else + ok(IsWindowUnicode(hwnd[i]), "Expected unicode window.\n"); + + SendMessageA(hwnd[i], WM_SETTEXT, 0, (LPARAM)str); + + memset(buff, 0, sizeof(buff)); + *(WORD *)buff = sizeof(buff); + r = SendMessageA(hwnd[i], EM_GETLINE, 0, (LPARAM)buff); + ok(r == strlen(str), "Failed to get a line %d.\n", r); + ok(!strcmp(buff, str), "Unexpected line data %s.\n", buff); + + memset(buff, 0, sizeof(buff)); + *(WORD *)buff = sizeof(buff); + r = SendMessageA(hwnd[i], EM_GETLINE, 1, (LPARAM)buff); + ok(r == strlen(str), "Failed to get a line %d.\n", r); + ok(!strcmp(buff, str), "Unexpected line data %s.\n", buff); + + memset(buffW, 0, sizeof(buffW)); + *(WORD *)buffW = sizeof(buffW)/sizeof(buffW[0]); + r = SendMessageW(hwnd[i], EM_GETLINE, 0, (LPARAM)buffW); + ok(r == lstrlenW(strW), "Failed to get a line %d.\n", r); + ok(!lstrcmpW(buffW, strW), "Unexpected line data %s.\n", wine_dbgstr_w(buffW)); + + memset(buffW, 0, sizeof(buffW)); + *(WORD *)buffW = sizeof(buffW)/sizeof(buffW[0]); + r = SendMessageW(hwnd[i], EM_GETLINE, 1, (LPARAM)buffW); + ok(r == lstrlenW(strW), "Failed to get a line %d.\n", r); + ok(!lstrcmpW(buffW, strW), "Unexpected line data %s.\n", wine_dbgstr_w(buffW)); + + DestroyWindow(hwnd[i]); + } +} + START_TEST(edit) { BOOL b; @@ -2970,6 +3033,7 @@ START_TEST(edit) test_contextmenu(); test_EM_GETHANDLE(); test_paste(); + test_EM_GETLINE(); UnregisterWindowClasses(); } -- 2.15.1

1 0

[PATCH] msxml3/tests: Use temporary user directory for test files
by Nikolay Sivov 12 Jan '18

12 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/tests/domdoc.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1306590894..7c56015235 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10155,16 +10155,20 @@ static void write_to_file(const char *name, const char *data) static void test_load(void) { IXMLDOMDocument *doc, *doc2; + BSTR pathW, bstr1, bstr2; IXMLDOMNodeList *list; IXMLDOMElement *elem; + char path[MAX_PATH]; VARIANT_BOOL b; VARIANT src; HRESULT hr; - BSTR path, bstr1, bstr2; void* ptr; + GetTempPathA(MAX_PATH, path); + strcat(path, "winetest.xml"); + /* prepare a file */ - write_to_file("test.xml", win1252xml); + write_to_file(path, win1252xml); doc = create_document(&IID_IXMLDOMDocument); @@ -10175,11 +10179,11 @@ static void test_load(void) EXPECT_HR(hr, E_INVALIDARG); ok(b == VARIANT_FALSE, "got %d\n", b); - path = _bstr_("test.xml"); + pathW = _bstr_(path); /* load from path: VT_BSTR */ V_VT(&src) = VT_BSTR; - V_BSTR(&src) = path; + V_BSTR(&src) = pathW; hr = IXMLDOMDocument_load(doc, src, &b); EXPECT_HR(hr, S_OK); ok(b == VARIANT_TRUE, "got %d\n", b); @@ -10191,7 +10195,7 @@ static void test_load(void) /* load from a path: VT_BSTR|VT_BYREF */ V_VT(&src) = VT_BSTR | VT_BYREF; - V_BSTRREF(&src) = &path; + V_BSTRREF(&src) = &pathW; hr = IXMLDOMDocument_load(doc, src, &b); EXPECT_HR(hr, S_OK); ok(b == VARIANT_TRUE, "got %d\n", b); @@ -10229,13 +10233,13 @@ static void test_load(void) ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(bstr1); - DeleteFileA("test.xml"); + DeleteFileA(path); /* load from existing path, no xml content */ - write_to_file("test.xml", nocontent); + write_to_file(path, nocontent); V_VT(&src) = VT_BSTR; - V_BSTR(&src) = path; + V_BSTR(&src) = pathW; b = VARIANT_TRUE; hr = IXMLDOMDocument_load(doc, src, &b); ok(hr == S_FALSE, "got 0x%08x\n", hr); @@ -10246,7 +10250,7 @@ static void test_load(void) ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(bstr1 == NULL, "got %p\n", bstr1); - DeleteFileA("test.xml"); + DeleteFileA(path); IXMLDOMDocument_Release(doc); doc = create_document(&IID_IXMLDOMDocument); -- 2.15.1

1 0

[PATCH] user32: Make functions use display dc thread-safe
by 吕果 12 Jan '18

12 Jan '18

Some functions in sysparams.c invoke get_display_dc to get display dc and then use it without lock mechanism. it will cause condition race in multi-thread. PS: I dont't kown how to make a test than can stably run into this problem, but call GetSystemMetrics(SM_CXSCREEN) within a tight loop in different thread will get zero finally.

4 3

[PATCH v2 1/2] shell32/tests: Drop shell folder test dynamic imports for Windows <= 2000
by Alex Henrie 12 Jan '18

12 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/tests/shlfolder.c | 672 +++++++++++++++-------------------------- 1 file changed, 238 insertions(+), 434 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 1ee02743f5..c8cbfda05f 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -45,17 +45,6 @@ DEFINE_GUID(CLSID_ShellDocObjView, 0xe7e4bc40, 0xe76a, 0x11ce, 0xa9,0xbb, 0x00,0 static IMalloc *ppM; -static HRESULT (WINAPI *pSHBindToParent)(LPCITEMIDLIST, REFIID, LPVOID*, LPCITEMIDLIST*); -static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); -static HRESULT (WINAPI *pSHGetFolderPathAndSubDirA)(HWND, int, HANDLE, DWORD, LPCSTR, LPSTR); -static BOOL (WINAPI *pSHGetPathFromIDListW)(LPCITEMIDLIST,LPWSTR); -static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); -static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL); -static BOOL (WINAPI *pSHGetSpecialFolderPathW)(HWND, LPWSTR, int, BOOL); -static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); -static LPITEMIDLIST (WINAPI *pILFindLastID)(LPCITEMIDLIST); -static void (WINAPI *pILFree)(LPITEMIDLIST); -static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); static HRESULT (WINAPI *pSHCreateItemFromIDList)(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv); static HRESULT (WINAPI *pSHCreateItemFromParsingName)(PCWSTR,IBindCtx*,REFIID,void**); static HRESULT (WINAPI *pSHCreateItemFromRelativeName)(IShellItem*,PCWSTR,IBindCtx*,REFIID,void**); @@ -65,18 +54,13 @@ static HRESULT (WINAPI *pSHCreateShellItemArray)(LPCITEMIDLIST,IShellFolder*,UIN static HRESULT (WINAPI *pSHCreateShellItemArrayFromIDLists)(UINT, PCIDLIST_ABSOLUTE*, IShellItemArray**); static HRESULT (WINAPI *pSHCreateShellItemArrayFromDataObject)(IDataObject*, REFIID, void **); static HRESULT (WINAPI *pSHCreateShellItemArrayFromShellItem)(IShellItem*, REFIID, void **); -static LPITEMIDLIST (WINAPI *pILCombine)(LPCITEMIDLIST,LPCITEMIDLIST); -static HRESULT (WINAPI *pSHParseDisplayName)(LPCWSTR,IBindCtx*,LPITEMIDLIST*,SFGAOF,SFGAOF*); -static LPITEMIDLIST (WINAPI *pSHSimpleIDListFromPathAW)(LPCVOID); static HRESULT (WINAPI *pSHGetKnownFolderPath)(REFKNOWNFOLDERID,DWORD,HANDLE,PWSTR*); static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); static HRESULT (WINAPI *pSHGetItemFromDataObject)(IDataObject*,DATAOBJ_GET_ITEM_FLAGS,REFIID,void**); static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); -static UINT (WINAPI *pGetSystemWow64DirectoryW)(LPWSTR, UINT); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); -static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); static BOOL (WINAPI *pSHGetPathFromIDListEx)(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_FLAGS); static WCHAR *make_wstr(const char *str) @@ -115,7 +99,6 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shell32.dll"); #define MAKEFUNC(f) (p##f = (void*)GetProcAddress(hmod, #f)) - MAKEFUNC(SHBindToParent); MAKEFUNC(SHCreateItemFromIDList); MAKEFUNC(SHCreateItemFromParsingName); MAKEFUNC(SHCreateItemFromRelativeName); @@ -125,13 +108,6 @@ static void init_function_pointers(void) MAKEFUNC(SHCreateShellItemArrayFromIDLists); MAKEFUNC(SHCreateShellItemArrayFromDataObject); MAKEFUNC(SHCreateShellItemArrayFromShellItem); - MAKEFUNC(SHGetFolderPathA); - MAKEFUNC(SHGetFolderPathAndSubDirA); - MAKEFUNC(SHGetPathFromIDListW); - MAKEFUNC(SHGetSpecialFolderPathA); - MAKEFUNC(SHGetSpecialFolderPathW); - MAKEFUNC(SHGetSpecialFolderLocation); - MAKEFUNC(SHParseDisplayName); MAKEFUNC(SHGetKnownFolderPath); MAKEFUNC(SHGetNameFromIDList); MAKEFUNC(SHGetItemFromDataObject); @@ -141,15 +117,6 @@ static void init_function_pointers(void) MAKEFUNC(SHGetPathFromIDListEx); #undef MAKEFUNC -#define MAKEFUNC_ORD(f, ord) (p##f = (void*)GetProcAddress(hmod, (LPSTR)(ord))) - MAKEFUNC_ORD(ILFindLastID, 16); - MAKEFUNC_ORD(ILIsEqual, 21); - MAKEFUNC_ORD(ILCombine, 25); - MAKEFUNC_ORD(SHILCreateFromPath, 28); - MAKEFUNC_ORD(ILFree, 155); - MAKEFUNC_ORD(SHSimpleIDListFromPathAW, 162); -#undef MAKEFUNC_ORD - /* test named exports */ ptr = GetProcAddress(hmod, "ILFree"); ok(broken(ptr == 0) || ptr != 0, "expected named export for ILFree\n"); @@ -177,12 +144,8 @@ static void init_function_pointers(void) #undef TESTNAMED } - hmod = GetModuleHandleA("shlwapi.dll"); - pStrRetToBufW = (void*)GetProcAddress(hmod, "StrRetToBufW"); - hmod = GetModuleHandleA("kernel32.dll"); pIsWow64Process = (void*)GetProcAddress(hmod, "IsWow64Process"); - pGetSystemWow64DirectoryW = (void*)GetProcAddress(hmod, "GetSystemWow64DirectoryW"); hr = SHGetMalloc(&ppM); ok(hr == S_OK, "SHGetMalloc failed %08x\n", hr); @@ -225,12 +188,11 @@ static void test_ParseDisplayName(void) ok(hr == S_OK, "Expected SHGetDesktopFolder to return S_OK, got 0x%08x\n", hr); if(hr != S_OK) return; - /* Tests crash on W2K and below (SHCreateShellItem available as of XP) */ if (pSHCreateShellItem) { if (0) { - /* null name and pidl, also crashes on Windows 8 */ + /* null name and pidl, crashes on Windows 8 */ hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, NULL, NULL, NULL, 0); ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); @@ -244,7 +206,7 @@ static void test_ParseDisplayName(void) ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); } else - win_skip("Tests would crash on W2K and below\n"); + win_skip("SHCreateShellItem requires XP SP1 or later\n"); MultiByteToWideChar(CP_ACP, 0, cInetTestA, -1, cTestDirW, MAX_PATH); hr = IShellFolder_ParseDisplayName(IDesktopFolder, @@ -253,8 +215,8 @@ static void test_ParseDisplayName(void) "ParseDisplayName returned %08x, expected SUCCESS or E_FAIL\n", hr); if (hr == S_OK) { - ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " - "PT_IESPECIAL1, but is: %02x\n", pILFindLastID(newPIDL)->mkid.abID[0]); + ok(ILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " + "PT_IESPECIAL1, but is: %02x\n", ILFindLastID(newPIDL)->mkid.abID[0]); IMalloc_Free(ppM, newPIDL); } @@ -265,8 +227,8 @@ static void test_ParseDisplayName(void) "ParseDisplayName returned %08x, expected SUCCESS or E_FAIL\n", hr); if (hr == S_OK) { - ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " - "PT_IESPECIAL1, but is: %02x\n", pILFindLastID(newPIDL)->mkid.abID[0]); + ok(ILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " + "PT_IESPECIAL1, but is: %02x\n", ILFindLastID(newPIDL)->mkid.abID[0]); IMalloc_Free(ppM, newPIDL); } @@ -299,13 +261,8 @@ static void test_ParseDisplayName(void) /* I thought that perhaps the DesktopFolder's ParseDisplayName would recognize the * path corresponding to CSIDL_PERSONAL and return a CLSID_MyDocuments PIDL. Turns * out it doesn't. The magic seems to happen in the file dialogs, then. */ - if (!pSHGetSpecialFolderPathW || !pILFindLastID) - { - win_skip("SHGetSpecialFolderPathW and/or ILFindLastID are not available\n"); - goto finished; - } - bRes = pSHGetSpecialFolderPathW(NULL, cTestDirW, CSIDL_PERSONAL, FALSE); + bRes = SHGetSpecialFolderPathW(NULL, cTestDirW, CSIDL_PERSONAL, FALSE); ok(bRes, "SHGetSpecialFolderPath(CSIDL_PERSONAL) failed! %u\n", GetLastError()); if (!bRes) goto finished; @@ -313,12 +270,11 @@ static void test_ParseDisplayName(void) ok(hr == S_OK, "DesktopFolder->ParseDisplayName failed. hr = %08x.\n", hr); if (hr != S_OK) goto finished; - ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x31 || - pILFindLastID(newPIDL)->mkid.abID[0] == 0xb1, /* Win98 */ - "Last pidl should be of type PT_FOLDER or PT_IESPECIAL2, but is: %02x\n", - pILFindLastID(newPIDL)->mkid.abID[0]); + ok(ILFindLastID(newPIDL)->mkid.abID[0] == 0x31, + "Last pidl should be of type PT_FOLDER, but is: %02x\n", + ILFindLastID(newPIDL)->mkid.abID[0]); IMalloc_Free(ppM, newPIDL); - + finished: IShellFolder_Release(IDesktopFolder); } @@ -602,7 +558,7 @@ if (0) IShellFolder_Release(psfChild); } - pILFree(pidl); + ILFree(pidl); } DeleteFileA(pathA); } @@ -628,7 +584,7 @@ if (0) broken(hr == S_OK), /* Win9x, NT4, W2K */ "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); - pILFree(pidl); + ILFree(pidl); } DeleteFileA(pathA); } @@ -654,7 +610,7 @@ if (0) broken(hr == S_OK), /* Win9x, NT4, W2K */ "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); - pILFree(pidl); + ILFree(pidl); } DeleteFileA(pathA); } @@ -662,59 +618,42 @@ if (0) win_skip("Failed to create .foo testfile.\n"); /* And on the desktop */ - if(pSHGetSpecialFolderPathA) - { - pSHGetSpecialFolderPathA(NULL, pathA, CSIDL_DESKTOP, FALSE); - lstrcatA(pathA, "\\"); - lstrcatA(pathA, filename_html); - hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - if(hfile != INVALID_HANDLE_VALUE) - { - CloseHandle(hfile); - MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); - hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, path, NULL, &pidl, NULL); - ok(hr == S_OK, "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) - { - hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); - ok(hr == S_OK || - hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* XP, W2K3 */ - "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); - pILFree(pidl); - } - if(!DeleteFileA(pathA)) - trace("Failed to delete: %d\n", GetLastError()); + SHGetSpecialFolderPathA(NULL, pathA, CSIDL_DESKTOP, FALSE); + lstrcatA(pathA, "\\"); + lstrcatA(pathA, filename_html); + hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - } - else - win_skip("Failed to create .html testfile.\n"); + CloseHandle(hfile); + MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, path, NULL, &pidl, NULL); + ok(hr == S_OK, "Got 0x%08x\n", hr); - pSHGetSpecialFolderPathA(NULL, pathA, CSIDL_DESKTOP, FALSE); - lstrcatA(pathA, "\\"); - lstrcatA(pathA, filename_foo); - hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - if(hfile != INVALID_HANDLE_VALUE) - { - CloseHandle(hfile); - MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); - hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, path, NULL, &pidl, NULL); - ok(hr == S_OK, "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) - { - hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); - ok(hr == E_FAIL || /* Vista+ */ - hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || /* XP, W2K3 */ - broken(hr == S_OK), /* Win9x, NT4, W2K */ - "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); - pILFree(pidl); - } - DeleteFileA(pathA); - } - else - win_skip("Failed to create .foo testfile.\n"); - } + hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void **)&psfChild); + ok(hr == S_OK || + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* XP, W2K3 */ + "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); + ILFree(pidl); + if(!DeleteFileA(pathA)) + trace("Failed to delete: %d\n", GetLastError()); + + SHGetSpecialFolderPathA(NULL, pathA, CSIDL_DESKTOP, FALSE); + lstrcatA(pathA, "\\"); + lstrcatA(pathA, filename_foo); + hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + + CloseHandle(hfile); + MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, path, NULL, &pidl, NULL); + ok(hr == S_OK, "Got 0x%08x\n", hr); + + hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void **)&psfChild); + ok(hr == E_FAIL || /* Vista+ */ + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* XP, W2K3 */ + "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); + ILFree(pidl); + DeleteFileA(pathA); IShellFolder_Release(psfDesktop); } @@ -737,6 +676,10 @@ static void test_GetDisplayName(void) static const WCHAR wszFileName[] = { 'w','i','n','e','t','e','s','t','.','f','o','o',0 }; static const WCHAR wszDirName[] = { 'w','i','n','e','t','e','s','t',0 }; + /* It's ok to use this fixed path. Call will fail anyway. */ + WCHAR wszAbsoluteFilename[] = { 'C',':','\\','w','i','n','e','t','e','s','t', 0 }; + LPITEMIDLIST pidlNew; + /* I'm trying to figure if there is a functional difference between calling * SHGetPathFromIDListW and calling GetDisplayNameOf(SHGDN_FORPARSING) after * binding to the shellfolder. One thing I thought of was that perhaps @@ -745,13 +688,8 @@ static void test_GetDisplayName(void) * no functional difference in this respect. */ - if(!pSHGetSpecialFolderPathA) { - win_skip("SHGetSpecialFolderPathA is not available\n"); - return; - } - /* First creating a directory in MyDocuments and a file in this directory. */ - result = pSHGetSpecialFolderPathA(NULL, szTestDir, CSIDL_PERSONAL, FALSE); + result = SHGetSpecialFolderPathA(NULL, szTestDir, CSIDL_PERSONAL, FALSE); ok(result, "SHGetSpecialFolderPathA failed! Last error: %u\n", GetLastError()); if (!result) return; @@ -787,7 +725,7 @@ static void test_GetDisplayName(void) return; } - pidlLast = pILFindLastID(pidlTestFile); + pidlLast = ILFindLastID(pidlTestFile); ok(pidlLast->mkid.cb >=76 || broken(pidlLast->mkid.cb == 28) || /* W2K */ broken(pidlLast->mkid.cb == 40), /* Win9x, WinME */ @@ -816,77 +754,52 @@ static void test_GetDisplayName(void) IUnknown_Release(psfFile); } - if (!pSHBindToParent) - { - win_skip("SHBindToParent is missing\n"); - DeleteFileA(szTestFile); - RemoveDirectoryA(szTestDir); - return; - } - /* Some tests for IShellFolder::SetNameOf */ - if (pSHGetFolderPathAndSubDirA) - { - hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); - ok(hr == S_OK, "SHBindToParent failed! hr = %08x\n", hr); - if (hr == S_OK) { - /* It's ok to use this fixed path. Call will fail anyway. */ - WCHAR wszAbsoluteFilename[] = { 'C',':','\\','w','i','n','e','t','e','s','t', 0 }; - LPITEMIDLIST pidlNew; - - /* The pidl returned through the last parameter of SetNameOf is a simple one. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlLast, wszDirName, SHGDN_NORMAL, &pidlNew); - ok (hr == S_OK, "SetNameOf failed! hr = %08x\n", hr); - if (hr == S_OK) - { - ok (((LPITEMIDLIST)((LPBYTE)pidlNew+pidlNew->mkid.cb))->mkid.cb == 0, - "pidl returned from SetNameOf should be simple!\n"); + hr = SHBindToParent(pidlTestFile, &IID_IShellFolder, (void **)&psfPersonal, &pidlLast); + ok(hr == S_OK, "SHBindToParent failed! hr = %08x\n", hr); - /* Passing an absolute path to SetNameOf fails. The HRESULT code indicates that SetNameOf - * is implemented on top of SHFileOperation in WinXP. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszAbsoluteFilename, - SHGDN_FORPARSING, NULL); - ok (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "SetNameOf succeeded! hr = %08x\n", hr); + /* The pidl returned through the last parameter of SetNameOf is a simple one. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlLast, wszDirName, SHGDN_NORMAL, &pidlNew); + ok (hr == S_OK, "SetNameOf failed! hr = %08x\n", hr); - /* Rename the file back to its original name. SetNameOf ignores the fact, that the - * SHGDN flags specify an absolute path. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszFileName, SHGDN_FORPARSING, NULL); - ok (hr == S_OK, "SetNameOf failed! hr = %08x\n", hr); + ok (((ITEMIDLIST *)((BYTE *)pidlNew + pidlNew->mkid.cb))->mkid.cb == 0, + "pidl returned from SetNameOf should be simple!\n"); - pILFree(pidlNew); - } + /* Passing an absolute path to SetNameOf fails. The HRESULT code indicates that SetNameOf + * is implemented on top of SHFileOperation in WinXP. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszAbsoluteFilename, SHGDN_FORPARSING, NULL); + ok (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "SetNameOf succeeded! hr = %08x\n", hr); - IShellFolder_Release(psfPersonal); - } - } - else - win_skip("Avoid needs of interaction on Win2k\n"); + /* Rename the file back to its original name. SetNameOf ignores the fact, that the + * SHGDN flags specify an absolute path. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszFileName, SHGDN_FORPARSING, NULL); + ok (hr == S_OK, "SetNameOf failed! hr = %08x\n", hr); + + ILFree(pidlNew); + IShellFolder_Release(psfPersonal); /* Deleting the file and the directory */ DeleteFileA(szTestFile); RemoveDirectoryA(szTestDir); /* SHGetPathFromIDListW still works, although the file is not present anymore. */ - if (pSHGetPathFromIDListW) - { - result = pSHGetPathFromIDListW(pidlTestFile, wszTestFile2); - ok (result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); - ok (!lstrcmpiW(wszTestFile, wszTestFile2), "SHGetPathFromIDListW returns incorrect path!\n"); - } + result = SHGetPathFromIDListW(pidlTestFile, wszTestFile2); + ok (result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); + ok (!lstrcmpiW(wszTestFile, wszTestFile2), "SHGetPathFromIDListW returns incorrect path!\n"); /* SHBindToParent fails, if called with a NULL PIDL. */ - hr = pSHBindToParent(NULL, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); + hr = SHBindToParent(NULL, &IID_IShellFolder, (void **)&psfPersonal, &pidlLast); ok (hr != S_OK, "SHBindToParent(NULL) should fail!\n"); /* But it succeeds with an empty PIDL. */ - hr = pSHBindToParent(pidlEmpty, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); + hr = SHBindToParent(pidlEmpty, &IID_IShellFolder, (void **)&psfPersonal, &pidlLast); ok (hr == S_OK, "SHBindToParent(empty PIDL) should succeed! hr = %08x\n", hr); ok (pidlLast == pidlEmpty, "The last element of an empty PIDL should be the PIDL itself!\n"); if (hr == S_OK) IShellFolder_Release(psfPersonal); - + /* Binding to the folder and querying the display name of the file also works. */ - hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); + hr = SHBindToParent(pidlTestFile, &IID_IShellFolder, (void **)&psfPersonal, &pidlLast); ok (hr == S_OK, "SHBindToParent failed! hr = %08x\n", hr); if (hr != S_OK) { IShellFolder_Release(psfDesktop); @@ -895,9 +808,9 @@ static void test_GetDisplayName(void) /* This test shows that Windows doesn't allocate a new pidlLast, but returns a pointer into * pidlTestFile (In accordance with MSDN). */ - ok (pILFindLastID(pidlTestFile) == pidlLast, + ok (ILFindLastID(pidlTestFile) == pidlLast, "SHBindToParent doesn't return the last id of the pidl param!\n"); - + hr = IShellFolder_GetDisplayNameOf(psfPersonal, pidlLast, SHGDN_FORPARSING, &strret); ok (hr == S_OK, "Personal->GetDisplayNameOf failed! hr = %08x\n", hr); if (hr != S_OK) { @@ -906,13 +819,10 @@ static void test_GetDisplayName(void) return; } - if (pStrRetToBufW) - { - hr = pStrRetToBufW(&strret, pidlLast, wszTestFile2, MAX_PATH); - ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); - ok (!lstrcmpiW(wszTestFile, wszTestFile2), "GetDisplayNameOf returns incorrect path!\n"); - } - + hr = StrRetToBufW(&strret, pidlLast, wszTestFile2, MAX_PATH); + ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); + ok (!lstrcmpiW(wszTestFile, wszTestFile2), "GetDisplayNameOf returns incorrect path!\n"); + ILFree(pidlTestFile); IShellFolder_Release(psfDesktop); IShellFolder_Release(psfPersonal); @@ -1246,21 +1156,15 @@ static void test_SHGetPathFromIDList(void) 'w','i','n','e','t','e','s','t','.','f','o','o',0 }; LPITEMIDLIST pidlPrograms; - if(!pSHGetPathFromIDListW || !pSHGetSpecialFolderPathW) - { - win_skip("SHGetPathFromIDListW() or SHGetSpecialFolderPathW() is missing\n"); - return; - } - /* Calling SHGetPathFromIDListW with no pidl should return the empty string */ wszPath[0] = 'a'; wszPath[1] = '\0'; - result = pSHGetPathFromIDListW(NULL, wszPath); + result = SHGetPathFromIDListW(NULL, wszPath); ok(!result, "Expected failure\n"); ok(!wszPath[0], "Expected empty string\n"); /* Calling SHGetPathFromIDListW with an empty pidl should return the desktop folder's path. */ - result = pSHGetSpecialFolderPathW(NULL, wszDesktop, CSIDL_DESKTOP, FALSE); + result = SHGetSpecialFolderPathW(NULL, wszDesktop, CSIDL_DESKTOP, FALSE); ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOP) failed! Last error: %u\n", GetLastError()); if (!result) return; @@ -1273,7 +1177,7 @@ static void test_SHGetPathFromIDList(void) return; } - result = pSHGetPathFromIDListW(pidlEmpty, wszPath); + result = SHGetPathFromIDListW(pidlEmpty, wszPath); ok(result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); if (!result) return; ok(!lstrcmpiW(wszDesktop, wszPath), "SHGetPathFromIDListW didn't return desktop path for empty pidl!\n"); @@ -1293,7 +1197,7 @@ static void test_SHGetPathFromIDList(void) SetLastError(0xdeadbeef); wszPath[0] = 'a'; wszPath[1] = '\0'; - result = pSHGetPathFromIDListW(pidlMyComputer, wszPath); + result = SHGetPathFromIDListW(pidlMyComputer, wszPath); ok (!result, "SHGetPathFromIDListW succeeded where it shouldn't!\n"); ok (GetLastError()==0xdeadbeef || GetLastError()==ERROR_SUCCESS, /* Vista and higher */ @@ -1306,7 +1210,7 @@ static void test_SHGetPathFromIDList(void) IMalloc_Free(ppM, pidlMyComputer); - result = pSHGetSpecialFolderPathW(NULL, wszFileName, CSIDL_DESKTOPDIRECTORY, FALSE); + result = SHGetSpecialFolderPathW(NULL, wszFileName, CSIDL_DESKTOPDIRECTORY, FALSE); ok(result, "SHGetSpecialFolderPathW failed! Last error: %u\n", GetLastError()); if (!result) { IShellFolder_Release(psfDesktop); @@ -1341,15 +1245,12 @@ static void test_SHGetPathFromIDList(void) IMalloc_Free(ppM, pidlTestFile); return; } - if (pStrRetToBufW) - { - pStrRetToBufW(&strret, pidlTestFile, wszPath, MAX_PATH); - ok(0 == lstrcmpW(wszFileName, wszPath), - "Desktop->GetDisplayNameOf(pidlTestFile, SHGDN_FORPARSING) " - "returned incorrect path for file placed on desktop\n"); - } + StrRetToBufW(&strret, pidlTestFile, wszPath, MAX_PATH); + ok(0 == lstrcmpW(wszFileName, wszPath), + "Desktop->GetDisplayNameOf(pidlTestFile, SHGDN_FORPARSING) " + "returned incorrect path for file placed on desktop\n"); - result = pSHGetPathFromIDListW(pidlTestFile, wszPath); + result = SHGetPathFromIDListW(pidlTestFile, wszPath); ok(result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); ok(0 == lstrcmpW(wszFileName, wszPath), "SHGetPathFromIDListW returned incorrect path for file placed on desktop\n"); @@ -1381,11 +1282,11 @@ static void test_SHGetPathFromIDList(void) IMalloc_Free(ppM, pidlTestFile); /* Test if we can get the path from the start menu "program files" PIDL. */ - hr = pSHGetSpecialFolderLocation(NULL, CSIDL_PROGRAM_FILES, &pidlPrograms); + hr = SHGetSpecialFolderLocation(NULL, CSIDL_PROGRAM_FILES, &pidlPrograms); ok(hr == S_OK, "SHGetFolderLocation failed: 0x%08x\n", hr); SetLastError(0xdeadbeef); - result = pSHGetPathFromIDListW(pidlPrograms, wszPath); + result = SHGetPathFromIDListW(pidlPrograms, wszPath); IMalloc_Free(ppM, pidlPrograms); ok(result, "SHGetPathFromIDListW failed\n"); } @@ -1501,7 +1402,7 @@ static HRESULT WINAPI InitPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPC "Wrong variant type for 'Target' property!\n"); if (V_VT(pVar) != VT_BSTR) return E_INVALIDARG; - result = pSHGetSpecialFolderPathW(NULL, wszPath, CSIDL_DESKTOPDIRECTORY, FALSE); + result = SHGetSpecialFolderPathW(NULL, wszPath, CSIDL_DESKTOPDIRECTORY, FALSE); ok(result, "SHGetSpecialFolderPathW(DESKTOPDIRECTORY) failed! %u\n", GetLastError()); if (!result) return E_INVALIDARG; @@ -1578,17 +1479,6 @@ static void test_FolderShortcut(void) { static const GUID CLSID_UnixDosFolder = {0x9d20aae8, 0x0625, 0x44b0, {0x9c, 0xa7, 0x71, 0x88, 0x9c, 0x22, 0x54, 0xd9}}; - if (!pSHGetSpecialFolderPathW || !pStrRetToBufW) { - win_skip("SHGetSpecialFolderPathW and/or StrRetToBufW are not available\n"); - return; - } - - if (!pSHGetFolderPathAndSubDirA) - { - win_skip("FolderShortcut test doesn't work on Win2k\n"); - return; - } - /* These tests basically show, that CLSID_FolderShortcuts are initialized * via their IPersistPropertyBag interface. And that the target folder * is taken from the IPropertyBag's 'Target' property. @@ -1623,11 +1513,11 @@ static void test_FolderShortcut(void) { return; } - result = pSHGetSpecialFolderPathW(NULL, wszDesktopPath, CSIDL_DESKTOPDIRECTORY, FALSE); + result = SHGetSpecialFolderPathW(NULL, wszDesktopPath, CSIDL_DESKTOPDIRECTORY, FALSE); ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOPDIRECTORY) failed! %u\n", GetLastError()); if (!result) return; - pStrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); + StrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); ok(!lstrcmpiW(wszDesktopPath, wszBuffer), "FolderShortcut returned incorrect folder!\n"); hr = IShellFolder_QueryInterface(pShellFolder, &IID_IPersistFolder3, (LPVOID*)&pPersistFolder3); @@ -1668,16 +1558,16 @@ static void test_FolderShortcut(void) { ok (hr == S_OK, "IPersistFolder3::Initialize failed! hr = %08x\n", hr); if (hr != S_OK) { IPersistFolder3_Release(pPersistFolder3); - pILFree(pidlWineTestFolder); + ILFree(pidlWineTestFolder); return; } hr = IPersistFolder3_GetCurFolder(pPersistFolder3, &pidlCurrentFolder); ok(hr == S_OK, "IPersistFolder3_GetCurFolder failed! hr=0x%08x\n", hr); - ok(pILIsEqual(pidlCurrentFolder, pidlWineTestFolder), + ok(ILIsEqual(pidlCurrentFolder, pidlWineTestFolder), "IPersistFolder3_GetCurFolder should return pidlWineTestFolder!\n"); - pILFree(pidlCurrentFolder); - pILFree(pidlWineTestFolder); + ILFree(pidlCurrentFolder); + ILFree(pidlWineTestFolder); hr = IPersistFolder3_QueryInterface(pPersistFolder3, &IID_IShellFolder, (LPVOID*)&pShellFolder); IPersistFolder3_Release(pPersistFolder3); @@ -1691,7 +1581,7 @@ static void test_FolderShortcut(void) { return; } - pStrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); + StrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); ok(!lstrcmpiW(wszDesktopPath, wszBuffer), "FolderShortcut returned incorrect folder!\n"); /* Next few lines are meant to show that children of FolderShortcuts are not FolderShortcuts, @@ -1715,7 +1605,7 @@ static void test_FolderShortcut(void) { hr = IShellFolder_BindToObject(pShellFolder, pidlSubFolder, NULL, &IID_IPersistFolder3, (LPVOID*)&pPersistFolder3); IShellFolder_Release(pShellFolder); - pILFree(pidlSubFolder); + ILFree(pidlSubFolder); ok (hr == S_OK, "IShellFolder::BindToObject failed! hr = %08x\n", hr); if (hr != S_OK) return; @@ -1767,9 +1657,7 @@ static void test_ITEMIDLIST_format(void) { { 'l','o','n','g','e','r','_','t','h','a','n','.','8','_','3',0 } }; int i; - if (!pSHGetSpecialFolderPathW) return; - - bResult = pSHGetSpecialFolderPathW(NULL, wszPersonal, CSIDL_PERSONAL, FALSE); + bResult = SHGetSpecialFolderPathW(NULL, wszPersonal, CSIDL_PERSONAL, FALSE); ok(bResult, "SHGetSpecialFolderPathW failed! Last error: %u\n", GetLastError()); if (!bResult) return; @@ -1796,7 +1684,7 @@ static void test_ITEMIDLIST_format(void) { hr = IShellFolder_BindToObject(psfDesktop, pidlPersonal, NULL, &IID_IShellFolder, (LPVOID*)&psfPersonal); IShellFolder_Release(psfDesktop); - pILFree(pidlPersonal); + ILFree(pidlPersonal); ok(hr == S_OK, "psfDesktop->BindToObject failed! hr = %08x\n", hr); if (hr != S_OK) return; @@ -1907,7 +1795,7 @@ static void test_ITEMIDLIST_format(void) { } } - pILFree(pidlFile); + ILFree(pidlFile); } IShellFolder_Release(psfPersonal); @@ -1923,16 +1811,11 @@ static void test_SHGetFolderPathA(void) HRESULT hr; HKEY key; - if (!pSHGetFolderPathA) - { - win_skip("SHGetFolderPathA not present\n"); - return; - } if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; - hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES, 0, SHGFP_TYPE_CURRENT, path ); + hr = SHGetFolderPathA( 0, CSIDL_PROGRAM_FILES, 0, SHGFP_TYPE_CURRENT, path ); ok( hr == S_OK, "SHGetFolderPathA failed %x\n", hr ); - hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILESX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); + hr = SHGetFolderPathA( 0, CSIDL_PROGRAM_FILESX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); if (hr == E_FAIL) { win_skip( "Program Files (x86) not supported\n" ); @@ -1965,9 +1848,9 @@ static void test_SHGetFolderPathA(void) RegCloseKey( key ); } - hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMON, 0, SHGFP_TYPE_CURRENT, path ); + hr = SHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMON, 0, SHGFP_TYPE_CURRENT, path ); ok( hr == S_OK, "SHGetFolderPathA failed %x\n", hr ); - hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMONX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); + hr = SHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMONX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); if (hr == E_FAIL) { win_skip( "Common Files (x86) not supported\n" ); @@ -2012,17 +1895,7 @@ static void test_SHGetFolderPathAndSubDirA(void) static char testpath[MAX_PATH]; static char toolongpath[MAX_PATH+1]; - if(!pSHGetFolderPathAndSubDirA) - { - win_skip("SHGetFolderPathAndSubDirA not present!\n"); - return; - } - - if(!pSHGetFolderPathA) { - win_skip("SHGetFolderPathA not present!\n"); - return; - } - if(FAILED(pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata))) + if(FAILED(SHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata))) { win_skip("SHGetFolderPathA failed for CSIDL_LOCAL_APPDATA!\n"); return; @@ -2043,11 +1916,11 @@ static void test_SHGetFolderPathAndSubDirA(void) } /* test invalid second parameter */ - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | 0xff, NULL, SHGFP_TYPE_CURRENT, wine, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | 0xff, NULL, SHGFP_TYPE_CURRENT, wine, testpath); ok(E_INVALIDARG == ret, "expected E_INVALIDARG, got %x\n", ret); /* test fourth parameter */ - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, 2, winetemp, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, 2, winetemp, testpath); switch(ret) { case S_OK: /* winvista */ ok(!strncmp(appdata, testpath, strlen(appdata)), @@ -2063,40 +1936,40 @@ static void test_SHGetFolderPathAndSubDirA(void) /* test fifth parameter */ testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, NULL, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, NULL, testpath); ok(S_OK == ret, "expected S_OK, got %x\n", ret); ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "", testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "", testpath); ok(S_OK == ret, "expected S_OK, got %x\n", ret); ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "\\", testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "\\", testpath); ok(S_OK == ret, "expected S_OK, got %x\n", ret); ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); for(i=0; i< MAX_PATH; i++) toolongpath[i] = '0' + i % 10; toolongpath[MAX_PATH] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, toolongpath, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, toolongpath, testpath); ok(HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE) == ret, "expected %x, got %x\n", HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), ret); testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, wine, NULL); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, wine, NULL); ok((S_OK == ret) || (E_INVALIDARG == ret), "expected S_OK or E_INVALIDARG, got %x\n", ret); /* test a not existing path */ testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); ok(HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) == ret, "expected %x, got %x\n", HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), ret); /* create a directory inside a not existing directory */ testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_CREATE | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_CREATE | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); ok(S_OK == ret, "expected S_OK, got %x\n", ret); ok(!strncmp(appdata, testpath, strlen(appdata)), "expected %s to start with %s\n", testpath, appdata); @@ -2181,40 +2054,27 @@ static void test_LocalizedNames(void) hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER, &strret); ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); - if (hr == S_OK && pStrRetToBufW) - { - hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); - ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); - todo_wine - ok (!lstrcmpiW(tempbufW, folderdisplayW) || - broken(!lstrcmpiW(tempbufW, foldernameW)), /* W2K */ - "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); - } + hr = StrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); + todo_wine + ok (!lstrcmpiW(tempbufW, folderdisplayW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); /* editing name is also read from the resource */ hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER|SHGDN_FOREDITING, &strret); ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); - if (hr == S_OK && pStrRetToBufW) - { - hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); - ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); - todo_wine - ok (!lstrcmpiW(tempbufW, folderdisplayW) || - broken(!lstrcmpiW(tempbufW, foldernameW)), /* W2K */ - "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); - } + hr = StrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); + todo_wine + ok (!lstrcmpiW(tempbufW, folderdisplayW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); /* parsing name is unchanged */ hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER|SHGDN_FORPARSING, &strret); ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); - if (hr == S_OK && pStrRetToBufW) - { - hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); - ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); - ok (!lstrcmpiW(tempbufW, foldernameW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); - } + hr = StrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); + ok (!lstrcmpiW(tempbufW, foldernameW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); IShellFolder_Release(IDesktopFolder); IShellFolder_Release(testIShellFolder); @@ -2253,16 +2113,8 @@ static void test_SHCreateShellItem(void) return; } - if(pSHGetSpecialFolderLocation) - { - ret = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); - ok(ret == S_OK, "Got 0x%08x\n", ret); - } - else - { - win_skip("pSHGetSpecialFolderLocation missing.\n"); - pidl_desktop = NULL; - } + ret = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + ok(ret == S_OK, "Got 0x%08x\n", ret); MultiByteToWideChar(CP_ACP, 0, curdirA, -1, curdirW, MAX_PATH); @@ -2280,7 +2132,7 @@ static void test_SHCreateShellItem(void) ret = IShellFolder_ParseDisplayName(currentfolder, NULL, NULL, testfileW, NULL, &pidl_testfile, NULL); ok(SUCCEEDED(ret), "ParseDisplayName returned %x\n", ret); - pidl_abstestfile = pILCombine(pidl_cwd, pidl_testfile); + pidl_abstestfile = ILCombine(pidl_cwd, pidl_testfile); shellitem = (void*)0xdeadbeef; ret = pSHCreateShellItem(NULL, NULL, NULL, &shellitem); @@ -2308,7 +2160,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_cwd, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2328,7 +2180,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_abstestfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2346,7 +2198,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_cwd, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2369,7 +2221,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_abstestfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2390,7 +2242,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_abstestfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2410,7 +2262,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_testfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2495,7 +2347,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_cwd, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2515,7 +2367,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_testfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2592,7 +2444,7 @@ static void test_SHCreateShellItem(void) ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); ok(ret == S_OK, "IShellItem_Compare fail: 0x%08x.\n", ret); ok(!order, "order got wrong value: %d.\n", order); - pILFree(pidl_desktop_testfile); + ILFree(pidl_desktop_testfile); IShellItem_Release(shellitem2); IShellItem_Release(shellitem); @@ -2683,7 +2535,7 @@ static void test_SHCreateShellItem(void) ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); ok(ret == S_OK, "IShellItem_Compare failed: 0x%08x.\n", ret); ok(!order, "order got wrong value: %d.\n", order); - pILFree(pidl_desktop_testfile); + ILFree(pidl_desktop_testfile); IShellItem_Release(shellitem2); IShellItem_Release(shellitem); @@ -2715,10 +2567,10 @@ static void test_SHCreateShellItem(void) win_skip("No SHCreateItemInKnownFolder or SHGetKnownFolderPath\n"); DeleteFileA(".\\testfile"); - pILFree(pidl_abstestfile); - pILFree(pidl_testfile); - pILFree(pidl_desktop); - pILFree(pidl_cwd); + ILFree(pidl_abstestfile); + ILFree(pidl_testfile); + ILFree(pidl_desktop); + ILFree(pidl_cwd); IShellFolder_Release(currentfolder); IShellFolder_Release(desktopfolder); } @@ -2742,11 +2594,8 @@ static void test_SHGetNameFromIDList(void) return; } - /* These should be available on any platform that passed the above test. */ + /* This should be available on any platform that passed the above test. */ ok(pSHCreateShellItem != NULL, "SHCreateShellItem missing.\n"); - ok(pSHBindToParent != NULL, "SHBindToParent missing.\n"); - ok(pSHGetSpecialFolderLocation != NULL, "SHGetSpecialFolderLocation missing.\n"); - ok(pStrRetToBufW != NULL, "StrRetToBufW missing.\n"); if(0) { @@ -2758,7 +2607,7 @@ static void test_SHGetNameFromIDList(void) ok(hres == E_INVALIDARG, "Got 0x%08x\n", hres); /* Test the desktop */ - hres = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl); + hres = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl); ok(hres == S_OK, "Got 0x%08x\n", hres); hres = pSHCreateShellItem(NULL, NULL, pidl, &shellitem); ok(hres == S_OK, "Got 0x%08x\n", hres); @@ -2786,7 +2635,7 @@ static void test_SHGetNameFromIDList(void) if(SUCCEEDED(hrSF)) { - pStrRetToBufW(&strret, NULL, buf, MAX_PATH); + StrRetToBufW(&strret, NULL, buf, MAX_PATH); if(SUCCEEDED(hrSI)) ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); if(SUCCEEDED(hrSF)) @@ -2797,16 +2646,13 @@ static void test_SHGetNameFromIDList(void) } IShellFolder_Release(psf); - if(pSHGetPathFromIDListW){ - hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); - ok(hrSI == S_OK, "Got 0x%08x\n", hrSI); - res = pSHGetPathFromIDListW(pidl, buf); - ok(res == TRUE, "Got %d\n", res); - if(SUCCEEDED(hrSI) && res) - ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); - if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); - }else - win_skip("pSHGetPathFromIDListW not available\n"); + hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); + ok(hrSI == S_OK, "Got 0x%08x\n", hrSI); + res = SHGetPathFromIDListW(pidl, buf); + ok(res == TRUE, "Got %d\n", res); + if(SUCCEEDED(hrSI) && res) + ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); + if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); hres = pSHGetNameFromIDList(pidl, SIGDN_URL, &name_string); todo_wine ok(hres == S_OK, "Got 0x%08x\n", hres); @@ -2814,10 +2660,10 @@ static void test_SHGetNameFromIDList(void) IShellItem_Release(shellitem); } - pILFree(pidl); + ILFree(pidl); /* Test the control panel */ - hres = pSHGetSpecialFolderLocation(NULL, CSIDL_CONTROLS, &pidl); + hres = SHGetSpecialFolderLocation(NULL, CSIDL_CONTROLS, &pidl); ok(hres == S_OK, "Got 0x%08x\n", hres); hres = pSHCreateShellItem(NULL, NULL, pidl, &shellitem); ok(hres == S_OK, "Got 0x%08x\n", hres); @@ -2845,7 +2691,7 @@ static void test_SHGetNameFromIDList(void) if(SUCCEEDED(hrSF)) { - pStrRetToBufW(&strret, NULL, buf, MAX_PATH); + StrRetToBufW(&strret, NULL, buf, MAX_PATH); if(SUCCEEDED(hrSI)) ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); if(SUCCEEDED(hrSF)) @@ -2856,16 +2702,13 @@ static void test_SHGetNameFromIDList(void) } IShellFolder_Release(psf); - if(pSHGetPathFromIDListW){ - hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); - ok(hrSI == E_INVALIDARG, "Got 0x%08x\n", hrSI); - res = pSHGetPathFromIDListW(pidl, buf); - ok(res == FALSE, "Got %d\n", res); - if(SUCCEEDED(hrSI) && res) - ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); - if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); - }else - win_skip("pSHGetPathFromIDListW not available\n"); + hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); + ok(hrSI == E_INVALIDARG, "Got 0x%08x\n", hrSI); + res = SHGetPathFromIDListW(pidl, buf); + ok(res == FALSE, "Got %d\n", res); + if(SUCCEEDED(hrSI) && res) + ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); + if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); hres = pSHGetNameFromIDList(pidl, SIGDN_URL, &name_string); todo_wine ok(hres == E_NOTIMPL /* Win7 */ || hres == S_OK /* Vista */, @@ -2874,7 +2717,7 @@ static void test_SHGetNameFromIDList(void) IShellItem_Release(shellitem); } - pILFree(pidl); + ILFree(pidl); } static void test_SHGetItemFromDataObject(void) @@ -2979,7 +2822,7 @@ static void test_SHGetItemFromDataObject(void) skip("zero or one file found - skipping multi-file test.\n"); for(i = 0; i < count; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); IEnumIDList_Release(peidl); } @@ -3054,7 +2897,7 @@ static void test_ShellItemCompare(void) { hr = pSHCreateShellItem(NULL, NULL, pidl_testfile, &psi[i]); ok(hr == S_OK, "Got 0x%08x\n", hr); - pILFree(pidl_testfile); + ILFree(pidl_testfile); } if(FAILED(hr)) failed = TRUE; } @@ -3289,8 +3132,6 @@ static void test_SHGetIDListFromObject(void) return; } - ok(pSHGetSpecialFolderLocation != NULL, "SHGetSpecialFolderLocation missing.\n"); - if(0) { /* Crashes native */ @@ -3321,7 +3162,7 @@ static void test_SHGetIDListFromObject(void) HeapFree(GetProcessHeap(), 0, punkimpl); pidl_desktop = NULL; - pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); ok(pidl_desktop != NULL, "Failed to get desktop pidl.\n"); SHGetDesktopFolder(&psfdesktop); @@ -3339,7 +3180,7 @@ static void test_SHGetIDListFromObject(void) if(SUCCEEDED(hres)) { ok(ILIsEqual(pidl_desktop, pidl), "pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); } IShellItem_Release(shellitem); } @@ -3353,7 +3194,7 @@ static void test_SHGetIDListFromObject(void) if(SUCCEEDED(hres)) { ok(ILIsEqual(pidl_desktop, pidl), "pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); } hres = IShellFolder_CreateViewObject(psfdesktop, NULL, &IID_IShellView, (void**)&psv); @@ -3370,7 +3211,7 @@ static void test_SHGetIDListFromObject(void) if(SUCCEEDED(hres)) { ok(ILIsEqual(pidl_desktop, pidl), "pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); } /* Test IDataObject */ @@ -3397,7 +3238,7 @@ static void test_SHGetIDListFromObject(void) ok(hres == S_OK, "got 0x%08x\n", hres); ok(pidl != NULL, "pidl is NULL.\n"); ok(ILIsEqual(pidl, apidl[0]), "pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); IDataObject_Release(pdo); } @@ -3425,7 +3266,7 @@ static void test_SHGetIDListFromObject(void) skip("zero or one file found - skipping multi-file test.\n"); for(i = 0; i < count; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); IEnumIDList_Release(peidl); } @@ -3434,7 +3275,7 @@ static void test_SHGetIDListFromObject(void) } IShellFolder_Release(psfdesktop); - pILFree(pidl_desktop); + ILFree(pidl_desktop); } static void test_SHGetItemFromObject(void) @@ -3527,8 +3368,6 @@ static void test_SHCreateShellItemArray(void) return; } - ok(pSHGetSpecialFolderLocation != NULL, "SHGetSpecialFolderLocation missing.\n"); - if(0) { /* Crashes under native */ @@ -3548,10 +3387,10 @@ static void test_SHCreateShellItemArray(void) hr = pSHCreateShellItemArray(NULL, pdesktopsf, 1, NULL, &psia); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl); + SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl); hr = pSHCreateShellItemArray(pidl, NULL, 0, NULL, &psia); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - pILFree(pidl); + ILFree(pidl); GetCurrentDirectoryW(MAX_PATH, cTestDirW); myPathAddBackslashW(cTestDirW); @@ -3572,7 +3411,7 @@ static void test_SHCreateShellItemArray(void) if(FAILED(hr)) { skip("Failed to set up environment for SHCreateShellItemArray tests.\n"); - pILFree(pidl_testdir); + ILFree(pidl_testdir); Cleanup(); return; } @@ -3624,14 +3463,14 @@ static void test_SHCreateShellItemArray(void) if(SUCCEEDED(hr)) { ok(ILIsEqual(pidl_abs, pidl), "Pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); } IShellItem_Release(psi); } - pILFree(pidl_abs); + ILFree(pidl_abs); } for(i = 0; i < done; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); IShellItemArray_Release(psia); } } @@ -3676,8 +3515,8 @@ static void test_SHCreateShellItemArray(void) ok(hr == S_OK, "Got 0x%08x\n", hr); ok(pidl2 != NULL, "pidl2 was null.\n"); ok(ILIsEqual(pidl1, pidl2), "pidls not equal.\n"); - pILFree(pidl1); - pILFree(pidl2); + ILFree(pidl1); + ILFree(pidl2); IShellItem_Release(psi2); } hr = IShellItemArray_GetItemAt(psia, 1, &psi2); @@ -3752,10 +3591,10 @@ static void test_SHCreateShellItemArray(void) ok(hr == S_OK, "Got 0x%08x\n", hr); ok(pidl != NULL, "pidl as NULL.\n"); ok(ILIsEqual(pidl, pidl_abs), "pidls differ.\n"); - pILFree(pidl); + ILFree(pidl); IShellItem_Release(psi); } - pILFree(pidl_abs); + ILFree(pidl_abs); } IShellItemArray_Release(psia); @@ -3764,7 +3603,7 @@ static void test_SHCreateShellItemArray(void) IDataObject_Release(pdo); } for(i = 0; i < count; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); } else skip("No files found - skipping test.\n"); @@ -3843,7 +3682,7 @@ static void test_SHCreateShellItemArray(void) WCHAR desktoppath[MAX_PATH]; BOOL result; - result = pSHGetSpecialFolderPathW(NULL, desktoppath, CSIDL_DESKTOPDIRECTORY, FALSE); + result = SHGetSpecialFolderPathW(NULL, desktoppath, CSIDL_DESKTOPDIRECTORY, FALSE); ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOPDIRECTORY) failed! %u\n", GetLastError()); hr = IShellItem_GetDisplayName(psi, SIGDN_DESKTOPABSOLUTEPARSING, &path); @@ -3948,7 +3787,7 @@ static void test_SHCreateShellItemArray(void) IShellItemArray_Release(psia); } - pILFree(pidltest1); + ILFree(pidltest1); } IShellFolder_Release(pdesktopsf); @@ -3957,7 +3796,7 @@ static void test_SHCreateShellItemArray(void) skip("No SHCreateShellItemArrayFromIDLists.\n"); IShellFolder_Release(psf); - pILFree(pidl_testdir); + ILFree(pidl_testdir); Cleanup(); } @@ -3991,7 +3830,7 @@ static void test_ShellItemArrayEnumItems(void) hr = IShellFolder_BindToObject(pdesktopsf, pidl_testdir, NULL, (REFIID)&IID_IShellFolder, (void**)&psf); ok(hr == S_OK, "Got 0x%08x\n", hr); - pILFree(pidl_testdir); + ILFree(pidl_testdir); } IShellFolder_Release(pdesktopsf); if (FAILED(hr)) return; @@ -4110,7 +3949,7 @@ static void test_ShellItemArrayEnumItems(void) } for(i = 0; i < done; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); } } @@ -4127,7 +3966,7 @@ static void test_ShellItemBindToHandler(void) return; } - hr = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + hr = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { @@ -4162,7 +4001,7 @@ static void test_ShellItemBindToHandler(void) if(SUCCEEDED(hr)) { ok(ILIsEqual(pidl_desktop, pidl_tmp), "Pidl not equal (%p, %p)\n", pidl_desktop, pidl_tmp); - pILFree(pidl_tmp); + ILFree(pidl_tmp); } IPersistFolder2_Release(ppf2); } @@ -4276,7 +4115,7 @@ static void test_ShellItemBindToHandler(void) else skip("Failed to create ShellItem.\n"); - pILFree(pidl_desktop); + ILFree(pidl_desktop); } static void test_ShellItemGetAttributes(void) @@ -4297,13 +4136,13 @@ static void test_ShellItemGetAttributes(void) return; } - hr = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + hr = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { hr = pSHCreateShellItem(NULL, NULL, pidl_desktop, &psi); ok(hr == S_OK, "Got 0x%08x\n", hr); - pILFree(pidl_desktop); + ILFree(pidl_desktop); } if(FAILED(hr)) { @@ -4338,7 +4177,7 @@ static void test_ShellItemGetAttributes(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = pSHCreateShellItem(NULL, NULL, pidl, &psi_folder1); ok(hr == S_OK, "Got 0x%08x\n", sfgao); - pILFree(pidl); + ILFree(pidl); lstrcpyW(buf, curdirW); lstrcatW(buf, testfile1W); @@ -4346,7 +4185,7 @@ static void test_ShellItemGetAttributes(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = pSHCreateShellItem(NULL, NULL, pidl, &psi_file1); ok(hr == S_OK, "Got 0x%08x\n", sfgao); - pILFree(pidl); + ILFree(pidl); IShellFolder_Release(pdesktopsf); @@ -4421,7 +4260,7 @@ static void test_ShellItemArrayGetAttributes(void) ok(hr == S_OK, "got 0x%08x\n", hr); for(i = 0; i < 5; i++) - pILFree((LPITEMIDLIST)pidl_array[i]); + ILFree((LPITEMIDLIST)pidl_array[i]); /* [testfolder/, testfolder/testfolder2] seems to break in Vista */ attr = 0xdeadbeef; @@ -4477,71 +4316,65 @@ static void test_SHParseDisplayName(void) HRESULT hr; BOOL ret, is_wow64; - if (!pSHParseDisplayName) - { - win_skip("SHParseDisplayName isn't available\n"); - return; - } - if (0) { /* crashes on native */ - pSHParseDisplayName(NULL, NULL, NULL, 0, NULL); + SHParseDisplayName(NULL, NULL, NULL, 0, NULL); nameW[0] = 0; - pSHParseDisplayName(nameW, NULL, NULL, 0, NULL); + SHParseDisplayName(nameW, NULL, NULL, 0, NULL); } pidl1 = (LPITEMIDLIST)0xdeadbeef; - hr = pSHParseDisplayName(NULL, NULL, &pidl1, 0, NULL); + hr = SHParseDisplayName(NULL, NULL, &pidl1, 0, NULL); ok(broken(hr == E_OUTOFMEMORY) /* < Vista */ || hr == E_INVALIDARG, "failed %08x\n", hr); ok(pidl1 == 0, "expected null ptr, got %p\n", pidl1); /* dummy name */ nameW[0] = 0; - hr = pSHParseDisplayName(nameW, NULL, &pidl1, 0, NULL); + hr = SHParseDisplayName(nameW, NULL, &pidl1, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); hr = SHGetDesktopFolder(&desktop); ok(hr == S_OK, "failed %08x\n", hr); hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, nameW, NULL, &pidl2, NULL); ok(hr == S_OK, "failed %08x\n", hr); - ret = pILIsEqual(pidl1, pidl2); + ret = ILIsEqual(pidl1, pidl2); ok(ret == TRUE, "expected equal idls\n"); - pILFree(pidl1); - pILFree(pidl2); + ILFree(pidl1); + ILFree(pidl2); /* with path */ GetWindowsDirectoryW( dirW, MAX_PATH ); - hr = pSHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); + hr = SHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, dirW, NULL, &pidl2, NULL); ok(hr == S_OK, "failed %08x\n", hr); - ret = pILIsEqual(pidl1, pidl2); + ret = ILIsEqual(pidl1, pidl2); ok(ret == TRUE, "expected equal idls\n"); - pILFree(pidl1); - pILFree(pidl2); + ILFree(pidl1); + ILFree(pidl2); /* system32 is not redirected to syswow64 on WOW64 */ if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; - if (is_wow64 && pGetSystemWow64DirectoryW) + if (is_wow64) { UINT len; *dirW = 0; len = GetSystemDirectoryW(dirW, MAX_PATH); ok(len > 0, "GetSystemDirectoryW failed: %u\n", GetLastError()); - hr = pSHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); + hr = SHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); *dirW = 0; - len = pGetSystemWow64DirectoryW(dirW, MAX_PATH); + len = GetSystemWow64DirectoryW(dirW, MAX_PATH); ok(len > 0, "GetSystemWow64DirectoryW failed: %u\n", GetLastError()); - hr = pSHParseDisplayName(dirW, NULL, &pidl2, 0, NULL); + hr = SHParseDisplayName(dirW, NULL, &pidl2, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); - ret = pILIsEqual(pidl1, pidl2); + ret = ILIsEqual(pidl1, pidl2); ok(ret == FALSE, "expected different idls\n"); - pILFree(pidl1); - pILFree(pidl2); + ILFree(pidl1); + ILFree(pidl2); } IShellFolder_Release(desktop); @@ -4595,7 +4428,7 @@ static void test_desktop_IPersist(void) hr = IPersistFolder2_GetCurFolder(ppf2, &pidl); ok(hr == S_OK, "got %08x\n", hr); ok(pidl != NULL, "pidl was NULL.\n"); - if(SUCCEEDED(hr)) pILFree(pidl); + if(SUCCEEDED(hr)) ILFree(pidl); IPersistFolder2_Release(ppf2); } @@ -4613,12 +4446,6 @@ static void test_GetUIObject(void) const WCHAR filename[] = {'\\','t','e','s','t','d','i','r','\\','t','e','s','t','1','.','t','x','t',0}; - if(!pSHBindToParent) - { - win_skip("SHBindToParent missing.\n"); - return; - } - GetCurrentDirectoryW(MAX_PATH, path); if (!path[0]) { @@ -4636,7 +4463,7 @@ static void test_GetUIObject(void) { IShellFolder *psf; LPCITEMIDLIST pidl_child; - hr = pSHBindToParent(pidl, &IID_IShellFolder, (void**)&psf, &pidl_child); + hr = SHBindToParent(pidl, &IID_IShellFolder, (void**)&psf, &pidl_child); ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { @@ -4692,9 +4519,7 @@ static void test_GetUIObject(void) (max_id_check == max_id-2), /* Win 8 */ "Not equal (or near equal), got %d and %d\n", max_id_check, max_id); -#define is_win2k() (pSHGetFolderPathA && !pSHGetFolderPathAndSubDirA) - - if(count && !is_win2k()) /* Test is interactive on w2k, so skip */ + if(count) { CMINVOKECOMMANDINFO cmi; ZeroMemory(&cmi, sizeof(CMINVOKECOMMANDINFO)); @@ -4711,14 +4536,13 @@ static void test_GetUIObject(void) (hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Vista */), "Got 0x%08x\n", hr); } -#undef is_win2k DestroyMenu(hmenu); IContextMenu_Release(pcm); } IShellFolder_Release(psf); } - if(pILFree) pILFree(pidl); + ILFree(pidl); } IShellFolder_Release(psf_desktop); @@ -4733,22 +4557,13 @@ static void r_verify_pidl(unsigned l, LPCITEMIDLIST pidl, const WCHAR *path) STRRET filename; HRESULT hr; - if(!pSHBindToParent){ - win_skip("SHBindToParent is not available, not performing full PIDL verification\n"); - if(path) - ok_(__FILE__,l)(pidl != NULL, "Expected PIDL to be non-NULL\n"); - else - ok_(__FILE__,l)(pidl == NULL, "Expected PIDL to be NULL\n"); - return; - } - if(path){ if(!pidl){ ok_(__FILE__,l)(0, "didn't get expected path (%s), instead: NULL\n", wine_dbgstr_w(path)); return; } - hr = pSHBindToParent(pidl, &IID_IShellFolder, (LPVOID*)&parent, &child); + hr = SHBindToParent(pidl, &IID_IShellFolder, (void **)&parent, &child); ok_(__FILE__,l)(hr == S_OK, "SHBindToParent failed: 0x%08x\n", hr); if(FAILED(hr)) return; @@ -4786,30 +4601,25 @@ static void test_SHSimpleIDListFromPath(void) LPITEMIDLIST pidl = NULL; - if(!pSHSimpleIDListFromPathAW){ - win_skip("SHSimpleIDListFromPathAW not available\n"); - return; - } - br = CreateDirectoryA(adirA, NULL); ok(br == TRUE, "CreateDirectory failed: %d\n", GetLastError()); if(is_unicode) - pidl = pSHSimpleIDListFromPathAW(adirW); + pidl = SHSimpleIDListFromPath(adirW); else - pidl = pSHSimpleIDListFromPathAW(adirA); + pidl = SHSimpleIDListFromPath((const WCHAR *)adirA); verify_pidl(pidl, adirW); - pILFree(pidl); + ILFree(pidl); br = RemoveDirectoryA(adirA); ok(br == TRUE, "RemoveDirectory failed: %d\n", GetLastError()); if(is_unicode) - pidl = pSHSimpleIDListFromPathAW(adirW); + pidl = SHSimpleIDListFromPath(adirW); else - pidl = pSHSimpleIDListFromPathAW(adirA); + pidl = SHSimpleIDListFromPath((const WCHAR *)adirA); verify_pidl(pidl, adirW); - pILFree(pidl); + ILFree(pidl); } /* IFileSystemBindData impl */ @@ -5207,9 +5017,9 @@ static void test_SHChangeNotify(BOOL test_new_delivery) entries[0].pidl = NULL; if(has_unicode) - hr = pSHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); + hr = SHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); else - hr = pSHILCreateFromPath((LPCVOID)root_dirA, (LPITEMIDLIST*)&entries[0].pidl, 0); + hr = SHILCreateFromPath((const void *)root_dirA, (LPITEMIDLIST*)&entries[0].pidl, 0); ok(hr == S_OK, "SHILCreateFromPath failed: 0x%08x\n", hr); entries[0].fRecursive = TRUE; @@ -5271,12 +5081,6 @@ static void test_SHCreateDefaultContextMenu(void) return; } - if(!pSHBindToParent) - { - skip("SHBindToParent missing.\n"); - return; - } - GetCurrentDirectoryW(MAX_PATH, path); if (!path[0]) { @@ -5293,7 +5097,7 @@ static void test_SHCreateDefaultContextMenu(void) if(SUCCEEDED(hr)) { - hr = pSHBindToParent(pidl, &IID_IShellFolder, (void**)&folder, (LPCITEMIDLIST*)&pidl_child); + hr = SHBindToParent(pidl, &IID_IShellFolder, (void **)&folder, (const ITEMIDLIST **)&pidl_child); ok(hr == S_OK, "Got 0x%08x\n", hr); IShellFolder_QueryInterface(folder,&IID_IPersistFolder2,(void**)&persist); @@ -5366,7 +5170,7 @@ static void test_DataObject(void) hres = IShellFolder_GetUIObjectOf(desktop, NULL, 1, (LPCITEMIDLIST*)&apidl, &IID_IDataObject, NULL, (void**)&data_obj); ok(hres == S_OK, "got %x\n", hres); - pILFree(apidl); + ILFree(apidl); IShellFolder_Release(desktop); cf_shellidlist = RegisterClipboardFormatW(CFSTR_SHELLIDLISTW); -- 2.15.1

1 1

[PATCH] shell32/tests: Drop shell folder test workarounds for Windows <= 2000
by Alex Henrie 12 Jan '18

12 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Coverity has been complaining about them. The most straightforward solution is to remove them all. dlls/shell32/tests/shlfolder.c | 905 ++++++++++++++--------------------------- 1 file changed, 312 insertions(+), 593 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 1ee02743f5..46ce514260 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -45,17 +45,6 @@ DEFINE_GUID(CLSID_ShellDocObjView, 0xe7e4bc40, 0xe76a, 0x11ce, 0xa9,0xbb, 0x00,0 static IMalloc *ppM; -static HRESULT (WINAPI *pSHBindToParent)(LPCITEMIDLIST, REFIID, LPVOID*, LPCITEMIDLIST*); -static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); -static HRESULT (WINAPI *pSHGetFolderPathAndSubDirA)(HWND, int, HANDLE, DWORD, LPCSTR, LPSTR); -static BOOL (WINAPI *pSHGetPathFromIDListW)(LPCITEMIDLIST,LPWSTR); -static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); -static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL); -static BOOL (WINAPI *pSHGetSpecialFolderPathW)(HWND, LPWSTR, int, BOOL); -static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); -static LPITEMIDLIST (WINAPI *pILFindLastID)(LPCITEMIDLIST); -static void (WINAPI *pILFree)(LPITEMIDLIST); -static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); static HRESULT (WINAPI *pSHCreateItemFromIDList)(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv); static HRESULT (WINAPI *pSHCreateItemFromParsingName)(PCWSTR,IBindCtx*,REFIID,void**); static HRESULT (WINAPI *pSHCreateItemFromRelativeName)(IShellItem*,PCWSTR,IBindCtx*,REFIID,void**); @@ -65,18 +54,13 @@ static HRESULT (WINAPI *pSHCreateShellItemArray)(LPCITEMIDLIST,IShellFolder*,UIN static HRESULT (WINAPI *pSHCreateShellItemArrayFromIDLists)(UINT, PCIDLIST_ABSOLUTE*, IShellItemArray**); static HRESULT (WINAPI *pSHCreateShellItemArrayFromDataObject)(IDataObject*, REFIID, void **); static HRESULT (WINAPI *pSHCreateShellItemArrayFromShellItem)(IShellItem*, REFIID, void **); -static LPITEMIDLIST (WINAPI *pILCombine)(LPCITEMIDLIST,LPCITEMIDLIST); -static HRESULT (WINAPI *pSHParseDisplayName)(LPCWSTR,IBindCtx*,LPITEMIDLIST*,SFGAOF,SFGAOF*); -static LPITEMIDLIST (WINAPI *pSHSimpleIDListFromPathAW)(LPCVOID); static HRESULT (WINAPI *pSHGetKnownFolderPath)(REFKNOWNFOLDERID,DWORD,HANDLE,PWSTR*); static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); static HRESULT (WINAPI *pSHGetItemFromDataObject)(IDataObject*,DATAOBJ_GET_ITEM_FLAGS,REFIID,void**); static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); -static UINT (WINAPI *pGetSystemWow64DirectoryW)(LPWSTR, UINT); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); -static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); static BOOL (WINAPI *pSHGetPathFromIDListEx)(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_FLAGS); static WCHAR *make_wstr(const char *str) @@ -115,7 +99,6 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shell32.dll"); #define MAKEFUNC(f) (p##f = (void*)GetProcAddress(hmod, #f)) - MAKEFUNC(SHBindToParent); MAKEFUNC(SHCreateItemFromIDList); MAKEFUNC(SHCreateItemFromParsingName); MAKEFUNC(SHCreateItemFromRelativeName); @@ -125,13 +108,6 @@ static void init_function_pointers(void) MAKEFUNC(SHCreateShellItemArrayFromIDLists); MAKEFUNC(SHCreateShellItemArrayFromDataObject); MAKEFUNC(SHCreateShellItemArrayFromShellItem); - MAKEFUNC(SHGetFolderPathA); - MAKEFUNC(SHGetFolderPathAndSubDirA); - MAKEFUNC(SHGetPathFromIDListW); - MAKEFUNC(SHGetSpecialFolderPathA); - MAKEFUNC(SHGetSpecialFolderPathW); - MAKEFUNC(SHGetSpecialFolderLocation); - MAKEFUNC(SHParseDisplayName); MAKEFUNC(SHGetKnownFolderPath); MAKEFUNC(SHGetNameFromIDList); MAKEFUNC(SHGetItemFromDataObject); @@ -141,15 +117,6 @@ static void init_function_pointers(void) MAKEFUNC(SHGetPathFromIDListEx); #undef MAKEFUNC -#define MAKEFUNC_ORD(f, ord) (p##f = (void*)GetProcAddress(hmod, (LPSTR)(ord))) - MAKEFUNC_ORD(ILFindLastID, 16); - MAKEFUNC_ORD(ILIsEqual, 21); - MAKEFUNC_ORD(ILCombine, 25); - MAKEFUNC_ORD(SHILCreateFromPath, 28); - MAKEFUNC_ORD(ILFree, 155); - MAKEFUNC_ORD(SHSimpleIDListFromPathAW, 162); -#undef MAKEFUNC_ORD - /* test named exports */ ptr = GetProcAddress(hmod, "ILFree"); ok(broken(ptr == 0) || ptr != 0, "expected named export for ILFree\n"); @@ -177,12 +144,8 @@ static void init_function_pointers(void) #undef TESTNAMED } - hmod = GetModuleHandleA("shlwapi.dll"); - pStrRetToBufW = (void*)GetProcAddress(hmod, "StrRetToBufW"); - hmod = GetModuleHandleA("kernel32.dll"); pIsWow64Process = (void*)GetProcAddress(hmod, "IsWow64Process"); - pGetSystemWow64DirectoryW = (void*)GetProcAddress(hmod, "GetSystemWow64DirectoryW"); hr = SHGetMalloc(&ppM); ok(hr == S_OK, "SHGetMalloc failed %08x\n", hr); @@ -225,12 +188,11 @@ static void test_ParseDisplayName(void) ok(hr == S_OK, "Expected SHGetDesktopFolder to return S_OK, got 0x%08x\n", hr); if(hr != S_OK) return; - /* Tests crash on W2K and below (SHCreateShellItem available as of XP) */ if (pSHCreateShellItem) { if (0) { - /* null name and pidl, also crashes on Windows 8 */ + /* null name and pidl, crashes on Windows 8 */ hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, NULL, NULL, NULL, 0); ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); @@ -244,29 +206,26 @@ static void test_ParseDisplayName(void) ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); } else - win_skip("Tests would crash on W2K and below\n"); + win_skip("SHCreateShellItem requires XP SP1 or later\n"); MultiByteToWideChar(CP_ACP, 0, cInetTestA, -1, cTestDirW, MAX_PATH); - hr = IShellFolder_ParseDisplayName(IDesktopFolder, - NULL, NULL, cTestDirW, NULL, &newPIDL, 0); - todo_wine ok(hr == S_OK || broken(hr == E_FAIL) /* NT4 */, - "ParseDisplayName returned %08x, expected SUCCESS or E_FAIL\n", hr); + hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cTestDirW, NULL, &newPIDL, 0); + todo_wine ok(hr == S_OK, "ParseDisplayName returned %08x, expected SUCCESS\n", hr); if (hr == S_OK) { - ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " - "PT_IESPECIAL1, but is: %02x\n", pILFindLastID(newPIDL)->mkid.abID[0]); + ok(ILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " + "PT_IESPECIAL1, but is: %02x\n", ILFindLastID(newPIDL)->mkid.abID[0]); IMalloc_Free(ppM, newPIDL); } MultiByteToWideChar(CP_ACP, 0, cInetTest2A, -1, cTestDirW, MAX_PATH); hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cTestDirW, NULL, &newPIDL, 0); - todo_wine ok(hr == S_OK || broken(hr == E_FAIL) /* NT4 */, - "ParseDisplayName returned %08x, expected SUCCESS or E_FAIL\n", hr); + todo_wine ok(hr == S_OK, "ParseDisplayName returned %08x, expected SUCCESS\n", hr); if (hr == S_OK) { - ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " - "PT_IESPECIAL1, but is: %02x\n", pILFindLastID(newPIDL)->mkid.abID[0]); + ok(ILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " + "PT_IESPECIAL1, but is: %02x\n", ILFindLastID(newPIDL)->mkid.abID[0]); IMalloc_Free(ppM, newPIDL); } @@ -278,10 +237,10 @@ static void test_ParseDisplayName(void) } MultiByteToWideChar(CP_ACP, 0, cNonExistDir1A, -1, cTestDirW, MAX_PATH); - hr = IShellFolder_ParseDisplayName(IDesktopFolder, + hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cTestDirW, NULL, &newPIDL, 0); - ok((hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) || (hr == E_FAIL), - "ParseDisplayName returned %08x, expected 80070002 or E_FAIL\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "ParseDisplayName returned %08x, expected 0x80070002\n", hr); res = GetFileAttributesA(cNonExistDir2A); if(res != INVALID_FILE_ATTRIBUTES) @@ -291,21 +250,15 @@ static void test_ParseDisplayName(void) } MultiByteToWideChar(CP_ACP, 0, cNonExistDir2A, -1, cTestDirW, MAX_PATH); - hr = IShellFolder_ParseDisplayName(IDesktopFolder, + hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cTestDirW, NULL, &newPIDL, 0); - ok((hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) || (hr == E_FAIL) || (hr == E_INVALIDARG), - "ParseDisplayName returned %08x, expected 80070002, E_FAIL or E_INVALIDARG\n", hr); + todo_wine ok(hr == E_INVALIDARG, "ParseDisplayName returned %08x, expected E_INVALIDARG\n", hr); /* I thought that perhaps the DesktopFolder's ParseDisplayName would recognize the * path corresponding to CSIDL_PERSONAL and return a CLSID_MyDocuments PIDL. Turns * out it doesn't. The magic seems to happen in the file dialogs, then. */ - if (!pSHGetSpecialFolderPathW || !pILFindLastID) - { - win_skip("SHGetSpecialFolderPathW and/or ILFindLastID are not available\n"); - goto finished; - } - bRes = pSHGetSpecialFolderPathW(NULL, cTestDirW, CSIDL_PERSONAL, FALSE); + bRes = SHGetSpecialFolderPathW(NULL, cTestDirW, CSIDL_PERSONAL, FALSE); ok(bRes, "SHGetSpecialFolderPath(CSIDL_PERSONAL) failed! %u\n", GetLastError()); if (!bRes) goto finished; @@ -313,12 +266,11 @@ static void test_ParseDisplayName(void) ok(hr == S_OK, "DesktopFolder->ParseDisplayName failed. hr = %08x.\n", hr); if (hr != S_OK) goto finished; - ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x31 || - pILFindLastID(newPIDL)->mkid.abID[0] == 0xb1, /* Win98 */ - "Last pidl should be of type PT_FOLDER or PT_IESPECIAL2, but is: %02x\n", - pILFindLastID(newPIDL)->mkid.abID[0]); + ok(ILFindLastID(newPIDL)->mkid.abID[0] == 0x31, + "Last pidl should be of type PT_FOLDER, but is: %02x\n", + ILFindLastID(newPIDL)->mkid.abID[0]); IMalloc_Free(ppM, newPIDL); - + finished: IShellFolder_Release(IDesktopFolder); } @@ -441,7 +393,6 @@ static void test_EnumObjects(IShellFolder *iFolder) flags &= SFGAO_testfor; ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); ok(flags == (attrs[i]) || - flags == (attrs[i] & ~SFGAO_FILESYSANCESTOR) || /* Win9x, NT4 */ flags == ((attrs[i] & ~SFGAO_CAPABILITYMASK) | SFGAO_VISTA), /* Vista and higher */ "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); @@ -449,9 +400,7 @@ static void test_EnumObjects(IShellFolder *iFolder) hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); flags &= SFGAO_testfor; ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); - ok(flags == attrs[i] || - flags == (attrs[i] & ~SFGAO_FILESYSANCESTOR), /* Win9x, NT4 */ - "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); + ok(flags == attrs[i], "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); flags = ~0u; hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); @@ -512,12 +461,8 @@ static void test_BindToObject(void) hr = IShellFolder_BindToObject(psfMyComputer, pidlEmpty, NULL, &IID_IShellFolder, (LPVOID*)&psfChild); ok (hr == E_INVALIDARG, "MyComputers's BindToObject should fail, when called with empty pidl! hr = %08x\n", hr); -if (0) -{ - /* this call segfaults on 98SE */ hr = IShellFolder_BindToObject(psfMyComputer, NULL, NULL, &IID_IShellFolder, (LPVOID*)&psfChild); ok (hr == E_INVALIDARG, "MyComputers's BindToObject should fail, when called with NULL pidl! hr = %08x\n", hr); -} cChars = GetSystemDirectoryA(szSystemDir, MAX_PATH); ok (cChars > 0 && cChars < MAX_PATH, "GetSystemDirectoryA failed! LastError: %u\n", GetLastError()); @@ -544,13 +489,9 @@ if (0) ok (hr == E_INVALIDARG, "FileSystem ShellFolder's BindToObject should fail, when called with empty pidl! hr = %08x\n", hr); -if (0) -{ - /* this call segfaults on 98SE */ hr = IShellFolder_BindToObject(psfSystemDir, NULL, NULL, &IID_IShellFolder, (LPVOID*)&psfChild); ok (hr == E_INVALIDARG, "FileSystem ShellFolder's BindToObject should fail, when called with NULL pidl! hr = %08x\n", hr); -} IShellFolder_Release(psfSystemDir); @@ -586,23 +527,19 @@ if (0) { IPersist *pp; hr = IShellFolder_QueryInterface(psfChild, &IID_IPersist, (void**)&pp); - ok(hr == S_OK || - broken(hr == E_NOINTERFACE), /* Win9x, NT4, W2K */ - "Got 0x%08x\n", hr); + ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { CLSID id; hr = IPersist_GetClassID(pp, &id); ok(hr == S_OK, "Got 0x%08x\n", hr); - /* CLSID_ShellFSFolder on some w2k systems */ - ok(IsEqualIID(&id, &CLSID_ShellDocObjView) || broken(IsEqualIID(&id, &CLSID_ShellFSFolder)), - "Unexpected classid %s\n", wine_dbgstr_guid(&id)); + ok(IsEqualIID(&id, &CLSID_ShellDocObjView), "Unexpected classid %s\n", wine_dbgstr_guid(&id)); IPersist_Release(pp); } IShellFolder_Release(psfChild); } - pILFree(pidl); + ILFree(pidl); } DeleteFileA(pathA); } @@ -623,12 +560,10 @@ if (0) { hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); ok(hr == E_FAIL || /* Vista+ */ - hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || /* XP, W2K3 */ - hr == E_INVALIDARG || /* W2K item in top dir */ - broken(hr == S_OK), /* Win9x, NT4, W2K */ + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* XP, W2K3 */ "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); - pILFree(pidl); + ILFree(pidl); } DeleteFileA(pathA); } @@ -649,12 +584,10 @@ if (0) { hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); ok(hr == E_FAIL || /* Vista+ */ - hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || /* XP, W2K3 */ - hr == E_INVALIDARG || /* W2K item in top dir */ - broken(hr == S_OK), /* Win9x, NT4, W2K */ + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* XP, W2K3 */ "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); - pILFree(pidl); + ILFree(pidl); } DeleteFileA(pathA); } @@ -662,59 +595,55 @@ if (0) win_skip("Failed to create .foo testfile.\n"); /* And on the desktop */ - if(pSHGetSpecialFolderPathA) + SHGetSpecialFolderPathA(NULL, pathA, CSIDL_DESKTOP, FALSE); + lstrcatA(pathA, "\\"); + lstrcatA(pathA, filename_html); + hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + if(hfile != INVALID_HANDLE_VALUE) { - pSHGetSpecialFolderPathA(NULL, pathA, CSIDL_DESKTOP, FALSE); - lstrcatA(pathA, "\\"); - lstrcatA(pathA, filename_html); - hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - if(hfile != INVALID_HANDLE_VALUE) + CloseHandle(hfile); + MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, path, NULL, &pidl, NULL); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) { - CloseHandle(hfile); - MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); - hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, path, NULL, &pidl, NULL); - ok(hr == S_OK, "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) - { - hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); - ok(hr == S_OK || - hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* XP, W2K3 */ - "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); - pILFree(pidl); - } - if(!DeleteFileA(pathA)) - trace("Failed to delete: %d\n", GetLastError()); - + hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); + ok(hr == S_OK || + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* XP, W2K3 */ + "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); + ILFree(pidl); } - else - win_skip("Failed to create .html testfile.\n"); + if(!DeleteFileA(pathA)) + trace("Failed to delete: %d\n", GetLastError()); + + } + else + win_skip("Failed to create .html testfile.\n"); - pSHGetSpecialFolderPathA(NULL, pathA, CSIDL_DESKTOP, FALSE); - lstrcatA(pathA, "\\"); - lstrcatA(pathA, filename_foo); - hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - if(hfile != INVALID_HANDLE_VALUE) + SHGetSpecialFolderPathA(NULL, pathA, CSIDL_DESKTOP, FALSE); + lstrcatA(pathA, "\\"); + lstrcatA(pathA, filename_foo); + hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + if(hfile != INVALID_HANDLE_VALUE) + { + CloseHandle(hfile); + MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, path, NULL, &pidl, NULL); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) { - CloseHandle(hfile); - MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); - hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, path, NULL, &pidl, NULL); - ok(hr == S_OK, "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) - { - hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); - ok(hr == E_FAIL || /* Vista+ */ - hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || /* XP, W2K3 */ - broken(hr == S_OK), /* Win9x, NT4, W2K */ - "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); - pILFree(pidl); - } - DeleteFileA(pathA); + hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); + ok(hr == E_FAIL || /* Vista+ */ + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* XP, W2K3 */ + "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); + ILFree(pidl); } - else - win_skip("Failed to create .foo testfile.\n"); + DeleteFileA(pathA); } + else + win_skip("Failed to create .foo testfile.\n"); IShellFolder_Release(psfDesktop); } @@ -745,13 +674,8 @@ static void test_GetDisplayName(void) * no functional difference in this respect. */ - if(!pSHGetSpecialFolderPathA) { - win_skip("SHGetSpecialFolderPathA is not available\n"); - return; - } - /* First creating a directory in MyDocuments and a file in this directory. */ - result = pSHGetSpecialFolderPathA(NULL, szTestDir, CSIDL_PERSONAL, FALSE); + result = SHGetSpecialFolderPathA(NULL, szTestDir, CSIDL_PERSONAL, FALSE); ok(result, "SHGetSpecialFolderPathA failed! Last error: %u\n", GetLastError()); if (!result) return; @@ -787,11 +711,8 @@ static void test_GetDisplayName(void) return; } - pidlLast = pILFindLastID(pidlTestFile); - ok(pidlLast->mkid.cb >=76 || - broken(pidlLast->mkid.cb == 28) || /* W2K */ - broken(pidlLast->mkid.cb == 40), /* Win9x, WinME */ - "Expected pidl length of at least 76, got %d.\n", pidlLast->mkid.cb); + pidlLast = ILFindLastID(pidlTestFile); + ok(pidlLast->mkid.cb >= 76, "Expected pidl length of at least 76, got %d.\n", pidlLast->mkid.cb); if (pidlLast->mkid.cb >= 28) { ok(!lstrcmpA((CHAR*)&pidlLast->mkid.abID[12], szFileName), "Filename should be stored as ansi-string at this position!\n"); @@ -809,95 +730,79 @@ static void test_GetDisplayName(void) */ hr = IShellFolder_BindToObject(psfDesktop, pidlTestFile, NULL, &IID_IUnknown, (VOID**)&psfFile); ok (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || - hr == E_NOTIMPL || /* Vista */ - broken(hr == S_OK), /* Win9x, W2K */ + hr == E_NOTIMPL, /* Vista */ "hr = %08x\n", hr); if (hr == S_OK) { IUnknown_Release(psfFile); } - if (!pSHBindToParent) - { - win_skip("SHBindToParent is missing\n"); - DeleteFileA(szTestFile); - RemoveDirectoryA(szTestDir); - return; - } - /* Some tests for IShellFolder::SetNameOf */ - if (pSHGetFolderPathAndSubDirA) + hr = SHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); + ok(hr == S_OK, "SHBindToParent failed! hr = %08x\n", hr); + if (hr == S_OK) { - hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); - ok(hr == S_OK, "SHBindToParent failed! hr = %08x\n", hr); - if (hr == S_OK) { - /* It's ok to use this fixed path. Call will fail anyway. */ - WCHAR wszAbsoluteFilename[] = { 'C',':','\\','w','i','n','e','t','e','s','t', 0 }; - LPITEMIDLIST pidlNew; - - /* The pidl returned through the last parameter of SetNameOf is a simple one. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlLast, wszDirName, SHGDN_NORMAL, &pidlNew); + /* It's ok to use this fixed path. Call will fail anyway. */ + WCHAR wszAbsoluteFilename[] = { 'C',':','\\','w','i','n','e','t','e','s','t', 0 }; + LPITEMIDLIST pidlNew; + + /* The pidl returned through the last parameter of SetNameOf is a simple one. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlLast, wszDirName, SHGDN_NORMAL, &pidlNew); + ok (hr == S_OK, "SetNameOf failed! hr = %08x\n", hr); + if (hr == S_OK) + { + ok (((LPITEMIDLIST)((LPBYTE)pidlNew+pidlNew->mkid.cb))->mkid.cb == 0, + "pidl returned from SetNameOf should be simple!\n"); + + /* Passing an absolute path to SetNameOf fails. The HRESULT code indicates that SetNameOf + * is implemented on top of SHFileOperation in WinXP. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszAbsoluteFilename, + SHGDN_FORPARSING, NULL); + ok (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "SetNameOf succeeded! hr = %08x\n", hr); + + /* Rename the file back to its original name. SetNameOf ignores the fact, that the + * SHGDN flags specify an absolute path. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszFileName, SHGDN_FORPARSING, NULL); ok (hr == S_OK, "SetNameOf failed! hr = %08x\n", hr); - if (hr == S_OK) - { - ok (((LPITEMIDLIST)((LPBYTE)pidlNew+pidlNew->mkid.cb))->mkid.cb == 0, - "pidl returned from SetNameOf should be simple!\n"); - - /* Passing an absolute path to SetNameOf fails. The HRESULT code indicates that SetNameOf - * is implemented on top of SHFileOperation in WinXP. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszAbsoluteFilename, - SHGDN_FORPARSING, NULL); - ok (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "SetNameOf succeeded! hr = %08x\n", hr); - - /* Rename the file back to its original name. SetNameOf ignores the fact, that the - * SHGDN flags specify an absolute path. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszFileName, SHGDN_FORPARSING, NULL); - ok (hr == S_OK, "SetNameOf failed! hr = %08x\n", hr); - pILFree(pidlNew); - } - - IShellFolder_Release(psfPersonal); + ILFree(pidlNew); } + + IShellFolder_Release(psfPersonal); } - else - win_skip("Avoid needs of interaction on Win2k\n"); /* Deleting the file and the directory */ DeleteFileA(szTestFile); RemoveDirectoryA(szTestDir); /* SHGetPathFromIDListW still works, although the file is not present anymore. */ - if (pSHGetPathFromIDListW) - { - result = pSHGetPathFromIDListW(pidlTestFile, wszTestFile2); - ok (result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); - ok (!lstrcmpiW(wszTestFile, wszTestFile2), "SHGetPathFromIDListW returns incorrect path!\n"); - } + result = SHGetPathFromIDListW(pidlTestFile, wszTestFile2); + ok (result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); + ok (!lstrcmpiW(wszTestFile, wszTestFile2), "SHGetPathFromIDListW returns incorrect path!\n"); /* SHBindToParent fails, if called with a NULL PIDL. */ - hr = pSHBindToParent(NULL, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); + hr = SHBindToParent(NULL, &IID_IShellFolder, (void**)&psfPersonal, &pidlLast); ok (hr != S_OK, "SHBindToParent(NULL) should fail!\n"); /* But it succeeds with an empty PIDL. */ - hr = pSHBindToParent(pidlEmpty, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); + hr = SHBindToParent(pidlEmpty, &IID_IShellFolder, (void**)&psfPersonal, &pidlLast); ok (hr == S_OK, "SHBindToParent(empty PIDL) should succeed! hr = %08x\n", hr); ok (pidlLast == pidlEmpty, "The last element of an empty PIDL should be the PIDL itself!\n"); if (hr == S_OK) IShellFolder_Release(psfPersonal); - + /* Binding to the folder and querying the display name of the file also works. */ - hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); + hr = SHBindToParent(pidlTestFile, &IID_IShellFolder, (void**)&psfPersonal, &pidlLast); ok (hr == S_OK, "SHBindToParent failed! hr = %08x\n", hr); if (hr != S_OK) { IShellFolder_Release(psfDesktop); return; } - /* This test shows that Windows doesn't allocate a new pidlLast, but returns a pointer into + /* This test shows that Windows doesn't allocate a new pidlLast, but returns a pointer into * pidlTestFile (In accordance with MSDN). */ - ok (pILFindLastID(pidlTestFile) == pidlLast, + ok (ILFindLastID(pidlTestFile) == pidlLast, "SHBindToParent doesn't return the last id of the pidl param!\n"); - + hr = IShellFolder_GetDisplayNameOf(psfPersonal, pidlLast, SHGDN_FORPARSING, &strret); ok (hr == S_OK, "Personal->GetDisplayNameOf failed! hr = %08x\n", hr); if (hr != S_OK) { @@ -906,13 +811,10 @@ static void test_GetDisplayName(void) return; } - if (pStrRetToBufW) - { - hr = pStrRetToBufW(&strret, pidlLast, wszTestFile2, MAX_PATH); - ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); - ok (!lstrcmpiW(wszTestFile, wszTestFile2), "GetDisplayNameOf returns incorrect path!\n"); - } - + hr = StrRetToBufW(&strret, pidlLast, wszTestFile2, MAX_PATH); + ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); + ok (!lstrcmpiW(wszTestFile, wszTestFile2), "GetDisplayNameOf returns incorrect path!\n"); + ILFree(pidlTestFile); IShellFolder_Release(psfDesktop); IShellFolder_Release(psfPersonal); @@ -950,11 +852,10 @@ static void test_CallForAttributes(void) hr = SHGetDesktopFolder(&psfDesktop); ok (hr == S_OK, "SHGetDesktopFolder failed! hr = %08x\n", hr); if (hr != S_OK) return; - - hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, wszMyDocuments, NULL, + + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, wszMyDocuments, NULL, &pidlMyDocuments, NULL); - ok (hr == S_OK || - broken(hr == E_INVALIDARG), /* Win95, NT4 */ + ok (hr == S_OK, "Desktop's ParseDisplayName failed to parse MyDocuments's CLSID! hr = %08x\n", hr); if (hr != S_OK) { IShellFolder_Release(psfDesktop); @@ -1049,32 +950,11 @@ static void test_GetAttributesOf(void) LPCITEMIDLIST pidlEmpty = (LPCITEMIDLIST)&emptyitem; LPITEMIDLIST pidlMyComputer; DWORD dwFlags; - static const DWORD desktopFlags[] = { - /* WinXP */ - SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | - SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER, - /* Win2k */ - SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_STREAM | SFGAO_FILESYSANCESTOR | - SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER, - /* WinMe, Win9x, WinNT*/ - SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_FILESYSANCESTOR | - SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER - }; - static const DWORD myComputerFlags[] = { - /* WinXP */ - SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | - SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER, - /* Win2k */ - SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_STREAM | - SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER, - /* WinMe, Win9x, WinNT */ - SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | - SFGAO_FOLDER | SFGAO_HASSUBFOLDER, - /* Win95, WinNT when queried directly */ - SFGAO_CANLINK | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | - SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER - }; - WCHAR wszMyComputer[] = { + static const DWORD desktopFlags = SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | + SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; + static const DWORD myComputerFlags = SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | + SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER; + WCHAR wszMyComputer[] = { ':',':','{','2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-', 'A','2','D','8','-','0','8','0','0','2','B','3','0','3','0','9','D','}',0 }; char cCurrDirA [MAX_PATH] = {0}; @@ -1082,8 +962,7 @@ static void test_GetAttributesOf(void) static WCHAR cTestDirW[] = {'t','e','s','t','d','i','r',0}; IShellFolder *IDesktopFolder, *testIShellFolder; ITEMIDLIST *newPIDL; - int len, i; - BOOL foundFlagsMatch; + int len; hr = SHGetDesktopFolder(&psfDesktop); ok (hr == S_OK, "SHGetDesktopFolder failed! hr = %08x\n", hr); @@ -1093,26 +972,14 @@ static void test_GetAttributesOf(void) dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfDesktop, 1, &pidlEmpty, &dwFlags); ok (hr == S_OK, "Desktop->GetAttributesOf(empty pidl) failed! hr = %08x\n", hr); - for (i = 0, foundFlagsMatch = FALSE; !foundFlagsMatch && - i < sizeof(desktopFlags) / sizeof(desktopFlags[0]); i++) - { - if (desktopFlags[i] == dwFlags) - foundFlagsMatch = TRUE; - } - ok (foundFlagsMatch, "Wrong Desktop attributes: %08x\n", dwFlags); + ok (dwFlags == desktopFlags, "Wrong Desktop attributes: %08x\n", dwFlags); /* .. or with no itemidlist at all. */ dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfDesktop, 0, NULL, &dwFlags); ok (hr == S_OK, "Desktop->GetAttributesOf(NULL) failed! hr = %08x\n", hr); - for (i = 0, foundFlagsMatch = FALSE; !foundFlagsMatch && - i < sizeof(desktopFlags) / sizeof(desktopFlags[0]); i++) - { - if (desktopFlags[i] == dwFlags) - foundFlagsMatch = TRUE; - } - ok (foundFlagsMatch, "Wrong Desktop attributes: %08x\n", dwFlags); - + ok (dwFlags == desktopFlags, "Wrong Desktop attributes: %08x\n", dwFlags); + /* Testing the attributes of the MyComputer shellfolder */ hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, wszMyComputer, NULL, &pidlMyComputer, NULL); ok (hr == S_OK, "Desktop's ParseDisplayName failed to parse MyComputer's CLSID! hr = %08x\n", hr); @@ -1127,14 +994,8 @@ static void test_GetAttributesOf(void) dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfDesktop, 1, (LPCITEMIDLIST*)&pidlMyComputer, &dwFlags); ok (hr == S_OK, "Desktop->GetAttributesOf(MyComputer) failed! hr = %08x\n", hr); - for (i = 0, foundFlagsMatch = FALSE; !foundFlagsMatch && - i < sizeof(myComputerFlags) / sizeof(myComputerFlags[0]); i++) - { - if ((myComputerFlags[i] | SFGAO_CANLINK) == dwFlags) - foundFlagsMatch = TRUE; - } todo_wine - ok (foundFlagsMatch, "Wrong MyComputer attributes: %08x\n", dwFlags); + ok (dwFlags == (myComputerFlags | SFGAO_CANLINK), "Wrong MyComputer attributes: %08x\n", dwFlags); hr = IShellFolder_BindToObject(psfDesktop, pidlMyComputer, NULL, &IID_IShellFolder, (LPVOID*)&psfMyComputer); ok (hr == S_OK, "Desktop failed to bind to MyComputer object! hr = %08x\n", hr); @@ -1144,21 +1005,13 @@ static void test_GetAttributesOf(void) hr = IShellFolder_GetAttributesOf(psfMyComputer, 1, &pidlEmpty, &dwFlags); todo_wine - ok (hr == E_INVALIDARG || - broken(hr == S_OK), /* W2K and earlier */ - "MyComputer->GetAttributesOf(empty pidl) should fail! hr = %08x\n", hr); + ok (hr == E_INVALIDARG, "MyComputer->GetAttributesOf(empty pidl) should fail! hr = %08x\n", hr); dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfMyComputer, 0, NULL, &dwFlags); ok (hr == S_OK, "MyComputer->GetAttributesOf(NULL) failed! hr = %08x\n", hr); - for (i = 0, foundFlagsMatch = FALSE; !foundFlagsMatch && - i < sizeof(myComputerFlags) / sizeof(myComputerFlags[0]); i++) - { - if (myComputerFlags[i] == dwFlags) - foundFlagsMatch = TRUE; - } todo_wine - ok (foundFlagsMatch, "Wrong MyComputer attributes: %08x\n", dwFlags); + ok (dwFlags == myComputerFlags, "Wrong MyComputer attributes: %08x\n", dwFlags); IShellFolder_Release(psfMyComputer); @@ -1246,34 +1099,19 @@ static void test_SHGetPathFromIDList(void) 'w','i','n','e','t','e','s','t','.','f','o','o',0 }; LPITEMIDLIST pidlPrograms; - if(!pSHGetPathFromIDListW || !pSHGetSpecialFolderPathW) - { - win_skip("SHGetPathFromIDListW() or SHGetSpecialFolderPathW() is missing\n"); - return; - } - /* Calling SHGetPathFromIDListW with no pidl should return the empty string */ wszPath[0] = 'a'; wszPath[1] = '\0'; - result = pSHGetPathFromIDListW(NULL, wszPath); + result = SHGetPathFromIDListW(NULL, wszPath); ok(!result, "Expected failure\n"); ok(!wszPath[0], "Expected empty string\n"); /* Calling SHGetPathFromIDListW with an empty pidl should return the desktop folder's path. */ - result = pSHGetSpecialFolderPathW(NULL, wszDesktop, CSIDL_DESKTOP, FALSE); + result = SHGetSpecialFolderPathW(NULL, wszDesktop, CSIDL_DESKTOP, FALSE); ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOP) failed! Last error: %u\n", GetLastError()); if (!result) return; - /* Check if we are on Win9x */ - SetLastError(0xdeadbeef); - lstrcmpiW(wszDesktop, wszDesktop); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("Most W-calls are not implemented\n"); - return; - } - - result = pSHGetPathFromIDListW(pidlEmpty, wszPath); + result = SHGetPathFromIDListW(pidlEmpty, wszPath); ok(result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); if (!result) return; ok(!lstrcmpiW(wszDesktop, wszPath), "SHGetPathFromIDListW didn't return desktop path for empty pidl!\n"); @@ -1293,7 +1131,7 @@ static void test_SHGetPathFromIDList(void) SetLastError(0xdeadbeef); wszPath[0] = 'a'; wszPath[1] = '\0'; - result = pSHGetPathFromIDListW(pidlMyComputer, wszPath); + result = SHGetPathFromIDListW(pidlMyComputer, wszPath); ok (!result, "SHGetPathFromIDListW succeeded where it shouldn't!\n"); ok (GetLastError()==0xdeadbeef || GetLastError()==ERROR_SUCCESS, /* Vista and higher */ @@ -1306,7 +1144,7 @@ static void test_SHGetPathFromIDList(void) IMalloc_Free(ppM, pidlMyComputer); - result = pSHGetSpecialFolderPathW(NULL, wszFileName, CSIDL_DESKTOPDIRECTORY, FALSE); + result = SHGetSpecialFolderPathW(NULL, wszFileName, CSIDL_DESKTOPDIRECTORY, FALSE); ok(result, "SHGetSpecialFolderPathW failed! Last error: %u\n", GetLastError()); if (!result) { IShellFolder_Release(psfDesktop); @@ -1341,15 +1179,12 @@ static void test_SHGetPathFromIDList(void) IMalloc_Free(ppM, pidlTestFile); return; } - if (pStrRetToBufW) - { - pStrRetToBufW(&strret, pidlTestFile, wszPath, MAX_PATH); - ok(0 == lstrcmpW(wszFileName, wszPath), - "Desktop->GetDisplayNameOf(pidlTestFile, SHGDN_FORPARSING) " - "returned incorrect path for file placed on desktop\n"); - } + StrRetToBufW(&strret, pidlTestFile, wszPath, MAX_PATH); + ok(0 == lstrcmpW(wszFileName, wszPath), + "Desktop->GetDisplayNameOf(pidlTestFile, SHGDN_FORPARSING) " + "returned incorrect path for file placed on desktop\n"); - result = pSHGetPathFromIDListW(pidlTestFile, wszPath); + result = SHGetPathFromIDListW(pidlTestFile, wszPath); ok(result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); ok(0 == lstrcmpW(wszFileName, wszPath), "SHGetPathFromIDListW returned incorrect path for file placed on desktop\n"); @@ -1381,11 +1216,11 @@ static void test_SHGetPathFromIDList(void) IMalloc_Free(ppM, pidlTestFile); /* Test if we can get the path from the start menu "program files" PIDL. */ - hr = pSHGetSpecialFolderLocation(NULL, CSIDL_PROGRAM_FILES, &pidlPrograms); + hr = SHGetSpecialFolderLocation(NULL, CSIDL_PROGRAM_FILES, &pidlPrograms); ok(hr == S_OK, "SHGetFolderLocation failed: 0x%08x\n", hr); SetLastError(0xdeadbeef); - result = pSHGetPathFromIDListW(pidlPrograms, wszPath); + result = SHGetPathFromIDListW(pidlPrograms, wszPath); IMalloc_Free(ppM, pidlPrograms); ok(result, "SHGetPathFromIDListW failed\n"); } @@ -1478,11 +1313,9 @@ static HRESULT WINAPI InitPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPC 'T','a','r','g','e','t','K','n','o','w','n','F','o','l','d','e','r',0 }; static const WCHAR wszCLSID[] = { 'C','L','S','I','D',0 }; - + if (!lstrcmpW(pszPropName, wszTargetSpecialFolder)) { - ok(V_VT(pVar) == VT_I4 || - broken(V_VT(pVar) == VT_BSTR), /* Win2k */ - "Wrong variant type for 'TargetSpecialFolder' property!\n"); + ok(V_VT(pVar) == VT_I4, "Wrong variant type for 'TargetSpecialFolder' property!\n"); return E_INVALIDARG; } @@ -1495,13 +1328,11 @@ static HRESULT WINAPI InitPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPC if (!lstrcmpW(pszPropName, wszTarget)) { WCHAR wszPath[MAX_PATH]; BOOL result; - - ok(V_VT(pVar) == VT_BSTR || - broken(V_VT(pVar) == VT_EMPTY), /* Win2k */ - "Wrong variant type for 'Target' property!\n"); + + ok(V_VT(pVar) == VT_BSTR, "Wrong variant type for 'Target' property!\n"); if (V_VT(pVar) != VT_BSTR) return E_INVALIDARG; - result = pSHGetSpecialFolderPathW(NULL, wszPath, CSIDL_DESKTOPDIRECTORY, FALSE); + result = SHGetSpecialFolderPathW(NULL, wszPath, CSIDL_DESKTOPDIRECTORY, FALSE); ok(result, "SHGetSpecialFolderPathW(DESKTOPDIRECTORY) failed! %u\n", GetLastError()); if (!result) return E_INVALIDARG; @@ -1578,17 +1409,6 @@ static void test_FolderShortcut(void) { static const GUID CLSID_UnixDosFolder = {0x9d20aae8, 0x0625, 0x44b0, {0x9c, 0xa7, 0x71, 0x88, 0x9c, 0x22, 0x54, 0xd9}}; - if (!pSHGetSpecialFolderPathW || !pStrRetToBufW) { - win_skip("SHGetSpecialFolderPathW and/or StrRetToBufW are not available\n"); - return; - } - - if (!pSHGetFolderPathAndSubDirA) - { - win_skip("FolderShortcut test doesn't work on Win2k\n"); - return; - } - /* These tests basically show, that CLSID_FolderShortcuts are initialized * via their IPersistPropertyBag interface. And that the target folder * is taken from the IPropertyBag's 'Target' property. @@ -1623,11 +1443,11 @@ static void test_FolderShortcut(void) { return; } - result = pSHGetSpecialFolderPathW(NULL, wszDesktopPath, CSIDL_DESKTOPDIRECTORY, FALSE); + result = SHGetSpecialFolderPathW(NULL, wszDesktopPath, CSIDL_DESKTOPDIRECTORY, FALSE); ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOPDIRECTORY) failed! %u\n", GetLastError()); if (!result) return; - pStrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); + StrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); ok(!lstrcmpiW(wszDesktopPath, wszBuffer), "FolderShortcut returned incorrect folder!\n"); hr = IShellFolder_QueryInterface(pShellFolder, &IID_IPersistFolder3, (LPVOID*)&pPersistFolder3); @@ -1668,16 +1488,16 @@ static void test_FolderShortcut(void) { ok (hr == S_OK, "IPersistFolder3::Initialize failed! hr = %08x\n", hr); if (hr != S_OK) { IPersistFolder3_Release(pPersistFolder3); - pILFree(pidlWineTestFolder); + ILFree(pidlWineTestFolder); return; } hr = IPersistFolder3_GetCurFolder(pPersistFolder3, &pidlCurrentFolder); ok(hr == S_OK, "IPersistFolder3_GetCurFolder failed! hr=0x%08x\n", hr); - ok(pILIsEqual(pidlCurrentFolder, pidlWineTestFolder), + ok(ILIsEqual(pidlCurrentFolder, pidlWineTestFolder), "IPersistFolder3_GetCurFolder should return pidlWineTestFolder!\n"); - pILFree(pidlCurrentFolder); - pILFree(pidlWineTestFolder); + ILFree(pidlCurrentFolder); + ILFree(pidlWineTestFolder); hr = IPersistFolder3_QueryInterface(pPersistFolder3, &IID_IShellFolder, (LPVOID*)&pShellFolder); IPersistFolder3_Release(pPersistFolder3); @@ -1691,7 +1511,7 @@ static void test_FolderShortcut(void) { return; } - pStrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); + StrRetToBufW(&strret, NULL, wszBuffer, MAX_PATH); ok(!lstrcmpiW(wszDesktopPath, wszBuffer), "FolderShortcut returned incorrect folder!\n"); /* Next few lines are meant to show that children of FolderShortcuts are not FolderShortcuts, @@ -1715,7 +1535,7 @@ static void test_FolderShortcut(void) { hr = IShellFolder_BindToObject(pShellFolder, pidlSubFolder, NULL, &IID_IPersistFolder3, (LPVOID*)&pPersistFolder3); IShellFolder_Release(pShellFolder); - pILFree(pidlSubFolder); + ILFree(pidlSubFolder); ok (hr == S_OK, "IShellFolder::BindToObject failed! hr = %08x\n", hr); if (hr != S_OK) return; @@ -1767,9 +1587,7 @@ static void test_ITEMIDLIST_format(void) { { 'l','o','n','g','e','r','_','t','h','a','n','.','8','_','3',0 } }; int i; - if (!pSHGetSpecialFolderPathW) return; - - bResult = pSHGetSpecialFolderPathW(NULL, wszPersonal, CSIDL_PERSONAL, FALSE); + bResult = SHGetSpecialFolderPathW(NULL, wszPersonal, CSIDL_PERSONAL, FALSE); ok(bResult, "SHGetSpecialFolderPathW failed! Last error: %u\n", GetLastError()); if (!bResult) return; @@ -1796,7 +1614,7 @@ static void test_ITEMIDLIST_format(void) { hr = IShellFolder_BindToObject(psfDesktop, pidlPersonal, NULL, &IID_IShellFolder, (LPVOID*)&psfPersonal); IShellFolder_Release(psfDesktop); - pILFree(pidlPersonal); + ILFree(pidlPersonal); ok(hr == S_OK, "psfDesktop->BindToObject failed! hr = %08x\n", hr); if (hr != S_OK) return; @@ -1837,13 +1655,10 @@ static void test_ITEMIDLIST_format(void) { * current habit of storing the long filename here, which seems to work * just fine. */ todo_wine - ok(pidlFile->mkid.abID[18] == '~' || - broken(pidlFile->mkid.abID[34] == '~'), /* Win2k */ - "Should be derived 8.3 name!\n"); + ok(pidlFile->mkid.abID[18] == '~', "Should be derived 8.3 name!\n"); if (i == 0) /* First file name has an even number of chars. No need for alignment. */ - ok(pidlFile->mkid.abID[12 + strlen(szFile) + 1] != '\0' || - broken(pidlFile->mkid.cb == 2 + 12 + strlen(szFile) + 1 + 1), /* Win2k */ + ok(pidlFile->mkid.abID[12 + strlen(szFile) + 1] != '\0', "Alignment byte, where there shouldn't be!\n"); if (i == 1) /* Second file name has an uneven number of chars => alignment byte */ @@ -1853,9 +1668,7 @@ static void test_ITEMIDLIST_format(void) { /* The offset of the FileStructW member is stored as a WORD at the end of the pidl. */ cbOffset = *(WORD*)(((LPBYTE)pidlFile)+pidlFile->mkid.cb-sizeof(WORD)); ok ((cbOffset >= sizeof(struct FileStructA) && - cbOffset <= pidlFile->mkid.cb - sizeof(struct FileStructW)) || - broken(pidlFile->mkid.cb == 2 + 12 + strlen(szFile) + 1 + 1) || /* Win2k on short names */ - broken(pidlFile->mkid.cb == 2 + 12 + strlen(szFile) + 1 + 12 + 1), /* Win2k on long names */ + cbOffset <= pidlFile->mkid.cb - sizeof(struct FileStructW)), "Wrong offset value (%d) stored at the end of the PIDL\n", cbOffset); if (cbOffset >= sizeof(struct FileStructA) && @@ -1907,7 +1720,7 @@ static void test_ITEMIDLIST_format(void) { } } - pILFree(pidlFile); + ILFree(pidlFile); } IShellFolder_Release(psfPersonal); @@ -1923,16 +1736,11 @@ static void test_SHGetFolderPathA(void) HRESULT hr; HKEY key; - if (!pSHGetFolderPathA) - { - win_skip("SHGetFolderPathA not present\n"); - return; - } if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; - hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES, 0, SHGFP_TYPE_CURRENT, path ); + hr = SHGetFolderPathA( 0, CSIDL_PROGRAM_FILES, 0, SHGFP_TYPE_CURRENT, path ); ok( hr == S_OK, "SHGetFolderPathA failed %x\n", hr ); - hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILESX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); + hr = SHGetFolderPathA( 0, CSIDL_PROGRAM_FILESX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); if (hr == E_FAIL) { win_skip( "Program Files (x86) not supported\n" ); @@ -1965,9 +1773,9 @@ static void test_SHGetFolderPathA(void) RegCloseKey( key ); } - hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMON, 0, SHGFP_TYPE_CURRENT, path ); + hr = SHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMON, 0, SHGFP_TYPE_CURRENT, path ); ok( hr == S_OK, "SHGetFolderPathA failed %x\n", hr ); - hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMONX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); + hr = SHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMONX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); if (hr == E_FAIL) { win_skip( "Common Files (x86) not supported\n" ); @@ -2012,17 +1820,7 @@ static void test_SHGetFolderPathAndSubDirA(void) static char testpath[MAX_PATH]; static char toolongpath[MAX_PATH+1]; - if(!pSHGetFolderPathAndSubDirA) - { - win_skip("SHGetFolderPathAndSubDirA not present!\n"); - return; - } - - if(!pSHGetFolderPathA) { - win_skip("SHGetFolderPathA not present!\n"); - return; - } - if(FAILED(pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata))) + if(FAILED(SHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata))) { win_skip("SHGetFolderPathA failed for CSIDL_LOCAL_APPDATA!\n"); return; @@ -2043,11 +1841,11 @@ static void test_SHGetFolderPathAndSubDirA(void) } /* test invalid second parameter */ - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | 0xff, NULL, SHGFP_TYPE_CURRENT, wine, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | 0xff, NULL, SHGFP_TYPE_CURRENT, wine, testpath); ok(E_INVALIDARG == ret, "expected E_INVALIDARG, got %x\n", ret); /* test fourth parameter */ - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, 2, winetemp, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, 2, winetemp, testpath); switch(ret) { case S_OK: /* winvista */ ok(!strncmp(appdata, testpath, strlen(appdata)), @@ -2063,40 +1861,40 @@ static void test_SHGetFolderPathAndSubDirA(void) /* test fifth parameter */ testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, NULL, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, NULL, testpath); ok(S_OK == ret, "expected S_OK, got %x\n", ret); ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "", testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "", testpath); ok(S_OK == ret, "expected S_OK, got %x\n", ret); ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "\\", testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "\\", testpath); ok(S_OK == ret, "expected S_OK, got %x\n", ret); ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); for(i=0; i< MAX_PATH; i++) toolongpath[i] = '0' + i % 10; toolongpath[MAX_PATH] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, toolongpath, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, toolongpath, testpath); ok(HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE) == ret, "expected %x, got %x\n", HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), ret); testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, wine, NULL); - ok((S_OK == ret) || (E_INVALIDARG == ret), "expected S_OK or E_INVALIDARG, got %x\n", ret); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, wine, NULL); + ok((S_OK == ret) || (E_INVALIDARG == ret), "expected E_INVALIDARG, got %x\n", ret); /* test a not existing path */ testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); ok(HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) == ret, "expected %x, got %x\n", HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), ret); /* create a directory inside a not existing directory */ testpath[0] = '\0'; - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_CREATE | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); + ret = SHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_CREATE | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); ok(S_OK == ret, "expected S_OK, got %x\n", ret); ok(!strncmp(appdata, testpath, strlen(appdata)), "expected %s to start with %s\n", testpath, appdata); @@ -2181,13 +1979,12 @@ static void test_LocalizedNames(void) hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER, &strret); ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); - if (hr == S_OK && pStrRetToBufW) + if (hr == S_OK) { - hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + hr = StrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); todo_wine - ok (!lstrcmpiW(tempbufW, folderdisplayW) || - broken(!lstrcmpiW(tempbufW, foldernameW)), /* W2K */ + ok (!lstrcmpiW(tempbufW, folderdisplayW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); } @@ -2195,13 +1992,12 @@ static void test_LocalizedNames(void) hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER|SHGDN_FOREDITING, &strret); ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); - if (hr == S_OK && pStrRetToBufW) + if (hr == S_OK) { - hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + hr = StrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); todo_wine - ok (!lstrcmpiW(tempbufW, folderdisplayW) || - broken(!lstrcmpiW(tempbufW, foldernameW)), /* W2K */ + ok (!lstrcmpiW(tempbufW, folderdisplayW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); } @@ -2209,9 +2005,9 @@ static void test_LocalizedNames(void) hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER|SHGDN_FORPARSING, &strret); ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); - if (hr == S_OK && pStrRetToBufW) + if (hr == S_OK) { - hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + hr = StrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); ok (!lstrcmpiW(tempbufW, foldernameW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); } @@ -2253,16 +2049,8 @@ static void test_SHCreateShellItem(void) return; } - if(pSHGetSpecialFolderLocation) - { - ret = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); - ok(ret == S_OK, "Got 0x%08x\n", ret); - } - else - { - win_skip("pSHGetSpecialFolderLocation missing.\n"); - pidl_desktop = NULL; - } + ret = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + ok(ret == S_OK, "Got 0x%08x\n", ret); MultiByteToWideChar(CP_ACP, 0, curdirA, -1, curdirW, MAX_PATH); @@ -2280,7 +2068,7 @@ static void test_SHCreateShellItem(void) ret = IShellFolder_ParseDisplayName(currentfolder, NULL, NULL, testfileW, NULL, &pidl_testfile, NULL); ok(SUCCEEDED(ret), "ParseDisplayName returned %x\n", ret); - pidl_abstestfile = pILCombine(pidl_cwd, pidl_testfile); + pidl_abstestfile = ILCombine(pidl_cwd, pidl_testfile); shellitem = (void*)0xdeadbeef; ret = pSHCreateShellItem(NULL, NULL, NULL, &shellitem); @@ -2308,7 +2096,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_cwd, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2328,7 +2116,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_abstestfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2346,7 +2134,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_cwd, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2369,7 +2157,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_abstestfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2390,7 +2178,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_abstestfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2410,7 +2198,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_testfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2495,7 +2283,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_cwd, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2515,7 +2303,7 @@ static void test_SHCreateShellItem(void) if (SUCCEEDED(ret)) { ok(ILIsEqual(pidl_testfile, pidl_test), "id lists are not equal\n"); - pILFree(pidl_test); + ILFree(pidl_test); } IPersistIDList_Release(persistidl); } @@ -2592,7 +2380,7 @@ static void test_SHCreateShellItem(void) ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); ok(ret == S_OK, "IShellItem_Compare fail: 0x%08x.\n", ret); ok(!order, "order got wrong value: %d.\n", order); - pILFree(pidl_desktop_testfile); + ILFree(pidl_desktop_testfile); IShellItem_Release(shellitem2); IShellItem_Release(shellitem); @@ -2683,7 +2471,7 @@ static void test_SHCreateShellItem(void) ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); ok(ret == S_OK, "IShellItem_Compare failed: 0x%08x.\n", ret); ok(!order, "order got wrong value: %d.\n", order); - pILFree(pidl_desktop_testfile); + ILFree(pidl_desktop_testfile); IShellItem_Release(shellitem2); IShellItem_Release(shellitem); @@ -2715,10 +2503,10 @@ static void test_SHCreateShellItem(void) win_skip("No SHCreateItemInKnownFolder or SHGetKnownFolderPath\n"); DeleteFileA(".\\testfile"); - pILFree(pidl_abstestfile); - pILFree(pidl_testfile); - pILFree(pidl_desktop); - pILFree(pidl_cwd); + ILFree(pidl_abstestfile); + ILFree(pidl_testfile); + ILFree(pidl_desktop); + ILFree(pidl_cwd); IShellFolder_Release(currentfolder); IShellFolder_Release(desktopfolder); } @@ -2742,11 +2530,8 @@ static void test_SHGetNameFromIDList(void) return; } - /* These should be available on any platform that passed the above test. */ + /* This should be available on any platform that passed the above test. */ ok(pSHCreateShellItem != NULL, "SHCreateShellItem missing.\n"); - ok(pSHBindToParent != NULL, "SHBindToParent missing.\n"); - ok(pSHGetSpecialFolderLocation != NULL, "SHGetSpecialFolderLocation missing.\n"); - ok(pStrRetToBufW != NULL, "StrRetToBufW missing.\n"); if(0) { @@ -2758,7 +2543,7 @@ static void test_SHGetNameFromIDList(void) ok(hres == E_INVALIDARG, "Got 0x%08x\n", hres); /* Test the desktop */ - hres = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl); + hres = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl); ok(hres == S_OK, "Got 0x%08x\n", hres); hres = pSHCreateShellItem(NULL, NULL, pidl, &shellitem); ok(hres == S_OK, "Got 0x%08x\n", hres); @@ -2786,7 +2571,7 @@ static void test_SHGetNameFromIDList(void) if(SUCCEEDED(hrSF)) { - pStrRetToBufW(&strret, NULL, buf, MAX_PATH); + StrRetToBufW(&strret, NULL, buf, MAX_PATH); if(SUCCEEDED(hrSI)) ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); if(SUCCEEDED(hrSF)) @@ -2797,16 +2582,13 @@ static void test_SHGetNameFromIDList(void) } IShellFolder_Release(psf); - if(pSHGetPathFromIDListW){ - hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); - ok(hrSI == S_OK, "Got 0x%08x\n", hrSI); - res = pSHGetPathFromIDListW(pidl, buf); - ok(res == TRUE, "Got %d\n", res); - if(SUCCEEDED(hrSI) && res) - ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); - if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); - }else - win_skip("pSHGetPathFromIDListW not available\n"); + hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); + ok(hrSI == S_OK, "Got 0x%08x\n", hrSI); + res = SHGetPathFromIDListW(pidl, buf); + ok(res == TRUE, "Got %d\n", res); + if(SUCCEEDED(hrSI) && res) + ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); + if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); hres = pSHGetNameFromIDList(pidl, SIGDN_URL, &name_string); todo_wine ok(hres == S_OK, "Got 0x%08x\n", hres); @@ -2814,10 +2596,10 @@ static void test_SHGetNameFromIDList(void) IShellItem_Release(shellitem); } - pILFree(pidl); + ILFree(pidl); /* Test the control panel */ - hres = pSHGetSpecialFolderLocation(NULL, CSIDL_CONTROLS, &pidl); + hres = SHGetSpecialFolderLocation(NULL, CSIDL_CONTROLS, &pidl); ok(hres == S_OK, "Got 0x%08x\n", hres); hres = pSHCreateShellItem(NULL, NULL, pidl, &shellitem); ok(hres == S_OK, "Got 0x%08x\n", hres); @@ -2845,7 +2627,7 @@ static void test_SHGetNameFromIDList(void) if(SUCCEEDED(hrSF)) { - pStrRetToBufW(&strret, NULL, buf, MAX_PATH); + StrRetToBufW(&strret, NULL, buf, MAX_PATH); if(SUCCEEDED(hrSI)) ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); if(SUCCEEDED(hrSF)) @@ -2856,16 +2638,13 @@ static void test_SHGetNameFromIDList(void) } IShellFolder_Release(psf); - if(pSHGetPathFromIDListW){ - hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); - ok(hrSI == E_INVALIDARG, "Got 0x%08x\n", hrSI); - res = pSHGetPathFromIDListW(pidl, buf); - ok(res == FALSE, "Got %d\n", res); - if(SUCCEEDED(hrSI) && res) - ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); - if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); - }else - win_skip("pSHGetPathFromIDListW not available\n"); + hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); + ok(hrSI == E_INVALIDARG, "Got 0x%08x\n", hrSI); + res = SHGetPathFromIDListW(pidl, buf); + ok(res == FALSE, "Got %d\n", res); + if(SUCCEEDED(hrSI) && res) + ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); + if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); hres = pSHGetNameFromIDList(pidl, SIGDN_URL, &name_string); todo_wine ok(hres == E_NOTIMPL /* Win7 */ || hres == S_OK /* Vista */, @@ -2874,7 +2653,7 @@ static void test_SHGetNameFromIDList(void) IShellItem_Release(shellitem); } - pILFree(pidl); + ILFree(pidl); } static void test_SHGetItemFromDataObject(void) @@ -2979,7 +2758,7 @@ static void test_SHGetItemFromDataObject(void) skip("zero or one file found - skipping multi-file test.\n"); for(i = 0; i < count; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); IEnumIDList_Release(peidl); } @@ -3054,7 +2833,7 @@ static void test_ShellItemCompare(void) { hr = pSHCreateShellItem(NULL, NULL, pidl_testfile, &psi[i]); ok(hr == S_OK, "Got 0x%08x\n", hr); - pILFree(pidl_testfile); + ILFree(pidl_testfile); } if(FAILED(hr)) failed = TRUE; } @@ -3289,8 +3068,6 @@ static void test_SHGetIDListFromObject(void) return; } - ok(pSHGetSpecialFolderLocation != NULL, "SHGetSpecialFolderLocation missing.\n"); - if(0) { /* Crashes native */ @@ -3321,7 +3098,7 @@ static void test_SHGetIDListFromObject(void) HeapFree(GetProcessHeap(), 0, punkimpl); pidl_desktop = NULL; - pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); ok(pidl_desktop != NULL, "Failed to get desktop pidl.\n"); SHGetDesktopFolder(&psfdesktop); @@ -3339,7 +3116,7 @@ static void test_SHGetIDListFromObject(void) if(SUCCEEDED(hres)) { ok(ILIsEqual(pidl_desktop, pidl), "pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); } IShellItem_Release(shellitem); } @@ -3353,7 +3130,7 @@ static void test_SHGetIDListFromObject(void) if(SUCCEEDED(hres)) { ok(ILIsEqual(pidl_desktop, pidl), "pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); } hres = IShellFolder_CreateViewObject(psfdesktop, NULL, &IID_IShellView, (void**)&psv); @@ -3370,7 +3147,7 @@ static void test_SHGetIDListFromObject(void) if(SUCCEEDED(hres)) { ok(ILIsEqual(pidl_desktop, pidl), "pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); } /* Test IDataObject */ @@ -3397,7 +3174,7 @@ static void test_SHGetIDListFromObject(void) ok(hres == S_OK, "got 0x%08x\n", hres); ok(pidl != NULL, "pidl is NULL.\n"); ok(ILIsEqual(pidl, apidl[0]), "pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); IDataObject_Release(pdo); } @@ -3425,7 +3202,7 @@ static void test_SHGetIDListFromObject(void) skip("zero or one file found - skipping multi-file test.\n"); for(i = 0; i < count; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); IEnumIDList_Release(peidl); } @@ -3434,7 +3211,7 @@ static void test_SHGetIDListFromObject(void) } IShellFolder_Release(psfdesktop); - pILFree(pidl_desktop); + ILFree(pidl_desktop); } static void test_SHGetItemFromObject(void) @@ -3527,8 +3304,6 @@ static void test_SHCreateShellItemArray(void) return; } - ok(pSHGetSpecialFolderLocation != NULL, "SHGetSpecialFolderLocation missing.\n"); - if(0) { /* Crashes under native */ @@ -3548,10 +3323,10 @@ static void test_SHCreateShellItemArray(void) hr = pSHCreateShellItemArray(NULL, pdesktopsf, 1, NULL, &psia); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl); + SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl); hr = pSHCreateShellItemArray(pidl, NULL, 0, NULL, &psia); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - pILFree(pidl); + ILFree(pidl); GetCurrentDirectoryW(MAX_PATH, cTestDirW); myPathAddBackslashW(cTestDirW); @@ -3572,7 +3347,7 @@ static void test_SHCreateShellItemArray(void) if(FAILED(hr)) { skip("Failed to set up environment for SHCreateShellItemArray tests.\n"); - pILFree(pidl_testdir); + ILFree(pidl_testdir); Cleanup(); return; } @@ -3624,14 +3399,14 @@ static void test_SHCreateShellItemArray(void) if(SUCCEEDED(hr)) { ok(ILIsEqual(pidl_abs, pidl), "Pidl not equal.\n"); - pILFree(pidl); + ILFree(pidl); } IShellItem_Release(psi); } - pILFree(pidl_abs); + ILFree(pidl_abs); } for(i = 0; i < done; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); IShellItemArray_Release(psia); } } @@ -3676,8 +3451,8 @@ static void test_SHCreateShellItemArray(void) ok(hr == S_OK, "Got 0x%08x\n", hr); ok(pidl2 != NULL, "pidl2 was null.\n"); ok(ILIsEqual(pidl1, pidl2), "pidls not equal.\n"); - pILFree(pidl1); - pILFree(pidl2); + ILFree(pidl1); + ILFree(pidl2); IShellItem_Release(psi2); } hr = IShellItemArray_GetItemAt(psia, 1, &psi2); @@ -3752,10 +3527,10 @@ static void test_SHCreateShellItemArray(void) ok(hr == S_OK, "Got 0x%08x\n", hr); ok(pidl != NULL, "pidl as NULL.\n"); ok(ILIsEqual(pidl, pidl_abs), "pidls differ.\n"); - pILFree(pidl); + ILFree(pidl); IShellItem_Release(psi); } - pILFree(pidl_abs); + ILFree(pidl_abs); } IShellItemArray_Release(psia); @@ -3764,7 +3539,7 @@ static void test_SHCreateShellItemArray(void) IDataObject_Release(pdo); } for(i = 0; i < count; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); } else skip("No files found - skipping test.\n"); @@ -3843,7 +3618,7 @@ static void test_SHCreateShellItemArray(void) WCHAR desktoppath[MAX_PATH]; BOOL result; - result = pSHGetSpecialFolderPathW(NULL, desktoppath, CSIDL_DESKTOPDIRECTORY, FALSE); + result = SHGetSpecialFolderPathW(NULL, desktoppath, CSIDL_DESKTOPDIRECTORY, FALSE); ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOPDIRECTORY) failed! %u\n", GetLastError()); hr = IShellItem_GetDisplayName(psi, SIGDN_DESKTOPABSOLUTEPARSING, &path); @@ -3948,7 +3723,7 @@ static void test_SHCreateShellItemArray(void) IShellItemArray_Release(psia); } - pILFree(pidltest1); + ILFree(pidltest1); } IShellFolder_Release(pdesktopsf); @@ -3957,7 +3732,7 @@ static void test_SHCreateShellItemArray(void) skip("No SHCreateShellItemArrayFromIDLists.\n"); IShellFolder_Release(psf); - pILFree(pidl_testdir); + ILFree(pidl_testdir); Cleanup(); } @@ -3991,7 +3766,7 @@ static void test_ShellItemArrayEnumItems(void) hr = IShellFolder_BindToObject(pdesktopsf, pidl_testdir, NULL, (REFIID)&IID_IShellFolder, (void**)&psf); ok(hr == S_OK, "Got 0x%08x\n", hr); - pILFree(pidl_testdir); + ILFree(pidl_testdir); } IShellFolder_Release(pdesktopsf); if (FAILED(hr)) return; @@ -4110,7 +3885,7 @@ static void test_ShellItemArrayEnumItems(void) } for(i = 0; i < done; i++) - pILFree(apidl[i]); + ILFree(apidl[i]); } } @@ -4127,7 +3902,7 @@ static void test_ShellItemBindToHandler(void) return; } - hr = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + hr = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { @@ -4162,7 +3937,7 @@ static void test_ShellItemBindToHandler(void) if(SUCCEEDED(hr)) { ok(ILIsEqual(pidl_desktop, pidl_tmp), "Pidl not equal (%p, %p)\n", pidl_desktop, pidl_tmp); - pILFree(pidl_tmp); + ILFree(pidl_tmp); } IPersistFolder2_Release(ppf2); } @@ -4276,7 +4051,7 @@ static void test_ShellItemBindToHandler(void) else skip("Failed to create ShellItem.\n"); - pILFree(pidl_desktop); + ILFree(pidl_desktop); } static void test_ShellItemGetAttributes(void) @@ -4297,13 +4072,13 @@ static void test_ShellItemGetAttributes(void) return; } - hr = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + hr = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { hr = pSHCreateShellItem(NULL, NULL, pidl_desktop, &psi); ok(hr == S_OK, "Got 0x%08x\n", hr); - pILFree(pidl_desktop); + ILFree(pidl_desktop); } if(FAILED(hr)) { @@ -4338,7 +4113,7 @@ static void test_ShellItemGetAttributes(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = pSHCreateShellItem(NULL, NULL, pidl, &psi_folder1); ok(hr == S_OK, "Got 0x%08x\n", sfgao); - pILFree(pidl); + ILFree(pidl); lstrcpyW(buf, curdirW); lstrcatW(buf, testfile1W); @@ -4346,7 +4121,7 @@ static void test_ShellItemGetAttributes(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = pSHCreateShellItem(NULL, NULL, pidl, &psi_file1); ok(hr == S_OK, "Got 0x%08x\n", sfgao); - pILFree(pidl); + ILFree(pidl); IShellFolder_Release(pdesktopsf); @@ -4421,7 +4196,7 @@ static void test_ShellItemArrayGetAttributes(void) ok(hr == S_OK, "got 0x%08x\n", hr); for(i = 0; i < 5; i++) - pILFree((LPITEMIDLIST)pidl_array[i]); + ILFree((LPITEMIDLIST)pidl_array[i]); /* [testfolder/, testfolder/testfolder2] seems to break in Vista */ attr = 0xdeadbeef; @@ -4477,71 +4252,65 @@ static void test_SHParseDisplayName(void) HRESULT hr; BOOL ret, is_wow64; - if (!pSHParseDisplayName) - { - win_skip("SHParseDisplayName isn't available\n"); - return; - } - if (0) { /* crashes on native */ - pSHParseDisplayName(NULL, NULL, NULL, 0, NULL); + SHParseDisplayName(NULL, NULL, NULL, 0, NULL); nameW[0] = 0; - pSHParseDisplayName(nameW, NULL, NULL, 0, NULL); + SHParseDisplayName(nameW, NULL, NULL, 0, NULL); } pidl1 = (LPITEMIDLIST)0xdeadbeef; - hr = pSHParseDisplayName(NULL, NULL, &pidl1, 0, NULL); + hr = SHParseDisplayName(NULL, NULL, &pidl1, 0, NULL); ok(broken(hr == E_OUTOFMEMORY) /* < Vista */ || hr == E_INVALIDARG, "failed %08x\n", hr); ok(pidl1 == 0, "expected null ptr, got %p\n", pidl1); /* dummy name */ nameW[0] = 0; - hr = pSHParseDisplayName(nameW, NULL, &pidl1, 0, NULL); + hr = SHParseDisplayName(nameW, NULL, &pidl1, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); hr = SHGetDesktopFolder(&desktop); ok(hr == S_OK, "failed %08x\n", hr); hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, nameW, NULL, &pidl2, NULL); ok(hr == S_OK, "failed %08x\n", hr); - ret = pILIsEqual(pidl1, pidl2); + ret = ILIsEqual(pidl1, pidl2); ok(ret == TRUE, "expected equal idls\n"); - pILFree(pidl1); - pILFree(pidl2); + ILFree(pidl1); + ILFree(pidl2); /* with path */ GetWindowsDirectoryW( dirW, MAX_PATH ); - hr = pSHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); + hr = SHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, dirW, NULL, &pidl2, NULL); ok(hr == S_OK, "failed %08x\n", hr); - ret = pILIsEqual(pidl1, pidl2); + ret = ILIsEqual(pidl1, pidl2); ok(ret == TRUE, "expected equal idls\n"); - pILFree(pidl1); - pILFree(pidl2); + ILFree(pidl1); + ILFree(pidl2); /* system32 is not redirected to syswow64 on WOW64 */ if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; - if (is_wow64 && pGetSystemWow64DirectoryW) + if (is_wow64) { UINT len; *dirW = 0; len = GetSystemDirectoryW(dirW, MAX_PATH); ok(len > 0, "GetSystemDirectoryW failed: %u\n", GetLastError()); - hr = pSHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); + hr = SHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); *dirW = 0; - len = pGetSystemWow64DirectoryW(dirW, MAX_PATH); + len = GetSystemWow64DirectoryW(dirW, MAX_PATH); ok(len > 0, "GetSystemWow64DirectoryW failed: %u\n", GetLastError()); - hr = pSHParseDisplayName(dirW, NULL, &pidl2, 0, NULL); + hr = SHParseDisplayName(dirW, NULL, &pidl2, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); - ret = pILIsEqual(pidl1, pidl2); + ret = ILIsEqual(pidl1, pidl2); ok(ret == FALSE, "expected different idls\n"); - pILFree(pidl1); - pILFree(pidl2); + ILFree(pidl1); + ILFree(pidl2); } IShellFolder_Release(desktop); @@ -4559,7 +4328,7 @@ static void test_desktop_IPersist(void) ok(hr == S_OK, "failed %08x\n", hr); hr = IShellFolder_QueryInterface(desktop, &IID_IPersist, (void**)&persist); - ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* NT4, W9X */, "failed %08x\n", hr); + ok(hr == S_OK, "failed %08x\n", hr); if (hr == S_OK) { @@ -4595,7 +4364,7 @@ static void test_desktop_IPersist(void) hr = IPersistFolder2_GetCurFolder(ppf2, &pidl); ok(hr == S_OK, "got %08x\n", hr); ok(pidl != NULL, "pidl was NULL.\n"); - if(SUCCEEDED(hr)) pILFree(pidl); + if(SUCCEEDED(hr)) ILFree(pidl); IPersistFolder2_Release(ppf2); } @@ -4613,12 +4382,6 @@ static void test_GetUIObject(void) const WCHAR filename[] = {'\\','t','e','s','t','d','i','r','\\','t','e','s','t','1','.','t','x','t',0}; - if(!pSHBindToParent) - { - win_skip("SHBindToParent missing.\n"); - return; - } - GetCurrentDirectoryW(MAX_PATH, path); if (!path[0]) { @@ -4631,12 +4394,12 @@ static void test_GetUIObject(void) CreateFilesFolders(); hr = IShellFolder_ParseDisplayName(psf_desktop, NULL, NULL, path, NULL, &pidl, 0); - ok(hr == S_OK || broken(hr == E_FAIL) /* WinME */, "Got 0x%08x\n", hr); + ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { IShellFolder *psf; LPCITEMIDLIST pidl_child; - hr = pSHBindToParent(pidl, &IID_IShellFolder, (void**)&psf, &pidl_child); + hr = SHBindToParent(pidl, &IID_IShellFolder, (void**)&psf, &pidl_child); ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { @@ -4692,9 +4455,7 @@ static void test_GetUIObject(void) (max_id_check == max_id-2), /* Win 8 */ "Not equal (or near equal), got %d and %d\n", max_id_check, max_id); -#define is_win2k() (pSHGetFolderPathA && !pSHGetFolderPathAndSubDirA) - - if(count && !is_win2k()) /* Test is interactive on w2k, so skip */ + if(count) { CMINVOKECOMMANDINFO cmi; ZeroMemory(&cmi, sizeof(CMINVOKECOMMANDINFO)); @@ -4711,14 +4472,13 @@ static void test_GetUIObject(void) (hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Vista */), "Got 0x%08x\n", hr); } -#undef is_win2k DestroyMenu(hmenu); IContextMenu_Release(pcm); } IShellFolder_Release(psf); } - if(pILFree) pILFree(pidl); + ILFree(pidl); } IShellFolder_Release(psf_desktop); @@ -4733,22 +4493,13 @@ static void r_verify_pidl(unsigned l, LPCITEMIDLIST pidl, const WCHAR *path) STRRET filename; HRESULT hr; - if(!pSHBindToParent){ - win_skip("SHBindToParent is not available, not performing full PIDL verification\n"); - if(path) - ok_(__FILE__,l)(pidl != NULL, "Expected PIDL to be non-NULL\n"); - else - ok_(__FILE__,l)(pidl == NULL, "Expected PIDL to be NULL\n"); - return; - } - if(path){ if(!pidl){ ok_(__FILE__,l)(0, "didn't get expected path (%s), instead: NULL\n", wine_dbgstr_w(path)); return; } - hr = pSHBindToParent(pidl, &IID_IShellFolder, (LPVOID*)&parent, &child); + hr = SHBindToParent(pidl, &IID_IShellFolder, (LPVOID*)&parent, &child); ok_(__FILE__,l)(hr == S_OK, "SHBindToParent failed: 0x%08x\n", hr); if(FAILED(hr)) return; @@ -4786,30 +4537,25 @@ static void test_SHSimpleIDListFromPath(void) LPITEMIDLIST pidl = NULL; - if(!pSHSimpleIDListFromPathAW){ - win_skip("SHSimpleIDListFromPathAW not available\n"); - return; - } - br = CreateDirectoryA(adirA, NULL); ok(br == TRUE, "CreateDirectory failed: %d\n", GetLastError()); if(is_unicode) - pidl = pSHSimpleIDListFromPathAW(adirW); + pidl = SHSimpleIDListFromPath(adirW); else - pidl = pSHSimpleIDListFromPathAW(adirA); + pidl = SHSimpleIDListFromPath((const WCHAR *)adirA); verify_pidl(pidl, adirW); - pILFree(pidl); + ILFree(pidl); br = RemoveDirectoryA(adirA); ok(br == TRUE, "RemoveDirectory failed: %d\n", GetLastError()); if(is_unicode) - pidl = pSHSimpleIDListFromPathAW(adirW); + pidl = SHSimpleIDListFromPath(adirW); else - pidl = pSHSimpleIDListFromPathAW(adirA); + pidl = SHSimpleIDListFromPath((const WCHAR *)adirA); verify_pidl(pidl, adirW); - pILFree(pidl); + ILFree(pidl); } /* IFileSystemBindData impl */ @@ -4920,28 +4666,22 @@ static void test_ParseDisplayNamePBC(void) /* fails on unknown dir with no IBindCtx */ hres = IShellFolder_ParseDisplayName(psf, NULL, NULL, adirW, NULL, &pidl, NULL); - ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed with wrong error: 0x%08x\n", hres); + ok(hres == exp_err, "ParseDisplayName failed with wrong error: 0x%08x\n", hres); hres = IShellFolder_ParseDisplayName(psf, NULL, NULL, afileW, NULL, &pidl, NULL); - ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed with wrong error: 0x%08x\n", hres); + ok(hres == exp_err, "ParseDisplayName failed with wrong error: 0x%08x\n", hres); hres = IShellFolder_ParseDisplayName(psf, NULL, NULL, afile2W, NULL, &pidl, NULL); - ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed with wrong error: 0x%08x\n", hres); + ok(hres == exp_err, "ParseDisplayName failed with wrong error: 0x%08x\n", hres); /* fails on unknown dir with IBindCtx with no IFileSystemBindData */ hres = CreateBindCtx(0, &pbc); ok(hres == S_OK, "CreateBindCtx failed: 0x%08x\n", hres); hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, adirW, NULL, &pidl, NULL); - ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed with wrong error: 0x%08x\n", hres); + ok(hres == exp_err, "ParseDisplayName failed with wrong error: 0x%08x\n", hres); hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); - ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed with wrong error: 0x%08x\n", hres); + ok(hres == exp_err, "ParseDisplayName failed with wrong error: 0x%08x\n", hres); hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); - ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed with wrong error: 0x%08x\n", hres); + ok(hres == exp_err, "ParseDisplayName failed with wrong error: 0x%08x\n", hres); /* unknown dir with IBindCtx with IFileSystemBindData */ hres = IBindCtx_RegisterObjectParam(pbc, wFileSystemBindData, (IUnknown*)&fsbd); @@ -4951,24 +4691,21 @@ static void test_ParseDisplayNamePBC(void) pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_fail; hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, adirW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, adirW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afileW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afile2W); ILFree(pidl); @@ -4978,24 +4715,21 @@ static void test_ParseDisplayNamePBC(void) pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_nul; hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, adirW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, adirW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afileW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afile2W); ILFree(pidl); @@ -5005,24 +4739,21 @@ static void test_ParseDisplayNamePBC(void) pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_junk; hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, adirW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, adirW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afileW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afile2W); ILFree(pidl); @@ -5032,24 +4763,21 @@ static void test_ParseDisplayNamePBC(void) pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_invalid; hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, adirW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, adirW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afileW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afile2W); ILFree(pidl); @@ -5059,24 +4787,21 @@ static void test_ParseDisplayNamePBC(void) pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_valid; hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, adirW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, adirW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afileW); ILFree(pidl); } hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); - ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, - "ParseDisplayName failed: 0x%08x\n", hres); + ok(hres == S_OK, "ParseDisplayName failed: 0x%08x\n", hres); if(SUCCEEDED(hres)){ verify_pidl(pidl, afile2W); ILFree(pidl); @@ -5207,9 +4932,9 @@ static void test_SHChangeNotify(BOOL test_new_delivery) entries[0].pidl = NULL; if(has_unicode) - hr = pSHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); + hr = SHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); else - hr = pSHILCreateFromPath((LPCVOID)root_dirA, (LPITEMIDLIST*)&entries[0].pidl, 0); + hr = SHILCreateFromPath((LPCVOID)root_dirA, (LPITEMIDLIST*)&entries[0].pidl, 0); ok(hr == S_OK, "SHILCreateFromPath failed: 0x%08x\n", hr); entries[0].fRecursive = TRUE; @@ -5271,12 +4996,6 @@ static void test_SHCreateDefaultContextMenu(void) return; } - if(!pSHBindToParent) - { - skip("SHBindToParent missing.\n"); - return; - } - GetCurrentDirectoryW(MAX_PATH, path); if (!path[0]) { @@ -5289,11 +5008,11 @@ static void test_SHCreateDefaultContextMenu(void) CreateFilesFolders(); hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, path, NULL, &pidl, 0); - ok(hr == S_OK || broken(hr == E_FAIL) /* WinME */, "Got 0x%08x\n", hr); + ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { - hr = pSHBindToParent(pidl, &IID_IShellFolder, (void**)&folder, (LPCITEMIDLIST*)&pidl_child); + hr = SHBindToParent(pidl, &IID_IShellFolder, (void**)&folder, (LPCITEMIDLIST*)&pidl_child); ok(hr == S_OK, "Got 0x%08x\n", hr); IShellFolder_QueryInterface(folder,&IID_IPersistFolder2,(void**)&persist); @@ -5366,7 +5085,7 @@ static void test_DataObject(void) hres = IShellFolder_GetUIObjectOf(desktop, NULL, 1, (LPCITEMIDLIST*)&apidl, &IID_IDataObject, NULL, (void**)&data_obj); ok(hres == S_OK, "got %x\n", hres); - pILFree(apidl); + ILFree(apidl); IShellFolder_Release(desktop); cf_shellidlist = RegisterClipboardFormatW(CFSTR_SHELLIDLISTW); @@ -5498,7 +5217,7 @@ START_TEST(shlfolder) { init_function_pointers(); /* if OleInitialize doesn't get called, ParseDisplayName returns - CO_E_NOTINITIALIZED for malformed directory names on win2k. */ + CO_E_NOTINITIALIZED for malformed directory names */ OleInitialize(NULL); test_ParseDisplayName(); -- 2.15.1

2 2

[PATCH 1/4] ddraw/tests: Avoid touching unsupported clip planes.
by Józef Kucia 11 Jan '18

11 Jan '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- It seems to corrupt memory on Windows 10. The next test crashes. --- dlls/ddraw/tests/ddraw7.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d5969ab94929..c904e77849d7 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13340,7 +13340,7 @@ static void test_clip_planes_limits(void) trace("Max user clip planes: %u.\n", caps.wMaxUserClipPlanes); - for (i = 0; i < D3DMAXUSERCLIPPLANES; ++i) + for (i = 0; i < caps.wMaxUserClipPlanes; ++i) { memset(plane, 0xff, sizeof(plane)); hr = IDirect3DDevice7_GetClipPlane(device, i, plane); @@ -13353,13 +13353,13 @@ static void test_clip_planes_limits(void) plane[0] = 2.0f; plane[1] = 8.0f; plane[2] = 5.0f; - for (i = 0; i < D3DMAXUSERCLIPPLANES; ++i) + for (i = 0; i < caps.wMaxUserClipPlanes; ++i) { plane[3] = i; hr = IDirect3DDevice7_SetClipPlane(device, i, plane); ok(hr == D3D_OK, "Failed to set clip plane %u, hr %#x.\n", i, hr); } - for (i = 0; i < D3DMAXUSERCLIPPLANES; ++i) + for (i = 0; i < caps.wMaxUserClipPlanes; ++i) { memset(plane, 0xff, sizeof(plane)); hr = IDirect3DDevice7_GetClipPlane(device, i, plane); -- 2.13.6

3 8

[v2 PATCH] ddraw/tests: Move CreateSurface() invalid arguments test
by Nikolay Sivov 11 Jan '18

11 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: moved to different test function dlls/ddraw/tests/ddraw1.c | 13 +++++++++++ dlls/ddraw/tests/ddraw2.c | 13 +++++++++++ dlls/ddraw/tests/ddraw4.c | 13 +++++++++++ dlls/ddraw/tests/ddraw7.c | 13 +++++++++++ dlls/ddraw/tests/dsurface.c | 55 --------------------------------------------- 5 files changed, 52 insertions(+), 55 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d276565763..d1f28a2752 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3320,6 +3320,19 @@ static void test_coop_level_surf_create(void) ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + surface = (void *)0xdeadbeef; + hr = IDirectDraw_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + surface = (void *)0xdeadbeef; + hr = IDirectDraw_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Unexpected hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + IDirectDraw_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8b23c01b07..eb1385a87e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -3521,6 +3521,19 @@ static void test_coop_level_surf_create(void) ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + surface = (void *)0xdeadbeef; + hr = IDirectDraw2_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + surface = (void *)0xdeadbeef; + hr = IDirectDraw2_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Unexpected hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + IDirectDraw2_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 5eb391abd9..d8ea3a773e 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3652,6 +3652,19 @@ static void test_coop_level_surf_create(void) ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + surface = (void *)0xdeadbeef; + hr = IDirectDraw4_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + surface = (void *)0xdeadbeef; + hr = IDirectDraw4_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Unexpected hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + IDirectDraw4_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d5969ab949..8eecde0196 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3382,6 +3382,19 @@ static void test_coop_level_surf_create(void) ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + surface = (void *)0xdeadbeef; + hr = IDirectDraw7_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + surface = (void *)0xdeadbeef; + hr = IDirectDraw7_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Unexpected hr %#x.\n", hr); + ok(surface == (void *)0xdeadbeef, "Got unexpected surface %p.\n", surface); + IDirectDraw7_Release(ddraw); } diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 0f775a0062..90de8b00b2 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2476,60 +2476,6 @@ static void partial_block_lock_test(void) IDirectDraw7_Release(dd7); } -static void create_surface_test(void) -{ - HRESULT hr; - IDirectDraw2 *ddraw2; - IDirectDraw4 *ddraw4; - IDirectDraw7 *ddraw7; - IDirectDrawSurface *surface; - IDirectDrawSurface4 *surface4; - IDirectDrawSurface7 *surface7; - - hr = IDirectDraw_CreateSurface(lpDD, NULL, &surface, NULL); - ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," - " expected %#x.\n", hr, DDERR_INVALIDPARAMS); - - hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &ddraw2); - ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); - - hr = IDirectDraw2_CreateSurface(ddraw2, NULL, &surface, NULL); - ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," - " expected %#x.\n", hr, DDERR_INVALIDPARAMS); - - IDirectDraw2_Release(ddraw2); - - hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &ddraw4); - ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); - - hr = IDirectDraw4_CreateSurface(ddraw4, NULL, &surface4, NULL); - ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," - " expected %#x.\n", hr, DDERR_INVALIDPARAMS); - - IDirectDraw4_Release(ddraw4); - - if (!pDirectDrawCreateEx) - { - skip("DirectDrawCreateEx not available, skipping IDirectDraw7 tests.\n"); - return; - } - hr = pDirectDrawCreateEx(NULL, (void **) &ddraw7, &IID_IDirectDraw7, NULL); - ok(SUCCEEDED(hr), "DirectDrawCreateEx failed, hr %#x.\n", hr); - - hr = IDirectDraw7_CreateSurface(ddraw7, NULL, &surface7, NULL); - ok(hr == DDERR_NOCOOPERATIVELEVELSET, "CreateSurface(ddsd=NULL, pre-SCL) returned %#x," - " expected %#x.\n", hr, DDERR_NOCOOPERATIVELEVELSET); - - hr = IDirectDraw7_SetCooperativeLevel(ddraw7, NULL, DDSCL_NORMAL); - ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); - - hr = IDirectDraw7_CreateSurface(ddraw7, NULL, &surface7, NULL); - ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," - " expected %#x.\n", hr, DDERR_INVALIDPARAMS); - - IDirectDraw7_Release(ddraw7); -} - START_TEST(dsurface) { HRESULT ret; @@ -2581,6 +2527,5 @@ START_TEST(dsurface) zbufferbitdepth_test(); pixelformat_flag_test(); partial_block_lock_test(); - create_surface_test(); ReleaseDirectDraw(); } -- 2.15.1

2 1

[PATCH 1/1] wininet: Fix crash when connection is null in NETCON_secure_connect
by Wei Xie 11 Jan '18

11 Jan '18

request->netconn may be released before call NETCON_secure_connect. 5029 if(!request->contentLength) 5030 http_release_netconn(request, TRUE); 5121 if (secure_proxy_connect && request->status_code == HTTP_STATUS_OK) 5122 { 5123 res = NETCON_secure_connect(request->netconn, request->server); I don't know how write a test patch ------------------ 武汉深之度科技有限公司 Wuhan Deepin Technology Co., Ltd. 　　谢威手机：18038104349 武汉：武汉市光谷大道77号光谷金融港B18栋6楼北京：北京市西城区新街口外大街28号院普天德胜B座603室上海：上海市长宁区愚园路1258号15A01室官网：www.deepin.org　　官博：深度操作系统

2 3

[PATCH] services/tests: Fix resource leak.
by Andrey Gusev 11 Jan '18

11 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- programs/services/tests/service.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 98419497a5..728d515f85 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -561,6 +561,7 @@ static void test_runner(void (*p_run_test)(void)) WaitForSingleObject(thread, INFINITE); CloseHandle(event_handle); CloseHandle(pipe_handle); + CloseHandle(thread); } START_TEST(service) -- 2.13.6

1 0

[PATCH 2/2] kernel32: Return the list of module handles even if needed argument is null.
by Akihiro Sagawa 11 Jan '18

11 Jan '18

Touhou Shinpiroku relays on this behaviour. Fixes Bug 44347. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/module.c | 14 ++++++++++---- dlls/psapi/tests/psapi_main.c | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-)

1 0

[PATCH 1/2] psapi/tests: Add more EnumProcessModules tests.
by Akihiro Sagawa 11 Jan '18

11 Jan '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/psapi/tests/psapi_main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)

1 0

[PATCH] ddraw/tests: Move CreateSurface() invalid arguments test
by Nikolay Sivov 11 Jan '18

11 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 15 +++++++++++++ dlls/ddraw/tests/ddraw2.c | 15 +++++++++++++ dlls/ddraw/tests/ddraw4.c | 15 +++++++++++++ dlls/ddraw/tests/ddraw7.c | 15 +++++++++++++ dlls/ddraw/tests/dsurface.c | 55 --------------------------------------------- 5 files changed, 60 insertions(+), 55 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d276565763..7aad9ecac5 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2012,6 +2012,21 @@ static void test_surface_qi(void) IDirectDrawSurface_Release(surface); IDirectDraw_Release(ddraw); DestroyWindow(window); + + /* Invalid arguments. */ + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Unexpected hr %#x.\n", hr); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Unexpected hr %#x.\n", hr); + + IDirectDraw_Release(ddraw); } static void test_device_qi(void) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8b23c01b07..e39392e20e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2127,6 +2127,21 @@ static void test_surface_qi(void) IDirectDrawSurface_Release(surface); IDirectDraw2_Release(ddraw); DestroyWindow(window); + + /* Invalid arguments. */ + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw2_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Unexpected hr %#x.\n", hr); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw2_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Unexpected hr %#x.\n", hr); + + IDirectDraw2_Release(ddraw); } static void test_device_qi(void) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 5eb391abd9..051826260b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2278,6 +2278,21 @@ static void test_surface_qi(void) IDirectDrawSurface4_Release(surface); IDirectDraw4_Release(ddraw); DestroyWindow(window); + + /* Invalid arguments. */ + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw4_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Unexpected hr %#x.\n", hr); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw4_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Unexpected hr %#x.\n", hr); + + IDirectDraw4_Release(ddraw); } static void test_device_qi(void) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d5969ab949..aeac144adc 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2009,6 +2009,21 @@ static void test_surface_qi(void) IDirectDrawSurface7_Release(surface); IDirectDraw7_Release(ddraw); DestroyWindow(window); + + /* Invalid arguments. */ + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw7_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Unexpected hr %#x.\n", hr); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw7_CreateSurface(ddraw, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Unexpected hr %#x.\n", hr); + + IDirectDraw7_Release(ddraw); } static void test_device_qi(void) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 0f775a0062..90de8b00b2 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2476,60 +2476,6 @@ static void partial_block_lock_test(void) IDirectDraw7_Release(dd7); } -static void create_surface_test(void) -{ - HRESULT hr; - IDirectDraw2 *ddraw2; - IDirectDraw4 *ddraw4; - IDirectDraw7 *ddraw7; - IDirectDrawSurface *surface; - IDirectDrawSurface4 *surface4; - IDirectDrawSurface7 *surface7; - - hr = IDirectDraw_CreateSurface(lpDD, NULL, &surface, NULL); - ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," - " expected %#x.\n", hr, DDERR_INVALIDPARAMS); - - hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &ddraw2); - ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); - - hr = IDirectDraw2_CreateSurface(ddraw2, NULL, &surface, NULL); - ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," - " expected %#x.\n", hr, DDERR_INVALIDPARAMS); - - IDirectDraw2_Release(ddraw2); - - hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &ddraw4); - ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); - - hr = IDirectDraw4_CreateSurface(ddraw4, NULL, &surface4, NULL); - ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," - " expected %#x.\n", hr, DDERR_INVALIDPARAMS); - - IDirectDraw4_Release(ddraw4); - - if (!pDirectDrawCreateEx) - { - skip("DirectDrawCreateEx not available, skipping IDirectDraw7 tests.\n"); - return; - } - hr = pDirectDrawCreateEx(NULL, (void **) &ddraw7, &IID_IDirectDraw7, NULL); - ok(SUCCEEDED(hr), "DirectDrawCreateEx failed, hr %#x.\n", hr); - - hr = IDirectDraw7_CreateSurface(ddraw7, NULL, &surface7, NULL); - ok(hr == DDERR_NOCOOPERATIVELEVELSET, "CreateSurface(ddsd=NULL, pre-SCL) returned %#x," - " expected %#x.\n", hr, DDERR_NOCOOPERATIVELEVELSET); - - hr = IDirectDraw7_SetCooperativeLevel(ddraw7, NULL, DDSCL_NORMAL); - ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); - - hr = IDirectDraw7_CreateSurface(ddraw7, NULL, &surface7, NULL); - ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," - " expected %#x.\n", hr, DDERR_INVALIDPARAMS); - - IDirectDraw7_Release(ddraw7); -} - START_TEST(dsurface) { HRESULT ret; @@ -2581,6 +2527,5 @@ START_TEST(dsurface) zbufferbitdepth_test(); pixelformat_flag_test(); partial_block_lock_test(); - create_surface_test(); ReleaseDirectDraw(); } -- 2.15.1

2 1

[PATCH] comctl32/tests: Remove noisy trace
by Nikolay Sivov 11 Jan '18

11 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/listview.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4bba327e82..18e874a00f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -640,14 +640,6 @@ static LRESULT WINAPI listview_subclass_proc(HWND hwnd, UINT message, WPARAM wPa LRESULT ret; struct message msg; - /* some debug output for style changing */ - if ((message == WM_STYLECHANGING || - message == WM_STYLECHANGED) && lParam) - { - STYLESTRUCT *style = (STYLESTRUCT*)lParam; - trace("\told style: 0x%08x, new style: 0x%08x\n", style->styleOld, style->styleNew); - } - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; -- 2.15.1

1 0

[PATCH 1/2] advapi32/tests: Fix a couple of leaks (Valgrind).
by Matteo Bruni 10 Jan '18

10 Jan '18

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- I don't know that we care a lot about the leak fixed in the first hunk. If we go with it, the LocalFree() ideally should be removed when we'll get rid of the todo_wine. For bug 43310. dlls/advapi32/tests/security.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 51dcf90851..769328be81 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6570,6 +6570,7 @@ static void test_system_security_access(void) /* privilege is checked on access */ err = GetSecurityInfo( hkey, SE_REGISTRY_KEY, SACL_SECURITY_INFORMATION, NULL, NULL, NULL, &sacl, &sd ); todo_wine ok( err == ERROR_PRIVILEGE_NOT_HELD, "got %u\n", err ); + LocalFree( sd ); priv.PrivilegeCount = 1; priv.Privileges[0].Luid = luid; @@ -7082,6 +7083,7 @@ static void test_token_security_descriptor(void) CloseHandle(info.hThread); LocalFree(acl_child); + HeapFree(GetProcessHeap(), 0, sd2); LocalFree(psid); CloseHandle(token3); -- 2.13.6

3 4

[PATCH] mshtml/tests: Skip some tests if native XMLHTTP support is missing or disabled
by Nikolay Sivov 10 Jan '18

10 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 7 ++++++- dlls/mshtml/tests/jstest.html | 9 ++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b00346759f..845983ccd6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6683,7 +6683,12 @@ static void test_xmlhttprequest(IHTMLWindow5 *window) hres = IHTMLWindow5_get_XMLHttpRequest(window, &var); ok(hres == S_OK, "get_XMLHttpRequest failed: %08x\n", hres); - ok(V_VT(&var) == VT_DISPATCH, "expect VT_DISPATCH, got %s\n", debugstr_variant(&var)); + ok(V_VT(&var) == VT_DISPATCH || broken(V_VT(&var) == VT_EMPTY), "expect VT_DISPATCH, got %s\n", debugstr_variant(&var)); + + if (V_VT(&var) == VT_EMPTY) { + skip("Native XMLHTTP support is missing or disabled.\n"); + return; + } factory = NULL; hres = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IHTMLXMLHttpRequestFactory, (void**)&factory); diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index cce805032c..8d399d0747 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -1,5 +1,8 @@ <html> <head> +<script src="winetest.js" type="text/javascript"></script> +</head> +<head> <script> function ok(b,m) { return external.ok(b, m); @@ -355,8 +358,12 @@ function test_text_node() { } function test_xhr() { + if (typeof(XMLHttpRequest) != "object") { + win_skip("XMLHTTPRequest is not available or disabled"); + return; + } + ok("XMLHttpRequest" in window, "XMLHttpRequest not found in window object\n"); - ok(typeof(XMLHttpRequest) === "object", "typeof(XMLHttpRequest) = " + typeof(XMLHttpRequest)); var xhr = new XMLHttpRequest(); ok(typeof(xhr) === "object", "typeof(xhr) = " + typeof(xhr)); -- 2.15.1

5 5

[PATCH] mshtml/tests: Skip test_listener_order tests on IE7.
by Jacek Caban 10 Jan '18

10 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/events.html | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH] urlmon/tests: Make sure we don't run more than one thread at once.
by Zebediah Figura 10 Jan '18

10 Jan '18

On occasion the second thread, started by Continue(), will run far enough that it effectively steals the Switch() call out from under the first thread. Ensure that this doesn't happen by causing the second thread to wait for the first thread to finish before running any code. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/urlmon/tests/protocol.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index d88aa07..1d9a803 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -156,6 +156,7 @@ static DWORD prot_read, filter_state, http_post_test, thread_id; static BOOL security_problem, test_async_req, impl_protex; static BOOL async_read_pending, mimefilter_test, direct_read, wait_for_switch, emulate_prot, short_read, test_abort; static BOOL empty_file, no_mime, bind_from_cache, file_with_hash; +static HANDLE last_thread, thread; enum { STATE_CONNECTING, @@ -1592,6 +1593,10 @@ static DWORD WINAPI thread_proc(PVOID arg) BOOL redirect_only = redirect_on_continue; HRESULT hres; + /* make sure that the last thread terminates before we start this one */ + if (last_thread) + ok(WaitForSingleObject(last_thread, 90000) == WAIT_OBJECT_0, "wait timed out\n"); + memset(&protocoldata, -1, sizeof(protocoldata)); prot_state = 0; @@ -1719,7 +1724,6 @@ static void protocol_start(IInternetProtocolSink *pOIProtSink, IInternetBindInfo LPWSTR additional_headers = NULL; BYTE sec_id[100]; DWORD fetched = 0, size = 100; - DWORD tid; SET_EXPECT(GetBindString_USER_AGENT); hres = IInternetBindInfo_GetBindString(pOIBindInfo, BINDSTRING_USER_AGENT, @@ -1777,7 +1781,8 @@ static void protocol_start(IInternetProtocolSink *pOIProtSink, IInternetBindInfo IServiceProvider_Release(service_provider); - CreateThread(NULL, 0, thread_proc, NULL, 0, &tid); + last_thread = thread; + thread = CreateThread(NULL, 0, thread_proc, NULL, 0, NULL); return; } -- 2.7.4

2 3

[PATCH] kernel32/tests: Test CreateFileMapping with a foreign architecture dll (try 2)
by André Hentschel 10 Jan '18

10 Jan '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernel32/tests/virtual.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 4a449fd..67ccfcf 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3774,6 +3774,97 @@ static void test_CreateFileMapping_protection(void) DeleteFileA(file_name); } +static void test_CreateFileMapping_foreign(void) +{ + IMAGE_DOS_HEADER *dos; + IMAGE_NT_HEADERS *nt; + IMAGE_SECTION_HEADER *sec; + DWORD lfanew = sizeof(*dos); + DWORD size = lfanew + sizeof(*nt) + sizeof(*sec); + DWORD written; + BYTE *buffer; + char path[MAX_PATH], filename[MAX_PATH]; + HANDLE file, handle; + + GetTempPathA( MAX_PATH, path ); + GetTempFileNameA( path, "foreign", 0, filename ); + file = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); + + buffer = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); + + dos = (IMAGE_DOS_HEADER *)buffer; + dos->e_magic = IMAGE_DOS_SIGNATURE; + dos->e_cblp = sizeof(*dos); + dos->e_cp = 1; + dos->e_cparhdr = lfanew / 16; + dos->e_minalloc = 0; + dos->e_maxalloc = 0xffff; + dos->e_ss = 0x0000; + dos->e_sp = 0x00b8; + dos->e_lfarlc = lfanew; + dos->e_lfanew = lfanew; + + nt = (IMAGE_NT_HEADERS *)(buffer + lfanew); + nt->Signature = IMAGE_NT_SIGNATURE; +#if defined __aarch64__ + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_AMD64; +#else + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARM64; +#endif + nt->FileHeader.NumberOfSections = 1; + nt->FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); + nt->FileHeader.Characteristics = IMAGE_FILE_DLL | IMAGE_FILE_EXECUTABLE_IMAGE; + nt->OptionalHeader.Magic = IMAGE_NT_OPTIONAL_HDR_MAGIC; + nt->OptionalHeader.MajorLinkerVersion = 1; + nt->OptionalHeader.MinorLinkerVersion = 0; + nt->OptionalHeader.ImageBase = 0x10000000; + nt->OptionalHeader.SectionAlignment = 0x1000; + nt->OptionalHeader.FileAlignment = 0x1000; + nt->OptionalHeader.MajorOperatingSystemVersion = 1; + nt->OptionalHeader.MinorOperatingSystemVersion = 0; + nt->OptionalHeader.MajorImageVersion = 1; + nt->OptionalHeader.MinorImageVersion = 0; + nt->OptionalHeader.MajorSubsystemVersion = 4; + nt->OptionalHeader.MinorSubsystemVersion = 0; + nt->OptionalHeader.SizeOfImage = 0x2000; + nt->OptionalHeader.SizeOfHeaders = size; + nt->OptionalHeader.Subsystem = IMAGE_SUBSYSTEM_WINDOWS_GUI; + nt->OptionalHeader.NumberOfRvaAndSizes = IMAGE_NUMBEROF_DIRECTORY_ENTRIES; + + sec = (IMAGE_SECTION_HEADER *)(nt + 1); + memcpy( sec->Name, ".rodata", sizeof(".rodata") ); + sec->Misc.VirtualSize = 0x1000; + sec->VirtualAddress = 0x1000; + sec->SizeOfRawData = 0; + sec->PointerToRawData = 0; + sec->Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE; + + WriteFile( file, buffer, size, &written, NULL ); + ok( written == size, "wrong number of bytes written %u\n", written ); + HeapFree( GetProcessHeap(), 0, buffer ); + CloseHandle( file ); + + file = CreateFileA( filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + + /* test mapping a foreign architecture dll as image */ + SetLastError( 0xdeadbeef ); + handle = CreateFileMappingA( file, NULL, SEC_IMAGE | PAGE_READONLY, 0, 4096, NULL ); + ok( !handle, "CreateFileMapping succeeded\n" ); + ok( GetLastError() == ERROR_BAD_EXE_FORMAT || broken(GetLastError() == ERROR_INVALID_PARAMETER), + "wrong error %u\n", GetLastError()); + + /* test mapping a foreign architecture dll as no execute image */ + SetLastError( 0xdeadbeef ); + handle = CreateFileMappingA( file, NULL, SEC_IMAGE_NO_EXECUTE | PAGE_READONLY, 0, 4096, NULL ); + ok( !handle, "CreateFileMapping succeeded\n" ); + ok( GetLastError() == ERROR_BAD_EXE_FORMAT || broken(GetLastError() == ERROR_INVALID_PARAMETER), + "wrong error %u\n", GetLastError()); + + CloseHandle( file ); + DeleteFileA( filename ); +} + #define ACCESS_READ 0x01 #define ACCESS_WRITE 0x02 #define ACCESS_EXECUTE 0x04 @@ -4400,6 +4491,7 @@ START_TEST(virtual) test_shared_memory_ro(FALSE, FILE_MAP_COPY|FILE_MAP_WRITE); test_mappings(); test_CreateFileMapping_protection(); + test_CreateFileMapping_foreign(); test_VirtualAlloc_protection(); test_VirtualProtect(); test_VirtualAllocEx(); -- 2.7.4

1 0

[PATCH 1/3] ddraw/tests: Sync test_clear() with d3d8/9.
by Henri Verbeet 10 Jan '18

10 Jan '18

From: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 236 +++++++++++++++++++++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw2.c | 218 +++++++++++++++++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw4.c | 197 +++++++++++++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw7.c | 154 +++++++++++++++++++++++++++--- dlls/ddraw/tests/visual.c | 47 --------- 5 files changed, 761 insertions(+), 91 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d416cf55a3d..56521f6a4e3 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -105,31 +105,33 @@ static BOOL ddraw_is_warp(IDirectDraw *ddraw) && strstr(identifier.szDriver, "warp"); } -static BOOL ddraw_is_nvidia(IDirectDraw *ddraw) +static BOOL ddraw_is_vendor(IDirectDraw *ddraw, DWORD vendor) { DDDEVICEIDENTIFIER identifier; return strcmp(winetest_platform, "wine") && ddraw_get_identifier(ddraw, &identifier) - && identifier.dwVendorId == 0x10de; + && identifier.dwVendorId == vendor; +} + +static BOOL ddraw_is_amd(IDirectDraw *ddraw) +{ + return ddraw_is_vendor(ddraw, 0x1002); } static BOOL ddraw_is_intel(IDirectDraw *ddraw) { - DDDEVICEIDENTIFIER identifier; + return ddraw_is_vendor(ddraw, 0x8086); +} - return strcmp(winetest_platform, "wine") - && ddraw_get_identifier(ddraw, &identifier) - && identifier.dwVendorId == 0x8086; +static BOOL ddraw_is_nvidia(IDirectDraw *ddraw) +{ + return ddraw_is_vendor(ddraw, 0x10de); } static BOOL ddraw_is_vmware(IDirectDraw *ddraw) { - DDDEVICEIDENTIFIER identifier; - - return strcmp(winetest_platform, "wine") - && ddraw_get_identifier(ddraw, &identifier) - && identifier.dwVendorId == 0x15ad; + return ddraw_is_vendor(ddraw, 0x15ad); } static IDirectDrawSurface *create_overlay(IDirectDraw *ddraw, @@ -10913,6 +10915,217 @@ static void test_depth_readback(void) DestroyWindow(window); } +static void test_clear(void) +{ + D3DRECT rect_negneg, rect_full = {{0}, {0}, {640}, {480}}; + IDirect3DViewport *viewport, *viewport2, *viewport3; + IDirect3DMaterial *white, *red, *green, *blue; + IDirect3DDevice *device; + IDirectDrawSurface *rt; + IDirectDraw *ddraw; + D3DRECT rect[2]; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + viewport = create_viewport(device, 0, 0, 640, 480); + + white = create_diffuse_material(device, 1.0f, 1.0f, 1.0f, 1.0f); + red = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f); + green = create_diffuse_material(device, 0.0f, 1.0f, 0.0f, 1.0f); + blue = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); + + viewport_set_background(device, viewport, white); + hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* Positive x, negative y. */ + U1(rect[0]).x1 = 0; + U2(rect[0]).y1 = 480; + U3(rect[0]).x2 = 320; + U4(rect[0]).y2 = 240; + + /* Positive x, positive y. */ + U1(rect[1]).x1 = 0; + U2(rect[1]).y1 = 0; + U3(rect[1]).x2 = 320; + U4(rect[1]).y2 = 240; + + /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not + * refuse negative rectangles, but it will not clear them either. */ + viewport_set_background(device, viewport, red); + hr = IDirect3DViewport_Clear(viewport, 2, rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* negative x, negative y. + * + * FIXME: WARP seems to clear the entire screen here. */ + rect_negneg.x1 = 640; + rect_negneg.y1 = 240; + rect_negneg.x2 = 320; + rect_negneg.y2 = 0; + viewport_set_background(device, viewport, green); + hr = IDirect3DViewport_Clear(viewport, 1, &rect_negneg, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 160, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3 (pos, neg) has color 0x%08x.\n", color); + color = get_surface_color(rt, 160, 120); + ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1 (pos, pos) has color 0x%08x.\n", color); + color = get_surface_color(rt, 480, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (NULL) has color 0x%08x.\n", color); + color = get_surface_color(rt, 480, 120); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (neg, neg) has color 0x%08x.\n", color); + + /* Test how the viewport affects clears. */ + viewport_set_background(device, viewport, white); + hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + viewport2 = create_viewport(device, 160, 120, 160, 120); + viewport_set_background(device, viewport2, blue); + hr = IDirect3DViewport_Clear(viewport2, 1, &rect_full, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + viewport3 = create_viewport(device, 320, 240, 320, 240); + viewport_set_background(device, viewport3, green); + + U1(rect[0]).x1 = 160; + U2(rect[0]).y1 = 120; + U3(rect[0]).x2 = 480; + U4(rect[0]).y2 = 360; + hr = IDirect3DViewport_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* AMD drivers do not limit the clear area to the viewport rectangle in + * d3d1. It works as intended on other drivers and on d3d2 and newer on + * AMD cards. */ + color = get_surface_color(rt, 158, 118); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x000000ff, 0)), + "(158, 118) has color 0x%08x.\n", color); + color = get_surface_color(rt, 162, 118); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x000000ff, 0)), + "(162, 118) has color 0x%08x.\n", color); + color = get_surface_color(rt, 158, 122); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x000000ff, 0)), + "(158, 122) has color 0x%08x.\n", color); + color = get_surface_color(rt, 162, 122); + ok(compare_color(color, 0x000000ff, 0) + || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x0000ff00, 0)), + "(162, 122) has color 0x%08x.\n", color); + + color = get_surface_color(rt, 318, 238); + ok(compare_color(color, 0x000000ff, 0) + || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x0000ff00, 0)), + "(318, 238) has color 0x%08x.\n", color); + color = get_surface_color(rt, 322, 238); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x0000ff00, 0)), + "(322, 328) has color 0x%08x.\n", color); + color = get_surface_color(rt, 318, 242); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x0000ff00, 0)), + "(318, 242) has color 0x%08x.\n", color); + color = get_surface_color(rt, 322, 242); + ok(compare_color(color, 0x0000ff00, 0), "(322, 242) has color 0x%08x.\n", color); + + color = get_surface_color(rt, 478, 358); + ok(compare_color(color, 0x0000ff00, 0), "(478, 358) has color 0x%08x.\n", color); + color = get_surface_color(rt, 482, 358); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x000000ff, 0)), + "(482, 358) has color 0x%08x.\n", color); + color = get_surface_color(rt, 478, 362); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x000000ff, 0)), + "(478, 362) has color 0x%08x.\n", color); + color = get_surface_color(rt, 482, 362); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x000000ff, 0)), + "(482, 362) has color 0x%08x.\n", color); + + /* The clear rectangle is rendertarget absolute, not relative to the + * viewport. */ + hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + U1(rect[0]).x1 = 330; + U2(rect[0]).y1 = 250; + U3(rect[0]).x2 = 340; + U4(rect[0]).y2 = 260; + hr = IDirect3DViewport_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 328, 248); + ok(compare_color(color, 0x00ffffff, 0), "(328, 248) has color 0x%08x.\n", color); + color = get_surface_color(rt, 332, 248); + ok(compare_color(color, 0x00ffffff, 0), "(332, 248) has color 0x%08x.\n", color); + color = get_surface_color(rt, 328, 252); + ok(compare_color(color, 0x00ffffff, 0), "(328, 252) has color 0x%08x.\n", color); + color = get_surface_color(rt, 332, 252); + ok(compare_color(color, 0x0000ff00, 0), "(332, 252) has color 0x%08x.\n", color); + + color = get_surface_color(rt, 338, 248); + ok(compare_color(color, 0x00ffffff, 0), "(338, 248) has color 0x%08x.\n", color); + color = get_surface_color(rt, 342, 248); + ok(compare_color(color, 0x00ffffff, 0), "(342, 248) has color 0x%08x.\n", color); + color = get_surface_color(rt, 338, 252); + ok(compare_color(color, 0x0000ff00, 0), "(338, 252) has color 0x%08x.\n", color); + color = get_surface_color(rt, 342, 252); + ok(compare_color(color, 0x00ffffff, 0), "(342, 252) has color 0x%08x.\n", color); + + color = get_surface_color(rt, 328, 258); + ok(compare_color(color, 0x00ffffff, 0), "(328, 258) has color 0x%08x.\n", color); + color = get_surface_color(rt, 332, 258); + ok(compare_color(color, 0x0000ff00, 0), "(332, 258) has color 0x%08x.\n", color); + color = get_surface_color(rt, 328, 262); + ok(compare_color(color, 0x00ffffff, 0), "(328, 262) has color 0x%08x.\n", color); + color = get_surface_color(rt, 332, 262); + ok(compare_color(color, 0x00ffffff, 0), "(332, 262) has color 0x%08x.\n", color); + + color = get_surface_color(rt, 338, 258); + ok(compare_color(color, 0x0000ff00, 0), "(338, 258) has color 0x%08x.\n", color); + color = get_surface_color(rt, 342, 258); + ok(compare_color(color, 0x00ffffff, 0), "(342, 258) has color 0x%08x.\n", color); + color = get_surface_color(rt, 338, 262); + ok(compare_color(color, 0x00ffffff, 0), "(338, 262) has color 0x%08x.\n", color); + color = get_surface_color(rt, 342, 262); + ok(compare_color(color, 0x00ffffff, 0), "(342, 262) has color 0x%08x.\n", color); + + /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist + * in d3d1. */ + + IDirect3DViewport_Release(viewport3); + IDirect3DViewport_Release(viewport2); + IDirect3DViewport_Release(viewport); + IDirect3DMaterial_Release(white); + IDirect3DMaterial_Release(red); + IDirect3DMaterial_Release(green); + IDirect3DMaterial_Release(blue); + IDirectDrawSurface_Release(rt); + refcount = IDirect3DDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirectDraw_Release(ddraw); + ok(!refcount, "Ddraw object has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -11012,4 +11225,5 @@ START_TEST(ddraw1) test_texture_load(); test_ck_operation(); test_depth_readback(); + test_clear(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2186c314acc..9e4aebdef4b 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -107,31 +107,28 @@ static BOOL ddraw_is_warp(IDirectDraw2 *ddraw) && strstr(identifier.szDriver, "warp"); } -static BOOL ddraw_is_nvidia(IDirectDraw2 *ddraw) +static BOOL ddraw_is_vendor(IDirectDraw2 *ddraw, DWORD vendor) { DDDEVICEIDENTIFIER identifier; return strcmp(winetest_platform, "wine") && ddraw_get_identifier(ddraw, &identifier) - && identifier.dwVendorId == 0x10de; + && identifier.dwVendorId == vendor; } static BOOL ddraw_is_intel(IDirectDraw2 *ddraw) { - DDDEVICEIDENTIFIER identifier; + return ddraw_is_vendor(ddraw, 0x8086); +} - return strcmp(winetest_platform, "wine") - && ddraw_get_identifier(ddraw, &identifier) - && identifier.dwVendorId == 0x8086; +static BOOL ddraw_is_nvidia(IDirectDraw2 *ddraw) +{ + return ddraw_is_vendor(ddraw, 0x10de); } static BOOL ddraw_is_vmware(IDirectDraw2 *ddraw) { - DDDEVICEIDENTIFIER identifier; - - return strcmp(winetest_platform, "wine") - && ddraw_get_identifier(ddraw, &identifier) - && identifier.dwVendorId == 0x15ad; + return ddraw_is_vendor(ddraw, 0x15ad); } static IDirectDrawSurface *create_overlay(IDirectDraw2 *ddraw, @@ -12287,6 +12284,204 @@ static void test_depth_readback(void) DestroyWindow(window); } +static void test_clear(void) +{ + D3DRECT rect_negneg, rect_full = {{0}, {0}, {640}, {480}}; + IDirect3DViewport2 *viewport, *viewport2, *viewport3; + IDirect3DMaterial2 *white, *red, *green, *blue; + IDirect3DDevice2 *device; + IDirectDrawSurface *rt; + IDirectDraw2 *ddraw; + D3DRECT rect[2]; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw2_Release(ddraw); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice2_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + white = create_diffuse_material(device, 1.0f, 1.0f, 1.0f, 1.0f); + red = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f); + green = create_diffuse_material(device, 0.0f, 1.0f, 0.0f, 1.0f); + blue = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); + + viewport_set_background(device, viewport, white); + hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* Positive x, negative y. */ + U1(rect[0]).x1 = 0; + U2(rect[0]).y1 = 480; + U3(rect[0]).x2 = 320; + U4(rect[0]).y2 = 240; + + /* Positive x, positive y. */ + U1(rect[1]).x1 = 0; + U2(rect[1]).y1 = 0; + U3(rect[1]).x2 = 320; + U4(rect[1]).y2 = 240; + + /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not + * refuse negative rectangles, but it will not clear them either. */ + viewport_set_background(device, viewport, red); + hr = IDirect3DViewport2_Clear(viewport, 2, rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* negative x, negative y. + * + * FIXME: WARP seems to clear the entire screen here. */ + rect_negneg.x1 = 640; + rect_negneg.y1 = 240; + rect_negneg.x2 = 320; + rect_negneg.y2 = 0; + viewport_set_background(device, viewport, green); + hr = IDirect3DViewport2_Clear(viewport, 1, &rect_negneg, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 160, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3 (pos, neg) has color 0x%08x.\n", color); + color = get_surface_color(rt, 160, 120); + ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1 (pos, pos) has color 0x%08x.\n", color); + color = get_surface_color(rt, 480, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (NULL) has color 0x%08x.\n", color); + color = get_surface_color(rt, 480, 120); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (neg, neg) has color 0x%08x.\n", color); + + /* Test how the viewport affects clears. */ + viewport_set_background(device, viewport, white); + hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + viewport2 = create_viewport(device, 160, 120, 160, 120); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport2); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + viewport_set_background(device, viewport2, blue); + hr = IDirect3DViewport2_Clear(viewport2, 1, &rect_full, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + viewport3 = create_viewport(device, 320, 240, 320, 240); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport3); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + U1(rect[0]).x1 = 160; + U2(rect[0]).y1 = 120; + U3(rect[0]).x2 = 480; + U4(rect[0]).y2 = 360; + viewport_set_background(device, viewport3, green); + hr = IDirect3DViewport2_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + color = get_surface_color(rt, 158, 118); + ok(compare_color(color, 0x00ffffff, 0), "(158, 118) has color 0x%08x.\n", color); + color = get_surface_color(rt, 162, 118); + ok(compare_color(color, 0x00ffffff, 0), "(162, 118) has color 0x%08x.\n", color); + color = get_surface_color(rt, 158, 122); + ok(compare_color(color, 0x00ffffff, 0), "(158, 122) has color 0x%08x.\n", color); + color = get_surface_color(rt, 162, 122); + ok(compare_color(color, 0x000000ff, 0), "(162, 122) has color 0x%08x.\n", color); + + color = get_surface_color(rt, 318, 238); + ok(compare_color(color, 0x000000ff, 0), "(318, 238) has color 0x%08x.\n", color); + color = get_surface_color(rt, 322, 238); + ok(compare_color(color, 0x00ffffff, 0), "(322, 238) has color 0x%08x.\n", color); + color = get_surface_color(rt, 318, 242); + ok(compare_color(color, 0x00ffffff, 0), "(318, 242) has color 0x%08x.\n", color); + color = get_surface_color(rt, 322, 242); + ok(compare_color(color, 0x0000ff00, 0), "(322, 242) has color 0x%08x.\n", color); + + color = get_surface_color(rt, 478, 358); + ok(compare_color(color, 0x0000ff00, 0), "(478, 358) has color 0x%08x.\n", color); + color = get_surface_color(rt, 482, 358); + ok(compare_color(color, 0x00ffffff, 0), "(482, 358) has color 0x%08x.\n", color); + color = get_surface_color(rt, 478, 362); + ok(compare_color(color, 0x00ffffff, 0), "(478, 362) has color 0x%08x.\n", color); + color = get_surface_color(rt, 482, 362); + ok(compare_color(color, 0x00ffffff, 0), "(482, 362) has color 0x%08x.\n", color); + + /* The clear rectangle is rendertarget absolute, not relative to the + * viewport. */ + hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + U1(rect[0]).x1 = 330; + U2(rect[0]).y1 = 250; + U3(rect[0]).x2 = 340; + U4(rect[0]).y2 = 260; + hr = IDirect3DViewport2_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 328, 248); + ok(compare_color(color, 0x00ffffff, 0), "(328, 248) has color 0x%08x.\n", color); + color = get_surface_color(rt, 332, 248); + ok(compare_color(color, 0x00ffffff, 0), "(332, 248) has color 0x%08x.\n", color); + color = get_surface_color(rt, 328, 252); + ok(compare_color(color, 0x00ffffff, 0), "(328, 252) has color 0x%08x.\n", color); + color = get_surface_color(rt, 332, 252); + ok(compare_color(color, 0x0000ff00, 0), "(332, 252) has color 0x%08x.\n", color); + + color = get_surface_color(rt, 338, 248); + ok(compare_color(color, 0x00ffffff, 0), "(338, 248) has color 0x%08x.\n", color); + color = get_surface_color(rt, 342, 248); + ok(compare_color(color, 0x00ffffff, 0), "(342, 248) has color 0x%08x.\n", color); + color = get_surface_color(rt, 338, 252); + ok(compare_color(color, 0x0000ff00, 0), "(338, 252) has color 0x%08x.\n", color); + color = get_surface_color(rt, 342, 252); + ok(compare_color(color, 0x00ffffff, 0), "(342, 252) has color 0x%08x.\n", color); + + color = get_surface_color(rt, 328, 258); + ok(compare_color(color, 0x00ffffff, 0), "(328, 258) has color 0x%08x.\n", color); + color = get_surface_color(rt, 332, 258); + ok(compare_color(color, 0x0000ff00, 0), "(332, 258) has color 0x%08x.\n", color); + color = get_surface_color(rt, 328, 262); + ok(compare_color(color, 0x00ffffff, 0), "(328, 262) has color 0x%08x.\n", color); + color = get_surface_color(rt, 332, 262); + ok(compare_color(color, 0x00ffffff, 0), "(332, 262) has color 0x%08x.\n", color); + + color = get_surface_color(rt, 338, 258); + ok(compare_color(color, 0x0000ff00, 0), "(338, 258) has color 0x%08x.\n", color); + color = get_surface_color(rt, 342, 258); + ok(compare_color(color, 0x00ffffff, 0), "(342, 258) has color 0x%08x.\n", color); + color = get_surface_color(rt, 338, 262); + ok(compare_color(color, 0x00ffffff, 0), "(338, 262) has color 0x%08x.\n", color); + color = get_surface_color(rt, 342, 262); + ok(compare_color(color, 0x00ffffff, 0), "(342, 262) has color 0x%08x.\n", color); + + /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist + * in d3d2. */ + + IDirect3DViewport2_Release(viewport3); + IDirect3DViewport2_Release(viewport2); + IDirect3DViewport2_Release(viewport); + IDirect3DMaterial2_Release(white); + IDirect3DMaterial2_Release(red); + IDirect3DMaterial2_Release(green); + IDirect3DMaterial2_Release(blue); + IDirectDrawSurface_Release(rt); + refcount = IDirect3DDevice2_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirectDraw2_Release(ddraw); + ok(!refcount, "Ddraw object has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -12394,4 +12589,5 @@ START_TEST(ddraw2) test_surface_desc_size(); test_ck_operation(); test_depth_readback(); + test_clear(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 4c1bd78eefc..e4b65a5ca1f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -113,31 +113,28 @@ static BOOL ddraw_is_warp(IDirectDraw4 *ddraw) && strstr(identifier.szDriver, "warp"); } -static BOOL ddraw_is_nvidia(IDirectDraw4 *ddraw) +static BOOL ddraw_is_vendor(IDirectDraw4 *ddraw, DWORD vendor) { DDDEVICEIDENTIFIER identifier; return strcmp(winetest_platform, "wine") && ddraw_get_identifier(ddraw, &identifier) - && identifier.dwVendorId == 0x10de; + && identifier.dwVendorId == vendor; } static BOOL ddraw_is_intel(IDirectDraw4 *ddraw) { - DDDEVICEIDENTIFIER identifier; + return ddraw_is_vendor(ddraw, 0x8086); +} - return strcmp(winetest_platform, "wine") - && ddraw_get_identifier(ddraw, &identifier) - && identifier.dwVendorId == 0x8086; +static BOOL ddraw_is_nvidia(IDirectDraw4 *ddraw) +{ + return ddraw_is_vendor(ddraw, 0x10de); } static BOOL ddraw_is_vmware(IDirectDraw4 *ddraw) { - DDDEVICEIDENTIFIER identifier; - - return strcmp(winetest_platform, "wine") - && ddraw_get_identifier(ddraw, &identifier) - && identifier.dwVendorId == 0x15ad; + return ddraw_is_vendor(ddraw, 0x15ad); } static IDirectDrawSurface4 *create_overlay(IDirectDraw4 *ddraw, @@ -14355,6 +14352,183 @@ static void test_depth_readback(void) DestroyWindow(window); } +static void test_clear(void) +{ + D3DRECT rect_negneg, rect_full = {{0}, {0}, {640}, {480}}; + IDirect3DViewport3 *viewport, *viewport2, *viewport3; + IDirect3DDevice3 *device; + IDirectDrawSurface4 *rt; + D3DRECT rect[2]; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* Positive x, negative y. */ + U1(rect[0]).x1 = 0; + U2(rect[0]).y1 = 480; + U3(rect[0]).x2 = 320; + U4(rect[0]).y2 = 240; + + /* Positive x, positive y. */ + U1(rect[1]).x1 = 0; + U2(rect[1]).y1 = 0; + U3(rect[1]).x2 = 320; + U4(rect[1]).y2 = 240; + + /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not + * refuse negative rectangles, but it will not clear them either. */ + hr = IDirect3DViewport3_Clear2(viewport, 2, rect, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* negative x, negative y. + * + * FIXME: WARP seems to clear the entire screen here. */ + rect_negneg.x1 = 640; + rect_negneg.y1 = 240; + rect_negneg.x2 = 320; + rect_negneg.y2 = 0; + hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 160, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3 (pos, neg) has color 0x%08x.\n", color); + color = get_surface_color(rt, 160, 120); + ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1 (pos, pos) has color 0x%08x.\n", color); + color = get_surface_color(rt, 480, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (NULL) has color 0x%08x.\n", color); + color = get_surface_color(rt, 480, 120); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (neg, neg) has color 0x%08x.\n", color); + + /* Test how the viewport affects clears. */ + hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + viewport2 = create_viewport(device, 160, 120, 160, 120); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport2); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + hr = IDirect3DViewport3_Clear2(viewport2, 1, &rect_full, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + viewport3 = create_viewport(device, 320, 240, 320, 240); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport3); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + U1(rect[0]).x1 = 160; + U2(rect[0]).y1 = 120; + U3(rect[0]).x2 = 480; + U4(rect[0]).y2 = 360; + hr = IDirect3DViewport3_Clear2(viewport3, 1, &rect[0], D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + color = get_surface_color(rt, 158, 118); + ok(compare_color(color, 0x00ffffff, 0), "(158, 118) has color 0x%08x.\n", color); + color = get_surface_color(rt, 162, 118); + ok(compare_color(color, 0x00ffffff, 0), "(162, 118) has color 0x%08x.\n", color); + color = get_surface_color(rt, 158, 122); + ok(compare_color(color, 0x00ffffff, 0), "(158, 122) has color 0x%08x.\n", color); + color = get_surface_color(rt, 162, 122); + ok(compare_color(color, 0x000000ff, 0), "(162, 122) has color 0x%08x.\n", color); + + color = get_surface_color(rt, 318, 238); + ok(compare_color(color, 0x000000ff, 0), "(318, 238) has color 0x%08x.\n", color); + color = get_surface_color(rt, 322, 238); + ok(compare_color(color, 0x00ffffff, 0), "(322, 328) has color 0x%08x.\n", color); + color = get_surface_color(rt, 318, 242); + ok(compare_color(color, 0x00ffffff, 0), "(318, 242) has color 0x%08x.\n", color); + color = get_surface_color(rt, 322, 242); + ok(compare_color(color, 0x0000ff00, 0), "(322, 242) has color 0x%08x.\n", color); + + color = get_surface_color(rt, 478, 358); + ok(compare_color(color, 0x0000ff00, 0), "(478, 358) has color 0x%08x.\n", color); + color = get_surface_color(rt, 482, 358); + ok(compare_color(color, 0x00ffffff, 0), "(482, 358) has color 0x%08x.\n", color); + color = get_surface_color(rt, 478, 362); + ok(compare_color(color, 0x00ffffff, 0), "(478, 362) has color 0x%08x.\n", color); + color = get_surface_color(rt, 482, 362); + ok(compare_color(color, 0x00ffffff, 0), "(482, 362) has color 0x%08x.\n", color); + + /* The clear rectangle is rendertarget absolute, not relative to the + * viewport. */ + hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + U1(rect[0]).x1 = 330; + U2(rect[0]).y1 = 250; + U3(rect[0]).x2 = 340; + U4(rect[0]).y2 = 260; + hr = IDirect3DViewport3_Clear2(viewport3, 1, &rect[0], D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 328, 248); + ok(compare_color(color, 0x00ffffff, 0), "(328, 248) has color 0x%08x.\n", color); + color = get_surface_color(rt, 332, 248); + ok(compare_color(color, 0x00ffffff, 0), "(332, 248) has color 0x%08x.\n", color); + color = get_surface_color(rt, 328, 252); + ok(compare_color(color, 0x00ffffff, 0), "(328, 252) has color 0x%08x.\n", color); + color = get_surface_color(rt, 332, 252); + ok(compare_color(color, 0x0000ff00, 0), "(332, 252) has color 0x%08x.\n", color); + + color = get_surface_color(rt, 338, 248); + ok(compare_color(color, 0x00ffffff, 0), "(338, 248) has color 0x%08x.\n", color); + color = get_surface_color(rt, 342, 248); + ok(compare_color(color, 0x00ffffff, 0), "(342, 248) has color 0x%08x.\n", color); + color = get_surface_color(rt, 338, 252); + ok(compare_color(color, 0x0000ff00, 0), "(338, 252) has color 0x%08x.\n", color); + color = get_surface_color(rt, 342, 252); + ok(compare_color(color, 0x00ffffff, 0), "(342, 252) has color 0x%08x.\n", color); + + color = get_surface_color(rt, 328, 258); + ok(compare_color(color, 0x00ffffff, 0), "(328, 258) has color 0x%08x.\n", color); + color = get_surface_color(rt, 332, 258); + ok(compare_color(color, 0x0000ff00, 0), "(332, 258) has color 0x%08x.\n", color); + color = get_surface_color(rt, 328, 262); + ok(compare_color(color, 0x00ffffff, 0), "(328, 262) has color 0x%08x.\n", color); + color = get_surface_color(rt, 332, 262); + ok(compare_color(color, 0x00ffffff, 0), "(332, 262) has color 0x%08x.\n", color); + + color = get_surface_color(rt, 338, 258); + ok(compare_color(color, 0x0000ff00, 0), "(338, 258) has color 0x%08x.\n", color); + color = get_surface_color(rt, 342, 258); + ok(compare_color(color, 0x00ffffff, 0), "(342, 258) has color 0x%08x.\n", color); + color = get_surface_color(rt, 338, 262); + ok(compare_color(color, 0x00ffffff, 0), "(338, 262) has color 0x%08x.\n", color); + color = get_surface_color(rt, 342, 262); + ok(compare_color(color, 0x00ffffff, 0), "(342, 262) has color 0x%08x.\n", color); + + /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist + * in d3d3. */ + + IDirect3DViewport3_Release(viewport3); + IDirect3DViewport3_Release(viewport2); + IDirect3DViewport3_Release(viewport); + IDirectDrawSurface4_Release(rt); + refcount = IDirect3DDevice3_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -14475,4 +14649,5 @@ START_TEST(ddraw4) test_compute_sphere_visibility(); test_map_synchronisation(); test_depth_readback(); + test_clear(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d7355cf0ea7..5b29f9cd13e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -127,31 +127,28 @@ static BOOL ddraw_is_warp(IDirectDraw7 *ddraw) && strstr(identifier.szDriver, "warp"); } -static BOOL ddraw_is_nvidia(IDirectDraw7 *ddraw) +static BOOL ddraw_is_vendor(IDirectDraw7 *ddraw, DWORD vendor) { DDDEVICEIDENTIFIER2 identifier; return strcmp(winetest_platform, "wine") && ddraw_get_identifier(ddraw, &identifier) - && identifier.dwVendorId == 0x10de; + && identifier.dwVendorId == vendor; } static BOOL ddraw_is_intel(IDirectDraw7 *ddraw) { - DDDEVICEIDENTIFIER2 identifier; + return ddraw_is_vendor(ddraw, 0x8086); +} - return strcmp(winetest_platform, "wine") - && ddraw_get_identifier(ddraw, &identifier) - && identifier.dwVendorId == 0x8086; +static BOOL ddraw_is_nvidia(IDirectDraw7 *ddraw) +{ + return ddraw_is_vendor(ddraw, 0x10de); } static BOOL ddraw_is_vmware(IDirectDraw7 *ddraw) { - DDDEVICEIDENTIFIER2 identifier; - - return strcmp(winetest_platform, "wine") - && ddraw_get_identifier(ddraw, &identifier) - && identifier.dwVendorId == 0x15ad; + return ddraw_is_vendor(ddraw, 0x15ad); } static IDirectDrawSurface7 *create_overlay(IDirectDraw7 *ddraw, @@ -13726,6 +13723,140 @@ static void test_depth_readback(void) DestroyWindow(window); } +static void test_clear(void) +{ + IDirect3DDevice7 *device; + IDirectDrawSurface7 *rt; + D3DVIEWPORT7 vp, old_vp; + D3DRECT rect_negneg; + D3DRECT rect[2]; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* Positive x, negative y. */ + U1(rect[0]).x1 = 0; + U2(rect[0]).y1 = 480; + U3(rect[0]).x2 = 320; + U4(rect[0]).y2 = 240; + + /* Positive x, positive y. */ + U1(rect[1]).x1 = 0; + U2(rect[1]).y1 = 0; + U3(rect[1]).x2 = 320; + U4(rect[1]).y2 = 240; + + /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not + * refuse negative rectangles, but it will not clear them either. */ + hr = IDirect3DDevice7_Clear(device, 2, rect, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* negative x, negative y. + * + * FIXME: WARP seems to clear the entire screen here. */ + rect_negneg.x1 = 640; + rect_negneg.y1 = 240; + rect_negneg.x2 = 320; + rect_negneg.y2 = 0; + hr = IDirect3DDevice7_Clear(device, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 160, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3 (pos, neg) has color 0x%08x.\n", color); + color = get_surface_color(rt, 160, 120); + ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1 (pos, pos) has color 0x%08x.\n", color); + color = get_surface_color(rt, 480, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (NULL) has color 0x%08x.\n", color); + color = get_surface_color(rt, 480, 120); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (neg, neg) has color 0x%08x.\n", color); + + /* Test how the viewport affects clears. */ + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice7_GetViewport(device, &old_vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + + vp.dwX = 160; + vp.dwY = 120; + vp.dwWidth = 160; + vp.dwHeight = 120; + vp.dvMinZ = 0.0f; + vp.dvMaxZ = 1.0f; + hr = IDirect3DDevice7_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr); + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + vp.dwX = 320; + vp.dwY = 240; + vp.dwWidth = 320; + vp.dwHeight = 240; + vp.dvMinZ = 0.0f; + vp.dvMaxZ = 1.0f; + hr = IDirect3DDevice7_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr); + + U1(rect[0]).x1 = 160; + U2(rect[0]).y1 = 120; + U3(rect[0]).x2 = 480; + U4(rect[0]).y2 = 360; + hr = IDirect3DDevice7_Clear(device, 1, &rect[0], D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetViewport(device, &old_vp); + ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr); + + color = get_surface_color(rt, 158, 118); + ok(compare_color(color, 0x00ffffff, 0), "(158, 118) has color 0x%08x.\n", color); + color = get_surface_color(rt, 162, 118); + ok(compare_color(color, 0x00ffffff, 0), "(162, 118) has color 0x%08x.\n", color); + color = get_surface_color(rt, 158, 122); + ok(compare_color(color, 0x00ffffff, 0), "(158, 122) has color 0x%08x.\n", color); + color = get_surface_color(rt, 162, 122); + ok(compare_color(color, 0x000000ff, 0), "(162, 122) has color 0x%08x.\n", color); + + color = get_surface_color(rt, 318, 238); + ok(compare_color(color, 0x000000ff, 0), "(318, 238) has color 0x%08x.\n", color); + color = get_surface_color(rt, 322, 238); + ok(compare_color(color, 0x00ffffff, 0), "(322, 328) has color 0x%08x.\n", color); + color = get_surface_color(rt, 318, 242); + ok(compare_color(color, 0x00ffffff, 0), "(318, 242) has color 0x%08x.\n", color); + color = get_surface_color(rt, 322, 242); + ok(compare_color(color, 0x0000ff00, 0), "(322, 242) has color 0x%08x.\n", color); + + color = get_surface_color(rt, 478, 358); + ok(compare_color(color, 0x0000ff00, 0), "(478, 358) has color 0x%08x.\n", color); + color = get_surface_color(rt, 482, 358); + ok(compare_color(color, 0x00ffffff, 0), "(482, 358) has color 0x%08x.\n", color); + color = get_surface_color(rt, 478, 362); + ok(compare_color(color, 0x00ffffff, 0), "(478, 362) has color 0x%08x.\n", color); + color = get_surface_color(rt, 482, 362); + ok(compare_color(color, 0x00ffffff, 0), "(482, 362) has color 0x%08x.\n", color); + + /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist + * in d3d7. */ + + IDirectDrawSurface7_Release(rt); + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -13856,4 +13987,5 @@ START_TEST(ddraw7) test_clip_planes_limits(); test_map_synchronisation(); test_depth_readback(); + test_clear(); } diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 4f6213354d6..2cb1c892314 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -267,52 +267,6 @@ static void set_viewport_size(IDirect3DDevice7 *device) return; } -static void clear_test(IDirect3DDevice7 *device) -{ - /* Tests the correctness of clearing parameters */ - HRESULT hr; - D3DRECT rect[2]; - D3DRECT rect_negneg; - DWORD color; - - hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr); - - /* Positive x, negative y */ - U1(rect[0]).x1 = 0; - U2(rect[0]).y1 = 480; - U3(rect[0]).x2 = 320; - U4(rect[0]).y2 = 240; - - /* Positive x, positive y */ - U1(rect[1]).x1 = 0; - U2(rect[1]).y1 = 0; - U3(rect[1]).x2 = 320; - U4(rect[1]).y2 = 240; - /* Clear 2 rectangles with one call. Shows that a positive value is returned, but the negative rectangle - * is ignored, the positive is still cleared afterwards - */ - hr = IDirect3DDevice7_Clear(device, 2, rect, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); - ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr); - - /* negative x, negative y */ - U1(rect_negneg).x1 = 640; - U2(rect_negneg).y1 = 240; - U3(rect_negneg).x2 = 320; - U4(rect_negneg).y2 = 0; - hr = IDirect3DDevice7_Clear(device, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); - ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr); - - color = getPixelColor(device, 160, 360); /* lower left quad */ - ok(color == 0x00ffffff, "Clear rectangle 3(pos, neg) has color %08x\n", color); - color = getPixelColor(device, 160, 120); /* upper left quad */ - ok(color == 0x00ff0000, "Clear rectangle 1(pos, pos) has color %08x\n", color); - color = getPixelColor(device, 480, 360); /* lower right quad */ - ok(color == 0x00ffffff, "Clear rectangle 4(NULL) has color %08x\n", color); - color = getPixelColor(device, 480, 120); /* upper right quad */ - ok(color == 0x00ffffff, "Clear rectangle 4(neg, neg) has color %08x\n", color); -} - static void fog_test(IDirect3DDevice7 *device) { HRESULT hr; @@ -1681,7 +1635,6 @@ START_TEST(visual) /* Now run the tests */ depth_clamp_test(Direct3DDevice); - clear_test(Direct3DDevice); fog_test(Direct3DDevice); offscreen_test(Direct3DDevice); test_blend(Direct3DDevice); -- 2.11.0

2 1

[PATCH 1/2] d3d11: Handle 3D textures in wined3d_resource_from_d3d10_resource().
by Józef Kucia 10 Jan '18

10 Jan '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/texture.c | 8 ++++++++ dlls/d3d11/utils.c | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 4d9f34ea42ff..e7fd3a7f4c79 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -152,6 +152,7 @@ struct d3d_texture3d HRESULT d3d_texture3d_create(struct d3d_device *device, const D3D11_TEXTURE3D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture3d **texture) DECLSPEC_HIDDEN; struct d3d_texture3d *unsafe_impl_from_ID3D11Texture3D(ID3D11Texture3D *iface) DECLSPEC_HIDDEN; +struct d3d_texture3d *unsafe_impl_from_ID3D10Texture3D(ID3D10Texture3D *iface) DECLSPEC_HIDDEN; /* ID3D11Buffer, ID3D10Buffer */ struct d3d_buffer diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 177c0cc93912..17fb4b1da37c 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -924,6 +924,14 @@ static const struct ID3D10Texture3DVtbl d3d10_texture3d_vtbl = d3d10_texture3d_GetDesc, }; +struct d3d_texture3d *unsafe_impl_from_ID3D10Texture3D(ID3D10Texture3D *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_texture3d_vtbl); + return CONTAINING_RECORD(iface, struct d3d_texture3d, ID3D10Texture3D_iface); +} + struct d3d_texture3d *unsafe_impl_from_ID3D11Texture3D(ID3D11Texture3D *iface) { if (!iface) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index e919c58da452..c9e137c66e57 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -637,6 +637,10 @@ struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *re return wined3d_texture_get_resource(unsafe_impl_from_ID3D10Texture2D( (ID3D10Texture2D *)resource)->wined3d_texture); + case D3D10_RESOURCE_DIMENSION_TEXTURE3D: + return wined3d_texture_get_resource(unsafe_impl_from_ID3D10Texture3D( + (ID3D10Texture3D *)resource)->wined3d_texture); + default: FIXME("Unhandled resource dimension %#x.\n", dimension); return NULL; -- 2.13.6

2 4

[PATCH 3/3] ddraw/tests: Move the surface enumeration test.
by Henri Verbeet 10 Jan '18

10 Jan '18

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 76 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 76 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 76 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 42 ----------------------- 5 files changed, 309 insertions(+), 42 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ee03ee94b68..cef50ade3c6 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -11146,6 +11146,81 @@ static void test_clear(void) DestroyWindow(window); } +struct enum_surfaces_param +{ + IDirectDrawSurface *surfaces[8]; + unsigned int count; +}; + +static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) +{ + struct enum_surfaces_param *param = context; + BOOL found = FALSE; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(param->surfaces); ++i) + { + if (param->surfaces[i] == surface) + { + found = TRUE; + break; + } + } + + ok(found, "Unexpected surface %p enumerated.\n", surface); + IDirectDrawSurface_Release(surface); + ++param->count; + + return DDENUMRET_OK; +} + +static void test_enum_surfaces(void) +{ + struct enum_surfaces_param param = {0}; + IDirectDraw *ddraw; + DDSURFACEDESC desc; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + U2(desc).dwMipMapCount = 3; + desc.dwWidth = 32; + desc.dwHeight = 32; + hr = IDirectDraw_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_GetAttachedSurface(param.surfaces[0], &desc.ddsCaps, &param.surfaces[1]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(param.surfaces[1], &desc.ddsCaps, &param.surfaces[2]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(param.surfaces[2], &desc.ddsCaps, &param.surfaces[3]); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!param.surfaces[3], "Got unexpected pointer %p.\n", param.surfaces[3]); + + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + &desc, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + NULL, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + IDirectDrawSurface_Release(param.surfaces[2]); + IDirectDrawSurface_Release(param.surfaces[1]); + IDirectDrawSurface_Release(param.surfaces[0]); + IDirectDraw_Release(ddraw); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -11246,4 +11321,5 @@ START_TEST(ddraw1) test_ck_operation(); test_depth_readback(); test_clear(); + test_enum_surfaces(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 42dc3f262d0..3e7704f95eb 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -12502,6 +12502,81 @@ static void test_clear(void) DestroyWindow(window); } +struct enum_surfaces_param +{ + IDirectDrawSurface *surfaces[8]; + unsigned int count; +}; + +static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) +{ + struct enum_surfaces_param *param = context; + BOOL found = FALSE; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(param->surfaces); ++i) + { + if (param->surfaces[i] == surface) + { + found = TRUE; + break; + } + } + + ok(found, "Unexpected surface %p enumerated.\n", surface); + IDirectDrawSurface_Release(surface); + ++param->count; + + return DDENUMRET_OK; +} + +static void test_enum_surfaces(void) +{ + struct enum_surfaces_param param = {0}; + IDirectDraw2 *ddraw; + DDSURFACEDESC desc; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + U2(desc).dwMipMapCount = 3; + desc.dwWidth = 32; + desc.dwHeight = 32; + hr = IDirectDraw2_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL); + ok(SUCCEEDED(hr), "Failed to create a surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_GetAttachedSurface(param.surfaces[0], &desc.ddsCaps, &param.surfaces[1]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(param.surfaces[1], &desc.ddsCaps, &param.surfaces[2]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(param.surfaces[2], &desc.ddsCaps, &param.surfaces[3]); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!param.surfaces[3], "Got unexpected pointer %p.\n", param.surfaces[3]); + + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + &desc, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + NULL, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + IDirectDrawSurface_Release(param.surfaces[2]); + IDirectDrawSurface_Release(param.surfaces[1]); + IDirectDrawSurface_Release(param.surfaces[0]); + IDirectDraw2_Release(ddraw); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -12610,4 +12685,5 @@ START_TEST(ddraw2) test_ck_operation(); test_depth_readback(); test_clear(); + test_enum_surfaces(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index dab1e6d0f97..c0ffa532eed 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -14556,6 +14556,81 @@ static void test_clear(void) DestroyWindow(window); } +struct enum_surfaces_param +{ + IDirectDrawSurface4 *surfaces[8]; + unsigned int count; +}; + +static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface4 *surface, DDSURFACEDESC2 *desc, void *context) +{ + struct enum_surfaces_param *param = context; + BOOL found = FALSE; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(param->surfaces); ++i) + { + if (param->surfaces[i] == surface) + { + found = TRUE; + break; + } + } + + ok(found, "Unexpected surface %p enumerated.\n", surface); + IDirectDrawSurface4_Release(surface); + ++param->count; + + return DDENUMRET_OK; +} + +static void test_enum_surfaces(void) +{ + struct enum_surfaces_param param = {0}; + DDSURFACEDESC2 desc; + IDirectDraw4 *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + U2(desc).dwMipMapCount = 3; + desc.dwWidth = 32; + desc.dwHeight = 32; + hr = IDirectDraw4_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL); + ok(SUCCEEDED(hr), "Failed to create a surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface4_GetAttachedSurface(param.surfaces[0], &desc.ddsCaps, &param.surfaces[1]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetAttachedSurface(param.surfaces[1], &desc.ddsCaps, &param.surfaces[2]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetAttachedSurface(param.surfaces[2], &desc.ddsCaps, &param.surfaces[3]); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!param.surfaces[3], "Got unexpected pointer %p.\n", param.surfaces[3]); + + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + &desc, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + NULL, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + IDirectDrawSurface4_Release(param.surfaces[2]); + IDirectDrawSurface4_Release(param.surfaces[1]); + IDirectDrawSurface4_Release(param.surfaces[0]); + IDirectDraw4_Release(ddraw); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -14677,4 +14752,5 @@ START_TEST(ddraw4) test_map_synchronisation(); test_depth_readback(); test_clear(); + test_enum_surfaces(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index cebe0ecbf50..a187d8b80c9 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13884,6 +13884,86 @@ static void test_clear(void) DestroyWindow(window); } +struct enum_surfaces_param +{ + IDirectDrawSurface7 *surfaces[8]; + unsigned int count; +}; + +static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) +{ + struct enum_surfaces_param *param = context; + BOOL found = FALSE; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(param->surfaces); ++i) + { + if (param->surfaces[i] == surface) + { + found = TRUE; + break; + } + } + + ok(found, "Unexpected surface %p enumerated.\n", surface); + IDirectDrawSurface7_Release(surface); + ++param->count; + + return DDENUMRET_OK; +} + +static void test_enum_surfaces(void) +{ + struct enum_surfaces_param param = {0}; + DDSURFACEDESC2 desc; + IDirectDraw7 *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + U2(desc).dwMipMapCount = 3; + desc.dwWidth = 32; + desc.dwHeight = 32; + if (FAILED(IDirectDraw7_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL))) + { + win_skip("Failed to create a texture, skipping tests.\n"); + IDirectDraw7_Release(ddraw); + return; + } + + hr = IDirectDrawSurface7_GetAttachedSurface(param.surfaces[0], &desc.ddsCaps, &param.surfaces[1]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(param.surfaces[1], &desc.ddsCaps, &param.surfaces[2]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(param.surfaces[2], &desc.ddsCaps, &param.surfaces[3]); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!param.surfaces[3], "Got unexpected pointer %p.\n", param.surfaces[3]); + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + &desc, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + NULL, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + IDirectDrawSurface7_Release(param.surfaces[2]); + IDirectDrawSurface7_Release(param.surfaces[1]); + IDirectDrawSurface7_Release(param.surfaces[0]); + IDirectDraw7_Release(ddraw); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -14015,4 +14095,5 @@ START_TEST(ddraw7) test_map_synchronisation(); test_depth_readback(); test_clear(); + test_enum_surfaces(); } diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 90e7fcf781b..0f775a00625 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -368,47 +368,6 @@ static HRESULT WINAPI enumCB(IDirectDrawSurface *surf, DDSURFACEDESC *desc, void return DDENUMRET_OK; } -static void EnumTest(void) -{ - HRESULT rc; - DDSURFACEDESC ddsd; - IDirectDrawSurface *surface; - struct enumstruct ctx; - - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; - U2(ddsd).dwMipMapCount = 3; - ddsd.dwWidth = 32; - ddsd.dwHeight = 32; - rc = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); - ok(rc==DD_OK,"CreateSurface returned: %x\n",rc); - - memset(&ctx, 0, sizeof(ctx)); - ctx.expected[0] = surface; - rc = IDirectDrawSurface_GetAttachedSurface(ctx.expected[0], &ddsd.ddsCaps, &ctx.expected[1]); - ok(rc == DD_OK, "GetAttachedSurface returned %08x\n", rc); - rc = IDirectDrawSurface_GetAttachedSurface(ctx.expected[1], &ddsd.ddsCaps, &ctx.expected[2]); - ok(rc == DD_OK, "GetAttachedSurface returned %08x\n", rc); - rc = IDirectDrawSurface_GetAttachedSurface(ctx.expected[2], &ddsd.ddsCaps, &ctx.expected[3]); - ok(rc == DDERR_NOTFOUND, "GetAttachedSurface returned %08x\n", rc); - ok(!ctx.expected[3], "expected NULL pointer\n"); - ctx.count = 0; - - rc = IDirectDraw_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &ddsd, &ctx, enumCB); - ok(rc == DD_OK, "IDirectDraw_EnumSurfaces returned %08x\n", rc); - ok(ctx.count == 3, "%d surfaces enumerated, expected 3\n", ctx.count); - - ctx.count = 0; - rc = IDirectDraw_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, &ctx, enumCB); - ok(rc == DD_OK, "IDirectDraw_EnumSurfaces returned %08x\n", rc); - ok(ctx.count == 3, "%d surfaces enumerated, expected 3\n", ctx.count); - - IDirectDrawSurface_Release(ctx.expected[2]); - IDirectDrawSurface_Release(ctx.expected[1]); - IDirectDrawSurface_Release(surface); -} - struct compare { DWORD width, height; @@ -2609,7 +2568,6 @@ START_TEST(dsurface) GetDDInterface_2(); GetDDInterface_4(); GetDDInterface_7(); - EnumTest(); CubeMapTest(); CompressedTest(); SizeTest(); -- 2.11.0

1 0

[PATCH 2/3] ddraw/tests: Mark WARP negative rectangle handling broken.
by Henri Verbeet 10 Jan '18

10 Jan '18

From: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 32 ++++++++++++++++++++++++++------ dlls/ddraw/tests/ddraw2.c | 32 ++++++++++++++++++++++++++------ dlls/ddraw/tests/ddraw4.c | 39 +++++++++++++++++++++++++++++++++------ dlls/ddraw/tests/ddraw7.c | 39 +++++++++++++++++++++++++++++++++------ 4 files changed, 118 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 56521f6a4e3..ee03ee94b68 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -10971,9 +10971,21 @@ static void test_clear(void) hr = IDirect3DViewport_Clear(viewport, 2, rect, D3DCLEAR_TARGET); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = get_surface_color(rt, 160, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3 (pos, neg) has color 0x%08x.\n", color); + color = get_surface_color(rt, 160, 120); + ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1 (pos, pos) has color 0x%08x.\n", color); + color = get_surface_color(rt, 480, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (NULL) has color 0x%08x.\n", color); + color = get_surface_color(rt, 480, 120); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (neg, neg) has color 0x%08x.\n", color); + + viewport_set_background(device, viewport, white); + hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + /* negative x, negative y. - * - * FIXME: WARP seems to clear the entire screen here. */ + * Also ignored, except on WARP, which clears the entire screen. */ rect_negneg.x1 = 640; rect_negneg.y1 = 240; rect_negneg.x2 = 320; @@ -10983,13 +10995,21 @@ static void test_clear(void) ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); color = get_surface_color(rt, 160, 360); - ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3 (pos, neg) has color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 160, 120); - ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1 (pos, pos) has color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 480, 360); - ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (NULL) has color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 480, 120); - ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (neg, neg) has color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); /* Test how the viewport affects clears. */ viewport_set_background(device, viewport, white); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 9e4aebdef4b..42dc3f262d0 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -12342,9 +12342,21 @@ static void test_clear(void) hr = IDirect3DViewport2_Clear(viewport, 2, rect, D3DCLEAR_TARGET); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = get_surface_color(rt, 160, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3 (pos, neg) has color 0x%08x.\n", color); + color = get_surface_color(rt, 160, 120); + ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1 (pos, pos) has color 0x%08x.\n", color); + color = get_surface_color(rt, 480, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (NULL) has color 0x%08x.\n", color); + color = get_surface_color(rt, 480, 120); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (neg, neg) has color 0x%08x.\n", color); + + viewport_set_background(device, viewport, white); + hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + /* negative x, negative y. - * - * FIXME: WARP seems to clear the entire screen here. */ + * Also ignored, except on WARP, which clears the entire screen. */ rect_negneg.x1 = 640; rect_negneg.y1 = 240; rect_negneg.x2 = 320; @@ -12354,13 +12366,21 @@ static void test_clear(void) ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); color = get_surface_color(rt, 160, 360); - ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3 (pos, neg) has color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 160, 120); - ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1 (pos, pos) has color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 480, 360); - ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (NULL) has color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 480, 120); - ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (neg, neg) has color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); /* Test how the viewport affects clears. */ viewport_set_background(device, viewport, white); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index e4b65a5ca1f..dab1e6d0f97 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -14358,6 +14358,8 @@ static void test_clear(void) IDirect3DViewport3 *viewport, *viewport2, *viewport3; IDirect3DDevice3 *device; IDirectDrawSurface4 *rt; + IDirectDraw4 *ddraw; + IDirect3D3 *d3d; D3DRECT rect[2]; D3DCOLOR color; ULONG refcount; @@ -14372,6 +14374,11 @@ static void test_clear(void) return; } + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D3 interface, hr %#x.\n", hr); + hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); @@ -14399,9 +14406,19 @@ static void test_clear(void) hr = IDirect3DViewport3_Clear2(viewport, 2, rect, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = get_surface_color(rt, 160, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3 (pos, neg) has color 0x%08x.\n", color); + color = get_surface_color(rt, 160, 120); + ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1 (pos, pos) has color 0x%08x.\n", color); + color = get_surface_color(rt, 480, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (NULL) has color 0x%08x.\n", color); + color = get_surface_color(rt, 480, 120); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (neg, neg) has color 0x%08x.\n", color); + + hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); /* negative x, negative y. - * - * FIXME: WARP seems to clear the entire screen here. */ + * Also ignored, except on WARP, which clears the entire screen. */ rect_negneg.x1 = 640; rect_negneg.y1 = 240; rect_negneg.x2 = 320; @@ -14410,13 +14427,21 @@ static void test_clear(void) ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); color = get_surface_color(rt, 160, 360); - ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3 (pos, neg) has color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 160, 120); - ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1 (pos, pos) has color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 480, 360); - ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (NULL) has color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 480, 120); - ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (neg, neg) has color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); /* Test how the viewport affects clears. */ hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); @@ -14524,6 +14549,8 @@ static void test_clear(void) IDirect3DViewport3_Release(viewport2); IDirect3DViewport3_Release(viewport); IDirectDrawSurface4_Release(rt); + IDirectDraw4_Release(ddraw); + IDirect3D3_Release(d3d); refcount = IDirect3DDevice3_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(window); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5b29f9cd13e..cebe0ecbf50 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13728,7 +13728,9 @@ static void test_clear(void) IDirect3DDevice7 *device; IDirectDrawSurface7 *rt; D3DVIEWPORT7 vp, old_vp; + IDirectDraw7 *ddraw; D3DRECT rect_negneg; + IDirect3D7 *d3d; D3DRECT rect[2]; D3DCOLOR color; ULONG refcount; @@ -13743,6 +13745,11 @@ static void test_clear(void) return; } + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); @@ -13766,9 +13773,19 @@ static void test_clear(void) hr = IDirect3DDevice7_Clear(device, 2, rect, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = get_surface_color(rt, 160, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3 (pos, neg) has color 0x%08x.\n", color); + color = get_surface_color(rt, 160, 120); + ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1 (pos, pos) has color 0x%08x.\n", color); + color = get_surface_color(rt, 480, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (NULL) has color 0x%08x.\n", color); + color = get_surface_color(rt, 480, 120); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (neg, neg) has color 0x%08x.\n", color); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); /* negative x, negative y. - * - * FIXME: WARP seems to clear the entire screen here. */ + * Also ignored, except on WARP, which clears the entire screen. */ rect_negneg.x1 = 640; rect_negneg.y1 = 240; rect_negneg.x2 = 320; @@ -13777,13 +13794,21 @@ static void test_clear(void) ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); color = get_surface_color(rt, 160, 360); - ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3 (pos, neg) has color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 160, 120); - ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1 (pos, pos) has color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 480, 360); - ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (NULL) has color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 480, 120); - ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (neg, neg) has color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 0) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); /* Test how the viewport affects clears. */ hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); @@ -13852,6 +13877,8 @@ static void test_clear(void) * in d3d7. */ IDirectDrawSurface7_Release(rt); + IDirectDraw7_Release(ddraw); + IDirect3D7_Release(d3d); refcount = IDirect3DDevice7_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(window); -- 2.11.0

1 0

[PATCH] msvcrt: Don't include MSVC 7.0+ exception functions in SOs for older DLLs
by Alex Henrie 10 Jan '18

10 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msvcrt/except.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 8d13e7fbef..13698f8364 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -41,7 +41,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); +#if _MSVCR_VER>=70 && _MSVCR_VER<=71 static MSVCRT_security_error_handler security_error_handler; +#endif static MSVCRT___sighandler_t sighandlers[MSVCRT_NSIG] = { MSVCRT_SIG_DFL }; @@ -294,6 +296,8 @@ BOOL CDECL MSVCRT___uncaught_exception(void) return FALSE; } +#if _MSVCR_VER>=70 && _MSVCR_VER<=71 + /********************************************************************* * _set_security_error_handler (MSVCR70.@) */ @@ -321,6 +325,8 @@ void CDECL __security_error_handler(int code, void *data) MSVCRT__exit(3); } +#endif /* _MSVCR_VER>=70 && _MSVCR_VER<=71 */ + #if _MSVCR_VER>=110 /********************************************************************* * __crtSetUnhandledExceptionFilter (MSVCR110.@) @@ -470,8 +476,10 @@ struct __std_exception_data { MSVCRT_bool dofree; }; +#if _MSVCR_VER>=140 + /********************************************************************* - * __std_exception_copy (MSVCRT.@) + * __std_exception_copy (UCRTBASE.@) */ void CDECL MSVCRT___std_exception_copy(const struct __std_exception_data *src, struct __std_exception_data *dst) @@ -488,7 +496,7 @@ void CDECL MSVCRT___std_exception_copy(const struct __std_exception_data *src, } /********************************************************************* - * __std_exception_destroy (MSVCRT.@) + * __std_exception_destroy (UCRTBASE.@) */ void CDECL MSVCRT___std_exception_destroy(struct __std_exception_data *data) { @@ -499,3 +507,5 @@ void CDECL MSVCRT___std_exception_destroy(struct __std_exception_data *data) data->what = NULL; data->dofree = 0; } + +#endif /* _MSVCR_VER>=140 */ -- 2.15.1

2 10

[PATCH] kernel32/tests: Drop module test workarounds for Windows <= 2000
by Alex Henrie 10 Jan '18

10 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Coverity was complaining about one of them. The most straightforward solution is to remove them all. dlls/kernel32/tests/module.c | 162 +++++++++++++++---------------------------- 1 file changed, 54 insertions(+), 108 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index d3b9c92086..0b4ce14c46 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -29,8 +29,6 @@ static BOOL (WINAPI *pSetDllDirectoryA)(LPCSTR); static DLL_DIRECTORY_COOKIE (WINAPI *pAddDllDirectory)(const WCHAR*); static BOOL (WINAPI *pRemoveDllDirectory)(DLL_DIRECTORY_COOKIE); static BOOL (WINAPI *pSetDefaultDllDirectories)(DWORD); -static BOOL (WINAPI *pGetModuleHandleExA)(DWORD,LPCSTR,HMODULE*); -static BOOL (WINAPI *pGetModuleHandleExW)(DWORD,LPCWSTR,HMODULE*); static BOOL (WINAPI *pK32GetModuleInformation)(HANDLE process, HMODULE module, MODULEINFO *modinfo, DWORD cb); @@ -180,8 +178,7 @@ static void testGetModuleFileName(const char* name) ok(len1W / 2 == len2W, "Correct length in GetModuleFilenameW with buffer too small (%d/%d)\n", len1W / 2, len2W); } - ok(len1A / 2 == len2A || - len1A / 2 == len2A + 1, /* Win9x */ + ok(len1A / 2 == len2A, "Correct length in GetModuleFilenameA with buffer too small (%d/%d)\n", len1A / 2, len2A); } @@ -200,9 +197,7 @@ static void testGetModuleFileName_Wrong(void) bufA[0] = '*'; ok(GetModuleFileNameA((void*)0xffffffff, bufA, sizeof(bufA)) == 0, "Unexpected success in module handle\n"); - ok(bufA[0] == '*' || - bufA[0] == 0 /* Win9x */, - "When failing, buffer shouldn't be written to\n"); + ok(bufA[0] == '*', "When failing, buffer shouldn't be written to\n"); } static void testLoadLibraryA(void) @@ -221,14 +216,10 @@ static void testLoadLibraryA(void) SetLastError(0xdeadbeef); hModule1 = LoadLibraryA("kernel32 "); - /* Only winNT does this */ - if (GetLastError() != ERROR_DLL_NOT_FOUND) - { - ok( hModule1 != NULL, "\"kernel32 \" should be loadable\n"); - ok( GetLastError() == 0xdeadbeef, "GetLastError should be 0xdeadbeef but is %d\n", GetLastError()); - ok( hModule == hModule1, "Loaded wrong module\n"); - FreeLibrary(hModule1); - } + ok( hModule1 != NULL, "\"kernel32 \" should be loadable\n" ); + ok( GetLastError() == 0xdeadbeef, "GetLastError should be 0xdeadbeef but is %d\n", GetLastError() ); + ok( hModule == hModule1, "Loaded wrong module\n" ); + FreeLibrary(hModule1); FreeLibrary(hModule); } @@ -253,7 +244,7 @@ static void testNestedLoadLibraryA(void) hModule1 = LoadLibraryA(path1); if (!hModule1) { - /* We must be on Windows NT, so we cannot test */ + /* We must be on Windows, so we cannot test */ return; } @@ -261,12 +252,7 @@ static void testNestedLoadLibraryA(void) strcat(path2, "\\system32\\"); strcat(path2, dllname); hModule2 = LoadLibraryA(path2); - if (!hModule2) - { - /* We must be on Windows 9x, so we cannot test */ - ok(FreeLibrary(hModule1), "FreeLibrary() failed\n"); - return; - } + ok(hModule2 != NULL, "LoadLibrary(%s) failed\n", path2); /* The first LoadLibrary() call may have registered the dll under the * system32 path. So load it, again, under the '...\system\...' path so @@ -296,8 +282,7 @@ static void testLoadLibraryA_Wrong(void) SetLastError(0xdeadbeef); hModule = LoadLibraryA("non_ex_pv.dll"); ok( !hModule, "non_ex_pv.dll should be not loadable\n"); - ok( GetLastError() == ERROR_MOD_NOT_FOUND || GetLastError() == ERROR_DLL_NOT_FOUND, - "Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x), got %d\n", GetLastError()); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "Expected ERROR_MOD_NOT_FOUND, got %d\n", GetLastError() ); /* Just in case */ FreeLibrary(hModule); @@ -310,14 +295,12 @@ static void testGetProcAddress_Wrong(void) SetLastError(0xdeadbeef); fp = GetProcAddress(NULL, "non_ex_call"); ok( !fp, "non_ex_call should not be found\n"); - ok( GetLastError() == ERROR_PROC_NOT_FOUND || GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_PROC_NOT_FOUND or ERROR_INVALID_HANDLE(win9x), got %d\n", GetLastError()); + ok( GetLastError() == ERROR_PROC_NOT_FOUND, "Expected ERROR_PROC_NOT_FOUND, got %d\n", GetLastError() ); SetLastError(0xdeadbeef); fp = GetProcAddress((HMODULE)0xdeadbeef, "non_ex_call"); ok( !fp, "non_ex_call should not be found\n"); - ok( GetLastError() == ERROR_MOD_NOT_FOUND || GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_HANDLE(win9x), got %d\n", GetLastError()); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "Expected ERROR_MOD_NOT_FOUND, got %d\n", GetLastError() ); } static void testLoadLibraryEx(void) @@ -333,28 +316,20 @@ static void testLoadLibraryEx(void) ok(hfile != INVALID_HANDLE_VALUE, "Expected a valid file handle\n"); /* NULL lpFileName */ - if (is_unicode_enabled) - { - SetLastError(0xdeadbeef); - hmodule = LoadLibraryExA(NULL, NULL, 0); - ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - ok(GetLastError() == ERROR_MOD_NOT_FOUND || - GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */ - "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n", - GetLastError()); - } - else - win_skip("NULL filename crashes on WinMe\n"); + SetLastError(0xdeadbeef); + hmodule = LoadLibraryExA(NULL, NULL, 0); + ok(hmodule == 0, "Expected 0, got %p\n", hmodule); + ok(GetLastError() == ERROR_MOD_NOT_FOUND || + GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* empty lpFileName */ SetLastError(0xdeadbeef); hmodule = LoadLibraryExA("", NULL, 0); ok(hmodule == 0, "Expected 0, got %p\n", hmodule); ok(GetLastError() == ERROR_MOD_NOT_FOUND || - GetLastError() == ERROR_DLL_NOT_FOUND /* win9x */ || GetLastError() == ERROR_INVALID_PARAMETER /* win8 */, - "Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND, got %d\n", - GetLastError()); + "Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND, got %d\n", GetLastError()); /* hFile is non-NULL */ SetLastError(0xdeadbeef); @@ -363,8 +338,7 @@ static void testLoadLibraryEx(void) todo_wine { ok(GetLastError() == ERROR_SHARING_VIOLATION || - GetLastError() == ERROR_INVALID_PARAMETER || /* win2k3 */ - GetLastError() == ERROR_FILE_NOT_FOUND, /* win9x */ + GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */ "Unexpected last error, got %d\n", GetLastError()); } @@ -374,8 +348,7 @@ static void testLoadLibraryEx(void) todo_wine { ok(GetLastError() == ERROR_SHARING_VIOLATION || - GetLastError() == ERROR_INVALID_PARAMETER || /* win2k3 */ - GetLastError() == ERROR_FILE_NOT_FOUND, /* win9x */ + GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */ "Unexpected last error, got %d\n", GetLastError()); } @@ -385,10 +358,8 @@ static void testLoadLibraryEx(void) ok(hmodule == 0, "Expected 0, got %p\n", hmodule); todo_wine { - ok(GetLastError() == ERROR_SHARING_VIOLATION || - GetLastError() == ERROR_FILE_NOT_FOUND, /* win9x */ - "Expected ERROR_SHARING_VIOLATION or ERROR_FILE_NOT_FOUND, got %d\n", - GetLastError()); + ok(GetLastError() == ERROR_SHARING_VIOLATION, + "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); } /* lpFileName does not matter */ @@ -399,8 +370,7 @@ static void testLoadLibraryEx(void) ok(hmodule == 0, "Expected 0, got %p\n", hmodule); ok(GetLastError() == ERROR_MOD_NOT_FOUND || GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */ - "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n", - GetLastError()); + "Expected ERROR_MOD_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } CloseHandle(hfile); @@ -411,10 +381,8 @@ static void testLoadLibraryEx(void) ok(hmodule == 0, "Expected 0, got %p\n", hmodule); todo_wine { - ok(GetLastError() == ERROR_FILE_INVALID || - GetLastError() == ERROR_BAD_FORMAT, /* win9x */ - "Expected ERROR_FILE_INVALID or ERROR_BAD_FORMAT, got %d\n", - GetLastError()); + ok(GetLastError() == ERROR_FILE_INVALID, + "Expected ERROR_FILE_INVALID, got %d\n", GetLastError()); } DeleteFileA("testfile.dll"); @@ -429,7 +397,7 @@ static void testLoadLibraryEx(void) hmodule = LoadLibraryExA(path, NULL, LOAD_LIBRARY_AS_DATAFILE); ok(hmodule != 0, "Expected valid module handle\n"); ok(GetLastError() == 0xdeadbeef || - GetLastError() == ERROR_SUCCESS, /* win9x */ + GetLastError() == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got %d\n", GetLastError()); /* try invalid file handle */ @@ -444,9 +412,7 @@ static void testLoadLibraryEx(void) SetLastError(0xdeadbeef); hmodule = LoadLibraryExA("kernel32.dll", NULL, LOAD_LIBRARY_AS_DATAFILE); ok(hmodule != 0, "Expected valid module handle\n"); - ok(GetLastError() == 0xdeadbeef || - GetLastError() == ERROR_SUCCESS, /* win9x */ - "Expected 0xdeadbeef or ERROR_SUCCESS, got %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); FreeLibrary(hmodule); @@ -462,8 +428,7 @@ static void testLoadLibraryEx(void) { ok(hmodule == 0, "Expected 0, got %p\n", hmodule); } - ok(GetLastError() == ERROR_FILE_NOT_FOUND || - broken(GetLastError() == ERROR_INVALID_HANDLE), /* nt4 */ + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); /* Free the loaded dll when it's the first time this dll is loaded @@ -731,22 +696,15 @@ static void init_pointers(void) MAKEFUNC(AddDllDirectory); MAKEFUNC(RemoveDllDirectory); MAKEFUNC(SetDefaultDllDirectories); - MAKEFUNC(GetModuleHandleExA); - MAKEFUNC(GetModuleHandleExW); MAKEFUNC(K32GetModuleInformation); #undef MAKEFUNC - /* not all Windows versions export this in kernel32 */ + /* before Windows 7 this was not exported in kernel32 */ if (!pK32GetModuleInformation) { HMODULE hPsapi = LoadLibraryA("psapi.dll"); - if (hPsapi) - { - pK32GetModuleInformation = (void *)GetProcAddress(hPsapi, "GetModuleInformation"); - if (!pK32GetModuleInformation) FreeLibrary(hPsapi); - } + pK32GetModuleInformation = (void *)GetProcAddress(hPsapi, "GetModuleInformation"); } - } static void testGetModuleHandleEx(void) @@ -757,113 +715,107 @@ static void testGetModuleHandleEx(void) DWORD error; HMODULE mod, mod_kernel32; - if (!pGetModuleHandleExA || !pGetModuleHandleExW) - { - win_skip( "GetModuleHandleEx not available\n" ); - return; - } - SetLastError( 0xdeadbeef ); - ret = pGetModuleHandleExA( 0, NULL, NULL ); + ret = GetModuleHandleExA( 0, NULL, NULL ); error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); - ret = pGetModuleHandleExA( 0, "kernel32", NULL ); + ret = GetModuleHandleExA( 0, "kernel32", NULL ); error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; - ret = pGetModuleHandleExA( 0, "kernel32", &mod ); + ret = GetModuleHandleExA( 0, "kernel32", &mod ); ok( ret, "unexpected failure %u\n", GetLastError() ); ok( mod != (HMODULE)0xdeadbeef, "got %p\n", mod ); FreeLibrary( mod ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; - ret = pGetModuleHandleExA( 0, "nosuchmod", &mod ); + ret = GetModuleHandleExA( 0, "nosuchmod", &mod ); error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); ok( mod == NULL, "got %p\n", mod ); SetLastError( 0xdeadbeef ); - ret = pGetModuleHandleExW( 0, NULL, NULL ); + ret = GetModuleHandleExW( 0, NULL, NULL ); error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); - ret = pGetModuleHandleExW( 0, kernel32W, NULL ); + ret = GetModuleHandleExW( 0, kernel32W, NULL ); error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; - ret = pGetModuleHandleExW( 0, kernel32W, &mod ); + ret = GetModuleHandleExW( 0, kernel32W, &mod ); ok( ret, "unexpected failure %u\n", GetLastError() ); ok( mod != (HMODULE)0xdeadbeef, "got %p\n", mod ); FreeLibrary( mod ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; - ret = pGetModuleHandleExW( 0, nosuchmodW, &mod ); + ret = GetModuleHandleExW( 0, nosuchmodW, &mod ); error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); ok( mod == NULL, "got %p\n", mod ); SetLastError( 0xdeadbeef ); - ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, NULL ); + ret = GetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, NULL ); error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); - ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, "kernel32", NULL ); + ret = GetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, "kernel32", NULL ); error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; - ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, "kernel32", &mod ); + ret = GetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, "kernel32", &mod ); ok( ret, "unexpected failure %u\n", GetLastError() ); ok( mod != (HMODULE)0xdeadbeef, "got %p\n", mod ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; - ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, "nosuchmod", &mod ); + ret = GetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, "nosuchmod", &mod ); error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); ok( mod == NULL, "got %p\n", mod ); SetLastError( 0xdeadbeef ); - ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, NULL ); + ret = GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, NULL ); error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); - ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, kernel32W, NULL ); + ret = GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, kernel32W, NULL ); error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; - ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, kernel32W, &mod ); + ret = GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, kernel32W, &mod ); ok( ret, "unexpected failure %u\n", GetLastError() ); ok( mod != (HMODULE)0xdeadbeef, "got %p\n", mod ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; - ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, nosuchmodW, &mod ); + ret = GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, nosuchmodW, &mod ); error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); @@ -872,54 +824,54 @@ static void testGetModuleHandleEx(void) mod_kernel32 = LoadLibraryA( "kernel32" ); SetLastError( 0xdeadbeef ); - ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, NULL, NULL ); + ret = GetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, NULL, NULL ); error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); - ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)mod_kernel32, NULL ); + ret = GetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)mod_kernel32, NULL ); error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; - ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)mod_kernel32, &mod ); + ret = GetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)mod_kernel32, &mod ); ok( ret, "unexpected failure %u\n", GetLastError() ); ok( mod == mod_kernel32, "got %p\n", mod ); FreeLibrary( mod ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; - ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)0xbeefdead, &mod ); + ret = GetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)0xbeefdead, &mod ); error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); ok( mod == NULL, "got %p\n", mod ); SetLastError( 0xdeadbeef ); - ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, NULL, NULL ); + ret = GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, NULL, NULL ); error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); - ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)mod_kernel32, NULL ); + ret = GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)mod_kernel32, NULL ); error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; - ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)mod_kernel32, &mod ); + ret = GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)mod_kernel32, &mod ); ok( ret, "unexpected failure %u\n", GetLastError() ); ok( mod == mod_kernel32, "got %p\n", mod ); FreeLibrary( mod ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; - ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)0xbeefdead, &mod ); + ret = GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)0xbeefdead, &mod ); error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); @@ -934,12 +886,6 @@ static void testK32GetModuleInformation(void) HMODULE mod; BOOL ret; - if (!pK32GetModuleInformation) - { - win_skip("K32GetModuleInformation not available\n"); - return; - } - mod = GetModuleHandleA(NULL); memset(&info, 0xAA, sizeof(info)); ret = pK32GetModuleInformation(GetCurrentProcess(), mod, &info, sizeof(info)); -- 2.15.1

2 2

[PATCH 1/2] msxml3/tests: Add missing return value checks to domdoc tests (Coverity)
by Alex Henrie 10 Jan '18

10 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- The other Coverity warning was a false positive; lstrcmp definitely does a NULL check on both of its arguments. dlls/msxml3/tests/domdoc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c1b434bc5f..620f72c1bb 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6460,7 +6460,8 @@ static void test_save(void) hr = IXMLDOMDocument_loadXML(doc, _bstr_(win1252xml), &b); EXPECT_HR(hr, S_OK); - CreateStreamOnHGlobal(NULL, TRUE, &stream); + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); V_VT(&dest) = VT_UNKNOWN; V_UNKNOWN(&dest) = (IUnknown*)stream; hr = IXMLDOMDocument_save(doc, dest); @@ -10950,7 +10951,8 @@ static void test_dispex(void) /* IXMLDOMNodeList */ hr = IXMLDOMDocument_getElementsByTagName(doc, _bstr_("*"), &node_list); EXPECT_HR(hr, S_OK); - IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk); + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); test_domobj_dispex(unk); IUnknown_Release(unk); IXMLDOMNodeList_Release(node_list); -- 2.15.1

2 3

[PATCH] concrt140: Fix Concurrency::is_current_task_group_canceling spec entry
by Piotr Caban 10 Jan '18

10 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/concrt140/concrt140.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[website] German translation for release 3.0-rc5
by Julian Rüger 10 Jan '18

10 Jan '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 1/2] comctl32/tests: Enable more ListView tests on Comctl32 v6
by Nikolay Sivov 10 Jan '18

10 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/listview.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index f291698e76..1df86484c6 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6225,6 +6225,25 @@ START_TEST(listview) test_multiselect(); test_insertitem(); test_header_proc(); + test_images(); + test_checkboxes(); + test_items(); + test_color(); + test_columns(); + test_sorting(); + test_ownerdata(); + test_norecompute(); + test_nosortheader(); + test_columnscreation(); + test_indentation(); + test_finditem(); + test_hover(); + test_destroynotify(); + test_createdragimage(); + test_dispinfo(); + test_LVM_SETITEMTEXT(); + test_LVM_REDRAWITEMS(); + test_oneclickactivate(); unload_v6_module(ctx_cookie, hCtx); -- 2.15.1

1 1

[PATCH] hlink: Implement IHlinkBrowseContext_GetObject().
by Zebediah Figura 10 Jan '18

10 Jan '18

Fixes bug #44332. Fixes a regression introduced by 00aca1476efd573cbf9d31a45c3d484f6fa6055b. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/hlink/browse_ctx.c | 27 ++++++++++++++--- dlls/hlink/tests/browse_ctx.c | 70 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index ee8509d..2038768 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -98,10 +98,11 @@ static ULONG WINAPI IHlinkBC_fnRelease (IHlinkBrowseContext* iface) return ref; } +static const WCHAR szIdent[] = {'W','I','N','E','H','L','I','N','K',0}; + static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface, DWORD dwReserved, IUnknown *piunk, IMoniker *pimk, DWORD *pdwRegister) { - static const WCHAR szIdent[] = {'W','I','N','E','H','L','I','N','K',0}; HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); IMoniker *mon; IMoniker *composite; @@ -125,11 +126,29 @@ static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface, return S_OK; } -static HRESULT WINAPI IHlinkBC_GetObject(IHlinkBrowseContext* face, +static HRESULT WINAPI IHlinkBC_GetObject(IHlinkBrowseContext* iface, IMoniker *pimk, BOOL fBindifRootRegistered, IUnknown **ppiunk) { - FIXME("\n"); - return E_NOTIMPL; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + IMoniker *mon; + IMoniker *composite; + IRunningObjectTable *ROT; + HRESULT hr; + + TRACE("(%p)->(%p, %d, %p)\n", This, pimk, fBindifRootRegistered, ppiunk); + + hr = CreateItemMoniker(NULL, szIdent, &mon); + if (FAILED(hr)) return hr; + CreateGenericComposite(mon, pimk, &composite); + + GetRunningObjectTable(0, &ROT); + hr = IRunningObjectTable_GetObject(ROT, composite, ppiunk); + + IRunningObjectTable_Release(ROT); + IMoniker_Release(composite); + IMoniker_Release(mon); + + return hr; } static HRESULT WINAPI IHlinkBC_Revoke(IHlinkBrowseContext* iface, diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index 40d132b..3193525 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -131,12 +131,82 @@ static void test_BrowseWindowInfo(void) IHlinkBrowseContext_Release(bc); } +static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown)) + { + *ppv = iface; + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI Unknown_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI Unknown_Release(IUnknown *iface) +{ + return 1; +} + +static IUnknownVtbl UnknownVtbl = { + Unknown_QueryInterface, + Unknown_AddRef, + Unknown_Release, +}; + +static IUnknown Unknown = { &UnknownVtbl }; + +static void test_GetObject(void) +{ + IHlinkBrowseContext *bc; + IMoniker *dummy; + IBindCtx *bindctx; + IUnknown *unk; + WCHAR one[] = {'1',0}; + WCHAR five[] = {'5',0}; + DWORD cookie; + HRESULT hres; + + hres = CreateBindCtx(0, &bindctx); + ok(hres == S_OK, "CreateBindCtx() failed: 0x%08x\n", hres); + + hres = CreateItemMoniker(one, five, &dummy); + ok(hres == S_OK, "CreateItemMoniker() failed: 0x%08x\n", hres); + + hres = HlinkCreateBrowseContext(NULL, &IID_IHlinkBrowseContext, (void **)&bc); + ok(hres == S_OK, "HlinkCreateBrowseContext() failed: 0x%08x\n", hres); + + hres = IHlinkBrowseContext_GetObject(bc, dummy, FALSE, &unk); + ok(hres == MK_E_UNAVAILABLE, "expected MK_E_UNAVAILABLE, got 0x%08x\n", hres); + + hres = IHlinkBrowseContext_Register(bc, 0, &Unknown, dummy, &cookie); + ok(hres == S_OK, "Register() failed: 0x%08x\n", hres); + + hres = IHlinkBrowseContext_GetObject(bc, dummy, FALSE, &unk); + ok(hres == S_OK, "GetObject() failed: 0x%08x\n", hres); + ok(unk == &Unknown, "wrong object returned\n"); + + hres = IHlinkBrowseContext_Revoke(bc, cookie); + ok(hres == S_OK, "Revoke() failed: 0x%08x\n", hres); + + hres = IHlinkBrowseContext_GetObject(bc, dummy, FALSE, &unk); + ok(hres == MK_E_UNAVAILABLE, "expected MK_E_UNAVAILABLE, got 0x%08x\n", hres); + + IHlinkBrowseContext_Release(bc); +} + START_TEST(browse_ctx) { CoInitialize(NULL); test_SetInitialHlink(); test_BrowseWindowInfo(); + test_GetObject(); CoUninitialize(); } -- 2.7.4

1 0

[PATCH 1/1] wininet/test: Check null pointer in InternetGetSecurityInfoByURLW
by Wei Xie 10 Jan '18

10 Jan '18

3 4

[PATCH 1/4] dxgi/tests: Skip tests if DXGI_ERROR_NOT_CURRENTLY_AVAILABLE is returned.
by Józef Kucia 09 Jan '18

09 Jan '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 2bc0ff4071bc..a102ed89aa6d 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1494,7 +1494,13 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, ok(SUCCEEDED(hr), "GetContainingOutput failed, hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("Could not change fullscreen state.\n"); + IDXGIOutput_Release(expected_state.target); + return; + } check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); -- 2.13.6

2 7

[PATCH] hid: Pass a buffer to DeviceIoControl in HidD_SetNumInputBuffers
by Andrew Eikum 09 Jan '18

09 Jan '18

DeviceIoControl expects a pointer, and this value gets dereferenced as a ULONG* in hidclass.sys. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/hid/hidd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 1161f0cba6..614e7c4bf5 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -102,7 +102,7 @@ BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG BOOLEAN WINAPI HidD_SetNumInputBuffers(HANDLE HidDeviceObject, ULONG NumberBuffers) { TRACE("(%p %i)\n", HidDeviceObject, NumberBuffers); - return DeviceIoControl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, UlongToPtr(NumberBuffers), sizeof(NumberBuffers), NULL, 0, NULL, NULL); + return DeviceIoControl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0, NULL, NULL); } BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) -- 2.15.1

2 1

[PATCH vkd3d 1/7] libs/vkd3d-shader: Handle unimplemented registers more gracefully.
by Józef Kucia 09 Jan '18

09 Jan '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6fd198b4883d..b39a34571d84 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2204,7 +2204,7 @@ struct vkd3d_shader_register_info unsigned int structure_stride; }; -static void vkd3d_dxbc_compiler_get_register_info(struct vkd3d_dxbc_compiler *compiler, +static bool vkd3d_dxbc_compiler_get_register_info(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, struct vkd3d_shader_register_info *register_info) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; @@ -2218,12 +2218,17 @@ static void vkd3d_dxbc_compiler_get_register_info(struct vkd3d_dxbc_compiler *co assert(reg->idx[0].offset < compiler->temp_count); register_info->id = compiler->temp_id + reg->idx[0].offset; register_info->storage_class = SpvStorageClassFunction; - return; + return true; } vkd3d_symbol_make_register(&reg_symbol, reg); - entry = rb_get(&compiler->symbol_table, &reg_symbol); - assert(entry); + if (!(entry = rb_get(&compiler->symbol_table, &reg_symbol))) + { + FIXME("Unrecognized register %#x.\n", reg->type); + memset(register_info, 0, sizeof(*register_info)); + return false; + } + symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); register_info->id = symbol->id; register_info->storage_class = symbol->info.reg.storage_class; @@ -2258,6 +2263,8 @@ static void vkd3d_dxbc_compiler_get_register_info(struct vkd3d_dxbc_compiler *co { FIXME("Relative addressing not implemented.\n"); } + + return true; } static uint32_t vkd3d_dxbc_compiler_get_register_id(struct vkd3d_dxbc_compiler *compiler, @@ -2280,8 +2287,9 @@ static uint32_t vkd3d_dxbc_compiler_get_register_id(struct vkd3d_dxbc_compiler * case VKD3DSPR_LOCALTHREADID: case VKD3DSPR_LOCALTHREADINDEX: case VKD3DSPR_THREADGROUPID: - vkd3d_dxbc_compiler_get_register_info(compiler, reg, &register_info); - return register_info.id; + if (vkd3d_dxbc_compiler_get_register_info(compiler, reg, &register_info)) + return register_info.id; + return vkd3d_dxbc_compiler_emit_undef(compiler, &builder->global_stream, reg); case VKD3DSPR_IMMCONST: ERR("Unexpected register type %#x.\n", reg->type); return vkd3d_dxbc_compiler_emit_undef(compiler, &builder->global_stream, reg); @@ -2361,7 +2369,12 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler component_idx = vkd3d_write_mask_get_component_idx(write_mask); component_idx = vkd3d_swizzle_get_component(swizzle, component_idx); - vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info); + if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) + { + type_id = vkd3d_spirv_get_type_id(builder, + vkd3d_component_type_from_data_type(reg->data_type), 1); + return vkd3d_spirv_build_op_undef(builder, &builder->global_stream, type_id); + } type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); @@ -2489,7 +2502,8 @@ static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *co assert(reg->type != VKD3DSPR_IMMCONST); - vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info); + if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) + return; type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); @@ -4827,7 +4841,9 @@ static void vkd3d_dxbc_compiler_emit_ld_tgsm(struct vkd3d_dxbc_compiler *compile unsigned int i, j; resource = &src[instruction->src_count - 1]; - vkd3d_dxbc_compiler_get_register_info(compiler, &resource->reg, &reg_info); + if (!vkd3d_dxbc_compiler_get_register_info(compiler, &resource->reg, &reg_info)) + return; + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); base_coordinate_id = vkd3d_dxbc_compiler_emit_raw_structured_addressing(compiler, @@ -4950,7 +4966,9 @@ static void vkd3d_dxbc_compiler_emit_store_tgsm(struct vkd3d_dxbc_compiler *comp struct vkd3d_shader_register_info reg_info; unsigned int component_count; - vkd3d_dxbc_compiler_get_register_info(compiler, &dst->reg, &reg_info); + if (!vkd3d_dxbc_compiler_get_register_info(compiler, &dst->reg, &reg_info)) + return; + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); assert((instruction->handler_idx == VKD3DSIH_STORE_STRUCTURED) != !reg_info.structure_stride); @@ -5157,7 +5175,8 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil { scope = SpvScopeWorkgroup; coordinate_mask = 1u; - vkd3d_dxbc_compiler_get_register_info(compiler, &resource->reg, &reg_info); + if (!vkd3d_dxbc_compiler_get_register_info(compiler, &resource->reg, &reg_info)) + return; structure_stride = reg_info.structure_stride; raw = !structure_stride; } -- 2.13.6

2 13

[PATCH] schtasks/tests: Clean up the tasks directory.
by Zebediah Figura 09 Jan '18

09 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- programs/schtasks/tests/schtasks.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c index b8a9739..5143f0a 100644 --- a/programs/schtasks/tests/schtasks.c +++ b/programs/schtasks/tests/schtasks.c @@ -152,6 +152,8 @@ static BOOL initialize_task_service(void) START_TEST(schtasks) { + static WCHAR wineW[] = {'\\','w','i','n','e',0}; + static WCHAR wine_testW[] = {'\\','w','i','n','e','\\','t','e','s','t',0}; DWORD r; CoInitialize(NULL); @@ -183,6 +185,8 @@ START_TEST(schtasks) r = run_command("schtasks /change /tn wine\\test\\winetest /enable"); ok(r == 1, "r = %u\n", r); + ITaskFolder_DeleteFolder(root, wine_testW, 0); + ITaskFolder_DeleteFolder(root, wineW, 0); ITaskFolder_Release(root); ITaskService_Release(service); CoUninitialize(); -- 2.7.4

2 1

[PATCH 1/2] ddraw/tests: Sync test_clear with d3d8/9 (try 2).
by Stefan Dösinger 09 Jan '18

09 Jan '18

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Try 2: Mark AMD ddraw 1 behavior broken. It seems that AMD drivers (tested on r500 and evergreen, both Win7) do not limit the clear to the viewport rectangle in ddraw1 only. Later ddraw versions work fine. The behavior is (unsurprisingly) not influenced by the version of the viewport interface used to do the clear and not related to SetCurrentViewport in ddraw2. It isn't caused by having more than one viewport either. So as far as I can say it's just the driver being broken. This is merely a port of the existing test back to ddraw. The next patch will address the WARP test failure. --- dlls/ddraw/tests/ddraw1.c | 199 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 197 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 176 ++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 134 +++++++++++++++++++++++++++++++ dlls/ddraw/tests/visual.c | 47 ----------- 5 files changed, 706 insertions(+), 47 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d416cf55a3..58703013c1 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -10913,6 +10913,204 @@ static void test_depth_readback(void) DestroyWindow(window); } +static void test_clear(void) +{ + IDirectDraw *ddraw; + IDirect3DDevice *device; + IDirectDrawSurface *rt; + ULONG refcount; + HWND window; + HRESULT hr; + D3DRECT rect[2]; + D3DRECT rect_negneg, rect_full = {{0}, {0}, {640}, {480}}; + D3DCOLOR color; + IDirect3DViewport *viewport, *viewport2, *viewport3; + IDirect3DMaterial *white, *red, *green, *blue; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + viewport = create_viewport(device, 0, 0, 640, 480); + + white = create_diffuse_material(device, 1.0f, 1.0f, 1.0f, 1.0f); + red = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f); + green = create_diffuse_material(device, 0.0f, 1.0f, 0.0f, 1.0f); + blue = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); + + viewport_set_background(device, viewport, white); + hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* Positive x, negative y. */ + U1(rect[0]).x1 = 0; + U2(rect[0]).y1 = 480; + U3(rect[0]).x2 = 320; + U4(rect[0]).y2 = 240; + + /* Positive x, positive y. */ + U1(rect[1]).x1 = 0; + U2(rect[1]).y1 = 0; + U3(rect[1]).x2 = 320; + U4(rect[1]).y2 = 240; + + /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not refuse negative + * rectangles, but it will not clear them either. */ + viewport_set_background(device, viewport, red); + hr = IDirect3DViewport_Clear(viewport, 2, rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* negative x, negative y. + * + * FIXME: WARP seems to clear the entire screen here.*/ + rect_negneg.x1 = 640; + rect_negneg.y1 = 240; + rect_negneg.x2 = 320; + rect_negneg.y2 = 0; + viewport_set_background(device, viewport, green); + hr = IDirect3DViewport_Clear(viewport, 1, &rect_negneg, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 160, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3(pos, neg) has color %08x.\n", color); + color = get_surface_color(rt, 160, 120); + ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1(pos, pos) has color %08x.\n", color); + color = get_surface_color(rt, 480, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(NULL) has color %08x.\n", color); + color = get_surface_color(rt, 480, 120); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(neg, neg) has color %08x.\n", color); + + /* Test how the viewport affects clears */ + viewport_set_background(device, viewport, white); + hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + viewport2 = create_viewport(device, 160, 120, 160, 120); + viewport_set_background(device, viewport2, blue); + hr = IDirect3DViewport_Clear(viewport2, 1, &rect_full, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + viewport3 = create_viewport(device, 320, 240, 320, 240); + viewport_set_background(device, viewport3, green); + + U1(rect[0]).x1 = 160; + U2(rect[0]).y1 = 120; + U3(rect[0]).x2 = 480; + U4(rect[0]).y2 = 360; + hr = IDirect3DViewport_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + /* AMD drivers do not limit the clear area to the viewport rectangle in d3d1. + * It works as intended on other drivers and on d3d2 and newer on AMD cards. */ + color = get_surface_color(rt, 158, 118); + ok(compare_color(color, 0x00ffffff, 0) || broken(compare_color(color, 0x000000ff, 0)), + "(158,118) has color %08x\n", color); + color = get_surface_color(rt, 162, 118); + ok(compare_color(color, 0x00ffffff, 0) || broken(compare_color(color, 0x000000ff, 0)), + "(162,118) has color %08x\n", color); + color = get_surface_color(rt, 158, 122); + ok(compare_color(color, 0x00ffffff, 0) || broken(compare_color(color, 0x000000ff, 0)), + "(158,122) has color %08x\n", color); + color = get_surface_color(rt, 162, 122); + ok(compare_color(color, 0x000000ff, 0) || broken(compare_color(color, 0x0000ff00, 0)), + "(162,122) has color %08x\n", color); + + color = get_surface_color(rt, 318, 238); + ok(compare_color(color, 0x000000ff, 0) || broken(compare_color(color, 0x0000ff00, 0)), + "(318,238) has color %08x\n", color); + color = get_surface_color(rt, 322, 238); + ok(compare_color(color, 0x00ffffff, 0) || broken(compare_color(color, 0x0000ff00, 0)), + "(322,328) has color %08x\n", color); + color = get_surface_color(rt, 318, 242); + ok(compare_color(color, 0x00ffffff, 0) || broken(compare_color(color, 0x0000ff00, 0)), + "(318,242) has color %08x\n", color); + color = get_surface_color(rt, 322, 242); + ok(compare_color(color, 0x0000ff00, 0), "(322,242) has color %08x\n", color); + + color = get_surface_color(rt, 478, 358); + ok(compare_color(color, 0x0000ff00, 0), "(478,358 has color %08x\n", color); + color = get_surface_color(rt, 482, 358); + ok(compare_color(color, 0x00ffffff, 0) || broken(compare_color(color, 0x000000ff, 0)), + "(482,358) has color %08x\n", color); + color = get_surface_color(rt, 478, 362); + ok(compare_color(color, 0x00ffffff, 0) || broken(compare_color(color, 0x000000ff, 0)), + "(478,362) has color %08x\n", color); + color = get_surface_color(rt, 482, 362); + ok(compare_color(color, 0x00ffffff, 0) || broken(compare_color(color, 0x000000ff, 0)), + "(482,362) has color %08x\n", color); + + /* The clear rectangle is rendertarget absolute, not relative to the viewport. */ + hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + U1(rect[0]).x1 = 330; + U2(rect[0]).y1 = 250; + U3(rect[0]).x2 = 340; + U4(rect[0]).y2 = 260; + hr = IDirect3DViewport_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 328, 248); + ok(compare_color(color, 0x00ffffff, 0), "(328,248) has color %08x\n", color); + color = get_surface_color(rt, 332, 248); + ok(compare_color(color, 0x00ffffff, 0), "(332,248) has color %08x\n", color); + color = get_surface_color(rt, 328, 252); + ok(compare_color(color, 0x00ffffff, 0), "(328,252) has color %08x\n", color); + color = get_surface_color(rt, 332, 252); + ok(compare_color(color, 0x0000ff00, 0), "(332,252) has color %08x\n", color); + + color = get_surface_color(rt, 338, 248); + ok(compare_color(color, 0x00ffffff, 0), "(338,248) has color %08x\n", color); + color = get_surface_color(rt, 342, 248); + ok(compare_color(color, 0x00ffffff, 0), "(342,248) has color %08x\n", color); + color = get_surface_color(rt, 338, 252); + ok(compare_color(color, 0x0000ff00, 0), "(338,252) has color %08x\n", color); + color = get_surface_color(rt, 342, 252); + ok(compare_color(color, 0x00ffffff, 0), "(342,252) has color %08x\n", color); + + color = get_surface_color(rt, 328, 258); + ok(compare_color(color, 0x00ffffff, 0), "(328,258 has color %08x\n", color); + color = get_surface_color(rt, 332, 258); + ok(compare_color(color, 0x0000ff00, 0), "(332,258) has color %08x\n", color); + color = get_surface_color(rt, 328, 262); + ok(compare_color(color, 0x00ffffff, 0), "(328,262) has color %08x\n", color); + color = get_surface_color(rt, 332, 262); + ok(compare_color(color, 0x00ffffff, 0), "(332,262) has color %08x\n", color); + + color = get_surface_color(rt, 338, 258); + ok(compare_color(color, 0x0000ff00, 0), "(328,258 has color %08x\n", color); + color = get_surface_color(rt, 342, 258); + ok(compare_color(color, 0x00ffffff, 0), "(332,258) has color %08x\n", color); + color = get_surface_color(rt, 338, 262); + ok(compare_color(color, 0x00ffffff, 0), "(328,262) has color %08x\n", color); + color = get_surface_color(rt, 342, 262); + ok(compare_color(color, 0x00ffffff, 0), "(332,262) has color %08x\n", color); + + /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist in d3d1. */ + + IDirect3DViewport_Release(viewport3); + IDirect3DViewport_Release(viewport2); + IDirect3DViewport_Release(viewport); + IDirect3DMaterial_Release(white); + IDirect3DMaterial_Release(red); + IDirect3DMaterial_Release(green); + IDirect3DMaterial_Release(blue); + IDirectDrawSurface_Release(rt); + refcount = IDirect3DDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirectDraw_Release(ddraw); + ok(!refcount, "Ddraw object has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -11012,4 +11210,5 @@ START_TEST(ddraw1) test_texture_load(); test_ck_operation(); test_depth_readback(); + test_clear(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2186c314ac..0b51c99964 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -12287,6 +12287,202 @@ static void test_depth_readback(void) DestroyWindow(window); } +static void test_clear(void) +{ + IDirectDraw2 *ddraw; + IDirect3DDevice2 *device; + IDirectDrawSurface *rt; + ULONG refcount; + HWND window; + HRESULT hr; + D3DRECT rect[2]; + D3DRECT rect_negneg, rect_full = {{0}, {0}, {640}, {480}}; + D3DCOLOR color; + IDirect3DViewport2 *viewport, *viewport2, *viewport3; + IDirect3DMaterial2 *white, *red, *green, *blue; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw2_Release(ddraw); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice2_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + white = create_diffuse_material(device, 1.0f, 1.0f, 1.0f, 1.0f); + red = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f); + green = create_diffuse_material(device, 0.0f, 1.0f, 0.0f, 1.0f); + blue = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); + + viewport_set_background(device, viewport, white); + hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* Positive x, negative y. */ + U1(rect[0]).x1 = 0; + U2(rect[0]).y1 = 480; + U3(rect[0]).x2 = 320; + U4(rect[0]).y2 = 240; + + /* Positive x, positive y. */ + U1(rect[1]).x1 = 0; + U2(rect[1]).y1 = 0; + U3(rect[1]).x2 = 320; + U4(rect[1]).y2 = 240; + + /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not refuse negative + * rectangles, but it will not clear them either. */ + viewport_set_background(device, viewport, red); + hr = IDirect3DViewport2_Clear(viewport, 2, rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* negative x, negative y. + * + * FIXME: WARP seems to clear the entire screen here.*/ + rect_negneg.x1 = 640; + rect_negneg.y1 = 240; + rect_negneg.x2 = 320; + rect_negneg.y2 = 0; + viewport_set_background(device, viewport, green); + hr = IDirect3DViewport2_Clear(viewport, 1, &rect_negneg, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 160, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3(pos, neg) has color %08x.\n", color); + color = get_surface_color(rt, 160, 120); + ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1(pos, pos) has color %08x.\n", color); + color = get_surface_color(rt, 480, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(NULL) has color %08x.\n", color); + color = get_surface_color(rt, 480, 120); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(neg, neg) has color %08x.\n", color); + + /* Test how the viewport affects clears */ + viewport_set_background(device, viewport, white); + hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + viewport2 = create_viewport(device, 160, 120, 160, 120); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport2); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + viewport_set_background(device, viewport2, blue); + hr = IDirect3DViewport2_Clear(viewport2, 1, &rect_full, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + viewport3 = create_viewport(device, 320, 240, 320, 240); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport3); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + U1(rect[0]).x1 = 160; + U2(rect[0]).y1 = 120; + U3(rect[0]).x2 = 480; + U4(rect[0]).y2 = 360; + viewport_set_background(device, viewport3, green); + hr = IDirect3DViewport2_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + color = get_surface_color(rt, 158, 118); + ok(compare_color(color, 0x00ffffff, 0), "(158,118) has color %08x\n", color); + color = get_surface_color(rt, 162, 118); + ok(compare_color(color, 0x00ffffff, 0), "(162,118) has color %08x\n", color); + color = get_surface_color(rt, 158, 122); + ok(compare_color(color, 0x00ffffff, 0), "(158,122) has color %08x\n", color); + color = get_surface_color(rt, 162, 122); + ok(compare_color(color, 0x000000ff, 0), "(162,122) has color %08x\n", color); + + color = get_surface_color(rt, 318, 238); + ok(compare_color(color, 0x000000ff, 0), "(318,238) has color %08x\n", color); + color = get_surface_color(rt, 322, 238); + ok(compare_color(color, 0x00ffffff, 0), "(322,328) has color %08x\n", color); + color = get_surface_color(rt, 318, 242); + ok(compare_color(color, 0x00ffffff, 0), "(318,242) has color %08x\n", color); + color = get_surface_color(rt, 322, 242); + ok(compare_color(color, 0x0000ff00, 0), "(322,242) has color %08x\n", color); + + color = get_surface_color(rt, 478, 358); + ok(compare_color(color, 0x0000ff00, 0), "(478,358 has color %08x\n", color); + color = get_surface_color(rt, 482, 358); + ok(compare_color(color, 0x00ffffff, 0), "(482,358) has color %08x\n", color); + color = get_surface_color(rt, 478, 362); + ok(compare_color(color, 0x00ffffff, 0), "(478,362) has color %08x\n", color); + color = get_surface_color(rt, 482, 362); + ok(compare_color(color, 0x00ffffff, 0), "(482,362) has color %08x\n", color); + + /* The clear rectangle is rendertarget absolute, not relative to the viewport. */ + hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + U1(rect[0]).x1 = 330; + U2(rect[0]).y1 = 250; + U3(rect[0]).x2 = 340; + U4(rect[0]).y2 = 260; + hr = IDirect3DViewport2_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 328, 248); + ok(compare_color(color, 0x00ffffff, 0), "(328,248) has color %08x\n", color); + color = get_surface_color(rt, 332, 248); + ok(compare_color(color, 0x00ffffff, 0), "(332,248) has color %08x\n", color); + color = get_surface_color(rt, 328, 252); + ok(compare_color(color, 0x00ffffff, 0), "(328,252) has color %08x\n", color); + color = get_surface_color(rt, 332, 252); + ok(compare_color(color, 0x0000ff00, 0), "(332,252) has color %08x\n", color); + + color = get_surface_color(rt, 338, 248); + ok(compare_color(color, 0x00ffffff, 0), "(338,248) has color %08x\n", color); + color = get_surface_color(rt, 342, 248); + ok(compare_color(color, 0x00ffffff, 0), "(342,248) has color %08x\n", color); + color = get_surface_color(rt, 338, 252); + ok(compare_color(color, 0x0000ff00, 0), "(338,252) has color %08x\n", color); + color = get_surface_color(rt, 342, 252); + ok(compare_color(color, 0x00ffffff, 0), "(342,252) has color %08x\n", color); + + color = get_surface_color(rt, 328, 258); + ok(compare_color(color, 0x00ffffff, 0), "(328,258 has color %08x\n", color); + color = get_surface_color(rt, 332, 258); + ok(compare_color(color, 0x0000ff00, 0), "(332,258) has color %08x\n", color); + color = get_surface_color(rt, 328, 262); + ok(compare_color(color, 0x00ffffff, 0), "(328,262) has color %08x\n", color); + color = get_surface_color(rt, 332, 262); + ok(compare_color(color, 0x00ffffff, 0), "(332,262) has color %08x\n", color); + + color = get_surface_color(rt, 338, 258); + ok(compare_color(color, 0x0000ff00, 0), "(328,258 has color %08x\n", color); + color = get_surface_color(rt, 342, 258); + ok(compare_color(color, 0x00ffffff, 0), "(332,258) has color %08x\n", color); + color = get_surface_color(rt, 338, 262); + ok(compare_color(color, 0x00ffffff, 0), "(328,262) has color %08x\n", color); + color = get_surface_color(rt, 342, 262); + ok(compare_color(color, 0x00ffffff, 0), "(332,262) has color %08x\n", color); + + /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist in d3d2. */ + + IDirect3DViewport2_Release(viewport3); + IDirect3DViewport2_Release(viewport2); + IDirect3DViewport2_Release(viewport); + IDirect3DMaterial2_Release(white); + IDirect3DMaterial2_Release(red); + IDirect3DMaterial2_Release(green); + IDirect3DMaterial2_Release(blue); + IDirectDrawSurface_Release(rt); + refcount = IDirect3DDevice2_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirectDraw2_Release(ddraw); + ok(!refcount, "Ddraw object has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -12394,4 +12590,5 @@ START_TEST(ddraw2) test_surface_desc_size(); test_ck_operation(); test_depth_readback(); + test_clear(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 4c1bd78eef..dde67d7a33 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -14355,6 +14355,181 @@ static void test_depth_readback(void) DestroyWindow(window); } +static void test_clear(void) +{ + IDirect3DDevice3 *device; + IDirectDrawSurface4 *rt; + ULONG refcount; + HWND window; + HRESULT hr; + D3DRECT rect[2]; + D3DRECT rect_negneg, rect_full = {{0}, {0}, {640}, {480}}; + D3DCOLOR color; + IDirect3DViewport3 *viewport, *viewport2, *viewport3; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* Positive x, negative y. */ + U1(rect[0]).x1 = 0; + U2(rect[0]).y1 = 480; + U3(rect[0]).x2 = 320; + U4(rect[0]).y2 = 240; + + /* Positive x, positive y. */ + U1(rect[1]).x1 = 0; + U2(rect[1]).y1 = 0; + U3(rect[1]).x2 = 320; + U4(rect[1]).y2 = 240; + + /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not refuse negative + * rectangles, but it will not clear them either. */ + hr = IDirect3DViewport3_Clear2(viewport, 2, rect, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* negative x, negative y. + * + * FIXME: WARP seems to clear the entire screen here.*/ + rect_negneg.x1 = 640; + rect_negneg.y1 = 240; + rect_negneg.x2 = 320; + rect_negneg.y2 = 0; + hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 160, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3(pos, neg) has color %08x.\n", color); + color = get_surface_color(rt, 160, 120); + ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1(pos, pos) has color %08x.\n", color); + color = get_surface_color(rt, 480, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(NULL) has color %08x.\n", color); + color = get_surface_color(rt, 480, 120); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(neg, neg) has color %08x.\n", color); + + /* Test how the viewport affects clears */ + hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + viewport2 = create_viewport(device, 160, 120, 160, 120); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport2); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + hr = IDirect3DViewport3_Clear2(viewport2, 1, &rect_full, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + viewport3 = create_viewport(device, 320, 240, 320, 240); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport3); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + U1(rect[0]).x1 = 160; + U2(rect[0]).y1 = 120; + U3(rect[0]).x2 = 480; + U4(rect[0]).y2 = 360; + hr = IDirect3DViewport3_Clear2(viewport3, 1, &rect[0], D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + color = get_surface_color(rt, 158, 118); + ok(compare_color(color, 0x00ffffff, 0), "(158,118) has color %08x\n", color); + color = get_surface_color(rt, 162, 118); + ok(compare_color(color, 0x00ffffff, 0), "(162,118) has color %08x\n", color); + color = get_surface_color(rt, 158, 122); + ok(compare_color(color, 0x00ffffff, 0), "(158,122) has color %08x\n", color); + color = get_surface_color(rt, 162, 122); + ok(compare_color(color, 0x000000ff, 0), "(162,122) has color %08x\n", color); + + color = get_surface_color(rt, 318, 238); + ok(compare_color(color, 0x000000ff, 0), "(318,238) has color %08x\n", color); + color = get_surface_color(rt, 322, 238); + ok(compare_color(color, 0x00ffffff, 0), "(322,328) has color %08x\n", color); + color = get_surface_color(rt, 318, 242); + ok(compare_color(color, 0x00ffffff, 0), "(318,242) has color %08x\n", color); + color = get_surface_color(rt, 322, 242); + ok(compare_color(color, 0x0000ff00, 0), "(322,242) has color %08x\n", color); + + color = get_surface_color(rt, 478, 358); + ok(compare_color(color, 0x0000ff00, 0), "(478,358 has color %08x\n", color); + color = get_surface_color(rt, 482, 358); + ok(compare_color(color, 0x00ffffff, 0), "(482,358) has color %08x\n", color); + color = get_surface_color(rt, 478, 362); + ok(compare_color(color, 0x00ffffff, 0), "(478,362) has color %08x\n", color); + color = get_surface_color(rt, 482, 362); + ok(compare_color(color, 0x00ffffff, 0), "(482,362) has color %08x\n", color); + + /* The clear rectangle is rendertarget absolute, not relative to the viewport. */ + hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + U1(rect[0]).x1 = 330; + U2(rect[0]).y1 = 250; + U3(rect[0]).x2 = 340; + U4(rect[0]).y2 = 260; + hr = IDirect3DViewport3_Clear2(viewport3, 1, &rect[0], D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 328, 248); + ok(compare_color(color, 0x00ffffff, 0), "(328,248) has color %08x\n", color); + color = get_surface_color(rt, 332, 248); + ok(compare_color(color, 0x00ffffff, 0), "(332,248) has color %08x\n", color); + color = get_surface_color(rt, 328, 252); + ok(compare_color(color, 0x00ffffff, 0), "(328,252) has color %08x\n", color); + color = get_surface_color(rt, 332, 252); + ok(compare_color(color, 0x0000ff00, 0), "(332,252) has color %08x\n", color); + + color = get_surface_color(rt, 338, 248); + ok(compare_color(color, 0x00ffffff, 0), "(338,248) has color %08x\n", color); + color = get_surface_color(rt, 342, 248); + ok(compare_color(color, 0x00ffffff, 0), "(342,248) has color %08x\n", color); + color = get_surface_color(rt, 338, 252); + ok(compare_color(color, 0x0000ff00, 0), "(338,252) has color %08x\n", color); + color = get_surface_color(rt, 342, 252); + ok(compare_color(color, 0x00ffffff, 0), "(342,252) has color %08x\n", color); + + color = get_surface_color(rt, 328, 258); + ok(compare_color(color, 0x00ffffff, 0), "(328,258 has color %08x\n", color); + color = get_surface_color(rt, 332, 258); + ok(compare_color(color, 0x0000ff00, 0), "(332,258) has color %08x\n", color); + color = get_surface_color(rt, 328, 262); + ok(compare_color(color, 0x00ffffff, 0), "(328,262) has color %08x\n", color); + color = get_surface_color(rt, 332, 262); + ok(compare_color(color, 0x00ffffff, 0), "(332,262) has color %08x\n", color); + + color = get_surface_color(rt, 338, 258); + ok(compare_color(color, 0x0000ff00, 0), "(328,258 has color %08x\n", color); + color = get_surface_color(rt, 342, 258); + ok(compare_color(color, 0x00ffffff, 0), "(332,258) has color %08x\n", color); + color = get_surface_color(rt, 338, 262); + ok(compare_color(color, 0x00ffffff, 0), "(328,262) has color %08x\n", color); + color = get_surface_color(rt, 342, 262); + ok(compare_color(color, 0x00ffffff, 0), "(332,262) has color %08x\n", color); + + /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist in d3d3. */ + + IDirect3DViewport3_Release(viewport3); + IDirect3DViewport3_Release(viewport2); + IDirect3DViewport3_Release(viewport); + IDirectDrawSurface4_Release(rt); + refcount = IDirect3DDevice3_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -14475,4 +14650,5 @@ START_TEST(ddraw4) test_compute_sphere_visibility(); test_map_synchronisation(); test_depth_readback(); + test_clear(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d7355cf0ea..a9474f2444 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13726,6 +13726,139 @@ static void test_depth_readback(void) DestroyWindow(window); } +static void test_clear(void) +{ + IDirect3DDevice7 *device; + IDirectDrawSurface7 *rt; + ULONG refcount; + HWND window; + HRESULT hr; + D3DRECT rect[2]; + D3DRECT rect_negneg; + D3DCOLOR color; + D3DVIEWPORT7 vp, old_vp; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* Positive x, negative y. */ + U1(rect[0]).x1 = 0; + U2(rect[0]).y1 = 480; + U3(rect[0]).x2 = 320; + U4(rect[0]).y2 = 240; + + /* Positive x, positive y. */ + U1(rect[1]).x1 = 0; + U2(rect[1]).y1 = 0; + U3(rect[1]).x2 = 320; + U4(rect[1]).y2 = 240; + + /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not refuse negative + * rectangles, but it will not clear them either. */ + hr = IDirect3DDevice7_Clear(device, 2, rect, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* negative x, negative y. + * + * FIXME: WARP seems to clear the entire screen here.*/ + rect_negneg.x1 = 640; + rect_negneg.y1 = 240; + rect_negneg.x2 = 320; + rect_negneg.y2 = 0; + hr = IDirect3DDevice7_Clear(device, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 160, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3(pos, neg) has color %08x.\n", color); + color = get_surface_color(rt, 160, 120); + ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1(pos, pos) has color %08x.\n", color); + color = get_surface_color(rt, 480, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(NULL) has color %08x.\n", color); + color = get_surface_color(rt, 480, 120); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(neg, neg) has color %08x.\n", color); + + /* Test how the viewport affects clears */ + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice7_GetViewport(device, &old_vp); + ok(hr == D3D_OK, "Failed to get viewport, hr %#x.\n", hr); + + vp.dwX = 160; + vp.dwY = 120; + vp.dwWidth = 160; + vp.dwHeight = 120; + vp.dvMinZ = 0.0; + vp.dvMaxZ = 1.0; + hr = IDirect3DDevice7_SetViewport(device, &vp); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + vp.dwX = 320; + vp.dwY = 240; + vp.dwWidth = 320; + vp.dwHeight = 240; + vp.dvMinZ = 0.0; + vp.dvMaxZ = 1.0; + hr = IDirect3DDevice7_SetViewport(device, &vp); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + + U1(rect[0]).x1 = 160; + U2(rect[0]).y1 = 120; + U3(rect[0]).x2 = 480; + U4(rect[0]).y2 = 360; + hr = IDirect3DDevice7_Clear(device, 1, &rect[0], D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetViewport(device, &old_vp); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + + color = get_surface_color(rt, 158, 118); + ok(compare_color(color, 0x00ffffff, 0), "(158,118) has color %08x\n", color); + color = get_surface_color(rt, 162, 118); + ok(compare_color(color, 0x00ffffff, 0), "(162,118) has color %08x\n", color); + color = get_surface_color(rt, 158, 122); + ok(compare_color(color, 0x00ffffff, 0), "(158,122) has color %08x\n", color); + color = get_surface_color(rt, 162, 122); + ok(compare_color(color, 0x000000ff, 0), "(162,122) has color %08x\n", color); + + color = get_surface_color(rt, 318, 238); + ok(compare_color(color, 0x000000ff, 0), "(318,238) has color %08x\n", color); + color = get_surface_color(rt, 322, 238); + ok(compare_color(color, 0x00ffffff, 0), "(322,328) has color %08x\n", color); + color = get_surface_color(rt, 318, 242); + ok(compare_color(color, 0x00ffffff, 0), "(318,242) has color %08x\n", color); + color = get_surface_color(rt, 322, 242); + ok(compare_color(color, 0x0000ff00, 0), "(322,242) has color %08x\n", color); + + color = get_surface_color(rt, 478, 358); + ok(compare_color(color, 0x0000ff00, 0), "(478,358 has color %08x\n", color); + color = get_surface_color(rt, 482, 358); + ok(compare_color(color, 0x00ffffff, 0), "(482,358) has color %08x\n", color); + color = get_surface_color(rt, 478, 362); + ok(compare_color(color, 0x00ffffff, 0), "(478,362) has color %08x\n", color); + color = get_surface_color(rt, 482, 362); + ok(compare_color(color, 0x00ffffff, 0), "(482,362) has color %08x\n", color); + + /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist in d3d7. */ + + IDirectDrawSurface7_Release(rt); + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -13856,4 +13989,5 @@ START_TEST(ddraw7) test_clip_planes_limits(); test_map_synchronisation(); test_depth_readback(); + test_clear(); } diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 4f6213354d..2cb1c89231 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -267,52 +267,6 @@ static void set_viewport_size(IDirect3DDevice7 *device) return; } -static void clear_test(IDirect3DDevice7 *device) -{ - /* Tests the correctness of clearing parameters */ - HRESULT hr; - D3DRECT rect[2]; - D3DRECT rect_negneg; - DWORD color; - - hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr); - - /* Positive x, negative y */ - U1(rect[0]).x1 = 0; - U2(rect[0]).y1 = 480; - U3(rect[0]).x2 = 320; - U4(rect[0]).y2 = 240; - - /* Positive x, positive y */ - U1(rect[1]).x1 = 0; - U2(rect[1]).y1 = 0; - U3(rect[1]).x2 = 320; - U4(rect[1]).y2 = 240; - /* Clear 2 rectangles with one call. Shows that a positive value is returned, but the negative rectangle - * is ignored, the positive is still cleared afterwards - */ - hr = IDirect3DDevice7_Clear(device, 2, rect, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); - ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr); - - /* negative x, negative y */ - U1(rect_negneg).x1 = 640; - U2(rect_negneg).y1 = 240; - U3(rect_negneg).x2 = 320; - U4(rect_negneg).y2 = 0; - hr = IDirect3DDevice7_Clear(device, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); - ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr); - - color = getPixelColor(device, 160, 360); /* lower left quad */ - ok(color == 0x00ffffff, "Clear rectangle 3(pos, neg) has color %08x\n", color); - color = getPixelColor(device, 160, 120); /* upper left quad */ - ok(color == 0x00ff0000, "Clear rectangle 1(pos, pos) has color %08x\n", color); - color = getPixelColor(device, 480, 360); /* lower right quad */ - ok(color == 0x00ffffff, "Clear rectangle 4(NULL) has color %08x\n", color); - color = getPixelColor(device, 480, 120); /* upper right quad */ - ok(color == 0x00ffffff, "Clear rectangle 4(neg, neg) has color %08x\n", color); -} - static void fog_test(IDirect3DDevice7 *device) { HRESULT hr; @@ -1681,7 +1635,6 @@ START_TEST(visual) /* Now run the tests */ depth_clamp_test(Direct3DDevice); - clear_test(Direct3DDevice); fog_test(Direct3DDevice); offscreen_test(Direct3DDevice); test_blend(Direct3DDevice); -- 2.13.6

2 2

[PATCH] include: Add EnableMouseInPointer() declaration.
by Józef Kucia 09 Jan '18

09 Jan '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/winuser.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winuser.h b/include/winuser.h index 75bfe2b44e4f..05bf59002902 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3576,6 +3576,7 @@ WINUSERAPI INT WINAPI DrawTextExW(HDC,LPWSTR,INT,LPRECT,UINT,LPDRAWTEXTP #define DrawTextEx WINELIB_NAME_AW(DrawTextEx) WINUSERAPI BOOL WINAPI EmptyClipboard(void); WINUSERAPI BOOL WINAPI EnableMenuItem(HMENU,UINT,UINT); +WINUSERAPI BOOL WINAPI EnableMouseInPointer(BOOL); WINUSERAPI BOOL WINAPI EnableScrollBar(HWND,UINT,UINT); WINUSERAPI BOOL WINAPI EnableWindow(HWND,BOOL); WINUSERAPI BOOL WINAPI EndDeferWindowPos(HDWP); -- 2.13.6

1 0

[PATCH] msi: Remove redundant comparison.
by Andrey Gusev 09 Jan '18

09 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/msi/appsearch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index bb492f464f..693da18355 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -506,7 +506,7 @@ static LPWSTR get_ini_field(LPWSTR buf, int field) while ((end = strchrW(beg, ',')) && i < field) { beg = end + 1; - while (*beg && *beg == ' ') + while (*beg == ' ') beg++; i++; -- 2.13.6

2 1

[PATCH] schtasks: Make /change argument case insensitive.
by Jacek Caban 09 Jan '18

09 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/schtasks/schtasks.c | 2 +- programs/schtasks/tests/schtasks.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH] winhlp32: Remove redundant comparison.
by Andrey Gusev 09 Jan '18

09 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- programs/winhlp32/winhelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 070803482b..2ac3d2ff24 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -1666,7 +1666,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) option = *cmdline; if (option) cmdline++; - while (*cmdline && *cmdline == ' ') cmdline++; + while (*cmdline == ' ') cmdline++; switch (option) { case 'i': -- 2.13.6

1 0

[PATCH] cmd: Remove redundant comparison.
by Andrey Gusev 09 Jan '18

09 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 0609bb7f3f..14961d7922 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2173,7 +2173,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { } /* Ensure line continues with variable */ - if (!*thisArg || *thisArg != '%') { + if (*thisArg != '%') { WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } -- 2.13.6

1 0

[PATCH] kernel32: Remove redundant comparison.
by Andrey Gusev 09 Jan '18

09 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/kernel32/lcformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 057b7338fc..ecadd435d4 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -560,7 +560,7 @@ static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags, ++format; } /* Only numeric day form matters */ - if (*format && *format == 'd') + if (*format == 'd') { INT dcount = 1; while (*++format == 'd') dcount++; -- 2.13.6

1 0

[PATCH] wininet/test: Check null pointer in InternetGetSecurityInfoByURLW
by Jacek Caban 09 Jan '18

09 Jan '18

From: Wei Xie <xiewei(a)deepin.com> Signed-off-by: Wei xie <xiewei(a)linuxdeepin.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- My changes: - don't test last error on success - fixed cert chain leak in tests - don't duplicate cert chain if we know that it's not needed dlls/wininet/internet.c | 15 ++++++++------- dlls/wininet/tests/http.c | 12 ++++++++++++ 2 files changed, 20 insertions(+), 7 deletions(-)

2 1

Re: [PATCH 1/1] wininet/test: Check null pointer in InternetGetSecurityInfoByURLW
by Wei Xie 09 Jan '18

09 Jan '18

Because last error not set as 0 in vista and w2008, but others do it. If set last error as 0xdeadbeef in these two tests, the test will failed https://testbot.winehq.org/JobDetails.pl?Key=35144 ------------------ Original ------------------ From: "Jactry Zeng"<jactry92(a)gmail.com>; Date: Tue, Jan 9, 2018 04:28 PM To: "Wei Xie"<xiewei(a)deepin.com>; Cc: "wine-devel"<wine-devel(a)winehq.org>; Subject: Re: [PATCH 1/1] wininet/test: Check null pointer in InternetGetSecurityInfoByURLW Hi Wei, Thanks for contribution! I have a question about the tests: + + SetLastError(0); + res = pInternetGetSecurityInfoByURLA(url, &chain, NULL); + ok_(__FILE__,line)(res && GetLastError() == 0, + "InternetGetSecurityInfoByURLA failed returned: %x(%u), expected success\n", res, GetLastError()); + + SetLastError(0); + res = pInternetGetSecurityInfoByURLA(url, NULL, &flags); + ok_(__FILE__,line)(res && GetLastError() == 0, + "InternetGetSecurityInfoByURLA failed returned: %x(%u), expected success\n", res, GetLastError()); }else { Why not set last error as 0xdeadbeef in these two tests? 2018-01-08 15:57 GMT+08:00 Wei Xie <xiewei(a)deepin.com>: -- Regards, Jactry Zeng

1 0

[PATCH] shell32/tests: Drop progman DDE test workarounds for Windows <= 2000
by Alex Henrie 09 Jan '18

09 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- We don't need them anymore, and Coverity is complaining about them. dlls/shell32/tests/progman_dde.c | 46 +++------------------------------------- 1 file changed, 3 insertions(+), 43 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 0bb4960ae1..62ed413ad0 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -35,8 +35,6 @@ #include "shlobj.h" static HRESULT (WINAPI *pSHGetLocalizedName)(LPCWSTR, LPWSTR, UINT, int *); -static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL); -static BOOL (WINAPI *pReadCabinetState)(CABINETSTATE *, int); static void init_function_pointers(void) { @@ -44,10 +42,6 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shell32.dll"); pSHGetLocalizedName = (void*)GetProcAddress(hmod, "SHGetLocalizedName"); - pSHGetSpecialFolderPathA = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathA"); - pReadCabinetState = (void*)GetProcAddress(hmod, "ReadCabinetState"); - if (!pReadCabinetState) - pReadCabinetState = (void*)GetProcAddress(hmod, (LPSTR)651); } static BOOL use_common(void) @@ -88,21 +82,7 @@ static BOOL full_title(void) CABINETSTATE cs; memset(&cs, 0, sizeof(cs)); - if (pReadCabinetState) - { - pReadCabinetState(&cs, sizeof(cs)); - } - else - { - HKEY key; - DWORD size; - - win_skip("ReadCabinetState is not available, reading registry directly\n"); - RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", &key); - size = sizeof(cs); - RegQueryValueExA(key, "Settings", NULL, NULL, (LPBYTE)&cs, &size); - RegCloseKey(key); - } + ReadCabinetState(&cs, sizeof(cs)); return (cs.fFullPathTitle == -1); } @@ -114,28 +94,8 @@ static void init_strings(void) char commonprograms[MAX_PATH]; char programs[MAX_PATH]; - if (pSHGetSpecialFolderPathA) - { - pSHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE); - pSHGetSpecialFolderPathA(NULL, commonprograms, CSIDL_COMMON_PROGRAMS, FALSE); - } - else - { - HKEY key; - DWORD size; - - /* Older Win9x and NT4 */ - - RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key); - size = sizeof(programs); - RegQueryValueExA(key, "Programs", NULL, NULL, (LPBYTE)&programs, &size); - RegCloseKey(key); - - RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key); - size = sizeof(commonprograms); - RegQueryValueExA(key, "Common Programs", NULL, NULL, (LPBYTE)&commonprograms, &size); - RegCloseKey(key); - } + SHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE); + SHGetSpecialFolderPathA(NULL, commonprograms, CSIDL_COMMON_PROGRAMS, FALSE); /* ProgramsDir on Vista+ is always the users one (CSIDL_PROGRAMS). Before Vista * it depends on whether the user is an administrator (CSIDL_COMMON_PROGRAMS) or -- 2.15.1

1 0

[PATCH] jscript/tests: Test for script object creation failure (Coverity)
by Nikolay Sivov 08 Jan '18

08 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/jscript/tests/run.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index bd5e341545..887b264d8f 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2147,6 +2147,8 @@ static HRESULT parse_script_expr(const char *expr, VARIANT *res, IActiveScript * HRESULT hres; engine = create_script(); + if(!engine) + return E_FAIL; hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); @@ -2191,6 +2193,8 @@ static void test_retval(void) HRESULT hres; engine = create_script(); + if(!engine) + return; hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); -- 2.15.1

2 1

[v2 PATCH] mshtml/tests: Skip some tests if native XMLHTTP support is missing or disabled
by Nikolay Sivov 08 Jan '18

08 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: with improvements Jacek suggested dlls/mshtml/tests/dom.c | 7 ++++++- dlls/mshtml/tests/jstest.html | 13 ++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b00346759f..2a4ae625bb 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6683,7 +6683,12 @@ static void test_xmlhttprequest(IHTMLWindow5 *window) hres = IHTMLWindow5_get_XMLHttpRequest(window, &var); ok(hres == S_OK, "get_XMLHttpRequest failed: %08x\n", hres); - ok(V_VT(&var) == VT_DISPATCH, "expect VT_DISPATCH, got %s\n", debugstr_variant(&var)); + ok(V_VT(&var) == VT_DISPATCH || broken(V_VT(&var) == VT_EMPTY), "expect VT_DISPATCH, got %s\n", debugstr_variant(&var)); + + if (V_VT(&var) == VT_EMPTY) { + win_skip("Native XMLHTTP support is missing or disabled.\n"); + return; + } factory = NULL; hres = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IHTMLXMLHttpRequestFactory, (void**)&factory); diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index cce805032c..164593ee0d 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -1,10 +1,9 @@ <html> <head> +<script src="winetest.js" type="text/javascript"></script> +</head> +<head> <script> -function ok(b,m) { - return external.ok(b, m); -} - function broken(expr) { return external.broken(expr); } @@ -356,7 +355,11 @@ function test_text_node() { function test_xhr() { ok("XMLHttpRequest" in window, "XMLHttpRequest not found in window object\n"); - ok(typeof(XMLHttpRequest) === "object", "typeof(XMLHttpRequest) = " + typeof(XMLHttpRequest)); + + if (typeof(XMLHttpRequest) != "object") { + win_skip("XMLHTTPRequest is not available or disabled"); + return; + } var xhr = new XMLHttpRequest(); ok(typeof(xhr) === "object", "typeof(xhr) = " + typeof(xhr)); -- 2.15.1

2 1

[PATCH] msvcrt: Don't include MSVC 7.0+ miscellaneous functions in SOs for older DLLs
by Alex Henrie 08 Jan '18

08 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msvcrt/except.c | 2 ++ dlls/msvcrt/mbcs.c | 2 ++ dlls/msvcrt/misc.c | 40 ++++++++++++++++++++++++++++++++-------- dlls/msvcrt/process.c | 2 ++ dlls/msvcrt/thread.c | 2 ++ dlls/msvcrt/wcs.c | 4 ++++ 6 files changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 18c2f15348..8d13e7fbef 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -321,6 +321,7 @@ void CDECL __security_error_handler(int code, void *data) MSVCRT__exit(3); } +#if _MSVCR_VER>=110 /********************************************************************* * __crtSetUnhandledExceptionFilter (MSVCR110.@) */ @@ -328,6 +329,7 @@ LPTOP_LEVEL_EXCEPTION_FILTER CDECL MSVCR110__crtSetUnhandledExceptionFilter(LPTO { return SetUnhandledExceptionFilter(filter); } +#endif /********************************************************************* * _CreateFrameInfo (MSVCR80.@) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 6e46b84335..7ca1906dbe 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -185,6 +185,7 @@ int CDECL MSVCRT____mb_cur_max_func(void) return get_locinfo()->mb_cur_max; } +#if _MSVCR_VER>=80 /********************************************************************* * ___mb_cur_max_l_func (MSVCR80.@) */ @@ -199,6 +200,7 @@ int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) return &locinfo->mb_cur_max; } +#endif /********************************************************************* * INTERNAL: _setmbcp_l diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index b9dadac907..d784dec18e 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -426,8 +426,10 @@ int CDECL MSVCRT__resetstkoflw(void) return VirtualProtect(&stack_addr, 1, PAGE_GUARD|PAGE_READWRITE, &oldprot); } +#if _MSVCR_VER>=80 + /********************************************************************* - * _decode_pointer (MSVCR90.@) + * _decode_pointer (MSVCR80.@) */ void * CDECL MSVCRT_decode_pointer(void * ptr) { @@ -435,7 +437,7 @@ void * CDECL MSVCRT_decode_pointer(void * ptr) } /********************************************************************* - * _encode_pointer (MSVCR90.@) + * _encode_pointer (MSVCR80.@) */ void * CDECL MSVCRT_encode_pointer(void * ptr) { @@ -443,7 +445,7 @@ void * CDECL MSVCRT_encode_pointer(void * ptr) } /********************************************************************* - * _encoded_null (MSVCR100.@) + * _encoded_null (MSVCR80.@) */ void * CDECL _encoded_null(void) { @@ -452,8 +454,12 @@ void * CDECL _encoded_null(void) return EncodePointer(NULL); } +#endif /* _MSVCR_VER>=80 */ + +#if _MSVCR_VER>=70 + /********************************************************************* - * _CRT_RTC_INIT (MSVCR100.@) + * _CRT_RTC_INIT (MSVCR70.@) */ void* CDECL _CRT_RTC_INIT(void *unk1, void *unk2, int unk3, int unk4, int unk5) { @@ -462,7 +468,7 @@ void* CDECL _CRT_RTC_INIT(void *unk1, void *unk2, int unk3, int unk4, int unk5) } /********************************************************************* - * _CRT_RTC_INITW (MSVCR100.@) + * _CRT_RTC_INITW (MSVCR70.@) */ void* CDECL _CRT_RTC_INITW(void *unk1, void *unk2, int unk3, int unk4, int unk5) { @@ -470,8 +476,12 @@ void* CDECL _CRT_RTC_INITW(void *unk1, void *unk2, int unk3, int unk4, int unk5) return NULL; } +#endif /* _MSVCR_VER>=70 */ + +#if _MSVCR_VER>=80 + /********************************************************************* - * _byteswap_ushort (MSVCR100.@) + * _byteswap_ushort (MSVCR80.@) */ unsigned short CDECL _byteswap_ushort(unsigned short s) { @@ -479,7 +489,7 @@ unsigned short CDECL _byteswap_ushort(unsigned short s) } /********************************************************************* - * _byteswap_ulong (MSVCR100.@) + * _byteswap_ulong (MSVCR80.@) */ ULONG CDECL MSVCRT__byteswap_ulong(ULONG l) { @@ -487,7 +497,7 @@ ULONG CDECL MSVCRT__byteswap_ulong(ULONG l) } /********************************************************************* - * _byteswap_uint64 (MSVCR100.@) + * _byteswap_uint64 (MSVCR80.@) */ unsigned __int64 CDECL _byteswap_uint64(unsigned __int64 i) { @@ -495,6 +505,10 @@ unsigned __int64 CDECL _byteswap_uint64(unsigned __int64 i) ((i>>8)&0xFF000000) + ((i>>24)&0xFF0000) + ((i>>40)&0xFF00) + (i>>56); } +#endif /* _MSVCR_VER>=80 */ + +#if _MSVCR_VER>=110 + /********************************************************************* * __crtGetShowWindowMode (MSVCR110.@) */ @@ -517,6 +531,9 @@ BOOL CDECL MSVCR110__crtInitializeCriticalSectionEx( return InitializeCriticalSectionEx(cs, spin_count, flags); } +#endif /* _MSVCR_VER>=110 */ + +#if _MSVCR_VER>=120 /********************************************************************* * _vacopy (MSVCR120.@) */ @@ -524,7 +541,9 @@ void CDECL MSVCR120__vacopy(__ms_va_list *dest, __ms_va_list src) { __ms_va_copy(*dest, src); } +#endif +#if _MSVCR_VER>=80 /********************************************************************* * _crt_debugger_hook (MSVCR80.@) */ @@ -532,7 +551,9 @@ void CDECL MSVCRT__crt_debugger_hook(int reserved) { WARN("(%x)\n", reserved); } +#endif +#if _MSVCR_VER>=110 /********************************************************************* * __crtUnhandledException (MSVCR110.@) */ @@ -542,7 +563,9 @@ LONG CDECL MSVCRT__crtUnhandledException(EXCEPTION_POINTERS *ep) SetUnhandledExceptionFilter(NULL); return UnhandledExceptionFilter(ep); } +#endif +#if _MSVCR_VER>=120 /********************************************************************* * __crtSleep (MSVCR120.@) */ @@ -551,3 +574,4 @@ void CDECL MSVCRT__crtSleep(DWORD timeout) TRACE("(%u)\n", timeout); Sleep(timeout); } +#endif diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 1a183bc19b..fac3bd4d20 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1325,6 +1325,7 @@ int CDECL _getpid(void) return GetCurrentProcessId(); } +#if _MSVCR_VER>=110 /********************************************************************* * __crtTerminateProcess (MSVCR110.@) */ @@ -1332,3 +1333,4 @@ int CDECL MSVCR110__crtTerminateProcess(UINT exit_code) { return TerminateProcess(GetCurrentProcess(), exit_code); } +#endif diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index da1f8bf2c1..af31534adb 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -164,6 +164,7 @@ MSVCRT_uintptr_t CDECL _beginthreadex( initflag, thrdaddr); } +#if _MSVCR_VER>=80 /********************************************************************* * _getptd (MSVCR80.@) */ @@ -172,3 +173,4 @@ thread_data_t* CDECL _getptd(void) FIXME("returns undocumented/not fully filled data\n"); return msvcrt_get_thread_data(); } +#endif diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1aa8d98b12..098e0d5ba8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -40,6 +40,8 @@ static BOOL n_format_enabled = TRUE; #include "printf.h" #undef PRINTF_WIDE +#if _MSVCR_VER>=80 + /********************************************************************* * _get_printf_count_output (MSVCR80.@) */ @@ -58,6 +60,8 @@ int CDECL MSVCRT__set_printf_count_output( int enable ) return old ? 1 : 0; } +#endif /* _MSVCR_VER>=80 */ + /********************************************************************* * _wcsdup (MSVCRT.@) */ -- 2.15.1

2 1

[PATCH] msxml3/tests: Simplify test error path
by Nikolay Sivov 08 Jan '18

08 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This also removes a line with a typo, that Coverity complains about - cache2 released twice. dlls/msxml3/tests/schema.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index ee84b92158..48d1c5bce4 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -666,26 +666,26 @@ static void test_collection_refs(void) LONG length; schema1 = create_document(&IID_IXMLDOMDocument2); - schema2 = create_document(&IID_IXMLDOMDocument2); - schema3 = create_document(&IID_IXMLDOMDocument2); + ok(schema1 != NULL, "Failed to create a document.\n"); cache1 = create_cache(&IID_IXMLDOMSchemaCollection); - cache2 = create_cache(&IID_IXMLDOMSchemaCollection); - cache3 = create_cache(&IID_IXMLDOMSchemaCollection); + ok(cache1 != NULL, "Failed to create schema collection.\n"); - if (!schema1 || !schema2 || !schema3 || !cache1 || !cache2 || !cache3) + if (!schema1 || !cache1) { - if (schema1) IXMLDOMDocument2_Release(schema1); - if (schema2) IXMLDOMDocument2_Release(schema2); - if (schema3) IXMLDOMDocument2_Release(schema3); - - if (cache1) IXMLDOMSchemaCollection_Release(cache1); - if (cache2) IXMLDOMSchemaCollection_Release(cache2); - if (cache3) IXMLDOMSchemaCollection_Release(cache2); - + if (schema1) + IXMLDOMDocument2_Release(schema1); + if (cache1) + IXMLDOMSchemaCollection_Release(cache1); return; } + schema2 = create_document(&IID_IXMLDOMDocument2); + schema3 = create_document(&IID_IXMLDOMDocument2); + + cache2 = create_cache(&IID_IXMLDOMSchemaCollection); + cache3 = create_cache(&IID_IXMLDOMSchemaCollection); + ole_check(IXMLDOMDocument2_loadXML(schema1, _bstr_(xdr_schema1_xml), &b)); ok(b == VARIANT_TRUE, "failed to load XML\n"); -- 2.15.1

1 0

[PATCH] wininet/tests: Fix off-by-one errors in HTTP tests (Coverity)
by Alex Henrie 08 Jan '18

08 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wininet/tests/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index efc73e039f..1c2aadb5f5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -720,7 +720,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) res = InternetQueryOptionA(hor,INTERNET_OPTION_URL,buffer,&length); ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed with error %d\n", GetLastError()); - length = sizeof(buffer)-1; + length = sizeof(buffer)-2; memset(buffer, 0x77, sizeof(buffer)); res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length,0x0); ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); @@ -744,7 +744,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) ok(buffer[length2+1] == 0x77, "Expected 0x77, got %02X\n", buffer[length2+1]); ok(length2 == length, "Value should not have changed: %d != %d\n", length2, length); - length = sizeof(wbuffer)-sizeof(WCHAR); + length = sizeof(wbuffer)-2*sizeof(WCHAR); memset(wbuffer, 0x77, sizeof(wbuffer)); res = HttpQueryInfoW(hor, HTTP_QUERY_RAW_HEADERS, wbuffer, &length, 0x0); ok(res, "HttpQueryInfoW(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); -- 2.15.1

2 1

[PATCH] dwrite/tests: Add missing return value test (Coverity)
by Nikolay Sivov 08 Jan '18

08 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7a14180979..24e8e73b2c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -650,7 +650,8 @@ static HRESULT WINAPI resourcecollectionloader_CreateEnumeratorFromKey(IDWriteFo IDWriteFontFile *font_file; HRESULT hr; - IDWriteFactory_CreateCustomFontFileReference(factory, collectionKey, collectionKeySize, This->loader, &font_file); + hr = IDWriteFactory_CreateCustomFontFileReference(factory, collectionKey, collectionKeySize, This->loader, &font_file); + ok(hr == S_OK, "Failed to create custom file reference, hr %#x.\n", hr); hr = create_enumerator(font_file, fontFileEnumerator); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.15.1

1 0

[PATCH] user32/tests: Add some more tests for message data conversion in dialog procedures
by Nikolay Sivov 08 Jan '18

08 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/dialog.c | 80 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 65 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index afc3473df3..cbe4b2b1d8 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1239,44 +1239,65 @@ static INT_PTR CALLBACK TestControlStyleDlgProc(HWND hdlg, UINT msg, static const WCHAR testtextW[] = {'W','n','d','T','e','x','t',0}; static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { - if (msg == WM_SETTEXT) + WCHAR *text = (WCHAR *)lparam; + char *textA = (char *)lparam; + + switch (msg) { + case WM_SETTEXT: + case WM_WININICHANGE: + case WM_DEVMODECHANGE: + case CB_DIR: + case LB_DIR: + case LB_ADDFILE: + case EM_REPLACESEL: if (IsWindowUnicode(hdlg)) - { - WCHAR *text = (WCHAR *)lparam; todo_wine ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); - } else - { - char *textA = (char *)lparam; todo_wine ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); - } - } + break; + }; return DefWindowProcW(hdlg, msg, wparam, lparam); } static INT_PTR CALLBACK test_aw_conversion_dlgprocW(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { - if (msg == WM_SETTEXT) + WCHAR *text = (WCHAR *)lparam; + char *textA = (char *)lparam; + + switch (msg) { + case WM_SETTEXT: + case WM_WININICHANGE: + case WM_DEVMODECHANGE: + case CB_DIR: + case LB_DIR: + case LB_ADDFILE: + case EM_REPLACESEL: if (IsWindowUnicode(hdlg)) - { - WCHAR *text = (WCHAR *)lparam; ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); - } else - { - char *textA = (char *)lparam; ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); - } + break; } return DefWindowProcA(hdlg, msg, wparam, lparam); } +static void dlg_test_aw_message(HWND hdlg, UINT msg) +{ + LRESULT ret; + + ret = SendMessageA(hdlg, msg, 0, (LPARAM)"WndText"); + ok(ret == 0, "Unexpected retval %ld.\n", ret); + + ret = SendMessageW(hdlg, msg, 0, (LPARAM)testtextW); + ok(ret == 0, "Unexpected retval %ld.\n", ret); +} + static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { ULONG_PTR dlgproc, originalproc; @@ -1290,6 +1311,7 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM w case WM_INITDIALOG: ok(IsWindowUnicode(hdlg), "Expected unicode window.\n"); + /* WM_SETTEXT/WM_GETTEXT */ originalproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC); ok(originalproc == (ULONG_PTR)test_aw_conversion_dlgproc, "Unexpected dlg proc %#lx.\n", originalproc); @@ -1320,6 +1342,13 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM w todo_wine ok(!lstrcmpW(buffW, testtextW) && len == 0, "Unexpected window text %s, len %d\n", wine_dbgstr_w(buffW), len); + dlg_test_aw_message(hdlg, WM_WININICHANGE); + dlg_test_aw_message(hdlg, WM_DEVMODECHANGE); + dlg_test_aw_message(hdlg, CB_DIR); + dlg_test_aw_message(hdlg, LB_DIR); + dlg_test_aw_message(hdlg, LB_ADDFILE); + dlg_test_aw_message(hdlg, EM_REPLACESEL); + dlgproc = SetWindowLongPtrW(hdlg, DWLP_DLGPROC, (UINT_PTR)test_aw_conversion_dlgprocW); ok(IsWindowUnicode(hdlg), "Expected unicode window.\n"); @@ -1343,6 +1372,13 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM w ok(buffW[0] == 'W' && buffW[1] == 0xffff && len == 0, "Unexpected window text %#x, %#x, len %d\n", buffW[0], buffW[1], len); + dlg_test_aw_message(hdlg, WM_WININICHANGE); + dlg_test_aw_message(hdlg, WM_DEVMODECHANGE); + dlg_test_aw_message(hdlg, CB_DIR); + dlg_test_aw_message(hdlg, LB_DIR); + dlg_test_aw_message(hdlg, LB_ADDFILE); + dlg_test_aw_message(hdlg, EM_REPLACESEL); + SetWindowLongPtrA(hdlg, DWLP_DLGPROC, originalproc); EndDialog(hdlg, -123); return TRUE; @@ -1391,6 +1427,13 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc2(HWND hdlg, UINT msg, WPARAM ok(buffW[0] == 0 && buffW[1] == 0xffff && len == 0, "Unexpected window text %s, len %d\n", wine_dbgstr_w(buffW), len); + dlg_test_aw_message(hdlg, WM_WININICHANGE); + dlg_test_aw_message(hdlg, WM_DEVMODECHANGE); + dlg_test_aw_message(hdlg, CB_DIR); + dlg_test_aw_message(hdlg, LB_DIR); + dlg_test_aw_message(hdlg, LB_ADDFILE); + dlg_test_aw_message(hdlg, EM_REPLACESEL); + dlgproc = SetWindowLongPtrW(hdlg, DWLP_DLGPROC, (UINT_PTR)test_aw_conversion_dlgprocA); ok(!IsWindowUnicode(hdlg), "Unexpected unicode window.\n"); @@ -1415,6 +1458,13 @@ static INT_PTR CALLBACK test_aw_conversion_dlgproc2(HWND hdlg, UINT msg, WPARAM ok(buffW[0] == 0 && buffW[1] == 0xffff && len == 0, "Unexpected window text %#x, %#x, len %d\n", buffW[0], buffW[1], len); + dlg_test_aw_message(hdlg, WM_WININICHANGE); + dlg_test_aw_message(hdlg, WM_DEVMODECHANGE); + dlg_test_aw_message(hdlg, CB_DIR); + dlg_test_aw_message(hdlg, LB_DIR); + dlg_test_aw_message(hdlg, LB_ADDFILE); + dlg_test_aw_message(hdlg, EM_REPLACESEL); + SetWindowLongPtrA(hdlg, DWLP_DLGPROC, originalproc); EndDialog(hdlg, -123); return TRUE; -- 2.15.1

1 0

[PATCH] msctf/tests: Fix a typo in sink_check_ok().
by Andrey Gusev 08 Jan '18

08 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/msctf/tests/inputprocessor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 34a27098d8..c7ec1e567b 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1901,7 +1901,7 @@ TfEditCookie ec) ok(SUCCEEDED(hr),"ITfContext_GetSelection failed\n"); ok(fetched == 1,"fetched incorrect\n"); ok(selection.range != NULL,"NULL range\n"); - sink_check_ok(&test_ACP_GetSelection,"ACP_GetSepection"); + sink_check_ok(&test_ACP_GetSelection,"GetSelection"); ITfRange_Release(selection.range); test_InsertAtSelection(ec, cxt); -- 2.13.6

2 1

[PATCH] ddraw: Fix typos in comments.
by Andrey Gusev 08 Jan '18

08 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ddraw/device.c | 2 +- dlls/ddraw/vertexbuffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 542f23a0ef..28bb2fb52c 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1170,7 +1170,7 @@ static HRESULT WINAPI d3d_device3_EnumTextureFormats(IDirect3DDevice3 *iface, * IDirect3DDevice2::EnumTextureformats * * EnumTextureFormats for Version 1 and 2, see - * IDirect3DDevice7::EnumTexureFormats for a more detailed description. + * IDirect3DDevice7::EnumTextureFormats for a more detailed description. * * This version has a different callback and does not enumerate FourCC * formats diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index cc676f3985..83f3078c04 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -254,7 +254,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Unlock(IDirect3DVertexBuffer7 *iface) * SrcIndex: Index of the first vertex in the src buffer to process * D3DDevice: Device to use for transformation * Flags: 0 for default, D3DPV_DONOTCOPYDATA to prevent copying - * unchaned vertices + * unchained vertices * * Returns: * D3D_OK on success -- 2.13.6

2 1

[PATCH] kernel32/tests: Fix a typo in comment.
by Andrey Gusev 08 Jan '18

08 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/kernel32/tests/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 2af4946f2f..ce2f13b6dc 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2480,7 +2480,7 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret2, ret); /* test LCMAP_FULLWIDTH | LCMAP_HIRAGANA - (half-width katakana is converted into full-wdith hiragana) */ + (half-width katakana is converted into full-width hiragana) */ ret = func_ptr(LCMAP_FULLWIDTH | LCMAP_HIRAGANA, halfwidth_text, -1, buf, sizeof(buf)/sizeof(WCHAR)); ok(ret == lstrlenW(hiragana_text) + 1, "%s ret %d, error %d, expected value %d\n", func_name, -- 2.13.6

1 0

[PATCH] comctl32: Fix a typo in comment.
by Andrey Gusev 08 Jan '18

08 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/comctl32/listview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4d700b9cec..589d5c4a7e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1017,7 +1017,7 @@ static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, UINT code, LPNMLVDISP return ret; } - /* if dipsinfo holder changed notification code then convert */ + /* if dispinfo holder changed notification code then convert */ if (!isW && (pdi->hdr.code == LVN_GETDISPINFOW) && (pdi->item.mask & LVIF_TEXT)) { length = WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, NULL, 0, NULL, NULL); -- 2.13.6

1 0

[PATCH] kernel32/tests: Test CreateFileMapping with a foreign architecture dll
by André Hentschel 08 Jan '18

08 Jan '18

This was written with project Hangover in mind, we hoped that we can get rid of https://github.com/AndreRH/wine/commit/8935bdf941f5f2866c2fa4695eb15d94337f… Sadly this seems not to be the case, as Wine already behaves like modern Windows here Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernel32/tests/virtual.c | 96 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 4a449fd..56eb456 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1608,10 +1608,79 @@ static void test_NtAreMappedFilesTheSame(void) DeleteFileA( testfile ); } +static BOOL create_foreign_dll( LPCSTR filename ) +{ + IMAGE_DOS_HEADER *dos; + IMAGE_NT_HEADERS *nt; + IMAGE_SECTION_HEADER *sec; + BYTE *buffer; + DWORD lfanew = sizeof(*dos); + DWORD size = lfanew + sizeof(*nt) + sizeof(*sec); + DWORD written; + BOOL ret; + + HANDLE file = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + if (file == INVALID_HANDLE_VALUE) return FALSE; + + buffer = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); + + dos = (IMAGE_DOS_HEADER *)buffer; + dos->e_magic = IMAGE_DOS_SIGNATURE; + dos->e_cblp = sizeof(*dos); + dos->e_cp = 1; + dos->e_cparhdr = lfanew / 16; + dos->e_minalloc = 0; + dos->e_maxalloc = 0xffff; + dos->e_ss = 0x0000; + dos->e_sp = 0x00b8; + dos->e_lfarlc = lfanew; + dos->e_lfanew = lfanew; + + nt = (IMAGE_NT_HEADERS *)(buffer + lfanew); + nt->Signature = IMAGE_NT_SIGNATURE; +#if defined __aarch64__ + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_AMD64; +#else + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARM64; +#endif + nt->FileHeader.NumberOfSections = 1; + nt->FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); + nt->FileHeader.Characteristics = IMAGE_FILE_DLL | IMAGE_FILE_EXECUTABLE_IMAGE; + nt->OptionalHeader.Magic = IMAGE_NT_OPTIONAL_HDR_MAGIC; + nt->OptionalHeader.MajorLinkerVersion = 1; + nt->OptionalHeader.MinorLinkerVersion = 0; + nt->OptionalHeader.ImageBase = 0x10000000; + nt->OptionalHeader.SectionAlignment = 0x1000; + nt->OptionalHeader.FileAlignment = 0x1000; + nt->OptionalHeader.MajorOperatingSystemVersion = 1; + nt->OptionalHeader.MinorOperatingSystemVersion = 0; + nt->OptionalHeader.MajorImageVersion = 1; + nt->OptionalHeader.MinorImageVersion = 0; + nt->OptionalHeader.MajorSubsystemVersion = 4; + nt->OptionalHeader.MinorSubsystemVersion = 0; + nt->OptionalHeader.SizeOfImage = 0x2000; + nt->OptionalHeader.SizeOfHeaders = size; + nt->OptionalHeader.Subsystem = IMAGE_SUBSYSTEM_WINDOWS_GUI; + nt->OptionalHeader.NumberOfRvaAndSizes = IMAGE_NUMBEROF_DIRECTORY_ENTRIES; + + sec = (IMAGE_SECTION_HEADER *)(nt + 1); + memcpy( sec->Name, ".rodata", sizeof(".rodata") ); + sec->Misc.VirtualSize = 0x1000; + sec->VirtualAddress = 0x1000; + sec->SizeOfRawData = 0; + sec->PointerToRawData = 0; + sec->Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE; + + ret = WriteFile( file, buffer, size, &written, NULL ) && written == size; + HeapFree( GetProcessHeap(), 0, buffer ); + CloseHandle( file ); + return ret; +} + static void test_CreateFileMapping(void) { - HANDLE handle, handle2, file[3]; - char path[MAX_PATH], filename[MAX_PATH]; + HANDLE handle, handle2, file[4]; + char path[MAX_PATH], filename[MAX_PATH], filename2[MAX_PATH]; unsigned int i; NTSTATUS status; @@ -1664,6 +1733,14 @@ static void test_CreateFileMapping(void) { 2, SEC_IMAGE | SEC_WRITECOMBINE, ERROR_INVALID_PARAMETER }, { 2, SEC_IMAGE | SEC_RESERVE, ERROR_INVALID_PARAMETER }, { 2, SEC_IMAGE | SEC_COMMIT, ERROR_INVALID_PARAMETER }, + /* foreign PE image file */ + { 3, SEC_IMAGE, ERROR_BAD_EXE_FORMAT, SEC_FILE | SEC_IMAGE }, + { 3, SEC_IMAGE | SEC_FILE, ERROR_INVALID_PARAMETER }, /* 45 */ + { 3, SEC_IMAGE | SEC_NOCACHE, ERROR_BAD_EXE_FORMAT, SEC_FILE | SEC_IMAGE }, + { 3, SEC_IMAGE | SEC_LARGE_PAGES, ERROR_INVALID_PARAMETER }, + { 3, SEC_IMAGE | SEC_WRITECOMBINE, ERROR_INVALID_PARAMETER }, + { 3, SEC_IMAGE | SEC_RESERVE, ERROR_INVALID_PARAMETER }, + { 3, SEC_IMAGE | SEC_COMMIT, ERROR_INVALID_PARAMETER }, /* 50 */ }; /* test case sensitivity */ @@ -1716,17 +1793,26 @@ static void test_CreateFileMapping(void) file[2] = CreateFileA( path, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); ok( file[2] != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); + GetTempPathA( MAX_PATH, path ); + GetTempFileNameA( path, "foreign", 0, filename2 ); + ok(create_foreign_dll(filename2), "Creation of foreign dll failed\n"); + file[3] = CreateFileA( filename2, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + for (i = 0; i < sizeof(sec_flag_tests) / sizeof(sec_flag_tests[0]); i++) { DWORD flags = sec_flag_tests[i].flags; - DWORD perm = sec_flag_tests[i].file == 2 ? PAGE_READONLY : PAGE_READWRITE; + DWORD perm = sec_flag_tests[i].file >= 2 ? PAGE_READONLY : PAGE_READWRITE; SetLastError( 0xdeadbeef ); handle = CreateFileMappingA( file[sec_flag_tests[i].file], NULL, flags | perm, 0, 0x1000, "Wine Test Mapping" ); if (sec_flag_tests[i].error) { + /* SEC_IMAGE_NO_EXECUTE produces ERROR_INVALID_PARAMETER on older Windows */ + BOOL wrong_err = ((flags & SEC_IMAGE_NO_EXECUTE) == SEC_IMAGE_NO_EXECUTE) && + (GetLastError() == ERROR_INVALID_PARAMETER); ok( !handle, "%u: CreateFileMapping succeeded\n", i ); - ok( GetLastError() == sec_flag_tests[i].error, "%u: wrong error %u\n", i, GetLastError()); + ok( GetLastError() == sec_flag_tests[i].error || broken(wrong_err), + "%u: wrong error %u\n", i, GetLastError()); } else { @@ -1754,7 +1840,9 @@ static void test_CreateFileMapping(void) } CloseHandle( file[1] ); CloseHandle( file[2] ); + CloseHandle( file[3] ); DeleteFileA( filename ); + DeleteFileA( filename2 ); } static void test_IsBadReadPtr(void) -- 2.7.4

3 3

[v2 PATCH] ddraw/tests: Move surface enumeration test
by Nikolay Sivov 08 Jan '18

08 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed ddraw7 failure on 64 bit dlls/ddraw/tests/ddraw1.c | 76 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 76 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 76 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 42 ----------------------- 5 files changed, 309 insertions(+), 42 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d416cf55a3..b96bee8600 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -10913,6 +10913,81 @@ static void test_depth_readback(void) DestroyWindow(window); } +struct enum_surfaces_param +{ + IDirectDrawSurface *surfaces[8]; + UINT count; +}; + +static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) +{ + struct enum_surfaces_param *param = (struct enum_surfaces_param *)context; + BOOL found = FALSE; + int i; + + for (i = 0; i < sizeof(param->surfaces)/sizeof(param->surfaces[0]); i++) + { + if (param->surfaces[i] == surface) + { + found = TRUE; + break; + } + } + + ok(found, "Unexpected surface %p enumerated.\n", surface); + param->count++; + IDirectDrawSurface_Release(surface); + return DDENUMRET_OK; +} + +static void test_enum_surfaces(void) +{ + struct enum_surfaces_param param; + IDirectDrawSurface *surface; + IDirectDraw *ddraw; + DDSURFACEDESC desc; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + U2(desc).dwMipMapCount = 3; + desc.dwWidth = 32; + desc.dwHeight = 32; + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create a surface, hr %#x.\n", hr); + + memset(&param, 0, sizeof(param)); + param.surfaces[0] = surface; + hr = IDirectDrawSurface_GetAttachedSurface(param.surfaces[0], &desc.ddsCaps, &param.surfaces[1]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(param.surfaces[1], &desc.ddsCaps, &param.surfaces[2]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(param.surfaces[2], &desc.ddsCaps, &param.surfaces[3]); + ok(hr == DDERR_NOTFOUND, "Unexpected hr %#x.\n", hr); + ok(!param.surfaces[3], "expected NULL pointer\n"); + + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Unexpected number of surfaces enumerated - %d, expected 3\n", param.count); + + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Unexpected number of surfaces enumerated - %d, expected 3\n", param.count); + + IDirectDrawSurface_Release(param.surfaces[2]); + IDirectDrawSurface_Release(param.surfaces[1]); + IDirectDrawSurface_Release(surface); + IDirectDraw_Release(ddraw); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -11012,4 +11087,5 @@ START_TEST(ddraw1) test_texture_load(); test_ck_operation(); test_depth_readback(); + test_enum_surfaces(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2186c314ac..143230085f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -12287,6 +12287,81 @@ static void test_depth_readback(void) DestroyWindow(window); } +struct enum_surfaces_param +{ + IDirectDrawSurface *surfaces[8]; + UINT count; +}; + +static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) +{ + struct enum_surfaces_param *param = (struct enum_surfaces_param *)context; + BOOL found = FALSE; + int i; + + for (i = 0; i < sizeof(param->surfaces)/sizeof(param->surfaces[0]); i++) + { + if (param->surfaces[i] == surface) + { + found = TRUE; + break; + } + } + + ok(found, "Unexpected surface %p enumerated.\n", surface); + param->count++; + IDirectDrawSurface_Release(surface); + return DDENUMRET_OK; +} + +static void test_enum_surfaces(void) +{ + struct enum_surfaces_param param; + IDirectDrawSurface *surface; + IDirectDraw2 *ddraw; + DDSURFACEDESC desc; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + U2(desc).dwMipMapCount = 3; + desc.dwWidth = 32; + desc.dwHeight = 32; + hr = IDirectDraw2_CreateSurface(ddraw, &desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create a surface, hr %#x.\n", hr); + + memset(&param, 0, sizeof(param)); + param.surfaces[0] = surface; + hr = IDirectDrawSurface_GetAttachedSurface(param.surfaces[0], &desc.ddsCaps, &param.surfaces[1]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(param.surfaces[1], &desc.ddsCaps, &param.surfaces[2]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(param.surfaces[2], &desc.ddsCaps, &param.surfaces[3]); + ok(hr == DDERR_NOTFOUND, "Unexpected hr %#x.\n", hr); + ok(!param.surfaces[3], "expected NULL pointer\n"); + + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Unexpected number of surfaces enumerated - %d, expected 3\n", param.count); + + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Unexpected number of surfaces enumerated - %d, expected 3\n", param.count); + + IDirectDrawSurface_Release(param.surfaces[2]); + IDirectDrawSurface_Release(param.surfaces[1]); + IDirectDrawSurface_Release(surface); + IDirectDraw2_Release(ddraw); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -12394,4 +12469,5 @@ START_TEST(ddraw2) test_surface_desc_size(); test_ck_operation(); test_depth_readback(); + test_enum_surfaces(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 4c1bd78eef..cc8b6e8ace 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -14355,6 +14355,81 @@ static void test_depth_readback(void) DestroyWindow(window); } +struct enum_surfaces_param +{ + IDirectDrawSurface4 *surfaces[8]; + UINT count; +}; + +static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface4 *surface, DDSURFACEDESC2 *desc, void *context) +{ + struct enum_surfaces_param *param = (struct enum_surfaces_param *)context; + BOOL found = FALSE; + int i; + + for (i = 0; i < sizeof(param->surfaces)/sizeof(param->surfaces[0]); i++) + { + if (param->surfaces[i] == surface) + { + found = TRUE; + break; + } + } + + ok(found, "Unexpected surface %p enumerated.\n", surface); + param->count++; + IDirectDrawSurface4_Release(surface); + return DDENUMRET_OK; +} + +static void test_enum_surfaces(void) +{ + struct enum_surfaces_param param; + IDirectDrawSurface4 *surface; + DDSURFACEDESC2 desc; + IDirectDraw4 *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + U2(desc).dwMipMapCount = 3; + desc.dwWidth = 32; + desc.dwHeight = 32; + hr = IDirectDraw4_CreateSurface(ddraw, &desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create a surface, hr %#x.\n", hr); + + memset(&param, 0, sizeof(param)); + param.surfaces[0] = surface; + hr = IDirectDrawSurface4_GetAttachedSurface(param.surfaces[0], &desc.ddsCaps, &param.surfaces[1]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetAttachedSurface(param.surfaces[1], &desc.ddsCaps, &param.surfaces[2]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetAttachedSurface(param.surfaces[2], &desc.ddsCaps, &param.surfaces[3]); + ok(hr == DDERR_NOTFOUND, "Unexpected hr %#x.\n", hr); + ok(!param.surfaces[3], "expected NULL pointer\n"); + + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Unexpected number of surfaces enumerated - %d, expected 3\n", param.count); + + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Unexpected number of surfaces enumerated - %d, expected 3\n", param.count); + + IDirectDrawSurface4_Release(param.surfaces[2]); + IDirectDrawSurface4_Release(param.surfaces[1]); + IDirectDrawSurface4_Release(surface); + IDirectDraw4_Release(ddraw); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -14475,4 +14550,5 @@ START_TEST(ddraw4) test_compute_sphere_visibility(); test_map_synchronisation(); test_depth_readback(); + test_enum_surfaces(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d7355cf0ea..b162aa3b70 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13726,6 +13726,86 @@ static void test_depth_readback(void) DestroyWindow(window); } +struct enum_surfaces_param +{ + IDirectDrawSurface7 *surfaces[8]; + UINT count; +}; + +static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) +{ + struct enum_surfaces_param *param = (struct enum_surfaces_param *)context; + BOOL found = FALSE; + int i; + + for (i = 0; i < sizeof(param->surfaces)/sizeof(param->surfaces[0]); i++) + { + if (param->surfaces[i] == surface) + { + found = TRUE; + break; + } + } + + ok(found, "Unexpected surface %p enumerated.\n", surface); + param->count++; + IDirectDrawSurface7_Release(surface); + return DDENUMRET_OK; +} + +static void test_enum_surfaces(void) +{ + struct enum_surfaces_param param; + IDirectDrawSurface7 *surface; + DDSURFACEDESC2 desc; + IDirectDraw7 *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + U2(desc).dwMipMapCount = 3; + desc.dwWidth = 32; + desc.dwHeight = 32; + if (FAILED(IDirectDraw7_CreateSurface(ddraw, &desc, &surface, NULL))) + { + win_skip("Failed to create a texture, skipping tests.\n"); + IDirectDraw7_Release(ddraw); + return; + } + + memset(&param, 0, sizeof(param)); + param.surfaces[0] = surface; + hr = IDirectDrawSurface7_GetAttachedSurface(param.surfaces[0], &desc.ddsCaps, &param.surfaces[1]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(param.surfaces[1], &desc.ddsCaps, &param.surfaces[2]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(param.surfaces[2], &desc.ddsCaps, &param.surfaces[3]); + ok(hr == DDERR_NOTFOUND, "Unexpected hr %#x.\n", hr); + ok(!param.surfaces[3], "expected NULL pointer\n"); + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Unexpected number of surfaces enumerated - %d, expected 3\n", param.count); + + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Unexpected number of surfaces enumerated - %d, expected 3\n", param.count); + + IDirectDrawSurface7_Release(param.surfaces[2]); + IDirectDrawSurface7_Release(param.surfaces[1]); + IDirectDrawSurface7_Release(surface); + IDirectDraw7_Release(ddraw); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -13856,4 +13936,5 @@ START_TEST(ddraw7) test_clip_planes_limits(); test_map_synchronisation(); test_depth_readback(); + test_enum_surfaces(); } diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 90e7fcf781..0f775a0062 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -368,47 +368,6 @@ static HRESULT WINAPI enumCB(IDirectDrawSurface *surf, DDSURFACEDESC *desc, void return DDENUMRET_OK; } -static void EnumTest(void) -{ - HRESULT rc; - DDSURFACEDESC ddsd; - IDirectDrawSurface *surface; - struct enumstruct ctx; - - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; - U2(ddsd).dwMipMapCount = 3; - ddsd.dwWidth = 32; - ddsd.dwHeight = 32; - rc = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); - ok(rc==DD_OK,"CreateSurface returned: %x\n",rc); - - memset(&ctx, 0, sizeof(ctx)); - ctx.expected[0] = surface; - rc = IDirectDrawSurface_GetAttachedSurface(ctx.expected[0], &ddsd.ddsCaps, &ctx.expected[1]); - ok(rc == DD_OK, "GetAttachedSurface returned %08x\n", rc); - rc = IDirectDrawSurface_GetAttachedSurface(ctx.expected[1], &ddsd.ddsCaps, &ctx.expected[2]); - ok(rc == DD_OK, "GetAttachedSurface returned %08x\n", rc); - rc = IDirectDrawSurface_GetAttachedSurface(ctx.expected[2], &ddsd.ddsCaps, &ctx.expected[3]); - ok(rc == DDERR_NOTFOUND, "GetAttachedSurface returned %08x\n", rc); - ok(!ctx.expected[3], "expected NULL pointer\n"); - ctx.count = 0; - - rc = IDirectDraw_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &ddsd, &ctx, enumCB); - ok(rc == DD_OK, "IDirectDraw_EnumSurfaces returned %08x\n", rc); - ok(ctx.count == 3, "%d surfaces enumerated, expected 3\n", ctx.count); - - ctx.count = 0; - rc = IDirectDraw_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, &ctx, enumCB); - ok(rc == DD_OK, "IDirectDraw_EnumSurfaces returned %08x\n", rc); - ok(ctx.count == 3, "%d surfaces enumerated, expected 3\n", ctx.count); - - IDirectDrawSurface_Release(ctx.expected[2]); - IDirectDrawSurface_Release(ctx.expected[1]); - IDirectDrawSurface_Release(surface); -} - struct compare { DWORD width, height; @@ -2609,7 +2568,6 @@ START_TEST(dsurface) GetDDInterface_2(); GetDDInterface_4(); GetDDInterface_7(); - EnumTest(); CubeMapTest(); CompressedTest(); SizeTest(); -- 2.15.1

3 2

[PATCH v2 2/6] msi/tests: Add missing return value checks to package tests (Coverity)
by Alex Henrie 08 Jan '18

08 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Increased buffer size so that the new test passes dlls/msi/tests/package.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 002e6920cf..e4cee59663 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3268,7 +3268,8 @@ static void test_states(void) add_file_entry( hdb, "'psi_file', 'psi', 'psi.txt', 100, '', '1033', 8192, 1" ); add_file_entry( hdb, "'upsilon_file', 'upsilon', 'upsilon.txt', 0, '', '1033', 16384, 1" ); - MsiDatabaseCommit(hdb); + r = MsiDatabaseCommit(hdb); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); /* these properties must not be in the saved msi file */ add_property_entry( hdb, "'ADDLOCAL', 'one,four'"); @@ -7056,7 +7057,8 @@ static void test_shortlongsource(void) /* CostFinalize:long */ add_directory_entry(hdb, "'SubDir7', 'TARGETDIR', 'eleven|twelve'"); - MsiDatabaseCommit(hdb); + r = MsiDatabaseCommit(hdb); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r ); r = package_from_db(hdb, &hpkg); if (r == ERROR_INSTALL_PACKAGE_REJECTED) @@ -8553,7 +8555,8 @@ static void test_MsiEnumComponentCosts(void) add_install_execute_sequence_entry( hdb, "'CostFinalize', '', '1000'" ); add_install_execute_sequence_entry( hdb, "'InstallValidate', '', '1100'" ); - MsiDatabaseCommit( hdb ); + r = MsiDatabaseCommit( hdb ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r ); sprintf( package, "#%u", hdb ); r = MsiOpenPackageA( package, &hpkg ); @@ -9116,8 +9119,9 @@ static INT CALLBACK externalui_message_callback(void *context, UINT message, MSI { INT retval = context ? *((INT *)context) : 0; struct externalui_message msg; - char buffer[100]; - DWORD length = 100; + char buffer[256]; + DWORD length; + UINT r; int i; msg.message = message; @@ -9131,8 +9135,9 @@ static INT CALLBACK externalui_message_callback(void *context, UINT message, MSI msg.field_count = MsiRecordGetFieldCount(hrecord); for (i = 0; i <= msg.field_count; i++) { - length = 100; - MsiRecordGetStringA(hrecord, i, buffer, &length); + length = sizeof(buffer); + r = MsiRecordGetStringA(hrecord, i, buffer, &length); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); memcpy(msg.field[i], buffer, min(100, length+1)); } -- 2.15.1

2 1

[PATCH v2 5/6] shlwapi/tests: Add missing return value checks to istream tests (Coverity)
by Alex Henrie 08 Jan '18

08 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Now checking if ret is nonzero instead of using the SUCCEEDED macro dlls/shlwapi/tests/istream.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 54a73fcf5e..926f2f8157 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -663,8 +663,10 @@ static void test_SHCreateStreamOnFileEx_CopyTo(void) static const WCHAR prefix[] = { 'T', 'S', 'T', 0 }; GetTempPathW(MAX_PATH, tmpPath); - GetTempFileNameW(tmpPath, prefix, 0, srcFileName); - GetTempFileNameW(tmpPath, prefix, 0, dstFileName); + ret = GetTempFileNameW(tmpPath, prefix, 0, srcFileName); + ok(ret != 0, "GetTempFileName failed, got error %d\n", GetLastError()); + ret = GetTempFileNameW(tmpPath, prefix, 0, dstFileName); + ok(ret != 0, "GetTempFileName failed, got error %d\n", GetLastError()); ret = SHCreateStreamOnFileEx(srcFileName, STGM_CREATE | STGM_READWRITE | STGM_DELETEONRELEASE, FILE_ATTRIBUTE_TEMPORARY, FALSE, NULL, &src); ok(SUCCEEDED(ret), "SHCreateStreamOnFileEx failed with ret=0x%08x\n", ret); -- 2.15.1

1 0

[PATCH 0/6] Missing return value checks (Coverity)
by Alex Henrie 08 Jan '18

08 Jan '18

All patches in this set are for tests that sometimes crash or time out. I'd like to add the checks that Coverity suggests because they might reveal what's going wrong. -Alex Alex Henrie (6): kernel32/tests: Add missing return value check to module tests (Coverity) msi/tests: Add missing return value checks to package tests (Coverity) msxml3/tests: Add missing return value checks to domdoc tests (Coverity) shell32/tests: Add missing return value check to shelllink tests (Coverity) shlwapi/tests: Add missing return value checks to istream tests (Coverity) user32/tests: Add missing return value check to msg tests (Coverity) dlls/kernel32/tests/module.c | 3 ++- dlls/msi/tests/package.c | 13 +++++++++---- dlls/msxml3/tests/domdoc.c | 10 ++++++---- dlls/shell32/tests/shelllink.c | 5 +++-- dlls/shlwapi/tests/istream.c | 6 ++++-- dlls/user32/tests/msg.c | 3 ++- 6 files changed, 26 insertions(+), 14 deletions(-) -- 2.15.1

3 14

[PATCH 4/4] wininet/test: Check null pointer in InternetGetSecurityInfoByURLW
by Wei Xie 08 Jan '18

08 Jan '18

2 1

[PATCH 3/4] wininet/test: Test only chain is null
by Wei Xie 08 Jan '18

08 Jan '18

2 1

[PATCH 2/4] wininet/test: Test only flag is null
by Wei Xie 08 Jan '18

08 Jan '18

2 1

[PATCH 1/4] wininet/test: Test only flag is null
by Wei Xie 08 Jan '18

08 Jan '18

1 0

[PATCH 1/4] wininet/test: Test both chain and flag are null
by Wei Xie 08 Jan '18

08 Jan '18

1 0

[PATCH] dinput: Ignore vendor-specific usage pages for joystick elements on Mac.
by Bob Ziuchkovski 07 Jan '18

07 Jan '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=36441 Tested on Mac OS 10.13.2. Signed-off-by: Bob Ziuchkovski <bob.ziuchkovski(a)gmail.com> --- dlls/dinput/joystick_osx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 43fa20ea94..c1e05939d5 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -643,11 +643,16 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) TRACE("element %s\n", debugstr_element(element)); + int usage_page = IOHIDElementGetUsagePage( element ); + if (usage_page >= kHIDPage_VendorDefinedStart) { + /* vendor pages can repurpose type ids, resulting in incorrect case matches below (e.g. ds4 controllers) */ + continue; + } + switch(type) { case kIOHIDElementTypeInput_Button: { - int usage_page = IOHIDElementGetUsagePage( element ); TRACE("kIOHIDElementTypeInput_Button usage_page %d\n", usage_page); if (usage_page != kHIDPage_Button) { -- 2.15.0

1 0

[PATCH] ddraw/tests: Move surface enumration test
by Nikolay Sivov 07 Jan '18

07 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 76 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 76 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 76 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 76 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 42 ------------------------- 5 files changed, 304 insertions(+), 42 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d416cf55a3..b96bee8600 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -10913,6 +10913,81 @@ static void test_depth_readback(void) DestroyWindow(window); } +struct enum_surfaces_param +{ + IDirectDrawSurface *surfaces[8]; + UINT count; +}; + +static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) +{ + struct enum_surfaces_param *param = (struct enum_surfaces_param *)context; + BOOL found = FALSE; + int i; + + for (i = 0; i < sizeof(param->surfaces)/sizeof(param->surfaces[0]); i++) + { + if (param->surfaces[i] == surface) + { + found = TRUE; + break; + } + } + + ok(found, "Unexpected surface %p enumerated.\n", surface); + param->count++; + IDirectDrawSurface_Release(surface); + return DDENUMRET_OK; +} + +static void test_enum_surfaces(void) +{ + struct enum_surfaces_param param; + IDirectDrawSurface *surface; + IDirectDraw *ddraw; + DDSURFACEDESC desc; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + U2(desc).dwMipMapCount = 3; + desc.dwWidth = 32; + desc.dwHeight = 32; + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create a surface, hr %#x.\n", hr); + + memset(&param, 0, sizeof(param)); + param.surfaces[0] = surface; + hr = IDirectDrawSurface_GetAttachedSurface(param.surfaces[0], &desc.ddsCaps, &param.surfaces[1]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(param.surfaces[1], &desc.ddsCaps, &param.surfaces[2]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(param.surfaces[2], &desc.ddsCaps, &param.surfaces[3]); + ok(hr == DDERR_NOTFOUND, "Unexpected hr %#x.\n", hr); + ok(!param.surfaces[3], "expected NULL pointer\n"); + + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Unexpected number of surfaces enumerated - %d, expected 3\n", param.count); + + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Unexpected number of surfaces enumerated - %d, expected 3\n", param.count); + + IDirectDrawSurface_Release(param.surfaces[2]); + IDirectDrawSurface_Release(param.surfaces[1]); + IDirectDrawSurface_Release(surface); + IDirectDraw_Release(ddraw); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -11012,4 +11087,5 @@ START_TEST(ddraw1) test_texture_load(); test_ck_operation(); test_depth_readback(); + test_enum_surfaces(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2186c314ac..143230085f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -12287,6 +12287,81 @@ static void test_depth_readback(void) DestroyWindow(window); } +struct enum_surfaces_param +{ + IDirectDrawSurface *surfaces[8]; + UINT count; +}; + +static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) +{ + struct enum_surfaces_param *param = (struct enum_surfaces_param *)context; + BOOL found = FALSE; + int i; + + for (i = 0; i < sizeof(param->surfaces)/sizeof(param->surfaces[0]); i++) + { + if (param->surfaces[i] == surface) + { + found = TRUE; + break; + } + } + + ok(found, "Unexpected surface %p enumerated.\n", surface); + param->count++; + IDirectDrawSurface_Release(surface); + return DDENUMRET_OK; +} + +static void test_enum_surfaces(void) +{ + struct enum_surfaces_param param; + IDirectDrawSurface *surface; + IDirectDraw2 *ddraw; + DDSURFACEDESC desc; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + U2(desc).dwMipMapCount = 3; + desc.dwWidth = 32; + desc.dwHeight = 32; + hr = IDirectDraw2_CreateSurface(ddraw, &desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create a surface, hr %#x.\n", hr); + + memset(&param, 0, sizeof(param)); + param.surfaces[0] = surface; + hr = IDirectDrawSurface_GetAttachedSurface(param.surfaces[0], &desc.ddsCaps, &param.surfaces[1]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(param.surfaces[1], &desc.ddsCaps, &param.surfaces[2]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(param.surfaces[2], &desc.ddsCaps, &param.surfaces[3]); + ok(hr == DDERR_NOTFOUND, "Unexpected hr %#x.\n", hr); + ok(!param.surfaces[3], "expected NULL pointer\n"); + + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Unexpected number of surfaces enumerated - %d, expected 3\n", param.count); + + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Unexpected number of surfaces enumerated - %d, expected 3\n", param.count); + + IDirectDrawSurface_Release(param.surfaces[2]); + IDirectDrawSurface_Release(param.surfaces[1]); + IDirectDrawSurface_Release(surface); + IDirectDraw2_Release(ddraw); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -12394,4 +12469,5 @@ START_TEST(ddraw2) test_surface_desc_size(); test_ck_operation(); test_depth_readback(); + test_enum_surfaces(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 4c1bd78eef..cc8b6e8ace 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -14355,6 +14355,81 @@ static void test_depth_readback(void) DestroyWindow(window); } +struct enum_surfaces_param +{ + IDirectDrawSurface4 *surfaces[8]; + UINT count; +}; + +static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface4 *surface, DDSURFACEDESC2 *desc, void *context) +{ + struct enum_surfaces_param *param = (struct enum_surfaces_param *)context; + BOOL found = FALSE; + int i; + + for (i = 0; i < sizeof(param->surfaces)/sizeof(param->surfaces[0]); i++) + { + if (param->surfaces[i] == surface) + { + found = TRUE; + break; + } + } + + ok(found, "Unexpected surface %p enumerated.\n", surface); + param->count++; + IDirectDrawSurface4_Release(surface); + return DDENUMRET_OK; +} + +static void test_enum_surfaces(void) +{ + struct enum_surfaces_param param; + IDirectDrawSurface4 *surface; + DDSURFACEDESC2 desc; + IDirectDraw4 *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + U2(desc).dwMipMapCount = 3; + desc.dwWidth = 32; + desc.dwHeight = 32; + hr = IDirectDraw4_CreateSurface(ddraw, &desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create a surface, hr %#x.\n", hr); + + memset(&param, 0, sizeof(param)); + param.surfaces[0] = surface; + hr = IDirectDrawSurface4_GetAttachedSurface(param.surfaces[0], &desc.ddsCaps, &param.surfaces[1]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetAttachedSurface(param.surfaces[1], &desc.ddsCaps, &param.surfaces[2]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetAttachedSurface(param.surfaces[2], &desc.ddsCaps, &param.surfaces[3]); + ok(hr == DDERR_NOTFOUND, "Unexpected hr %#x.\n", hr); + ok(!param.surfaces[3], "expected NULL pointer\n"); + + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Unexpected number of surfaces enumerated - %d, expected 3\n", param.count); + + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Unexpected number of surfaces enumerated - %d, expected 3\n", param.count); + + IDirectDrawSurface4_Release(param.surfaces[2]); + IDirectDrawSurface4_Release(param.surfaces[1]); + IDirectDrawSurface4_Release(surface); + IDirectDraw4_Release(ddraw); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -14475,4 +14550,5 @@ START_TEST(ddraw4) test_compute_sphere_visibility(); test_map_synchronisation(); test_depth_readback(); + test_enum_surfaces(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d7355cf0ea..35d1b42ff7 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13726,6 +13726,81 @@ static void test_depth_readback(void) DestroyWindow(window); } +struct enum_surfaces_param +{ + IDirectDrawSurface7 *surfaces[8]; + UINT count; +}; + +static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) +{ + struct enum_surfaces_param *param = (struct enum_surfaces_param *)context; + BOOL found = FALSE; + int i; + + for (i = 0; i < sizeof(param->surfaces)/sizeof(param->surfaces[0]); i++) + { + if (param->surfaces[i] == surface) + { + found = TRUE; + break; + } + } + + ok(found, "Unexpected surface %p enumerated.\n", surface); + param->count++; + IDirectDrawSurface7_Release(surface); + return DDENUMRET_OK; +} + +static void test_enum_surfaces(void) +{ + struct enum_surfaces_param param; + IDirectDrawSurface7 *surface; + DDSURFACEDESC2 desc; + IDirectDraw7 *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + U2(desc).dwMipMapCount = 3; + desc.dwWidth = 32; + desc.dwHeight = 32; + hr = IDirectDraw7_CreateSurface(ddraw, &desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create a surface, hr %#x.\n", hr); + + memset(&param, 0, sizeof(param)); + param.surfaces[0] = surface; + hr = IDirectDrawSurface7_GetAttachedSurface(param.surfaces[0], &desc.ddsCaps, &param.surfaces[1]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(param.surfaces[1], &desc.ddsCaps, &param.surfaces[2]); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(param.surfaces[2], &desc.ddsCaps, &param.surfaces[3]); + ok(hr == DDERR_NOTFOUND, "Unexpected hr %#x.\n", hr); + ok(!param.surfaces[3], "expected NULL pointer\n"); + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Unexpected number of surfaces enumerated - %d, expected 3\n", param.count); + + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, &param, enum_surfaces_cb); + ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Unexpected number of surfaces enumerated - %d, expected 3\n", param.count); + + IDirectDrawSurface7_Release(param.surfaces[2]); + IDirectDrawSurface7_Release(param.surfaces[1]); + IDirectDrawSurface7_Release(surface); + IDirectDraw7_Release(ddraw); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -13856,4 +13931,5 @@ START_TEST(ddraw7) test_clip_planes_limits(); test_map_synchronisation(); test_depth_readback(); + test_enum_surfaces(); } diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 90e7fcf781..0f775a0062 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -368,47 +368,6 @@ static HRESULT WINAPI enumCB(IDirectDrawSurface *surf, DDSURFACEDESC *desc, void return DDENUMRET_OK; } -static void EnumTest(void) -{ - HRESULT rc; - DDSURFACEDESC ddsd; - IDirectDrawSurface *surface; - struct enumstruct ctx; - - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; - U2(ddsd).dwMipMapCount = 3; - ddsd.dwWidth = 32; - ddsd.dwHeight = 32; - rc = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); - ok(rc==DD_OK,"CreateSurface returned: %x\n",rc); - - memset(&ctx, 0, sizeof(ctx)); - ctx.expected[0] = surface; - rc = IDirectDrawSurface_GetAttachedSurface(ctx.expected[0], &ddsd.ddsCaps, &ctx.expected[1]); - ok(rc == DD_OK, "GetAttachedSurface returned %08x\n", rc); - rc = IDirectDrawSurface_GetAttachedSurface(ctx.expected[1], &ddsd.ddsCaps, &ctx.expected[2]); - ok(rc == DD_OK, "GetAttachedSurface returned %08x\n", rc); - rc = IDirectDrawSurface_GetAttachedSurface(ctx.expected[2], &ddsd.ddsCaps, &ctx.expected[3]); - ok(rc == DDERR_NOTFOUND, "GetAttachedSurface returned %08x\n", rc); - ok(!ctx.expected[3], "expected NULL pointer\n"); - ctx.count = 0; - - rc = IDirectDraw_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &ddsd, &ctx, enumCB); - ok(rc == DD_OK, "IDirectDraw_EnumSurfaces returned %08x\n", rc); - ok(ctx.count == 3, "%d surfaces enumerated, expected 3\n", ctx.count); - - ctx.count = 0; - rc = IDirectDraw_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, &ctx, enumCB); - ok(rc == DD_OK, "IDirectDraw_EnumSurfaces returned %08x\n", rc); - ok(ctx.count == 3, "%d surfaces enumerated, expected 3\n", ctx.count); - - IDirectDrawSurface_Release(ctx.expected[2]); - IDirectDrawSurface_Release(ctx.expected[1]); - IDirectDrawSurface_Release(surface); -} - struct compare { DWORD width, height; @@ -2609,7 +2568,6 @@ START_TEST(dsurface) GetDDInterface_2(); GetDDInterface_4(); GetDDInterface_7(); - EnumTest(); CubeMapTest(); CompressedTest(); SizeTest(); -- 2.15.1

2 1

Re: [PATCH] msvcrt: Don't include MSVC 8.0+ locale functions in SOs for older DLLs
by Mathew Hodson 07 Jan '18

07 Jan '18

For _W_Getdays and _W_Getmonths, the check is for 110 but the comment says MSVCR100. Is there a typo there? -- Sincerely, Mathew Hodson

2 1

[PATCH tools] patches: Include "AddDefaultCharset UTF-8" in the config example
by Alex Henrie 07 Jan '18

07 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Jeremy Newman just fixed this on source.winehq.org, see https://bugs.winehq.org/show_bug.cgi?id=28229 patches/doc/vhost_source.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/patches/doc/vhost_source.conf b/patches/doc/vhost_source.conf index 60a5bb5..03c25c6 100644 --- a/patches/doc/vhost_source.conf +++ b/patches/doc/vhost_source.conf @@ -1,5 +1,6 @@ <VirtualHost *:80> DocumentRoot /home/winehq/opt/source + AddDefaultCharset UTF-8 ServerName source.example.com ServerAdmin winehq(a)example.com -- 2.15.1

1 0

CoWaitForMultipleHandles infinite loop
by Anton Romanov 06 Jan '18

06 Jan '18

Hello, While looking at https://bugs.winehq.org/show_bug.cgi?id=43728 we discovered that an app uses in insane amount of CPU when idling because it makes wine enter infinite loop in dlls/ole32/compobj.c CoWaitForMultipleHandles This is because apartment is singlethreaded so that function enters message_loop mode, apt doesn't define any filter and the message that is pending does not match those defined in Com_PeekMessage. So CoWaitForMultipleHandles loops over and over again without ever dispatching aforementioned message. MSDN states that "If the caller resides in a single-thread apartment, CoWaitForMultipleHandles enters the COM modal loop, and the thread's message loop will continue to dispatch messages using the thread's message filter. If no message filter is registered for the thread, the default COM message processing is used." https://msdn.microsoft.com/en-us/library/windows/desktop/ms680732(v=vs.85).… Now in this case the only messages that are being dispatched are the ones defined in Com_PeekMessage. Is that the right behavior? Does anyone know what is the right thing to do to mitigate this infinite loop? Should we instead just dispatch ALL the messages if apartment does not define a filter? Thanks!

1 0

[PATCH v2] kernel32/tests: A couple spelling fixes in a comment.
by Francois Gouget 06 Jan '18

06 Jan '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index d0d623fc836..b5c8fc529db 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3192,7 +3192,7 @@ static void test_SuspendProcessState(void) 0, NULL); ok(server_pipe_handle != INVALID_HANDLE_VALUE, "Failed to create communication pipe (%d)\n", GetLastError()); - /* Setup the remote process enviornment */ + /* Set up the remote process environment */ ctx.ContextFlags = CONTEXT_FULL; ret = GetThreadContext(pi.hThread, &ctx); ok(ret, "Failed retrieving remote thread context (%d)\n", GetLastError()); -- 2.15.1

1 0

Re: [PATCH] msvcrt: Don't include MSVC 8.0+ locale functions in SOs for older DLLs
by Mathew Hodson 06 Jan '18

06 Jan '18

For _W_Getdays and _W_Getmonths, the check is for 110 but the comment says MSVCR100. Is there a typo there? Sincerely, Mathew Hodson

1 0

[PATCH 2/2] schtasks/tests: Added /change command tests.
by Jacek Caban 05 Jan '18

05 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/schtasks/tests/Makefile.in | 6 ++ programs/schtasks/tests/schtasks.c | 189 ++++++++++++++++++++++++++++++++++++ 2 files changed, 195 insertions(+) create mode 100644 programs/schtasks/tests/Makefile.in create mode 100644 programs/schtasks/tests/schtasks.c

1 0

[PATCH 1/2] schtasks: Added partial /change command implementation.
by Jacek Caban 05 Jan '18

05 Jan '18

This is needed by Office 2016 installer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/schtasks/Makefile.in | 1 + programs/schtasks/schtasks.c | 117 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 113 insertions(+), 5 deletions(-)

1 0

[PATCH 3/3] user32: Add more CB_SETCURSEL tests on ComboBox
by Piotr Caban 05 Jan '18

05 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/user32/combo.c | 2 +- dlls/user32/tests/msg.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-)

2 1

[PATCH 2/3] user32: Redraw combo text field even if it's empty
by Piotr Caban 05 Jan '18

05 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/user32/combo.c | 3 --- 1 file changed, 3 deletions(-)

1 0

[PATCH 1/3] user32: Let ComboBox edit control handle the redraw even if CBF_NOREDRAW is set
by Piotr Caban 05 Jan '18

05 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- Fixes bug 44286. dlls/user32/combo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

1 0

[PATCH] ddraw/tests: Add another invalid arguments test for surface QI
by Nikolay Sivov 05 Jan '18

05 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 1 + dlls/ddraw/tests/ddraw2.c | 1 + dlls/ddraw/tests/ddraw4.c | 1 + dlls/ddraw/tests/ddraw7.c | 1 + dlls/ddraw/tests/dsurface.c | 28 ---------------------------- 5 files changed, 4 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 52c5e858f9..38d8c63eef 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1949,6 +1949,7 @@ static void test_surface_qi(void) {&IID_IDirectDrawPalette, NULL, E_INVALIDARG }, {&IID_IDirectDrawClipper, NULL, E_INVALIDARG }, {&IID_IUnknown, &IID_IDirectDrawSurface, S_OK }, + {NULL, NULL, E_INVALIDARG }, }; IDirectDrawSurface *surface; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index e87244bb14..9400f89de3 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2083,6 +2083,7 @@ static void test_surface_qi(void) {&IID_IDirectDrawPalette, NULL, E_INVALIDARG }, {&IID_IDirectDrawClipper, NULL, E_INVALIDARG }, {&IID_IUnknown, &IID_IDirectDrawSurface, S_OK }, + {NULL, NULL, E_INVALIDARG }, }; IDirectDrawSurface *surface; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c86fcc5885..224d7b44b8 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2233,6 +2233,7 @@ static void test_surface_qi(void) {&IID_IDirectDrawPalette, NULL, E_INVALIDARG }, {&IID_IDirectDrawClipper, NULL, E_INVALIDARG }, {&IID_IUnknown, &IID_IDirectDrawSurface, S_OK }, + {NULL, NULL, E_INVALIDARG }, }; IDirectDrawSurface4 *surface; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f776efaa33..8d460d3c14 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1970,6 +1970,7 @@ static void test_surface_qi(void) {&IID_IDirectDrawPalette, NULL, E_NOINTERFACE}, {&IID_IDirectDrawClipper, NULL, E_NOINTERFACE}, {&IID_IUnknown, &IID_IDirectDrawSurface, S_OK }, + {NULL, NULL, E_INVALIDARG }, }; IDirectDrawSurface7 *surface; diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 9e022956ce..90e7fcf781 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -61,33 +61,6 @@ static void ReleaseDirectDraw(void) } } -static void QueryInterface(void) -{ - IDirectDrawSurface *dsurface; - DDSURFACEDESC surface; - void *object; - HRESULT ret; - - /* Create a surface */ - ZeroMemory(&surface, sizeof(surface)); - surface.dwSize = sizeof(surface); - surface.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; - surface.dwHeight = 10; - surface.dwWidth = 10; - ret = IDirectDraw_CreateSurface(lpDD, &surface, &dsurface, NULL); - if(ret != DD_OK) - { - ok(FALSE, "IDirectDraw::CreateSurface failed with error %x\n", ret); - return; - } - - /* Call IUnknown::QueryInterface */ - ret = IDirectDrawSurface_QueryInterface(dsurface, 0, &object); - ok(ret == DDERR_INVALIDPARAMS, "IDirectDrawSurface::QueryInterface returned %x\n", ret); - - IDirectDrawSurface_Release(dsurface); -} - /* The following tests test which interface is returned by IDirectDrawSurfaceX::GetDDInterface. * It uses refcounts to test that and compares the interface addresses. Partially fits here, and * partially in the refcount test @@ -2632,7 +2605,6 @@ START_TEST(dsurface) return; } - QueryInterface(); GetDDInterface_1(); GetDDInterface_2(); GetDDInterface_4(); -- 2.15.1

2 1

[PATCH 2/2] ddraw/tests: Add a depth read-back test.
by Henri Verbeet 05 Jan '18

05 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 134 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 132 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 148 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 141 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 555 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 52c5e858f91..9a872f830cd 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -217,6 +217,20 @@ static void destroy_window_thread(struct create_window_thread_param *p) CloseHandle(p->thread); } +static IDirectDrawSurface *get_depth_stencil(IDirect3DDevice *device) +{ + IDirectDrawSurface *rt, *ret; + DDSCAPS caps = {DDSCAPS_ZBUFFER}; + HRESULT hr; + + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(rt, &caps, &ret); + ok(SUCCEEDED(hr) || hr == DDERR_NOTFOUND, "Failed to get the z buffer, hr %#x.\n", hr); + IDirectDrawSurface_Release(rt); + return ret; +} + static HRESULT set_display_mode(IDirectDraw *ddraw, DWORD width, DWORD height) { if (SUCCEEDED(IDirectDraw_SetDisplayMode(ddraw, width, height, 32))) @@ -10779,6 +10793,125 @@ done: DestroyWindow(window); } +static void test_depth_readback(void) +{ + DWORD depth, expected_depth, max_diff, z_depth, z_mask; + IDirect3DExecuteBuffer *execute_buffer; + IDirect3DMaterial *blue_background; + D3DEXECUTEBUFFERDESC exec_desc; + IDirectDrawSurface *rt, *ds; + IDirect3DViewport *viewport; + DDSURFACEDESC surface_desc; + IDirect3DDevice *device; + IDirectDraw *ddraw; + unsigned int x, y; + UINT inst_length; + ULONG refcount; + HWND window; + HRESULT hr; + void *ptr; + + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + static D3DLVERTEX quad[] = + { + {{-1.0f}, {-1.0f}, {0.1f}, 0, {0xff00ff00}}, + {{-1.0f}, { 1.0f}, {0.0f}, 0, {0xff00ff00}}, + {{ 1.0f}, {-1.0f}, {1.0f}, 0, {0xff00ff00}}, + {{ 1.0f}, { 1.0f}, {0.9f}, 0, {0xff00ff00}}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + z_depth = get_device_z_depth(device); + z_mask = 0xffffffff >> (32 - z_depth); + ds = get_depth_stencil(device); + + /* Changing depth buffers is hard in d3d1, so we only test with the + * initial depth buffer here. */ + + blue_background = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); + viewport = create_viewport(device, 0, 0, 640, 480); + viewport_set_background(device, viewport, blue_background); + + memset(&exec_desc, 0, sizeof(exec_desc)); + exec_desc.dwSize = sizeof(exec_desc); + exec_desc.dwFlags = D3DDEB_BUFSIZE | D3DDEB_CAPS; + exec_desc.dwBufferSize = 1024; + exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY; + hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#x.\n", hr); + + hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc); + ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#x.\n", hr); + + memcpy(exec_desc.lpData, quad, sizeof(quad)); + ptr = (BYTE *)exec_desc.lpData + sizeof(quad); + emit_process_vertices(&ptr, D3DPROCESSVERTICES_TRANSFORM, 0, 4); + emit_tquad(&ptr, 0); + emit_end(&ptr); + + inst_length = ((BYTE *)ptr - sizeof(quad)) - (BYTE *)exec_desc.lpData; + + hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); + ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr); + + hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + set_execute_data(execute_buffer, 4, sizeof(quad), inst_length); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_UNCLIPPED); + ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); + hr = IDirect3DDevice_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface_Lock(ds, NULL, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + + for (y = 60; y < 480; y += 120) + { + for (x = 80; x < 640; x += 160) + { + ptr = (BYTE *)surface_desc.lpSurface + + y * U1(surface_desc).lPitch + + x * (z_depth == 16 ? 2 : 4); + depth = *((DWORD *)ptr) & z_mask; + expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * z_mask; + max_diff = ((0.5f * 0.9f) / 640.0f) * z_mask; + ok(abs(expected_depth - depth) <= max_diff, + "z_depth %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", + z_depth, depth, expected_depth - depth, expected_depth, max_diff, x, y); + } + } + + hr = IDirectDrawSurface_Unlock(ds, NULL); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + IDirect3DExecuteBuffer_Release(execute_buffer); + destroy_viewport(device, viewport); + destroy_material(blue_background); + IDirectDrawSurface_Release(ds); + IDirect3DDevice_Release(device); + refcount = IDirectDrawSurface_Release(rt); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirectDraw_Release(ddraw); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -10877,4 +11010,5 @@ START_TEST(ddraw1) test_surface_desc_size(); test_texture_load(); test_ck_operation(); + test_depth_readback(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index e87244bb143..dc74c6998ff 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -12155,6 +12155,137 @@ done: DestroyWindow(window); } +static void test_depth_readback(void) +{ + DWORD depth, expected_depth, max_diff; + IDirect3DMaterial2 *blue_background; + IDirectDrawSurface *rt, *ds; + IDirect3DViewport2 *viewport; + DDSURFACEDESC surface_desc; + IDirect3DDevice2 *device; + unsigned int i, x, y; + IDirectDraw2 *ddraw; + ULONG refcount; + HWND window; + HRESULT hr; + void *ptr; + + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + static D3DLVERTEX quad[] = + { + {{-1.0f}, {-1.0f}, {0.1f}, 0, {0xff00ff00}}, + {{-1.0f}, { 1.0f}, {0.0f}, 0, {0xff00ff00}}, + {{ 1.0f}, {-1.0f}, {1.0f}, 0, {0xff00ff00}}, + {{ 1.0f}, { 1.0f}, {0.9f}, 0, {0xff00ff00}}, + }; + + static const struct + { + unsigned int z_depth, z_mask; + } + tests[] = + { + {16, 0x0000ffff}, + {24, 0x00ffffff}, + {32, 0xffffffff}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirectDraw2_Release(ddraw); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice2_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + blue_background = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); + viewport = create_viewport(device, 0, 0, 640, 480); + viewport_set_background(device, viewport, blue_background); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + ds = get_depth_stencil(device); + hr = IDirectDrawSurface_DeleteAttachedSurface(rt, 0, ds); + ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); + IDirectDrawSurface_Release(ds); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER | DDSCAPS_VIDEOMEMORY; + U2(surface_desc).dwZBufferBitDepth = tests[i].z_depth; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &ds, NULL); + if (FAILED(hr)) + { + skip("Format %u not supported, skipping test.\n", i); + continue; + } + + hr = IDirectDrawSurface_AddAttachedSurface(rt, ds); + ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); + hr = IDirect3DDevice2_SetRenderTarget(device, rt, 0); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice2_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, quad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice2_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface_Lock(ds, NULL, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + + for (y = 60; y < 480; y += 120) + { + for (x = 80; x < 640; x += 160) + { + ptr = (BYTE *)surface_desc.lpSurface + + y * U1(surface_desc).lPitch + + x * (tests[i].z_depth == 16 ? 2 : 4); + depth = *((DWORD *)ptr) & tests[i].z_mask; + expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; + max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; + ok(abs(expected_depth - depth) <= max_diff, + "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", + i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + } + } + + hr = IDirectDrawSurface_Unlock(ds, NULL); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_DeleteAttachedSurface(rt, 0, ds); + ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); + IDirectDrawSurface_Release(ds); + } + + destroy_viewport(device, viewport); + destroy_material(blue_background); + IDirectDrawSurface_Release(rt); + refcount = IDirect3DDevice2_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirectDraw2_Release(ddraw); + DestroyWindow(window); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -12261,4 +12392,5 @@ START_TEST(ddraw2) test_display_mode_surface_pixel_format(); test_surface_desc_size(); test_ck_operation(); + test_depth_readback(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c86fcc58851..aeac118483f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -14207,6 +14207,153 @@ static void test_map_synchronisation(void) DestroyWindow(window); } +static void test_depth_readback(void) +{ + DWORD depth, expected_depth, max_diff; + IDirectDrawSurface4 *rt, *ds; + IDirect3DViewport3 *viewport; + DDSURFACEDESC2 surface_desc; + IDirect3DDevice3 *device; + unsigned int i, x, y; + IDirectDraw4 *ddraw; + IDirect3D3 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + RECT r; + + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + static struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xff00ff00}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 1.0f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.9f}, 0xff00ff00}, + }; + + static const struct + { + unsigned int z_depth, s_depth, z_mask, s_mask; + BOOL todo; + } + tests[] = + { + {16, 0, 0x0000ffff, 0x00000000}, + {24, 0, 0x00ffffff, 0x00000000}, + {32, 0, 0x00ffffff, 0x00000000}, + {32, 8, 0x00ffffff, 0xff000000, TRUE}, + {32, 0, 0xffffffff, 0x00000000}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D3 interface, hr %#x.\n", hr); + hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + ds = get_depth_stencil(device); + hr = IDirectDrawSurface4_DeleteAttachedSurface(rt, 0, ds); + ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); + IDirectDrawSurface4_Release(ds); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER | DDSCAPS_VIDEOMEMORY; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + if (tests[i].s_depth) + U4(surface_desc).ddpfPixelFormat.dwFlags |= DDPF_STENCILBUFFER; + U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth = tests[i].z_depth; + U2(U4(surface_desc).ddpfPixelFormat).dwStencilBitDepth = tests[i].s_depth; + U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask = tests[i].z_mask; + U4(U4(surface_desc).ddpfPixelFormat).dwStencilBitMask = tests[i].s_mask; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &ds, NULL); + if (FAILED(hr)) + { + skip("Format %u not supported, skipping test.\n", i); + continue; + } + + hr = IDirectDrawSurface_AddAttachedSurface(rt, ds); + ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); + hr = IDirect3DDevice3_SetRenderTarget(device, rt, 0); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, + D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + for (y = 60; y < 480; y += 120) + { + for (x = 80; x < 640; x += 160) + { + SetRect(&r, x, y, x + 1, y + 1); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface4_Lock(ds, &r, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + + depth = *((DWORD *)surface_desc.lpSurface) & tests[i].z_mask; + expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; + max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; + todo_wine_if(tests[i].todo) + ok(abs(expected_depth - depth) <= max_diff, + "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", + i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + + hr = IDirectDrawSurface4_Unlock(ds, &r); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + } + } + + hr = IDirectDrawSurface4_DeleteAttachedSurface(rt, 0, ds); + ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); + IDirectDrawSurface4_Release(ds); + } + + destroy_viewport(device, viewport); + IDirectDrawSurface4_Release(rt); + IDirectDraw4_Release(ddraw); + IDirect3D3_Release(d3d); + refcount = IDirect3DDevice3_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -14326,4 +14473,5 @@ START_TEST(ddraw4) test_vb_refcount(); test_compute_sphere_visibility(); test_map_synchronisation(); + test_depth_readback(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f776efaa33e..ce4117bf35e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13585,6 +13585,146 @@ done: DestroyWindow(window); } +static void test_depth_readback(void) +{ + DWORD depth, expected_depth, max_diff; + IDirectDrawSurface7 *rt, *ds; + DDSURFACEDESC2 surface_desc; + IDirect3DDevice7 *device; + unsigned int i, x, y; + IDirectDraw7 *ddraw; + IDirect3D7 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + RECT r; + + static struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xff00ff00}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 1.0f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.9f}, 0xff00ff00}, + }; + + static const struct + { + unsigned int z_depth, s_depth, z_mask, s_mask; + BOOL todo; + } + tests[] = + { + {16, 0, 0x0000ffff, 0x00000000}, + {24, 0, 0x00ffffff, 0x00000000}, + {32, 0, 0x00ffffff, 0x00000000}, + {32, 8, 0x00ffffff, 0xff000000, TRUE}, + {32, 0, 0xffffffff, 0x00000000}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + ds = get_depth_stencil(device); + hr = IDirectDrawSurface7_DeleteAttachedSurface(rt, 0, ds); + ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); + IDirectDrawSurface7_Release(ds); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER | DDSCAPS_VIDEOMEMORY; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + if (tests[i].s_depth) + U4(surface_desc).ddpfPixelFormat.dwFlags |= DDPF_STENCILBUFFER; + U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth = tests[i].z_depth; + U2(U4(surface_desc).ddpfPixelFormat).dwStencilBitDepth = tests[i].s_depth; + U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask = tests[i].z_mask; + U4(U4(surface_desc).ddpfPixelFormat).dwStencilBitMask = tests[i].s_mask; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &ds, NULL); + if (FAILED(hr)) + { + skip("Format %u not supported, skipping test.\n", i); + continue; + } + + hr = IDirectDrawSurface_AddAttachedSurface(rt, ds); + ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderTarget(device, rt, 0); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + for (y = 60; y < 480; y += 120) + { + for (x = 80; x < 640; x += 160) + { + SetRect(&r, x, y, x + 1, y + 1); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface7_Lock(ds, &r, &surface_desc, DDLOCK_READONLY, NULL); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + + depth = *((DWORD *)surface_desc.lpSurface) & tests[i].z_mask; + expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; + max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; + todo_wine_if(tests[i].todo) + ok(abs(expected_depth - depth) <= max_diff, + "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", + i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + + hr = IDirectDrawSurface7_Unlock(ds, &r); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + } + } + + hr = IDirectDrawSurface7_DeleteAttachedSurface(rt, 0, ds); + ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); + IDirectDrawSurface7_Release(ds); + } + + IDirectDrawSurface7_Release(rt); + IDirectDraw7_Release(ddraw); + IDirect3D7_Release(d3d); + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -13714,4 +13854,5 @@ START_TEST(ddraw7) test_compute_sphere_visibility(); test_clip_planes_limits(); test_map_synchronisation(); + test_depth_readback(); } -- 2.11.0

1 0

[PATCH 1/2] wined3d: Add a download function for WINED3DFMT_X8D24_UNORM.
by Henri Verbeet 05 Jan '18

05 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- For bug 43654. --- dlls/wined3d/surface.c | 58 ++++++++++++++++++++++++++++++++++++------ dlls/wined3d/texture.c | 10 ++++---- dlls/wined3d/utils.c | 47 +++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 8 ++++-- 4 files changed, 99 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index da22c7ad9aa..2a90c12353a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -546,7 +546,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct void *mem; /* Only support read back of converted P8 surfaces. */ - if (texture->flags & WINED3D_TEXTURE_CONVERTED && format->id != WINED3DFMT_P8_UINT) + if (texture->flags & WINED3D_TEXTURE_CONVERTED && format->id != WINED3DFMT_P8_UINT && !format->download) { ERR("Trying to read back converted surface %p with format %s.\n", surface, debug_d3dformat(format->id)); return; @@ -556,6 +556,12 @@ static void surface_download_data(struct wined3d_surface *surface, const struct if (surface->texture_target == GL_TEXTURE_2D_ARRAY) { + if (format->download) + { + FIXME("Reading back converted array texture %p is not supported.\n", texture); + return; + } + /* NP2 emulation is not allowed on array textures. */ if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) ERR("Array texture %p uses NP2 emulation.\n", texture); @@ -573,6 +579,12 @@ static void surface_download_data(struct wined3d_surface *surface, const struct if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { + if (format->download) + { + FIXME("Reading back converted texture %p with NP2 emulation is not supported.\n", texture); + return; + } + wined3d_texture_get_pitch(texture, surface->texture_level, &dst_row_pitch, &dst_slice_pitch); wined3d_format_calculate_pitch(format, texture->resource.device->surface_alignment, wined3d_texture_get_level_pow2_width(texture, surface->texture_level), @@ -590,6 +602,30 @@ static void surface_download_data(struct wined3d_surface *surface, const struct ERR("Unexpected compressed format for NP2 emulated texture.\n"); } + if (format->download) + { + struct wined3d_format f; + + if (data.buffer_object) + ERR("Converted texture %p uses PBO unexpectedly.\n", texture); + + WARN_(d3d_perf)("Downloading converted surface %p with format %s.\n", surface, debug_d3dformat(format->id)); + + f = *format; + f.byte_count = format->conv_byte_count; + wined3d_texture_get_pitch(texture, surface->texture_level, &dst_row_pitch, &dst_slice_pitch); + wined3d_format_calculate_pitch(&f, texture->resource.device->surface_alignment, + wined3d_texture_get_level_width(texture, surface->texture_level), + wined3d_texture_get_level_height(texture, surface->texture_level), + &src_row_pitch, &src_slice_pitch); + + if (!(temporary_mem = HeapAlloc(GetProcessHeap(), 0, src_slice_pitch))) + { + ERR("Failed to allocate memory.\n"); + return; + } + } + if (temporary_mem) { mem = temporary_mem; @@ -623,7 +659,13 @@ static void surface_download_data(struct wined3d_surface *surface, const struct checkGLcall("glGetTexImage"); } - if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) + if (format->download) + { + format->download(mem, data.addr, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, + wined3d_texture_get_level_width(texture, surface->texture_level), + wined3d_texture_get_level_height(texture, surface->texture_level), 1); + } + else if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { const BYTE *src_data; unsigned int h, y; @@ -1261,8 +1303,8 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr DWORD map_binding; if (!(conv = find_converter(src_format->id, dst_format->id)) && (!device->d3d_initialized - || !is_identity_fixup(src_format->color_fixup) || src_format->convert - || !is_identity_fixup(dst_format->color_fixup) || dst_format->convert + || !is_identity_fixup(src_format->color_fixup) || src_format->conv_byte_count + || !is_identity_fixup(dst_format->color_fixup) || dst_format->conv_byte_count || (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED))) { FIXME("Cannot find a conversion function from format %s to %s.\n", @@ -2258,7 +2300,7 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, /* Don't use PBOs for converted surfaces. During PBO conversion we look at * WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is * getting called. */ - if ((format.convert || conversion) && texture->sub_resources[sub_resource_idx].buffer_object) + if ((format.conv_byte_count || conversion) && texture->sub_resources[sub_resource_idx].buffer_object) { TRACE("Removing the pbo attached to surface %p.\n", surface); @@ -2267,7 +2309,7 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, } wined3d_texture_get_memory(texture, sub_resource_idx, &data, sub_resource->locations); - if (format.convert) + if (format.conv_byte_count) { /* This code is entered for texture formats which need a fixup. */ format.byte_count = format.conv_byte_count; @@ -2281,7 +2323,7 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, context_release(context); return FALSE; } - format.convert(src_mem, dst_mem, src_row_pitch, src_slice_pitch, + format.upload(src_mem, dst_mem, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, width, height, 1); src_row_pitch = dst_row_pitch; context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); @@ -3871,7 +3913,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst TRACE("Not doing upload because of scaling.\n"); else if (convert) TRACE("Not doing upload because of format conversion.\n"); - else if (dst_texture->resource.format->convert) + else if (dst_texture->resource.format->conv_byte_count) TRACE("Not doing upload because the destination format needs conversion.\n"); else { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ddbe340dc82..4dc739cc4c0 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -35,7 +35,7 @@ static BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const return texture->resource.pool == WINED3D_POOL_DEFAULT && texture->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] - && !texture->resource.format->convert + && !texture->resource.format->conv_byte_count && !(texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED)); } @@ -1668,7 +1668,7 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi TRACE("texture %p, context %p, format %s.\n", texture, context, debug_d3dformat(format->id)); - if (format->convert) + if (format->conv_byte_count) { texture->flags |= WINED3D_TEXTURE_CONVERTED; } @@ -2306,7 +2306,7 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int update_d = box->back - box->front; } - if (format->convert) + if (format->conv_byte_count) { if (data->buffer_object) ERR("Loading a converted texture from a PBO.\n"); @@ -2317,7 +2317,7 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int dst_slice_pitch = dst_row_pitch * update_h; converted_mem = wined3d_calloc(update_d, dst_slice_pitch); - format->convert(data->addr, converted_mem, row_pitch, slice_pitch, + format->upload(data->addr, converted_mem, row_pitch, slice_pitch, dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); mem = converted_mem; } @@ -2354,7 +2354,7 @@ static void texture3d_download_data(struct wined3d_texture *texture, unsigned in const struct wined3d_format *format = texture->resource.format; const struct wined3d_gl_info *gl_info = context->gl_info; - if (format->convert) + if (format->conv_byte_count) { FIXME("Attempting to download a converted volume, format %s.\n", debug_d3dformat(format->id)); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b3003f13028..8a96a20c117 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -434,8 +434,12 @@ struct wined3d_format_texture_info unsigned int conv_byte_count; unsigned int flags; enum wined3d_gl_extension extension; - void (*convert)(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, - UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth); + void (*upload)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); + void (*download)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); }; static void convert_l4a4_unorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, @@ -839,8 +843,32 @@ static void convert_s8_uint_d24_float(const BYTE *src, BYTE *dst, UINT src_row_p } } -static void convert_x8_d24_unorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, - UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) +static void x8_d24_unorm_upload(const BYTE *src, BYTE *dst, + unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth) +{ + unsigned int x, y, z; + + for (z = 0; z < depth; ++z) + { + for (y = 0; y < height; ++y) + { + const DWORD *source = (const DWORD *)(src + z * src_slice_pitch + y * src_row_pitch); + DWORD *dest = (DWORD *)(dst + z * dst_slice_pitch + y * dst_row_pitch); + + for (x = 0; x < width; ++x) + { + dest[x] = source[x] << 8 | ((source[x] >> 16) & 0xff); + } + } + } +} + +static void x8_d24_unorm_download(const BYTE *src, BYTE *dst, + unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth) { unsigned int x, y, z; @@ -853,7 +881,7 @@ static void convert_x8_d24_unorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, for (x = 0; x < width; ++x) { - dest[x] = source[x] << 8 | source[x] >> 16; + dest[x] = source[x] >> 8; } } } @@ -1088,7 +1116,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = /* format id gl_internal gl_srgb_internal gl_rt_internal gl_format gl_type conv_byte_count flags - extension convert */ + extension upload download */ /* FourCC formats */ /* GL_APPLE_ycbcr_422 claims that its '2YUV' format, which is supported via the UNSIGNED_SHORT_8_8_REV_APPLE type * is equivalent to 'UYVY' format on Windows, and the 'YUVS' via UNSIGNED_SHORT_8_8_APPLE equates to 'YUY2'. The @@ -1609,12 +1637,12 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 4, WINED3DFMT_FLAG_DEPTH, - WINED3D_GL_EXT_NONE, convert_x8_d24_unorm}, + WINED3D_GL_EXT_NONE, x8_d24_unorm_upload, x8_d24_unorm_download}, {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 4, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, - ARB_DEPTH_TEXTURE, convert_x8_d24_unorm}, + ARB_DEPTH_TEXTURE, x8_d24_unorm_upload, x8_d24_unorm_download}, {WINED3DFMT_S4X4_UINT_D24_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, @@ -2944,8 +2972,9 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win query_internal_format(adapter, format, &format_texture_info[i], gl_info, srgb_write, FALSE); /* Texture conversion stuff */ - format->convert = format_texture_info[i].convert; format->conv_byte_count = format_texture_info[i].conv_byte_count; + format->upload = format_texture_info[i].upload; + format->download = format_texture_info[i].download; srgb_format = NULL; for (j = 0; j < ARRAY_SIZE(format_srgb_info); ++j) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 20f53aa9e96..9f68b0ad30f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4240,8 +4240,12 @@ struct wined3d_format float depth_bias_scale; struct wined3d_rational height_scale; struct color_fixup_desc color_fixup; - void (*convert)(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, - UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth); + void (*upload)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); + void (*download)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); enum wined3d_format_id typeless_id; GLenum gl_view_class; -- 2.11.0

1 0

[PATCH 1/2] wininet/test: Add InternetGetSecurityInfoByURLW test
by Wei Xie 05 Jan '18

05 Jan '18

------------------ 武汉深之度科技有限公司 Wuhan Deepin Technology Co., Ltd. 　　谢威手机：18038104349 武汉：武汉市光谷大道77号光谷金融港B18栋6楼北京：北京市西城区新街口外大街28号院普天德胜B座603室上海：上海市长宁区愚园路1258号15A01室官网：www.deepin.org　　官博：深度操作系统

2 1

Re: [PATCH] msvcr90/tests: Make test__vsnwprintf() static.
by Piotr Caban 05 Jan '18

05 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

1 0

[PATCH] msvcrt: Don't include MSVC 8.0+ C++ functions in SOs for older DLLs
by Alex Henrie 05 Jan '18

05 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msvcrt/cpp.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 2e17f62b43..07cde75c98 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -650,6 +650,7 @@ void * __thiscall MSVCRT_type_info_vector_dtor(type_info * _this, unsigned int f } #if _MSVCR_VER >= 80 + typedef exception bad_alloc; extern const vtable_ptr MSVCRT_bad_alloc_vtable; @@ -675,9 +676,11 @@ void __thiscall MSVCRT_bad_alloc_dtor(bad_alloc * _this) TRACE("(%p)\n", _this); MSVCRT_exception_dtor(_this); } -#endif + +#endif /* _MSVCR_VER >= 80 */ #if _MSVCR_VER >= 100 + typedef struct { exception e; HRESULT hr; @@ -985,7 +988,8 @@ void __thiscall MSVCRT_improper_scheduler_detach_dtor( TRACE("(%p)\n", _this); MSVCRT_exception_dtor(_this); } -#endif + +#endif /* _MSVCR_VER >= 100 */ #ifndef __GNUC__ void __asm_dummy_vtables(void) { @@ -1583,6 +1587,8 @@ void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *typ } #endif +#if _MSVCR_VER >= 80 + /********************************************************************* * ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z * ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z @@ -1669,7 +1675,7 @@ int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) #endif /********************************************************************* - * __clean_type_info_names_internal (MSVCR100.@) + * __clean_type_info_names_internal (MSVCR80.@) */ void CDECL __clean_type_info_names_internal(void *p) { @@ -1688,6 +1694,8 @@ const char * __thiscall type_info_name_internal_method(type_info * _this, struct return MSVCRT_type_info_name(_this); } +#endif /* _MSVCR_VER >= 80 */ + /* std::exception_ptr class helpers */ typedef struct { @@ -1695,6 +1703,8 @@ typedef struct int *ref; /* not binary compatible with native msvcr100 */ } exception_ptr; +#if _MSVCR_VER >= 100 + /********************************************************************* * ?__ExceptionPtrCreate@@YAXPAX@Z * ?__ExceptionPtrCreate@@YAXPEAX@Z @@ -1781,6 +1791,8 @@ void __cdecl __ExceptionPtrAssign(exception_ptr *ep, const exception_ptr *assign InterlockedIncrement(ep->ref); } +#endif /* _MSVCR_VER >= 100 */ + /********************************************************************* * ?__ExceptionPtrRethrow@@YAXPBX@Z * ?__ExceptionPtrRethrow@@YAXPEBX@Z @@ -1803,6 +1815,8 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) ep->rec->NumberParameters, ep->rec->ExceptionInformation); } +#if _MSVCR_VER >= 100 + #ifdef __i386__ static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) { @@ -1925,6 +1939,9 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) } #endif +#endif /* _MSVCR_VER >= 100 */ + +#if _MSVCR_VER >= 110 /********************************************************************* * ?__ExceptionPtrToBool@@YA_NPBX@Z * ?__ExceptionPtrToBool@@YA_NPEBX@Z @@ -1933,6 +1950,9 @@ MSVCRT_bool __cdecl __ExceptionPtrToBool(exception_ptr *ep) { return !!ep->rec; } +#endif + +#if _MSVCR_VER >= 100 /********************************************************************* * ?__ExceptionPtrCopyException@@YAXPAXPBX1@Z @@ -2020,12 +2040,17 @@ MSVCRT_bool __cdecl __ExceptionPtrCompare(const exception_ptr *ep1, const except return ep1->rec == ep2->rec; } +#endif /* _MSVCR_VER >= 100 */ + +#if _MSVCR_VER >= 80 void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) { return get_this_pointer(off, obj); } +#endif #if _MSVCR_VER >= 140 + typedef struct { char *name; @@ -2139,9 +2164,11 @@ MSVCRT_size_t CDECL MSVCRT_type_info_hash(const type_info140 *ti) return hash; } -#endif + +#endif /* _MSVCR_VER >= 140 */ #if _MSVCR_VER >= 100 + enum ConcRT_EventType { CONCRT_EVENT_GENERIC, @@ -2160,4 +2187,5 @@ void __cdecl Concurrency__Trace_ppl_function(const GUID *guid, unsigned char lev { FIXME("(%s %u %i) stub\n", debugstr_guid(guid), level, type); } -#endif + +#endif /* _MSVCR_VER >= 100 */ -- 2.15.1

2 11

[PATCH] winhttp/tests: Fix resource leak.
by Andrey Gusev 05 Jan '18

05 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/winhttp/tests/notification.c | 3 +++ dlls/winhttp/tests/winhttp.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index da8f8e9bd9..2a647e3633 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1033,7 +1033,10 @@ START_TEST (notification) ret = WaitForSingleObject( si.event, 10000 ); ok(ret == WAIT_OBJECT_0, "failed to start winhttp test server %u\n", GetLastError()); if (ret != WAIT_OBJECT_0) + { + CloseHandle(thread); return; + } test_persistent_connection( si.port ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index e06661c31e..4399cf6df4 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4475,7 +4475,10 @@ START_TEST (winhttp) ret = WaitForSingleObject(si.event, 10000); ok(ret == WAIT_OBJECT_0, "failed to start winhttp test server %u\n", GetLastError()); if (ret != WAIT_OBJECT_0) + { + CloseHandle(thread); return; + } test_IWinHttpRequest(si.port); test_connection_info(si.port); @@ -4495,4 +4498,5 @@ START_TEST (winhttp) test_basic_request(si.port, NULL, quitW); WaitForSingleObject(thread, 3000); + CloseHandle(thread); } -- 2.13.6

2 1

[PATCH] wininet/tests: Fix resource leak.
by Andrey Gusev 05 Jan '18

05 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/wininet/tests/http.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ca1173e940..efc73e039f 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5459,7 +5459,10 @@ static void test_http_connection(void) r = WaitForSingleObject(si.hEvent, 10000); ok (r == WAIT_OBJECT_0, "failed to start wininet test server\n"); if (r != WAIT_OBJECT_0) + { + CloseHandle(hThread); return; + } test_basic_request(si.port, "GET", "/test1"); test_proxy_indirect(si.port); -- 2.13.6

2 1

[PATCH 1/2] mshtml/tests: Test document stream creation failure (Coverity)
by Nikolay Sivov 05 Jan '18

05 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/tests/activex.c | 7 +++++-- dlls/mshtml/tests/dom.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 78602b7146..8b6a47c391 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -2246,6 +2246,7 @@ static void doc_load_string(IHTMLDocument2 *doc, const char *str) IStream *stream; HGLOBAL mem; SIZE_T len; + HRESULT hr; notif_doc = doc; @@ -2253,9 +2254,11 @@ static void doc_load_string(IHTMLDocument2 *doc, const char *str) len = strlen(str); mem = GlobalAlloc(0, len); memcpy(mem, str, len); - CreateStreamOnHGlobal(mem, TRUE, &stream); + hr = CreateStreamOnHGlobal(mem, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); - IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + hr = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + ok(hr == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hr); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6c0b637a71..b00346759f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -10518,6 +10518,7 @@ static IHTMLDocument2 *create_doc_with_string(const char *str) IHTMLDocument2 *doc; HGLOBAL mem; SIZE_T len; + HRESULT hr; notif_doc = doc = create_document(); if(!doc) @@ -10527,9 +10528,11 @@ static IHTMLDocument2 *create_doc_with_string(const char *str) len = strlen(str); mem = GlobalAlloc(0, len); memcpy(mem, str, len); - CreateStreamOnHGlobal(mem, TRUE, &stream); + hr = CreateStreamOnHGlobal(mem, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); - IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + hr = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + ok(hr == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hr); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); -- 2.15.1

2 3

[PATCH] mshtml/tests: Add a trailing '\n' to ok() calls
by Alex Henrie 05 Jan '18

05 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mshtml/tests/events.c | 2 +- dlls/mshtml/tests/xmlhttprequest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 28aa93c289..908e647380 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -384,7 +384,7 @@ static void _test_event_args(unsigned line, const IID *dispiid, DISPID id, WORD if(pdp->cArgs > 1) ok_(__FILE__,line) (V_VT(pdp->rgvarg+1) == VT_DISPATCH, "V_VT(rgvarg) = %d\n", V_VT(pdp->rgvarg+1)); ok_(__FILE__,line) (pvarRes != NULL, "pvarRes == NULL\n"); - ok_(__FILE__,line) (pei != NULL, "pei == NULL"); + ok_(__FILE__,line) (pei != NULL, "pei == NULL\n"); ok_(__FILE__,line) (!pspCaller, "pspCaller != NULL\n"); if(dispiid) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index df5d6449cd..733987fce0 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -132,7 +132,7 @@ static void _test_event_args(unsigned line, const IID *dispiid, const IID *broke pdp->rgdispidNamedArgs[0]); ok_(__FILE__,line) (V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(rgvarg) = %d\n", V_VT(pdp->rgvarg)); ok_(__FILE__,line) (pvarRes != NULL, "pvarRes == NULL\n"); - ok_(__FILE__,line) (pei != NULL, "pei == NULL"); + ok_(__FILE__,line) (pei != NULL, "pei == NULL\n"); ok_(__FILE__,line) (!pspCaller, "pspCaller != NULL\n"); if(dispiid) -- 2.15.1

2 1

Re: [PATCH] mshtml: Make IEventTarget_{add,remove}EventListener_hook() static.
by Jacek Caban 05 Jan '18

05 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

1 0

Re: [PATCH] mshtml/tests: Fix typos in a few comments.
by Jacek Caban 05 Jan '18

05 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

1 0

[PATCH v2] shell32/tests: Fix resource leak.
by Andrey Gusev 05 Jan '18

05 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/shell32/tests/progman_dde.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 28dad2c87f..0bb4960ae1 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -452,6 +452,7 @@ static void test_request_groups(DWORD instance, HCONV hconv) "directory '%s' missing from group list\n", finddata.cFileName); } } while (FindNextFileA(hfind, &finddata)); + FindClose(hfind); } START_TEST(progman_dde) -- 2.13.6

1 0

[PATCH] shell32/tests: Fix resource leak.
by Andrey Gusev 05 Jan '18

05 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/shell32/tests/progman_dde.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 28dad2c87f..d1947add10 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -452,6 +452,7 @@ static void test_request_groups(DWORD instance, HCONV hconv) "directory '%s' missing from group list\n", finddata.cFileName); } } while (FindNextFileA(hfind, &finddata)); + CloseHandle(hfind); } START_TEST(progman_dde) -- 2.13.6

2 1

[PATCH] secur32/tests: Fix resource leak.
by Andrey Gusev 05 Jan '18

05 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/secur32/tests/schannel.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 21ebb6283f..7137b9cf9f 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -722,6 +722,7 @@ static void test_communication(void) if (sock == SOCKET_ERROR) { skip("Can't create socket\n"); + closesocket(sock); return; } -- 2.13.6

2 1

[PATCH] user32/tests: Fix resource leak.
by Andrey Gusev 05 Jan '18

05 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/user32/tests/win.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f9472ecfa5..f492eccca3 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9400,6 +9400,7 @@ static void test_smresult(void) CloseHandle(data.thread_got_wm_app); CloseHandle(data.main_in_wm_app_1); CloseHandle(data.thread_replied); + CloseHandle(hThread); } static void test_GetMessagePos(void) -- 2.13.6

1 0

[PATCH] oleaut32/tests: Test more return values
by Nikolay Sivov 05 Jan '18

05 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/tests/olepicture.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 4a81e2e9b2..7db1d844ba 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -722,7 +722,8 @@ static void test_Render(void) HDC hdc = create_render_dc(); /* test IPicture::Render return code on uninitialized picture */ - OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); + hres = OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void **)&pic); + ok(hres == S_OK, "Failed to create a picture, hr %#x.\n", hres); hres = IPicture_get_Type(pic, &type); ok(hres == S_OK, "IPicture_get_Type does not return S_OK, but 0x%08x\n", hres); ok(type == PICTYPE_UNINITIALIZED, "Expected type = PICTYPE_UNINITIALIZED, got = %d\n", type); @@ -755,7 +756,8 @@ static void test_Render(void) return; } - OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, (VOID**)&pic); + hres = OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, (void **)&pic); + ok(hres == S_OK, "Failed to create a picture, hr %#x.\n", hres); /* zero dimensions, PICTYPE_ICON */ hres = picture_render(pic, hdc, 0, 0, 0, 0, 0, 0, 0, 0, NULL); ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); @@ -809,7 +811,8 @@ static void test_get_Attributes(void) short type; DWORD attr; - OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); + hres = OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void **)&pic); + ok(hres == S_OK, "Failed to create a picture, hr %#x.\n", hres); hres = IPicture_get_Type(pic, &type); ok(hres == S_OK, "IPicture_get_Type does not return S_OK, but 0x%08x\n", hres); ok(type == PICTYPE_UNINITIALIZED, "Expected type = PICTYPE_UNINITIALIZED, got = %d\n", type); @@ -830,8 +833,8 @@ static void test_get_Handle(void) IPicture *pic; HRESULT hres; - OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); - + hres = OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void **)&pic); + ok(hres == S_OK, "Failed to create a picture, hr %#x.\n", hres); hres = IPicture_get_Handle(pic, NULL); ole_expect(hres, E_POINTER); @@ -843,7 +846,8 @@ static void test_get_Type(void) IPicture *pic; HRESULT hres; - OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); + hres = OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void **)&pic); + ok(hres == S_OK, "Failed to create a picture, hr %#x.\n", hres); hres = IPicture_get_Type(pic, NULL); ole_expect(hres, E_POINTER); -- 2.15.1

1 0

Re: [PATCH] ole32: Rename entry_updatable() to its more common spelling.
by Huw Davies 05 Jan '18

05 Jan '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

1 0

[PATCH 1/2] wininet/test: Add InternetGetSecurityInfoByURLW test
by Wei Xie 05 Jan '18

05 Jan '18

Last commit failed because has HTML text This job no test failures fond https://testbot.winehq.org/JobDetails.pl?Key=35093

1 0

[PATCH 1/2] wininet/test: Add InternetGetSecurityInfoByURLW test
by Wei Xie 05 Jan '18

05 Jan '18

2 1

Re: [PATCH 1/2] wininet/test: Add InternetGetSecurityInfoByURLW test
by Marvin 05 Jan '18

05 Jan '18

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=35089 Your paranoid android. === wvistau64 (64 bit http) === http.c:354: Test failed: unexpected status 30 (INTERNET_STATUS_SENDING_REQUEST) http.c:354: Test failed: unexpected status 31 (INTERNET_STATUS_REQUEST_SENT) http.c:354: Test failed: unexpected status 40 (INTERNET_STATUS_RECEIVING_RESPONSE) http.c:354: Test failed: unexpected status 50 (INTERNET_STATUS_CLOSING_CONNECTION) http.c:354: Test failed: unexpected status 51 (INTERNET_STATUS_CONNECTION_CLOSED) http.c:3253: Test failed: expected status 30 (INTERNET_STATUS_SENDING_REQUEST) 1 times, received 2 times http.c:3254: Test failed: expected status 31 (INTERNET_STATUS_REQUEST_SENT) 1 times, received 2 times http.c:3255: Test failed: expected status 40 (INTERNET_STATUS_RECEIVING_RESPONSE) 1 times, received 2 times === w2008s64 (64 bit http) === http.c:354: Test failed: unexpected status 50 (INTERNET_STATUS_CLOSING_CONNECTION) http.c:354: Test failed: unexpected status 51 (INTERNET_STATUS_CONNECTION_CLOSED) http.c:354: Test failed: unexpected status 30 (INTERNET_STATUS_SENDING_REQUEST) http.c:354: Test failed: unexpected status 31 (INTERNET_STATUS_REQUEST_SENT) http.c:4659: Test failed: expected status 30 (INTERNET_STATUS_SENDING_REQUEST) 1 times, received 2 times http.c:4660: Test failed: expected status 31 (INTERNET_STATUS_REQUEST_SENT) 1 times, received 2 times http.c:5314: Test failed: expected status 50 (INTERNET_STATUS_CLOSING_CONNECTION) 1 times, received 2 times http.c:5315: Test failed: expected status 51 (INTERNET_STATUS_CONNECTION_CLOSED) 1 times, received 2 times

1 0

[PATCH 1/1] wininet: Fix crash when connection is null in NETCON_secure_connect
by Wei Xie 05 Jan '18

05 Jan '18

request->netconn may be released before call NETCON_secure_connect. 5029 if(!request->contentLength) 5030 http_release_netconn(request, TRUE); 5121 if (secure_proxy_connect && request->status_code == HTTP_STATUS_OK) 5122 { 5123 res = NETCON_secure_connect(request->netconn, request->server); I don't know how write a test patch

1 0

[PATCH 2/2] wininet: Check null pointer in InternetGetSecurityInfoByURLW
by Wei Xie 05 Jan '18

05 Jan '18

The test will crash before apply this patch

1 0

[PATCH] gameux/tests: Add a trailing '\n' to an ok() call
by Alex Henrie 05 Jan '18

05 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/gameux/tests/gameexplorer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 1ef7a780de..05c2a1104f 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -454,7 +454,7 @@ static void _findGameInstanceId(int line, ++dwMaxSubKeyLen; /* for string terminator */ lpName = CoTaskMemAlloc(dwMaxSubKeyLen*sizeof(WCHAR)); if(!lpName) hr = E_OUTOFMEMORY; - ok_(__FILE__, line)(SUCCEEDED(hr), "cannot allocate memory for key name"); + ok_(__FILE__, line)(SUCCEEDED(hr), "cannot allocate memory for key name\n"); } if(SUCCEEDED(hr)) -- 2.15.1

2 1

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-devel