wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Rémi Bernon : winegcc: Add missing strarray initialization.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: 6db01bcbbc7a8a738750f0ad456c9825f160f5c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6db01bcbbc7a8a738750f0ad… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 24 10:17:40 2021 +0200 winegcc: Add missing strarray initialization. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 0cb5ae390de..8e72c6bcfee 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1475,6 +1475,7 @@ static void build(struct options* opts) { struct strarray tool, objcopy = build_tool_name(opts, TOOL_OBJCOPY); + tool = empty_strarray; strarray_addall( &tool, objcopy ); strarray_add(&tool, "--only-keep-debug"); strarray_add(&tool, output_path);

1 0

Jacek Caban : gdi32: Avoid calling kernel32 from ntgdi functions.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: 5b513cbb0e1b8f520a9e1b8e134be90c8a96446b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b513cbb0e1b8f520a9e1b8e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 24 12:56:11 2021 +0200 gdi32: Avoid calling kernel32 from ntgdi functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 4 ++-- dlls/gdi32/driver.c | 2 +- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/printdrv.c | 8 ++++++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 0ff4688b170..413ba8b8665 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -745,13 +745,13 @@ static inline void lock_surface( struct windrv_physdev *dev ) { GDI_CheckNotLock(); dev->surface->funcs->lock( dev->surface ); - if (is_rect_empty( dev->dibdrv->bounds )) dev->start_ticks = GetTickCount(); + if (is_rect_empty( dev->dibdrv->bounds )) dev->start_ticks = NtGetTickCount(); } static inline void unlock_surface( struct windrv_physdev *dev ) { dev->surface->funcs->unlock( dev->surface ); - if (GetTickCount() - dev->start_ticks > FLUSH_PERIOD) dev->surface->funcs->flush( dev->surface ); + if (NtGetTickCount() - dev->start_ticks > FLUSH_PERIOD) dev->surface->funcs->flush( dev->surface ); } static void CDECL unlock_bits_surface( struct gdi_image_bits *bits ) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 712dce06af6..f9cf592b28e 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -235,7 +235,7 @@ void CDECL __wine_set_display_driver( HMODULE module ) if (!(driver = create_driver( module ))) { ERR( "Could not create graphics driver\n" ); - ExitProcess(1); + NtTerminateProcess( GetCurrentThread(), 1 ); } if (InterlockedCompareExchangePointer( (void **)&display_driver, driver, NULL )) HeapFree( GetProcessHeap(), 0, driver ); diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index cf8fbb8ebb4..9c62e9e62d1 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -885,7 +885,7 @@ void GDI_CheckNotLock(void) if (RtlIsCriticalSectionLockedByThread(&gdi_section)) { ERR( "BUG: holding GDI lock\n" ); - DebugBreak(); + assert( 0 ); } } diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index 9a4ad3b5c23..152b43d6ae4 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -39,10 +39,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(print); */ DWORD WINAPI NtGdiGetSpoolMessage( void *ptr1, DWORD data2, void *ptr3, DWORD data4 ) { - TRACE("(%p 0x%x %p 0x%x) stub\n", ptr1, data2, ptr3, data4); + LARGE_INTEGER time; + + TRACE( "(%p 0x%x %p 0x%x) stub\n", ptr1, data2, ptr3, data4 ); + /* avoid 100% cpu usage with spoolsv.exe from w2k (spoolsv.exe from xp does Sleep 1000/1500/2000 in a loop) */ - Sleep(500); + time.QuadPart = 500 * -10000; + NtDelayExecution( FALSE, &time ); return 0; }

1 0

Jacek Caban : gdi32: Don't use MulDiv in ntgdi functions.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: 9ca7966aed4318599cd600564382d7b43b616289 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ca7966aed4318599cd60056… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 24 12:56:00 2021 +0200 gdi32: Don't use MulDiv in ntgdi functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/clipping.c | 4 ++-- dlls/gdi32/driver.c | 4 ++-- dlls/gdi32/font.c | 4 ++-- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/mapping.c | 36 ++++++++++++++++++++++++++++++------ dlls/gdi32/ntgdi_private.h | 1 + 6 files changed, 38 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 4fefa834b58..115de908cf6 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -237,8 +237,8 @@ INT WINAPI NtGdiOffsetClipRgn( HDC hdc, INT x, INT y ) if (dc->hClipRgn) { - x = MulDiv( x, dc->attr->vport_ext.cx, dc->attr->wnd_ext.cx ); - y = MulDiv( y, dc->attr->vport_ext.cy, dc->attr->wnd_ext.cy ); + x = muldiv( x, dc->attr->vport_ext.cx, dc->attr->wnd_ext.cx ); + y = muldiv( y, dc->attr->vport_ext.cy, dc->attr->wnd_ext.cy ); if (dc->attr->layout & LAYOUT_RTL) x = -x; ret = NtGdiOffsetRgn( dc->hClipRgn, x, y ); update_dc_clipping( dc ); diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 09e369bf27f..712dce06af6 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -382,9 +382,9 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) { case DRIVERVERSION: return 0x4000; case TECHNOLOGY: return DT_RASDISPLAY; - case HORZSIZE: return MulDiv( NtGdiGetDeviceCaps( dev->hdc, HORZRES ), 254, + case HORZSIZE: return muldiv( NtGdiGetDeviceCaps( dev->hdc, HORZRES ), 254, NtGdiGetDeviceCaps( dev->hdc, LOGPIXELSX ) * 10 ); - case VERTSIZE: return MulDiv( NtGdiGetDeviceCaps( dev->hdc, VERTRES ), 254, + case VERTSIZE: return muldiv( NtGdiGetDeviceCaps( dev->hdc, VERTRES ), 254, NtGdiGetDeviceCaps( dev->hdc, LOGPIXELSY ) * 10 ); case HORZRES: { diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6011f258499..805fbe7abcc 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2874,9 +2874,9 @@ static BOOL get_face_enum_data( struct gdi_font_face *face, ENUMLOGFONTEXW *elf, UINT cell_height; #define TM font->otm.otmTextMetrics -#define SCALE_NTM(value) (MulDiv( ntm->ntmTm.tmHeight, (value), TM.tmHeight )) +#define SCALE_NTM(value) (muldiv( ntm->ntmTm.tmHeight, (value), TM.tmHeight )) cell_height = TM.tmHeight / ( -lf.lfHeight / font->otm.otmEMSquare ); - ntm->ntmTm.tmHeight = MulDiv( ntm_ppem, cell_height, font->otm.otmEMSquare ); + ntm->ntmTm.tmHeight = muldiv( ntm_ppem, cell_height, font->otm.otmEMSquare ); ntm->ntmTm.tmAscent = SCALE_NTM( TM.tmAscent ); ntm->ntmTm.tmDescent = ntm->ntmTm.tmHeight - ntm->ntmTm.tmAscent; ntm->ntmTm.tmInternalLeading = SCALE_NTM( TM.tmInternalLeading ); diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 2a245b4596f..cf8fbb8ebb4 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -592,7 +592,7 @@ static HFONT create_scaled_font( const LOGFONTW *deffont ) } lf = *deffont; - lf.lfHeight = MulDiv( lf.lfHeight, dpi, 96 ); + lf.lfHeight = muldiv( lf.lfHeight, dpi, 96 ); return create_font( &lf ); } diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index c9a20602e13..6156a64a825 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -29,6 +29,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(dc); +/* copied from kernelbase */ +int muldiv( int a, int b, int c ) +{ + LONGLONG ret; + + if (!c) return -1; + + /* We want to deal with a positive divisor to simplify the logic. */ + if (c < 0) + { + a = -a; + c = -c; + } + + /* If the result is positive, we "add" to round. else, we subtract to round. */ + if ((a < 0 && b < 0) || (a >= 0 && b >= 0)) + ret = (((LONGLONG)a * b) + (c / 2)) / c; + else + ret = (((LONGLONG)a * b) - (c / 2)) / c; + + if (ret > 2147483647 || ret < -2147483647) return -1; + return ret; +} + static SIZE get_dc_virtual_size( DC *dc ) { SIZE ret = dc->attr->virtual_size; @@ -113,20 +137,20 @@ BOOL set_map_mode( DC *dc, int mode ) dc->attr->vport_ext.cy = -virtual_res.cy; break; case MM_LOENGLISH: - dc->attr->wnd_ext.cx = MulDiv(1000, virtual_size.cx, 254); - dc->attr->wnd_ext.cy = MulDiv(1000, virtual_size.cy, 254); + dc->attr->wnd_ext.cx = muldiv(1000, virtual_size.cx, 254); + dc->attr->wnd_ext.cy = muldiv(1000, virtual_size.cy, 254); dc->attr->vport_ext.cx = virtual_res.cx; dc->attr->vport_ext.cy = -virtual_res.cy; break; case MM_HIENGLISH: - dc->attr->wnd_ext.cx = MulDiv(10000, virtual_size.cx, 254); - dc->attr->wnd_ext.cy = MulDiv(10000, virtual_size.cy, 254); + dc->attr->wnd_ext.cx = muldiv(10000, virtual_size.cx, 254); + dc->attr->wnd_ext.cy = muldiv(10000, virtual_size.cy, 254); dc->attr->vport_ext.cx = virtual_res.cx; dc->attr->vport_ext.cy = -virtual_res.cy; break; case MM_TWIPS: - dc->attr->wnd_ext.cx = MulDiv(14400, virtual_size.cx, 254); - dc->attr->wnd_ext.cy = MulDiv(14400, virtual_size.cy, 254); + dc->attr->wnd_ext.cx = muldiv(14400, virtual_size.cx, 254); + dc->attr->wnd_ext.cy = muldiv(14400, virtual_size.cy, 254); dc->attr->vport_ext.cx = virtual_res.cx; dc->attr->vport_ext.cy = -virtual_res.cy; break; diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index afdbad24f4a..595387e0aef 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -391,6 +391,7 @@ extern void lp_to_dp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN; extern BOOL set_map_mode( DC *dc, int mode ) DECLSPEC_HIDDEN; extern void combine_transform( XFORM *result, const XFORM *xform1, const XFORM *xform2 ) DECLSPEC_HIDDEN; +extern int muldiv( int a, int b, int c ) DECLSPEC_HIDDEN; /* driver.c */ extern BOOL is_display_device( LPCWSTR name ) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : gdi32: Handle NULL name when setting registry value.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: 5e481ab965b85c26c20c71799093383562b9522c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e481ab965b85c26c20c7179… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 24 10:53:59 2021 +0300 gdi32: Handle NULL name when setting registry value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51789 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 274c1d83aba..6011f258499 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -506,7 +506,7 @@ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, static void set_reg_value( HKEY hkey, const WCHAR *name, UINT type, const void *value, DWORD count ) { - unsigned int name_size = lstrlenW( name ) * sizeof(WCHAR); + unsigned int name_size = name ? lstrlenW( name ) * sizeof(WCHAR) : 0; UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; NtSetValueKey( hkey, &nameW, 0, type, value, count ); }

1 0

Alexandre Julliard : wrc: Use the existing global variable for pedantic mode.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: df08cd443a1ab47eb057f372f48d5107d5e85e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=df08cd443a1ab47eb057f372… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 24 09:50:54 2021 +0200 wrc: Use the existing global variable for pedantic mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/parser.l | 1 + tools/wrc/ppy.y | 2 +- tools/wrc/wpp.c | 19 +++++++------------ tools/wrc/wpp_private.h | 3 +-- tools/wrc/wrc.c | 1 - tools/wrc/wrc.h | 1 - 6 files changed, 10 insertions(+), 17 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index f0cec77945e..0c71396de73 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -115,6 +115,7 @@ ws [ \f\t\r] #include "utils.h" #include "parser.h" #include "newstruc.h" +#include "wpp_private.h" #include "parser.tab.h" diff --git a/tools/wrc/ppy.y b/tools/wrc/ppy.y index 79058de170d..7dc75ac1965 100644 --- a/tools/wrc/ppy.y +++ b/tools/wrc/ppy.y @@ -281,7 +281,7 @@ preprocessor | tERROR opt_text tNL { ppy_error("#error directive: '%s'", $2); free($2); } | tWARNING opt_text tNL { ppy_warning("#warning directive: '%s'", $2); free($2); } | tPRAGMA opt_text tNL { fprintf(ppy_out, "#pragma %s\n", $2 ? $2 : ""); free($2); } - | tPPIDENT opt_text tNL { if(pp_status.pedantic) ppy_warning("#ident ignored (arg: '%s')", $2); free($2); } + | tPPIDENT opt_text tNL { if(pedantic) ppy_warning("#ident ignored (arg: '%s')", $2); free($2); } | tRCINCLUDE tRCINCLUDEPATH { pp_do_include(strmake( "\"%s\"", $2 ),1); } diff --git a/tools/wrc/wpp.c b/tools/wrc/wpp.c index 30d6dd79291..200b21f8a2a 100644 --- a/tools/wrc/wpp.c +++ b/tools/wrc/wpp.c @@ -191,7 +191,7 @@ void pp_del_define(const char *name) if((ppp = pplookup(name)) == NULL) { - if(pp_status.pedantic) + if(pedantic) ppy_warning("%s was not defined", name); return; } @@ -215,8 +215,9 @@ pp_entry_t *pp_add_define(const char *def, const char *text) idx = pphash(def); if((ppp = pplookup(def)) != NULL) { - if(pp_status.pedantic) - ppy_warning("Redefinition of %s\n\tPrevious definition: %s:%d", def, ppp->filename, ppp->linenumber); + if(pedantic) + ppy_warning("Redefinition of %s\n%s:%d: note: previous definition was here", + def, ppp->filename, ppp->linenumber); pp_del_define(def); } ppp = xmalloc(sizeof(pp_entry_t)); @@ -255,8 +256,9 @@ pp_entry_t *pp_add_macro(char *id, char *args[], int nargs, mtext_t *exp) idx = pphash(id); if((ppp = pplookup(id)) != NULL) { - if(pp_status.pedantic) - ppy_warning("Redefinition of %s\n\tPrevious definition: %s:%d", id, ppp->filename, ppp->linenumber); + if(pedantic) + ppy_warning("Redefinition of %s\n%s:%d: note: previous definition was here", + id, ppp->filename, ppp->linenumber); pp_del_define(id); } ppp = xmalloc(sizeof(pp_entry_t)); @@ -637,13 +639,6 @@ void wpp_set_debug( int lex_debug, int parser_debug, int msg_debug ) } -/* set the pedantic mode */ -void wpp_set_pedantic( int on ) -{ - pp_status.pedantic = on; -} - - /* the main preprocessor parsing loop */ int wpp_parse( const char *input, FILE *output ) { diff --git a/tools/wrc/wpp_private.h b/tools/wrc/wpp_private.h index 2dfb7bbd0ab..435dbcc005a 100644 --- a/tools/wrc/wpp_private.h +++ b/tools/wrc/wpp_private.h @@ -27,7 +27,6 @@ extern void wpp_del_define( const char *name ); extern void wpp_add_cmdline_define( const char *value ); extern void wpp_set_debug( int lex_debug, int parser_debug, int msg_debug ); -extern void wpp_set_pedantic( int on ); extern void wpp_add_include_path( const char *path ); extern char *wpp_find_include( const char *name, const char *parent_name ); /* Return value == 0 means successful execution */ @@ -177,12 +176,12 @@ struct pp_status FILE *file; /* current input file descriptor */ int line_number; /* current line number */ int char_number; /* current char number in line */ - int pedantic; /* pedantic option */ int debug; /* debug messages flag */ }; extern struct pp_status pp_status; extern include_state_t pp_incl_state; +extern int pedantic; /* * From ppl.l diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 757a3915e7a..56c4c2f656b 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -439,7 +439,6 @@ int main(int argc,char *argv[]) break; case LONG_OPT_PEDANTIC: pedantic = 1; - wpp_set_pedantic(1); break; case LONG_OPT_VERIFY_TRANSL: verify_translations_mode = 1; diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index d39284fbe96..d086c5c60f9 100644 --- a/tools/wrc/wrc.h +++ b/tools/wrc/wrc.h @@ -35,7 +35,6 @@ extern int debuglevel; extern int win32; extern int extensions; -extern int pedantic; extern int byteorder; extern int preprocess_only; extern int no_preprocess;

1 0

Alexandre Julliard : wrc: Use asserts instead of explicit internal error.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: 1e173eaa8c8f36ece635f6f817e19b8db756eeee URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e173eaa8c8f36ece635f6f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 24 09:43:31 2021 +0200 wrc: Use asserts instead of explicit internal error. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 113 ++++++++++++++++++++---------------------------- tools/wrc/newstruc.c | 14 +++--- tools/wrc/parser.y | 22 +++++----- tools/wrc/ppl.l | 23 +++------- tools/wrc/ppy.y | 6 +-- tools/wrc/utils.c | 44 ++++++------------- tools/wrc/utils.h | 1 - tools/wrc/wpp.c | 25 +++-------- tools/wrc/wpp_private.h | 1 - 9 files changed, 91 insertions(+), 158 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1e173eaa8c8f36ece635…

1 0

Alexandre Julliard : wrc: Use the standard memory allocation wrappers in the preprocessor.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: 04ae435f899d99050b3d0831ebd3cd3c8109be2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=04ae435f899d99050b3d0831… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 24 08:06:03 2021 +0200 wrc: Use the standard memory allocation wrappers in the preprocessor. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/ppl.l | 153 +++++++++++++----------------------------------- tools/wrc/ppy.y | 31 +++++----- tools/wrc/wpp.c | 84 ++++++++------------------ tools/wrc/wpp_private.h | 14 ----- 4 files changed, 78 insertions(+), 204 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=04ae435f899d99050b3d…

1 0

Alexandre Julliard : wpp: Move the preprocessor code into wrc.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: b69ce3472d22b9236b83c47ec1fbbb714f4276e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b69ce3472d22b9236b83c47e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 23 22:00:36 2021 +0200 wpp: Move the preprocessor code into wrc. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 -- configure.ac | 1 - include/wine/wpp.h | 36 ----------------------------------- libs/wpp/Makefile.in | 6 ------ tools/widl/Makefile.in | 16 +++++++++++----- tools/widl/parser.l | 2 +- tools/widl/typelib.c | 2 +- tools/widl/widl.c | 2 +- tools/wrc/Makefile.in | 16 +++++++++++----- tools/wrc/parser.y | 2 +- {libs/wpp => tools/wrc}/ppl.l | 11 ----------- {libs/wpp => tools/wrc}/ppy.y | 8 -------- {libs/wpp => tools/wrc}/wpp.c | 1 - {libs/wpp => tools/wrc}/wpp_private.h | 9 +++++++++ tools/wrc/wrc.c | 2 +- 15 files changed, 36 insertions(+), 80 deletions(-) diff --git a/configure b/configure index 4a99b1e8f42..4316a478c04 100755 --- a/configure +++ b/configure @@ -1789,7 +1789,6 @@ enable_fonts enable_include enable_port enable_wine -enable_wpp enable_loader enable_nls enable_po @@ -21101,7 +21100,6 @@ wine_fn_config_makefile fonts enable_fonts wine_fn_config_makefile include enable_include wine_fn_config_makefile libs/port enable_port wine_fn_config_makefile libs/wine enable_wine -wine_fn_config_makefile libs/wpp enable_wpp wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls wine_fn_config_makefile po enable_po diff --git a/configure.ac b/configure.ac index 56ef99f2d4c..c0a126293c4 100644 --- a/configure.ac +++ b/configure.ac @@ -3871,7 +3871,6 @@ WINE_CONFIG_MAKEFILE(fonts) WINE_CONFIG_MAKEFILE(include) WINE_CONFIG_MAKEFILE(libs/port) WINE_CONFIG_MAKEFILE(libs/wine) -WINE_CONFIG_MAKEFILE(libs/wpp) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) WINE_CONFIG_MAKEFILE(po) diff --git a/include/wine/wpp.h b/include/wine/wpp.h deleted file mode 100644 index 4994577d586..00000000000 --- a/include/wine/wpp.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Exported functions of the Wine preprocessor - * - * Copyright 2002 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_WPP_H -#define __WINE_WPP_H - -#include <stdio.h> -#include <stdarg.h> - -extern void wpp_del_define( const char *name ); -extern void wpp_add_cmdline_define( const char *value ); -extern void wpp_set_debug( int lex_debug, int parser_debug, int msg_debug ); -extern void wpp_set_pedantic( int on ); -extern void wpp_add_include_path( const char *path ); -extern char *wpp_find_include( const char *name, const char *parent_name ); -/* Return value == 0 means successful execution */ -extern int wpp_parse( const char *input, FILE *output ); - -#endif /* __WINE_WPP_H */ diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in deleted file mode 100644 index 982d34b15bd..00000000000 --- a/libs/wpp/Makefile.in +++ /dev/null @@ -1,6 +0,0 @@ -STATICLIB = libwpp.a - -C_SRCS = wpp.c - -LEX_SRCS = ppl.l -BISON_SRCS = ppy.y diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index a231087f37c..7eb74b813a4 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -1,5 +1,5 @@ PROGRAMS = widl -MANPAGES = widl.man.in +PARENTSRC = ../wrc C_SRCS = \ client.c \ @@ -14,15 +14,21 @@ C_SRCS = \ typetree.c \ utils.c \ widl.c \ + wpp.c \ write_msft.c -LEX_SRCS = parser.l -BISON_SRCS = parser.y +LEX_SRCS = \ + parser.l \ + ppl.l + +BISON_SRCS = \ + parser.y \ + ppy.y + +MANPAGES = widl.man.in widl_EXTRADEFS = \ -DINCLUDEDIR="\"${includedir}\"" \ -DBIN_TO_INCLUDEDIR=\"`${MAKEDEP} -R ${bindir} ${includedir}`\" -EXTRALIBS = -lwpp - INSTALL_DEV = $(PROGRAMS) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 4d3b9d683e8..72a7a432bbc 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -62,7 +62,7 @@ double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* #include "widl.h" #include "utils.h" #include "parser.h" -#include "wine/wpp.h" +#include "wpp_private.h" #include "parser.tab.h" diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 8b2a2401367..d5b1a3903ca 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -21,7 +21,6 @@ #include "config.h" #include "wine/port.h" -#include "wine/wpp.h" #include <stdio.h> #include <stdlib.h> @@ -37,6 +36,7 @@ #include "widl.h" #include "utils.h" +#include "wpp_private.h" #include "parser.h" #include "header.h" #include "typelib.h" diff --git a/tools/widl/widl.c b/tools/widl/widl.c index b40745a49f8..5b1ce6ca689 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -40,7 +40,7 @@ #include "widl.h" #include "utils.h" #include "parser.h" -#include "wine/wpp.h" +#include "wpp_private.h" #include "header.h" static const char usage[] = diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index fb6eba20c27..140240962e4 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -1,5 +1,5 @@ PROGRAMS = wrc -MANPAGES = wrc.man.in +EXTRALIBS = $(GETTEXTPO_LIBS) C_SRCS = \ dumpres.c \ @@ -8,11 +8,19 @@ C_SRCS = \ po.c \ translation.c \ utils.c \ + wpp.c \ wrc.c \ writeres.c -LEX_SRCS = parser.l -BISON_SRCS = parser.y +LEX_SRCS = \ + parser.l \ + ppl.l + +BISON_SRCS = \ + parser.y \ + ppy.y + +MANPAGES = wrc.man.in wrc_EXTRADEFS = \ -DNLSDIR="\"${nlsdir}\"" \ @@ -20,6 +28,4 @@ wrc_EXTRADEFS = \ -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\" \ -DBIN_TO_INCLUDEDIR=\"`${MAKEDEP} -R ${bindir} ${includedir}`\" -EXTRALIBS = $(GETTEXTPO_LIBS) -lwpp - INSTALL_DEV = $(PROGRAMS) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index f5666a03994..19717a324e1 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -134,7 +134,7 @@ #include "utils.h" #include "newstruc.h" #include "dumpres.h" -#include "wine/wpp.h" +#include "wpp_private.h" #include "parser.h" #include "windef.h" #include "winbase.h" diff --git a/libs/wpp/ppl.l b/tools/wrc/ppl.l similarity index 98% rename from libs/wpp/ppl.l rename to tools/wrc/ppl.l index c1b83076b40..786ec3b170a 100644 --- a/libs/wpp/ppl.l +++ b/tools/wrc/ppl.l @@ -17,16 +17,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 * - * History: - * 24-Apr-2000 BS - Started from scratch to restructure everything - * and reintegrate the source into the wine-tree. - * 04-Jan-2000 BS - Added comments about the lexicographical - * grammar to give some insight in the complexity. - * 28-Dec-1999 BS - Eliminated backing-up of the flexer by running - * `flex -b' on the source. This results in some - * weirdo extra rules, but a much faster scanner. - * 23-Dec-1999 BS - Started this file - * *------------------------------------------------------------------------- * The preprocessor's lexographical grammar (approximately): * @@ -182,7 +172,6 @@ ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] #define YY_NO_UNISTD_H #endif -#include "wine/wpp.h" #include "wpp_private.h" #include "ppy.tab.h" diff --git a/libs/wpp/ppy.y b/tools/wrc/ppy.y similarity index 98% rename from libs/wpp/ppy.y rename to tools/wrc/ppy.y index 0afc642d3e0..f8c701e28c8 100644 --- a/libs/wpp/ppy.y +++ b/tools/wrc/ppy.y @@ -3,7 +3,6 @@ * * Copyright 1999-2000 Bertho A. Stultiens (BS) * - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -18,13 +17,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 * - * History: - * 24-Apr-2000 BS Restructured the lot to fit the new scanner - * and reintegrate into the wine-tree. - * 01-Jan-2000 BS FIXME: win16 preprocessor calculates with - * 16 bit ints and overflows...? - * 26-Dec-1999 BS Started this file - * */ %{ diff --git a/libs/wpp/wpp.c b/tools/wrc/wpp.c similarity index 99% rename from libs/wpp/wpp.c rename to tools/wrc/wpp.c index 0e26121330c..1715c2e262d 100644 --- a/libs/wpp/wpp.c +++ b/tools/wrc/wpp.c @@ -35,7 +35,6 @@ #endif #include "wpp_private.h" -#include "wine/wpp.h" struct pp_status pp_status; diff --git a/libs/wpp/wpp_private.h b/tools/wrc/wpp_private.h similarity index 92% rename from libs/wpp/wpp_private.h rename to tools/wrc/wpp_private.h index fbcd3c00da7..503bd93d8c9 100644 --- a/libs/wpp/wpp_private.h +++ b/tools/wrc/wpp_private.h @@ -24,6 +24,15 @@ #include <string.h> #include "wine/list.h" +extern void wpp_del_define( const char *name ); +extern void wpp_add_cmdline_define( const char *value ); +extern void wpp_set_debug( int lex_debug, int parser_debug, int msg_debug ); +extern void wpp_set_pedantic( int on ); +extern void wpp_add_include_path( const char *path ); +extern char *wpp_find_include( const char *name, const char *parent_name ); +/* Return value == 0 means successful execution */ +extern int wpp_parse( const char *input, FILE *output ); + struct pp_entry; /* forward */ /* * Include logic diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index c95819a793e..757a3915e7a 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -41,7 +41,7 @@ #include "genres.h" #include "newstruc.h" #include "parser.h" -#include "wine/wpp.h" +#include "wpp_private.h" #ifdef WORDS_BIGENDIAN #define ENDIAN "big"

1 0

Zebediah Figura : Revert "winegstreamer: Replace source pad interface with GstAppSrc.".
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: 176654fa29d1ff46011eaa65e1da5fb22a155bb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=176654fa29d1ff46011eaa65… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 23 23:10:28 2021 -0500 Revert "winegstreamer: Replace source pad interface with GstAppSrc.". This reverts commit 1aa359a100bae859b278007e8bf90673eebd7db0. appsrc suffers from a rather problematic race condition surrounding flushes [1]. Essentially, it's possible for a flushing seek to begin and end between wg_parser_get_next_read_request and wg_parser_push_data. The race condition is not easy to fix, and in light of it it's not clear if we want to use appsrc. [1] https://www.winehq.org/pipermail/wine-devel/2021-September/196043.html Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51774 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 425 +++++++++++++++++++++++++++++------------ 1 file changed, 308 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=176654fa29d1ff46011e…

1 0

Connor McAdams : user32/tests: Add missing winevents to test_EndDialog() message sequences.
by Alexandre Julliard 24 Sep '21

24 Sep '21

Module: wine Branch: master Commit: e65813a5ba4efa140c5a1143186756d9ebc58e6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e65813a5ba4efa140c5a1143… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Sep 23 19:19:06 2021 -0400 user32/tests: Add missing winevents to test_EndDialog() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6aa40866d5e..19a8ff41a2c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14400,11 +14400,13 @@ static void test_dialog_messages(void) static void test_enddialog_seq(HWND dialog, HWND owner) { const struct message seq[] = { + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_ENABLE, sent }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, { HCBT_ACTIVATE, hook|wparam, (WPARAM)owner }, { WM_NCACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)owner }, { WM_ACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)owner }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, /* FIXME: Following two are optional because Wine sends WM_QUERYNEWPALETTE instead of WM_WINDOWPOSCHANGING */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_QUERYNEWPALETTE, sent|optional }, @@ -14413,6 +14415,7 @@ static void test_enddialog_seq(HWND dialog, HWND owner) { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, (LPARAM)dialog }, { HCBT_SETFOCUS, hook|wparam, (WPARAM)owner }, { WM_KILLFOCUS, sent|wparam, (WPARAM)owner }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc|wparam, (WPARAM)dialog }, { 0 } }; @@ -14425,15 +14428,18 @@ static void test_enddialog_seq(HWND dialog, HWND owner) static void test_enddialog_seq2(HWND dialog, HWND owner) { const struct message seq[] = { + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_ENABLE, parent|sent }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, { HCBT_ACTIVATE, hook|wparam, (WPARAM)owner }, { WM_NCACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)owner }, { WM_ACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)owner }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|optional|wparam, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGING, sent|optional|wparam, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, { HCBT_SETFOCUS, hook|wparam, (WPARAM)owner }, { WM_KILLFOCUS, sent|wparam, (WPARAM)owner }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|parent|defwinproc|wparam, (WPARAM)dialog }, { 0 } }; @@ -18598,6 +18604,10 @@ START_TEST(msg) test_SetWindowRgn(); test_sys_menu(); test_dialog_messages(); + test_EndDialog(); + test_nullCallback(); + test_dbcs_wm_char(); + test_unicode_wm_char(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18608,10 +18618,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_EndDialog(); - test_nullCallback(); - test_dbcs_wm_char(); - test_unicode_wm_char(); test_menu_messages(); test_paintingloop(); test_defwinproc();

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 September 2021