wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Henri Verbeet : wined3d: Simplify wined3d_context_destroy().
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 817f915bb3afb1c52afb7cac7276d63091a12d9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=817f915bb3afb1c52afb7cac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 3 15:43:58 2019 +0430 wined3d: Simplify wined3d_context_destroy(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 223e6b2..5978627 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2302,7 +2302,6 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, void wined3d_context_destroy(struct wined3d_context *context) { struct wined3d_device *device = context->device; - BOOL destroy; TRACE("Destroying ctx %p\n", context); @@ -2320,29 +2319,28 @@ void wined3d_context_destroy(struct wined3d_context *context) return; } - if (context->tid == GetCurrentThreadId() || !context->current) - { - context_destroy_gl_resources(context); - TlsSetValue(wined3d_context_tls_idx, NULL); - destroy = TRUE; - } - else + device->shader_backend->shader_free_context_data(context); + device->adapter->fragment_pipe->free_context_data(context); + heap_free(context->texture_type); + device_context_remove(device, context); + + if (context->current && context->tid != GetCurrentThreadId()) { - /* Make a copy of gl_info for context_destroy_gl_resources use, the one - in wined3d_adapter may go away in the meantime */ - struct wined3d_gl_info *gl_info = heap_alloc(sizeof(*gl_info)); + struct wined3d_gl_info *gl_info; + + /* Make a copy of gl_info for context_destroy_gl_resources() use, the + * one in wined3d_adapter may go away in the meantime. */ + gl_info = heap_alloc(sizeof(*gl_info)); *gl_info = *context->gl_info; context->gl_info = gl_info; context->destroyed = 1; - destroy = FALSE; + + return; } - device->shader_backend->shader_free_context_data(context); - device->adapter->fragment_pipe->free_context_data(context); - heap_free(context->texture_type); - device_context_remove(device, context); - if (destroy) - heap_free(context); + context_destroy_gl_resources(context); + TlsSetValue(wined3d_context_tls_idx, NULL); + heap_free(context); } const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context,

1 0

Alexandre Julliard : explorer: Build with msvcrt.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: e5e79bb7aac02dade2aeb427744dfc89414871e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5e79bb7aac02dade2aeb427… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 12:28:45 2019 +0200 explorer: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/Makefile.in | 3 ++- programs/explorer/appbar.c | 1 - programs/explorer/desktop.c | 45 ++++++++++++++++++++----------------------- programs/explorer/explorer.c | 17 ++++++++-------- 4 files changed, 31 insertions(+), 35 deletions(-) diff --git a/programs/explorer/Makefile.in b/programs/explorer/Makefile.in index a06887c..374c6aa 100644 --- a/programs/explorer/Makefile.in +++ b/programs/explorer/Makefile.in @@ -1,8 +1,9 @@ MODULE = explorer.exe -APPMODE = -mwindows -municode IMPORTS = rpcrt4 user32 gdi32 advapi32 DELAYIMPORTS = comctl32 shell32 oleaut32 ole32 shlwapi +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ appbar.c \ desktop.c \ diff --git a/programs/explorer/appbar.c b/programs/explorer/appbar.c index 329ef47..01dda7e 100644 --- a/programs/explorer/appbar.c +++ b/programs/explorer/appbar.c @@ -29,7 +29,6 @@ #include "windows.h" #include "shellapi.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "explorer_private.h" diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index f4cc7b1..2857fcf 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <stdio.h> #define COBJMACROS @@ -31,7 +29,6 @@ #include <shellapi.h> #include "exdisp.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "explorer_private.h" @@ -249,10 +246,10 @@ static void do_launch( const struct launcher *launcher ) static WCHAR *append_path( const WCHAR *path, const WCHAR *filename, int len_filename ) { - int len_path = strlenW( path ); + int len_path = lstrlenW( path ); WCHAR *ret; - if (len_filename == -1) len_filename = strlenW( filename ); + if (len_filename == -1) len_filename = lstrlenW( filename ); if (!(ret = HeapAlloc( GetProcessHeap(), 0, (len_path + len_filename + 2) * sizeof(WCHAR) ))) return NULL; memcpy( ret, path, len_path * sizeof(WCHAR) ); @@ -314,7 +311,7 @@ static WCHAR *build_title( const WCHAR *filename, int len ) const WCHAR *p; WCHAR *ret; - if (len == -1) len = strlenW( filename ); + if (len == -1) len = lstrlenW( filename ); for (p = filename + len - 1; p >= filename; p--) { if (*p == '.') @@ -381,7 +378,7 @@ static BOOL remove_launcher( const WCHAR *folder, const WCHAR *filename, int len if (!(path = append_path( folder, filename, len_filename ))) return FALSE; for (i = 0; i < nb_launchers; i++) { - if (!strcmpiW( launchers[i]->path, path )) + if (!wcsicmp( launchers[i]->path, path )) { free_launcher( launchers[i] ); if (--nb_launchers) @@ -514,14 +511,14 @@ error: static void add_folder( const WCHAR *folder ) { static const WCHAR lnkW[] = {'\\','*','.','l','n','k',0}; - int len = strlenW( folder ) + strlenW( lnkW ); + int len = lstrlenW( folder ) + lstrlenW( lnkW ); WIN32_FIND_DATAW data; HANDLE handle; WCHAR *glob; if (!(glob = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return; - strcpyW( glob, folder ); - strcatW( glob, lnkW ); + lstrcpyW( glob, folder ); + lstrcatW( glob, lnkW ); if ((handle = FindFirstFileW( glob, &data )) != INVALID_HANDLE_VALUE) { @@ -668,11 +665,11 @@ static BOOL parse_size( const WCHAR *size, unsigned int *width, unsigned int *he { WCHAR *end; - *width = strtoulW( size, &end, 10 ); + *width = wcstoul( size, &end, 10 ); if (end == size) return FALSE; if (*end != 'x') return FALSE; size = end + 1; - *height = strtoulW( size, &end, 10 ); + *height = wcstoul( size, &end, 10 ); return !*end; } @@ -691,7 +688,7 @@ static const WCHAR *get_default_desktop_name(void) if (desk && GetUserObjectInformationW( desk, UOI_NAME, buffer, ARRAY_SIZE( buffer ), NULL )) { - if (strcmpiW( buffer, defaultW )) return buffer; + if (wcsicmp( buffer, defaultW )) return buffer; } /* @@ Wine registry key: HKCU\Software\Wine\Explorer */ @@ -779,7 +776,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) if (!driver) { - strcpyW( buffer, default_driver ); + lstrcpyW( buffer, default_driver ); /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ if (!RegOpenKeyW( HKEY_CURRENT_USER, driversW, &hkey )) @@ -794,10 +791,10 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) name = buffer; while (name) { - next = strchrW( name, ',' ); + next = wcschr( name, ',' ); if (next) *next++ = 0; - snprintfW( libname, ARRAY_SIZE( libname ), drv_formatW, name ); + swprintf( libname, ARRAY_SIZE( libname ), drv_formatW, name ); if ((module = LoadLibraryW( libname )) != 0) break; switch (GetLastError()) { @@ -820,7 +817,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) ); } - sprintfW( key, device_keyW, guid->Data1, guid->Data2, guid->Data3, + swprintf( key, ARRAY_SIZE(key), device_keyW, guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); @@ -829,7 +826,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) { if (module) RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, - (BYTE *)buffer, (strlenW(buffer) + 1) * sizeof(WCHAR) ); + (BYTE *)buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR) ); else RegSetValueExA( hkey, "DriverError", 0, REG_SZ, (BYTE *)error, strlen(error) + 1 ); RegCloseKey( hkey ); @@ -866,7 +863,7 @@ static void set_desktop_window_title( HWND hwnd, const WCHAR *name ) return; } - window_title_len = strlenW(name) * sizeof(WCHAR) + window_title_len = lstrlenW(name) * sizeof(WCHAR) + sizeof(desktop_name_separatorW) + sizeof(desktop_nameW); window_titleW = HeapAlloc( GetProcessHeap(), 0, window_title_len ); @@ -876,9 +873,9 @@ static void set_desktop_window_title( HWND hwnd, const WCHAR *name ) return; } - strcpyW( window_titleW, name ); - strcatW( window_titleW, desktop_name_separatorW ); - strcatW( window_titleW, desktop_nameW ); + lstrcpyW( window_titleW, name ); + lstrcatW( window_titleW, desktop_name_separatorW ); + lstrcatW( window_titleW, desktop_nameW ); SetWindowTextW( hwnd, window_titleW ); HeapFree( GetProcessHeap(), 0, window_titleW ); @@ -920,10 +917,10 @@ void manage_desktop( WCHAR *arg ) { arg++; name = arg; - if ((p = strchrW( arg, ',' ))) + if ((p = wcschr( arg, ',' ))) { *p++ = 0; - if ((driver = strchrW( p, ',' ))) *driver++ = 0; + if ((driver = wcschr( p, ',' ))) *driver++ = 0; } if (!p || !parse_size( p, &width, &height )) get_default_desktop_size( name, &width, &height ); diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 955678d..dcd09ac 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -22,7 +22,6 @@ #define COBJMACROS -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h" #include "explorer_private.h" @@ -671,7 +670,7 @@ static WCHAR *copy_path_string(WCHAR *target, WCHAR *source) { INT i = 0; - while (isspaceW(*source)) source++; + while (iswspace(*source)) source++; if (*source == '\"') { @@ -735,23 +734,23 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) while (*p) { - while (isspaceW(*p)) p++; - if (strncmpW(p, arg_n, ARRAY_SIZE( arg_n ))==0) + while (iswspace(*p)) p++; + if (wcsncmp(p, arg_n, ARRAY_SIZE( arg_n ))==0) { parameters->explorer_mode = FALSE; p += ARRAY_SIZE( arg_n ); } - else if (strncmpW(p, arg_e, ARRAY_SIZE( arg_e ))==0) + else if (wcsncmp(p, arg_e, ARRAY_SIZE( arg_e ))==0) { parameters->explorer_mode = TRUE; p += ARRAY_SIZE( arg_e ); } - else if (strncmpW(p, arg_root, ARRAY_SIZE( arg_root ))==0) + else if (wcsncmp(p, arg_root, ARRAY_SIZE( arg_root ))==0) { p += ARRAY_SIZE( arg_root ); p = copy_path_string(parameters->root,p); } - else if (strncmpW(p, arg_select, ARRAY_SIZE( arg_select ))==0) + else if (wcsncmp(p, arg_select, ARRAY_SIZE( arg_select ))==0) { p += ARRAY_SIZE( arg_select ); p = copy_path_string(parameters->selection,p); @@ -759,13 +758,13 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) copy_path_root(parameters->root, parameters->selection); } - else if (strncmpW(p, arg_desktop, ARRAY_SIZE( arg_desktop ))==0) + else if (wcsncmp(p, arg_desktop, ARRAY_SIZE( arg_desktop ))==0) { p += ARRAY_SIZE( arg_desktop ); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } /* workaround for Worms Armageddon that hardcodes a /desktop option with quotes */ - else if (strncmpW(p, arg_desktop_quotes, ARRAY_SIZE( arg_desktop_quotes ))==0) + else if (wcsncmp(p, arg_desktop_quotes, ARRAY_SIZE( arg_desktop_quotes ))==0) { p += ARRAY_SIZE( arg_desktop_quotes ); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */

1 0

Alexandre Julliard : explorer: Move screen saver activation to the X11 driver.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: ed22f0454bc50f7820fc93fbe8c2af4877083006 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed22f0454bc50f7820fc93fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 12:28:38 2019 +0200 explorer: Move screen saver activation to the X11 driver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 26 +++++++++++++++++++++++++- programs/explorer/desktop.c | 22 ++-------------------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 97dee52..fb97ec5 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include <stdarg.h> #include <stdlib.h> @@ -2764,6 +2765,25 @@ static BOOL is_netwm_supported( Display *display, Atom atom ) /*********************************************************************** + * start_screensaver + */ +static LRESULT start_screensaver(void) +{ + if (root_window == DefaultRootWindow(gdi_display)) + { + const char *argv[3] = { "xdg-screensaver", "activate", NULL }; + int pid = _spawnvp( _P_DETACH, argv[0], argv ); + if (pid > 0) + { + TRACE( "started process %d\n", pid ); + return 0; + } + } + return -1; +} + + +/*********************************************************************** * SysCommand (X11DRV.@) * * Perform WM_SYSCOMMAND handling. @@ -2774,7 +2794,11 @@ LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) int dir; struct x11drv_win_data *data; - if (!(data = get_win_data( hwnd ))) return -1; + if (!(data = get_win_data( hwnd ))) + { + if (wparam == SC_SCREENSAVE && hwnd == GetDesktopWindow()) return start_screensaver(); + return -1; + } if (!data->whole_window || !data->managed || !data->mapped) goto failed; switch (wparam & 0xfff0) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 27b9b24..f4cc7b1 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -583,22 +583,6 @@ static void initialize_launchers( HWND hwnd ) } } -/* screen saver handler */ -static BOOL start_screensaver( void ) -{ - if (using_root) - { - const char *argv[3] = { "xdg-screensaver", "activate", NULL }; - int pid = _spawnvp( _P_DETACH, argv[0], argv ); - if (pid > 0) - { - WINE_TRACE( "started process %d\n", pid ); - return TRUE; - } - } - return FALSE; -} - static WNDPROC desktop_orig_wndproc; /* window procedure for the desktop window */ @@ -613,11 +597,9 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR { case SC_CLOSE: ExitWindows( 0, 0 ); - break; - case SC_SCREENSAVE: - return start_screensaver(); + return 0; } - return 0; + break; case WM_CLOSE: PostQuitMessage(0);

1 0

Alexandre Julliard : cmd: Build with msvcrt.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 43c430a6d837d99f30dbcdb770f676e60ddb1ffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=43c430a6d837d99f30dbcdb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 12:28:33 2019 +0200 cmd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/Makefile.in | 3 +- programs/cmd/batch.c | 94 +++++------ programs/cmd/builtins.c | 422 +++++++++++++++++++++++------------------------ programs/cmd/directory.c | 80 ++++----- programs/cmd/wcmd.h | 6 +- programs/cmd/wcmdmain.c | 202 +++++++++++------------ 6 files changed, 403 insertions(+), 404 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43c430a6d837d99f30db…

1 0

Alexandre Julliard : strmbase: Avoid using wine/unicode.h.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 71e7e73fc092b3594dde0fe3b99ae0552c626013 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71e7e73fc092b3594dde0fe3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 12:32:45 2019 +0200 strmbase: Avoid using wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/audio.c | 1 - dlls/strmbase/dispatch.c | 1 - dlls/strmbase/dllfunc.c | 2 -- dlls/strmbase/filter.c | 7 +++---- dlls/strmbase/outputqueue.c | 1 - dlls/strmbase/pin.c | 7 +++---- dlls/strmbase/renderer.c | 1 - dlls/strmbase/transform.c | 3 +-- dlls/strmbase/video.c | 1 - dlls/strmbase/window.c | 1 - 10 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/strmbase/audio.c b/dlls/strmbase/audio.c index 1b79ec5..260e5ed 100644 --- a/dlls/strmbase/audio.c +++ b/dlls/strmbase/audio.c @@ -24,7 +24,6 @@ #include "dshow.h" #include "uuids.h" #include "vfwmsgs.h" -#include "wine/unicode.h" #include "wine/strmbase.h" diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index 62bc397..6976185 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -21,7 +21,6 @@ #define COBJMACROS #include "dshow.h" -#include "wine/unicode.h" #include "wine/strmbase.h" #include "uuids.h" #include "vfwmsgs.h" diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index 195a409..da4f450 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -18,7 +18,6 @@ * 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 <stdarg.h> #include <assert.h> @@ -36,7 +35,6 @@ #include "uuids.h" #include "strmif.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/strmbase.h" diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 9b14cf0..f133f1c 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -22,7 +22,6 @@ #include "dshow.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/strmbase.h" #include "uuids.h" #include <assert.h> @@ -162,7 +161,7 @@ HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin } if (info.pFilter) IBaseFilter_Release(info.pFilter); - if (!strcmpW(id, info.achName)) + if (!lstrcmpW(id, info.achName)) { *ret = pin; return S_OK; @@ -179,7 +178,7 @@ HRESULT WINAPI BaseFilterImpl_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO * BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%p)\n", This, pInfo); - strcpyW(pInfo->achName, This->filterInfo.achName); + lstrcpyW(pInfo->achName, This->filterInfo.achName); pInfo->pGraph = This->filterInfo.pGraph; if (pInfo->pGraph) @@ -197,7 +196,7 @@ HRESULT WINAPI BaseFilterImpl_JoinFilterGraph(IBaseFilter * iface, IFilterGraph EnterCriticalSection(&This->csFilter); { if (pName) - strcpyW(This->filterInfo.achName, pName); + lstrcpyW(This->filterInfo.achName, pName); else *This->filterInfo.achName = '\0'; This->filterInfo.pGraph = pGraph; /* NOTE: do NOT increase ref. count */ diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index 5513193..ba61c1f 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -22,7 +22,6 @@ #include "dshow.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/list.h" #include "wine/strmbase.h" #include "uuids.h" diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index a100ae1..3075207 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -23,7 +23,6 @@ #include "dshow.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/strmbase.h" #include "uuids.h" #include "vfwmsgs.h" @@ -146,7 +145,7 @@ out: static void Copy_PinInfo(PIN_INFO * pDest, const PIN_INFO * pSrc) { /* avoid copying uninitialized data */ - strcpyW(pDest->achName, pSrc->achName); + lstrcpyW(pDest->achName, pSrc->achName); pDest->dir = pSrc->dir; pDest->pFilter = pSrc->pFilter; } @@ -296,11 +295,11 @@ HRESULT WINAPI BasePinImpl_QueryId(IPin * iface, LPWSTR * Id) TRACE("(%p)->(%p)\n", This, Id); - *Id = CoTaskMemAlloc((strlenW(This->pinInfo.achName) + 1) * sizeof(WCHAR)); + *Id = CoTaskMemAlloc((lstrlenW(This->pinInfo.achName) + 1) * sizeof(WCHAR)); if (!*Id) return E_OUTOFMEMORY; - strcpyW(*Id, This->pinInfo.achName); + lstrcpyW(*Id, This->pinInfo.achName); return S_OK; } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 499bc2b..4e24ce1 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -22,7 +22,6 @@ #include "dshow.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/strmbase.h" #include "uuids.h" #include "vfwmsgs.h" diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index c62e49a..d741e92 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -18,7 +18,7 @@ * 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 <stdarg.h> #define COBJMACROS @@ -32,7 +32,6 @@ #include <assert.h> -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/strmbase.h" #include "strmbase_private.h" diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index a03ba55..f536641 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -25,7 +25,6 @@ #include "uuids.h" #include "vfwmsgs.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/strmbase.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index b08608e..64e9bc1 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -22,7 +22,6 @@ #include "dshow.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/strmbase.h" #include "uuids.h" #include "vfwmsgs.h"

1 0

Alexandre Julliard : dxerr9: Don't use snprintf().
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 0844e4473c52f15e1a6ec1e48c678aac42ed6649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0844e4473c52f15e1a6ec1e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 12:26:45 2019 +0200 dxerr9: Don't use snprintf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxerr9/dxerr9.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dxerr9/dxerr9.c b/dlls/dxerr9/dxerr9.c index e5b1861..aa1de46 100644 --- a/dlls/dxerr9/dxerr9.c +++ b/dlls/dxerr9/dxerr9.c @@ -18,10 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> -#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -126,11 +124,11 @@ HRESULT WINAPI DXTraceA(const char* strFile, DWORD dwLine, HRESULT hr, const cha char msg[1024]; if (bPopMsgBox) { - snprintf(msg, sizeof(msg), "File: %s\nLine: %d\nError Code: %s (0x%08x)\nCalling: %s", + wsprintfA(msg, "File: %s\nLine: %d\nError Code: %s (0x%08x)\nCalling: %s", strFile, dwLine, DXGetErrorString9A(hr), hr, strMsg); MessageBoxA(0, msg, "Unexpected error encountered", MB_OK|MB_ICONERROR); } else { - snprintf(msg, sizeof(msg), "%s(%d): %s (hr=%s (0x%08x))", strFile, + wsprintfA(msg, "%s(%d): %s (hr=%s (0x%08x))", strFile, dwLine, strMsg, DXGetErrorString9A(hr), hr); OutputDebugStringA(msg); }

1 0

Alexandre Julliard : dxerr8: Don't use snprintf().
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 689f5c80f3c051af1087e59b962fc5e5583ea461 URL: https://source.winehq.org/git/wine.git/?a=commit;h=689f5c80f3c051af1087e59b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 12:26:36 2019 +0200 dxerr8: Don't use snprintf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxerr8/dxerr8.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dxerr8/dxerr8.c b/dlls/dxerr8/dxerr8.c index 1d22296..eb72394 100644 --- a/dlls/dxerr8/dxerr8.c +++ b/dlls/dxerr8/dxerr8.c @@ -18,10 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> -#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -122,11 +120,11 @@ HRESULT WINAPI DXTraceA(const char* strFile, DWORD dwLine, HRESULT hr, const cha char msg[1024]; if (bPopMsgBox) { - snprintf(msg, sizeof(msg), "File: %s\nLine: %d\nError Code: %s (0x%08x)\nCalling: %s", + wsprintfA(msg, "File: %s\nLine: %d\nError Code: %s (0x%08x)\nCalling: %s", strFile, dwLine, DXGetErrorString8A(hr), hr, strMsg); MessageBoxA(0, msg, "Unexpected error encountered", MB_OK|MB_ICONERROR); } else { - snprintf(msg, sizeof(msg), "%s(%d): %s (hr=%s (0x%08x))", strFile, + wsprintfA(msg, "%s(%d): %s (hr=%s (0x%08x))", strFile, dwLine, strMsg, DXGetErrorString8A(hr), hr); OutputDebugStringA(msg); }

1 0

Alexandre Julliard : makefiles: Only cross-compile the static libraries that are actually used.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: c685acba64f57a35fb2d04630ee0bbd6d0aa01bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c685acba64f57a35fb2d0463… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 11:18:00 2019 +0200 makefiles: Only cross-compile the static libraries that are actually used. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index d9d4d1a..97017d7 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2086,8 +2086,14 @@ static struct makefile *get_parent_makefile( struct makefile *make ) static int needs_cross_lib( const struct makefile *make ) { if (!crosstarget) return 0; - if (!make->importlib) return 0; - return strarray_exists( &cross_import_libs, make->importlib ); + if (make->importlib) return strarray_exists( &cross_import_libs, make->importlib ); + if (make->staticlib) + { + const char *name = replace_extension( make->staticlib, ".a", "" ); + if (!strncmp( name, "lib", 3 )) name += 3; + return strarray_exists( &cross_import_libs, name ); + } + return 0; } @@ -2974,7 +2980,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour (make->is_cross || ((source->file->flags & FLAG_C_IMPLIB) && (needs_cross_lib( make ) || needs_delay_lib( make ))) || - (make->module && make->staticlib))); + (make->staticlib && needs_cross_lib( make )))); int need_obj = (!need_cross || (source->file->flags & FLAG_C_IMPLIB) || (make->module && make->staticlib)); @@ -3289,7 +3295,7 @@ static void output_static_lib( struct makefile *make ) output( "\n\t%s $@\n", ranlib ); add_install_rule( make, make->staticlib, make->staticlib, strmake( "d$(dlldir)/%s", make->staticlib )); - if (crosstarget && make->module) + if (needs_cross_lib( make )) { char *name = replace_extension( make->staticlib, ".a", ".cross.a" );

1 0

Alexandre Julliard : makefiles: Only cross-compile the import libraries that are actually used.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: bbc302290b6e48e390a342e60eabdd5d6e3912cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbc302290b6e48e390a342e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 10:52:51 2019 +0200 makefiles: Only cross-compile the import libraries that are actually used. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 165 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 108 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bbc302290b6e48e390a3…

1 0

Józef Kucia : tests: Add simple test for graphics and compute queue synchronization.
by Alexandre Julliard 03 May '19

03 May '19

Module: vkd3d Branch: master Commit: 1bfe8a2c5415e41ab1a35de01448b4c6972dd41e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1bfe8a2c5415e41ab1a35de… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 2 16:02:42 2019 +0200 tests: Add simple test for graphics and compute queue synchronization. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 225 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 225 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=1bfe8a2c5415e41ab1a…

1 0

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 May 2019