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

Alexandre Julliard : rasdlg: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

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 : regapi: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

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 : resutils: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

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 : riched20: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

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 : riched32: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

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 : rpcrt4: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: eadb037ba115e1101645d8260bb5cb9e8e52a87f URL: https://source.winehq.org/git/wine.git/?a=commit;h=eadb037ba115e1101645d826… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:32:06 2019 +0200 rpcrt4: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/Makefile.in | 2 ++ dlls/rpcrt4/cproxy.c | 3 --- dlls/rpcrt4/cpsf.c | 26 +++++++++++--------------- dlls/rpcrt4/cstub.c | 3 --- dlls/rpcrt4/ndr_marshall.c | 5 ++--- dlls/rpcrt4/ndr_stubless.c | 3 --- dlls/rpcrt4/rpc_assoc.c | 5 ++--- dlls/rpcrt4/rpc_binding.c | 21 ++++++++++----------- dlls/rpcrt4/rpc_server.c | 3 --- dlls/rpcrt4/rpc_transport.c | 29 ++++++++++++++--------------- dlls/rpcrt4/rpcrt4_main.c | 5 +---- 11 files changed, 42 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eadb037ba115e1101645…

1 0

Alexandre Julliard : rsaenh: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: 18fbc3a3cf880f35ab497c0e2026fe850536c6bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=18fbc3a3cf880f35ab497c0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:32:27 2019 +0200 rsaenh: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/Makefile.in | 2 ++ dlls/rsaenh/implglue.c | 9 +++------ dlls/rsaenh/rsaenh.c | 6 +----- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in index 9997752..80680d6 100644 --- a/dlls/rsaenh/Makefile.in +++ b/dlls/rsaenh/Makefile.in @@ -2,6 +2,8 @@ MODULE = rsaenh.dll IMPORTLIB = rsaenh IMPORTS = bcrypt crypt32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ aes.c \ des.c \ diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 76c2b1f..9d90ad7 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -21,18 +21,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include "wine/port.h" -#include "wine/library.h" +#include <stdarg.h> +#include <stdio.h> #include "windef.h" +#include "winbase.h" #include "wincrypt.h" #include "implglue.h" -#include <stdio.h> - /* Function prototype copied from dlls/advapi32/crypt.c */ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen); diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index c22b3dc..9119d4b 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -22,11 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" -#include "wine/library.h" -#include "wine/debug.h" - #include <stdarg.h> #include <stdio.h> @@ -39,6 +34,7 @@ #include "objbase.h" #include "rpcproxy.h" #include "aclapi.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt);

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.9.0.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: faa7564d375a6d4672da0bfe35f367199188e114 URL: https://source.winehq.org/git/wine.git/?a=commit;h=faa7564d375a6d4672da0bfe… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 18 12:57:20 2019 -0500 mscoree: Update Wine Mono to 4.9.0. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index ed9ae3a..08d9f85 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.8.3" -#define MONO_SHA "d6fa1f019bfa3c572438e4a2473ce25af1e937ed4cdcbe46554164ce25db0a76" +#define MONO_VERSION "4.9.0" +#define MONO_SHA "8e2ec7ce6f10faa24e7b1b4bcab99a946dfe975c21327c8420c7abc74ee1c713" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 8311db7..7420b4b 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "4.8.3" +#define WINE_MONO_VERSION "4.9.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to draw_indirect().
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: 6001575f9d3e4594cdd5e957062b12781c06f4ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=6001575f9d3e4594cdd5e957… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 19 04:38:05 2019 +0430 wined3d: Pass a wined3d_context_gl structure to draw_indirect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6a7aafc..a024e28 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4709,10 +4709,10 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, checkGLcall("draw immediate mode"); } -static void draw_indirect(struct wined3d_context *context, const struct wined3d_state *state, +static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_gl, const struct wined3d_state *state, const struct wined3d_indirect_draw_parameters *parameters, unsigned int idx_size) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_buffer *buffer = parameters->buffer; const void *offset; @@ -4977,7 +4977,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (parameters->indirect) { if (!context->use_immediate_mode_draw && !emulation) - draw_indirect(context, state, &parameters->u.indirect, idx_size); + wined3d_context_gl_draw_indirect(context_gl, state, &parameters->u.indirect, idx_size); else FIXME("Indirect draws with immediate mode/emulation are not supported.\n"); }

1 0

Alexandre Julliard : ntdll: Make wine_server_call() cdecl.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: c911eff7b403836ded4e57536e30d70cf969ccbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=c911eff7b403836ded4e5753… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 11:33:16 2019 +0200 ntdll: Make wine_server_call() cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 2 +- include/wine/server.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 094b530..8274f11 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -312,7 +312,7 @@ unsigned int server_call_unlocked( void *req_ptr ) *| } *| SERVER_END_REQ; */ -unsigned int wine_server_call( void *req_ptr ) +unsigned int CDECL wine_server_call( void *req_ptr ) { sigset_t old_set; unsigned int ret; diff --git a/include/wine/server.h b/include/wine/server.h index d573d1f..ac5dcc6 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -49,7 +49,7 @@ struct __server_request_info struct __server_iovec data[__SERVER_MAX_DATA]; /* request variable size data */ }; -extern unsigned int wine_server_call( void *req_ptr ); +extern unsigned int CDECL wine_server_call( void *req_ptr ); extern void CDECL wine_server_send_fd( int fd ); extern int CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ); extern int CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options );

1 0