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

Alexandre Julliard : Release 4.6.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: fabde842ede40fc53cf6f5743d5b477841f7b11c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fabde842ede40fc53cf6f574… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 20:10:12 2019 +0200 Release 4.6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 995 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 516 insertions(+), 501 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fabde842ede40fc53cf6…

1 0

Alexandre Julliard : sfnt2fon: Avoid using wine/unicode.h on Windows.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: 3c29cc446bfbe69dd17dcab2061677f5a63af741 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c29cc446bfbe69dd17dcab2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 13:29:49 2019 +0200 sfnt2fon: Avoid using wine/unicode.h on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/sfnt2fon/sfnt2fon.c | 64 ++++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 23 deletions(-) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index 25f0763..9dfc178 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -41,7 +41,8 @@ #include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TAGS_H -#include "wine/unicode.h" +#include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "basetsd.h" @@ -340,15 +341,40 @@ static int lookup_charset(int enc) return OEM_CHARSET; } -static int get_char(const union cptable *cptable, int enc, int index) +#ifdef _WIN32 + +static void get_char_table(int enc, WCHAR tableW[0x100]) { - /* Korean has the Won sign in place of '\\' */ - if(enc == 949 && index == '\\') - return 0x20a9; + int i; + char tableA[0x100]; - return cptable->sbcs.cp2uni[index]; + if (!GetCPInfo( enc, &info )) error("Can't find codepage %d\n", enc); + if (info.MaxCharSize > 1) enc = 1252; + + for (i = 0; i < 0x100; i++) tableA[i] = i; + MultiByteToWideChar( enc, 0, tableA, 0x100, tableW, 0x100 ); } +#else /* _WIN32 */ + +#include "wine/unicode.h" + +static void get_char_table(int enc, WCHAR tableW[0x100]) +{ + int i; + char tableA[0x100]; + const union cptable *cptable = wine_cp_get_table(enc); + + if (!cptable) error("Can't find codepage %d\n", enc); + /* for double byte charsets we actually want to use cp1252 */ + if (cptable->info.char_size != 1) cptable = wine_cp_get_table(1252); + + for (i = 0; i < 0x100; i++) tableA[i] = i; + wine_cp_mbstowcs( cptable, 0, tableA, 0x100, tableW, 0x100 ); +} + +#endif /* _WIN32 */ + static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, int dpi, unsigned char def_char, int avg_width ) { @@ -359,7 +385,6 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, int i, x, y, x_off, x_end, first_char; FT_UInt gi; int num_names; - const union cptable *cptable; FT_SfntName sfntname; TT_OS2 *os2; FT_ULong needed; @@ -368,22 +393,17 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, int num_sizes; struct fontinfo *info; size_t data_pos; + WCHAR table[0x100]; if (FT_New_Face(ft_library, face_name, 0, &face)) error( "Cannot open face %s\n", face_name ); if (FT_Set_Pixel_Sizes(face, ppem, ppem)) error( "cannot set face size to %u\n", ppem ); - cptable = wine_cp_get_table(enc); - if(!cptable) - error("Can't find codepage %d\n", enc); + assert( face->size->metrics.y_ppem == ppem ); - if(cptable->info.char_size != 1) { - /* for double byte charsets we actually want to use cp1252 */ - cptable = wine_cp_get_table(1252); - if(!cptable) - error("Can't find codepage 1252\n"); - } + get_char_table( enc, table ); - assert( face->size->metrics.y_ppem == ppem ); + /* Korean has the Won sign in place of '\\' */ + if (enc == 949) table['\\'] = 0x20a9; needed = 0; if (FT_Load_Sfnt_Table(face, TTAG_EBLC, 0, NULL, &needed)) @@ -462,12 +482,11 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, os2 = FT_Get_Sfnt_Table(face, ft_sfnt_os2); for(i = first_char; i < 0x100; i++) { - int c = get_char(cptable, enc, i); - gi = FT_Get_Char_Index(face, c); + gi = FT_Get_Char_Index(face, table[i]); if(gi == 0 && !option_quiet) fprintf(stderr, "warning: %s %u: missing glyph for char %04x\n", - face->family_name, ppem, cptable->sbcs.cp2uni[i]); - if(FT_Load_Char(face, c, FT_LOAD_DEFAULT)) { + face->family_name, ppem, table[i]); + if(FT_Load_Char(face, table[i], FT_LOAD_DEFAULT)) { fprintf(stderr, "error loading char %d - bad news!\n", i); continue; } @@ -546,8 +565,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, data_pos = 0; for(i = first_char; i < 0x100; i++) { - int c = get_char(cptable, enc, i); - if(FT_Load_Char(face, c, FT_LOAD_DEFAULT)) { + if(FT_Load_Char(face, table[i], FT_LOAD_DEFAULT)) { continue; } assert(info->dfCharTable[i].width == face->glyph->metrics.horiAdvance >> 6);

1 0

Alexandre Julliard : wrc: Avoid using wine/unicode.h on Windows.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: ab6e4c8b735aa28112fbc6ec876d8881ef6498f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab6e4c8b735aa28112fbc6ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 12:59:59 2019 +0200 wrc: Avoid using wine/unicode.h on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/parser.l | 2 +- tools/wrc/parser.y | 46 ++++++++++++++++++++---------------- tools/wrc/po.c | 37 +++++++++++++---------------- tools/wrc/utils.c | 67 ++++++++++++++++++++++++++++++++++++++-------------- tools/wrc/utils.h | 1 + tools/wrc/wrc.h | 1 - tools/wrc/wrctypes.h | 3 --- 7 files changed, 94 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab6e4c8b735aa28112fb…

1 0

Alexandre Julliard : wmc: Avoid using wine/unicode.h on Windows.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: cd372015174205555eb6819b3828c39928795574 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd372015174205555eb6819b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 12:14:59 2019 +0200 wmc: Avoid using wine/unicode.h on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/lang.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- tools/wmc/lang.h | 6 ++++-- tools/wmc/mcl.c | 9 ++------- tools/wmc/mcy.y | 4 ++-- tools/wmc/po.c | 6 +++--- tools/wmc/write.c | 29 +++++------------------------ 6 files changed, 68 insertions(+), 41 deletions(-) diff --git a/tools/wmc/lang.c b/tools/wmc/lang.c index 07022f7..99a27cf 100644 --- a/tools/wmc/lang.c +++ b/tools/wmc/lang.c @@ -168,7 +168,7 @@ void show_languages(void) printf(" Code | DOS-cp | WIN-cp | Language | Country\n"); printf("-------+--------+--------+--------------+---------\n"); for(i = 0; i < ARRAY_SIZE(languages); i++) - printf("0x%04x | %5d | %5d | %-12s | %s\n", + printf("0x%04x | %5d | %5d | %-12s | %s\n", languages[i].id, languages[i].doscp, languages[i].wincp, @@ -187,6 +187,41 @@ const language_t *find_language(unsigned id) sizeof(languages[0]), langcmp); } +#ifdef _WIN32 + +static BOOL CALLBACK proc( char *cp ) +{ + CPINFOEXA info; + GetCPInfoExA( atoi(cp), 0, &info ); + printf("%-5s %s\n", cp, info.CodePageName ); + return TRUE; +} + +void show_codepages(void) +{ + printf("Codepages:\n"); + EnumSystemCodePagesA( proc, 0 ); +} + +int is_valid_codepage(int id) +{ + return IsValidCodePage( id ); +} + +int wmc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) +{ + return MultiByteToWideChar( codepage, flags, src, srclen, dst, dstlen ); +} + +int wmc_wcstombs( int codepage, int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) +{ + return WideCharToMultiByte( codepage, flags, src, srclen, dst, dstlen, NULL, NULL ); +} + +#else /* _WIN32 */ + +#include "wine/unicode.h" + void show_codepages(void) { unsigned i; @@ -198,7 +233,21 @@ void show_codepages(void) } } -const union cptable *find_codepage(int id) +int is_valid_codepage(int id) { - return wine_cp_get_table(id); + return id == CP_UTF8 || wine_cp_get_table(id); } + +int wmc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) +{ + if (codepage == CP_UTF8) return wine_utf8_mbstowcs( flags, src, srclen, dst, dstlen ); + return wine_cp_mbstowcs( wine_cp_get_table( codepage ), flags, src, srclen, dst, dstlen ); +} + +int wmc_wcstombs( int codepage, int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) +{ + if (codepage == CP_UTF8) return wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); + return wine_cp_wcstombs( wine_cp_get_table( codepage ), flags, src, srclen, dst, dstlen, NULL, NULL ); +} + +#endif /* _WIN32 */ diff --git a/tools/wmc/lang.h b/tools/wmc/lang.h index 5a11c5b..660995b 100644 --- a/tools/wmc/lang.h +++ b/tools/wmc/lang.h @@ -21,7 +21,7 @@ #ifndef __WMC_LANG_H #define __WMC_LANG_H -#include "wine/unicode.h" +#include "winnls.h" typedef struct language { unsigned id; @@ -34,6 +34,8 @@ typedef struct language { void show_languages(void); const language_t *find_language(unsigned id); void show_codepages(void); -const union cptable *find_codepage(int id); +int is_valid_codepage(int id); +int wmc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ); +int wmc_wcstombs( int codepage, int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); #endif diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index 0a57e2b..68d2444 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -149,13 +149,11 @@ static int isisochar(int ch) } static int codepage; -static const union cptable *codepage_def; void set_codepage(int cp) { codepage = cp; - codepage_def = find_codepage(codepage); - if(!codepage_def && codepage != CP_UTF8) + if (!is_valid_codepage( cp )) xyyerror("Codepage %d not found; cannot process\n", codepage); } @@ -200,10 +198,7 @@ try_again: xyyerror(err_fatalread); else if(!cptr) return 0; - if (codepage_def) - n = wine_cp_mbstowcs(codepage_def, 0, xlatebuffer, strlen(xlatebuffer)+1, inputbuffer, INPUTBUFFER_SIZE); - else - n = wine_utf8_mbstowcs(0, xlatebuffer, strlen(xlatebuffer)+1, inputbuffer, INPUTBUFFER_SIZE); + n = wmc_mbstowcs(codepage, 0, xlatebuffer, strlen(xlatebuffer)+1, inputbuffer, INPUTBUFFER_SIZE); if(n < 0) internal_error(__FILE__, __LINE__, "Could not translate to unicode (%d)\n", n); if(n <= 1) diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index 54403d5..f1d3458 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -254,9 +254,9 @@ cmap : clan '=' tNUMBER ':' tNUMBER { static const char err_nocp[] = "Codepage %d not builtin; cannot convert\n"; if(find_cpxlat($1)) xyyerror("Codepage translation already defined for language 0x%x\n", $1); - if($3 && $3 != CP_UTF8 && !find_codepage($3)) + if($3 && !is_valid_codepage($3)) xyyerror(err_nocp, $3); - if($5 && $5 != CP_UTF8 && !find_codepage($5)) + if($5 && !is_valid_codepage($5)) xyyerror(err_nocp, $5); add_cpxlat($1, $3, $5); } diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 6986bc9..8a8064a 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -405,7 +405,7 @@ static char *get_message_context( char **msgid ) static char *convert_string_utf8( const lanmsg_t *msg ) { char *buffer = xmalloc( msg->len * 4 + 1 ); - int len = wine_utf8_wcstombs( 0, msg->msg, msg->len, buffer, msg->len * 4 ); + int len = wmc_wcstombs( CP_UTF8, 0, msg->msg, msg->len, buffer, msg->len * 4 ); buffer[len] = 0; return buffer; } @@ -656,9 +656,9 @@ static lanmsg_t *translate_string( lanmsg_t *str, int lang, int *found ) new->cp = 0; /* FIXME */ new->file = str->file; new->line = str->line; - new->len = wine_utf8_mbstowcs( 0, transl, strlen(transl) + 1, NULL, 0 ); + new->len = wmc_mbstowcs( CP_UTF8, 0, transl, strlen(transl) + 1, NULL, 0 ); new->msg = xmalloc( new->len * sizeof(WCHAR) ); - res = wine_utf8_mbstowcs( MB_ERR_INVALID_CHARS, transl, strlen(transl) + 1, new->msg, new->len ); + res = wmc_mbstowcs( CP_UTF8, MB_ERR_INVALID_CHARS, transl, strlen(transl) + 1, new->msg, new->len ); if (res == -2) error( "Invalid utf-8 character in string '%s'\n", transl ); free( buffer ); diff --git a/tools/wmc/write.c b/tools/wmc/write.c index 19cd5b3..59cb869 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -98,17 +98,11 @@ static char *dup_u2c(int cp, const WCHAR *uc) { int len; char *cptr; - const union cptable *cpdef = find_codepage(cp); - if(cpdef) - len = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, NULL, 0, NULL, NULL); - else - len = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, NULL, 0); + if (!cp) cp = CP_UTF8; + len = wmc_wcstombs(cp, 0, uc, unistrlen(uc)+1, NULL, 0); cptr = xmalloc(len); - if (cpdef) - len = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, cptr, len, NULL, NULL); - else - len = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, cptr, len); + len = wmc_wcstombs(cp, 0, uc, unistrlen(uc)+1, cptr, len); if (len < 0) internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", len); return cptr; @@ -385,21 +379,8 @@ static char *make_string(WCHAR *uc, int len, int codepage) else { char *tmp, *cc; - int mlen; - const union cptable *cpdef = find_codepage(codepage); - - if (cpdef) - mlen = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, NULL, 0, NULL, NULL); - else - mlen = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, NULL, 0); - cc = tmp = xmalloc(mlen); - if (cpdef) { - if((i = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, tmp, mlen, NULL, NULL)) < 0) - internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", i); - } else { - if((i = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, tmp, mlen)) < 0) - internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", i); - } + + cc = tmp = dup_u2c(codepage, uc); *cptr++ = ' '; *cptr++ = '"'; for(i = b = 0; i < len; i++, cc++)

1 0

Zebediah Figura : qcap/tests: Add more tests for smart tee pin interfaces.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: 7ca60b90ef0114149f240270f4c592503464087c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ca60b90ef0114149f240270… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 12 00:20:56 2019 -0500 qcap/tests: Add more tests for smart tee pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 88 ++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 39 deletions(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 79d296d..b3b0584 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -63,6 +63,7 @@ static void test_interfaces(void) { IBaseFilter *filter = create_smart_tee(); ULONG ref; + IPin *pin; check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); @@ -82,6 +83,54 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAMStreamConfig, FALSE); + check_interface(pin, &IID_IAMStreamControl, FALSE); + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IPropertyBag, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, capture_id, &pin); + + todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAMStreamConfig, FALSE); + check_interface(pin, &IID_IAsyncReader, FALSE); + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IPropertyBag, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, preview_id, &pin); + + todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAMStreamConfig, FALSE); + check_interface(pin, &IID_IAsyncReader, FALSE); + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IPropertyBag, FALSE); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); ok(!ref, "Got unexpected refcount %d.\n", ref); } @@ -1842,21 +1891,6 @@ static SourceFilter* create_audio_SourceFilter(void) return This; } -static BOOL has_interface(IUnknown *unknown, REFIID uuid) -{ - HRESULT hr; - IUnknown *iface = NULL; - - hr = IUnknown_QueryInterface(unknown, uuid, (void**)&iface); - if (SUCCEEDED(hr)) - { - IUnknown_Release(iface); - return TRUE; - } - else - return FALSE; -} - static void test_smart_tee_filter_in_graph(IBaseFilter *smartTeeFilter, IPin *inputPin, IPin *capturePin, IPin *previewPin) { @@ -2036,30 +2070,6 @@ static void test_smart_tee_filter(void) if (!(inputPin && capturePin && previewPin)) goto end; - ok(has_interface((IUnknown*)inputPin, &IID_IUnknown), "IUnknown should exist on the input pin\n"); - ok(has_interface((IUnknown*)inputPin, &IID_IMemInputPin), "IMemInputPin should exist the input pin\n"); - ok(!has_interface((IUnknown*)inputPin, &IID_IKsPropertySet), "IKsPropertySet shouldn't exist on the input pin\n"); - ok(!has_interface((IUnknown*)inputPin, &IID_IAMStreamConfig), "IAMStreamConfig shouldn't exist on the input pin\n"); - ok(!has_interface((IUnknown*)inputPin, &IID_IAMStreamControl), "IAMStreamControl shouldn't exist on the input pin\n"); - ok(!has_interface((IUnknown*)inputPin, &IID_IPropertyBag), "IPropertyBag shouldn't exist on the input pin\n"); - todo_wine ok(has_interface((IUnknown*)inputPin, &IID_IQualityControl), "IQualityControl should exist on the input pin\n"); - - ok(has_interface((IUnknown*)capturePin, &IID_IUnknown), "IUnknown should exist on the capture pin\n"); - ok(!has_interface((IUnknown*)capturePin, &IID_IAsyncReader), "IAsyncReader shouldn't exist on the capture pin\n"); - ok(!has_interface((IUnknown*)capturePin, &IID_IKsPropertySet), "IKsPropertySet shouldn't exist on the capture pin\n"); - ok(!has_interface((IUnknown*)capturePin, &IID_IAMStreamConfig), "IAMStreamConfig shouldn't exist on the capture pin\n"); - todo_wine ok(has_interface((IUnknown*)capturePin, &IID_IAMStreamControl), "IAMStreamControl should exist on the capture pin\n"); - ok(!has_interface((IUnknown*)capturePin, &IID_IPropertyBag), "IPropertyBag shouldn't exist on the capture pin\n"); - todo_wine ok(has_interface((IUnknown*)capturePin, &IID_IQualityControl), "IQualityControl should exist on the capture pin\n"); - - ok(has_interface((IUnknown*)previewPin, &IID_IUnknown), "IUnknown should exist on the preview pin\n"); - ok(!has_interface((IUnknown*)previewPin, &IID_IAsyncReader), "IAsyncReader shouldn't exist on the preview pin\n"); - ok(!has_interface((IUnknown*)previewPin, &IID_IKsPropertySet), "IKsPropertySet shouldn't exist on the preview pin\n"); - ok(!has_interface((IUnknown*)previewPin, &IID_IAMStreamConfig), "IAMStreamConfig shouldn't exist on the preview pin\n"); - todo_wine ok(has_interface((IUnknown*)capturePin, &IID_IAMStreamControl), "IAMStreamControl should exist on the preview pin\n"); - ok(!has_interface((IUnknown*)previewPin, &IID_IPropertyBag), "IPropertyBag shouldn't exist on the preview pin\n"); - todo_wine ok(has_interface((IUnknown*)previewPin, &IID_IQualityControl), "IQualityControl should exist on the preview pin\n"); - hr = IPin_QueryInterface(inputPin, &IID_IMemInputPin, (void**)&memInputPin); ok(SUCCEEDED(hr), "couldn't get mem input pin, hr=0x%08x\n", hr); if (FAILED(hr))

1 0

Zebediah Figura : qcap/tests: Add some tests for IBaseFilter::FindPin() on the smart tee filter.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: 4862f8404b13e9509b203da31a47c093eb38617d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4862f8404b13e9509b203da3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 12 00:20:54 2019 -0500 qcap/tests: Add some tests for IBaseFilter::FindPin() on the smart tee filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 45 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index cdd09f0..f931d0b 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -22,6 +22,10 @@ #include "dshow.h" #include "wine/test.h" +static const WCHAR sink_id[] = {'I','n','p','u','t',0}; +static const WCHAR capture_id[] = {'C','a','p','t','u','r','e',0}; +static const WCHAR preview_id[] = {'P','r','e','v','i','e','w',0}; + static HANDLE event; static IBaseFilter *create_smart_tee(void) @@ -222,6 +226,46 @@ static void test_enum_pins(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_find_pin(void) +{ + IBaseFilter *filter = create_smart_tee(); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, capture_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, preview_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + typedef struct { IBaseFilter IBaseFilter_iface; LONG ref; @@ -2216,6 +2260,7 @@ START_TEST(smartteefilter) test_interfaces(); test_enum_pins(); + test_find_pin(); test_smart_tee_filter_aggregation(); test_smart_tee_filter();

1 0

Zebediah Figura : qcap/tests: Add some more tests for IBaseFilter:: EnumPins() on the smart tee filter.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: ea1c56cb6672c13211fdbca39956c18bd873b3b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea1c56cb6672c13211fdbca3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 12 00:20:53 2019 -0500 qcap/tests: Add some more tests for IBaseFilter::EnumPins() on the smart tee filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 148 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 5bcb82d..cdd09f0 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -33,6 +33,13 @@ static IBaseFilter *create_smart_tee(void) return filter; } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -75,6 +82,146 @@ static void test_interfaces(void) ok(!ref, "Got unexpected refcount %d.\n", ref); } +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_smart_tee(); + IEnumPins *enum1, *enum2; + ULONG count, ref; + IPin *pins[4]; + HRESULT hr; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 4, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + IPin_Release(pins[2]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 4); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + typedef struct { IBaseFilter IBaseFilter_iface; LONG ref; @@ -2068,6 +2215,7 @@ START_TEST(smartteefilter) event = CreateEventW(NULL, FALSE, FALSE, NULL); test_interfaces(); + test_enum_pins(); test_smart_tee_filter_aggregation(); test_smart_tee_filter();

1 0

Jacek Caban : ntoskrnl.exe: Open thread with THREAD_QUERY_INFORMATION access in KeGetCurrentThread.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: 2017db7d0af4421357ad58fee880f6eeb162e4f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2017db7d0af4421357ad58fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 12 15:20:28 2019 +0200 ntoskrnl.exe: Open thread with THREAD_QUERY_INFORMATION access in KeGetCurrentThread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 861eb40..3789abd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2510,7 +2510,8 @@ PRKTHREAD WINAPI KeGetCurrentThread(void) HANDLE handle = GetCurrentThread(); /* FIXME: we shouldn't need it, GetCurrentThread() should be client thread already */ - if (GetCurrentThreadId() == request_thread) handle = OpenThread( 0, FALSE, client_tid ); + if (GetCurrentThreadId() == request_thread) + handle = OpenThread( THREAD_QUERY_INFORMATION, FALSE, client_tid ); kernel_object_from_handle( handle, PsThreadType, (void**)&thread ); if (handle != GetCurrentThread()) NtClose( handle );

1 0

Henri Verbeet : dxgi: Slightly simplify d3d11_swapchain_init().
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: 7d351e1168b4f41ca43e67f3b038abaecbefa6b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d351e1168b4f41ca43e67f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 12 17:38:48 2019 +0430 dxgi: Slightly simplify d3d11_swapchain_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 4 ++-- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/swapchain.c | 12 +++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index d6dd041..e3dc52b 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -474,7 +474,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_create_swapchain(IWineDX return E_OUTOFMEMORY; } - if (FAILED(hr = d3d11_swapchain_init(object, device, &wined3d_desc, FALSE))) + if (FAILED(hr = d3d11_swapchain_init(object, device, &wined3d_desc))) { WARN("Failed to initialise swapchain, hr %#x.\n", hr); heap_free(object); @@ -578,7 +578,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l return E_OUTOFMEMORY; } - if (FAILED(hr = d3d11_swapchain_init(swapchain, device, &swapchain_desc, TRUE))) + if (FAILED(hr = d3d11_swapchain_init(swapchain, device, &swapchain_desc))) { WARN("Failed to initialize swapchain, hr %#x.\n", hr); heap_free(swapchain); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 5c5775c..b6999c7 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -178,7 +178,7 @@ struct d3d11_swapchain }; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, - struct wined3d_swapchain_desc *desc, BOOL implicit) DECLSPEC_HIDDEN; + struct wined3d_swapchain_desc *desc) DECLSPEC_HIDDEN; HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *queue, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 17f9a1e..53da208 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -779,16 +779,14 @@ static const struct wined3d_parent_ops d3d11_swapchain_wined3d_parent_ops = }; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, - struct wined3d_swapchain_desc *desc, BOOL implicit) + struct wined3d_swapchain_desc *desc) { HRESULT hr; - /* - * A reference to the implicit swapchain is held by the wined3d device. - * In order to avoid circular references we do not keep a reference - * to the device in the implicit swapchain. - */ - if (!implicit) + /* A reference to the implicit swapchain is held by the wined3d device. In + * order to avoid circular references we do not keep a reference to the + * device in the implicit swapchain. */ + if (!(desc->flags & WINED3D_SWAPCHAIN_IMPLICIT)) { if (desc->backbuffer_format == WINED3DFMT_UNKNOWN) return E_INVALIDARG;

1 0

Henri Verbeet : ddraw: Simplify ddraw_destroy_swapchain().
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: f485816d102e517bc092934348ec9cddf624696b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f485816d102e517bc0929343… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 12 17:38:46 2019 +0430 ddraw: Simplify ddraw_destroy_swapchain(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index cb7c12a..b209772 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -365,44 +365,34 @@ static ULONG WINAPI d3d1_AddRef(IDirect3D *iface) static void ddraw_destroy_swapchain(struct ddraw *ddraw) { + unsigned int i; + HRESULT hr; + TRACE("Destroying the swapchain.\n"); wined3d_swapchain_decref(ddraw->wined3d_swapchain); ddraw->wined3d_swapchain = NULL; - if (!(ddraw->flags & DDRAW_NO3D)) + for (i = 0; i < ddraw->numConvertedDecls; ++i) { - UINT i; + wined3d_vertex_declaration_decref(ddraw->decls[i].decl); + } + heap_free(ddraw->decls); + ddraw->numConvertedDecls = 0; - for (i = 0; i < ddraw->numConvertedDecls; ++i) - { - wined3d_vertex_declaration_decref(ddraw->decls[i].decl); - } - heap_free(ddraw->decls); - ddraw->numConvertedDecls = 0; + if (FAILED(hr = wined3d_device_uninit_3d(ddraw->wined3d_device))) + ERR("Failed to uninit 3D, hr %#x.\n", hr); - if (FAILED(wined3d_device_uninit_3d(ddraw->wined3d_device))) - { - ERR("Failed to uninit 3D.\n"); - } - else - { - /* Free the d3d window if one was created. */ - if (ddraw->d3d_window && ddraw->d3d_window != ddraw->dest_window) - { - TRACE("Destroying the hidden render window %p.\n", ddraw->d3d_window); - DestroyWindow(ddraw->d3d_window); - ddraw->d3d_window = 0; - } - } - - ddraw->flags &= ~DDRAW_D3D_INITIALIZED; - } - else + /* Free the d3d window if one was created. */ + if (ddraw->d3d_window && ddraw->d3d_window != ddraw->dest_window) { - wined3d_device_uninit_3d(ddraw->wined3d_device); + TRACE("Destroying the hidden render window %p.\n", ddraw->d3d_window); + DestroyWindow(ddraw->d3d_window); + ddraw->d3d_window = 0; } + ddraw->flags &= ~DDRAW_D3D_INITIALIZED; + ddraw_set_swapchain_window(ddraw, NULL); TRACE("Swapchain destroyed.\n");

1 0