June 2013 - Wine-commits - list.winehq.org

Francois Gouget : wined3d: Make state_fog_vertexpart() static.
by Alexandre Julliard 06 Jun '13

06 Jun '13

Module: wine Branch: master Commit: 145c417e98e173e73de10dc77e7fd1a19e46843f URL: http://source.winehq.org/git/wine.git/?a=commit;h=145c417e98e173e73de10dc77… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 6 10:16:49 2013 +0200 wined3d: Make state_fog_vertexpart() static. --- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1204744..491ee91 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -946,7 +946,7 @@ static void state_stencilwrite(struct wined3d_context *context, const struct win checkGLcall("glStencilMask"); } -void state_fog_vertexpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void state_fog_vertexpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f10bd70..6539548 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2626,8 +2626,6 @@ void state_clipping(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void light(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -void state_fog_vertexpart(struct wined3d_context *context, - const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void vertexdeclaration(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void clipplane(struct wined3d_context *context,

1 0

Daniel Jelinski : mscoree: Extract a helper function for getting file name from assembly.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 0eaa3ec9fb1609f0a0b0bb703b47e65071d4d49e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eaa3ec9fb1609f0a0b0bb703… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Tue Jun 4 21:10:27 2013 +0200 mscoree: Extract a helper function for getting file name from assembly. --- dlls/mscoree/metahost.c | 74 ++++++++++++++++++++++------------------ dlls/mscoree/mscoree_private.h | 2 + 2 files changed, 43 insertions(+), 33 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index fe529fd..eabdcf5 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1210,31 +1210,15 @@ HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj) return ICLRMetaHost_QueryInterface(&GlobalCLRMetaHost.ICLRMetaHost_iface, riid, ppobj); } -static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) +HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int path_length) { - loaded_mono *mono = user_data; HRESULT hr=S_OK; - MonoAssembly *result=NULL; - char *stringname=NULL; - LPWSTR stringnameW; - int stringnameW_size; IAssemblyCache *asmcache; ASSEMBLY_INFO info; - WCHAR path[MAX_PATH]; - char *pathA; - MonoImageOpenStatus stat; static WCHAR fusiondll[] = {'f','u','s','i','o','n',0}; HMODULE hfusion=NULL; static HRESULT (WINAPI *pCreateAssemblyCache)(IAssemblyCache**,DWORD); - stringname = mono->mono_stringify_assembly_name(aname); - - TRACE("%s\n", debugstr_a(stringname)); - - if (!stringname) return NULL; - - /* FIXME: We should search the given paths before the GAC. */ - if (!pCreateAssemblyCache) { hr = LoadLibraryShim(fusiondll, NULL, NULL, &hfusion); @@ -1252,28 +1236,52 @@ static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char if (SUCCEEDED(hr)) { - stringnameW_size = MultiByteToWideChar(CP_UTF8, 0, stringname, -1, NULL, 0); + info.cbAssemblyInfo = sizeof(info); + info.pszCurrentAssemblyPathBuf = assemblies_path; + info.cchBuf = path_length; + assemblies_path[0] = 0; - stringnameW = HeapAlloc(GetProcessHeap(), 0, stringnameW_size * sizeof(WCHAR)); - if (stringnameW) - MultiByteToWideChar(CP_UTF8, 0, stringname, -1, stringnameW, stringnameW_size); - else - hr = E_OUTOFMEMORY; + hr = IAssemblyCache_QueryAssemblyInfo(asmcache, 0, stringnameW, &info); - if (SUCCEEDED(hr)) - { - info.cbAssemblyInfo = sizeof(info); - info.pszCurrentAssemblyPathBuf = path; - info.cchBuf = MAX_PATH; - path[0] = 0; + IAssemblyCache_Release(asmcache); + } - hr = IAssemblyCache_QueryAssemblyInfo(asmcache, 0, stringnameW, &info); - } + return hr; +} - HeapFree(GetProcessHeap(), 0, stringnameW); +static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) +{ + loaded_mono *mono = user_data; + HRESULT hr; + MonoAssembly *result=NULL; + char *stringname=NULL; + LPWSTR stringnameW; + int stringnameW_size; + WCHAR path[MAX_PATH]; + char *pathA; + MonoImageOpenStatus stat; - IAssemblyCache_Release(asmcache); + stringname = mono->mono_stringify_assembly_name(aname); + + TRACE("%s\n", debugstr_a(stringname)); + + if (!stringname) return NULL; + + /* FIXME: We should search the given paths before the GAC. */ + + stringnameW_size = MultiByteToWideChar(CP_UTF8, 0, stringname, -1, NULL, 0); + + stringnameW = HeapAlloc(GetProcessHeap(), 0, stringnameW_size * sizeof(WCHAR)); + if (stringnameW) + { + MultiByteToWideChar(CP_UTF8, 0, stringname, -1, stringnameW, stringnameW_size); + + hr = get_file_from_strongname(stringnameW, path, MAX_PATH); + + HeapFree(GetProcessHeap(), 0, stringnameW); } + else + hr = E_OUTOFMEMORY; if (SUCCEEDED(hr)) { diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 4677921..b66669c 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -204,6 +204,8 @@ extern HRESULT CorDebug_Create(ICLRRuntimeHost *runtimehost, IUnknown** ppUnk) D extern HRESULT create_monodata(REFIID riid, LPVOID *ppObj) DECLSPEC_HIDDEN; +extern HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int path_length) DECLSPEC_HIDDEN; + extern void runtimehost_init(void); extern void runtimehost_uninit(void);

1 0

Daniel Jelinski : mscoree: Search for COM classes by assembly name if CodeBase not found.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 1319515173f5c0ea303a8087904ad72d8698c99f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1319515173f5c0ea303a80879… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Tue Jun 4 21:14:56 2013 +0200 mscoree: Search for COM classes by assembly name if CodeBase not found. --- dlls/mscoree/corruntimehost.c | 45 +++++++++++++++++++++++++++++++---------- 1 files changed, 34 insertions(+), 11 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index b4ee38b..76b7d65 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1235,6 +1235,7 @@ HRESULT RuntimeHost_Destroy(RuntimeHost *This) HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) { + static const WCHAR wszAssembly[] = {'A','s','s','e','m','b','l','y',0}; static const WCHAR wszCodebase[] = {'C','o','d','e','B','a','s','e',0}; static const WCHAR wszClass[] = {'C','l','a','s','s',0}; static const WCHAR wszFileSlash[] = {'f','i','l','e',':','/','/','/',0}; @@ -1246,11 +1247,12 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) ICLRRuntimeInfo *info = NULL; RuntimeHost *host; HRESULT hr; - HKEY key; + HKEY key, subkey; LONG res; int offset = 0; + DWORD numKeys, keyLength; WCHAR codebase[MAX_PATH + 8]; - WCHAR classname[350]; + WCHAR classname[350], subkeyName[256]; WCHAR filename[MAX_PATH]; DWORD dwBufLen = 350; @@ -1277,19 +1279,40 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) dwBufLen = MAX_PATH + 8; res = RegGetValueW( key, NULL, wszCodebase, RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); - if(res != ERROR_SUCCESS) + if(res == ERROR_SUCCESS) + { + /* Strip file:/// */ + if(strncmpW(codebase, wszFileSlash, strlenW(wszFileSlash)) == 0) + offset = strlenW(wszFileSlash); + + strcpyW(filename, codebase + offset); + } + else { - WARN("CodeBase value cannot be found.\n"); hr = CLASS_E_CLASSNOTAVAILABLE; - goto cleanup; + WARN("CodeBase value cannot be found, trying Assembly.\n"); + /* get the last subkey of InprocServer32 */ + res = RegQueryInfoKeyW(key, 0, 0, 0, &numKeys, 0, 0, 0, 0, 0, 0, 0); + if (res != ERROR_SUCCESS || numKeys == 0) + goto cleanup; + numKeys--; + keyLength = sizeof(subkeyName) / sizeof(WCHAR); + res = RegEnumKeyExW(key, numKeys, subkeyName, &keyLength, 0, 0, 0, 0); + if (res != ERROR_SUCCESS) + goto cleanup; + res = RegOpenKeyExW(key, subkeyName, 0, KEY_READ, &subkey); + if (res != ERROR_SUCCESS) + goto cleanup; + dwBufLen = MAX_PATH + 8; + res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); + RegCloseKey(subkey); + if (res != ERROR_SUCCESS) + goto cleanup; + hr = get_file_from_strongname(codebase, filename, MAX_PATH); + if (!SUCCEEDED(hr)) + goto cleanup; } - /* Strip file:/// */ - if(strncmpW(codebase, wszFileSlash, strlenW(wszFileSlash)) == 0) - offset = strlenW(wszFileSlash); - - strcpyW(filename, codebase + offset); - TRACE("codebase (%s)\n", debugstr_w(filename)); *ppObj = NULL;

1 0

Austin English : api-ms-win-core-localregistry-l1-1-0: Add stub dll.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 1648340d09847903ad6e7e7abcd870c46bd329c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1648340d09847903ad6e7e7ab… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 4 13:20:00 2013 -0700 api-ms-win-core-localregistry-l1-1-0: Add stub dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 + .../api-ms-win-core-localregistry-l1-1-0.spec | 40 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 46 insertions(+), 0 deletions(-) diff --git a/configure b/configure index d72d2df..df05f1f 100755 --- a/configure +++ b/configure @@ -15750,6 +15750,7 @@ wine_fn_config_dll advpack enable_advpack implib wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test +wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index 0a8c316..57d76d9 100644 --- a/configure.ac +++ b/configure.ac @@ -2574,6 +2574,7 @@ WINE_CONFIG_DLL(advpack,,[implib]) WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) +WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-core-localregistry-l1-1-0/Makefile.in b/dlls/api-ms-win-core-localregistry-l1-1-0/Makefile.in new file mode 100644 index 0000000..57d3e80 --- /dev/null +++ b/dlls/api-ms-win-core-localregistry-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-core-localregistry-l1-1-0.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-core-localregistry-l1-1-0/api-ms-win-core-localregistry-l1-1-0.spec b/dlls/api-ms-win-core-localregistry-l1-1-0/api-ms-win-core-localregistry-l1-1-0.spec new file mode 100644 index 0000000..fcf4f00 --- /dev/null +++ b/dlls/api-ms-win-core-localregistry-l1-1-0/api-ms-win-core-localregistry-l1-1-0.spec @@ -0,0 +1,40 @@ +@ stdcall RegCloseKey(long) advapi32.RegCloseKey +@ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExA +@ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExW +@ stdcall RegDeleteKeyExA(long str long long) advapi32.RegDeleteKeyExA +@ stdcall RegDeleteKeyExW(long wstr long long) advapi32.RegDeleteKeyExW +@ stdcall RegDeleteTreeA(long str) advapi32.RegDeleteTreeA +@ stdcall RegDeleteTreeW(long wstr) advapi32.RegDeleteTreeW +@ stdcall RegDeleteValueA(long str) advapi32.RegDeleteValueA +@ stdcall RegDeleteValueW(long wstr) advapi32.RegDeleteValueW +@ stub RegDisablePredefinedCacheEx +@ stdcall RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExA +@ stdcall RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExW +@ stdcall RegEnumValueA(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueA +@ stdcall RegEnumValueW(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueW +@ stdcall RegFlushKey(long) advapi32.RegFlushKey +@ stdcall RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity +@ stdcall RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA +@ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW +@ stdcall RegLoadKeyA(long str str) advapi32.RegLoadKeyA +@ stdcall RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW +@ stdcall RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA +@ stdcall RegLoadMUIStringW(long wstr wstr long ptr long wstr) advapi32.RegLoadMUIStringW +@ stdcall RegNotifyChangeKeyValue(long long long long long) advapi32.RegNotifyChangeKeyValue +@ stdcall RegOpenCurrentUser(long ptr) advapi32.RegOpenCurrentUser +@ stdcall RegOpenKeyExA(long str long long ptr) advapi32.RegOpenKeyExA +@ stdcall RegOpenKeyExW(long wstr long long ptr) advapi32.RegOpenKeyExW +@ stdcall RegOpenUserClassesRoot(ptr long long ptr) advapi32.RegOpenUserClassesRoot +@ stdcall RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyA +@ stdcall RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyW +@ stdcall RegQueryValueExA(long str ptr ptr ptr ptr) advapi32.RegQueryValueExA +@ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) advapi32.RegQueryValueExW +@ stdcall RegRestoreKeyA(long str long) advapi32.RegRestoreKeyA +@ stdcall RegRestoreKeyW(long wstr long) advapi32.RegRestoreKeyW +@ stub RegSaveKeyExA +@ stub RegSaveKeyExW +@ stdcall RegSetKeySecurity(long long ptr) advapi32.RegSetKeySecurity +@ stdcall RegSetValueExA(long str long long ptr long) advapi32.RegSetValueExA +@ stdcall RegSetValueExW(long wstr long long ptr long) advapi32.RegSetValueExW +@ stdcall RegUnLoadKeyA(long str) advapi32.RegUnLoadKeyA +@ stdcall RegUnLoadKeyW(long wstr) advapi32.RegUnLoadKeyW diff --git a/tools/make_specfiles b/tools/make_specfiles index 44e0fa0..002d252 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -120,6 +120,7 @@ my @dll_groups = ], [ "advapi32", + "api-ms-win-core-localregistry-l1-1-0", "api-ms-win-downlevel-advapi32-l1-1-0", "api-ms-win-downlevel-advapi32-l2-1-0", "api-ms-win-security-base-l1-1-0",

1 0

Jason Edmeades : cmd: set "var=value" ignores trailing characters.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 56a33a8c558f6b37bf219e289e48cb514cf697fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=56a33a8c558f6b37bf219e289… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Jun 3 22:38:15 2013 +0100 cmd: set "var=value" ignores trailing characters. --- programs/cmd/builtins.c | 19 +++++++++++++++---- programs/cmd/tests/test_builtins.cmd | 18 ++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 7 +++++++ programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 9 ++++++--- 5 files changed, 47 insertions(+), 8 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 3c06e13..c2ccdc8 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4038,8 +4038,13 @@ void WCMD_setshow_env (WCHAR *s) { s += 2; while (*s && (*s==' ' || *s=='\t')) s++; - if (*s=='\"') - WCMD_strip_quotes(s); + /* set /P "var=value"jim ignores anything after the last quote */ + if (*s=='\"') { + WCHAR *lastquote; + lastquote = WCMD_strip_quotes(s); + if (lastquote) *lastquote = 0x00; + WINE_TRACE("set: Stripped command line '%s'\n", wine_dbgstr_w(s)); + } /* If no parameter, or no '=' sign, return an error */ if (!(*s) || ((p = strchrW (s, '=')) == NULL )) { @@ -4104,8 +4109,14 @@ void WCMD_setshow_env (WCHAR *s) { } else { DWORD gle; - if (*s=='\"') - WCMD_strip_quotes(s); + /* set "var=value"jim ignores anything after the last quote */ + if (*s=='\"') { + WCHAR *lastquote; + lastquote = WCMD_strip_quotes(s); + if (lastquote) *lastquote = 0x00; + WINE_TRACE("set: Stripped command line '%s'\n", wine_dbgstr_w(s)); + } + p = strchrW (s, '='); if (p == NULL) { env = GetEnvironmentStringsW(); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 45617cf..48a8362 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -286,6 +286,24 @@ set WINE_FOO=foo(a)space@ echo '%WINE_FOO%' set WINE_FOO=foo(a)tab@ echo '%WINE_FOO%' +rem Space symbol must appear in `var` +set WINE_FOO=value(a)space@ +echo '%WINE_FOO%' +rem Space symbol must NOT appear in `var` +set "WINE_FOO=value"@space@ +echo '%WINE_FOO%' +rem Mixed examples: +set WINE_FOO=jim fred +echo '%WINE_FOO%' +set WINE_FOO="jim" fred +echo '%WINE_FOO%' +set "WINE_FOO=jim fred" +echo '%WINE_FOO%' +set "WINE_FOO=jim" fred +echo '%WINE_FOO%' +rem Only the final quote ends the string +set "WINE_FOO=apple"banana"grape"orange +echo '%WINE_FOO%' set WINE_FOO= echo ------------ Testing variable expansion ------------ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 99ed738..77e4178 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -251,6 +251,13 @@ foo '' 'foo(a)space@' 'foo(a)tab@' +'value(a)space@' +'value' +'jim fred' +'"jim" fred' +'jim fred' +'jim' +'apple"banana"grape' ------------ Testing variable expansion ------------ ~dp0 should be directory containing batch file @pwd@\ diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 418f8c9..e5a0138 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -115,7 +115,7 @@ BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute); void WCMD_splitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); -void WCMD_strip_quotes(WCHAR *cmd); +WCHAR *WCMD_strip_quotes(WCHAR *cmd); WCHAR *WCMD_LoadMessage(UINT id); void WCMD_strsubstW(WCHAR *start, const WCHAR* next, const WCHAR* insert, int len); BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 876bbef..0d4575b 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -496,20 +496,23 @@ BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr) { /************************************************************************* * WCMD_strip_quotes * - * Remove first and last quote WCHARacters, preserving all other text + * Remove first and last quote WCHARacters, preserving all other text + * Returns the location of the final quote */ -void WCMD_strip_quotes(WCHAR *cmd) { - WCHAR *src = cmd + 1, *dest = cmd, *lastq = NULL; +WCHAR *WCMD_strip_quotes(WCHAR *cmd) { + WCHAR *src = cmd + 1, *dest = cmd, *lastq = NULL, *lastquote; while((*dest=*src) != '\0') { if (*src=='\"') lastq=dest; dest++, src++; } + lastquote = lastq; if (lastq) { dest=lastq++; while ((*dest++=*lastq++) != 0) ; } + return lastquote; }

1 0

Jason Edmeades : cmd: Fix 'for' expansion of wildcards when no args are supplied.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: a5b1172e90de94234b2799d26ccc36a752bdd7eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b1172e90de94234b2799d26… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Jun 4 00:29:51 2013 +0100 cmd: Fix 'for' expansion of wildcards when no args are supplied. --- programs/cmd/builtins.c | 8 ++++++-- programs/cmd/tests/test_builtins.cmd | 17 ++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 12 ++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index c2ccdc8..aa1e7d4 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2237,6 +2237,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { if (!useNumbers && !doFileset) { WCHAR fullitem[MAX_PATH]; + int prefixlen = 0; /* Now build the item to use / search for in the specified directory, as it is fully qualified in the /R case */ @@ -2245,11 +2246,12 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { strcatW(fullitem, slashW); strcatW(fullitem, item); } else { + WCHAR *prefix = strrchrW(item, '\\'); + if (prefix) prefixlen = (prefix - item) + 1; strcpyW(fullitem, item); } if (strpbrkW (fullitem, wildcards)) { - hff = FindFirstFileW(fullitem, &fd); if (hff != INVALID_HANDLE_VALUE) { do { @@ -2270,7 +2272,9 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { strcatW(fullitem, slashW); strcatW(fullitem, fd.cFileName); } else { - strcpyW(fullitem, fd.cFileName); + if (prefixlen) lstrcpynW(fullitem, item, prefixlen + 1); + fullitem[prefixlen] = 0x00; + strcatW(fullitem, fd.cFileName); } doExecuted = TRUE; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 48a8362..78f7cdc 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1017,7 +1017,22 @@ for /R %%i in (baz* fred* jim) do call temp.bat %%i call :ValidateExpected echo for /R passed -cd .. & rd /s/Q foobar +echo --- Complex wildcards unix and windows slash +cd .. +echo Windows slashs, valid path +for %%f in (foobar\baz\bazbaz) do echo ASIS: %%f +for %%f in (foobar\baz\*) do echo WC : %%f +echo Windows slashs, invalid path +for %%f in (foobar\jim\bazbaz) do echo ASIS: %%f +for %%f in (foobar\jim\*) do echo WC : %%f +echo Unix slashs, valid path +for %%f in (foobar/baz/bazbaz) do echo ASIS: %%f +for %%f in (foobar/baz/*) do echo WC : %%f +echo Unix slashs, invalid path +for %%f in (foobar/jim/bazbaz) do echo ASIS: %%f +for %%f in (foobar/jim/*) do echo WC : %%f +echo Done +rd /s/Q foobar echo --- for /L rem Some cases loop forever writing 0s, like e.g. (1,0,1), (1,a,3) or (a,b,c); those can't be tested here for /L %%i in (1,2,0) do echo %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 77e4178..7380185 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -691,6 +691,18 @@ Mixed enumeration from provided root With duplicates enumeration Strip missing wildcards, keep unwildcarded names for /R passed +--- Complex wildcards unix and windows slash +Windows slashs, valid path +ASIS: foobar\baz\bazbaz +WC : foobar\baz\bazbaz +Windows slashs, invalid path +ASIS: foobar\jim\bazbaz +Unix slashs, valid path +ASIS: foobar/baz/bazbaz +WC : bazbaz +Unix slashs, invalid path +ASIS: foobar/jim/bazbaz +Done --- for /L 1 3

1 0

Jason Edmeades : cmd: Avoid infinite loop running batch program.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: dd0b719a3a1419f34774fc4cd921f3378d8c237b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0b719a3a1419f34774fc4cd… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Jun 4 21:27:48 2013 +0100 cmd: Avoid infinite loop running batch program. --- programs/cmd/tests/test_cmdline.cmd | 8 +++++++- programs/cmd/tests/test_cmdline.cmd.exp | 1 + programs/cmd/wcmdmain.c | 21 +++++---------------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/programs/cmd/tests/test_cmdline.cmd b/programs/cmd/tests/test_cmdline.cmd index e563341..32a1ef2 100644 --- a/programs/cmd/tests/test_cmdline.cmd +++ b/programs/cmd/tests/test_cmdline.cmd @@ -95,6 +95,7 @@ echo @echo 1 > "say one.bat" echo @echo 2 > "saytwo.bat" echo @echo 3 > "say (3).bat" echo @echo 4 > "say .bat" +echo @echo 5 > "bazbaz(5).bat" echo ------ Testing invocation of batch files ---------- call say one @@ -144,6 +145,11 @@ if errorlevel 2 echo error %ErrorLevel% call :setError 0 cmd /c say" "(3) prints 4?! if errorlevel 2 echo error %ErrorLevel% +call :setError 0 +rem Deliberately invoking a fully qualified batch name containing a bracket +rem should fail, as a bracket is a command delimiter. +cmd /c "bazbaz(5).bat" +if errorlevel 1 echo Passed echo ---------- Testing CMD /C quoting ----------------- cmd /c @echo "hi" @@ -261,7 +267,7 @@ call tell(1234) call tell(12(34) call tell(12;34) echo --------- Finished -------------- -del tell.bat say*.* +del tell.bat say*.* bazbaz*.bat exit :setError exit /B %1 diff --git a/programs/cmd/tests/test_cmdline.cmd.exp b/programs/cmd/tests/test_cmdline.cmd.exp index 38e17a5..980f674 100644 --- a/programs/cmd/tests/test_cmdline.cmd.exp +++ b/programs/cmd/tests/test_cmdline.cmd.exp @@ -70,6 +70,7 @@ var=33(a)space@ 0(a)space@ 3(a)space@ 4(a)space@ +Passed ---------- Testing CMD /C quoting ----------------- "hi" 1(a)space@ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0d4575b..a211efa 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1048,7 +1048,6 @@ void WCMD_run_program (WCHAR *command, BOOL called) BOOL extensionsupplied = FALSE; BOOL launched = FALSE; BOOL status; - BOOL assumeInternal = FALSE; DWORD len; static const WCHAR envPath[] = {'P','A','T','H','\0'}; static const WCHAR delims[] = {'/','\\',':','\0'}; @@ -1168,20 +1167,8 @@ void WCMD_run_program (WCHAR *command, BOOL called) } } - /* Internal programs won't be picked up by this search, so even - though not found, try one last createprocess and wait for it - to complete. - Note: Ideally we could tell between a console app (wait) and a - windows app, but the API's for it fail in this case */ - if (!found && pathposn == NULL) { - WINE_TRACE("ASSUMING INTERNAL\n"); - assumeInternal = TRUE; - } else { - WINE_TRACE("Found as %s\n", wine_dbgstr_w(thisDir)); - } - /* Once found, launch it */ - if (found || assumeInternal) { + if (found) { STARTUPINFOW st; PROCESS_INFORMATION pe; SHFILEINFOW psfi; @@ -1191,6 +1178,8 @@ void WCMD_run_program (WCHAR *command, BOOL called) static const WCHAR batExt[] = {'.','b','a','t','\0'}; static const WCHAR cmdExt[] = {'.','c','m','d','\0'}; + WINE_TRACE("Found as %s\n", wine_dbgstr_w(thisDir)); + /* Special case BAT and CMD */ if (ext && (!strcmpiW(ext, batExt) || !strcmpiW(ext, cmdExt))) { BOOL oldinteractive = interactive; @@ -1214,7 +1203,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Launch the process and if a CUI wait on it to complete Note: Launching internal wine processes cannot specify a full path to exe */ - status = CreateProcessW(assumeInternal?NULL : thisDir, + status = CreateProcessW(thisDir, command, NULL, NULL, TRUE, 0, NULL, NULL, &st, &pe); heap_free(st.lpReserved2); if ((opt_c || opt_k) && !opt_s && !status @@ -1231,7 +1220,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Always wait when non-interactive (cmd /c or in batch program), or for console applications */ - if (assumeInternal || !interactive || (console && !HIWORD(console))) + if (!interactive || (console && !HIWORD(console))) WaitForSingleObject (pe.hProcess, INFINITE); GetExitCodeProcess (pe.hProcess, &errorlevel); if (errorlevel == STILL_ACTIVE) errorlevel = 0;

1 0

Alistair Leslie-Hughes : dbs.idl: Add missing DBPROPNUM* enums.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 06db5a986d3d37e58a9553c98eb50528f0b1ffe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06db5a986d3d37e58a9553c98… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 4 09:48:39 2013 +1000 dbs.idl: Add missing DBPROPNUM* enums. --- include/dbs.idl | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index 46d55ad..a517bf2 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -347,6 +347,112 @@ enum DBPROPENUM DBPROP_NOTIFYROWSETCHANGED = 0x000000d3, }; +enum DBPROPENUM15 { + DBPROP_FILTERCOMPAREOPS = 0x000000d1, + DBPROP_FINDCOMPAREOPS = 0x000000d2, + DBPROP_IChapteredRowset = 0x000000ca, + DBPROP_IDBAsynchStatus = 0x000000cb, + DBPROP_IRowsetFind = 0x000000cc, + DBPROP_IRowsetView = 0x000000d4, + DBPROP_IViewChapter = 0x000000d5, + DBPROP_IViewFilter = 0x000000d6, + DBPROP_IViewRowset = 0x000000d7, + DBPROP_IViewSort = 0x000000d8, + DBPROP_INIT_ASYNCH = 0x000000c8, + DBPROP_MAXOPENCHAPTERS = 0x000000c7, + DBPROP_MAXORSINFILTER = 0x000000cd, + DBPROP_MAXSORTCOLUMNS = 0x000000ce, + DBPROP_ROWSET_ASYNCH = 0x000000c9, + DBPROP_SORTONINDEX = 0x000000cf +}; + +enum DBPROPENUM20 { + DBPROP_IMultipleResults = 0x000000d9, + DBPROP_DATASOURCE_TYPE = 0x000000fb, + MDPROP_AXES = 0x000000fc, + MDPROP_FLATTENING_SUPPORT = 0x000000fd, + MDPROP_MDX_JOINCUBES = 0x000000fe, + MDPROP_NAMED_LEVELS = 0x000000ff, + MDPROP_RANGEROWSET = 0x00000100, + MDPROP_MDX_SLICER = 0x000000da, + MDPROP_MDX_CUBEQUALIFICATION = 0x000000db, + MDPROP_MDX_OUTERREFERENCE = 0x000000dc, + MDPROP_MDX_QUERYBYPROPERTY = 0x000000dd, + MDPROP_MDX_CASESUPPORT = 0x000000de, + MDPROP_MDX_STRING_COMPOP = 0x000000e0, + MDPROP_MDX_DESCFLAGS = 0x000000e1, + MDPROP_MDX_SET_FUNCTIONS = 0x000000e2, + MDPROP_MDX_MEMBER_FUNCTIONS = 0x000000e3, + MDPROP_MDX_NUMERIC_FUNCTIONS = 0x000000e4, + MDPROP_MDX_FORMULAS = 0x000000e5, + MDPROP_AGGREGATECELL_UPDATE = 0x000000e6, + MDPROP_MDX_AGGREGATECELL_UPDATE = MDPROP_AGGREGATECELL_UPDATE, + MDPROP_MDX_OBJQUALIFICATION = 0x00000105, + MDPROP_MDX_NONMEASURE_EXPRESSIONS = 0x00000106, + DBPROP_ACCESSORDER = 0x000000e7, + DBPROP_BOOKMARKINFO = 0x000000e8, + DBPROP_INIT_CATALOG = 0x000000e9, + DBPROP_ROW_BULKOPS = 0x000000ea, + DBPROP_PROVIDERFRIENDLYNAME = 0x000000eb, + DBPROP_LOCKMODE = 0x000000ec, + DBPROP_MULTIPLECONNECTIONS = 0x000000ed, + DBPROP_UNIQUEROWS = 0x000000ee, + DBPROP_SERVERDATAONINSERT = 0x000000ef, + DBPROP_STORAGEFLAGS = 0x000000f0, + DBPROP_CONNECTIONSTATUS = 0x000000f4, + DBPROP_ALTERCOLUMN = 0x000000f5, + DBPROP_COLUMNLCID = 0x000000f6, + DBPROP_RESETDATASOURCE = 0x000000f7, + DBPROP_INIT_OLEDBSERVICES = 0x000000f8, + DBPROP_IRowsetRefresh = 0x000000f9, + DBPROP_SERVERNAME = 0x000000fa, + DBPROP_IParentRowset = 0x00000101, + DBPROP_HIDDENCOLUMNS = 0x00000102, + DBPROP_PROVIDERMEMORY = 0x00000103, + DBPROP_CLIENTCURSOR = 0x00000104 +}; + + +enum DBPROPENUM21 { + DBPROP_TRUSTEE_USERNAME = 0x000000f1, + DBPROP_TRUSTEE_AUTHENTICATION = 0x000000f2, + DBPROP_TRUSTEE_NEWAUTHENTICATION = 0x000000f3, + DBPROP_IRow = 0x00000107, + DBPROP_IRowChange = 0x00000108, + DBPROP_IRowSchemaChange = 0x00000109, + DBPROP_IGetRow = 0x0000010a, + DBPROP_IScopedOperations = 0x0000010b, + DBPROP_IBindResource = 0x0000010c, + DBPROP_ICreateRow = 0x0000010d, + DBPROP_INIT_BINDFLAGS = 0x0000010e, + DBPROP_INIT_LOCKOWNER = 0x0000010f, + DBPROP_GENERATEURL = 0x00000111, + DBPROP_IDBBinderProperties = 0x00000112, + DBPROP_IColumnsInfo2 = 0x00000113, + DBPROP_IRegisterProvider = 0x00000114, + DBPROP_IGetSession = 0x00000115, + DBPROP_IGetSourceRow = 0x00000116, + DBPROP_IRowsetCurrentIndex = 0x00000117, + DBPROP_OPENROWSETSUPPORT = 0x00000118, + DBPROP_COL_ISLONG = 0x00000119 +}; + +enum DBPROPENUM25 { + DBPROP_COL_SEED = 0x0000011a, + DBPROP_COL_INCREMENT = 0x0000011b, + DBPROP_INIT_GENERALTIMEOUT = 0x0000011c, + DBPROP_COMSERVICES = 0x0000011d +}; + +enum DBPROPENUM26 { + DBPROP_OUTPUTSTREAM = 0x0000011e, + DBPROP_OUTPUTENCODING = 0x0000011f, + DBPROP_TABLESTATISTICS = 0x00000120, + DBPROP_SKIPROWCOUNTRESULTS = 0x00000123, + DBPROP_IRowsetBookmark = 0x00000124, + MDPROP_VISUALMODE = 0x00000125, +}; + cpp_quote("#ifdef DBINITCONSTANTS") cpp_quote("#ifdef __cplusplus") cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\")

1 0

Alistair Leslie-Hughes : oledb32: Support more default properties.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 7f1473ac59ef434a42c13e87373f5bf24456a496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1473ac59ef434a42c13e873… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 3 16:26:32 2013 +1000 oledb32: Support more default properties. --- dlls/oledb32/datainit.c | 30 +++++++++++++++++++++++++++--- dlls/oledb32/tests/Makefile.in | 2 +- dlls/oledb32/tests/database.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 62e2e50..b6ba0e1 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -296,12 +296,36 @@ struct dbproperty { VARTYPE type; }; +static const WCHAR conn_timeout[] = {'C','o','n','n','e','c','t',' ','T','i','m','e','o','u','t',0}; static const WCHAR datasourceW[] = {'D','a','t','a',' ','S','o','u','r','c','e',0}; -static const WCHAR persistsiW[] = {'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o',0}; +static const WCHAR extemdedW[] = {'E','x','t','e','n','d','e','d',' ','P','r','o','p','e','r','t','i','e','s',0}; +static const WCHAR gen_timeout[] = {'G','e','n','e','r','a','l',' ','T','i','m','e','o','u','t',0}; +static const WCHAR initcatW[] = {'I','n','i','t','i','a','l',' ','C','a','t','a','l','o','g',0}; +static const WCHAR localeIDW[] = {'L','o','c','a','l','e',' ','I','d','e','n','t','i','f','i','e','r',0}; +static const WCHAR locationW[] = {'L','o','c','a','t','i','o','n',0}; +static const WCHAR modeW[] = {'M','o','d','e',0}; +static const WCHAR oledbservW[] = {'O','L','E',' ','D','B',' ','S','e','r','v','i','c','i','e','s',0}; +static const WCHAR passwordW[] = {'P','a','s','s','w','o','r','d',0}; +static const WCHAR persiststW[] = {'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o',0}; +static const WCHAR promptW[] = {'P','r','o','m','p','t',0}; +static const WCHAR useridW[] = {'U','s','e','r',' ','I','D',0}; +static const WCHAR winhandleW[] = {'W','i','n','d','o','w',' ','H','a','n','d','l','e',0}; static const struct dbproperty dbproperties[] = { - { datasourceW, DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, - { persistsiW, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL } + { conn_timeout,DBPROP_INIT_TIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { datasourceW, DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { extemdedW, DBPROP_INIT_PROVIDERSTRING, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { gen_timeout, DBPROP_INIT_GENERALTIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { initcatW, DBPROP_CATALOGLOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { localeIDW, DBPROP_INIT_LCID, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { locationW, DBPROP_INIT_LOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { modeW, DBPROP_INIT_MODE, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { oledbservW, DBPROP_INIT_OLEDBSERVICES, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { passwordW, DBPROP_AUTH_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { persiststW, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, + { promptW, DBPROP_INIT_PROMPT, DBPROPOPTIONS_OPTIONAL, VT_I2 }, + { useridW, DBPROP_AUTH_USERID, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { winhandleW, DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, VT_I4 }, }; static HRESULT set_dbpropset(BSTR name, BSTR value, DBPROPSET **propset) diff --git a/dlls/oledb32/tests/Makefile.in b/dlls/oledb32/tests/Makefile.in index 07a4892..bb1f0b3 100644 --- a/dlls/oledb32/tests/Makefile.in +++ b/dlls/oledb32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = oledb32.dll -IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32 +IMPORTS = uuid shell32 oleaut32 ole32 user32 gdi32 advapi32 C_SRCS = \ convert.c \ diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index d744c86..518bba7 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -27,6 +27,7 @@ #include "ole2.h" #include "msdadc.h" #include "msdasc.h" +#include "shlobj.h" #include "wine/test.h" @@ -36,6 +37,8 @@ static void test_GetDataSource(WCHAR *initstring) IDBInitialize *dbinit = NULL; HRESULT hr; + trace("Data Source: %s\n", wine_dbgstr_w(initstring)); + hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit); ok(hr == S_OK, "got %08x\n", hr); @@ -44,11 +47,43 @@ static void test_GetDataSource(WCHAR *initstring) if(SUCCEEDED(hr)) { IDBProperties *props = NULL; + IMalloc *ppM = NULL; + + hr = SHGetMalloc(&ppM); + if (FAILED(hr)) + { + ok(0, "Couldn't get IMalloc object.\n"); + goto end; + } hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBProperties, (void**)&props); ok(hr == S_OK, "got %08x\n", hr); if(SUCCEEDED(hr)) + { + ULONG cnt; + DBPROPINFOSET *pInfoset; + OLECHAR *ary; + + hr = IDBProperties_GetPropertyInfo(props, 0, NULL, &cnt, &pInfoset, &ary); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + { + ULONG i; + for(i =0; i < pInfoset->cPropertyInfos; i++) + { + trace("(0x%04x) '%s' %d\n", pInfoset->rgPropertyInfos[i].dwPropertyID, wine_dbgstr_w(pInfoset->rgPropertyInfos[i].pwszDescription), + pInfoset->rgPropertyInfos[i].vtType); + } + + IMalloc_Free(ppM, ary); + } + IDBProperties_Release(props); + } + + IMalloc_Release(ppM); + +end: IDBInitialize_Release(dbinit); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_init().
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 1366e3a5bfd610d9702426a625ca7cc29bb0d91b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1366e3a5bfd610d9702426a62… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 5 11:06:10 2013 +0200 wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_init(). --- dlls/wined3d/texture.c | 74 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 55 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e4ef6e8..8cf9fc2 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -27,16 +27,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_texture_ops *texture_ops, - UINT layer_count, UINT level_count, enum wined3d_resource_type resource_type, struct wined3d_device *device, - DWORD usage, const struct wined3d_format *format, enum wined3d_pool pool, UINT width, UINT height, UINT depth, + UINT layer_count, UINT level_count, const struct wined3d_resource_desc *desc, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) { + const struct wined3d_format *format = wined3d_get_format(&device->adapter->gl_info, desc->format); HRESULT hr; - hr = resource_init(&texture->resource, device, resource_type, format, - WINED3D_MULTISAMPLE_NONE, 0, usage, pool, width, height, depth, 0, - parent, parent_ops, resource_ops); - if (FAILED(hr)) + TRACE("texture %p, texture_ops %p, layer_count %u, level_count %u, resource_type %s, format %s, " + "multisample_type %#x, multisample_quality %#x, usage %s, pool %s, width %u, height %u, depth %u, " + "device %p, parent %p, parent_ops %p, resource_ops %p.\n", + texture, texture_ops, layer_count, level_count, debug_d3dresourcetype(desc->resource_type), + debug_d3dformat(desc->format), desc->multisample_type, desc->multisample_quality, + debug_d3dusage(desc->usage), debug_d3dpool(desc->pool), desc->width, desc->height, desc->depth, + device, parent, parent_ops, resource_ops); + + if (FAILED(hr = resource_init(&texture->resource, device, desc->resource_type, format, + desc->multisample_type, desc->multisample_quality, desc->usage, desc->pool, + desc->width, desc->height, desc->depth, 0, parent, parent_ops, resource_ops))) { WARN("Failed to initialize resource, returning %#x\n", hr); return hr; @@ -54,7 +61,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->layer_count = layer_count; texture->level_count = level_count; - texture->filter_type = (usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3D_TEXF_LINEAR : WINED3D_TEXF_NONE; + texture->filter_type = (desc->usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3D_TEXF_LINEAR : WINED3D_TEXF_NONE; texture->lod = 0; texture->texture_rgb.dirty = TRUE; texture->texture_srgb.dirty = TRUE; @@ -759,7 +766,6 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, UINT edge_lengt void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); struct wined3d_resource_desc desc; unsigned int i, j; HRESULT hr; @@ -822,8 +828,19 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, UINT edge_lengt } } - if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 6, levels, WINED3D_RTYPE_CUBE_TEXTURE, device, - usage, format, pool, edge_length, edge_length, 1, parent, parent_ops, &texture2d_resource_ops))) + desc.resource_type = WINED3D_RTYPE_CUBE_TEXTURE; + desc.format = format_id; + desc.multisample_type = WINED3D_MULTISAMPLE_NONE; + desc.multisample_quality = 0; + desc.usage = usage; + desc.pool = pool; + desc.width = edge_length; + desc.height = edge_length; + desc.depth = 1; + desc.size = 0; + + if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 6, levels, + &desc, device, parent, parent_ops, &texture2d_resource_ops))) { WARN("Failed to initialize texture, returning %#x\n", hr); return hr; @@ -836,7 +853,6 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, UINT edge_lengt texture->target = GL_TEXTURE_CUBE_MAP_ARB; /* Generate all the surfaces. */ - wined3d_resource_get_desc(&texture->resource, &desc); desc.resource_type = WINED3D_RTYPE_SURFACE; for (i = 0; i < texture->level_count; ++i) { @@ -880,7 +896,6 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); struct wined3d_resource_desc desc; UINT pow2_width, pow2_height; unsigned int i; @@ -948,8 +963,19 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he TRACE("Calculated levels = %u.\n", levels); } - if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, WINED3D_RTYPE_TEXTURE, device, - usage, format, pool, width, height, 1, parent, parent_ops, &texture2d_resource_ops))) + desc.resource_type = WINED3D_RTYPE_TEXTURE; + desc.format = format_id; + desc.multisample_type = WINED3D_MULTISAMPLE_NONE; + desc.multisample_quality = 0; + desc.usage = usage; + desc.pool = pool; + desc.width = width; + desc.height = height; + desc.depth = 1; + desc.size = 0; + + if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, + &desc, device, parent, parent_ops, &texture2d_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr; @@ -970,7 +996,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he texture->min_mip_lookup = minMipLookup_noFilter; } else if (gl_info->supported[ARB_TEXTURE_RECTANGLE] && (width != pow2_width || height != pow2_height) - && !(format->id == WINED3DFMT_P8_UINT && gl_info->supported[EXT_PALETTED_TEXTURE] + && !(format_id == WINED3DFMT_P8_UINT && gl_info->supported[EXT_PALETTED_TEXTURE] && wined3d_settings.rendertargetlock_mode == RTL_READTEX)) { texture->pow2_matrix[0] = (float)width; @@ -1007,7 +1033,6 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he TRACE("xf(%f) yf(%f)\n", texture->pow2_matrix[0], texture->pow2_matrix[5]); /* Generate all the surfaces. */ - wined3d_resource_get_desc(&texture->resource, &desc); desc.resource_type = WINED3D_RTYPE_SURFACE; for (i = 0; i < texture->level_count; ++i) { @@ -1152,7 +1177,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, UINT width, U enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); + struct wined3d_resource_desc desc; UINT tmp_w, tmp_h, tmp_d; unsigned int i; HRESULT hr; @@ -1219,8 +1244,19 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, UINT width, U } } - if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, levels, WINED3D_RTYPE_VOLUME_TEXTURE, device, - usage, format, pool, width, height, depth, parent, parent_ops, &texture3d_resource_ops))) + desc.resource_type = WINED3D_RTYPE_VOLUME_TEXTURE; + desc.format = format_id; + desc.multisample_type = WINED3D_MULTISAMPLE_NONE; + desc.multisample_quality = 0; + desc.usage = usage; + desc.pool = pool; + desc.width = width; + desc.height = height; + desc.depth = depth; + desc.size = 0; + + if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, levels, + &desc, device, parent, parent_ops, &texture3d_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr;

1 0