wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Alexandre Julliard : kernel32/tests: Add tests for QueryActCtxSettingsW.
by Alexandre Julliard 24 Mar '18

24 Mar '18

Module: wine Branch: master Commit: 678c5544c15352411dfdb5c717834724f21d8c5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=678c5544c15352411dfdb5c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 23 09:14:21 2018 +0100 kernel32/tests: Add tests for QueryActCtxSettingsW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 88 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 9aa081f..b63abac 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -38,6 +38,7 @@ static BOOL (WINAPI *pFindActCtxSectionStringW)(DWORD,const GUID *,ULONG,LPCWS static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); static BOOL (WINAPI *pIsDebuggerPresent)(void); static BOOL (WINAPI *pQueryActCtxW)(DWORD,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*); +static BOOL (WINAPI *pQueryActCtxSettingsW)(DWORD,HANDLE,LPCWSTR,LPCWSTR,LPWSTR,SIZE_T,SIZE_T*); static VOID (WINAPI *pReleaseActCtx)(HANDLE); static BOOL (WINAPI *pFindActCtxSectionGuid)(DWORD,const GUID*,ULONG,const GUID*,PACTCTX_SECTION_KEYED_DATA); static BOOL (WINAPI *pZombifyActCtx)(HANDLE); @@ -457,6 +458,16 @@ static const char compat_manifest_other_guid[] = " </compatibility>" "</assembly>"; +static const char settings_manifest[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +" <assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>" +" <application xmlns=\"urn:schemas-microsoft-com:asm.v3\">" +" <windowsSettings>" +" <dpiAware xmlns=\"http://schemas.microsoft.com/SMI/2005/WindowsSettings\">true</dpiAware>" +" </windowsSettings>" +" </application>" +"</assembly>"; + DEFINE_GUID(VISTA_COMPAT_GUID, 0xe2011457, 0x1546, 0x43c5, 0xa5, 0xfe, 0x00, 0x8d, 0xee, 0xe3, 0xd3, 0xf0); DEFINE_GUID(WIN7_COMPAT_GUID, 0x35138b9a, 0x5d96, 0x4fbd, 0x8e, 0x2d, 0xa2, 0x44, 0x02, 0x25, 0xf9, 0x3a); DEFINE_GUID(WIN8_COMPAT_GUID, 0x4a2f28e3, 0x53b9, 0x4441, 0xba, 0x9c, 0xd6, 0x9d, 0x4a, 0x4a, 0x6e, 0x38); @@ -2695,6 +2706,7 @@ static BOOL init_funcs(void) X(ReleaseActCtx); X(FindActCtxSectionGuid); X(ZombifyActCtx); + pQueryActCtxSettingsW = (void *)GetProcAddress( hLibrary, "QueryActCtxSettingsW" ); hLibrary = GetModuleHandleA("ntdll.dll"); X(RtlFindActivationContextSectionString); @@ -2949,6 +2961,81 @@ static void test_compatibility(void) } } +static void test_settings(void) +{ + static const WCHAR dpiAwareW[] = {'d','p','i','A','w','a','r','e',0}; + static const WCHAR dummyW[] = {'d','u','m','m','y',0}; + static const WCHAR trueW[] = {'t','r','u','e',0}; + static const WCHAR namespaceW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0','0','5','/','W','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; + WCHAR buffer[80]; + SIZE_T size; + HANDLE handle; + BOOL ret; + + if (!pQueryActCtxSettingsW) + { + win_skip( "QueryActCtxSettingsW is missing\n" ); + return; + } + create_manifest_file( "manifest_settings.manifest", settings_manifest, -1, NULL, NULL ); + handle = test_create("manifest_settings.manifest"); + ok( handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError() ); + DeleteFileA( "manifest_settings.manifest" ); + + SetLastError( 0xdeadbeef ); + ret = pQueryActCtxSettingsW( 1, handle, NULL, dpiAwareW, buffer, 80, &size ); + ok( !ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pQueryActCtxSettingsW( 0, handle, dummyW, dpiAwareW, buffer, 80, &size ); + ok( !ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwareW, buffer, 80, &size ); + ok( ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( size == lstrlenW( buffer ) + 1, "wrong len %lu\n", size ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, NULL, dummyW, buffer, 80, &size ); + ok( !ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( GetLastError() == ERROR_SXS_KEY_NOT_FOUND, "wrong error %u\n", GetLastError() ); + ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, namespaceW, dpiAwareW, buffer, 80, &size ); + ok( ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( size == sizeof(trueW)/sizeof(WCHAR), "wrong len %lu\n", size ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, namespaceW, dpiAwareW, buffer, lstrlenW(trueW) + 1, &size ); + ok( ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( size == sizeof(trueW)/sizeof(WCHAR), "wrong len %lu\n", size ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwareW, buffer, lstrlenW(trueW), &size ); + ok( ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( size == sizeof(trueW)/sizeof(WCHAR), "wrong len %lu\n", size ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwareW, buffer, lstrlenW(trueW) - 1, &size ); + ok( !ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %u\n", GetLastError() ); + ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); + ok( size == sizeof(trueW)/sizeof(WCHAR), "wrong len %lu\n", size ); + pReleaseActCtx(handle); +} + START_TEST(actctx) { int argc; @@ -2975,4 +3062,5 @@ START_TEST(actctx) test_ZombifyActCtx(); run_child_process(); test_compatibility(); + test_settings(); }

1 0

Alexandre Julliard : kernel32: Implement QueryActCtxSettingsW.
by Alexandre Julliard 24 Mar '18

24 Mar '18

Module: wine Branch: master Commit: ff8471eb070179a093a9c57ecff9ee2c184206ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff8471eb070179a093a9c57e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 23 09:14:12 2018 +0100 kernel32: Implement QueryActCtxSettingsW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/actctx.c | 17 +++++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- include/winbase.h | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index 2eb1c2a..17067ed 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -309,3 +309,20 @@ BOOL WINAPI QueryActCtxW(DWORD dwFlags, HANDLE hActCtx, PVOID pvSubInst, } return TRUE; } + +/*********************************************************************** + * QueryActCtxSettingsW (KERNEL32.@) + */ +BOOL WINAPI QueryActCtxSettingsW( DWORD flags, HANDLE ctx, const WCHAR *ns, const WCHAR *settings, + WCHAR *buffer, SIZE_T size, SIZE_T *written ) +{ + NTSTATUS status; + + if ((status = RtlQueryActivationContextApplicationSettings( flags, ctx, ns, settings, + buffer, size, written ))) + { + SetLastError( RtlNtStatusToDosError( status )); + return FALSE; + } + return TRUE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index aae22eb..445b84f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1155,7 +1155,7 @@ @ stdcall PulseEvent(long) @ stdcall PurgeComm(long long) @ stdcall -i386 -private -norelay QT_Thunk() krnl386.exe16.QT_Thunk -# @ stub QueryActCtxSettingsW +@ stdcall QueryActCtxSettingsW(long ptr wstr wstr ptr long ptr) @ stdcall QueryActCtxW(long ptr ptr long ptr long ptr) @ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList @ stdcall QueryDosDeviceA(str ptr long) diff --git a/include/winbase.h b/include/winbase.h index c99993a..e31ebca 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2475,6 +2475,7 @@ WINADVAPI BOOL WINAPI PrivilegedServiceAuditAlarmW(LPCWSTR,LPCWSTR,HANDL #define PrivilegedServiceAuditAlarm WINELIB_NAME_AW(PrivilegedServiceAuditAlarm) WINBASEAPI BOOL WINAPI PulseEvent(HANDLE); WINBASEAPI BOOL WINAPI PurgeComm(HANDLE,DWORD); +WINBASEAPI BOOL WINAPI QueryActCtxSettingsW(DWORD,HANDLE,const WCHAR*,const WCHAR*,WCHAR*,SIZE_T,SIZE_T*); WINBASEAPI BOOL WINAPI QueryActCtxW(DWORD,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T *); WINBASEAPI USHORT WINAPI QueryDepthSList(PSLIST_HEADER); WINBASEAPI DWORD WINAPI QueryDosDeviceA(LPCSTR,LPSTR,DWORD);

1 0

Alexandre Julliard : ntdll: Implement RtlQueryActivationContextApplicationSettings.
by Alexandre Julliard 24 Mar '18

24 Mar '18

Module: wine Branch: master Commit: 14b9a5af0b44d7e2ca5232ad810c77e561d5d30c URL: https://source.winehq.org/git/wine.git/?a=commit;h=14b9a5af0b44d7e2ca5232ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 23 09:13:31 2018 +0100 ntdll: Implement RtlQueryActivationContextApplicationSettings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 1 + 3 files changed, 55 insertions(+) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index f8dd3fc..4dc0c98 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -4891,6 +4891,24 @@ static NTSTATUS find_guid(ACTIVATION_CONTEXT* actctx, ULONG section_kind, return STATUS_SUCCESS; } +static const WCHAR *find_app_settings( ACTIVATION_CONTEXT *actctx, const WCHAR *settings ) +{ + unsigned int i, j; + + for (i = 0; i < actctx->num_assemblies; i++) + { + struct assembly *assembly = &actctx->assemblies[i]; + for (j = 0; j < assembly->entities.num; j++) + { + struct entity *entity = &assembly->entities.base[j]; + if (entity->kind == ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS && + !strcmpW( entity->u.settings.name, settings )) + return entity->u.settings.value; + } + } + return NULL; +} + /* initialize the activation context for the current process */ void actctx_init(void) { @@ -5524,3 +5542,38 @@ NTSTATUS WINAPI RtlFindActivationContextSectionGuid( ULONG flags, const GUID *ex return status; } + + +/*********************************************************************** + * RtlQueryActivationContextApplicationSettings (NTDLL.@) + */ +NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings( DWORD flags, HANDLE handle, const WCHAR *ns, + const WCHAR *settings, WCHAR *buffer, + SIZE_T size, SIZE_T *written ) +{ + static const WCHAR namespaceW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0',0}; + ACTIVATION_CONTEXT *actctx = check_actctx( handle ); + const WCHAR *res; + + if (flags) + { + WARN( "unknown flags %08x\n", flags ); + return STATUS_INVALID_PARAMETER; + } + + if (ns && strncmpW( ns, namespaceW, strlenW(namespaceW) )) + { + WARN( "unknown namespace %s\n", debugstr_w(ns) ); + return STATUS_INVALID_PARAMETER; + } + + if (!handle) handle = process_actctx; + if (!(actctx = check_actctx( handle ))) return STATUS_INVALID_PARAMETER; + + if (!(res = find_app_settings( actctx, settings ))) return STATUS_SXS_KEY_NOT_FOUND; + + if (written) *written = strlenW(res) + 1; + if (size < strlenW(res)) return STATUS_BUFFER_TOO_SMALL; + strcpyW( buffer, res ); + return STATUS_SUCCESS; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 04e108c..0107932 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -803,6 +803,7 @@ @ stub RtlPropertySetNameToGuid @ stub RtlProtectHeap @ stdcall RtlPushFrame(ptr) +@ stdcall RtlQueryActivationContextApplicationSettings(long ptr wstr wstr ptr long ptr) @ stdcall RtlQueryAtomInAtomTable(ptr long ptr ptr ptr ptr) @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) diff --git a/include/winternl.h b/include/winternl.h index f01344c..ed54229 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2694,6 +2694,7 @@ NTSYSAPI void WINAPI RtlPopFrame(TEB_ACTIVE_FRAME*); NTSYSAPI BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); NTSYSAPI void WINAPI RtlPushFrame(TEB_ACTIVE_FRAME*); +NTSYSAPI NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings(DWORD,HANDLE,const WCHAR*,const WCHAR*,WCHAR*,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI RtlQueryAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM,ULONG*,ULONG*,WCHAR*,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlQueryDynamicTimeZoneInformation(RTL_DYNAMIC_TIME_ZONE_INFORMATION*); NTSYSAPI NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR,PUNICODE_STRING,PUNICODE_STRING);

1 0

Alexandre Julliard : ntdll: Add support for parsing application settings in manifests.
by Alexandre Julliard 24 Mar '18

24 Mar '18

Module: wine Branch: master Commit: fc14442970dc6b97032c3cdd76cab33d774dc1a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc14442970dc6b97032c3cdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 23 09:12:52 2018 +0100 ntdll: Add support for parsing application settings in manifests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 2 + 2 files changed, 129 insertions(+) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 14d71bc..f8dd3fc 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -464,6 +464,11 @@ struct entity WCHAR *clsid; WCHAR *version; } clrsurrogate; + struct + { + WCHAR *name; + WCHAR *value; + } settings; } u; }; @@ -546,6 +551,7 @@ struct actctx_loader static const WCHAR asmv1W[] = {'a','s','m','v','1',':',0}; static const WCHAR asmv2W[] = {'a','s','m','v','2',':',0}; +static const WCHAR asmv3W[] = {'a','s','m','v','3',':',0}; static const WCHAR assemblyW[] = {'a','s','s','e','m','b','l','y',0}; static const WCHAR assemblyIdentityW[] = {'a','s','s','e','m','b','l','y','I','d','e','n','t','i','t','y',0}; static const WCHAR bindingRedirectW[] = {'b','i','n','d','i','n','g','R','e','d','i','r','e','c','t',0}; @@ -635,6 +641,18 @@ static const WCHAR requestedExecutionLevelW[] = {'r','e','q','u','e','s','t','e' static const WCHAR requestedPrivilegesW[] = {'r','e','q','u','e','s','t','e','d','P','r','i','v','i','l','e','g','e','s',0}; static const WCHAR securityW[] = {'s','e','c','u','r','i','t','y',0}; static const WCHAR trustInfoW[] = {'t','r','u','s','t','I','n','f','o',0}; +static const WCHAR windowsSettingsW[] = {'w','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; +static const WCHAR autoElevateW[] = {'a','u','t','o','E','l','e','v','a','t','e',0}; +static const WCHAR disableThemingW[] = {'d','i','s','a','b','l','e','T','h','e','m','i','n','g',0}; +static const WCHAR disableWindowFilteringW[] = {'d','i','s','a','b','l','e','W','i','n','d','o','w','F','i','l','t','e','r','i','n','g',0}; +static const WCHAR dpiAwareW[] = {'d','p','i','A','w','a','r','e',0}; +static const WCHAR dpiAwarenessW[] = {'d','p','i','A','w','a','r','e','n','e','s','s',0}; +static const WCHAR gdiScalingW[] = {'g','d','i','S','c','a','l','i','n','g',0}; +static const WCHAR highResolutionScrollingAwareW[] = {'h','i','g','h','R','e','s','o','l','u','t','i','o','n','S','c','r','o','l','l','i','n','g','A','w','a','r','e',0}; +static const WCHAR longPathAwareW[] = {'l','o','n','g','P','a','t','h','A','w','a','r','e',0}; +static const WCHAR magicFutureSettingW[] = {'m','a','g','i','c','F','u','t','u','r','e','S','e','t','t','i','n','g',0}; +static const WCHAR printerDriverIsolationW[] = {'p','r','i','n','t','e','r','D','r','i','v','e','r','I','s','o','l','a','t','i','o','n',0}; +static const WCHAR ultraHighResolutionScrollingAwareW[] = {'u','l','t','r','a','H','i','g','h','R','e','s','o','l','u','t','i','o','n','S','c','r','o','l','l','i','n','g','A','w','a','r','e',0}; struct olemisc_entry { @@ -899,6 +917,10 @@ static void free_entity_array(struct entity_array *array) RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrsurrogate.clsid); RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrsurrogate.version); break; + case ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS: + RtlFreeHeap(GetProcessHeap(), 0, entity->u.settings.name); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.settings.value); + break; default: FIXME("Unknown entity kind %d\n", entity->kind); } @@ -2337,6 +2359,107 @@ static BOOL parse_compatibility_elem(xmlbuf_t* xmlbuf, struct assembly* assembly return ret; } +static BOOL parse_settings_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl, + xmlstr_t *parent ) +{ + xmlstr_t elem, content, attr_name, attr_value; + BOOL end = FALSE, ret = TRUE, error = FALSE; + struct entity *entity; + + while (next_xml_attr( xmlbuf, &attr_name, &attr_value, &error, &end )) + { + if (xmlstr_cmp( &attr_name, xmlnsW )) continue; + WARN( "unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), debugstr_xmlstr(&attr_value) ); + } + + if (error) return FALSE; + if (end) return TRUE; + + if (!parse_text_content( xmlbuf, &content )) return FALSE; + TRACE( "got %s %s\n", debugstr_xmlstr(parent), debugstr_xmlstr(&content) ); + + entity = add_entity( &assembly->entities, ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS ); + if (!entity) return FALSE; + entity->u.settings.name = xmlstrdupW( parent ); + entity->u.settings.value = xmlstrdupW( &content ); + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end( &elem, entity->u.settings.name )) + { + ret = parse_end_element( xmlbuf ); + break; + } + else + { + WARN( "unknown elem %s\n", debugstr_xmlstr(&elem) ); + ret = parse_unknown_elem( xmlbuf, &elem ); + } + } + return ret; +} + +static BOOL parse_windows_settings_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader *acl ) +{ + xmlstr_t elem; + BOOL ret = TRUE; + + while (ret && (ret = next_xml_elem( xmlbuf, &elem ))) + { + if (xmlstr_cmp_end( &elem, windowsSettingsW )) + { + ret = parse_end_element( xmlbuf ); + break; + } + else if (xmlstr_cmp( &elem, autoElevateW ) || + xmlstr_cmp( &elem, disableThemingW ) || + xmlstr_cmp( &elem, disableWindowFilteringW ) || + xmlstr_cmp( &elem, dpiAwareW ) || + xmlstr_cmp( &elem, dpiAwarenessW ) || + xmlstr_cmp( &elem, gdiScalingW ) || + xmlstr_cmp( &elem, highResolutionScrollingAwareW ) || + xmlstr_cmp( &elem, longPathAwareW ) || + xmlstr_cmp( &elem, magicFutureSettingW ) || + xmlstr_cmp( &elem, printerDriverIsolationW ) || + xmlstr_cmp( &elem, ultraHighResolutionScrollingAwareW )) + { + ret = parse_settings_elem( xmlbuf, assembly, acl, &elem ); + } + else + { + WARN( "unknown elem %s\n", debugstr_xmlstr(&elem) ); + ret = parse_unknown_elem( xmlbuf, &elem ); + } + } + return ret; +} + +static BOOL parse_application_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl) +{ + xmlstr_t elem; + BOOL ret = TRUE; + + while (ret && (ret = next_xml_elem( xmlbuf, &elem ))) + { + if (xmlstr_cmp_end( &elem, applicationW )) + { + ret = parse_end_element( xmlbuf ); + break; + } + else if (xmlstr_cmp( &elem, windowsSettingsW )) + { + ret = parse_windows_settings_elem( xmlbuf, assembly, acl ); + } + else + { + WARN( "unknown elem %s\n", debugstr_xmlstr(&elem) ); + ret = parse_unknown_elem( xmlbuf, &elem ); + } + } + return ret; +} + static BOOL parse_requested_execution_level_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader *acl) { static const WCHAR levelW[] = {'l','e','v','e','l',0}; @@ -2598,6 +2721,10 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, { ret = parse_compatibility_elem(xmlbuf, assembly, acl); } + else if (xml_elem_cmp(&elem, applicationW, asmv3W)) + { + ret = parse_application_elem(xmlbuf, assembly, acl); + } else { WARN("unknown element %s\n", debugstr_xmlstr(&elem)); diff --git a/include/winnt.h b/include/winnt.h index 3c19af9..16d96d8 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5807,6 +5807,8 @@ typedef enum _ACTIVATION_CONTEXT_INFO_CLASS { #define ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION 7 #define ACTIVATION_CONTEXT_SECTION_GLOBAL_OBJECT_RENAME_TABLE 8 #define ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES 9 +#define ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS 10 +#define ACTIVATION_CONTEXT_SECTION_COMPATIBILITY_INFO 11 typedef enum _JOBOBJECTINFOCLASS {

1 0

Francois Gouget : testbot: Standardize some pushes.
by Alexandre Julliard 23 Mar '18

23 Mar '18

Module: tools Branch: master Commit: f318eb5bd4c16c4cc833333d1c66836486e487ef URL: https://source.winehq.org/git/tools.git/?a=commit;h=f318eb5bd4c16c4cc833333… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 23 01:19:18 2018 +0100 testbot: Standardize some pushes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 16 ++++++++-------- testbot/web/Feedback.pl | 2 +- testbot/web/ForgotPassword.pl | 2 +- testbot/web/Login.pl | 2 +- testbot/web/ResetPassword.pl | 2 +- testbot/web/Submit.pl | 8 ++++---- testbot/web/admin/Log.pl | 2 +- testbot/web/admin/UserDetails.pl | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index a508f66..0016e19 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -198,7 +198,7 @@ sub LoadCollection($$) if (defined($MasterColNames)) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; - push(@Data, @{$MasterColValues}); + push @Data, @{$MasterColValues}; } my $Filters = $Collection->GetFilters(); @@ -299,11 +299,11 @@ sub LoadItem($$$) if (defined($MasterColNames)) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; - push(@Data, @{$MasterColValues}); + push @Data, @{$MasterColValues}; } $Where = $self->BuildKeyWhere($Collection->GetPropertyDescriptors(), "", $Where); - push(@Data, $Collection->SplitKey($RequestedKey)); + push @Data, $Collection->SplitKey($RequestedKey); my $Query = "SELECT $Fields FROM " . $Collection->GetTableName(); if ($Where ne "") @@ -378,7 +378,7 @@ sub GetInsertData($$$) my @Data; if (defined($MasterColValues)) { - push(@Data, @$MasterColValues); + push @Data, @$MasterColValues; } foreach my $PropertyDescriptor (@{$Item->GetPropertyDescriptors()}) @@ -442,7 +442,7 @@ sub GetUpdateData($$$) if (defined($MasterColValues)) { - push(@Data, @$MasterColValues); + push @Data, @$MasterColValues; } foreach my $PropertyDescriptor (@{$Item->GetPropertyDescriptors()}) @@ -550,11 +550,11 @@ sub DeleteItem($$) if (defined($MasterColNames)) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; - push(@Data, @{$MasterColValues}); + push @Data, @{$MasterColValues}; } $Where = $self->BuildKeyWhere($Item->GetPropertyDescriptors(), "", $Where); - push(@Data, $Item->GetKeyComponents()); + push @Data, $Item->GetKeyComponents(); my $Statement = $self->GetDb()->prepare("DELETE FROM " . $Item->GetTableName() . @@ -575,7 +575,7 @@ sub DeleteAll($$) if (defined($MasterColNames)) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; - push(@Data, @{$MasterColValues}); + push @Data, @{$MasterColValues}; } my $Query = "DELETE FROM " . $Collection->GetTableName(); diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index ded705a..2480243 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -68,7 +68,7 @@ sub GetActions($) my ($self) = @_; my $Actions = $self->SUPER::GetActions(); - push(@$Actions, "Send"); + push @$Actions, "Send"; return $Actions; } diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index c6240e7..3c94c27 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -61,7 +61,7 @@ sub GetActions($) my ($self) = @_; my $Actions = $self->SUPER::GetActions(); - push(@$Actions, "Reset password"); + push @$Actions, "Reset password"; return $Actions; } diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index f17d60e..b5b6365 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -89,7 +89,7 @@ sub GetActions($) my ($self) = @_; my $Actions = $self->SUPER::GetActions(); - push(@$Actions, "Log in"); + push @$Actions, "Log in"; return $Actions; } diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index 431a4da..db129db 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -75,7 +75,7 @@ sub GetActions($) my ($self) = @_; my $Actions = $self->SUPER::GetActions(); - push(@$Actions, "Change password"); + push @$Actions, "Change password"; return $Actions; } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 875384e..9bf1781 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -358,19 +358,19 @@ sub GetActions($) my $Actions = $self->SUPER::GetActions(); if ($self->{Page} == 1) { - push(@$Actions, "Next >"); + push @$Actions, "Next >"; } elsif ($self->{Page} == 2) { - push(@$Actions, "< Prev", "Next >"); + push @$Actions, "< Prev", "Next >"; } elsif ($self->{Page} == 3) { - push(@$Actions, "< Prev", "Submit"); + push @$Actions, "< Prev", "Submit"; } elsif ($self->{Page} == 4) { - push(@$Actions, "OK"); + push @$Actions, "OK"; } return $Actions; diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index b9754bd..3ad35a4 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -59,7 +59,7 @@ sub GetActions($) my ($self) = @_; my $Actions = $self->SUPER::GetActions(); - push(@$Actions, "Download"); + push @$Actions, "Download"; return $Actions; } diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index d24e675..28eb4b5 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -61,7 +61,7 @@ sub GetActions($) push @Actions, "Reject" if ($self->{Item}->Name); } - push(@Actions, @{$self->SUPER::GetActions()}); + push @Actions, @{$self->SUPER::GetActions()}; return \@Actions; }

1 0

Francois Gouget : testbot: Standardize on push to append to an array.
by Alexandre Julliard 23 Mar '18

23 Mar '18

Module: tools Branch: master Commit: e377b8d508144f057a2e6111fc85e125c564948c URL: https://source.winehq.org/git/tools.git/?a=commit;h=e377b8d508144f057a2e611… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 23 01:19:15 2018 +0100 testbot: Standardize on push to append to an array. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 6 +++--- testbot/bin/WineSendLog.pl | 4 ++-- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- testbot/lib/ObjectModel/CGI/ItemPage.pm | 3 +-- testbot/lib/ObjectModel/DBIBackEnd.pm | 10 +++++----- testbot/lib/ObjectModel/Item.pm | 2 +- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index a03fa06..f39ec5f 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -813,9 +813,9 @@ sub main() { if (PrepareSocket($NewClientSocket)) { - $Clients[@Clients] = {Socket => $NewClientSocket, - InBuf => "", - OutBuf => ""}; + push @Clients, {Socket => $NewClientSocket, + InBuf => "", + OutBuf => ""}; } else { diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index ec9a587..2a89427 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -106,13 +106,13 @@ sub ReadLog($$$) { if ($Line =~ m/${BaseName}:${TestSet} done $258$/) { - $Messages[@Messages] = "The test timed out"; + push @Messages, "The test timed out"; } $Found = 1; } else { - $Messages[@Messages] = $Line; + push @Messages, $Line; } } } diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 5723554..ca2c6d3 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -373,7 +373,7 @@ sub GetActions($) my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); if (defined($MasterColNames)) { - $Actions[@Actions] = 'Cancel'; + push @Actions, "Cancel"; } return \@Actions; diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 74ce14e..4086a93 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -116,8 +116,7 @@ sub GetActions($) my ($self) = @_; my @Actions = @{$self->SUPER::GetActions()}; - $Actions[@Actions] = "OK"; - $Actions[@Actions] = "Cancel"; + push @Actions, "OK", "Cancel"; return \@Actions; } diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 60e68d8..a508f66 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -385,8 +385,8 @@ sub GetInsertData($$$) { foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - $Data[@Data] = $self->ToDb($Item->GetColValue($ColName), - $PropertyDescriptor); + push @Data, $self->ToDb($Item->GetColValue($ColName), + $PropertyDescriptor); } } @@ -434,8 +434,8 @@ sub GetUpdateData($$$) { foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - $Data[@Data] = $self->ToDb($Item->GetColValue($ColName), - $PropertyDescriptor); + push @Data, $self->ToDb($Item->GetColValue($ColName), + $PropertyDescriptor); } } } @@ -451,7 +451,7 @@ sub GetUpdateData($$$) { foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - $Data[@Data] = $Item->GetColValue($ColName); + push @Data, $Item->GetColValue($ColName); } } } diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index e90ebbe..424826f 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -386,7 +386,7 @@ sub GetKeyComponents($) { foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - $KeyComponents[@KeyComponents] = $self->{ColValues}{$ColName}; + push @KeyComponents, $self->{ColValues}{$ColName}; } } }

1 0

Matteo Bruni : d3dx9: Disentangle ID3DXEffectCompiler implementation from struct d3dx9_base_effect.
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: wine Branch: master Commit: afef57f872433bcd3032c2ccbc0453bef5b62178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afef57f872433bcd3032c2cc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 22 21:43:08 2018 +0100 d3dx9: Disentangle ID3DXEffectCompiler implementation from struct d3dx9_base_effect. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 365 ++++++++++++++----------------------------- dlls/d3dx9_36/tests/effect.c | 2 +- 2 files changed, 117 insertions(+), 250 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=afef57f872433bcd3032…

1 0

Matteo Bruni : d3dx9/tests: Add a test for FindNextValidTechnique().
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: wine Branch: master Commit: 74a02a850c6378a481c4b4b406323d1e5aab87c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74a02a850c6378a481c4b4b4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 22 21:43:07 2018 +0100 d3dx9/tests: Add a test for FindNextValidTechnique(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 88 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index acc5ded..0ae0231 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7832,6 +7832,93 @@ static void test_create_effect_from_file(void) DestroyWindow(window); } +static void test_effect_find_next_valid_technique(void) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DDevice9 *device; + D3DXTECHNIQUE_DESC desc; + ID3DXEffect *effect; + IDirect3D9 *d3d; + D3DXHANDLE tech; + ULONG refcount; + HWND window; + HRESULT hr; + + if (!(window = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) + { + skip("Failed to create window.\n"); + return; + } + if (!(d3d = Direct3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object.\n"); + DestroyWindow(window); + return; + } + present_parameters.Windowed = TRUE; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object, hr %#x.\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = D3DXCreateEffectEx(device, test_effect_unsupported_shader_blob, sizeof(test_effect_unsupported_shader_blob), + NULL, NULL, NULL, 0, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->FindNextValidTechnique(effect, NULL, &tech); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->GetTechniqueDesc(effect, tech, &desc); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!strcmp(desc.Name, "tech1"), "Got unexpected technique %s.\n", desc.Name); + + hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); + ok(hr == S_FALSE, "Got result %#x.\n", hr); + hr = effect->lpVtbl->GetTechniqueDesc(effect, tech, &desc); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!strcmp(desc.Name, "tech0"), "Got unexpected technique %s.\n", desc.Name); + + effect->lpVtbl->SetInt(effect, "i", 1); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + tech = (D3DXHANDLE)0xdeadbeef; + hr = effect->lpVtbl->FindNextValidTechnique(effect, NULL, &tech); + ok(hr == S_FALSE, "Got result %#x.\n", hr); + hr = effect->lpVtbl->GetTechniqueDesc(effect, tech, &desc); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!strcmp(desc.Name, "tech0"), "Got unexpected technique %s.\n", desc.Name); + + hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); + ok(hr == S_FALSE, "Got result %#x.\n", hr); + + effect->lpVtbl->SetInt(effect, "i", 0); + + hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->GetTechniqueDesc(effect, tech, &desc); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!strcmp(desc.Name, "tech1"), "Got unexpected technique %s.\n", desc.Name); + + hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); + ok(hr == S_FALSE, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->FindNextValidTechnique(effect, "nope", &tech); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + + effect->lpVtbl->Release(effect); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(effect) { IDirect3DDevice9 *device; @@ -7870,4 +7957,5 @@ START_TEST(effect) test_effect_clone(); test_refcount(); test_create_effect_from_file(); + test_effect_find_next_valid_technique(); }

1 0

Matteo Bruni : d3dx9: Implement FindNextValidTechnique().
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: wine Branch: master Commit: c3342644e418358e63273580f46cce2d05de9e35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3342644e418358e63273580… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 22 21:43:06 2018 +0100 d3dx9: Implement FindNextValidTechnique(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7675f17..1e91a7b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4038,13 +4038,45 @@ done: return ret; } -static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect* iface, D3DXHANDLE technique, D3DXHANDLE* next_technique) +static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect *iface, + D3DXHANDLE technique, D3DXHANDLE *next_technique) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_base_effect *base = &effect->base_effect; + struct d3dx_technique *prev_tech, *tech; + unsigned int i; - FIXME("(%p)->(%p, %p): stub\n", This, technique, next_technique); + TRACE("iface %p, technique %p, next_technique %p.\n", iface, technique, next_technique); - return E_NOTIMPL; + if (technique) + { + if (!(prev_tech = get_valid_technique(base, technique))) + return D3DERR_INVALIDCALL; + + for (i = 0; i < base->technique_count; ++i) + { + tech = &base->techniques[i]; + if (tech == prev_tech) + break; + } + } + else + { + i = 0; + } + + for (++i; i < base->technique_count; ++i) + { + tech = &base->techniques[i]; + if (SUCCEEDED(ID3DXEffectImpl_ValidateTechnique(iface, get_technique_handle(tech)))) + { + *next_technique = get_technique_handle(tech); + return D3D_OK; + } + } + + *next_technique = get_technique_handle(&base->techniques[0]); + return S_FALSE; } static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func,

1 0

Matteo Bruni : d3dx9/tests: Add a test for D3DXCreateEffectFromFileExW().
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: wine Branch: master Commit: ed746aeed4eb1a098c595103d7a837896f676d9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed746aeed4eb1a098c595103… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 22 21:43:05 2018 +0100 d3dx9/tests: Add a test for D3DXCreateEffectFromFileExW(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 348 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 348 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed746aeed4eb1a098c59…

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018