September 2013 - Wine-Commits

Nikolay Sivov : msxml3: Added ISupportErrorInfo support for schema cache.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: 26d42b9d5cda468acf46679118b063e15ef4c465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26d42b9d5cda468acf4667911… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 9 19:14:20 2013 +0400 msxml3: Added ISupportErrorInfo support for schema cache. --- dlls/msxml3/schema.c | 10 ++++++++++ dlls/msxml3/tests/domdoc.c | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 1c11349..8c00f86 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -116,6 +116,12 @@ typedef struct LONG ref; } cache_entry; +static const tid_t schema_cache_se_tids[] = { + IXMLDOMSchemaCollection_tid, + IXMLDOMSchemaCollection2_tid, + NULL_tid +}; + /* datatypes lookup stuff * generated with help from gperf */ #define DT_MIN_STR_LEN 2 @@ -1105,6 +1111,10 @@ static HRESULT WINAPI schema_cache_QueryInterface(IXMLDOMSchemaCollection2* ifac { return *ppvObject ? S_OK : E_NOINTERFACE; } + else if(IsEqualGUID( riid, &IID_ISupportErrorInfo )) + { + return node_create_supporterrorinfo(schema_cache_se_tids, ppvObject); + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a32eda8..921cb16 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10712,6 +10712,7 @@ static void test_supporterrorinfo(void) &IID_IXMLDOMDocument2, &IID_IXMLDOMDocument3 }; const supporterror_t *ptr = supporterror_test; ISupportErrorInfo *errorinfo, *info2; + IXMLDOMSchemaCollection *schemacache; IXMLDOMNamedNodeMap *map, *map2; IXMLDOMDocument *doc; IXMLDOMElement *elem; @@ -10838,6 +10839,20 @@ static void test_supporterrorinfo(void) IXMLDOMElement_Release(elem); IXMLDOMDocument_Release(doc); + + /* IXMLDOMSchemaCollection */ + hr = CoCreateInstance(&CLSID_XMLSchemaCache, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMSchemaCollection, (void**)&schemacache); + ok(hr == S_OK, "failed to create schema collection, 0x%08x\n", hr); + + hr = IXMLDOMSchemaCollection_QueryInterface(schemacache, &IID_ISupportErrorInfo, (void**)&errorinfo); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ISupportErrorInfo_InterfaceSupportsErrorInfo(errorinfo, &IID_IXMLDOMSchemaCollection); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ISupportErrorInfo_Release(errorinfo); + IXMLDOMSchemaCollection_Release(schemacache); + free_bstrs(); }

1 0

Detlef Riekenberg : d3dx11_42: Add stub dll.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: 6cb21569768f32bf92c90cba0cfea136ee00bbb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cb21569768f32bf92c90cba0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Sep 4 09:51:37 2013 +0200 d3dx11_42: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3dx11_42/Makefile.in | 7 +++++ dlls/d3dx11_42/d3dx11_42.c | 55 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx11_42/d3dx11_42.spec | 44 ++++++++++++++++++++++++++++++++ dlls/d3dx11_42/version.rc | 26 +++++++++++++++++++ tools/make_specfiles | 4 +++ 7 files changed, 138 insertions(+), 0 deletions(-) diff --git a/configure b/configure index b041ce7..5056a20 100755 --- a/configure +++ b/configure @@ -15993,6 +15993,7 @@ wine_fn_config_dll d3dx10_40 enable_d3dx10_40 wine_fn_config_dll d3dx10_41 enable_d3dx10_41 wine_fn_config_dll d3dx10_42 enable_d3dx10_42 wine_fn_config_dll d3dx10_43 enable_d3dx10_43 +wine_fn_config_dll d3dx11_42 enable_d3dx11_42 wine_fn_config_dll d3dx11_43 enable_d3dx11_43 wine_fn_config_dll d3dx9_24 enable_d3dx9_24 wine_fn_config_dll d3dx9_25 enable_d3dx9_25 diff --git a/configure.ac b/configure.ac index 707e8bb..66b4dd6 100644 --- a/configure.ac +++ b/configure.ac @@ -2675,6 +2675,7 @@ WINE_CONFIG_DLL(d3dx10_40) WINE_CONFIG_DLL(d3dx10_41) WINE_CONFIG_DLL(d3dx10_42) WINE_CONFIG_DLL(d3dx10_43) +WINE_CONFIG_DLL(d3dx11_42) WINE_CONFIG_DLL(d3dx11_43) WINE_CONFIG_DLL(d3dx9_24) WINE_CONFIG_DLL(d3dx9_25) diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in new file mode 100644 index 0000000..aea3b7d --- /dev/null +++ b/dlls/d3dx11_42/Makefile.in @@ -0,0 +1,7 @@ +MODULE = d3dx11_42.dll + +C_SRCS = d3dx11_42.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/d3dx11_42/d3dx11_42.c b/dlls/d3dx11_42/d3dx11_42.c new file mode 100644 index 0000000..ac56fbe --- /dev/null +++ b/dlls/d3dx11_42/d3dx11_42.c @@ -0,0 +1,55 @@ +/* + * Copyright 2013 Detlef Riekenberg + * + * 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 + * + */ + +#include "config.h" +#include "wine/port.h" +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "objbase.h" +#include "d3d11.h" + +BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hdll); + } + + return TRUE; +} + +/*********************************************************************** + * D3DX11CheckVersion + * + * Checks whether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion) +{ + if ((d3dsdkversion == D3D11_SDK_VERSION) && (d3dxsdkversion == 42)) + return TRUE; + + return FALSE; +} diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec new file mode 100644 index 0000000..3fd291c --- /dev/null +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -0,0 +1,44 @@ +@ stdcall D3DX11CheckVersion(long long) +@ stub D3DX11CompileFromFileA +@ stub D3DX11CompileFromFileW +@ stub D3DX11CompileFromMemory +@ stub D3DX11CompileFromResourceA +@ stub D3DX11CompileFromResourceW +@ stub D3DX11ComputeNormalMap +@ stub D3DX11CreateAsyncCompilerProcessor +@ stub D3DX11CreateAsyncFileLoaderA +@ stub D3DX11CreateAsyncFileLoaderW +@ stub D3DX11CreateAsyncMemoryLoader +@ stub D3DX11CreateAsyncResourceLoaderA +@ stub D3DX11CreateAsyncResourceLoaderW +@ stub D3DX11CreateAsyncShaderPreprocessProcessor +@ stub D3DX11CreateAsyncShaderResourceViewProcessor +@ stub D3DX11CreateAsyncTextureInfoProcessor +@ stub D3DX11CreateAsyncTextureProcessor +@ stub D3DX11CreateShaderResourceViewFromFileA +@ stub D3DX11CreateShaderResourceViewFromFileW +@ stub D3DX11CreateShaderResourceViewFromMemory +@ stub D3DX11CreateShaderResourceViewFromResourceA +@ stub D3DX11CreateShaderResourceViewFromResourceW +@ stub D3DX11CreateTextureFromFileA +@ stub D3DX11CreateTextureFromFileW +@ stub D3DX11CreateTextureFromMemory +@ stub D3DX11CreateTextureFromResourceA +@ stub D3DX11CreateTextureFromResourceW +@ stub D3DX11CreateThreadPump +@ stub D3DX11FilterTexture +@ stub D3DX11GetImageInfoFromFileA +@ stub D3DX11GetImageInfoFromFileW +@ stub D3DX11GetImageInfoFromMemory +@ stub D3DX11GetImageInfoFromResourceA +@ stub D3DX11GetImageInfoFromResourceW +@ stub D3DX11LoadTextureFromTexture +@ stub D3DX11PreprocessShaderFromFileA +@ stub D3DX11PreprocessShaderFromFileW +@ stub D3DX11PreprocessShaderFromMemory +@ stub D3DX11PreprocessShaderFromResourceA +@ stub D3DX11PreprocessShaderFromResourceW +@ stub D3DX11SHProjectCubeMap +@ stub D3DX11SaveTextureToFileA +@ stub D3DX11SaveTextureToFileW +@ stub D3DX11SaveTextureToMemory diff --git a/dlls/d3dx11_42/version.rc b/dlls/d3dx11_42/version.rc new file mode 100644 index 0000000..808abd9 --- /dev/null +++ b/dlls/d3dx11_42/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2013 Detlef Riekenberg + * + * 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 WINE_FILEDESCRIPTION_STR "Wine D3DX11" +#define WINE_FILENAME_STR "d3dx11_42.dll" +#define WINE_FILEVERSION 9,29,952,3111 +#define WINE_FILEVERSION_STR "9.29.952.3111" +#define WINE_PRODUCTVERSION 9,29,952,3111 +#define WINE_PRODUCTVERSION_STR "9.29.952.3111" + +#include "wine/wine_common_ver.rc" diff --git a/tools/make_specfiles b/tools/make_specfiles index c0e6a06..5314c41 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -86,6 +86,10 @@ my @dll_groups = "d3dx10_33", ], [ + "d3dx11_43", + "d3dx11_42", + ], + [ "d3dcompiler_43", "d3dcompiler_42", "d3dcompiler_41",

1 0

Sylvain Petreolle : wbemprox: Implement Win32_OperatingSystem.LocalDateTime .
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: 4a1d4acd29d5d0e45e00923ac65c5f7d35c04231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a1d4acd29d5d0e45e00923ac… Author: Sylvain Petreolle <spetreolle(a)yahoo.fr> Date: Sun Sep 8 16:47:16 2013 +0200 wbemprox: Implement Win32_OperatingSystem.LocalDateTime. --- dlls/wbemprox/builtin.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d310704..8dca46e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -160,6 +160,8 @@ static const WCHAR prop_intvalueW[] = {'I','n','t','e','g','e','r','V','a','l','u','e',0}; static const WCHAR prop_lastbootuptimeW[] = {'L','a','s','t','B','o','o','t','U','p','T','i','m','e',0}; +static const WCHAR prop_localdatetimeW[] = + {'L','o','c','a','l','D','a','t','e','T','i','m','e',0}; static const WCHAR prop_localeW[] = {'L','o','c','a','l','e',0}; static const WCHAR prop_macaddressW[] = @@ -339,6 +341,7 @@ static const struct column col_os[] = { prop_countrycodeW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_csdversionW, CIM_STRING }, { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, + { prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_osarchitectureW, CIM_STRING }, { prop_oslanguageW, CIM_UINT32, VT_I4 }, @@ -591,6 +594,7 @@ struct record_operatingsystem const WCHAR *countrycode; const WCHAR *csdversion; const WCHAR *lastbootuptime; + const WCHAR *localdatetime; const WCHAR *locale; const WCHAR *osarchitecture; UINT32 oslanguage; @@ -1777,6 +1781,31 @@ static WCHAR *get_lastbootuptime(void) sprintfW( ret, fmtW, tf.Year, tf.Month, tf.Day, tf.Hour, tf.Minute, tf.Second, tf.Milliseconds * 1000 ); return ret; } +static WCHAR *get_localdatetime(void) +{ + static const WCHAR fmtW[] = + {'%','0','4','u','%','0','2','u','%','0','2','u','%','0','2','u','%','0','2','u','%','0','2','u', + '.','%','0','6','u','%','+','0','3','d',0}; + TIME_ZONE_INFORMATION tzi; + SYSTEMTIME st; + WCHAR *ret; + DWORD Status; + LONG Bias; + + Status = GetTimeZoneInformation(&tzi); + + if(Status == TIME_ZONE_ID_INVALID) return NULL; + Bias = tzi.Bias; + if(Status == TIME_ZONE_ID_DAYLIGHT) + Bias+= tzi.DaylightBias; + else + Bias+= tzi.StandardBias; + if (!(ret = heap_alloc( 26 * sizeof(WCHAR) ))) return NULL; + + GetLocalTime(&st); + sprintfW( ret, fmtW, st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds * 1000, -Bias); + return ret; +} static WCHAR *get_systemdirectory(void) { void *redir; @@ -1822,6 +1851,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->countrycode = get_countrycode(); rec->csdversion = os_csdversionW; rec->lastbootuptime = get_lastbootuptime(); + rec->localdatetime = get_localdatetime(); rec->locale = get_locale(); rec->osarchitecture = get_osarchitecture(); rec->oslanguage = GetSystemDefaultLangID();

1 0

Nikolay Sivov : shell32: Added support for ASSOCF_NOTRUNCATE flag in GetString().
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: 891cf2ac54b69cf7d2f8c093338108a7b1e24edf URL: http://source.winehq.org/git/wine.git/?a=commit;h=891cf2ac54b69cf7d2f8c0933… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 9 11:21:03 2013 +0400 shell32: Added support for ASSOCF_NOTRUNCATE flag in GetString(). --- dlls/shell32/assoc.c | 67 +++++++++++++++++++++---------- dlls/shell32/tests/assoc.c | 93 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 131 insertions(+), 29 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 65f4644..77b0a2d 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -392,17 +392,41 @@ static HRESULT ASSOC_ReturnData(void *out, DWORD *outlen, const void *data, } } -static HRESULT ASSOC_ReturnString(LPWSTR out, DWORD *outlen, LPCWSTR data, - DWORD datalen) +static HRESULT ASSOC_ReturnString(ASSOCF flags, LPWSTR out, DWORD *outlen, LPCWSTR data, DWORD datalen) { - HRESULT hres; + HRESULT hr = S_OK; + DWORD len; - assert(outlen); + TRACE("flags=0x%08x, data=%s\n", flags, debugstr_w(data)); - *outlen *= sizeof(WCHAR); - hres = ASSOC_ReturnData(out, outlen, data, datalen*sizeof(WCHAR)); - *outlen /= sizeof(WCHAR); - return hres; + if (!out) + { + *outlen = datalen; + return S_FALSE; + } + + if (*outlen < datalen) + { + if (flags & ASSOCF_NOTRUNCATE) + { + len = 0; + if (*outlen > 0) out[0] = 0; + hr = E_POINTER; + } + else + { + len = min(*outlen, datalen); + hr = E_NOT_SUFFICIENT_BUFFER; + } + *outlen = datalen; + } + else + len = datalen; + + if (len) + memcpy(out, data, len*sizeof(WCHAR)); + + return hr; } /************************************************************************** @@ -424,23 +448,22 @@ static HRESULT ASSOC_ReturnString(LPWSTR out, DWORD *outlen, LPCWSTR data, */ static HRESULT WINAPI IQueryAssociations_fnGetString( IQueryAssociations *iface, - ASSOCF cfFlags, + ASSOCF flags, ASSOCSTR str, LPCWSTR pszExtra, LPWSTR pszOut, DWORD *pcchOut) { IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); - const ASSOCF cfUnimplemented = ~(0); + const ASSOCF unimplemented_flags = ~ASSOCF_NOTRUNCATE; DWORD len = 0; HRESULT hr; WCHAR path[MAX_PATH]; - TRACE("(%p,0x%08x,%u,%s,%p,%p)\n", This, cfFlags, str, - debugstr_w(pszExtra), pszOut, pcchOut); + TRACE("(%p)->(0x%08x, %u, %s, %p, %p)\n", This, flags, str, debugstr_w(pszExtra), pszOut, pcchOut); - if (cfFlags & cfUnimplemented) - FIXME("%08x: unimplemented flags!\n", cfFlags & cfUnimplemented); + if (flags & unimplemented_flags) + FIXME("%08x: unimplemented flags\n", flags & unimplemented_flags); if (!pcchOut) return E_UNEXPECTED; @@ -453,7 +476,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( hr = ASSOC_GetCommand(This, pszExtra, &command); if (SUCCEEDED(hr)) { - hr = ASSOC_ReturnString(pszOut, pcchOut, command, strlenW(command) + 1); + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, command, strlenW(command) + 1); HeapFree(GetProcessHeap(), 0, command); } return hr; @@ -465,7 +488,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( if (FAILED(hr)) return hr; len++; - return ASSOC_ReturnString(pszOut, pcchOut, path, len); + return ASSOC_ReturnString(flags, pszOut, pcchOut, path, len); } case ASSOCSTR_FRIENDLYDOCNAME: @@ -486,7 +509,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( { ret = RegGetValueW(HKEY_CLASSES_ROOT, pszFileType, NULL, RRF_RT_REG_SZ, NULL, docName, &size); if (ret == ERROR_SUCCESS) - hr = ASSOC_ReturnString(pszOut, pcchOut, docName, strlenW(docName) + 1); + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, docName, strlenW(docName) + 1); else hr = HRESULT_FROM_WIN32(ret); HeapFree(GetProcessHeap(), 0, docName); @@ -542,7 +565,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( /* Does strlenW(bufW) == 0 mean we use the filename? */ len = strlenW(bufW) + 1; TRACE("found FileDescription: %s\n", debugstr_w(bufW)); - hr = ASSOC_ReturnString(pszOut, pcchOut, bufW, len); + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, bufW, len); HeapFree(GetProcessHeap(), 0, verinfoW); return hr; } @@ -552,7 +575,7 @@ get_friendly_name_fail: PathRemoveExtensionW(path); PathStripPathW(path); TRACE("using filename: %s\n", debugstr_w(path)); - hr = ASSOC_ReturnString(pszOut, pcchOut, path, strlenW(path) + 1); + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, path, strlenW(path) + 1); HeapFree(GetProcessHeap(), 0, verinfoW); return hr; } @@ -573,7 +596,7 @@ get_friendly_name_fail: { ret = RegGetValueW(This->hkeySource, NULL, Content_TypeW, RRF_RT_REG_SZ, NULL, contentType, &size); if (ret == ERROR_SUCCESS) - hr = ASSOC_ReturnString(pszOut, pcchOut, contentType, strlenW(contentType) + 1); + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, contentType, strlenW(contentType) + 1); else hr = HRESULT_FROM_WIN32(ret); HeapFree(GetProcessHeap(), 0, contentType); @@ -606,7 +629,7 @@ get_friendly_name_fail: { ret = RegGetValueW(hkeyFile, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, icon, &size); if (ret == ERROR_SUCCESS) - hr = ASSOC_ReturnString(pszOut, pcchOut, icon, strlenW(icon) + 1); + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, icon, strlenW(icon) + 1); else hr = HRESULT_FROM_WIN32(ret); HeapFree(GetProcessHeap(), 0, icon); @@ -645,7 +668,7 @@ get_friendly_name_fail: RegCloseKey(hkey); if (ret) return HRESULT_FROM_WIN32(ret); - return ASSOC_ReturnString(pszOut, pcchOut, guid, size / sizeof(WCHAR)); + return ASSOC_ReturnString(flags, pszOut, pcchOut, guid, size / sizeof(WCHAR)); } default: diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 29524dc..abfe6d4 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -35,13 +35,8 @@ static void test_IQueryAssociations_QueryInterface(void) IUnknown *unk; HRESULT hr; - /* this works since XP */ hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&qa); - - if (FAILED(hr)) { - win_skip("CoCreateInstance for IQueryAssociations returned 0x%x\n", hr); - return; - } + ok(hr == S_OK, "got 0x%08x\n", hr); hr = IQueryAssociations_QueryInterface(qa, &IID_IQueryAssociations, (void**)&qa2); ok(hr == S_OK, "QueryInterface (IQueryAssociations) returned 0x%x\n", hr); @@ -97,12 +92,96 @@ static void test_IApplicationAssociationRegistration_QueryInterface(void) IApplicationAssociationRegistration_Release(appreg); } +struct assoc_getstring_test +{ + const WCHAR *key; + ASSOCF flags; + ASSOCSTR str; + DWORD len; + HRESULT hr; + HRESULT brokenhr; +}; + +static const WCHAR httpW[] = {'h','t','t','p',0}; + +static struct assoc_getstring_test getstring_tests[] = +{ + { httpW, 0, ASSOCSTR_EXECUTABLE, 2, 0x8007007a /* E_NOT_SUFFICIENT_BUFFER */, S_OK }, + { httpW, ASSOCF_NOTRUNCATE, ASSOCSTR_EXECUTABLE, 2, E_POINTER }, + { NULL } +}; + +static void test_IQueryAssociations_GetString(void) +{ + struct assoc_getstring_test *ptr = getstring_tests; + IQueryAssociations *assoc; + HRESULT hr; + DWORD len; + int i = 0; + + hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); + ok(hr == S_OK, "failed to create object, 0x%x\n", hr); + + hr = IQueryAssociations_Init(assoc, 0, httpW, NULL, NULL); + ok(hr == S_OK, "Init failed, 0x%x\n", hr); + + len = 0; + hr = IQueryAssociations_GetString(assoc, 0, ASSOCSTR_EXECUTABLE, NULL, NULL, &len); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(len > 0, "got wrong needed length, %d\n", len); + + while (ptr->key) + { + WCHAR buffW[MAX_PATH]; + DWORD len; + + hr = IQueryAssociations_Init(assoc, 0, ptr->key, NULL, NULL); + ok(hr == S_OK, "%d: Init failed, 0x%x\n", i, hr); + + len = ptr->len; + buffW[0] = ptr->flags & ASSOCF_NOTRUNCATE ? 0x1 : 0; + hr = IQueryAssociations_GetString(assoc, ptr->flags, ptr->str, NULL, buffW, &len); + if (hr != ptr->hr) + ok(broken(hr == ptr->brokenhr), "%d: GetString failed, 0x%08x\n", i, hr); + else + { + ok(hr == ptr->hr, "%d: GetString failed, 0x%08x\n", i, hr); + ok(len > ptr->len, "%d: got needed length %d\n", i, len); + } + + /* even with ASSOCF_NOTRUNCATE it's null terminated */ + if ((ptr->flags & ASSOCF_NOTRUNCATE) && (ptr->len > 0)) + ok(buffW[0] == 0 || broken(buffW[0] == 0x1) /* pre win7 */, "%d: got %x\n", i, buffW[0]); + + if (!(ptr->flags & ASSOCF_NOTRUNCATE) && ptr->len && FAILED(ptr->hr)) + ok(buffW[0] != 0, "%d: got %x\n", i, buffW[0]); + + i++; + ptr++; + } + + IQueryAssociations_Release(assoc); +} START_TEST(assoc) { + IQueryAssociations *qa; + HRESULT hr; + CoInitialize(NULL); - test_IQueryAssociations_QueryInterface(); + /* this works since XP */ + hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&qa); + if (hr == S_OK) + { + test_IQueryAssociations_QueryInterface(); + test_IQueryAssociations_GetString(); + + IQueryAssociations_Release(qa); + } + else + win_skip("IQueryAssociations not supported, 0x%x\n", hr); + test_IApplicationAssociationRegistration_QueryInterface(); CoUninitialize();

1 0

Nikolay Sivov : shell32: Fix search for a command string to cover more cases ( like protocol associations).
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: 4f6230d5c46c3e2287e56c426889bb6220b36289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f6230d5c46c3e2287e56c426… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 9 09:26:40 2013 +0400 shell32: Fix search for a command string to cover more cases (like protocol associations). --- dlls/shell32/assoc.c | 113 ++++++++++++++++++++++++++----------------------- 1 files changed, 60 insertions(+), 53 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index ad23c7d..65f4644 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -240,79 +240,86 @@ static HRESULT ASSOC_GetValue(HKEY hkey, const WCHAR *name, void **data, DWORD * return S_OK; } -static HRESULT ASSOC_GetCommand(IQueryAssociationsImpl *This, - LPCWSTR pszExtra, WCHAR **ppszCommand) +static HRESULT ASSOC_GetCommand(IQueryAssociationsImpl *This, const WCHAR *extra, WCHAR **command) { HKEY hkeyCommand; - HKEY hkeyFile; HKEY hkeyShell; HKEY hkeyVerb; HRESULT hr; LONG ret; - WCHAR * pszExtraFromReg = NULL; - WCHAR * pszFileType; + WCHAR *extra_from_reg = NULL; + WCHAR *filetype; static const WCHAR commandW[] = { 'c','o','m','m','a','n','d',0 }; static const WCHAR shellW[] = { 's','h','e','l','l',0 }; - hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&pszFileType, NULL); - if (FAILED(hr)) - return hr; - ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszFileType, 0, KEY_READ, &hkeyFile); - HeapFree(GetProcessHeap(), 0, pszFileType); - if (ret != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(ret); + /* When looking for file extension it's possible to have a default value + that points to another key that contains 'shell/<verb>/command' subtree. */ + hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&filetype, NULL); + if (hr == S_OK) + { + HKEY hkeyFile; - ret = RegOpenKeyExW(hkeyFile, shellW, 0, KEY_READ, &hkeyShell); - RegCloseKey(hkeyFile); - if (ret != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(ret); + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, filetype, 0, KEY_READ, &hkeyFile); + HeapFree(GetProcessHeap(), 0, filetype); + if (ret) return HRESULT_FROM_WIN32(ret); - if (!pszExtra) + ret = RegOpenKeyExW(hkeyFile, shellW, 0, KEY_READ, &hkeyShell); + RegCloseKey(hkeyFile); + if (ret) return HRESULT_FROM_WIN32(ret); + } + else { - hr = ASSOC_GetValue(hkeyShell, NULL, (void**)&pszExtraFromReg, NULL); - /* if no default action */ - if (hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) - { - DWORD rlen; - ret = RegQueryInfoKeyW(hkeyShell, 0, 0, 0, 0, &rlen, 0, 0, 0, 0, 0, 0); - if (ret != ERROR_SUCCESS) - { - RegCloseKey(hkeyShell); - return HRESULT_FROM_WIN32(ret); - } - rlen++; - pszExtraFromReg = HeapAlloc(GetProcessHeap(), 0, rlen * sizeof(WCHAR)); - if (!pszExtraFromReg) - { - RegCloseKey(hkeyShell); - return E_OUTOFMEMORY; - } - ret = RegEnumKeyExW(hkeyShell, 0, pszExtraFromReg, &rlen, 0, NULL, NULL, NULL); - if (ret != ERROR_SUCCESS) + ret = RegOpenKeyExW(This->hkeySource, shellW, 0, KEY_READ, &hkeyShell); + if (ret) return HRESULT_FROM_WIN32(ret); + } + + if (!extra) + { + /* check for default verb */ + hr = ASSOC_GetValue(hkeyShell, NULL, (void**)&extra_from_reg, NULL); + if (FAILED(hr)) { - RegCloseKey(hkeyShell); - return HRESULT_FROM_WIN32(ret); + /* no default verb, try first subkey */ + DWORD max_subkey_len; + + ret = RegQueryInfoKeyW(hkeyShell, NULL, NULL, NULL, NULL, &max_subkey_len, NULL, NULL, NULL, NULL, NULL, NULL); + if (ret) + { + RegCloseKey(hkeyShell); + return HRESULT_FROM_WIN32(ret); + } + + max_subkey_len++; + extra_from_reg = HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR)); + if (!extra_from_reg) + { + RegCloseKey(hkeyShell); + return E_OUTOFMEMORY; + } + + ret = RegEnumKeyExW(hkeyShell, 0, extra_from_reg, &max_subkey_len, NULL, NULL, NULL, NULL); + if (ret) + { + HeapFree(GetProcessHeap(), 0, extra_from_reg); + RegCloseKey(hkeyShell); + return HRESULT_FROM_WIN32(ret); + } } - } - else if (FAILED(hr)) - { - RegCloseKey(hkeyShell); - return hr; - } + extra = extra_from_reg; } - ret = RegOpenKeyExW(hkeyShell, pszExtra ? pszExtra : pszExtraFromReg, 0, - KEY_READ, &hkeyVerb); - HeapFree(GetProcessHeap(), 0, pszExtraFromReg); + /* open verb subkey */ + ret = RegOpenKeyExW(hkeyShell, extra, 0, KEY_READ, &hkeyVerb); + HeapFree(GetProcessHeap(), 0, extra_from_reg); RegCloseKey(hkeyShell); - if (ret != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(ret); + if (ret) return HRESULT_FROM_WIN32(ret); + /* open command subkey */ ret = RegOpenKeyExW(hkeyVerb, commandW, 0, KEY_READ, &hkeyCommand); RegCloseKey(hkeyVerb); - if (ret != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(ret); - hr = ASSOC_GetValue(hkeyCommand, NULL, (void**)ppszCommand, NULL); + if (ret) return HRESULT_FROM_WIN32(ret); + + hr = ASSOC_GetValue(hkeyCommand, NULL, (void**)command, NULL); RegCloseKey(hkeyCommand); return hr; }

1 0

Bruno Jesus : ws2_32/tests: Mark WinNT result as broken.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: d77522988ba1950c46704bdb04dd4731a272b420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d77522988ba1950c46704bdb0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Sep 8 01:47:35 2013 -0300 ws2_32/tests: Mark WinNT result as broken. --- dlls/ws2_32/tests/sock.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5d80fca..78521ae 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1286,8 +1286,10 @@ todo_wine infoA.szProtocol, prottest[i].family, prottest[i].type, prottest[i].proto); todo_wine { - ok(infoA.szProtocol[0], "WSAPROTOCOL_INFOA was not filled\n"); - ok(infoW.szProtocol[0], "WSAPROTOCOL_INFOW was not filled\n"); + ok(infoA.szProtocol[0] || broken(!infoA.szProtocol[0]) /* NT4 */, + "WSAPROTOCOL_INFOA was not filled\n"); + ok(infoW.szProtocol[0] || broken(!infoA.szProtocol[0]) /* NT4 */, + "WSAPROTOCOL_INFOW was not filled\n"); } WideCharToMultiByte(CP_ACP, 0, infoW.szProtocol, -1,

1 0

Vincent Povirk : winsta: Stub WinStationRegisterConsoleNotification.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: 7c215d5a259dd711b339911b3ac0f6a9c67ead63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c215d5a259dd711b339911b3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 6 12:55:58 2013 -0500 winsta: Stub WinStationRegisterConsoleNotification. --- dlls/winsta/main.c | 7 +++++++ dlls/winsta/winsta.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index 505163b..867d3c9 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -60,6 +60,13 @@ BOOLEAN WINAPI WinStationQueryInformationW( HANDLE server, ULONG logon_id, WINST return FALSE; } +BOOLEAN WINAPI WinStationRegisterConsoleNotification( HANDLE server, HWND hwnd, ULONG flags ) +{ + FIXME( "%p %p 0x%x\n", server, hwnd, flags ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + BOOL WINAPI WinStationGetProcessSid( PVOID a, HANDLE server, DWORD process_id, PFILETIME process_start_time, PBYTE process_user_sid, PDWORD sid_size) { diff --git a/dlls/winsta/winsta.spec b/dlls/winsta/winsta.spec index 32185d3..46162c0 100644 --- a/dlls/winsta/winsta.spec +++ b/dlls/winsta/winsta.spec @@ -53,7 +53,7 @@ @ stub WinStationQueryLicense @ stub WinStationQueryLogonCredentialsW @ stub WinStationQueryUpdateRequired -@ stub WinStationRegisterConsoleNotification +@ stdcall WinStationRegisterConsoleNotification(ptr ptr long) @ stub WinStationRemoveLicense @ stub WinStationRenameA @ stub WinStationRenameW

1 0

Aric Stewart : Unicode Private Use Area is also rotated by tategaki.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: 5aa1f6b7a5d4de373c6f366c9cf7f7a947eb23b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aa1f6b7a5d4de373c6f366c9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Sep 6 14:47:40 2013 -0500 Unicode Private Use Area is also rotated by tategaki. --- dlls/gdi32/freetype.c | 3 ++- dlls/wineps.drv/text.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d9f111a..2a2619ee 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6152,7 +6152,8 @@ static const struct { WCHAR lower; WCHAR upper;} unrotate_ranges[] = {0xA000, 0xABFF}, /* Hangul Syllables */ /* Hangul Jamo Extended-B */ - {0xD800, 0xF8FF}, + {0xD800, 0xDFFF}, + /* Private Use Area */ /* CJK Compatibility Ideographs */ {0xFB00, 0xFE0F}, /* Vertical Forms */ diff --git a/dlls/wineps.drv/text.c b/dlls/wineps.drv/text.c index a9623a1..7ba59f9 100644 --- a/dlls/wineps.drv/text.c +++ b/dlls/wineps.drv/text.c @@ -65,7 +65,8 @@ static const struct { WCHAR lower; WCHAR upper;} unrotate_ranges[] = {0xA000, 0xABFF}, /* Hangul Syllables */ /* Hangul Jamo Extended-B */ - {0xD800, 0xF8FF}, + {0xD800, 0xDFFF}, + /* Private Use Area */ /* CJK Compatibility Ideographs */ {0xFB00, 0xFE0F}, /* Vertical Forms */

1 0

Henri Verbeet : d3drm: Avoid LPVOID.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: 16c48f9d84c127e53074f01268f1a8cd09e1b8a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16c48f9d84c127e53074f0126… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 9 10:26:21 2013 +0200 d3drm: Avoid LPVOID. --- dlls/d3drm/d3drm.c | 20 ++---- dlls/d3drm/d3drm_main.c | 2 +- dlls/d3drm/device.c | 88 ++++++++--------------- dlls/d3drm/face.c | 36 +++------ dlls/d3drm/frame.c | 56 +++++--------- dlls/d3drm/light.c | 18 ++--- dlls/d3drm/material.c | 14 ++-- dlls/d3drm/meshbuilder.c | 88 +++++++++-------------- dlls/d3drm/tests/d3drm.c | 4 +- dlls/d3drm/texture.c | 42 +++++------ dlls/d3drm/viewport.c | 36 +++------ include/d3drm.h | 6 +- include/d3drmdef.h | 5 +- include/d3drmobj.h | 183 +++++++++++++++++++++++----------------------- include/d3drmwin.h | 4 +- 15 files changed, 248 insertions(+), 354 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16c48f9d84c127e53074f…

1 0

Bruno Jesus : kernel32: Fix parameters checking for GetVolumePathName().
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: 3465646d446f2537faeb9b8f0a5d04cc3f1048e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3465646d446f2537faeb9b8f0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Sep 6 12:19:34 2013 -0300 kernel32: Fix parameters checking for GetVolumePathName(). --- dlls/kernel32/tests/volume.c | 13 ++++++++----- dlls/kernel32/volume.c | 23 +++++++++++++++++++---- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index e63a2ef..02446ea 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -606,7 +606,6 @@ static void test_GetVolumePathNameA(void) ret = pGetVolumePathNameA(NULL, NULL, 0); error = GetLastError(); ok(!ret, "expected failure\n"); -todo_wine ok(error == ERROR_INVALID_PARAMETER || broken( error == 0xdeadbeef) /* <=XP */, "expected ERROR_INVALID_PARAMETER got %u\n", error); @@ -615,7 +614,6 @@ todo_wine ret = pGetVolumePathNameA("", NULL, 0); error = GetLastError(); ok(!ret, "expected failure\n"); -todo_wine ok(error == ERROR_INVALID_PARAMETER || broken( error == 0xdeadbeef) /* <=XP */, "expected ERROR_INVALID_PARAMETER got %u\n", error); @@ -624,7 +622,6 @@ todo_wine ret = pGetVolumePathNameA(pathC1, NULL, 0); error = GetLastError(); ok(!ret, "expected failure\n"); -todo_wine ok(error == ERROR_INVALID_PARAMETER || broken(error == ERROR_FILENAME_EXCED_RANGE) /* <=XP */, "expected ERROR_INVALID_PARAMETER got %u\n", error); @@ -633,7 +630,6 @@ todo_wine ret = pGetVolumePathNameA(pathC1, volume, 0); error = GetLastError(); ok(!ret, "expected failure\n"); -todo_wine ok(error == ERROR_INVALID_PARAMETER || broken(error == ERROR_FILENAME_EXCED_RANGE ) /* <=XP */, "expected ERROR_INVALID_PARAMETER got %u\n", error); @@ -642,7 +638,6 @@ todo_wine ret = pGetVolumePathNameA(pathC1, volume, 1); error = GetLastError(); ok(!ret, "expected failure\n"); -todo_wine ok(error == ERROR_FILENAME_EXCED_RANGE, "expected ERROR_FILENAME_EXCED_RANGE got %u\n", error); volume[0] = '\0'; @@ -664,6 +659,14 @@ todo_wine ok(ret, "expected success\n"); todo_wine ok(!strcmp(expected, volume), "expected name '%s', returned '%s'\n", expected, volume); + + /* test an invalid path */ + SetLastError( 0xdeadbeef ); + ret = pGetVolumePathNameA("\\\\$$$", volume, 1); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_NAME || broken(ERROR_FILENAME_EXCED_RANGE) /* <=2000 */, + "expected ERROR_INVALID_NAME got %u\n", error); } static void test_GetVolumePathNamesForVolumeNameA(void) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 72b04df..1509d73 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1782,12 +1782,14 @@ BOOL WINAPI GetDiskFreeSpaceA( LPCSTR root, LPDWORD cluster_sectors, BOOL WINAPI GetVolumePathNameA(LPCSTR filename, LPSTR volumepathname, DWORD buflen) { BOOL ret; - WCHAR *filenameW = NULL, *volumeW; + WCHAR *filenameW = NULL, *volumeW = NULL; FIXME("(%s, %p, %d), stub!\n", debugstr_a(filename), volumepathname, buflen); - if (filename && !(filenameW = FILE_name_AtoW( filename, FALSE ))) return FALSE; - if (!(volumeW = HeapAlloc( GetProcessHeap(), 0, buflen * sizeof(WCHAR) ))) return FALSE; + if (filename && !(filenameW = FILE_name_AtoW( filename, FALSE ))) + return FALSE; + if (volumepathname && !(volumeW = HeapAlloc( GetProcessHeap(), 0, buflen * sizeof(WCHAR) ))) + return FALSE; if ((ret = GetVolumePathNameW( filenameW, volumeW, buflen ))) FILE_name_WtoA( volumeW, -1, volumepathname, buflen ); @@ -1805,14 +1807,27 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu FIXME("(%s, %p, %d), stub!\n", debugstr_w(filename), volumepathname, buflen); - if (p && tolowerW(p[0]) >= 'a' && tolowerW(p[0]) <= 'z' && p[1] ==':' && p[2] == '\\' && buflen >= 4) + if (!filename || !volumepathname || !buflen) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (p && tolowerW(p[0]) >= 'a' && tolowerW(p[0]) <= 'z' && p[1] ==':' && p[2] == '\\') { + if (buflen < 4) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return FALSE; + } volumepathname[0] = p[0]; volumepathname[1] = ':'; volumepathname[2] = '\\'; volumepathname[3] = 0; return TRUE; } + + SetLastError(ERROR_INVALID_NAME); return FALSE; }

1 0