November 2019 - Wine-Commits

Louis Lenders : shell32: Add stub for SHCreateDataObject.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: 36eb51b8a64a706150a39c9786d6d5f900019626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36eb51b8a64a706150a39c97… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Nov 20 10:07:11 2019 +0100 shell32: Add stub for SHCreateDataObject. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.spec | 3 ++- dlls/shell32/shell32_main.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 5331ffff94..96251a87ca 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -338,7 +338,7 @@ @ stdcall SHBrowseForFolderW(ptr) @ stdcall SHChangeNotify (long long ptr ptr) @ stub SHChangeNotifySuspendResume -@ stdcall SHCreateQueryCancelAutoPlayMoniker(ptr) +@ stdcall SHCreateDataObject(ptr long ptr ptr ptr ptr) @ stdcall SHCreateDefaultContextMenu(ptr ptr ptr) @ stdcall SHCreateDirectoryExA(long str ptr) @ stdcall SHCreateDirectoryExW(long wstr ptr) @@ -347,6 +347,7 @@ @ stdcall SHCreateItemInKnownFolder(ptr long wstr ptr ptr) @ stdcall SHCreateItemFromRelativeName(ptr wstr ptr ptr ptr) @ stub SHCreateProcessAsUserW +@ stdcall SHCreateQueryCancelAutoPlayMoniker(ptr) @ stdcall SHCreateShellItem(ptr ptr ptr ptr) @ stdcall SHCreateShellItemArray(ptr ptr long ptr ptr) @ stdcall SHCreateShellItemArrayFromDataObject(ptr ptr ptr) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 034805f6fb..afbf5164c9 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1258,3 +1258,13 @@ HRESULT WINAPI SHQueryUserNotificationState(QUERY_USER_NOTIFICATION_STATE *state *state = QUNS_ACCEPTS_NOTIFICATIONS; return S_OK; } + +/*********************************************************************** + * SHCreateDataObject (SHELL32.@) + */ +HRESULT WINAPI SHCreateDataObject(PCIDLIST_ABSOLUTE pidl_folder, UINT count, PCUITEMID_CHILD_ARRAY pidl_array, + IDataObject *object, REFIID riid, void **ppv) +{ + FIXME("%p %d %p %p %s %p: stub\n", pidl_folder, count, pidl_array, object, debugstr_guid(riid), ppv); + return E_NOTIMPL; +}

1 0

Alexandre Julliard : mountmgr: Don't include sys/time.h before winsock.h.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: e7040616c899eafbccdfa697f80b92044b64a3c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7040616c899eafbccdfa697… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 21 11:59:10 2019 +0100 mountmgr: Don't include sys/time.h before winsock.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/diskarb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 66c121e114..7f04c5f1e0 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -25,7 +25,6 @@ #include <errno.h> #include <stdarg.h> #include <stdio.h> -#include <sys/time.h> #ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H #include <DiskArbitration/DiskArbitration.h> #endif

1 0

Jeff Smith : ucrtbase: Add _Strftime tests for seconds.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: e25962553fe39afee11e96df620d813c7a2bb042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e25962553fe39afee11e96df… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 21 07:04:19 2019 -0600 ucrtbase: Add _Strftime tests for seconds. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index bf4b2a0e37..cdf3820dcc 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -996,6 +996,9 @@ static void test_strftime(void) { "%X", "0", 0, 0, L"m", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, { "%X", "00", 0, 0, L"mm", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, { "%X", "m00", 0, 0, L"mmm", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "0", 0, 0, L"s", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%X", "00", 0, 0, L"ss", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%X", "s00", 0, 0, L"sss", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, { "%X", "T", 0, 0, L"t", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, { "%X", "TAM", 0, 0, L"tt", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, { "%X", "TAM", 0, 0, L"ttttttttt", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE},

1 0

Francois Gouget : ntdll: S/4Gb/4GB/ in a comment since it refers to bytes.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: ca577af1bc737104ff6fdb2c25473fd18a2d619f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca577af1bc737104ff6fdb2c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 21 15:57:06 2019 +0100 ntdll: S/4Gb/4GB/ in a comment since it refers to bytes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index e8ac1ffa7a..d7232b47d6 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -882,7 +882,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, if (!address) { if (!commitSize) commitSize = COMMIT_MASK + 1; - totalSize = min( totalSize, 0xffff0000 ); /* don't allow a heap larger than 4Gb */ + totalSize = min( totalSize, 0xffff0000 ); /* don't allow a heap larger than 4GB */ if (totalSize < commitSize) totalSize = commitSize; if (flags & HEAP_SHARED) commitSize = totalSize; /* always commit everything in a shared heap */ commitSize = min( totalSize, (commitSize + COMMIT_MASK) & ~COMMIT_MASK );

1 0

Alexandre Julliard : ntdll: Handle version parsing in Unicode.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: c77cb5a5f7d20828c48ee120d1596e560aa44797 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c77cb5a5f7d20828c48ee120… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 21 17:31:43 2019 +0100 ntdll: Handle version parsing in Unicode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/version.c | 91 ++++++++++++++++++++++------------------------------ 1 file changed, 39 insertions(+), 52 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index bd03382899..61e48f6fbd 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -191,27 +191,34 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }; -static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] = -{ /* no spaces in here ! */ - "win20", /* WIN20 */ - "win30", /* WIN30 */ - "win31", /* WIN31 */ - "win95", /* WIN95 */ - "win98", /* WIN98 */ - "winme", /* WINME */ - "nt351", /* NT351 */ - "nt40", /* NT40 */ - "win2000,win2k,nt2k,nt2000", /* NT2K */ - "winxp", /* WINXP */ - "winxp64", /* WINXP64 */ - "win2003,win2k3", /* WIN2K3 */ - "vista,winvista", /* WINVISTA*/ - "win2008,win2k8", /* WIN2K8 */ - "win2008r2,win2k8r2", /* WIN2K8R2 */ - "win7", /* WIN7 */ - "win8", /* WIN8 */ - "win81", /* WIN81 */ - "win10", /* WIN10 */ +static const struct { WCHAR name[12]; WINDOWS_VERSION ver; } version_names[] = +{ + { {'w','i','n','2','0',0}, WIN20 }, + { {'w','i','n','3','0',0}, WIN30 }, + { {'w','i','n','3','1',0}, WIN31 }, + { {'w','i','n','9','5',0}, WIN95 }, + { {'w','i','n','9','8',0}, WIN98 }, + { {'w','i','n','m','e',0}, WINME }, + { {'n','t','3','5','1',0}, NT351 }, + { {'n','t','4','0',0}, NT40 }, + { {'w','i','n','2','0','0','0',0}, NT2K }, + { {'w','i','n','2','k',0}, NT2K }, + { {'n','t','2','k',0}, NT2K }, + { {'n','t','2','0','0','0',0}, NT2K }, + { {'w','i','n','x','p',0}, WINXP }, + { {'w','i','n','x','p','6','4',0}, WINXP64 }, + { {'w','i','n','2','0','0','3',0}, WIN2K3 }, + { {'w','i','n','2','k','3',0}, WIN2K3 }, + { {'v','i','s','t','a',0}, WINVISTA }, + { {'w','i','n','v','i','s','t','a',0}, WINVISTA }, + { {'w','i','n','2','0','0','8',0}, WIN2K8 }, + { {'w','i','n','2','k','8',0}, WIN2K8 }, + { {'w','i','n','2','0','0','8','r','2',0}, WIN2K8R2 }, + { {'w','i','n','2','k','8','r','2',0}, WIN2K8R2 }, + { {'w','i','n','7',0}, WIN7 }, + { {'w','i','n','8',0}, WIN8 }, + { {'w','i','n','8','1',0}, WIN81 }, + { {'w','i','n','1','0',0}, WIN10 }, }; @@ -438,46 +445,26 @@ static BOOL parse_win_version( HANDLE hkey ) static const WCHAR VersionW[] = {'V','e','r','s','i','o','n',0}; UNICODE_STRING valueW; - char tmp[64], buffer[50]; + WCHAR *name, tmp[64]; KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)tmp; - DWORD count, len; - int i; + DWORD i, count; RtlInitUnicodeString( &valueW, VersionW ); - if (NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, tmp, sizeof(tmp), &count )) + if (NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, tmp, sizeof(tmp) - sizeof(WCHAR), &count )) return FALSE; - RtlUnicodeToMultiByteN( buffer, sizeof(buffer)-1, &len, (WCHAR *)info->Data, info->DataLength ); - buffer[len] = 0; + name = (WCHAR *)info->Data; + name[info->DataLength / sizeof(WCHAR)] = 0; - for (i = 0; i < NB_WINDOWS_VERSIONS; i++) + for (i = 0; i < ARRAY_SIZE(version_names); i++) { - const char *p, *pCurr = WinVersionNames[i]; - /* iterate through all winver aliases separated by comma */ - do { - p = strchr(pCurr, ','); - len = p ? p - pCurr : strlen(pCurr); - if ( (!strncmp( pCurr, buffer, len )) && (buffer[len] == 0) ) - { - current_version = &VersionData[i]; - TRACE( "got win version %s\n", WinVersionNames[i] ); - return TRUE; - } - pCurr = p+1; - } while (p); + if (strcmpW( version_names[i].name, name )) continue; + current_version = &VersionData[version_names[i].ver]; + TRACE( "got win version %s\n", debugstr_w(version_names[i].name) ); + return TRUE; } - MESSAGE("Invalid Windows version value '%s' specified in config file.\n", buffer ); - MESSAGE("Valid versions are:" ); - for (i = 0; i < NB_WINDOWS_VERSIONS; i++) - { - /* only list the first, "official" alias in case of aliases */ - const char *pCurr = WinVersionNames[i]; - const char *p = strchr(pCurr, ','); - len = (p) ? p - pCurr : strlen(pCurr); - - MESSAGE(" '%.*s'%c", (int)len, pCurr, (i == NB_WINDOWS_VERSIONS - 1) ? '\n' : ',' ); - } + ERR( "Invalid Windows version value %s specified in config file.\n", debugstr_w(name) ); return FALSE; }

1 0

Jeff Smith : msvcrt: Correct behavior of time in strftime formats %X %c.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: 6f13ac30b9b90d2c53d860cb5124d6d77fba41b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f13ac30b9b90d2c53d860cb… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 21 07:04:22 2019 -0600 msvcrt: Correct behavior of time in strftime formats %X %c. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 25 +++++++------ dlls/msvcrt/time.c | 87 +++++++++++++++++++++++----------------------- dlls/ucrtbase/tests/misc.c | 26 +++++++------- 3 files changed, 69 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f13ac30b9b90d2c53d8…

1 0

Vijay Kiran Kamuju : include: Update error codes in raserror.h.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: a017223055d4ae7befa7b2359341608d08a1ce25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a017223055d4ae7befa7b235… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Nov 21 13:34:08 2019 +0100 include: Update error codes in raserror.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/raserror.h | 272 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 272 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a017223055d4ae7befa7…

1 0

Alistair Leslie-Hughes : dmstyle: Improved tracing of the DMUS_OBJECTDESC structure.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: 21c3ac446d72ce161bf0377931776309c5c69b0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=21c3ac446d72ce161bf03779… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 21 20:17:45 2019 +0100 dmstyle: Improved tracing of the DMUS_OBJECTDESC structure. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/dmutils.c | 54 +++++++++++++++++++++++++++++--------------------- dlls/dmstyle/dmutils.h | 2 +- dlls/dmstyle/style.c | 2 +- 3 files changed, 33 insertions(+), 25 deletions(-) diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index 0432e76f9f..fd3abe5209 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -40,6 +40,7 @@ #include "dmutils.h" WINE_DEFAULT_DEBUG_CHANNEL(dmfile); +WINE_DECLARE_DEBUG_CHANNEL(dmime); HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { @@ -197,7 +198,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, TRACE("** DM Reference Begin of Load ***\n"); TRACE("With Desc:\n"); - debugstr_DMUS_OBJECTDESC(&ref_desc); + dump_DMUS_OBJECTDESC(&ref_desc); { LPDIRECTMUSICGETLOADER pGetLoader = NULL; @@ -484,26 +485,33 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } -const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { - if (pDesc) { - char buffer[1024], *ptr = buffer; - - ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):\n", pDesc); - ptr += sprintf(ptr, " - dwSize = 0x%08X\n", pDesc->dwSize); - ptr += sprintf(ptr, " - dwValidData = 0x%08X ( %s)\n", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); - if (pDesc->dwValidData & DMUS_OBJ_CLASS) ptr += sprintf(ptr, " - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) ptr += sprintf(ptr, " - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) ptr += sprintf(ptr, " - ftDate = %s\n", debugstr_filetime (&pDesc->ftDate)); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) ptr += sprintf(ptr, " - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); - if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", - wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); - if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream); - - return wine_dbg_sprintf("%s", buffer); - } else { - return wine_dbg_sprintf("(NULL)"); - } +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) +{ + if (!TRACE_ON(dmime)) + return; + + if (pDesc) { + TRACE_(dmime)("DMUS_OBJECTDESC (%p):", pDesc); + TRACE_(dmime)(" - dwSize = 0x%08X\n", pDesc->dwSize); + TRACE_(dmime)(" - dwValidData = 0x%08X ( %s)\n", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); + if (pDesc->dwValidData & DMUS_OBJ_CLASS) + TRACE_(dmime)(" - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); + if (pDesc->dwValidData & DMUS_OBJ_OBJECT) + TRACE_(dmime)(" - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); + if (pDesc->dwValidData & DMUS_OBJ_DATE) + TRACE_(dmime)(" - ftDate = %s\n", debugstr_filetime (&pDesc->ftDate)); + if (pDesc->dwValidData & DMUS_OBJ_VERSION) + TRACE_(dmime)(" - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); + if (pDesc->dwValidData & DMUS_OBJ_NAME) + TRACE_(dmime)(" - wszName = %s\n", debugstr_w(pDesc->wszName)); + if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) + TRACE_(dmime)(" - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); + if (pDesc->dwValidData & DMUS_OBJ_FILENAME) + TRACE_(dmime)(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) + TRACE_(dmime)(" - llMemLength = 0x%s\n - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), + pDesc->pbMemData); + if (pDesc->dwValidData & DMUS_OBJ_STREAM) + TRACE_(dmime)(" - pStream = %p\n", pDesc->pStream); + } } diff --git a/dlls/dmstyle/dmutils.h b/dlls/dmstyle/dmutils.h index e2902875dc..f2b469806f 100644 --- a/dlls/dmstyle/dmutils.h +++ b/dlls/dmstyle/dmutils.h @@ -58,6 +58,6 @@ extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; /* dump whole DMUS_OBJECTDESC struct */ -extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; +extern void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) DECLSPEC_HIDDEN; #endif /* __WINE_DMUTILS_H */ diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index b3a3b83f39..4e84a3edc3 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -234,7 +234,7 @@ static HRESULT WINAPI style_IDirectMusicObject_ParseDescriptor(IDirectMusicObjec desc->guidClass = CLSID_DirectMusicStyle; desc->dwValidData |= DMUS_OBJ_CLASS; - TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (desc)); + dump_DMUS_OBJECTDESC(desc); return S_OK; }

1 0

Vincent Povirk : windowscodecs: Fix tiffformat test on current Windows 10.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: 546ab20cf350321aefe1b4ebee193d055c842f12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=546ab20cf350321aefe1b4eb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 20 11:28:55 2019 -0600 windowscodecs: Fix tiffformat test on current Windows 10. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/tiffformat.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 2f9a0ca65f..861e620e44 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -405,7 +405,6 @@ static void test_QueryCapability(void) WICBitmapDecoderCapabilityCanDecodeSomeImages; DWORD capability; LARGE_INTEGER pos; - ULARGE_INTEGER cur_pos; UINT frame_count; stream = create_stream(&tiff_1bpp_data, sizeof(tiff_1bpp_data)); @@ -442,11 +441,9 @@ static void test_QueryCapability(void) ok(hr == S_OK, "GetFrame error %#x\n", hr); IWICBitmapFrameDecode_Release(frame); - pos.QuadPart = 0; - hr = IStream_Seek(stream, pos, SEEK_CUR, &cur_pos); + pos.QuadPart = 5; + hr = IStream_Seek(stream, pos, SEEK_SET, NULL); ok(hr == S_OK, "IStream_Seek error %#x\n", hr); - ok(cur_pos.QuadPart > 4 && cur_pos.QuadPart < sizeof(tiff_1bpp_data), - "current stream pos is at %x/%x\n", cur_pos.u.LowPart, cur_pos.u.HighPart); hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability); ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); @@ -456,6 +453,7 @@ static void test_QueryCapability(void) IWICBitmapDecoder_Release(decoder); + /* CreateDecoderFromStream fails if seeked past the start */ hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); todo_wine ok(hr == WINCODEC_ERR_COMPONENTNOTFOUND, "expected WINCODEC_ERR_COMPONENTNOTFOUND, got %#x\n", hr);

1 0

Zebediah Figura : quartz/tests: Add some tests for VMR7 filter state.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: 6bac59199096feae36ce3fb0381007894f77adf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bac59199096feae36ce3fb0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 20 21:06:26 2019 -0600 quartz/tests: Add some tests for VMR7 filter state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 226 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 226 insertions(+) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index fdd493c089..eb39a66742 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -22,6 +22,7 @@ #include "dshow.h" #include "d3d9.h" #include "vmr9.h" +#include "wine/heap.h" #include "wine/strmbase.h" #include "wine/test.h" @@ -1010,6 +1011,215 @@ static void test_allocator(IMemInputPin *input) IMemAllocator_Release(req_allocator); } +struct frame_thread_params +{ + IMemInputPin *sink; + IMediaSample *sample; +}; + +static DWORD WINAPI frame_thread(void *arg) +{ + struct frame_thread_params *params = arg; + HRESULT hr; + + if (winetest_debug > 1) trace("%04x: Sending frame.\n", GetCurrentThreadId()); + hr = IMemInputPin_Receive(params->sink, params->sample); + if (winetest_debug > 1) trace("%04x: Returned %#x.\n", GetCurrentThreadId(), hr); + IMediaSample_Release(params->sample); + heap_free(params); + return hr; +} + +static HANDLE send_frame(IMemInputPin *sink) +{ + struct frame_thread_params *params = heap_alloc(sizeof(*params)); + REFERENCE_TIME start_time, end_time; + IMemAllocator *allocator; + IMediaSample *sample; + HANDLE thread; + HRESULT hr; + BYTE *data; + + hr = IMemInputPin_GetAllocator(sink, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + memset(data, 0x55, 32 * 16 * 4); + + hr = IMediaSample_SetActualDataLength(sample, 32 * 16 * 4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + start_time = 0; + end_time = start_time + 10000000; + hr = IMediaSample_SetTime(sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + params->sink = sink; + params->sample = sample; + thread = CreateThread(NULL, 0, frame_thread, params, 0, NULL); + + IMemAllocator_Release(allocator); + return thread; +} + +static HRESULT join_thread_(int line, HANDLE thread) +{ + DWORD ret; + ok_(__FILE__, line)(!WaitForSingleObject(thread, 1000), "Wait failed.\n"); + GetExitCodeThread(thread, &ret); + CloseHandle(thread); + return ret; +} +#define join_thread(a) join_thread_(__LINE__, a) + +static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) +{ + IMemAllocator *allocator; + IMediaControl *control; + IMediaSample *sample; + OAFilterState state; + HANDLE thread; + HRESULT hr; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + + thread = send_frame(input); + hr = join_thread(thread); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + /* The renderer is not fully paused until it receives a sample. The thread + * sending the sample blocks in IMemInputPin_Receive() until the filter is + * stopped or run. */ + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* The sink will decommit our allocator for us when stopping, however it + * will not recommit it when pausing. */ + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + todo_wine ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#x.\n", hr); + if (hr == S_OK) IMediaSample_Release(sample); + + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + thread = send_frame(input); + hr = join_thread(thread); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + thread = send_frame(input); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + hr = IMediaControl_Run(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IMemAllocator_Release(allocator); + IMediaControl_Release(control); +} + static void test_connect_pin(void) { VIDEOINFOHEADER vih = @@ -1028,9 +1238,11 @@ static void test_connect_pin(void) .cbFormat = sizeof(vih), .pbFormat = (BYTE *)&vih, }; + ALLOCATOR_PROPERTIES req_props = {1, 32 * 16 * 4, 1, 0}, ret_props; IBaseFilter *filter = create_vmr7(VMRMode_Windowed); IFilterGraph2 *graph = create_graph(); struct testfilter source; + IMemAllocator *allocator; IMemInputPin *input; AM_MEDIA_TYPE mt; IPin *pin, *peer; @@ -1128,6 +1340,20 @@ static void test_connect_pin(void) test_allocator(input); + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_SetProperties(allocator, &req_props, &ret_props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!memcmp(&ret_props, &req_props, sizeof(req_props)), "Properties did not match.\n"); + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMemAllocator_Release(allocator); + + hr = IMemInputPin_ReceiveCanBlock(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + test_filter_state(input, graph); + hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, pin);

1 0