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

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_unload_numbered_array().
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 7dd4bb2ab650ebe86ba9574ae05e73af9fa5d9a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dd4bb2ab650ebe86ba9574a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 19 04:38:08 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_unload_numbered_array(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 52f1524..c88e2b3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5303,26 +5303,27 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte wined3d_context_gl_load_tex_coords(context_gl, si, &current_bo, state); } -static void context_unload_numbered_array(struct wined3d_context *context, unsigned int i) +static void wined3d_context_gl_unload_numbered_array(struct wined3d_context_gl *context_gl, unsigned int i) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GL_EXTCALL(glDisableVertexAttribArray(i)); checkGLcall("glDisableVertexAttribArray"); if (gl_info->supported[ARB_INSTANCED_ARRAYS]) GL_EXTCALL(glVertexAttribDivisor(i, 0)); - context->numbered_array_mask &= ~(1u << i); + context_gl->c.numbered_array_mask &= ~(1u << i); } static void context_unload_numbered_arrays(struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int i; while (context->numbered_array_mask) { i = wined3d_bit_scan(&context->numbered_array_mask); - context_unload_numbered_array(context, i); + wined3d_context_gl_unload_numbered_array(context_gl, i); } } @@ -5348,7 +5349,7 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c if (!(stream_info->use_map & (1u << i))) { if (context->numbered_array_mask & (1u << i)) - context_unload_numbered_array(context, i); + wined3d_context_gl_unload_numbered_array(context_gl, i); if (!use_vs(state) && i == WINED3D_FFP_DIFFUSE) { if (!(context_gl->default_attrib_value_set & (1u << i)) || !context_gl->diffuse_attrib_to_1) @@ -5385,7 +5386,7 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c /* Unload instanced arrays, they will be loaded using immediate * mode instead. */ if (context->numbered_array_mask & (1u << i)) - context_unload_numbered_array(context, i); + wined3d_context_gl_unload_numbered_array(context_gl, i); context_gl->default_attrib_value_set &= ~(1u << i); continue; } @@ -5435,7 +5436,7 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c ptr += (ULONG_PTR)wined3d_buffer_load_sysmem(stream->buffer, context); if (context->numbered_array_mask & (1u << i)) - context_unload_numbered_array(context, i); + wined3d_context_gl_unload_numbered_array(context_gl, i); switch (format_gl->f.id) {

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_load_vertex_data().
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: f585a301c76b54bbaa00a26801e984240b0297e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f585a301c76b54bbaa00a268… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 19 04:38:07 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_load_vertex_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b1dfa0d..52f1524 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5092,7 +5092,7 @@ void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context checkGLcall("loadTexCoords"); } -/* This should match any arrays loaded in context_load_vertex_data(). */ +/* This should match any arrays loaded in wined3d_context_gl_load_vertex_data(). */ static void wined3d_context_gl_unload_vertex_data(struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; @@ -5108,20 +5108,19 @@ static void wined3d_context_gl_unload_vertex_data(struct wined3d_context_gl *con context_gl->c.namedArraysLoaded = FALSE; } -static void context_load_vertex_data(struct wined3d_context *context, +static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *context_gl, const struct wined3d_stream_info *si, const struct wined3d_state *state) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_stream_info_element *e; const struct wined3d_format_gl *format_gl; GLuint current_bo; - TRACE("context %p, si %p, state %p.\n", context, si, state); + TRACE("context_gl %p, si %p, state %p.\n", context_gl, si, state); /* This is used for the fixed-function pipeline only, and the * fixed-function pipeline doesn't do instancing. */ - context->instance_count = 0; + context_gl->c.instance_count = 0; current_bo = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0u : 0; /* Blend data */ @@ -5556,7 +5555,7 @@ void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context TRACE("Loading named arrays.\n"); context_unload_numbered_arrays(&context_gl->c); - context_load_vertex_data(&context_gl->c, &context_gl->c.stream_info, state); + wined3d_context_gl_load_vertex_data(context_gl, &context_gl->c.stream_info, state); context_gl->c.namedArraysLoaded = TRUE; }

1 0

Alexandre Julliard : riched32: Build with msvcrt.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: d15d53b2e9bc8895dee9143c422f40d79a3bec41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d15d53b2e9bc8895dee9143c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:30:31 2019 +0200 riched32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/riched32/Makefile.in b/dlls/riched32/Makefile.in index 6ea0f4d..dde9b7c 100644 --- a/dlls/riched32/Makefile.in +++ b/dlls/riched32/Makefile.in @@ -1,6 +1,8 @@ MODULE = riched32.dll IMPORTS = riched20 user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ richedit.c

1 0

Alexandre Julliard : riched20: Build with msvcrt.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: a6d57b0addc9513f1a9384668825eadf60a51035 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6d57b0addc9513f1a938466… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:30:25 2019 +0200 riched20: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/Makefile.in | 2 +- dlls/riched20/editor.c | 14 +++++++------- dlls/riched20/editor.h | 3 +-- dlls/riched20/para.c | 2 +- dlls/riched20/richole.c | 6 +++--- dlls/riched20/run.c | 2 +- dlls/riched20/style.c | 2 +- dlls/riched20/txthost.c | 3 --- dlls/riched20/txtsrv.c | 3 --- dlls/riched20/writer.c | 19 ++++++++----------- 10 files changed, 23 insertions(+), 33 deletions(-) diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in index 8f8aeee..76f78d3 100644 --- a/dlls/riched20/Makefile.in +++ b/dlls/riched20/Makefile.in @@ -1,7 +1,7 @@ MODULE = riched20.dll IMPORTLIB = riched20 IMPORTS = uuid usp10 ole32 oleaut32 imm32 user32 gdi32 -EXTRADLLFLAGS = -Wl,--image-base,0x7ac00000 +EXTRADLLFLAGS = -mno-cygwin -Wl,--image-base,0x7ac00000 C_SRCS = \ caret.c \ diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b826a2c..1b78eab 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1926,7 +1926,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH while (pCurItem && ME_CharCompare( *get_text( &pCurItem->member.run, nCurStart + nMatched ), text[nMatched], (flags & FR_MATCHCASE))) { - if ((flags & FR_WHOLEWORD) && isalnumW(wLastChar)) + if ((flags & FR_WHOLEWORD) && iswalnum(wLastChar)) break; nMatched++; @@ -1950,7 +1950,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH else wNextChar = ' '; - if (isalnumW(wNextChar)) + if (iswalnum(wNextChar)) break; } @@ -2010,7 +2010,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH while (pCurItem && ME_CharCompare( *get_text( &pCurItem->member.run, nCurEnd - nMatched - 1 ), text[nLen - nMatched - 1], (flags & FR_MATCHCASE) )) { - if ((flags & FR_WHOLEWORD) && isalnumW(wLastChar)) + if ((flags & FR_WHOLEWORD) && iswalnum(wLastChar)) break; nMatched++; @@ -2036,7 +2036,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH else wPrevChar = ' '; - if (isalnumW(wPrevChar)) + if (iswalnum(wPrevChar)) break; } @@ -5284,7 +5284,7 @@ LRESULT WINAPI REExtendedRegisterClass(void) return result; } -static int wchar_comp( const void *key, const void *elem ) +static int __cdecl wchar_comp( const void *key, const void *elem ) { return *(const WCHAR *)key - *(const WCHAR *)elem; } @@ -5333,7 +5333,7 @@ static BOOL ME_FindNextURLCandidate(ME_TextEditor *editor, while (cursor.nOffset < run_len) { c = str[cursor.nOffset]; - if (!isspaceW( c ) && !isurlneutral( c )) + if (!iswspace( c ) && !isurlneutral( c )) { *candidate_min = cursor; candidateStarted = TRUE; @@ -5353,7 +5353,7 @@ static BOOL ME_FindNextURLCandidate(ME_TextEditor *editor, while (cursor.nOffset < run_len) { c = str[cursor.nOffset]; - if (isspaceW( c )) + if (iswspace( c )) { if (quoted && c != '\r') { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 68264e7..f56d2a2 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -19,7 +19,6 @@ */ #include "editstr.h" -#include "wine/unicode.h" struct _RTF_Info; @@ -105,7 +104,7 @@ static inline int ME_IsWSpace(WCHAR ch) static inline int ME_CharCompare(WCHAR a, WCHAR b, int caseSensitive) { - return caseSensitive ? (a == b) : (toupperW(a) == toupperW(b)); + return caseSensitive ? (a == b) : (towupper(a) == towupper(b)); } /* note: those two really return the first matching offset (starting from EOS)+1 diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 6eec6b5..5b6cf77 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -312,7 +312,7 @@ static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) { case PFN_ARABIC: default: - p += sprintfW( p, fmtW, num ); + p += swprintf( p, 20, fmtW, num ); break; case PFN_LCLETTER: diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index c111920..5a102a7 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -372,7 +372,7 @@ static inline BOOL is_equal_textfont_prop_value(enum textfont_prop_id propid, te case FONT_WEIGHT: return left->l == right->l; case FONT_NAME: - return !strcmpW(left->str, right->str); + return !wcscmp(left->str, right->str); case FONT_POSITION: case FONT_SIZE: case FONT_SPACING: @@ -1688,7 +1688,7 @@ static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR str) } /* it's safer not to rely on stored BSTR length */ - len = strlenW(str); + len = lstrlenW(str); cursor = editor->pCursors[0]; ME_CursorFromCharOfs(editor, This->start, &editor->pCursors[0]); style = ME_GetInsertStyle(editor, 0); @@ -4537,7 +4537,7 @@ static HRESULT WINAPI ITextSelection_fnSetText(ITextSelection *me, BSTR str) return CO_E_RELEASED; editor = This->reOle->editor; - len = strlenW(str); + len = lstrlenW(str); ME_GetSelectionOfs(editor, &from, &to); ME_ReplaceSel(editor, FALSE, str, len); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 66c24f8..6772e2f 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -862,7 +862,7 @@ void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, { if (!(tmp.dwMask & CFM_FACE)) pFmt->dwMask &= ~CFM_FACE; - else if (lstrcmpW(pFmt->szFaceName, tmp.szFaceName) || + else if (wcscmp(pFmt->szFaceName, tmp.szFaceName) || pFmt->bPitchAndFamily != tmp.bPitchAndFamily) pFmt->dwMask &= ~CFM_FACE; } diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 3b9d771..1be1c15 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -352,7 +352,7 @@ static BOOL ME_IsFontEqual(const LOGFONTW *p1, const LOGFONTW *p2) { if (memcmp(p1, p2, sizeof(LOGFONTW)-sizeof(p1->lfFaceName))) return FALSE; - if (lstrcmpW(p1->lfFaceName, p2->lfFaceName)) + if (wcscmp(p1->lfFaceName, p2->lfFaceName)) return FALSE; return TRUE; } diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index fc489f2..3f25625 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #define COBJMACROS #include "editor.h" diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 941b8a3..9ce1d47 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #define COBJMACROS #include "editor.h" diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 2bd97d8..94001ee 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #define NONAMELESSUNION #include "editor.h" @@ -123,17 +120,17 @@ ME_StreamOutMove(ME_OutStream *pStream, const char *buffer, int len) } -static BOOL +static BOOL WINAPIV ME_StreamOutPrint(ME_OutStream *pStream, const char *format, ...) { char string[STREAMOUT_BUFFER_SIZE]; /* This is going to be enough */ int len; - va_list valist; + __ms_va_list valist; - va_start(valist, format); + __ms_va_start(valist, format); len = vsnprintf(string, sizeof(string), format, valist); - va_end(valist); - + __ms_va_end(valist); + return ME_StreamOutMove(pStream, string, len); } @@ -245,7 +242,7 @@ static void add_font_to_fonttbl( ME_OutStream *stream, ME_Style *style ) { for (i = 0; i < stream->nFontTblLen; i++) if (table[i].bCharSet == charset - && (table[i].szFaceName == face || !lstrcmpW(table[i].szFaceName, face))) + && (table[i].szFaceName == face || !wcscmp(table[i].szFaceName, face))) break; if (i == stream->nFontTblLen && i < STREAMOUT_FONTTBL_SIZE) @@ -270,7 +267,7 @@ static BOOL find_font_in_fonttbl( ME_OutStream *stream, CHARFORMAT2W *fmt, unsig for (i = 0; i < stream->nFontTblLen; i++) { if (facename == stream->fonttbl[i].szFaceName - || !lstrcmpW(facename, stream->fonttbl[i].szFaceName)) + || !wcscmp(facename, stream->fonttbl[i].szFaceName)) if (!(fmt->dwMask & CFM_CHARSET) || fmt->bCharSet == stream->fonttbl[i].bCharSet) { @@ -841,7 +838,7 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt) } } - if (strcmpW(old_fmt->szFaceName, fmt->szFaceName) || + if (wcscmp(old_fmt->szFaceName, fmt->szFaceName) || old_fmt->bCharSet != fmt->bCharSet) { if (find_font_in_fonttbl( pStream, fmt, &i ))

1 0

Alexandre Julliard : resutils: Build with msvcrt.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: baf14b1a96aa492294ff08f3b2b381ad42f069a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baf14b1a96aa492294ff08f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:29:27 2019 +0200 resutils: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/resutils/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/resutils/Makefile.in b/dlls/resutils/Makefile.in index fa5910a..f5c43f8 100644 --- a/dlls/resutils/Makefile.in +++ b/dlls/resutils/Makefile.in @@ -1,5 +1,7 @@ MODULE = resutils.dll IMPORTLIB = resutils +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ resutils.c

1 0

Alexandre Julliard : regapi: Build with msvcrt.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 2e2f862eeca6ce682b76545a1901bd8937ff9055 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e2f862eeca6ce682b76545a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:29:21 2019 +0200 regapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/regapi/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/regapi/Makefile.in b/dlls/regapi/Makefile.in index 1dda911..4d8d773 100644 --- a/dlls/regapi/Makefile.in +++ b/dlls/regapi/Makefile.in @@ -1,4 +1,6 @@ MODULE = regapi.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : rasdlg: Build with msvcrt.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 0e28d661e76c285457d1082d0d372c297d153fad URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e28d661e76c285457d1082d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:29:14 2019 +0200 rasdlg: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rasdlg/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/rasdlg/Makefile.in b/dlls/rasdlg/Makefile.in index 6a94843..d780513 100644 --- a/dlls/rasdlg/Makefile.in +++ b/dlls/rasdlg/Makefile.in @@ -1,5 +1,7 @@ MODULE = rasdlg.dll IMPORTLIB = rasdlg +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ rasdlg_main.c

1 0

Alexandre Julliard : query: Build with msvcrt.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 0281cd038fdf1aa9ac4184e0d1d2509e2aed10cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0281cd038fdf1aa9ac4184e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:28:41 2019 +0200 query: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/query/Makefile.in | 2 ++ dlls/query/query_main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/query/Makefile.in b/dlls/query/Makefile.in index 54132ab..075a645 100644 --- a/dlls/query/Makefile.in +++ b/dlls/query/Makefile.in @@ -1,5 +1,7 @@ MODULE = query.dll IMPORTS = uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ query_main.c diff --git a/dlls/query/query_main.c b/dlls/query/query_main.c index c6dde22..b93973a 100644 --- a/dlls/query/query_main.c +++ b/dlls/query/query_main.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : qmgrprxy: Build with msvcrt.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 6c984b47a860ed0a513884bf5aa56dd4f83dc249 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c984b47a860ed0a513884bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:28:26 2019 +0200 qmgrprxy: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgrprxy/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/qmgrprxy/Makefile.in b/dlls/qmgrprxy/Makefile.in index bdbe0bc..10d257a 100644 --- a/dlls/qmgrprxy/Makefile.in +++ b/dlls/qmgrprxy/Makefile.in @@ -1,6 +1,8 @@ MODULE = qmgrprxy.dll IMPORTS = rpcrt4 +EXTRADLLFLAGS = -mno-cygwin + IDL_SRCS = qmgrprxy.idl dlldata_EXTRADEFS = -DWINE_REGISTER_DLL

1 0

Zebediah Figura : qcap: Use strmbase pin reference counting methods.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: bd00160c25a3a36012b0e7a373c24b99cb38117e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd00160c25a3a36012b0e7a3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 18 20:17:37 2019 -0500 qcap: Use strmbase pin reference counting methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 32 ++++-------------------------- dlls/qcap/avimux.c | 32 ++++-------------------------- dlls/qcap/smartteefilter.c | 49 ++++++---------------------------------------- dlls/qcap/vfwcapture.c | 17 ++-------------- 4 files changed, 16 insertions(+), 114 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 399fe09..bcfdc6b 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -323,18 +323,6 @@ static HRESULT WINAPI AVICompressorIn_QueryInterface(IPin *iface, REFIID riid, v return BaseInputPinImpl_QueryInterface(iface, riid, ppv); } -static ULONG WINAPI AVICompressorIn_AddRef(IPin *iface) -{ - AVICompressor *This = impl_from_IPin(iface); - return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI AVICompressorIn_Release(IPin *iface) -{ - AVICompressor *This = impl_from_IPin(iface); - return IBaseFilter_Release(&This->filter.IBaseFilter_iface); -} - static HRESULT WINAPI AVICompressorIn_ReceiveConnection(IPin *iface, IPin *pConnector, const AM_MEDIA_TYPE *pmt) { @@ -372,8 +360,8 @@ static HRESULT WINAPI AVICompressorIn_Disconnect(IPin *iface) static const IPinVtbl AVICompressorInputPinVtbl = { AVICompressorIn_QueryInterface, - AVICompressorIn_AddRef, - AVICompressorIn_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseInputPinImpl_Connect, AVICompressorIn_ReceiveConnection, AVICompressorIn_Disconnect, @@ -524,22 +512,10 @@ static HRESULT WINAPI AVICompressorOut_QueryInterface(IPin *iface, REFIID riid, return BaseInputPinImpl_QueryInterface(iface, riid, ppv); } -static ULONG WINAPI AVICompressorOut_AddRef(IPin *iface) -{ - AVICompressor *This = impl_from_IPin(iface); - return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI AVICompressorOut_Release(IPin *iface) -{ - AVICompressor *This = impl_from_IPin(iface); - return IBaseFilter_Release(&This->filter.IBaseFilter_iface); -} - static const IPinVtbl AVICompressorOutputPinVtbl = { AVICompressorOut_QueryInterface, - AVICompressorOut_AddRef, - AVICompressorOut_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect, diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 784d93a..d2475ee 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1255,18 +1255,6 @@ static HRESULT WINAPI AviMuxOut_QueryInterface(IPin *iface, REFIID riid, void ** return S_OK; } -static ULONG WINAPI AviMuxOut_AddRef(IPin *iface) -{ - AviMux *This = impl_from_out_IPin(iface); - return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI AviMuxOut_Release(IPin *iface) -{ - AviMux *This = impl_from_out_IPin(iface); - return IBaseFilter_Release(&This->filter.IBaseFilter_iface); -} - static HRESULT WINAPI AviMuxOut_Connect(IPin *iface, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) { @@ -1408,8 +1396,8 @@ static HRESULT WINAPI AviMuxOut_NewSegment(IPin *iface, REFERENCE_TIME tStart, static const IPinVtbl AviMuxOut_PinVtbl = { AviMuxOut_QueryInterface, - AviMuxOut_AddRef, - AviMuxOut_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, AviMuxOut_Connect, AviMuxOut_ReceiveConnection, AviMuxOut_Disconnect, @@ -1655,18 +1643,6 @@ static HRESULT WINAPI AviMuxIn_QueryInterface(IPin *iface, REFIID riid, void **p return S_OK; } -static ULONG WINAPI AviMuxIn_AddRef(IPin *iface) -{ - AviMux *This = impl_from_in_IPin(iface); - return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI AviMuxIn_Release(IPin *iface) -{ - AviMux *This = impl_from_in_IPin(iface); - return IBaseFilter_Release(&This->filter.IBaseFilter_iface); -} - static HRESULT WINAPI AviMuxIn_Connect(IPin *iface, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) { @@ -1876,8 +1852,8 @@ static HRESULT WINAPI AviMuxIn_NewSegment(IPin *iface, REFERENCE_TIME tStart, static const IPinVtbl AviMuxIn_PinVtbl = { AviMuxIn_QueryInterface, - AviMuxIn_AddRef, - AviMuxIn_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, AviMuxIn_Connect, AviMuxIn_ReceiveConnection, AviMuxIn_Disconnect, diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 51efe17..caaaaab 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -146,23 +146,10 @@ static const BaseFilterFuncTable SmartTeeFilterFuncs = { .filter_destroy = smart_tee_destroy, }; -static ULONG WINAPI SmartTeeFilterInput_AddRef(IPin *iface) -{ - SmartTeeFilter *This = impl_from_IPin(iface); - return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI SmartTeeFilterInput_Release(IPin *iface) -{ - SmartTeeFilter *This = impl_from_IPin(iface); - return IBaseFilter_Release(&This->filter.IBaseFilter_iface); -} - - static const IPinVtbl SmartTeeFilterInputVtbl = { BaseInputPinImpl_QueryInterface, - SmartTeeFilterInput_AddRef, - SmartTeeFilterInput_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseInputPinImpl_Connect, BaseInputPinImpl_ReceiveConnection, BasePinImpl_Disconnect, @@ -340,18 +327,6 @@ static const BaseInputPinFuncTable SmartTeeFilterInputFuncs = { SmartTeeFilterInput_Receive }; -static ULONG WINAPI SmartTeeFilterCapture_AddRef(IPin *iface) -{ - SmartTeeFilter *This = impl_from_IPin(iface); - return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI SmartTeeFilterCapture_Release(IPin *iface) -{ - SmartTeeFilter *This = impl_from_IPin(iface); - return IBaseFilter_Release(&This->filter.IBaseFilter_iface); -} - static HRESULT WINAPI SmartTeeFilterCapture_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) { SmartTeeFilter *This = impl_from_IPin(iface); @@ -368,8 +343,8 @@ static HRESULT WINAPI SmartTeeFilterCapture_EnumMediaTypes(IPin *iface, IEnumMed static const IPinVtbl SmartTeeFilterCaptureVtbl = { BaseOutputPinImpl_QueryInterface, - SmartTeeFilterCapture_AddRef, - SmartTeeFilterCapture_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect, @@ -423,18 +398,6 @@ static const BaseOutputPinFuncTable SmartTeeFilterCaptureFuncs = { SmartTeeFilterCapture_DecideAllocator, }; -static ULONG WINAPI SmartTeeFilterPreview_AddRef(IPin *iface) -{ - SmartTeeFilter *This = impl_from_IPin(iface); - return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI SmartTeeFilterPreview_Release(IPin *iface) -{ - SmartTeeFilter *This = impl_from_IPin(iface); - return IBaseFilter_Release(&This->filter.IBaseFilter_iface); -} - static HRESULT WINAPI SmartTeeFilterPreview_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) { SmartTeeFilter *This = impl_from_IPin(iface); @@ -451,8 +414,8 @@ static HRESULT WINAPI SmartTeeFilterPreview_EnumMediaTypes(IPin *iface, IEnumMed static const IPinVtbl SmartTeeFilterPreviewVtbl = { BaseOutputPinImpl_QueryInterface, - SmartTeeFilterPreview_AddRef, - SmartTeeFilterPreview_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect, diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 2cb1f7d..660f44d 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -677,19 +677,6 @@ static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * return E_NOINTERFACE; } -static ULONG WINAPI VfwPin_AddRef(IPin *iface) -{ - VfwPinImpl *pin = impl_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); -} - -static ULONG WINAPI -VfwPin_Release(IPin * iface) -{ - VfwPinImpl *pin = impl_from_IPin(iface); - return IBaseFilter_Release(pin->pin.pin.pinInfo.pFilter); -} - static HRESULT WINAPI VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) { @@ -716,8 +703,8 @@ VfwPin_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin) static const IPinVtbl VfwPin_Vtbl = { VfwPin_QueryInterface, - VfwPin_AddRef, - VfwPin_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect,

1 0