wine-commits July 2023

wine-commits@winehq.org

1 participants
865 discussions

Fabian Maurer : user32: Ignore invalid parameters in DrawTextEx when HDC is invalid.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 35c8f15bc67f7602438fe0c39a69ff6ddf6b8297 URL: https://gitlab.winehq.org/wine/wine/-/commit/35c8f15bc67f7602438fe0c39a69ff… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Jun 12 22:02:45 2023 +0200 user32: Ignore invalid parameters in DrawTextEx when HDC is invalid. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47089 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/text.c | 32 ++++++++++++++++++++++++++++++++ dlls/user32/text.c | 21 ++++++++++++++++----- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 317fb9a6a29..90fe7421b02 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -519,6 +519,38 @@ static void test_DrawTextCalcRect(void) ok(textheight==0,"Got textheight from DrawTextExW\n"); ok(dtp.uiLengthDrawn==1337, "invalid dtp.uiLengthDrawn = %i\n",dtp.uiLengthDrawn); } + + /* When passing invalid DC, other parameters must be ignored - no crashes on invalid pointers */ + SetLastError(0xdeadbeef); + textheight = DrawTextExW((HDC)0xdeadbeef, emptystringW, 100000, (LPRECT)0xdeadbeef, 0, 0); + ok(textheight == 0, "Got textheight from DrawTextExW\n"); + ok(GetLastError() == 0xdeadbeef,"Got error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + textheight = DrawTextExW((HDC)0xdeadbeef, (LPWSTR)0xdeadbeef, 100000, &rect, 0, 0); + ok(textheight == 0, "Got textheight from DrawTextExW\n"); + ok(GetLastError() == 0xdeadbeef,"Got error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + textheight = DrawTextExW((HDC)0xdeadbeef, 0, -1, (LPRECT)0xdeadbeef, DT_CALCRECT, 0); + ok(textheight == 0, "Got textheight from DrawTextExW\n"); + ok(GetLastError() == 0xdeadbeef,"Got error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + textheight = DrawTextExA((HDC)0xdeadbeef, emptystring, 100000, (LPRECT)0xdeadbeef, 0, 0); + ok(textheight == 0, "Got textheight from DrawTextExA\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INVALID_HANDLE,"Got error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + textheight = DrawTextExA((HDC)0xdeadbeef, 0, -1, (LPRECT)0xdeadbeef, DT_CALCRECT, 0); + ok(textheight == 0, "Got textheight from DrawTextExA\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INVALID_HANDLE,"Got error %lu\n", GetLastError()); + + if (0) + { + /* Crashes */ + textheight = DrawTextExA((HDC)0xdeadbeef, (LPSTR)0xdeadbeef, 100, &rect, 0, 0); + } } /* More test cases from bug 12226 */ diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 86946e6a53a..788ed10269c 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -874,8 +874,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, int len, lh, count=i_count; TEXTMETRICW tm; int lmargin = 0, rmargin = 0; - int x = rect->left, y = rect->top; - int width = rect->right - rect->left; + int x, y, width; int max_width = 0; int last_line; int tabwidth /* to keep gcc happy */ = 0; @@ -897,7 +896,13 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (flags & DT_SINGLELINE) flags &= ~DT_WORDBREAK; - GetTextMetricsW(hdc, &tm); + if (!GetTextMetricsW(hdc, &tm)) + return 0; + + x = rect->left; + y = rect->top; + width = rect->right - rect->left; + if (flags & DT_EXTERNALLEADING) lh = tm.tmHeight + tm.tmExternalLeading; else @@ -1086,18 +1091,24 @@ INT WINAPI DrawTextExA( HDC hdc, LPSTR str, INT count, DWORD wmax; DWORD amax; UINT cp; + TEXTMETRICA tm; + + if (!GetTextMetricsA(hdc, &tm)) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } if (!count) return 0; if (!str && count > 0) return 0; if( !str || ((count == -1) && !(count = strlen(str)))) { int lh; - TEXTMETRICA tm; if (dtp && dtp->cbSize != sizeof(DRAWTEXTPARAMS)) return 0; - GetTextMetricsA(hdc, &tm); + if (flags & DT_EXTERNALLEADING) lh = tm.tmHeight + tm.tmExternalLeading; else

1 0

Bernhard Kölbl : include: Add VoiceCommandSet runtimeclass with its dependencies.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 9f9f799ad9453a9996f67ae88e1ea2bf7f8ccc05 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f9f799ad9453a9996f67ae88e1ea2… Author: Bernhard Kölbl <bkoelbl(a)codeweavers.com> Date: Wed Jul 5 15:32:36 2023 +0200 include: Add VoiceCommandSet runtimeclass with its dependencies. --- include/windows.media.speechrecognition.idl | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index 79107aab1bf..36f94823218 100644 --- a/include/windows.media.speechrecognition.idl +++ b/include/windows.media.speechrecognition.idl @@ -60,6 +60,7 @@ namespace Windows { interface ISpeechRecognizerStatics2; interface ISpeechRecognizerTimeouts; interface ISpeechRecognizerUIOptions; + interface IVoiceCommandSet; runtimeclass SpeechContinuousRecognitionCompletedEventArgs; runtimeclass SpeechContinuousRecognitionResultGeneratedEventArgs; runtimeclass SpeechContinuousRecognitionSession; @@ -74,6 +75,7 @@ namespace Windows { runtimeclass SpeechRecognizerStateChangedEventArgs; runtimeclass SpeechRecognizerTimeouts; runtimeclass SpeechRecognizerUIOptions; + runtimeclass VoiceCommandSet; } } } @@ -471,6 +473,22 @@ namespace Windows { [propput] HRESULT ShowConfirmation([in] boolean value); } + [ + contract(Windows.Phone.PhoneContract, 1.0), + deprecated("Use Windows.ApplicationModel.VoiceCommands.VoiceCommandDefinition", deprecate, Windows.Phone.PhoneContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.VoiceCommandSet), + uuid(0bedda75-46e6-4b11-a088-5c68632899b5) + ] + interface IVoiceCommandSet : IInspectable + { + [deprecated("Use Windows.ApplicationModel.VoiceCommands.VoiceCommandDefinition", deprecate, Windows.Phone.PhoneContract, 1.0)] + [propget] HRESULT Language([out, retval] HSTRING *value); + [deprecated("Use Windows.ApplicationModel.VoiceCommands.VoiceCommandDefinition", deprecate, Windows.Phone.PhoneContract, 1.0)] + [propget] HRESULT Name([out, retval] HSTRING *value); + [deprecated("Use Windows.ApplicationModel.VoiceCommands.VoiceCommandDefinition", deprecate, Windows.Phone.PhoneContract, 1.0)] + HRESULT SetPhraseListAsync([in] HSTRING phrase_list_name, [in] Windows.Foundation.Collections.IIterable<HSTRING> *phrase_list, [out, retval] Windows.Foundation.IAsyncAction **update_action); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -610,6 +628,16 @@ namespace Windows { { [default] interface Windows.Media.SpeechRecognition.ISpeechRecognizerUIOptions; } + + [ + contract(Windows.Phone.PhoneContract, 1.0), + deprecated("Use Windows.ApplicationModel.VoiceCommands.VoiceCommandDefinition", deprecate, Windows.Phone.PhoneContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass VoiceCommandSet + { + [default] interface Windows.Media.SpeechRecognition.IVoiceCommandSet; + } } } }

1 0

Bernhard Kölbl : include: Add Windows.Phone.PhoneContract api contract.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 4a020b2fb64bd48d3b032c5502d8b75ef7ede4aa URL: https://gitlab.winehq.org/wine/wine/-/commit/4a020b2fb64bd48d3b032c5502d8b7… Author: Bernhard Kölbl <bkoelbl(a)codeweavers.com> Date: Wed Jul 5 15:31:00 2023 +0200 include: Add Windows.Phone.PhoneContract api contract. --- include/windowscontracts.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/windowscontracts.idl b/include/windowscontracts.idl index 5bcae48a5b5..46e1e3d0e1b 100644 --- a/include/windowscontracts.idl +++ b/include/windowscontracts.idl @@ -30,4 +30,9 @@ namespace Windows { apicontract UniversalApiContract {}; } + namespace Phone { + [contractversion(1)] + apicontract PhoneContract + {}; + } }

1 0

Bernhard Kölbl : widl: Add basic support for the [deprecated] attribute.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 711cd500e72acf9bb69097b84fad10e8213b2f77 URL: https://gitlab.winehq.org/wine/wine/-/commit/711cd500e72acf9bb69097b84fad10… Author: Bernhard Kölbl <bkoelbl(a)codeweavers.com> Date: Wed Jul 5 16:38:06 2023 +0200 widl: Add basic support for the [deprecated] attribute. Signed-off-by: Bernhard Kölbl <bkoelbl(a)codeweavers.com> --- tools/widl/attribute.c | 1 + tools/widl/parser.l | 1 + tools/widl/parser.y | 8 ++++++++ tools/widl/widltypes.h | 1 + 4 files changed, 11 insertions(+) diff --git a/tools/widl/attribute.c b/tools/widl/attribute.c index b9aa99c9228..5ea13a01175 100644 --- a/tools/widl/attribute.c +++ b/tools/widl/attribute.c @@ -157,6 +157,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_DEFAULTCOLLELEM */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultcollelem" }, /* ATTR_DEFAULTVALUE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultvalue" }, /* ATTR_DEFAULTVTABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "defaultvtable" }, + /* ATTR_DEPRECATED */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "deprecated" }, /* ATTR_DISABLECONSISTENCYCHECK */{ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "disable_consistency_check" }, /* ATTR_DISPINTERFACE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, NULL }, /* ATTR_DISPLAYBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "displaybind" }, diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 445efd2d458..afbdf7151f0 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -258,6 +258,7 @@ static void winrt_enable( int ns_prefix ) defaultcollelem { return tDEFAULTCOLLELEM; } defaultvalue { return tDEFAULTVALUE; } defaultvtable { return tDEFAULTVTABLE; } + deprecated { return token_winrt( tDEPRECATED, yytext, yylval ); } disable_consistency_check { return tDISABLECONSISTENCYCHECK; } displaybind { return tDISPLAYBIND; } dllname { return tDLLNAME; } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index b802f75874d..26385a578b0 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -199,6 +199,7 @@ void pop_import( PARSER_LTYPE *yylloc ); %token tDEFAULTCOLLELEM %token tDEFAULTVALUE %token tDEFAULTVTABLE +%token tDEPRECATED %token tDISABLECONSISTENCYCHECK tDISPLAYBIND %token tDISPINTERFACE %token tDLLNAME tDONTFREE tDOUBLE tDUAL @@ -298,6 +299,7 @@ void pop_import( PARSER_LTYPE *yylloc ); %type <expr> static_attr %type <expr> activatable_attr %type <expr> composable_attr +%type <expr> deprecated_attr %type <type> delegatedef %type <stgclass> storage_cls_spec %type <type_qualifier> type_qualifier m_type_qual_list @@ -628,6 +630,11 @@ composable_attr } ; +deprecated_attr + : aSTRING ',' aIDENTIFIER ',' contract_req + { $$ = make_expr3( EXPR_MEMBER, make_exprs( EXPR_STRLIT, $1 ), make_exprs( EXPR_IDENTIFIER, $3 ), $5 ); } + ; + attribute : %empty { $$ = NULL; } | tACTIVATABLE '(' activatable_attr ')' { $$ = attr_ptr( @$, ATTR_ACTIVATABLE, $3 ); } @@ -659,6 +666,7 @@ attribute | tDEFAULTCOLLELEM { $$ = attr_int( @$, ATTR_DEFAULTCOLLELEM, 0 ); } | tDEFAULTVALUE '(' expr_const ')' { $$ = attr_ptr( @$, ATTR_DEFAULTVALUE, $3 ); } | tDEFAULTVTABLE { $$ = attr_int( @$, ATTR_DEFAULTVTABLE, 0 ); } + | tDEPRECATED '(' deprecated_attr ')' { $$ = attr_ptr( @$, ATTR_DEPRECATED, $3 ); } | tDISABLECONSISTENCYCHECK { $$ = attr_int( @$, ATTR_DISABLECONSISTENCYCHECK, 0 ); } | tDISPLAYBIND { $$ = attr_int( @$, ATTR_DISPLAYBIND, 0 ); } | tDLLNAME '(' aSTRING ')' { $$ = attr_ptr( @$, ATTR_DLLNAME, $3 ); } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index ad6a4e0b7ec..b92c8c15e68 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -96,6 +96,7 @@ enum attr_type ATTR_DEFAULTCOLLELEM, ATTR_DEFAULTVALUE, ATTR_DEFAULTVTABLE, + ATTR_DEPRECATED, ATTR_DISABLECONSISTENCYCHECK, ATTR_DISPINTERFACE, ATTR_DISPLAYBIND,

1 0

Rémi Bernon : winex11: Use gdi_display consistently for client_window requests.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: a6bc5f34b87393e04ff46659f518f2e7094cc7e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6bc5f34b87393e04ff46659f518f2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 23 10:24:57 2023 +0200 winex11: Use gdi_display consistently for client_window requests. And synchronize with thread display when necessary. --- dlls/winex11.drv/window.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 974bd376fe6..14490ecd028 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1416,7 +1416,7 @@ static void sync_client_position( struct x11drv_win_data *data, { TRACE( "setting client win %lx pos %d,%d,%dx%d changes=%x\n", data->client_window, changes.x, changes.y, changes.width, changes.height, mask ); - XConfigureWindow( data->display, data->client_window, mask, &changes ); + XConfigureWindow( gdi_display, data->client_window, mask, &changes ); } } @@ -1583,6 +1583,7 @@ Window create_client_window( HWND hwnd, const XVisualInfo *visual ) cx = min( max( 1, data->client_rect.right - data->client_rect.left ), 65535 ); cy = min( max( 1, data->client_rect.bottom - data->client_rect.top ), 65535 ); + XSync( gdi_display, False ); /* make sure whole_window is known from gdi_display */ ret = data->client_window = XCreateWindow( gdi_display, data->whole_window ? data->whole_window : dummy_parent, x, y, cx, cy, 0, default_visual.depth, InputOutput, @@ -1592,8 +1593,12 @@ Window create_client_window( HWND hwnd, const XVisualInfo *visual ) { XSaveContext( data->display, data->client_window, winContext, (char *)data->hwnd ); XMapWindow( gdi_display, data->client_window ); - XSync( gdi_display, False ); - if (data->whole_window) XSelectInput( data->display, data->client_window, ExposureMask ); + if (data->whole_window) + { + XFlush( gdi_display ); /* make sure client_window is created for XSelectInput */ + XSync( data->display, False ); /* make sure client_window is known from data->display */ + XSelectInput( data->display, data->client_window, ExposureMask ); + } TRACE( "%p xwin %lx/%lx\n", data->hwnd, data->whole_window, data->client_window ); } release_win_data( data ); @@ -1701,11 +1706,15 @@ static void destroy_whole_window( struct x11drv_win_data *data, BOOL already_des if (data->client_window && !already_destroyed) { XSelectInput( data->display, data->client_window, 0 ); - XReparentWindow( data->display, data->client_window, get_dummy_parent(), 0, 0 ); - XSync( data->display, False ); + XFlush( data->display ); /* make sure XSelectInput doesn't use client_window after this point */ + XReparentWindow( gdi_display, data->client_window, get_dummy_parent(), 0, 0 ); } XDeleteContext( data->display, data->whole_window, winContext ); - if (!already_destroyed) XDestroyWindow( data->display, data->whole_window ); + if (!already_destroyed) + { + XSync( gdi_display, False ); /* make sure XReparentWindow requests have completed before destroying whole_window */ + XDestroyWindow( data->display, data->whole_window ); + } } if (data->whole_colormap) XFreeColormap( data->display, data->whole_colormap ); data->whole_window = data->client_window = 0; @@ -1749,10 +1758,11 @@ void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis, BO create_whole_window( data ); if (!client_window) return; /* move the client to the new parent */ - XReparentWindow( data->display, client_window, data->whole_window, + XReparentWindow( gdi_display, client_window, data->whole_window, data->client_rect.left - data->whole_rect.left, data->client_rect.top - data->whole_rect.top ); data->client_window = client_window; + XSync( gdi_display, False ); /* make sure XReparentWindow requests have completed before destroying whole_window */ XDestroyWindow( data->display, whole_window ); }

1 0

Francois Gouget : user32/tests: Fix a WM_DISPLAYCHANGE broken() condition.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: aad8bc2cf73fb8048738d2563c0ef34815d46b89 URL: https://gitlab.winehq.org/wine/wine/-/commit/aad8bc2cf73fb8048738d2563c0ef3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 5 12:51:24 2023 +0200 user32/tests: Fix a WM_DISPLAYCHANGE broken() condition. --- dlls/user32/tests/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 6ed7755b91b..12cbf630319 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2502,7 +2502,7 @@ static void test_WM_DISPLAYCHANGE(void) { todo_wine win_skip( "ChangeDisplaySettingsExW returned %ld\n", res ); - ok( res == DISP_CHANGE_BADMODE || broken( DISP_CHANGE_FAILED && bpp == 8 ), + ok( res == DISP_CHANGE_BADMODE || broken( res == DISP_CHANGE_FAILED && bpp == 8 ), "ChangeDisplaySettingsExW returned %ld\n", res ); ok( last_bpp == -1, "got WM_DISPLAYCHANGE bpp %d\n", last_bpp ); }

1 0

Alex Henrie : winhttp: Use specific types insted of sizeof(ULONG_PTR) in alloc_handle.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 6d748ce392d8edc9f15ac486c86debef7e6706da URL: https://gitlab.winehq.org/wine/wine/-/commit/6d748ce392d8edc9f15ac486c86deb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 4 12:53:05 2023 -0600 winhttp: Use specific types insted of sizeof(ULONG_PTR) in alloc_handle. Resolves a scan-build warning. --- dlls/winhttp/handle.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index 33a4cd6bb71..6b68f7b4c23 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -94,15 +94,15 @@ HINTERNET alloc_handle( struct object_header *hdr ) if (!max_handles) { num = HANDLE_CHUNK_SIZE; - if (!(p = calloc( 1, sizeof(ULONG_PTR) * num ))) goto end; + if (!(p = calloc( 1, sizeof(*p) * num ))) goto end; handles = p; max_handles = num; } if (max_handles == next_handle) { - size_t new_size, old_size = max_handles * sizeof(ULONG_PTR); + size_t new_size, old_size = max_handles * sizeof(*handles); num = max_handles * 2; - new_size = num * sizeof(ULONG_PTR); + new_size = num * sizeof(*handles); if (!(p = realloc( handles, new_size ))) goto end; memset( (char *)p + old_size, 0, new_size - old_size ); handles = p;

1 0

Zebediah Figura : d3d10core/tests: Mark test failures specific to the Vulkan or GL renderers.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 44168cf4cbd760b9b338c431f66329b1e9cb6e78 URL: https://gitlab.winehq.org/wine/wine/-/commit/44168cf4cbd760b9b338c431f66329… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 21 15:42:36 2023 -0500 d3d10core/tests: Mark test failures specific to the Vulkan or GL renderers. --- dlls/d3d10core/tests/d3d10core.c | 99 ++++++++++++++++++++++++++-------------- 1 file changed, 66 insertions(+), 33 deletions(-)

1 0

Zebediah Figura : wined3d: Introduce wined3d_get_renderer().
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: 22b25dfc9c8ef4d15b8029885ad616f2a05e3cf0 URL: https://gitlab.winehq.org/wine/wine/-/commit/22b25dfc9c8ef4d15b8029885ad616… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 21 15:41:52 2023 -0500 wined3d: Introduce wined3d_get_renderer(). --- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_main.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 8 -------- include/wine/wined3d.h | 9 +++++++++ 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 91d3355830e..8f75dffc142 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -12,6 +12,7 @@ @ cdecl wined3d_get_adapter(ptr long) @ cdecl wined3d_get_adapter_count(ptr) @ cdecl wined3d_get_device_caps(ptr long ptr) +@ cdecl wined3d_get_renderer() @ cdecl wined3d_incref(ptr) @ cdecl wined3d_register_software_device(ptr ptr) @ cdecl wined3d_register_window(ptr ptr ptr long) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index bcaf1651db8..15c8e237af3 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -129,6 +129,11 @@ struct wined3d_settings wined3d_settings = .shader_backend = WINED3D_SHADER_BACKEND_AUTO, }; +enum wined3d_renderer CDECL wined3d_get_renderer(void) +{ + return wined3d_settings.renderer; +} + struct wined3d * CDECL wined3d_create(uint32_t flags) { struct wined3d *object; @@ -491,6 +496,9 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) vkd3d_set_log_callback(vkd3d_log_callback); + if (wined3d_settings.renderer == WINED3D_RENDERER_AUTO) + wined3d_settings.renderer = WINED3D_RENDERER_OPENGL; + return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e67c2e17791..22182c0507e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -514,14 +514,6 @@ static inline int wined3d_uint64_compare(uint64_t x, uint64_t y) #define PCI_VENDOR_NONE 0xffff /* e.g. 0x8086 for Intel and 0x10de for Nvidia */ #define PCI_DEVICE_NONE 0xffff /* e.g. 0x14f for a Geforce6200 */ -enum wined3d_renderer -{ - WINED3D_RENDERER_AUTO, - WINED3D_RENDERER_VULKAN, - WINED3D_RENDERER_OPENGL, - WINED3D_RENDERER_NO3D, -}; - enum wined3d_shader_backend { WINED3D_SHADER_BACKEND_AUTO, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 04e69e67904..c9790efccbb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -53,6 +53,14 @@ #define WINED3D_RESOURCE_ACCESS_MAP_R 0x4u #define WINED3D_RESOURCE_ACCESS_MAP_W 0x8u +enum wined3d_renderer +{ + WINED3D_RENDERER_AUTO, + WINED3D_RENDERER_VULKAN, + WINED3D_RENDERER_OPENGL, + WINED3D_RENDERER_NO3D, +}; + enum wined3d_light_type { WINED3D_LIGHT_POINT = 1, @@ -2311,6 +2319,7 @@ struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, struct wined3d_caps *caps); +enum wined3d_renderer __cdecl wined3d_get_renderer(void); ULONG __cdecl wined3d_incref(struct wined3d *wined3d); HRESULT __cdecl wined3d_register_software_device(struct wined3d *wined3d, void *init_function); BOOL __cdecl wined3d_register_window(struct wined3d *wined3d, HWND window,

1 0

Alexandre Julliard : include: Define LONG_PTR as int on llvm-mingw to avoid printf format warnings.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: bb1266b276b0ad51d53ac8a49bc1e6169d5dd7f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb1266b276b0ad51d53ac8a49bc1e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 5 12:14:50 2023 +0200 include: Define LONG_PTR as int on llvm-mingw to avoid printf format warnings. --- include/basetsd.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 6a6a3945205..55e900d4f8e 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -122,15 +122,15 @@ typedef unsigned __int64 ULONG_PTR, *PULONG_PTR; #define __int3264 __int32 -#ifdef WINE_NO_LONG_TYPES -typedef long INT_PTR, *PINT_PTR; -typedef unsigned long UINT_PTR, *PUINT_PTR; -#else typedef int INT_PTR, *PINT_PTR; typedef unsigned int UINT_PTR, *PUINT_PTR; -#endif +#if defined(__clang__) && defined(__MINGW32__) /* llvm-mingw warns about long type in %I formats */ +typedef int LONG_PTR, *PLONG_PTR; +typedef unsigned int ULONG_PTR, *PULONG_PTR; +#else typedef long LONG_PTR, *PLONG_PTR; typedef unsigned long ULONG_PTR, *PULONG_PTR; +#endif #endif @@ -142,8 +142,6 @@ typedef unsigned long ULONG_PTR, *PULONG_PTR; #define MININT_PTR 0x8000000000000000 #define MAXUINT_PTR 0xffffffffffffffff -typedef __int64 SHANDLE_PTR; -typedef unsigned __int64 HANDLE_PTR; typedef int HALF_PTR, *PHALF_PTR; typedef unsigned int UHALF_PTR, *PUHALF_PTR; @@ -259,8 +257,6 @@ static inline void *ULongToPtr(ULONG32 ul) #define MININT_PTR 0x80000000 #define MAXUINT_PTR 0xffffffff -typedef long SHANDLE_PTR; -typedef unsigned long HANDLE_PTR; typedef signed short HALF_PTR, *PHALF_PTR; typedef unsigned short UHALF_PTR, *PUHALF_PTR; @@ -290,6 +286,8 @@ typedef unsigned short UHALF_PTR, *PUHALF_PTR; #define UintToPtr(ui) UIntToPtr(ui) #define UlongToPtr(ul) ULongToPtr(ul) +typedef LONG_PTR SHANDLE_PTR; +typedef ULONG_PTR HANDLE_PTR; typedef LONG_PTR SSIZE_T, *PSSIZE_T; typedef ULONG_PTR SIZE_T, *PSIZE_T; typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR;

1 0

← Newer
1
...
69
70
71
72
73
74
75
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2023