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

Michael Stefaniuc : dmband/tests: Add some basic IDirectMusicTrack8 tests.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 8fae7fd4cc40679187b6bb4b7a911a7161e9aa01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fae7fd4cc40679187b6bb4b7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:32:57 2015 +0200 dmband/tests: Add some basic IDirectMusicTrack8 tests. --- dlls/dmband/tests/dmband.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 0041807..e1f00ae 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -185,6 +185,44 @@ static void test_bandtrack(void) &IID_IDirectMusicTrack8, (void**)&dmt8); ok(hr == S_OK, "DirectMusicBandTrack create failed: %08x, expected S_OK\n", hr); + /* IDirectMusicTrack8 */ + todo_wine { + hr = IDirectMusicTrack8_Init(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %08x\n", hr); + hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_EndPlay(dmt8, NULL); + ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + todo_wine { + hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == DMUS_S_END, "IDirectMusicTrack8_Play failed: %08x\n", hr); + hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + todo_wine { + hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == DMUS_S_END, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);

1 0

Michael Stefaniuc : dmcompos: IsParamSupported of DMChordMapTrack doesn' t crashes on NULL.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: d9aa14c5e07a01177a2f5493ae7746f157231992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9aa14c5e07a01177a2f5493a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:36:13 2015 +0200 dmcompos: IsParamSupported of DMChordMapTrack doesn't crashes on NULL. --- dlls/dmcompos/chordmaptrack.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index cac652c..9077c88 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -139,6 +139,10 @@ static HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_SetParam (LPDI static HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_IsParamSupported (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType) { ICOM_THIS_MULTI(IDirectMusicChordMapTrack, TrackVtbl, iface); TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); + + if (!rguidType) + return E_POINTER; + if (IsEqualGUID (rguidType, &GUID_IDirectMusicChordMap)) { TRACE("param supported\n"); return S_OK;

1 0

Michael Stefaniuc : dmcompos: Implement the E_NOTIMPL methods of IDirectMusicTrack8.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 7090b26300bf26dbdc2d39cdfb61640d5f445d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7090b26300bf26dbdc2d39cdf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:38:37 2015 +0200 dmcompos: Implement the E_NOTIMPL methods of IDirectMusicTrack8. --- dlls/dmcompos/chordmaptrack.c | 74 ++++++++++++++++++------------ dlls/dmcompos/signposttrack.c | 103 +++++++++++++++++++++++++----------------- 2 files changed, 105 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7090b26300bf26dbdc2d3…

1 0

Michael Stefaniuc : dmcompos/tests: Add some basic IDirectMusicTrack8 tests.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 1e421a26fbb458b3383d8df0e85b56ce8d40dc19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e421a26fbb458b3383d8df0e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:39:44 2015 +0200 dmcompos/tests: Add some basic IDirectMusicTrack8 tests. --- dlls/dmcompos/tests/dmcompos.c | 75 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index c4cf386..b0646a7 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -273,6 +273,42 @@ static void test_chordmaptrack(void) &IID_IDirectMusicTrack8, (void**)&dmt8); ok(hr == S_OK, "DirectMusicChordMapTrack create failed: %08x, expected S_OK\n", hr); + /* IDirectMusicTrack8 */ + hr = IDirectMusicTrack8_Init(dmt8, NULL); + ok(hr == S_OK, "IDirectMusicTrack8_Init failed: %08x\n", hr); + hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); + ok(hr == S_OK, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + hr = IDirectMusicTrack8_EndPlay(dmt8, NULL); + ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == S_OK, "IDirectMusicTrack8_Play failed: %08x\n", hr); + todo_wine { + hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + todo_wine { + hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); @@ -304,6 +340,45 @@ static void test_signposttrack(void) &IID_IDirectMusicTrack8, (void**)&dmt8); ok(hr == S_OK, "DirectMusicSignPostTrack create failed: %08x, expected S_OK\n", hr); + /* IDirectMusicTrack8 */ + hr = IDirectMusicTrack8_Init(dmt8, NULL); + ok(hr == S_OK, "IDirectMusicTrack8_Init failed: %08x\n", hr); + if (0) { + /* Crashes on Windows */ + hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_EndPlay(dmt8, NULL); + ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == S_OK, "IDirectMusicTrack8_Play failed: %08x\n", hr); + hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + todo_wine { + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + todo_wine { + hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + } + /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);

1 0

Michael Stefaniuc : dmcompos: Move struct definitions to the files that need them.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: bf117ec5f418b1e9caa669fb79945938f8e00cb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf117ec5f418b1e9caa669fb7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:41:01 2015 +0200 dmcompos: Move struct definitions to the files that need them. --- dlls/dmcompos/chordmaptrack.c | 8 ++++++++ dlls/dmcompos/dmcompos_private.h | 34 ---------------------------------- dlls/dmcompos/signposttrack.c | 8 ++++++++ 3 files changed, 16 insertions(+), 34 deletions(-) diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index c282d9d..6773b9d 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicChordMapTrack_IPersistStream_AddRef (LPPERSISTST /***************************************************************************** * IDirectMusicChordMapTrack implementation */ +typedef struct IDirectMusicChordMapTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicChordMapTrack; + /* IDirectMusicChordMapTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicChordMapTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicChordMapTrack, UnknownVtbl, iface); diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index 6a80445..8e67a18 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -43,12 +43,6 @@ #include "dmusics.h" /***************************************************************************** - * Interfaces - */ -typedef struct IDirectMusicChordMapTrack IDirectMusicChordMapTrack; -typedef struct IDirectMusicSignPostTrack IDirectMusicSignPostTrack; - -/***************************************************************************** * ClassFactory */ extern HRESULT WINAPI create_dmchordmap(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; @@ -56,34 +50,6 @@ extern HRESULT WINAPI create_dmcomposer(REFIID riid, void **ret_iface) DECLSPEC_ extern HRESULT WINAPI create_dmchordmaptrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; extern HRESULT WINAPI create_dmsignposttrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -/***************************************************************************** - * IDirectMusicChordMapTrack implementation structure - */ -struct IDirectMusicChordMapTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicChordMapTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - -/***************************************************************************** - * IDirectMusicSignPostTrack implementation structure - */ -struct IDirectMusicSignPostTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicSignPostTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - /********************************************************************** * Dll lifetime tracking declaration for dmcompos.dll */ diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index 0fe9c4b..ed7b706 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_AddRef (LPPERSISTST /***************************************************************************** * IDirectMusicSignPostTrack implementation */ +typedef struct IDirectMusicSignPostTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicSignPostTrack; + /* IDirectMusicSignPostTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicSignPostTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSignPostTrack, UnknownVtbl, iface);

1 0

Sebastian Lackner : windowscodecs/tests: Fix test condition which is always true.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: c0f5d024ca0d2b1248b9ba0478f4678c5e981a4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f5d024ca0d2b1248b9ba047… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jun 25 03:17:47 2015 +0200 windowscodecs/tests: Fix test condition which is always true. --- dlls/windowscodecs/tests/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 8a22970..64ccab5 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -223,7 +223,7 @@ static void test_pixelformat_info(void) memset(value, 0xaa, 256 * sizeof(WCHAR)); hr = IWICComponentInfo_GetAuthor(info, len-1, value, NULL); ok(hr == E_INVALIDARG, "GetAuthor failed, hr=%x\n", hr); - ok(value[0] = 0xaaaa, "string modified\n"); + ok(value[0] == 0xaaaa, "string modified\n"); len = 0xdeadbeef; memset(value, 0xaa, 256 * sizeof(WCHAR));

1 0

Akihiro Sagawa : winetest: Add SystemPreferredUILanguages to the log.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: c908c9c7c9e0da51a2b35915965e5a1d519497dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c908c9c7c9e0da51a2b359159… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 25 00:42:07 2015 +0900 winetest: Add SystemPreferredUILanguages to the log. A few GDI functions are affected by System account's display language (by GetSystemPreferredUILanguages). --- programs/winetest/main.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 0149377..1eb49b6 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -445,20 +445,35 @@ static void print_version (void) static void print_language(void) { HMODULE hkernel32; + BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, PULONG, PZZWSTR, PULONG); LANGID (WINAPI *pGetUserDefaultUILanguage)(void); LANGID (WINAPI *pGetThreadUILanguage)(void); - xprintf (" SystemDefaultLCID=%x\n", GetSystemDefaultLCID()); - xprintf (" UserDefaultLCID=%x\n", GetUserDefaultLCID()); - xprintf (" ThreadLocale=%x\n", GetThreadLocale()); + xprintf (" SystemDefaultLCID=%04x\n", GetSystemDefaultLCID()); + xprintf (" UserDefaultLCID=%04x\n", GetUserDefaultLCID()); + xprintf (" ThreadLocale=%04x\n", GetThreadLocale()); hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetSystemPreferredUILanguages = (void*)GetProcAddress(hkernel32, "GetSystemPreferredUILanguages"); pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + + if (pGetSystemPreferredUILanguages && !running_under_wine()) + { + WCHAR langW[32]; + ULONG num, size = sizeof(langW)/sizeof(langW[0]); + if (pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &num, langW, &size)) + { + char lang[32], *p = lang; + WideCharToMultiByte(CP_ACP, 0, langW, size, lang, sizeof(lang), NULL, NULL); + for (p += strlen(p) + 1; *p != '\0'; p += strlen(p) + 1) *(p - 1) = ','; + xprintf (" SystemPreferredUILanguages=%s\n", lang); + } + } if (pGetUserDefaultUILanguage) - xprintf (" UserDefaultUILanguage=%x\n", pGetUserDefaultUILanguage()); + xprintf (" UserDefaultUILanguage=%04x\n", pGetUserDefaultUILanguage()); if (pGetThreadUILanguage) - xprintf (" ThreadUILanguage=%x\n", pGetThreadUILanguage()); + xprintf (" ThreadUILanguage=%04x\n", pGetThreadUILanguage()); } static inline BOOL is_dot_dir(const char* x)

1 0

Michael Müller : fltlib: Add stub for FilterLoad.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: ca0973486aeee2d7f4d919f326fd472a24c77b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca0973486aeee2d7f4d919f32… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jun 25 08:17:11 2015 +0200 fltlib: Add stub for FilterLoad. --- dlls/fltlib/fltlib.c | 15 ++++++++++++--- dlls/fltlib/fltlib.spec | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/fltlib/fltlib.c b/dlls/fltlib/fltlib.c index 50f46ac..b968c2b 100644 --- a/dlls/fltlib/fltlib.c +++ b/dlls/fltlib/fltlib.c @@ -79,13 +79,22 @@ HRESULT WINAPI FilterFindClose(HANDLE handle) } /********************************************************************** + * FilterLoad (FLTLIB.@) + */ +HRESULT WINAPI FilterLoad(LPCWSTR filtername) +{ + FIXME("(%s) stub\n", debugstr_w(filtername)); + return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED); +} + +/********************************************************************** * FilterUnload (FLTLIB.@) */ -HRESULT WINAPI FilterUnload(LPCWSTR lpFilterName) +HRESULT WINAPI FilterUnload(LPCWSTR filtername) { - FIXME("(%s) stub\n", debugstr_w(lpFilterName)); + FIXME("(%s) stub\n", debugstr_w(filtername)); - if (!lpFilterName) + if (!filtername) return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); return S_OK; diff --git a/dlls/fltlib/fltlib.spec b/dlls/fltlib/fltlib.spec index 91e803b..226a615 100644 --- a/dlls/fltlib/fltlib.spec +++ b/dlls/fltlib/fltlib.spec @@ -16,7 +16,7 @@ @ stub FilterInstanceFindFirst @ stub FilterInstanceFindNext @ stub FilterInstanceGetInformation -@ stub FilterLoad +@ stdcall FilterLoad(wstr) @ stub FilterReplyMessage @ stub FilterSendMessage @ stdcall FilterUnload(wstr)

1 0

Nikolay Sivov : dmsynth: Cleanup IDirectMusicSynth8 creation helper.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 32924d4ed0e49b74f5d4f6bbe2d63a4837f40117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32924d4ed0e49b74f5d4f6bbe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 25 12:13:43 2015 +0300 dmsynth: Cleanup IDirectMusicSynth8 creation helper. --- dlls/dmsynth/synth.c | 60 +++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index af8a6fd..cdf8026 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -575,31 +575,37 @@ static const IKsControlVtbl DMSynthImpl_IKsControl_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) -{ - IDirectMusicSynth8Impl *obj; - - TRACE("(%p,%p,%p)\n", lpcGUID, ppobj, pUnkOuter); - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSynth8Impl)); - if (NULL == obj) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - obj->IDirectMusicSynth8_iface.lpVtbl = &DirectMusicSynth8_Vtbl; - obj->IKsControl_iface.lpVtbl = &DMSynthImpl_IKsControl_Vtbl; - obj->ref = 0; - /* fill in caps */ - obj->pCaps.dwSize = sizeof(DMUS_PORTCAPS); - obj->pCaps.dwFlags = DMUS_PC_DLS | DMUS_PC_SOFTWARESYNTH | DMUS_PC_DIRECTSOUND | DMUS_PC_DLS2 | DMUS_PC_AUDIOPATH | DMUS_PC_WAVE; - obj->pCaps.guidPort = CLSID_DirectMusicSynth; - obj->pCaps.dwClass = DMUS_PC_OUTPUTCLASS; - obj->pCaps.dwType = DMUS_PORT_USER_MODE_SYNTH; - obj->pCaps.dwMemorySize = DMUS_PC_SYSTEMMEMORY; - obj->pCaps.dwMaxChannelGroups = 1000; - obj->pCaps.dwMaxVoices = 1000; - obj->pCaps.dwMaxAudioChannels = 2; - obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB; - MultiByteToWideChar (CP_ACP, 0, "Microsoft Synthesizer", -1, obj->pCaps.wszDescription, sizeof(obj->pCaps.wszDescription)/sizeof(WCHAR)); - - return IDirectMusicSynth8Impl_QueryInterface ((LPDIRECTMUSICSYNTH8)obj, lpcGUID, ppobj); +HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj, IUnknown *outer) +{ + static const WCHAR descrW[] = {'M','i','c','r','o','s','o','f','t',' ', + 'S','y','n','t','h','e','s','i','z','e','r',0}; + IDirectMusicSynth8Impl *obj; + HRESULT hr; + + TRACE("(%s, %p, %p)\n", debugstr_guid(riid), ppobj, outer); + + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); + if (NULL == obj) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } + obj->IDirectMusicSynth8_iface.lpVtbl = &DirectMusicSynth8_Vtbl; + obj->IKsControl_iface.lpVtbl = &DMSynthImpl_IKsControl_Vtbl; + obj->ref = 1; + /* fill in caps */ + obj->pCaps.dwSize = sizeof(DMUS_PORTCAPS); + obj->pCaps.dwFlags = DMUS_PC_DLS | DMUS_PC_SOFTWARESYNTH | DMUS_PC_DIRECTSOUND | DMUS_PC_DLS2 | DMUS_PC_AUDIOPATH | DMUS_PC_WAVE; + obj->pCaps.guidPort = CLSID_DirectMusicSynth; + obj->pCaps.dwClass = DMUS_PC_OUTPUTCLASS; + obj->pCaps.dwType = DMUS_PORT_USER_MODE_SYNTH; + obj->pCaps.dwMemorySize = DMUS_PC_SYSTEMMEMORY; + obj->pCaps.dwMaxChannelGroups = 1000; + obj->pCaps.dwMaxVoices = 1000; + obj->pCaps.dwMaxAudioChannels = 2; + obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB; + strcpyW(obj->pCaps.wszDescription, descrW); + + hr = IDirectMusicSynth8_QueryInterface(&obj->IDirectMusicSynth8_iface, riid, ppobj); + IDirectMusicSynth8_Release(&obj->IDirectMusicSynth8_iface); + return hr; }

1 0

Michael Müller : wininet/tests: Add tests for overriding host header.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 1b53917ece1a3b0fb3f8422c9798453ef84f85ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b53917ece1a3b0fb3f8422c9… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jun 25 12:27:30 2015 +0200 wininet/tests: Add tests for overriding host header. --- dlls/wininet/tests/http.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index df7dd07..b841795 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2051,6 +2051,7 @@ static DWORD CALLBACK server_thread(LPVOID param) WSADATA wsaData; int last_request = 0; char host_header[22]; + char host_header_override[30]; static BOOL test_b = FALSE; static int test_no_cache = 0; @@ -2077,6 +2078,7 @@ static DWORD CALLBACK server_thread(LPVOID param) SetEvent(si->hEvent); sprintf(host_header, "Host: localhost:%d", si->port); + sprintf(host_header_override, "Host: test.local:%d\r\n", si->port); do { @@ -2351,6 +2353,13 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } + if (strstr(buffer, "/test_host_override")) + { + if (strstr(buffer, host_header_override)) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -2946,6 +2955,105 @@ static void test_connection_header(int port) InternetCloseHandle(ses); } +static void test_header_override(int port) +{ + char buffer[128], host_header_override[30], full_url[128]; + HINTERNET ses, con, req; + DWORD size, count, err; + BOOL ret; + + sprintf(host_header_override, "Host: test.local:%d\r\n", port); + sprintf(full_url, "http://localhost:%d/test_host_override", port); + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + size = sizeof(buffer) - 1; + count = 0; + memset(buffer, 0, sizeof(buffer)); + ret = HttpQueryInfoA(req, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, &count); + err = GetLastError(); + todo_wine ok(!ret, "HttpQueryInfo succeeded\n"); + todo_wine ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); + + size = sizeof(buffer) - 1; + memset(buffer, 0, sizeof(buffer)); + ret = InternetQueryOptionA(req, INTERNET_OPTION_URL, buffer, &size); + ok(ret, "InternetQueryOption failed\n"); + ok(!strcmp(full_url, buffer), "Expected %s, got %s\n", full_url, buffer); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_COALESCE); + ok(ret, "HttpAddRequestHeaders failed\n"); + + size = sizeof(buffer) - 1; + count = 0; + memset(buffer, 0, sizeof(buffer)); + ret = HttpQueryInfoA(req, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, &count); + ok(ret, "HttpQueryInfo failed\n"); + + size = sizeof(buffer) - 1; + memset(buffer, 0, sizeof(buffer)); + ret = InternetQueryOptionA(req, INTERNET_OPTION_URL, buffer, &size); + ok(ret, "InternetQueryOption failed\n"); + todo_wine ok(!strcmp(full_url, buffer), "Expected %s, got %s\n", full_url, buffer); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code_todo(req, 200); + + InternetCloseHandle(req); + req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_COALESCE); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_COALESCE); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 400); + + InternetCloseHandle(req); + req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code(req, 200); + + InternetCloseHandle(req); + req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_REPLACE); + err = GetLastError(); + todo_wine ok(!ret, "HttpAddRequestHeaders succeeded\n"); + todo_wine ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + test_status_code_todo(req, 400); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_http1_1(int port) { HINTERNET ses, con, req; @@ -4322,6 +4430,7 @@ static void test_http_connection(void) test_basic_request(si.port, "GET", "/test6"); test_basic_request(si.port, "GET", "/testF"); test_connection_header(si.port); + test_header_override(si.port); test_http1_1(si.port); test_cookie_header(si.port); test_basic_authentication(si.port);

1 0