June 2019 - Wine-Commits - list.winehq.org

Zhiyi Zhang : winex11.drv: Use generic GetMonitorInfo.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 23b28323cb904bc9823f422ac21aa499690c4e21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23b28323cb904bc9823f422a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 25 16:39:01 2019 +0800 winex11.drv: Use generic GetMonitorInfo. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 23 ----------------- dlls/user32/sysparams.c | 54 +++++++++++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 1 + dlls/winex11.drv/display.c | 12 +++++++++ dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xinerama.c | 40 +++-------------------------- 7 files changed, 72 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=23b28323cb904bc9823f…

1 0

Jacek Caban : tdi.sys: Fix EXTRADLLFLAGS.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: d03f825241d524feadae18c64e79681993ebf95a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d03f825241d524feadae18c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 24 23:34:42 2019 +0200 tdi.sys: Fix EXTRADLLFLAGS. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tdi.sys/Makefile.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/tdi.sys/Makefile.in b/dlls/tdi.sys/Makefile.in index 9d5e05f..eef2fec 100644 --- a/dlls/tdi.sys/Makefile.in +++ b/dlls/tdi.sys/Makefile.in @@ -1,7 +1,6 @@ MODULE = tdi.sys -EXTRADLLFLAGS = -Wl,--subsystem,native -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native C_SRCS = \ main.c

1 0

Alexandre Julliard : vssapi: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: d31da0443bbc1632272070b37f6f48dca7557e88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d31da0443bbc1632272070b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:39:58 2019 +0200 vssapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vssapi/Makefile.in | 2 ++ dlls/vssapi/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vssapi/Makefile.in b/dlls/vssapi/Makefile.in index 867a562..f04be0e 100644 --- a/dlls/vssapi/Makefile.in +++ b/dlls/vssapi/Makefile.in @@ -1,4 +1,6 @@ MODULE = vssapi.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/vssapi/main.c b/dlls/vssapi/main.c index 526772a..ce06ca2 100644 --- a/dlls/vssapi/main.c +++ b/dlls/vssapi/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h" #include "winbase.h"

1 0

Alexandre Julliard : usp10: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 8355a2018921bc9018a7c5622324ab0da083af14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8355a2018921bc9018a7c562… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:34:11 2019 +0200 usp10: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/Makefile.in | 2 ++ dlls/usp10/bidi.c | 4 +--- dlls/usp10/breaking.c | 2 +- dlls/usp10/indic.c | 2 +- dlls/usp10/opentype.c | 2 +- dlls/usp10/usp10.c | 15 +++++++-------- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/usp10/Makefile.in b/dlls/usp10/Makefile.in index 68d85fb..5b705e7 100644 --- a/dlls/usp10/Makefile.in +++ b/dlls/usp10/Makefile.in @@ -2,6 +2,8 @@ MODULE = usp10.dll IMPORTLIB = usp10 IMPORTS = advapi32 user32 gdi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ bidi.c \ bracket.c \ diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 1f04dd4..7de2be5 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -41,8 +41,6 @@ * has been modified. */ -#include "config.h" - #include <stdarg.h> #include <stdlib.h> #include "windef.h" @@ -640,7 +638,7 @@ typedef struct tagBracketPair int end; } BracketPair; -static int compr(const void *a, const void* b) +static int __cdecl compr(const void *a, const void* b) { return ((BracketPair*)a)->start - ((BracketPair*)b)->start; } diff --git a/dlls/usp10/breaking.c b/dlls/usp10/breaking.c index 9b12d9e..480d692 100644 --- a/dlls/usp10/breaking.c +++ b/dlls/usp10/breaking.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#include "config.h" + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index 5a228e8..b537eb2 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#include "config.h" + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 5363271..a6ce760 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -658,7 +658,7 @@ static VOID *load_CMAP_format12_table(HDC hdc, ScriptCache *psc) return NULL; } -static int compare_group(const void *a, const void* b) +static int __cdecl compare_group(const void *a, const void* b) { const DWORD *chr = a; const CMAP_SegmentedCoverage_group *group = b; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a2e1a73..3cc6665 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -40,7 +40,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); @@ -876,7 +875,7 @@ static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc) return E_INVALIDARG; } /* Ensure canonical result by zeroing extra space in lfFaceName */ - size = strlenW(lf.lfFaceName); + size = lstrlenW(lf.lfFaceName); memset(lf.lfFaceName + size, 0, sizeof(lf.lfFaceName) - size * sizeof(WCHAR)); EnterCriticalSection(&cs_script_cache); @@ -952,7 +951,7 @@ static DWORD decode_surrogate_pair(const WCHAR *str, unsigned int index, unsigne return 0; } -static int usp10_compare_script_range(const void *key, const void *value) +static int __cdecl usp10_compare_script_range(const void *key, const void *value) { const struct usp10_script_range *range = value; const DWORD *ch = key; @@ -978,7 +977,7 @@ static enum usp10_script get_char_script(const WCHAR *str, unsigned int index, return Script_CR; /* These punctuation characters are separated out as Latin punctuation */ - if (strchrW(latin_punc,str[index])) + if (wcschr(latin_punc,str[index])) return Script_Punctuation2; /* These chars are itemized as Punctuation by Windows */ @@ -1023,7 +1022,7 @@ static enum usp10_script get_char_script(const WCHAR *str, unsigned int index, return range->script; } -static int compare_FindGlyph(const void *a, const void* b) +static int __cdecl compare_FindGlyph(const void *a, const void* b) { const FindGlyph_struct *find = (FindGlyph_struct*)a; const WORD *idx= (WORD*)b; @@ -1534,7 +1533,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, { if (i > 0 && i < cInChars-1 && script_is_numeric(scripts[i-1]) && - strchrW(math_punc, pwcInChars[i])) + wcschr(math_punc, pwcInChars[i])) { if (script_is_numeric(scripts[i+1])) { @@ -1543,7 +1542,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, strength[i] = strength[i-1]; i++; } - else if (strchrW(repeatable_math_punc, pwcInChars[i])) + else if (wcschr(repeatable_math_punc, pwcInChars[i])) { int j; for (j = i+1; j < cInChars; j++) @@ -1967,7 +1966,7 @@ static void find_fallback_font(enum usp10_script scriptid, WCHAR *FaceName) DWORD count = LF_FACESIZE * sizeof(WCHAR); DWORD type; - sprintfW(value, szFmt, scriptInformation[scriptid].scriptTag); + swprintf(value, ARRAY_SIZE(value), szFmt, scriptInformation[scriptid].scriptTag); if (RegQueryValueExW(hkey, value, 0, &type, (BYTE *)FaceName, &count)) lstrcpyW(FaceName,scriptInformation[scriptid].fallbackFont); RegCloseKey(hkey);

1 0

Alexandre Julliard : userenv: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 048588ed398d3c1105f32409a7025641514f8a22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=048588ed398d3c1105f32409… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:33:34 2019 +0200 userenv: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/userenv/Makefile.in | 2 ++ dlls/userenv/userenv_main.c | 25 ++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/userenv/Makefile.in b/dlls/userenv/Makefile.in index c71dc93..df719af 100644 --- a/dlls/userenv/Makefile.in +++ b/dlls/userenv/Makefile.in @@ -2,5 +2,7 @@ MODULE = userenv.dll IMPORTS = advapi32 IMPORTLIB = userenv +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ userenv_main.c diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 4a38c9a..b811c83 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -32,7 +32,6 @@ #include "userenv.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL( userenv ); @@ -98,7 +97,7 @@ static void set_registry_variables(WCHAR **env, HKEY hkey, DWORD type, BOOL set_ { static const WCHAR SystemRootW[] = {'S','y','s','t','e','m','R','o','o','t',0}; static const WCHAR SystemDriveW[] = {'S','y','s','t','e','m','D','r','i','v','e',0}; - static const WCHAR PATHW[] = {'P','A','T','H'}; + static const WCHAR PATHW[] = {'P','A','T','H',0}; UNICODE_STRING us_name, us_value; WCHAR name[1024], value[1024]; @@ -111,19 +110,19 @@ static void set_registry_variables(WCHAR **env, HKEY hkey, DWORD type, BOOL set_ if (ret != ERROR_SUCCESS) break; - if (!strcmpiW(name, SystemRootW)) continue; - if (!strcmpiW(name, SystemDriveW)) continue; + if (!wcsicmp(name, SystemRootW)) continue; + if (!wcsicmp(name, SystemDriveW)) continue; RtlInitUnicodeString(&us_name, name); us_value.Buffer = value; us_value.MaximumLength = sizeof(value); - if (!strncmpiW(name, PATHW, ARRAY_SIZE(PATHW)) && + if (!wcsnicmp(name, PATHW, ARRAY_SIZE(PATHW)) && !RtlQueryEnvironmentVariable_U(*env, &us_name, &us_value)) { if (!set_path) continue; - size = strlenW(value)+1; + size = lstrlenW(value)+1; if (!get_reg_value(*env, hkey, name, value+size, sizeof(value)-size*sizeof(WCHAR))) continue; @@ -314,7 +313,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, { if (get_reg_value(env, hkey, ProfilesDirectoryW, profiles_dir, MAX_PATH-sizeof(WCHAR))) { - len = strlenW(profiles_dir); + len = lstrlenW(profiles_dir); if (profiles_dir[len-1] != '\\') { profiles_dir[len++] = '\\'; @@ -350,7 +349,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, { if (profiles_dir[0]) { - len = strlenW(profiles_dir); + len = lstrlenW(profiles_dir); if (len*sizeof(WCHAR)+sizeof(DefaultW) < sizeof(buf)) { memcpy(buf, profiles_dir, len*sizeof(WCHAR)); @@ -382,7 +381,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, return FALSE; } - len = strlenW(profiles_dir); + len = lstrlenW(profiles_dir); memcpy(buf, profiles_dir, len*sizeof(WCHAR)); size = UNICODE_STRING_MAX_CHARS-len; @@ -402,7 +401,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, } HeapFree(GetProcessHeap(), 0, token_user); - strcpyW(buf, sidW); + lstrcpyW(buf, sidW); LocalFree(sidW); } @@ -541,9 +540,9 @@ BOOL WINAPI GetUserProfileDirectoryW( HANDLE hToken, LPWSTR lpProfileDir, *lpcchSize = len; goto done; } - strcpyW( lpProfileDir, dirW ); - strcatW( lpProfileDir, slashW ); - strcatW( lpProfileDir, userW ); + lstrcpyW( lpProfileDir, dirW ); + lstrcatW( lpProfileDir, slashW ); + lstrcatW( lpProfileDir, userW ); *lpcchSize = len; ret = TRUE;

1 0

Alexandre Julliard : usbd.sys: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 503d5ef50d8abf1e9ecf842bdf44747fea382d39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=503d5ef50d8abf1e9ecf842b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:30:21 2019 +0200 usbd.sys: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usbd.sys/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usbd.sys/Makefile.in b/dlls/usbd.sys/Makefile.in index d4e47a9..b756bf7 100644 --- a/dlls/usbd.sys/Makefile.in +++ b/dlls/usbd.sys/Makefile.in @@ -1,7 +1,7 @@ MODULE = usbd.sys IMPORTLIB = usbd IMPORTS = ntoskrnl -EXTRADLLFLAGS = -Wl,--subsystem,native +EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native C_SRCS = \ usbd.c

1 0

Zebediah Figura : quartz/memallocator: Set the AM_SAMPLE_TYPECHANGED flag.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: daaf546f42f7c3956af00ae40f14ca24b15cf49f URL: https://source.winehq.org/git/wine.git/?a=commit;h=daaf546f42f7c3956af00ae4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 24 20:05:19 2019 -0500 quartz/memallocator: Set the AM_SAMPLE_TYPECHANGED flag. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/memallocator.c | 7 +++++++ dlls/quartz/tests/memallocator.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 91c2373..5ac8a72 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -685,8 +685,15 @@ static HRESULT WINAPI StdMediaSample2_SetMediaType(IMediaSample2 * iface, AM_MED DeleteMediaType(This->props.pMediaType); This->props.pMediaType = NULL; } + if (!pMediaType) + { + This->props.dwSampleFlags &= ~AM_SAMPLE_TYPECHANGED; return S_OK; + } + + This->props.dwSampleFlags |= AM_SAMPLE_TYPECHANGED; + if (!(This->props.pMediaType = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) return E_OUTOFMEMORY; diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c index 9bbfd42..164f3af 100644 --- a/dlls/quartz/tests/memallocator.c +++ b/dlls/quartz/tests/memallocator.c @@ -509,7 +509,7 @@ static void test_sample_properties(void) hr = IMediaSample2_GetProperties(sample2, sizeof(props), (BYTE *)&props); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(props.dwSampleFlags == AM_SAMPLE_TYPECHANGED, "Got flags %#x.\n", props.dwSampleFlags); + ok(props.dwSampleFlags == AM_SAMPLE_TYPECHANGED, "Got flags %#x.\n", props.dwSampleFlags); ok(!memcmp(props.pMediaType, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); hr = IMediaSample_SetMediaType(sample, NULL);

1 0

Alexandre Julliard : virtdisk: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: c46a54d6bb92f801a3cc869495a26c95e981e680 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c46a54d6bb92f801a3cc8694… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:39:11 2019 +0200 virtdisk: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/virtdisk/Makefile.in | 2 ++ dlls/virtdisk/virtdisk_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/virtdisk/Makefile.in b/dlls/virtdisk/Makefile.in index b91f0e2..463e1ac 100644 --- a/dlls/virtdisk/Makefile.in +++ b/dlls/virtdisk/Makefile.in @@ -1,4 +1,6 @@ MODULE = virtdisk.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ virtdisk_main.c diff --git a/dlls/virtdisk/virtdisk_main.c b/dlls/virtdisk/virtdisk_main.c index 2d384cb..630a97b 100644 --- a/dlls/virtdisk/virtdisk_main.c +++ b/dlls/virtdisk/virtdisk_main.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : vbscript: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 3911e6696a2399992b0e37f9b54d7ce5ed2d8840 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3911e6696a2399992b0e37f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:38:01 2019 +0200 vbscript: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/Makefile.in | 2 ++ dlls/vbscript/compile.c | 26 +++++++++++++------------- dlls/vbscript/global.c | 20 ++++++++++---------- dlls/vbscript/interp.c | 20 ++++++++++---------- dlls/vbscript/lex.c | 26 ++++++++++++-------------- dlls/vbscript/parser.y | 6 +++--- dlls/vbscript/regexp.c | 28 ++++++++++++++-------------- dlls/vbscript/vbdisp.c | 10 +++++----- dlls/vbscript/vbregexp.c | 4 ++-- dlls/vbscript/vbscript.c | 2 +- dlls/vbscript/vbscript.h | 12 ++---------- 11 files changed, 74 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3911e6696a2399992b0e…

1 0

Zebediah Figura : quartz/memallocator: Return S_OK when clearing the media type.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 838f68341f74fe80c3f0329e9696bdc11ad5920a URL: https://source.winehq.org/git/wine.git/?a=commit;h=838f68341f74fe80c3f0329e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 24 20:05:18 2019 -0500 quartz/memallocator: Return S_OK when clearing the media type. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/memallocator.c | 2 +- dlls/quartz/tests/memallocator.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index b7dff8c..91c2373 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -686,7 +686,7 @@ static HRESULT WINAPI StdMediaSample2_SetMediaType(IMediaSample2 * iface, AM_MED This->props.pMediaType = NULL; } if (!pMediaType) - return S_FALSE; + return S_OK; if (!(This->props.pMediaType = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) return E_OUTOFMEMORY; diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c index 3868312..9bbfd42 100644 --- a/dlls/quartz/tests/memallocator.c +++ b/dlls/quartz/tests/memallocator.c @@ -487,7 +487,7 @@ static void test_sample_properties(void) ok(!mt, "Got media type %p.\n", mt); hr = IMediaSample_SetMediaType(sample, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); mt = (AM_MEDIA_TYPE *)0xdeadbeef; hr = IMediaSample_GetMediaType(sample, &mt); @@ -513,7 +513,7 @@ static void test_sample_properties(void) ok(!memcmp(props.pMediaType, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); hr = IMediaSample_SetMediaType(sample, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); mt = (AM_MEDIA_TYPE *)0xdeadbeef; hr = IMediaSample_GetMediaType(sample, &mt);

1 0