January 2023 - Wine-commits

Zebediah Figura : win32u: Make create_brush() hidden.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: ffe262b29b4617d24d4562f7efb32ecc39fb9c4a URL: https://gitlab.winehq.org/wine/wine/-/commit/ffe262b29b4617d24d4562f7efb32e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 19:44:36 2023 -0600 win32u: Make create_brush() hidden. --- dlls/win32u/ntgdi_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index be3e4d8cd56..53674e0661a 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -152,7 +152,7 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src extern void get_mono_dc_colors( DC *dc, int color_table_size, BITMAPINFO *info, int count ) DECLSPEC_HIDDEN; /* brush.c */ -extern HBRUSH create_brush( const LOGBRUSH *brush ); +extern HBRUSH create_brush( const LOGBRUSH *brush ) DECLSPEC_HIDDEN; extern BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern void free_brush_pattern( struct brush_pattern *pattern ) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : win32u: Make draw_frame_caption() static.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: e729c3bb70d4c733dd86a3cbd8176c1fd36e650b URL: https://gitlab.winehq.org/wine/wine/-/commit/e729c3bb70d4c733dd86a3cbd8176c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 19:45:08 2023 -0600 win32u: Make draw_frame_caption() static. --- dlls/win32u/defwnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index e58d4e5a793..182703e22be 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -1292,7 +1292,7 @@ static BOOL draw_push_button( HDC dc, RECT *r, UINT flags ) return TRUE; } -BOOL draw_frame_caption( HDC dc, RECT *r, UINT flags ) +static BOOL draw_frame_caption( HDC dc, RECT *r, UINT flags ) { RECT rect; int small_diam = make_square_rect( r, &rect ) - 2;

1 0

Zebediah Figura : win32u: Make draw_scroll_bar() static.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: a0a3c25e84a4a5adb689c0b4702d01c1d4ace098 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0a3c25e84a4a5adb689c0b4702d01… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 19:46:06 2023 -0600 win32u: Make draw_scroll_bar() static. --- dlls/win32u/scroll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index ce3af5189d3..19a9a1379f4 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -282,7 +282,7 @@ static BOOL get_scroll_bar_rect( HWND hwnd, int bar, RECT *rect, int *arrow_size * * Redraw the whole scrollbar. */ -void draw_scroll_bar( HWND hwnd, HDC hdc, int bar, enum SCROLL_HITTEST hit_test, +static void draw_scroll_bar( HWND hwnd, HDC hdc, int bar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, BOOL draw_arrows, BOOL draw_interior ) {

1 0

Alexandre Julliard : tools: Add a common helper to get the argv0 directory.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: ecb651c01fa7d6b495b82ed516d5e86042f65121 URL: https://gitlab.winehq.org/wine/wine/-/commit/ecb651c01fa7d6b495b82ed516d5e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 11:14:36 2023 +0100 tools: Add a common helper to get the argv0 directory. --- tools/tools.h | 26 ++++++++++++++++++++++++++ tools/widl/widl.c | 25 +++++-------------------- tools/winegcc/winegcc.c | 20 +------------------- tools/wmc/wmc.c | 22 +++------------------- tools/wrc/wrc.c | 22 +++------------------- 5 files changed, 38 insertions(+), 77 deletions(-) diff --git a/tools/tools.h b/tools/tools.h index 456633e4277..4a886999e96 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -30,6 +30,9 @@ #include <fcntl.h> #include <time.h> #include <errno.h> +#ifdef HAVE_SYS_SYSCTL_H +# include <sys/sysctl.h> +#endif #ifdef _WIN32 # include <direct.h> @@ -603,6 +606,29 @@ static inline struct target init_argv0_target( const char *argv0 ) } +static inline char *get_argv0_dir( const char *argv0 ) +{ +#ifndef _WIN32 + char *dir = NULL; + +#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) + dir = realpath( "/proc/self/exe", NULL ); +#elif defined (__FreeBSD__) || defined(__DragonFly__) + static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; + size_t path_size = PATH_MAX; + char *path = xmalloc( path_size ); + if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) + dir = realpath( path, NULL ); + free( path ); +#endif + if (!dir && !(dir = realpath( argv0, NULL ))) return NULL; + return get_dirname( dir ); +#else + return get_dirname( argv0 ); +#endif +} + + /* output buffer management */ extern unsigned char *output_buffer; diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 8d07bf61dba..58ad87b44f0 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -31,9 +31,6 @@ #include <signal.h> #include <limits.h> #include <sys/types.h> -#ifdef HAVE_SYS_SYSCTL_H -# include <sys/sysctl.h> -#endif #include "widl.h" #include "utils.h" @@ -482,23 +479,11 @@ void write_id_data(const statement_list_t *stmts) static void init_argv0_dir( const char *argv0 ) { -#ifndef _WIN32 - char *dir = NULL; - -#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - dir = realpath( "/proc/self/exe", NULL ); -#elif defined (__FreeBSD__) || defined(__DragonFly__) - static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; - size_t path_size = PATH_MAX; - char *path = xmalloc( path_size ); - if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) - dir = realpath( path, NULL ); - free( path ); -#endif - if (!dir && !(dir = realpath( argv0, NULL ))) return; - includedir = strmake( "%s/%s", get_dirname( dir ), BIN_TO_INCLUDEDIR ); - dlldir = strmake( "%s/%s", get_dirname( dir ), BIN_TO_DLLDIR ); -#endif + char *dir = get_argv0_dir( argv0 ); + + if (!dir) return; + includedir = strmake( "%s/%s", dir, BIN_TO_INCLUDEDIR ); + dlldir = strmake( "%s/%s", dir, BIN_TO_DLLDIR ); } static void option_callback( int optc, char *optarg ) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 3891974c6c1..a0947a6fa7c 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -98,9 +98,6 @@ #include <ctype.h> #include <limits.h> #include <sys/types.h> -#ifdef HAVE_SYS_SYSCTL_H -# include <sys/sysctl.h> -#endif #include "utils.h" @@ -646,24 +643,9 @@ static char *get_lib_dir( struct options *opts ) static void init_argv0_dir( const char *argv0 ) { -#ifndef _WIN32 - char *dir = NULL; - -#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - dir = realpath( "/proc/self/exe", NULL ); -#elif defined (__FreeBSD__) || defined(__DragonFly__) - static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; - size_t path_size = PATH_MAX; - char *path = xmalloc( path_size ); - if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) - dir = realpath( path, NULL ); - free( path ); -#endif - if (!dir && !(dir = realpath( argv0, NULL ))) return; - bindir = get_dirname( dir ); + if (!(bindir = get_argv0_dir( argv0 ))) return; includedir = strmake( "%s/%s", bindir, BIN_TO_INCLUDEDIR ); libdir = strmake( "%s/%s", bindir, BIN_TO_LIBDIR ); -#endif } static void compile(struct options* opts, const char* lang) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 76251637a4b..c2cf754f590 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -26,9 +26,6 @@ #include <signal.h> #include <limits.h> #include <sys/types.h> -#ifdef HAVE_SYS_SYSCTL_H -# include <sys/sysctl.h> -#endif #include "wmc.h" #include "utils.h" @@ -149,24 +146,11 @@ static void exit_on_signal( int sig ) static void init_argv0_dir( const char *argv0 ) { -#ifndef _WIN32 - char *dir = NULL; - -#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - dir = realpath( "/proc/self/exe", NULL ); -#elif defined (__FreeBSD__) || defined(__DragonFly__) - static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; - size_t path_size = PATH_MAX; - char *path = xmalloc( path_size ); - if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) - dir = realpath( path, NULL ); - free( path ); -#endif - if (!dir && !(dir = realpath( argv0, NULL ))) return; - dir = get_dirname( dir ); + char *dir = get_argv0_dir( argv0 ); + + if (!dir) return; if (strendswith( dir, "/tools/wmc" )) nlsdirs[0] = strmake( "%s/../../nls", dir ); else nlsdirs[0] = strmake( "%s/%s", dir, BIN_TO_NLSDIR ); -#endif } static void option_callback( int optc, char *optarg ) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index fc217afec6c..baf98c3c3bb 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -29,9 +29,6 @@ #include <signal.h> #include <limits.h> #include <sys/types.h> -#ifdef HAVE_SYS_SYSCTL_H -# include <sys/sysctl.h> -#endif #include "../tools.h" #include "wrc.h" @@ -294,25 +291,12 @@ static int load_file( const char *input_name, const char *output_name ) static void init_argv0_dir( const char *argv0 ) { -#ifndef _WIN32 - char *dir = NULL; - -#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - dir = realpath( "/proc/self/exe", NULL ); -#elif defined (__FreeBSD__) || defined(__DragonFly__) - static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; - size_t path_size = PATH_MAX; - char *path = xmalloc( path_size ); - if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) - dir = realpath( path, NULL ); - free( path ); -#endif - if (!dir && !(dir = realpath( argv0, NULL ))) return; - dir = get_dirname( dir ); + char *dir = get_argv0_dir( argv0 ); + + if (!dir) return; includedir = strmake( "%s/%s", dir, BIN_TO_INCLUDEDIR ); if (strendswith( dir, "/tools/wrc" )) nlsdirs[0] = strmake( "%s/../../nls", dir ); else nlsdirs[0] = strmake( "%s/%s", dir, BIN_TO_NLSDIR ); -#endif } static void option_callback( int optc, char *optarg )

1 0

Alexandre Julliard : tools: Add a common helper to cleanup temp files.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: ca398e2762ec7b5395e912127eb751a6eea120da URL: https://gitlab.winehq.org/wine/wine/-/commit/ca398e2762ec7b5395e912127eb751… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 11:19:55 2023 +0100 tools: Add a common helper to cleanup temp files. --- tools/tools.h | 25 ++++++++++++++++++++----- tools/widl/parser.l | 28 ++++++++++------------------ tools/widl/widl.c | 30 +++++++++++------------------- tools/winebuild/build.h | 2 -- tools/winebuild/import.c | 6 +++--- tools/winebuild/main.c | 2 +- tools/winebuild/res32.c | 2 +- tools/winebuild/utils.c | 27 +++------------------------ tools/winegcc/winegcc.c | 16 +++------------- tools/wrc/wrc.c | 17 +++++------------ 10 files changed, 57 insertions(+), 98 deletions(-)

1 0

Alexandre Julliard : krnl386: Make MapLS argument non-const to avoid some compiler warnings.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 6e43f873c3f554f8166abdce8bbd265b66aad548 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e43f873c3f554f8166abdce8bbd26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 22:17:14 2023 +0100 krnl386: Make MapLS argument non-const to avoid some compiler warnings. --- dlls/commdlg.dll16/filedlg.c | 4 ++-- dlls/krnl386.exe16/selector.c | 2 +- dlls/shell.dll16/shell.c | 2 +- dlls/user.exe16/dialog.c | 2 +- dlls/user.exe16/hook.c | 4 ++-- dlls/user.exe16/message.c | 12 ++++++------ dlls/user.exe16/window.c | 2 +- include/wine/winbase16.h | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c index 2631febb6ae..b292561b077 100644 --- a/dlls/commdlg.dll16/filedlg.c +++ b/dlls/commdlg.dll16/filedlg.c @@ -249,8 +249,8 @@ static UINT_PTR CALLBACK call_hook_proc( WNDPROC16 hook, HWND hwnd, UINT msg, WP CREATESTRUCT16 cs; CREATESTRUCT32Ato16( cs32, &cs ); - cs.lpszName = MapLS( cs32->lpszName ); - cs.lpszClass = MapLS( cs32->lpszClass ); + cs.lpszName = MapLS( (void *)cs32->lpszName ); + cs.lpszClass = MapLS( (void *)cs32->lpszClass ); lp = MapLS( &cs ); ret = call_hook16( hook, hwnd, msg, wp, lp ); UnMapLS( lp ); diff --git a/dlls/krnl386.exe16/selector.c b/dlls/krnl386.exe16/selector.c index 7d2984cf777..f0c29c8b10d 100644 --- a/dlls/krnl386.exe16/selector.c +++ b/dlls/krnl386.exe16/selector.c @@ -515,7 +515,7 @@ static struct mapls_entry *first_entry; * * Maps linear pointer to segmented. */ -SEGPTR WINAPI MapLS( LPCVOID ptr ) +SEGPTR WINAPI MapLS( void *ptr ) { struct mapls_entry *entry, *free = NULL; const void *base; diff --git a/dlls/shell.dll16/shell.c b/dlls/shell.dll16/shell.c index bc3cfdfc97d..342adeb9a4a 100644 --- a/dlls/shell.dll16/shell.c +++ b/dlls/shell.dll16/shell.c @@ -670,7 +670,7 @@ HINSTANCE16 WINAPI ShellExecute16( HWND16 hWnd, LPCSTR lpOperation, * Only exported from shell32 on Windows, probably imported * from shell through the 16/32 thunks. */ -void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, LPCSTR cmdline, INT cmdshow ) +void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, LPSTR cmdline, INT cmdshow ) { WORD args[5]; SEGPTR cmdline_seg; diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index b61ae5cd519..2b6731e4aaf 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -186,7 +186,7 @@ static BOOL DIALOG_CreateControls16( HWND hwnd, LPCSTR template, SEGPTR segptr; template = DIALOG_GetControl16( template, &info ); - segptr = MapLS( info.data ); + segptr = MapLS( (void *)info.data ); caption = (char *)info.windowName; if (caption && IS_INTRESOURCE(caption)) diff --git a/dlls/user.exe16/hook.c b/dlls/user.exe16/hook.c index d140e16e426..6d40982297c 100644 --- a/dlls/user.exe16/hook.c +++ b/dlls/user.exe16/hook.c @@ -290,8 +290,8 @@ static LRESULT CALLBACK call_WH_CBT( INT code, WPARAM wp, LPARAM lp ) cs16.y = cbtcw32->lpcs->y; cs16.x = cbtcw32->lpcs->x; cs16.style = cbtcw32->lpcs->style; - cs16.lpszName = MapLS( cbtcw32->lpcs->lpszName ); - cs16.lpszClass = MapLS( cbtcw32->lpcs->lpszClass ); + cs16.lpszName = MapLS( (void *)cbtcw32->lpcs->lpszName ); + cs16.lpszClass = MapLS( (void *)cbtcw32->lpcs->lpszClass ); cs16.dwExStyle = cbtcw32->lpcs->dwExStyle; cbtcw16.lpcs = (CREATESTRUCT16 *)MapLS( &cs16 ); diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 59c58ed9bd9..203d543ce90 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -945,15 +945,15 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT BOOL mdi_child = (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD); CREATESTRUCT32Ato16( cs32, &cs ); - cs.lpszName = MapLS( cs32->lpszName ); - cs.lpszClass = MapLS( cs32->lpszClass ); + cs.lpszName = MapLS( (void *)cs32->lpszName ); + cs.lpszClass = MapLS( (void *)cs32->lpszClass ); if (mdi_child) { MDICREATESTRUCTA *mdi_cs = cs32->lpCreateParams; MDICREATESTRUCT32Ato16( mdi_cs, &mdi_cs16 ); - mdi_cs16.szTitle = MapLS( mdi_cs->szTitle ); - mdi_cs16.szClass = MapLS( mdi_cs->szClass ); + mdi_cs16.szTitle = MapLS( (void *)mdi_cs->szTitle ); + mdi_cs16.szClass = MapLS( (void *)mdi_cs->szClass ); cs.lpCreateParams = MapLS( &mdi_cs16 ); } lParam = MapLS( &cs ); @@ -975,8 +975,8 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT MDICREATESTRUCT16 cs; MDICREATESTRUCT32Ato16( cs32, &cs ); - cs.szTitle = MapLS( cs32->szTitle ); - cs.szClass = MapLS( cs32->szClass ); + cs.szTitle = MapLS( (void *)cs32->szTitle ); + cs.szClass = MapLS( (void *)cs32->szClass ); lParam = MapLS( &cs ); ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); UnMapLS( lParam ); diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index 69d178e31b0..eac3468a6e0 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -1671,7 +1671,7 @@ BOOL16 WINAPI GetClassInfoEx16( HINSTANCE16 hInst16, SEGPTR name, WNDCLASSEX16 * wc->hCursor = get_icon_16( wc32.hCursor ); wc->hbrBackground = HBRUSH_16(wc32.hbrBackground); wc->lpszClassName = 0; - wc->lpszMenuName = MapLS(wc32.lpszMenuName); /* FIXME: leak */ + wc->lpszMenuName = MapLS((void *)wc32.lpszMenuName); /* FIXME: leak */ } return ret; } diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 1d052130e33..28cde59f9b3 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -402,8 +402,8 @@ WORD WINAPI LocalHeapSize16(void); BOOL16 WINAPI LocalInit16(HANDLE16,WORD,WORD); FARPROC16 WINAPI LocalNotify16(FARPROC16); HTASK16 WINAPI LockCurrentTask16(BOOL16); -DWORD WINAPI MapLS(LPCVOID); -LPVOID WINAPI MapSL(DWORD); +SEGPTR WINAPI MapLS(void*); +LPVOID WINAPI MapSL(SEGPTR); VOID WINAPI OldYield16(void); VOID WINAPI WIN32_OldYield16(void); VOID WINAPI PostEvent16(HTASK16);

1 0

Alexandre Julliard : krnl386: Remove a trace that causes compiler warnings.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: cf3d58e4dc0a59b8b3ac75ceae64fe594c681a50 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf3d58e4dc0a59b8b3ac75ceae64fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 22:18:34 2023 +0100 krnl386: Remove a trace that causes compiler warnings. --- dlls/krnl386.exe16/thunk.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index 6b289eac65e..27fc14b5810 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -989,15 +989,7 @@ DWORD WINAPIV SSCall( FARPROC fun, /* [in] function to call */ ... /* [in/out] arguments */ ) { - DWORD i,ret; - DWORD *args = ((DWORD *)&fun) + 1; - - TRACE("(%ld,0x%08lx,%p,[",nr,flags,fun); - for (i = 0; i < nr/4; i++) TRACE("0x%08lx,",args[i]); - TRACE("])\n"); - ret = call_entry_point( fun, nr / sizeof(DWORD), args ); - TRACE(" returning %ld ...\n",ret); - return ret; + return call_entry_point( fun, nr / sizeof(DWORD), (DWORD *)&fun + 1 ); } /**********************************************************************

1 0

Alexandre Julliard : shell32: Allocate a full SHITEMID to avoid a compiler warning.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: c844ebdb0ae8994ee4f3d1d3c1697ece06f52a4e URL: https://gitlab.winehq.org/wine/wine/-/commit/c844ebdb0ae8994ee4f3d1d3c1697e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 22:22:52 2023 +0100 shell32: Allocate a full SHITEMID to avoid a compiler warning. --- dlls/shell32/shfldr_fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 662d8b52d5b..d47911dbef7 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -347,7 +347,7 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface, /* Special case for the root folder. */ if (!wcsicmp( szPath, L"\\\\?\\unix\\" )) { - *ppidl = SHAlloc(sizeof(USHORT)); + *ppidl = SHAlloc(sizeof(*ppidl)); if (!*ppidl) return E_FAIL; (*ppidl)->mkid.cb = 0; /* Terminate the ITEMIDLIST */ return S_OK;

1 0

Fabian Maurer : d2d1_1: Don't redefine D2D1_PROPERTY_BINDING (gcc 4.3).
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 0de8f53b3bb6a5256808638cb98f468a7990b3f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/0de8f53b3bb6a5256808638cb98f46… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Dec 12 18:32:14 2022 +0100 d2d1_1: Don't redefine D2D1_PROPERTY_BINDING (gcc 4.3). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- include/d2d1_1.idl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index b60064be3b6..9da56050ecb 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -157,7 +157,7 @@ typedef enum D2D1_LAYER_OPTIONS1 D2D1_LAYER_OPTIONS1_FORCE_DWORD = 0xffffffff, } D2D1_LAYER_OPTIONS1; -typedef struct D2D1_PROPERTY_BINDING D2D1_PROPERTY_BINDING; +struct D2D1_PROPERTY_BINDING; typedef D2D_MATRIX_4X4_F D2D1_MATRIX_4X4_F; typedef enum D2D1_PROPERTY_TYPE @@ -936,14 +936,14 @@ interface ID2D1Factory1 : ID2D1Factory HRESULT RegisterEffectFromStream( [in] REFCLSID effect_id, [in] IStream *property_xml, - [in, size_is(binding_count)] const D2D1_PROPERTY_BINDING *bindings, + [in, size_is(binding_count)] const struct D2D1_PROPERTY_BINDING *bindings, [in] UINT32 binding_count, [in] PD2D1_EFFECT_FACTORY effect_factory ); HRESULT RegisterEffectFromString( [in] REFCLSID effect_id, [in] const WCHAR *property_xml, - [in, size_is(binding_count)] const D2D1_PROPERTY_BINDING *bindings, + [in, size_is(binding_count)] const struct D2D1_PROPERTY_BINDING *bindings, [in] UINT32 binding_count, [in] PD2D1_EFFECT_FACTORY effect_factory );

1 0

Fabian Maurer : d3dx10core: Don't redefine ID3D10Device1 (gcc 4.3).
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: ae84e423c5d0e7d9d8c083b1f64029ef41e6e1fe URL: https://gitlab.winehq.org/wine/wine/-/commit/ae84e423c5d0e7d9d8c083b1f64029… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Dec 12 18:56:34 2022 +0100 d3dx10core: Don't redefine ID3D10Device1 (gcc 4.3). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- include/d3dx10core.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3dx10core.h b/include/d3dx10core.h index cca9052cc13..c8c5e97505f 100644 --- a/include/d3dx10core.h +++ b/include/d3dx10core.h @@ -287,8 +287,8 @@ HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive HRESULT WINAPI D3DX10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, unsigned int flags, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain, ID3D10Device **device); -typedef interface ID3D10Device1 ID3D10Device1; -HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1); +interface ID3D10Device1; +HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, interface ID3D10Device1 **device1); HRESULT WINAPI D3DX10CreateFontIndirectA(ID3D10Device *device, const D3DX10_FONT_DESCA *desc, ID3DX10Font **font); HRESULT WINAPI D3DX10CreateFontIndirectW(ID3D10Device *device, const D3DX10_FONT_DESCW *desc, ID3DX10Font **font); HRESULT WINAPI D3DX10CreateFontA(ID3D10Device *device, INT height, UINT width, UINT weight,

1 0