April 2022 - Wine-Commits - list.winehq.org

Alexandre Julliard : wrc: Store version and characteristics as simple integers.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: d0b7fa9da7539847ebfc6960ff2aedc762218c1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0b7fa9da7539847ebfc6960… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 12:58:15 2022 +0200 wrc: Store version and characteristics as simple integers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 12 ++++++------ tools/wrc/newstruc.c | 26 -------------------------- tools/wrc/newstruc.h | 4 ---- tools/wrc/parser.y | 32 ++++++++++++++++---------------- tools/wrc/po.c | 4 ++-- tools/wrc/wrctypes.h | 8 ++++---- 6 files changed, 28 insertions(+), 58 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 5282c809f85..81e7a52c9a9 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -247,17 +247,17 @@ static void put_name_id(name_id_t *nid, int upcase, language_t lang) static void put_lvc(lvc_t *lvc) { if(lvc) + { put_word(lvc->language); + put_dword(lvc->version); + put_dword(lvc->characts); + } else + { put_word(0); /* Neutral */ - if(lvc && lvc->version) - put_dword(*lvc->version); - else put_dword(0); - if(lvc && lvc->characts) - put_dword(*lvc->characts); - else put_dword(0); + } } /* diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index b1cd9183640..9602cdfbf92 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -196,32 +196,6 @@ resource_t *new_resource(enum res_e t, void *res, int memopt, language_t lan) return r; } -version_t *new_version(unsigned int v) -{ - version_t *vp = xmalloc(sizeof(version_t)); - *vp = v; - return vp; -} - -characts_t *new_characts(unsigned int c) -{ - characts_t *cp = xmalloc(sizeof(characts_t)); - *cp = c; - return cp; -} - -version_t *dup_version(version_t *v) -{ - if(!v) return NULL; - return new_version(*v); -} - -characts_t *dup_characts(characts_t *c) -{ - if(!c) return NULL; - return new_characts(*c); -} - html_t *new_html(raw_data_t *rd, int *memopt) { html_t *html = xmalloc(sizeof(html_t)); diff --git a/tools/wrc/newstruc.h b/tools/wrc/newstruc.h index dd3215eba8d..7ed386916ab 100644 --- a/tools/wrc/newstruc.h +++ b/tools/wrc/newstruc.h @@ -43,10 +43,6 @@ string_t *new_string(void); toolbar_item_t *new_toolbar_item(void); ani_any_t *new_ani_any(void); resource_t *new_resource(enum res_e t, void *res, int memopt, language_t lan); -version_t *new_version(unsigned int v); -characts_t *new_characts(unsigned int c); -version_t *dup_version(version_t *v); -characts_t *dup_characts(characts_t *c); html_t *new_html(raw_data_t *rd, int *memopt); rcdata_t *new_rcdata(raw_data_t *rd, int *memopt); font_id_t *new_font_id(int size, string_t *face, int weight, int italic); diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index d13d89cdd41..6b362b06b6b 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -155,8 +155,8 @@ static int dont_want_id = 0; /* See language parsing for details */ /* Set to the current options of the currently scanning stringtable */ static int *tagstt_memopt; -static characts_t *tagstt_characts; -static version_t *tagstt_version; +static characts_t tagstt_characts; +static version_t tagstt_version; static const char riff[4] = "RIFF"; /* RIFF file magic for animated cursor/icon */ @@ -180,8 +180,8 @@ static event_t *add_string_event(string_t *key, int id, int flags, event_t *prev static event_t *add_event(int key, int id, int flags, event_t *prev); static name_id_t *convert_ctlclass(name_id_t *cls); static control_t *ins_ctrl(int type, int special_style, control_t *ctrl, control_t *prev); -static dialog_t *dialog_version(version_t *v, dialog_t *dlg); -static dialog_t *dialog_characteristics(characts_t *c, dialog_t *dlg); +static dialog_t *dialog_version(version_t v, dialog_t *dlg); +static dialog_t *dialog_characteristics(characts_t c, dialog_t *dlg); static dialog_t *dialog_language(language_t l, dialog_t *dlg); static dialog_t *dialog_menu(name_id_t *m, dialog_t *dlg); static dialog_t *dialog_class(name_id_t *n, dialog_t *dlg); @@ -228,8 +228,8 @@ static int rsrcid_to_token(int lookahead); name_id_t *nid; font_id_t *fntid; language_t lan; - version_t *ver; - characts_t *chars; + version_t ver; + characts_t chars; event_t *event; menu_item_t *menitm; itemex_opt_t *exopt; @@ -1727,11 +1727,11 @@ opt_language ; opt_characts - : tCHARACTERISTICS expr { $$ = new_characts($2); } + : tCHARACTERISTICS expr { $$ = $2; } ; opt_version - : tVERSION expr { $$ = new_version($2); } + : tVERSION expr { $$ = $2; } ; /* ------------------------------ Raw data handling ------------------------------ */ @@ -1895,7 +1895,7 @@ static dialog_t *dialog_language(language_t l, dialog_t *dlg) return dlg; } -static dialog_t *dialog_characteristics(characts_t *c, dialog_t *dlg) +static dialog_t *dialog_characteristics(characts_t c, dialog_t *dlg) { assert(dlg != NULL); if(dlg->lvc.characts) @@ -1904,7 +1904,7 @@ static dialog_t *dialog_characteristics(characts_t *c, dialog_t *dlg) return dlg; } -static dialog_t *dialog_version(version_t *v, dialog_t *dlg) +static dialog_t *dialog_version(version_t v, dialog_t *dlg) { assert(dlg != NULL); if(dlg->lvc.version) @@ -2369,8 +2369,8 @@ static resource_t *build_stt_resources(stringtable_t *stthead) int j; unsigned int andsum; unsigned int orsum; - characts_t *characts; - version_t *version; + characts_t characts; + version_t version; if(!stthead) return NULL; @@ -2401,8 +2401,8 @@ static resource_t *build_stt_resources(stringtable_t *stthead) } andsum = ~0; orsum = 0; - characts = NULL; - version = NULL; + characts = 0; + version = 0; /* Check individual memory options and get * the first characteristics/version */ @@ -2426,11 +2426,11 @@ static resource_t *build_stt_resources(stringtable_t *stthead) { if(characts && newstt->entries[j].characts - && *newstt->entries[j].characts != *characts) + && newstt->entries[j].characts != characts) warning("Stringtable's characteristics are not the same (idbase: %d)\n", newstt->idbase); if(version && newstt->entries[j].version - && *newstt->entries[j].version != *version) + && newstt->entries[j].version != version) warning("Stringtable's versions are not the same (idbase: %d)\n", newstt->idbase); } rsc = new_resource(res_stt, newstt, newstt->memopt, newstt->lvc.language); diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 4d472a12a64..266dd3ec2e4 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -86,10 +86,10 @@ static language_t get_default_sublang( language_t lan ) } } -static version_t *get_dup_version( language_t lang ) +static version_t get_dup_version( language_t lang ) { /* English "translations" take precedence over the original rc contents */ - return new_version( is_english( lang ) ? 1 : -1 ); + return is_english( lang ) ? 1 : -1; } static name_id_t *dup_name_id( name_id_t *id ) diff --git a/tools/wrc/wrctypes.h b/tools/wrc/wrctypes.h index 2415ce5f294..b453e2fdb08 100644 --- a/tools/wrc/wrctypes.h +++ b/tools/wrc/wrctypes.h @@ -108,8 +108,8 @@ typedef unsigned int version_t; typedef struct lvc { language_t language; - version_t *version; - characts_t *characts; + version_t version; + characts_t characts; } lvc_t; typedef struct font_id { @@ -428,8 +428,8 @@ typedef struct stt_entry { string_t *str; int id; unsigned int memopt; - characts_t *characts; - version_t *version; + characts_t characts; + version_t version; } stt_entry_t; typedef struct stringtable {

1 0

Zebediah Figura : include: Add more URL_* flags.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: 684944f0619aebbee92dbe49f453baed7495e4fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=684944f0619aebbee92dbe49… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Mar 30 18:58:07 2022 -0500 include: Add more URL_* flags. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shlwapi.h | 50 ++++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/include/shlwapi.h b/include/shlwapi.h index a282ae6d993..6149c7081a3 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -648,28 +648,34 @@ typedef enum { /* The following are used by UrlEscape..., UrlUnEscape..., * UrlCanonicalize..., and UrlCombine... routines */ -#define URL_WININET_COMPATIBILITY 0x80000000 -#define URL_PLUGGABLE_PROTOCOL 0x40000000 -#define URL_ESCAPE_UNSAFE 0x20000000 -#define URL_UNESCAPE 0x10000000 - -#define URL_DONT_SIMPLIFY 0x08000000 -#define URL_NO_META URL_DONT_SIMPLIFY -#define URL_ESCAPE_SPACES_ONLY 0x04000000 -#define URL_DONT_ESCAPE_EXTRA_INFO 0x02000000 -#define URL_DONT_UNESCAPE_EXTRA_INFO URL_DONT_ESCAPE_EXTRA_INFO -#define URL_BROWSER_MODE URL_DONT_ESCAPE_EXTRA_INFO - -#define URL_INTERNAL_PATH 0x00800000 /* Will escape #'s in paths */ -#define URL_UNESCAPE_HIGH_ANSI_ONLY 0x00400000 -#define URL_CONVERT_IF_DOSPATH 0x00200000 -#define URL_UNESCAPE_INPLACE 0x00100000 - -#define URL_FILE_USE_PATHURL 0x00010000 -#define URL_ESCAPE_AS_UTF8 0x00040000 - -#define URL_ESCAPE_SEGMENT_ONLY 0x00002000 -#define URL_ESCAPE_PERCENT 0x00001000 +#define URL_WININET_COMPATIBILITY 0x80000000 +#define URL_PLUGGABLE_PROTOCOL 0x40000000 +#define URL_ESCAPE_UNSAFE 0x20000000 +#define URL_UNESCAPE 0x10000000 + +#define URL_DONT_SIMPLIFY 0x08000000 +#define URL_ESCAPE_SPACES_ONLY 0x04000000 +#define URL_DONT_ESCAPE_EXTRA_INFO 0x02000000 + +#define URL_INTERNAL_PATH 0x00800000 +#define URL_UNESCAPE_HIGH_ANSI_ONLY 0x00400000 +#define URL_CONVERT_IF_DOSPATH 0x00200000 +#define URL_UNESCAPE_INPLACE 0x00100000 + +#define URL_ESCAPE_ASCII_URI_COMPONENT 0x00080000 +#define URL_ESCAPE_AS_UTF8 0x00040000 +#define URL_DONT_UNESCAPE 0x00020000 +#define URL_FILE_USE_PATHURL 0x00010000 + +#define URL_ESCAPE_SEGMENT_ONLY 0x00002000 +#define URL_ESCAPE_PERCENT 0x00001000 + +#define URL_BROWSER_MODE URL_DONT_ESCAPE_EXTRA_INFO +#define URL_DONT_UNESCAPE_EXTRA_INFO URL_DONT_ESCAPE_EXTRA_INFO +#define URL_ESCAPE_URI_COMPONENT (URL_ESCAPE_ASCII_URI_COMPONENT | URL_ESCAPE_AS_UTF8) +#define URL_NO_META URL_DONT_SIMPLIFY +#define URL_UNESCAPE_AS_UTF8 URL_ESCAPE_AS_UTF8 +#define URL_UNESCAPE_URI_COMPONENT URL_UNESCAPE_AS_UTF8 HRESULT WINAPI UrlApplySchemeA(LPCSTR,LPSTR,LPDWORD,DWORD); HRESULT WINAPI UrlApplySchemeW(LPCWSTR,LPWSTR,LPDWORD,DWORD);

1 0

Alexandre Julliard : wrc: Use the locale.nls data to determine a language's codepage.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: f445f21a3881d21687d18d4ba7d8e6a84aabea6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f445f21a3881d21687d18d4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 13:39:58 2022 +0200 wrc: Use the locale.nls data to determine a language's codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/utils.c | 253 +++++++++++++++++------------------------------------- 1 file changed, 78 insertions(+), 175 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f445f21a3881d21687d1…

1 0

Mohamad Al-Jaf : propsys: Implement VariantToStringWithDefault.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: bf0f1fdcf80657a42116b79a0953181191cf9221 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf0f1fdcf80657a42116b79a… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Apr 1 16:10:13 2022 +0300 propsys: Implement VariantToStringWithDefault. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 16 ++++++++++++++++ include/propvarutil.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..cd92912fde5 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,22 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, const WCHAR *default_value) +{ + TRACE("%s, %s.\n", debugstr_variant(pvar), debugstr_w(default_value)); + + if (V_VT(pvar) == (VT_BYREF | VT_VARIANT)) pvar = V_VARIANTREF(pvar); + if (V_VT(pvar) == (VT_BYREF | VT_BSTR) || V_VT(pvar) == VT_BSTR) + { + BSTR ret = V_ISBYREF(pvar) ? *V_BSTRREF(pvar) : V_BSTR(pvar); + return ret ? ret : L""; + } + + return default_value; +} /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..fcc532fd623 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret);

1 0

Jacek Caban : win32u: Move __wine_send_input implementation from user32.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: 21d60952cb3a45c8c5dc0d88dab19ecdb1807570 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21d60952cb3a45c8c5dc0d88… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 1 14:46:58 2022 +0200 win32u: Move __wine_send_input implementation from user32. 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/hidclass.sys/Makefile.in | 2 +- dlls/user32/input.c | 13 ----- dlls/user32/user32.spec | 1 - dlls/user32/user_main.c | 1 + dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 10 ++++ dlls/win32u/message.c | 116 ++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 1 + dlls/win32u/win32u.spec | 1 + dlls/win32u/win32u_private.h | 3 ++ dlls/win32u/wrappers.c | 6 +++ 11 files changed, 140 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21d60952cb3a45c8c5dc…

1 0

Ziqing Hui : include: Add defines for ID2D1Factory3.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: fa073ecd1518dbb2b31809124a555bc0eca082cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa073ecd1518dbb2b3180912… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Mar 31 10:59:33 2022 +0800 include: Add defines for ID2D1Factory3. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_3.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index c96821ae276..b51adfdffdb 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -342,3 +342,16 @@ interface ID2D1Device2 : ID2D1Device1 [out] IDXGIDevice **dxgi_device ); } + +[ + object, + uuid(0869759f-4f00-413f-b03e-2bda45404d0f), + local, +] +interface ID2D1Factory3 : ID2D1Factory2 +{ + HRESULT CreateDevice( + [in] IDXGIDevice *dxgi_device, + [out] ID2D1Device2 **d2d_device + ); +}

1 0

Ziqing Hui : include: Add defines for ID2D1DeviceContext2.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: 223fcc8e463ac0da658509536a6bc761afa1a88d URL: https://source.winehq.org/git/wine.git/?a=commit;h=223fcc8e463ac0da65850953… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Mar 31 10:59:31 2022 +0800 include: Add defines for ID2D1DeviceContext2. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_3.idl | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index d1030d19d9e..2eeda0dd616 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -53,6 +53,21 @@ typedef enum D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS_FORCE_DWORD = 0xffffffff } D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS; +typedef enum D2D1_IMAGE_SOURCE_LOADING_OPTIONS +{ + D2D1_IMAGE_SOURCE_LOADING_OPTIONS_NONE = 0x0, + D2D1_IMAGE_SOURCE_LOADING_OPTIONS_RELEASE_SOURCE = 0x1, + D2D1_IMAGE_SOURCE_LOADING_OPTIONS_CACHE_ON_DEMAND = 0x2, + D2D1_IMAGE_SOURCE_LOADING_OPTIONS_FORCE_DWORD = 0xffffffff +} D2D1_IMAGE_SOURCE_LOADING_OPTIONS; + +typedef enum D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS +{ + D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS_NONE = 0x0, + D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS_LOW_QUALITY_PRIMARY_CONVERSION = 0x1, + D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS_FORCE_DWORD = 0xffffffff +} D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS; + typedef struct D2D1_INK_POINT { float x; @@ -67,6 +82,12 @@ typedef struct D2D1_INK_BEZIER_SEGMENT D2D1_INK_POINT point3; } D2D1_INK_BEZIER_SEGMENT; +typedef struct D2D1_INK_STYLE_PROPERTIES +{ + D2D1_INK_NIB_SHAPE nibShape; + D2D1_MATRIX_3X2_F nibTransform; +} D2D1_INK_STYLE_PROPERTIES; + typedef struct D2D1_GRADIENT_MESH_PATCH { D2D1_POINT_2F point00; @@ -228,3 +249,77 @@ interface ID2D1TransformedImageSource : ID2D1Image [out] D2D1_TRANSFORMED_IMAGE_SOURCE_PROPERTIES *out ); }; + +[ + object, + uuid(53dd9855-a3b0-4d5b-82e1-26e25c5e5797), + local, +] +interface ID2D1LookupTable3D : ID2D1Resource +{ +} + +[ + object, + uuid(394ea6a3-0c34-4321-950b-6ca20f0be6c7), + local, +] +interface ID2D1DeviceContext2 : ID2D1DeviceContext1 +{ + HRESULT CreateInk( + [in] const D2D1_INK_POINT *start_point, + [out] ID2D1Ink **ink + ); + HRESULT CreateInkStyle( + [in, optional] const D2D1_INK_STYLE_PROPERTIES *ink_style_properties, + [out] ID2D1InkStyle **ink_style + ); + HRESULT CreateGradientMesh( + [in] const D2D1_GRADIENT_MESH_PATCH *patches, + [in] UINT32 patches_count, + [out] ID2D1GradientMesh **gradient_mesh + ); + HRESULT CreateImageSourceFromWic( + [in] IWICBitmapSource *wic_bitmap_source, + [in] D2D1_IMAGE_SOURCE_LOADING_OPTIONS loading_options, + [in] D2D1_ALPHA_MODE alpha_mode, + [out] ID2D1ImageSourceFromWic **image_source + ); + HRESULT CreateLookupTable3D( + [in] D2D1_BUFFER_PRECISION precision, + [in] const UINT32 *extents, + [in] const BYTE *data, + [in] UINT32 data_count, + [in] const UINT32 *strides, + [out] ID2D1LookupTable3D **lookup_table + ); + HRESULT CreateImageSourceFromDxgi( + [in] IDXGISurface **surfaces, + [in] UINT32 surface_count, + [in] DXGI_COLOR_SPACE_TYPE color_space, + [in] D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS options, + [out] ID2D1ImageSource **image_source + ); + HRESULT GetGradientMeshWorldBounds( + [in] ID2D1GradientMesh *gradient_mesh, + [out] D2D1_RECT_F *bounds + ); + void DrawInk( + [in] ID2D1Ink *ink, + [in] ID2D1Brush *brush, + [in, optional] ID2D1InkStyle *ink_style + ); + void DrawGradientMesh( + [in] ID2D1GradientMesh *gradient_mesh + ); + void DrawGdiMetafile( + [in] ID2D1GdiMetafile *gdi_metafile, + [in, optional] const D2D1_RECT_F *dst_rect, + [in, optional] const D2D1_RECT_F *src_rect + ); + HRESULT CreateTransformedImageSource( + [in] ID2D1ImageSource *source, + [in] const D2D1_TRANSFORMED_IMAGE_SOURCE_PROPERTIES *props, + [out] ID2D1TransformedImageSource **transformed + ); +}

1 0

Jan Sikorski : wined3d: Reset and reuse Vulkan descriptor pools.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: 8676f28a8a1b7695249f44436d48b4d0da2bcd60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8676f28a8a1b7695249f4443… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Mar 31 12:57:48 2022 +0200 wined3d: Reset and reuse Vulkan descriptor pools. Creating and destroying them is fairly slow. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 104 ++++++++++++++++++++++++++++------------- dlls/wined3d/view.c | 4 +- dlls/wined3d/wined3d_private.h | 9 ++-- 3 files changed, 79 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8676f28a8a1b7695249f…

1 0

Jacek Caban : user32: Avoid internal structs in post_dde_message.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: b666d908d5827e5b2ce2bd0c111b3297f4a6de2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b666d908d5827e5b2ce2bd0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 1 14:46:11 2022 +0200 user32: Avoid internal structs in post_dde_message. 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/user32/message.c | 53 ++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 0df521a5a47..25db8c42728 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1184,22 +1184,21 @@ static HGLOBAL dde_get_pair(HGLOBAL shm) * * Post a DDE message */ -static BOOL post_dde_message( struct packed_message *data, const struct send_message_info *info ) +static BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, DWORD type ) { void* ptr = NULL; int size = 0; UINT_PTR uiLo, uiHi; LPARAM lp; HGLOBAL hunlock = 0; - int i; DWORD res; ULONGLONG hpack; - if (!UnpackDDElParam( info->msg, info->lparam, &uiLo, &uiHi )) + if (!UnpackDDElParam( msg, lparam, &uiLo, &uiHi )) return FALSE; - lp = info->lparam; - switch (info->msg) + lp = lparam; + switch (msg) { /* DDE messages which don't require packing are: * WM_DDE_INITIATE @@ -1216,7 +1215,8 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes { hpack = pack_ptr( h ); /* send back the value of h on the other side */ - push_data( data, &hpack, sizeof(hpack) ); + ptr = &hpack; + size = sizeof(hpack); lp = uiLo; TRACE( "send dde-ack %lx %08lx => %p\n", uiLo, uiHi, h ); } @@ -1231,17 +1231,15 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes case WM_DDE_ADVISE: case WM_DDE_DATA: case WM_DDE_POKE: - size = 0; if (uiLo) { size = GlobalSize( (HGLOBAL)uiLo ) ; - if ((info->msg == WM_DDE_ADVISE && size < sizeof(DDEADVISE)) || - (info->msg == WM_DDE_DATA && size < FIELD_OFFSET(DDEDATA, Value)) || - (info->msg == WM_DDE_POKE && size < FIELD_OFFSET(DDEPOKE, Value)) - ) - return FALSE; + if ((msg == WM_DDE_ADVISE && size < sizeof(DDEADVISE)) || + (msg == WM_DDE_DATA && size < FIELD_OFFSET(DDEDATA, Value)) || + (msg == WM_DDE_POKE && size < FIELD_OFFSET(DDEPOKE, Value))) + return FALSE; } - else if (info->msg != WM_DDE_DATA) return FALSE; + else if (msg != WM_DDE_DATA) return FALSE; lp = uiHi; if (uiLo) @@ -1252,37 +1250,35 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes TRACE("unused %d, fResponse %d, fRelease %d, fDeferUpd %d, fAckReq %d, cfFormat %d\n", dde_data->unused, dde_data->fResponse, dde_data->fRelease, dde_data->reserved, dde_data->fAckReq, dde_data->cfFormat); - push_data( data, ptr, size ); hunlock = (HGLOBAL)uiLo; } } TRACE( "send ddepack %u %lx\n", size, uiHi ); break; case WM_DDE_EXECUTE: - if (info->lparam) + if (lparam) { - if ((ptr = GlobalLock( (HGLOBAL)info->lparam) )) + if ((ptr = GlobalLock( (HGLOBAL)lparam) )) { - push_data(data, ptr, GlobalSize( (HGLOBAL)info->lparam )); + size = GlobalSize( (HGLOBAL)lparam ); /* so that the other side can send it back on ACK */ - lp = info->lparam; - hunlock = (HGLOBAL)info->lparam; + lp = lparam; + hunlock = (HGLOBAL)lparam; } } break; } SERVER_START_REQ( send_message ) { - req->id = info->dest_tid; - req->type = info->type; + req->id = dest_tid; + req->type = type; req->flags = 0; - req->win = wine_server_user_handle( info->hwnd ); - req->msg = info->msg; - req->wparam = info->wparam; + req->win = wine_server_user_handle( hwnd ); + req->msg = msg; + req->wparam = wparam; req->lparam = lp; req->timeout = TIMEOUT_INFINITE; - for (i = 0; i < data->count; i++) - wine_server_add_data( req, data->data[i], data->size[i] ); + if (size) wine_server_add_data( req, ptr, size ); if ((res = wine_server_call( req ))) { if (res == STATUS_INVALID_PARAMETER) @@ -1292,7 +1288,7 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes SetLastError( RtlNtStatusToDosError(res) ); } else - FreeDDElParam(info->msg, info->lparam); + FreeDDElParam( msg, lparam ); } SERVER_END_REQ; if (hunlock) GlobalUnlock(hunlock); @@ -2010,7 +2006,8 @@ static BOOL put_message_in_queue( const struct send_message_info *info, size_t * } else if (info->type == MSG_POSTED && info->msg >= WM_DDE_FIRST && info->msg <= WM_DDE_LAST) { - return post_dde_message( &data, info ); + return post_dde_message( info->hwnd, info->msg, info->wparam, info->lparam, + info->dest_tid, info->type ); } SERVER_START_REQ( send_message )

1 0

Jacek Caban : win32u: Move NtUserWaitForInputIdle implementation from user32.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: 2a833a1c862e7ec421978540ad83aadc16cdda8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a833a1c862e7ec421978540… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 1 14:46:04 2022 +0200 win32u: Move NtUserWaitForInputIdle implementation from user32. 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/user32/message.c | 48 ++-------------------------------- dlls/user32/user_main.c | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 61 +++++++++++++++++++++++++++++++++++++------- dlls/win32u/ntuser_private.h | 1 - dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 +++++ 8 files changed, 63 insertions(+), 58 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index c5f55bf11c9..0df521a5a47 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2974,53 +2974,9 @@ DWORD WINAPI MsgWaitForMultipleObjects( DWORD count, const HANDLE *handles, /*********************************************************************** * WaitForInputIdle (USER32.@) */ -DWORD WINAPI WaitForInputIdle( HANDLE hProcess, DWORD dwTimeOut ) +DWORD WINAPI WaitForInputIdle( HANDLE process, DWORD timeout ) { - DWORD start_time, elapsed, ret; - HANDLE handles[2]; - - handles[0] = hProcess; - SERVER_START_REQ( get_process_idle_event ) - { - req->handle = wine_server_obj_handle( hProcess ); - wine_server_call_err( req ); - handles[1] = wine_server_ptr_handle( reply->event ); - } - SERVER_END_REQ; - if (!handles[1]) return WAIT_FAILED; /* no event to wait on */ - - start_time = GetTickCount(); - elapsed = 0; - - TRACE("waiting for %p\n", handles[1] ); - do - { - ret = MsgWaitForMultipleObjects ( 2, handles, FALSE, dwTimeOut - elapsed, QS_SENDMESSAGE ); - switch (ret) - { - case WAIT_OBJECT_0: - return 0; - case WAIT_OBJECT_0+2: - process_sent_messages(); - break; - case WAIT_TIMEOUT: - case WAIT_FAILED: - TRACE("timeout or error\n"); - return ret; - default: - TRACE("finished\n"); - return 0; - } - if (dwTimeOut != INFINITE) - { - elapsed = GetTickCount() - start_time; - if (elapsed > dwTimeOut) - break; - } - } - while (1); - - return WAIT_TIMEOUT; + return NtUserWaitForInputIdle( process, timeout, FALSE ); } diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 599bc3f636f..8eb60232c2f 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -172,7 +172,6 @@ static const struct user_callbacks user_funcs = SendNotifyMessageW, SetSystemMenu, ShowCaret, - WaitForInputIdle, free_menu_items, free_win_ptr, MENU_IsMenuActive, diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index ccab4beeaf4..5f3c7bdf7b1 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1226,6 +1226,7 @@ static struct unix_funcs unix_funcs = NtUserUnregisterHotKey, NtUserUpdateLayeredWindow, NtUserVkKeyScanEx, + NtUserWaitForInputIdle, NtUserWindowFromPoint, SetDIBits, diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 0a311f5a6ef..24813fac66f 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -481,15 +481,6 @@ LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar } } -/*********************************************************************** - * NtUserWaitForInputIdle (win32u.@) - */ -DWORD WINAPI NtUserWaitForInputIdle( HANDLE process, DWORD timeout, BOOL wow ) -{ - if (!user_callbacks) return 0; - return user_callbacks->pWaitForInputIdle( process, timeout ); -} - /********************************************************************** * NtUserGetGUIThreadInfo (win32u.@) */ @@ -980,6 +971,58 @@ DWORD WINAPI NtUserMsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handl (flags & MWMO_INPUTAVAILABLE) ? mask : 0, mask, flags ); } +/*********************************************************************** + * NtUserWaitForInputIdle (win32u.@) + */ +DWORD WINAPI NtUserWaitForInputIdle( HANDLE process, DWORD timeout, BOOL wow ) +{ + DWORD start_time, elapsed, ret; + HANDLE handles[2]; + + handles[0] = process; + SERVER_START_REQ( get_process_idle_event ) + { + req->handle = wine_server_obj_handle( process ); + wine_server_call_err( req ); + handles[1] = wine_server_ptr_handle( reply->event ); + } + SERVER_END_REQ; + if (!handles[1]) return WAIT_FAILED; /* no event to wait on */ + + start_time = NtGetTickCount(); + elapsed = 0; + + TRACE("waiting for %p\n", handles[1] ); + + for (;;) + { + ret = NtUserMsgWaitForMultipleObjectsEx( 2, handles, timeout - elapsed, QS_SENDMESSAGE, 0 ); + switch (ret) + { + case WAIT_OBJECT_0: + return 0; + case WAIT_OBJECT_0+2: + process_sent_messages(); + break; + case WAIT_TIMEOUT: + case WAIT_FAILED: + TRACE("timeout or error\n"); + return ret; + default: + TRACE("finished\n"); + return 0; + } + if (timeout != INFINITE) + { + elapsed = NtGetTickCount() - start_time; + if (elapsed > timeout) + break; + } + } + + return WAIT_TIMEOUT; +} + /*********************************************************************** * NtUserPeekMessage (win32u.@) */ diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 3b6b6badfdc..4dade6c78a5 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -45,7 +45,6 @@ struct user_callbacks BOOL (WINAPI *pSendNotifyMessageW)( HWND, UINT, WPARAM, LPARAM ); BOOL (WINAPI *pSetSystemMenu)( HWND hwnd, HMENU menu ); BOOL (WINAPI *pShowCaret)( HWND hwnd ); - DWORD (WINAPI *pWaitForInputIdle)( HANDLE, DWORD ); void (CDECL *free_menu_items)( void *ptr ); void (CDECL *free_win_ptr)( struct tagWND *win ); HWND (CDECL *is_menu_active)(void); diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 47e2afb315f..3e4b3ab5e30 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1305,7 +1305,7 @@ @ stdcall NtUserVkKeyScanEx(long long) @ stub NtUserWOWCleanup @ stub NtUserWaitAvailableMessageEx -@ stub NtUserWaitForInputIdle +@ stdcall NtUserWaitForInputIdle(long long long) @ stub NtUserWaitForMsgAndEvent @ stub NtUserWaitForRedirectionStartComplete @ stub NtUserWaitMessage diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 83fdecc9348..80cae3dad35 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -286,6 +286,7 @@ struct unix_funcs COLORREF key, const BLENDFUNCTION *blend, DWORD flags, const RECT *dirty ); WORD (WINAPI *pNtUserVkKeyScanEx)( WCHAR chr, HKL layout ); + DWORD (WINAPI *pNtUserWaitForInputIdle)( HANDLE process, DWORD timeout, BOOL wow ); HWND (WINAPI *pNtUserWindowFromPoint)( LONG x, LONG y ); /* Wine-specific functions */ diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 74677a969db..6348093e1fc 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -1184,6 +1184,12 @@ WORD WINAPI NtUserVkKeyScanEx( WCHAR chr, HKL layout ) return unix_funcs->pNtUserVkKeyScanEx( chr, layout ); } +DWORD WINAPI NtUserWaitForInputIdle( HANDLE process, DWORD timeout, BOOL wow ) +{ + if (!unix_funcs) return 0; + return unix_funcs->pNtUserWaitForInputIdle( process, timeout, wow ); +} + HWND WINAPI NtUserWindowFromPoint( LONG x, LONG y ) { if (!unix_funcs) return 0;

1 0