March 2018 - Wine-Commits - list.winehq.org

Alexandre Julliard : wininet/tests: Update the winehq.org certificate data.
by Alexandre Julliard March 6, 2018

March 6, 2018

Module: wine Branch: master Commit: 105b3dc8169db038b30abb653add0689dff2b89e URL: https://source.winehq.org/git/wine.git/?a=commit;h=105b3dc8169db038b30abb65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 6 15:27:49 2018 -0600 wininet/tests: Update the winehq.org certificate data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index af78704..72121d8 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5526,11 +5526,22 @@ typedef struct { } cert_struct_test_t; static const cert_struct_test_t test_winehq_org_cert = { + "US\r\n" + "55114\r\n" + "MN\r\n" + "Saint Paul\r\n" + "Ste 120\r\n" + "700 Raymond Ave\r\n" + "CodeWeavers\r\n" + "IT\r\n" + "Secure Link SSL Wildcard\r\n" "*.winehq.org", "US\r\n" - "GeoTrust Inc.\r\n" - "RapidSSL SHA256 CA" + "VA\r\n" + "Herndon\r\n" + "Network Solutions L.L.C.\r\n" + "Network Solutions OV Server CA 2" }; static const cert_struct_test_t test_winehq_com_cert = {

1 0

Zebediah Figura : explorer: Pass the full path to ParseDisplayName().
by Alexandre Julliard March 6, 2018

March 6, 2018

Module: wine Branch: master Commit: bd74183b1e9b443e52dedf1842c4721a54f9908e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd74183b1e9b443e52dedf18… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 6 10:58:24 2018 -0600 explorer: Pass the full path to ParseDisplayName(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index ac5bebb..c509336 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -24,6 +24,7 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" #include "explorer_private.h" #include "resource.h" @@ -631,16 +632,26 @@ static IShellFolder* get_starting_shell_folder(parameters_struct* params) { IShellFolder* desktop,*folder; LPITEMIDLIST root_pidl; + WCHAR *fullpath = NULL; HRESULT hres; + DWORD size; SHGetDesktopFolder(&desktop); if (!params->root[0]) { return desktop; } + + size = GetFullPathNameW(params->root, 0, fullpath, NULL); + if (!size) + return desktop; + fullpath = heap_alloc(size * sizeof(WCHAR)); + GetFullPathNameW(params->root, size, fullpath, NULL); + hres = IShellFolder_ParseDisplayName(desktop,NULL,NULL, - params->root,NULL, + fullpath,NULL, &root_pidl,NULL); + heap_free(fullpath); if(FAILED(hres)) {

1 0

Alexandre Julliard : configure; Also disable gssapi when krb5 is disabled.
by Alexandre Julliard March 6, 2018

March 6, 2018

Module: wine Branch: master Commit: 4559c06032586f6a809db4cf06a3a2b41d1f27f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4559c06032586f6a809db4cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 6 09:26:23 2018 -0600 configure; Also disable gssapi when krb5 is disabled. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configure b/configure index 397677e..b4cfc38 100755 --- a/configure +++ b/configure @@ -13654,6 +13654,8 @@ CPPFLAGS=$ac_save_CPPFLAGS test -z "$KRB5_CFLAGS" || KRB5_CFLAGS=`echo " $KRB5_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` test -z "$KRB5_LIBS" || KRB5_LIBS=`echo " $KRB5_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` +else + with_gssapi=${with_gssapi:-no} fi if test "x$ac_cv_lib_soname_krb5" = "x"; then : case "x$with_krb5" in diff --git a/configure.ac b/configure.ac index cfc2080..702267e 100644 --- a/configure.ac +++ b/configure.ac @@ -1673,6 +1673,8 @@ then else KRB5_CFLAGS="" fi]) +else + with_gssapi=${with_gssapi:-no} fi WINE_NOTICE_WITH(krb5,[test "x$ac_cv_lib_soname_krb5" = "x"], [libkrb5 ${notice_platform}development files not found, Kerberos won't be supported.])

1 0

Zhiyi Zhang : kernel32: Fix handling lines with only values in GetPrivateProfileSection.
by Alexandre Julliard March 6, 2018

March 6, 2018

Module: wine Branch: master Commit: aa16304c191ab19a60577f02f42b904df584acaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa16304c191ab19a60577f02… Author: Zhiyi Zhang <yi.gd.cn(a)gmail.com> Date: Tue Mar 6 16:13:20 2018 +0800 kernel32: Fix handling lines with only values in GetPrivateProfileSection. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 2 +- dlls/kernel32/tests/profile.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 721808c..0974aaf 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -879,7 +879,7 @@ static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name, for (key = section->key; key; key = key->next) { if (len <= 2) break; - if (!*key->name) continue; /* Skip empty lines */ + if (!*key->name && !key->value) continue; /* Skip empty lines */ if (IS_ENTRY_COMMENT(key->name)) continue; /* Skip comments */ if (!return_values && !key->value) continue; /* Skip lines w.o. '=' */ PROFILE_CopyEntry( buffer, key->name, len - 1, 0 ); diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 17ba124..64ffc17 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -171,7 +171,7 @@ static void test_profile_sections(void) DWORD count; char buf[100]; char *p; - static const char content[]="[section1]\r\nname1=val1\r\nname2=\r\nname3\r\nname4=val4\r\n[section2]\r\n"; + static const char content[]="[section1]\r\nname1=val1\r\nname2=\r\nname3\r\nname4=val4\r\n[section2]\r\n[section3]\r\n=val5\r\n"; static const char testfile4[]=".\\testwine4.ini"; BOOL on_win98 = FALSE; @@ -241,6 +241,19 @@ static void test_profile_sections(void) broken(GetLastError() == 0xdeadbeef), /* Win9x, WinME */ "expected ERROR_SUCCESS, got %d\n", GetLastError()); + /* Existing section with no keys but has values */ + SetLastError(0xdeadbeef); + ret=GetPrivateProfileSectionA("section3", buf, sizeof(buf), testfile4); + trace("section3 return: %s\n", buf); + for( p = buf + strlen(buf) + 1; *p;p += strlen(p)+1) + p[-1] = ','; + ok( ret == 6 && !strcmp( buf, "=val5"), "wrong section returned(%d): %s\n", + ret, buf); + ok( buf[ret-1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); + ok( GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == 0xdeadbeef), /* Win9x, WinME */ + "expected ERROR_SUCCESS, got %d\n", GetLastError()); + /* Overflow*/ ret=GetPrivateProfileSectionA("section1", buf, 24, testfile4); for( p = buf + strlen(buf) + 1; *p;p += strlen(p)+1)

1 0

Michael Stefaniuc : dmstyle/tests: Avoid a clang warning.
by Alexandre Julliard March 6, 2018

March 6, 2018

Module: wine Branch: master Commit: 6fd5bce038789aac2312ac3b5347ba4f81371685 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fd5bce038789aac2312ac3b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 6 01:07:27 2018 +0100 dmstyle/tests: Avoid a clang warning. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/tests/dmstyle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index a9a89a7..ed12315 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -356,13 +356,13 @@ struct chunk { followed by the chunks of the list and terminated with 0. */ static IStream *gen_riff_stream(const FOURCC *ids) { + static const LARGE_INTEGER zero; int level = -1; DWORD *sizes[4]; /* Stack for the sizes of RIFF and LIST chunks */ char riff[1024]; char *p = riff; struct chunk *ck; IStream *stream; - LARGE_INTEGER zero = {0}; do { ck = (struct chunk *)p;

1 0

Dmitry Timoshkov : taskschd: Implement IExecAction::get_Arguments.
by Alexandre Julliard March 6, 2018

March 6, 2018

Module: wine Branch: master Commit: 1884714569b0121bb8c7eda928211ca9d4123923 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1884714569b0121bb8c7eda9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 6 11:33:02 2018 +0800 taskschd: Implement IExecAction::get_Arguments. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index a4cc3be..1b6a701 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1810,8 +1810,16 @@ static HRESULT WINAPI ExecAction_put_Path(IExecAction *iface, BSTR path) static HRESULT WINAPI ExecAction_get_Arguments(IExecAction *iface, BSTR *arguments) { - FIXME("%p,%p: stub\n", iface, arguments); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + + TRACE("%p,%p\n", iface, arguments); + + if (!arguments) return E_POINTER; + + if (!action->args) *arguments = NULL; + else if (!(*arguments = SysAllocString(action->args))) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI ExecAction_put_Arguments(IExecAction *iface, BSTR arguments)

1 0

Dmitry Timoshkov : taskschd: Implement IExecAction::put_WorkingDirectory.
by Alexandre Julliard March 6, 2018

March 6, 2018

Module: wine Branch: master Commit: 6dbee463a797b3e24bc96a2bc7e04b299036750b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dbee463a797b3e24bc96a2b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 6 11:32:55 2018 +0800 taskschd: Implement IExecAction::put_WorkingDirectory. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index a8b819c..f7ea013 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1677,6 +1677,7 @@ typedef struct IExecAction IExecAction_iface; LONG ref; WCHAR *path; + WCHAR *directory; } ExecAction; static inline ExecAction *impl_from_IExecAction(IExecAction *iface) @@ -1699,6 +1700,7 @@ static ULONG WINAPI ExecAction_Release(IExecAction *iface) { TRACE("destroying %p\n", iface); heap_free(action->path); + heap_free(action->directory); heap_free(action); } @@ -1824,8 +1826,16 @@ static HRESULT WINAPI ExecAction_get_WorkingDirectory(IExecAction *iface, BSTR * static HRESULT WINAPI ExecAction_put_WorkingDirectory(IExecAction *iface, BSTR directory) { - FIXME("%p,%s: stub\n", iface, debugstr_w(directory)); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + WCHAR *str = NULL; + + TRACE("%p,%s\n", iface, debugstr_w(directory)); + + if (directory && !(str = heap_strdupW((directory)))) return E_OUTOFMEMORY; + heap_free(action->directory); + action->directory = str; + + return S_OK; } static const IExecActionVtbl Action_vtbl = @@ -1858,6 +1868,7 @@ static HRESULT ExecAction_create(IExecAction **obj) action->IExecAction_iface.lpVtbl = &Action_vtbl; action->ref = 1; action->path = NULL; + action->directory = NULL; *obj = &action->IExecAction_iface;

1 0

Dmitry Timoshkov : taskschd: Implement IExecAction::get_WorkingDirectory.
by Alexandre Julliard March 6, 2018

March 6, 2018

Module: wine Branch: master Commit: 439a4b1ee1c5e2f3e6d505f92a84dbe63779708f URL: https://source.winehq.org/git/wine.git/?a=commit;h=439a4b1ee1c5e2f3e6d505f9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 6 11:32:58 2018 +0800 taskschd: Implement IExecAction::get_WorkingDirectory. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index f7ea013..2b0283e 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1820,8 +1820,16 @@ static HRESULT WINAPI ExecAction_put_Arguments(IExecAction *iface, BSTR argument static HRESULT WINAPI ExecAction_get_WorkingDirectory(IExecAction *iface, BSTR *directory) { - FIXME("%p,%p: stub\n", iface, directory); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + + TRACE("%p,%p\n", iface, directory); + + if (!directory) return E_POINTER; + + if (!action->directory) *directory = NULL; + else if (!(*directory = SysAllocString(action->directory))) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI ExecAction_put_WorkingDirectory(IExecAction *iface, BSTR directory)

1 0

Henri Verbeet : wined3d: Merge surface_load_location() into texture2d_load_location().
by Alexandre Julliard March 6, 2018

March 6, 2018

Module: wine Branch: master Commit: c1f5b9ac67b5dbed71d4a32a8d3d833d39a0dc1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1f5b9ac67b5dbed71d4a32a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 6 10:26:27 2018 +0330 wined3d: Merge surface_load_location() into texture2d_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 40 +++++----------------------------------- dlls/wined3d/texture.c | 31 ++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 10 ++++++++-- 3 files changed, 43 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5a2bf52..23d7ae7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2060,7 +2060,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE } /* Context activation is done by the caller. */ -static BOOL surface_load_sysmem(struct wined3d_surface *surface, +BOOL surface_load_sysmem(struct wined3d_surface *surface, struct wined3d_context *context, DWORD dst_location) { unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); @@ -2108,7 +2108,7 @@ static BOOL surface_load_sysmem(struct wined3d_surface *surface, } /* Context activation is done by the caller. */ -static BOOL surface_load_drawable(struct wined3d_surface *surface, +BOOL surface_load_drawable(struct wined3d_surface *surface, struct wined3d_context *context) { unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); @@ -2155,7 +2155,7 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, return TRUE; } -static BOOL surface_load_texture(struct wined3d_surface *surface, +BOOL surface_load_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { unsigned int width, height, level, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; @@ -2326,8 +2326,8 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, } /* Context activation is done by the caller. */ -static BOOL surface_load_renderbuffer(struct wined3d_surface *surface, struct wined3d_context *context, - DWORD dst_location) +BOOL surface_load_renderbuffer(struct wined3d_surface *surface, + struct wined3d_context *context, DWORD dst_location) { struct wined3d_texture *texture = surface->container; unsigned int level = surface_get_sub_resource_idx(surface) % texture->level_count; @@ -2359,36 +2359,6 @@ static BOOL surface_load_renderbuffer(struct wined3d_surface *surface, struct wi return TRUE; } -/* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ -BOOL surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) -{ - TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location)); - - switch (location) - { - case WINED3D_LOCATION_USER_MEMORY: - case WINED3D_LOCATION_SYSMEM: - case WINED3D_LOCATION_BUFFER: - return surface_load_sysmem(surface, context, location); - - case WINED3D_LOCATION_DRAWABLE: - return surface_load_drawable(surface, context); - - case WINED3D_LOCATION_RB_RESOLVED: - case WINED3D_LOCATION_RB_MULTISAMPLE: - return surface_load_renderbuffer(surface, context, location); - - case WINED3D_LOCATION_TEXTURE_RGB: - case WINED3D_LOCATION_TEXTURE_SRGB: - return surface_load_texture(surface, context, - location == WINED3D_LOCATION_TEXTURE_SRGB); - - default: - ERR("Don't know how to handle location %#x.\n", location); - return FALSE; - } -} - /* Context activation is done by the caller. */ static void fbo_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_context *context) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8c03331..72aee66 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1788,10 +1788,39 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int texture->resource.format, &src_rect, row_pitch, &dst_point, FALSE, data); } +/* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { - return surface_load_location(texture->sub_resources[sub_resource_idx].u.surface, context, location); + struct wined3d_surface *surface; + + TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", + texture, sub_resource_idx, context, wined3d_debug_location(location)); + + surface = texture->sub_resources[sub_resource_idx].u.surface; + switch (location) + { + case WINED3D_LOCATION_USER_MEMORY: + case WINED3D_LOCATION_SYSMEM: + case WINED3D_LOCATION_BUFFER: + return surface_load_sysmem(surface, context, location); + + case WINED3D_LOCATION_DRAWABLE: + return surface_load_drawable(surface, context); + + case WINED3D_LOCATION_RB_RESOLVED: + case WINED3D_LOCATION_RB_MULTISAMPLE: + return surface_load_renderbuffer(surface, context, location); + + case WINED3D_LOCATION_TEXTURE_RGB: + case WINED3D_LOCATION_TEXTURE_SRGB: + return surface_load_texture(surface, context, + location == WINED3D_LOCATION_TEXTURE_SRGB); + + default: + ERR("Don't know how to handle location %#x.\n", location); + return FALSE; + } } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d7895b5..6d2ff8e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3337,10 +3337,16 @@ static inline struct wined3d_texture_sub_resource *surface_get_sub_resource(stru HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; +BOOL surface_load_drawable(struct wined3d_surface *surface, + struct wined3d_context *context) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; -BOOL surface_load_location(struct wined3d_surface *surface, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; +BOOL surface_load_renderbuffer(struct wined3d_surface *surface, + struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; +BOOL surface_load_sysmem(struct wined3d_surface *surface, + struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; +BOOL surface_load_texture(struct wined3d_surface *surface, + struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, unsigned int src_pitch, const POINT *dst_point, BOOL srgb,

1 0

Michael Stefaniuc : dmloader/tests: Add IDirectMusicObject:: ParseDescriptor() tests.
by Alexandre Julliard March 6, 2018

March 6, 2018

Module: wine Branch: master Commit: 9e74cdc6397a79e7ca671eab5b3ac9393455077b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e74cdc6397a79e7ca671eab… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 6 01:07:26 2018 +0100 dmloader/tests: Add IDirectMusicObject::ParseDescriptor() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/tests/loader.c | 204 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 204 insertions(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index ff084b6..46e46d4 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -19,11 +19,14 @@ #define COBJMACROS #include "initguid.h" +#include <ole2.h> #include "dmusici.h" +#include <dmusicf.h> #include "wine/test.h" #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static unsigned char mp3file[] = "\xFF\xFB\x92\x04"; /* MP3 header */ static unsigned char rifffile[8+4+8+16+8+256] = "RIFF\x24\x01\x00\x00WAVE" /* header: 4 ("WAVE") + (8 + 16) (format segment) + (8 + 256) (data segment) = 0x124 */ "fmt \x10\x00\x00\x00\x01\x00\x20\x00\xAC\x44\x00\x00\x10\xB1\x02\x00\x04\x00\x10\x00" /* format segment: PCM, 2 chan, 44100 Hz, 16 bits */ @@ -391,6 +394,205 @@ static void test_container(void) while (IDirectMusicContainer_Release(dmc)); } +struct chunk { + FOURCC id; + DWORD size; + FOURCC type; +}; + +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + +/* Generate a RIFF file format stream from an array of FOURCC ids. + RIFF and LIST need to be followed by the form type respectively list type, + followed by the chunks of the list and terminated with 0. */ +static IStream *gen_riff_stream(const FOURCC *ids) +{ + static const LARGE_INTEGER zero; + int level = -1; + DWORD *sizes[4]; /* Stack for the sizes of RIFF and LIST chunks */ + char riff[1024]; + char *p = riff; + struct chunk *ck; + IStream *stream; + + do { + ck = (struct chunk *)p; + ck->id = *ids++; + switch (ck->id) { + case 0: + *sizes[level] = p - (char *)sizes[level] - sizeof(DWORD); + level--; + break; + case FOURCC_LIST: + case FOURCC_RIFF: + level++; + sizes[level] = &ck->size; + ck->type = *ids++; + p += sizeof(*ck); + break; + case DMUS_FOURCC_GUID_CHUNK: + ck->size = sizeof(GUID_NULL); + p += CHUNK_HDR_SIZE; + memcpy(p, &GUID_NULL, sizeof(GUID_NULL)); + p += ck->size; + break; + case DMUS_FOURCC_VERSION_CHUNK: + { + DMUS_VERSION ver = {5, 8}; + + ck->size = sizeof(ver); + p += CHUNK_HDR_SIZE; + memcpy(p, &ver, sizeof(ver)); + p += ck->size; + break; + } + default: + { + /* Just convert the FOURCC id to a WCHAR string */ + WCHAR *s; + + ck->size = 5 * sizeof(WCHAR); + p += CHUNK_HDR_SIZE; + s = (WCHAR *)p; + s[0] = (char)(ck->id); + s[1] = (char)(ck->id >> 8); + s[2] = (char)(ck->id >> 16); + s[3] = (char)(ck->id >> 24); + s[4] = 0; + p += ck->size; + } + } + } while (level >= 0); + + ck = (struct chunk *)riff; + CreateStreamOnHGlobal(NULL, TRUE, &stream); + IStream_Write(stream, riff, ck->size + CHUNK_HDR_SIZE, NULL); + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + + return stream; +} + +static void test_parsedescriptor(void) +{ + IDirectMusicObject *dmo; + IStream *stream; + DMUS_OBJECTDESC desc; + HRESULT hr; + DWORD valid; + const WCHAR s_unam[] = {'U','N','A','M','\0'}; + const FOURCC alldesc[] = + { + FOURCC_RIFF, DMUS_FOURCC_CONTAINER_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, + DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, DMUS_FOURCC_UCOP_CHUNK, + DMUS_FOURCC_UCMT_CHUNK, DMUS_FOURCC_USBJ_CHUNK, 0, DMUS_FOURCC_VERSION_CHUNK, + DMUS_FOURCC_GUID_CHUNK, 0 + }; + const FOURCC dupes[] = + { + FOURCC_RIFF, DMUS_FOURCC_CONTAINER_FORM, DMUS_FOURCC_CATEGORY_CHUNK, + DMUS_FOURCC_CATEGORY_CHUNK, DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_VERSION_CHUNK, + DMUS_FOURCC_GUID_CHUNK, DMUS_FOURCC_GUID_CHUNK, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, + DMUS_FOURCC_UNAM_CHUNK, 0, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, mmioFOURCC('I','N','A','M'), + 0, 0 + }; + FOURCC empty[] = {FOURCC_RIFF, DMUS_FOURCC_CONTAINER_FORM, 0}; + FOURCC inam[] = + { + FOURCC_RIFF, DMUS_FOURCC_CONTAINER_FORM, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, + mmioFOURCC('I','N','A','M'), 0, 0 + }; + + hr = CoCreateInstance(&CLSID_DirectMusicContainer, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void **)&dmo); + ok(hr == S_OK, "DirectMusicContainer create failed: %08x, expected S_OK\n", hr); + + /* Nothing loaded */ + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS /* XP */ || + broken(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS)), /* Vista and above */ + "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicContainer), + "Got class guid %s, expected CLSID_DirectMusicContainer\n", + wine_dbgstr_guid(&desc.guidClass)); + + /* Empty RIFF stream */ + stream = gen_riff_stream(empty); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == E_INVALIDARG, "ParseDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + desc.dwSize = sizeof(desc); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicContainer), + "Got class guid %s, expected CLSID_DirectMusicContainer\n", + wine_dbgstr_guid(&desc.guidClass)); + IStream_Release(stream); + + /* Wrong form */ + empty[1] = DMUS_FOURCC_SEGMENT_FORM; + stream = gen_riff_stream(empty); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + todo_wine ok(hr == DMUS_E_DESCEND_CHUNK_FAIL, + "ParseDescriptor failed: %08x, expected DMUS_E_DESCEND_CHUNK_FAIL\n", hr); + + /* All desc chunks */ + stream = gen_riff_stream(alldesc); + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION; + ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicContainer), + "Got class guid %s, expected CLSID_DirectMusicContainer\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + /* UNFO list with INAM */ + inam[3] = DMUS_FOURCC_UNFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + IStream_Release(stream); + + /* INFO list with INAM */ + inam[3] = DMUS_FOURCC_INFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + IStream_Release(stream); + + /* Duplicated chunks */ + stream = gen_riff_stream(dupes); + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION; + ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + todo_wine ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + IDirectMusicObject_Release(dmo); +} + START_TEST(loader) { CoInitialize(NULL); @@ -408,5 +610,7 @@ START_TEST(loader) test_COM(); test_COM_container(); test_container(); + test_parsedescriptor(); + CoUninitialize(); }

1 0