wine-devel

wine-devel@winehq.org

4 participants
84402 discussions

Start a nNew thread

[PATCH] shdocvw: Remove obsolete -D_SHDOCVW_ from Makefile.in
by Drew Ronneberg 29 Apr '22

29 Apr '22

1 0

[PATCH] setupapi: Remove obsolete -D_SETUPAPI_ from Makefile.in
by Drew Ronneberg 29 Apr '22

29 Apr '22

1 0

[PATCH 0/1] MR15: programs/winedbg: correctly read register values
by eric pouech (＠epo) 29 Apr '22

29 Apr '22

(was incorrectly reading all registers as having the size of debugger's DWORD_PTR) this is mainly needed: - for a 64-bit debugger attached to a 32-bit debuggee - when register is of different size than machine word (regressions introduced in wine-7.0-rc1) Fixed by accessing registers through dbg_lvalue structure (which contains correct size information) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/15

2 1

[PATCH v2 1/8] d2d1: Add stubs for ID2D1EffectContext.
by Ziqing Hui 29 Apr '22

29 Apr '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 23 ++++ dlls/d2d1/effect.c | 256 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 278 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index aa8e8569455..98092d80951 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -34,6 +34,7 @@ #include "initguid.h" #endif #include "dwrite_2.h" +#include "d2d1effectauthor.h" enum d2d_brush_type { @@ -567,6 +568,14 @@ struct d2d_device void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN; +struct d2d_effect_context +{ + ID2D1EffectContext ID2D1EffectContext_iface; + LONG refcount; +}; + +void d2d_effect_context_init(struct d2d_effect_context *effect_context) DECLSPEC_HIDDEN; + struct d2d_effect_info { const CLSID *clsid; @@ -694,6 +703,13 @@ static inline const char *debug_d2d_point_2f(const D2D1_POINT_2F *point) return wine_dbg_sprintf("{%.8e, %.8e}", point->x, point->y); } +static inline const char *debug_d2d_point_2l(const D2D1_POINT_2L *point) +{ + if (!point) + return "(null)"; + return wine_dbg_sprintf("{%ld, %ld}", point->x, point->y); +} + static inline const char *debug_d2d_rect_f(const D2D1_RECT_F *rect) { if (!rect) @@ -701,6 +717,13 @@ static inline const char *debug_d2d_rect_f(const D2D1_RECT_F *rect) return wine_dbg_sprintf("(%.8e, %.8e)-(%.8e, %.8e)", rect->left, rect->top, rect->right, rect->bottom); } +static inline const char *debug_d2d_rect_l(const D2D1_RECT_L *rect) +{ + if (!rect) + return "(null)"; + return wine_dbg_sprintf("(%ld, %ld)-(%ld, %ld)", rect->left, rect->top, rect->right, rect->bottom); +} + static inline const char *debug_d2d_rounded_rect(const D2D1_ROUNDED_RECT *rounded_rect) { if (!rounded_rect) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 350ac3c7bbf..5709afed7a5 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -17,7 +17,6 @@ */ #include "d2d1_private.h" -#include "d2d1effectauthor.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); @@ -31,6 +30,261 @@ static const struct d2d_effect_info builtin_effects[] = {&CLSID_D2D1Grayscale, 1, 1, 1}, }; +static inline struct d2d_effect_context *impl_from_ID2D1EffectContext(ID2D1EffectContext *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_effect_context, ID2D1EffectContext_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_QueryInterface(ID2D1EffectContext *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1EffectContext) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1EffectContext_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_effect_context_AddRef(ID2D1EffectContext *iface) +{ + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + ULONG refcount = InterlockedIncrement(&effect_context->refcount); + + TRACE("%p increasing refcount to %lu.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_effect_context_Release(ID2D1EffectContext *iface) +{ + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + ULONG refcount = InterlockedDecrement(&effect_context->refcount); + + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); + + if (!refcount) + { + heap_free(effect_context); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_effect_context_GetDpi(ID2D1EffectContext *iface, float *dpi_x, float *dpi_y) +{ + FIXME("iface %p, dpi_x %p, dpi_y %p stub!\n", iface, dpi_x, dpi_y); +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateEffect(ID2D1EffectContext *iface, + REFCLSID clsid, ID2D1Effect **effect) +{ + FIXME("iface %p, clsid %s, effect %p stub!\n", iface, debugstr_guid(clsid), effect); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_GetMaximumSupportedFeatureLevel(ID2D1EffectContext *iface, + const D3D_FEATURE_LEVEL *levels, UINT32 level_count, D3D_FEATURE_LEVEL *max_level) +{ + FIXME("iface %p, levels %p, level_count %u, max_level %p stub!\n", iface, levels, level_count, max_level); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateTransformNodeFromEffect(ID2D1EffectContext *iface, + ID2D1Effect *effect, ID2D1TransformNode **node) +{ + FIXME("iface %p, effect %p, node %p stub!\n", iface, effect, node); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBlendTransform(ID2D1EffectContext *iface, + UINT32 num_inputs, const D2D1_BLEND_DESCRIPTION *description, ID2D1BlendTransform **transform) +{ + FIXME("iface %p, num_inputs %u, description %p, transform %p stub!\n", iface, num_inputs, description, transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBorderTransform(ID2D1EffectContext *iface, + D2D1_EXTEND_MODE mode_x, D2D1_EXTEND_MODE mode_y, ID2D1BorderTransform **transform) +{ + FIXME("iface %p, mode_x %#x, mode_y %#x, transform %p stub!\n", iface, mode_x, mode_y, transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateOffsetTransform(ID2D1EffectContext *iface, + D2D1_POINT_2L offset, ID2D1OffsetTransform **transform) +{ + FIXME("iface %p, offset %s, transform %p stub!\n", iface, debug_d2d_point_2l(&offset), transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBoundsAdjustmentTransform(ID2D1EffectContext *iface, + const D2D1_RECT_L *output_rect, ID2D1BoundsAdjustmentTransform **transform) +{ + FIXME("iface %p, output_rect %s, transform %p stub!\n", iface, debug_d2d_rect_l(output_rect), transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadPixelShader(ID2D1EffectContext *iface, + REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) +{ + FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + iface, debugstr_guid(shader_id), buffer, buffer_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1EffectContext *iface, + REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) +{ + FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + iface, debugstr_guid(shader_id), buffer, buffer_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1EffectContext *iface, + REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) +{ + FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + iface, debugstr_guid(shader_id), buffer, buffer_size); + + return E_NOTIMPL; +} + +static BOOL STDMETHODCALLTYPE d2d_effect_context_IsShaderLoaded(ID2D1EffectContext *iface, REFGUID shader_id) +{ + FIXME("iface %p, shader_id %s stub!\n", iface, debugstr_guid(shader_id)); + + return FALSE; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateResourceTexture(ID2D1EffectContext *iface, + const GUID *id, const D2D1_RESOURCE_TEXTURE_PROPERTIES *texture_properties, + const BYTE *data, const UINT32 *strides, UINT32 data_size, ID2D1ResourceTexture **texture) +{ + FIXME("iface %p, id %s, texture_properties %p, data %p, strides %s, data_size %u, texture %p stub!\n", + iface, debugstr_guid(id), texture_properties, data, + strides ? wine_dbg_sprintf("%u", *strides) : "(null)", data_size, texture); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_FindResourceTexture(ID2D1EffectContext *iface, + const GUID *id, ID2D1ResourceTexture **texture) +{ + FIXME("iface %p, id %s, texture %p stub!\n", iface, debugstr_guid(id), texture); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateVertexBuffer(ID2D1EffectContext *iface, + const D2D1_VERTEX_BUFFER_PROPERTIES *buffer_properties, const GUID *id, + const D2D1_CUSTOM_VERTEX_BUFFER_PROPERTIES *custom_buffer_properties, ID2D1VertexBuffer **buffer) +{ + FIXME("iface %p, buffer_properties %p, id %s, custom_buffer_properties %p, buffer %p stub!\n", + iface, buffer_properties, debugstr_guid(id), custom_buffer_properties, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_FindVertexBuffer(ID2D1EffectContext *iface, + const GUID *id, ID2D1VertexBuffer **buffer) +{ + FIXME("iface %p, id %s, buffer %p stub!\n", iface, debugstr_guid(id), buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContext(ID2D1EffectContext *iface, + D2D1_COLOR_SPACE space, const BYTE *profile, UINT32 profile_size, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, space %#x, profile %p, profile_size %u, color_context %p stub!\n", + iface, space, profile, profile_size, color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromFilename(ID2D1EffectContext *iface, + const WCHAR *filename, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, filename %s, color_context %p stub!\n", iface, debugstr_w(filename), color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromWicColorContext(ID2D1EffectContext *iface, + IWICColorContext *wic_color_context, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, wic_color_context %p, color_context %p stub!\n", iface, wic_color_context, color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CheckFeatureSupport(ID2D1EffectContext *iface, + D2D1_FEATURE feature, void *data, UINT32 data_size) +{ + FIXME("iface %p, feature %#x, data %p, data_size %u stub!\n", iface, feature, data, data_size); + + return E_NOTIMPL; +} + +static BOOL STDMETHODCALLTYPE d2d_effect_context_IsBufferPrecisionSupported(ID2D1EffectContext *iface, + D2D1_BUFFER_PRECISION precision) +{ + FIXME("iface %p, precision %#x stub!\n", iface, precision); + + return FALSE; +} + +static const ID2D1EffectContextVtbl d2d_effect_context_vtbl = +{ + d2d_effect_context_QueryInterface, + d2d_effect_context_AddRef, + d2d_effect_context_Release, + d2d_effect_context_GetDpi, + d2d_effect_context_CreateEffect, + d2d_effect_context_GetMaximumSupportedFeatureLevel, + d2d_effect_context_CreateTransformNodeFromEffect, + d2d_effect_context_CreateBlendTransform, + d2d_effect_context_CreateBorderTransform, + d2d_effect_context_CreateOffsetTransform, + d2d_effect_context_CreateBoundsAdjustmentTransform, + d2d_effect_context_LoadPixelShader, + d2d_effect_context_LoadVertexShader, + d2d_effect_context_LoadComputeShader, + d2d_effect_context_IsShaderLoaded, + d2d_effect_context_CreateResourceTexture, + d2d_effect_context_FindResourceTexture, + d2d_effect_context_CreateVertexBuffer, + d2d_effect_context_FindVertexBuffer, + d2d_effect_context_CreateColorContext, + d2d_effect_context_CreateColorContextFromFilename, + d2d_effect_context_CreateColorContextFromWicColorContext, + d2d_effect_context_CheckFeatureSupport, + d2d_effect_context_IsBufferPrecisionSupported, +}; + +void d2d_effect_context_init(struct d2d_effect_context *effect_context) +{ + effect_context->ID2D1EffectContext_iface.lpVtbl = &d2d_effect_context_vtbl; + effect_context->refcount = 1; +} + static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) { return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Effect_iface); -- 2.25.1

2 14

[PATCH v2 0/1] MR14: dlls/dbghelp: introduce symt_find_symbol_at()
by eric pouech (＠epo) 29 Apr '22

29 Apr '22

To be used in place of symt_find_nearest(). symt_find_symbol_at() ensures that the address passed is within the boundaries of the returned symbol (while find_nearest() doesn't). This fixes erroneous backtraces in debugger like: ``` $ ./wine winedbg notepad WineDbg starting on pid 0104 RtlDefaultNpAcl () at Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731 0x00000170054805 ntdll+0x54805 [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731]: ret 1731 } Wine-dbg>bt Backtrace: =>0 0x00000170054805 RtlDefaultNpAcl+0x2d5(pAcl=<internal error>) [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731] in ntdll (0x000001700701a4) 1 0x0000017002d6c4 __wine_pop_frame(pAcl=<internal error>) [Z:\home\eric\work\wine\include\wine\exception.h:273] in ntdll (0x000001700701a4) 2 0x0000017002d6c4 process_breakpoint+0x84() [Z:\home\eric\work\wine\dlls\ntdll\loader.c:3912] in ntdll (0x000001700701a4) 3 0x000001700354c9 LdrInitializeThunk+0x509(context=<register R13 not accessible in this frame>, unknown2=<internal error>, unknown3=<internal error>, unknown4=<internal error>) [Z:\home\eric\work\wine\dlls\ntdll\loader.c:4200] in ntdll (0x000001700701a4) ``` where RtlDefaultNpAcl() has nothing to do here (it's the symbol below RIP and we don't have a symbol with debug information for that address). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- v2: dlls/dbghelp: introduce symt_find_symbol_at() https://gitlab.winehq.org/wine/wine/-/merge_requests/14

2 1

[PATCH 0/1] MR14: dlls/dbghelp: introduce symt_find_symbol_at()
by eric pouech (＠epo) 29 Apr '22

29 Apr '22

To be used in place of symt_find_nearest(). symt_find_symbol_at() ensures that the address passed is whithin the boundaries of the returned symbol (while find_nearest() doesn't). This fixes erroneous backtraces in debugger like: $ ./wine winedbg notepad WineDbg starting on pid 0104 RtlDefaultNpAcl () at Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731 0x00000170054805 ntdll+0x54805 [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731]: ret 1731 } Wine-dbg>bt Backtrace: =>0 0x00000170054805 RtlDefaultNpAcl+0x2d5(pAcl=<internal error>) [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731] in ntdll (0x000001700701a4) 1 0x0000017002d6c4 __wine_pop_frame(pAcl=<internal error>) [Z:\home\eric\work\wine\include\wine\exception.h:273] in ntdll (0x000001700701a4) 2 0x0000017002d6c4 process_breakpoint+0x84() [Z:\home\eric\work\wine\dlls\ntdll\loader.c:3912] in ntdll (0x000001700701a4) 3 0x000001700354c9 LdrInitializeThunk+0x509(context=<register R13 not accessible in this frame>, unknown2=<internal error>, unknown3=<internal error>, unknown4=<internal error>) [Z:\home\eric\work\wine\dlls\ntdll\loader.c:4200] in ntdll (0x000001700701a4) where RtlDefaultNpAcl() has nothing to do here (it's the symbol below RIP and we don't have a symbol with debug information for that address). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/14

3 2

[PATCH 0/1] MR13: kernelbase: Add support for progress callback in CopyFileEx.
by Alistair Leslie-Hughes (＠alesliehughes) 29 Apr '22

29 Apr '22

Based on patch by Michael Müller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/13

2 1

[PATCH v2 1/5] ntdll: Prevent double free (Coverity)
by Fabian Maurer 29 Apr '22

29 Apr '22

fd will be closed at the end of the function anyways Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ntdll/unix/file.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index cc8bf0c6e82..a6d76a49b27 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4215,7 +4215,6 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, int res = recv( fd, tmpbuf, size, MSG_PEEK ); info->MessagesAvailable = (res > 0); info->NextMessageSize = (res >= 0) ? res : MAILSLOT_NO_MESSAGE; - if (needs_close) close( fd ); } free( tmpbuf ); } -- 2.36.0

2 8

[PATCH v2 1/2] wrc: Support function macros where varargs are the only argument.
by Brendan Shanks 29 Apr '22

29 Apr '22

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: wrc needed support added for parsing function macros where '...' is the only argument. Negative 'args' was being used to represent a macro using varargs, but this obviously fails when there are no named arguments. Like with other variable argument macros, expansion still doesn't work. tools/wrc/ppl.l | 4 ++-- tools/wrc/ppy.y | 11 ++++++----- tools/wrc/wpp.c | 5 +++-- tools/wrc/wpp_private.h | 3 ++- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/wrc/ppl.l b/tools/wrc/ppl.l index 35c3fd6fb44..4748d735fa2 100644 --- a/tools/wrc/ppl.l +++ b/tools/wrc/ppl.l @@ -1071,9 +1071,9 @@ static void expand_macro(macexpstackentry_t *mep) assert(ppp->type == def_macro); assert(ppp->expanding == 0); - if((ppp->nargs >= 0 && nargs != ppp->nargs) || (ppp->nargs < 0 && nargs < -ppp->nargs)) + if((!ppp->variadic && nargs != ppp->nargs) || (ppp->variadic && nargs < ppp->nargs)) { - ppy_error("Too %s macro arguments (%d)", nargs < abs(ppp->nargs) ? "few" : "many", nargs); + ppy_error("Too %s macro arguments (%d)", nargs < ppp->nargs ? "few" : "many", nargs); return; } diff --git a/tools/wrc/ppy.y b/tools/wrc/ppy.y index ac4423d724f..ce3c409e735 100644 --- a/tools/wrc/ppy.y +++ b/tools/wrc/ppy.y @@ -112,6 +112,7 @@ static char *merge_text(char *s1, char *s2); */ static char **macro_args; /* Macro parameters array while parsing */ static int nmacro_args; +static int macro_variadic; /* Macro arguments end with (or consist entirely of) '...' */ %} @@ -267,7 +268,7 @@ preprocessor | tUNDEF tIDENT tNL { pp_del_define($2); free($2); } | tDEFINE opt_text tNL { pp_add_define($1, $2); free($1); free($2); } | tMACRO res_arg allmargs tMACROEND opt_mtexts tNL { - pp_add_macro($1, macro_args, nmacro_args, $5); + pp_add_macro($1, macro_args, nmacro_args, macro_variadic, $5); } | tLINE tSINT tDQSTRING tNL { if($3) fprintf(ppy_out, "# %d %s\n", $2 , $3); free($3); } | tGCCLINE tSINT tDQSTRING tNL { if($3) fprintf(ppy_out, "# %d %s\n", $2 , $3); free($3); } @@ -305,16 +306,16 @@ text : tLITERAL { $$ = $1; } | text tSQSTRING { $$ = merge_text($1, $2); } ; -res_arg : /* Empty */ { macro_args = NULL; nmacro_args = 0; } +res_arg : /* Empty */ { macro_args = NULL; nmacro_args = 0; macro_variadic = 0; } ; -allmargs: /* Empty */ { $$ = 0; macro_args = NULL; nmacro_args = 0; } +allmargs: /* Empty */ { $$ = 0; macro_args = NULL; nmacro_args = 0; macro_variadic = 0; } | emargs { $$ = nmacro_args; } ; emargs : margs { $$ = $1; } - | margs ',' tELLIPSIS { nmacro_args *= -1; } - | tELLIPSIS { macro_args = NULL; nmacro_args = 0; } + | margs ',' tELLIPSIS { macro_variadic = 1; } + | tELLIPSIS { macro_args = NULL; nmacro_args = 0; macro_variadic = 1; } ; margs : margs ',' tIDENT { $$ = add_new_marg($3); } diff --git a/tools/wrc/wpp.c b/tools/wrc/wpp.c index d8d5052870a..57baf44862b 100644 --- a/tools/wrc/wpp.c +++ b/tools/wrc/wpp.c @@ -239,7 +239,7 @@ pp_entry_t *pp_add_define(const char *def, const char *text) return ppp; } -pp_entry_t *pp_add_macro(char *id, char *args[], int nargs, mtext_t *exp) +pp_entry_t *pp_add_macro(char *id, char *args[], int nargs, int variadic, mtext_t *exp) { int idx; pp_entry_t *ppp; @@ -258,13 +258,14 @@ pp_entry_t *pp_add_macro(char *id, char *args[], int nargs, mtext_t *exp) ppp->type = def_macro; ppp->margs = args; ppp->nargs = nargs; + ppp->variadic = variadic; ppp->subst.mtext= exp; ppp->filename = xstrdup(pp_status.input ? pp_status.input : "<internal or cmdline>"); ppp->linenumber = pp_status.input ? pp_status.line_number : 0; list_add_head( &pp_defines[idx], &ppp->entry ); if(pp_status.debug) { - fprintf(stderr, "Added macro (%s, %d) <%s(%d)> to <", pp_status.input, pp_status.line_number, ppp->ident, nargs); + fprintf(stderr, "Added macro (%s, %d) <%s(%d%s)> to <", pp_status.input, pp_status.line_number, ppp->ident, nargs, variadic ? ",va" : ""); for(; exp; exp = exp->next) { switch(exp->type) diff --git a/tools/wrc/wpp_private.h b/tools/wrc/wpp_private.h index 435dbcc005a..9d92fa02fbb 100644 --- a/tools/wrc/wpp_private.h +++ b/tools/wrc/wpp_private.h @@ -80,6 +80,7 @@ typedef struct pp_entry { char *ident; /* The key */ char **margs; /* Macro arguments array or NULL if none */ int nargs; + int variadic; union { mtext_t *mtext; /* The substitution sequence or NULL if none */ char *text; @@ -156,7 +157,7 @@ typedef struct cval { pp_entry_t *pplookup(const char *ident); pp_entry_t *pp_add_define(const char *def, const char *text); -pp_entry_t *pp_add_macro(char *ident, char *args[], int nargs, mtext_t *exp); +pp_entry_t *pp_add_macro(char *ident, char *args[], int nargs, int variadic, mtext_t *exp); void pp_del_define(const char *name); void *pp_open_include(const char *name, int type, const char *parent_name, char **newpath); void pp_push_if(pp_if_state_t s); -- 2.35.1

1 1

[PATCH v3 1/5] ws2_32/tests: Test polling for AFD_POLL_READ while there is a pending WSARecv() call.
by Zebediah Figura 29 Apr '22

29 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/afd.c | 49 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index e385715f102..9d1600a7f6a 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -154,11 +154,14 @@ static void test_poll(void) struct afd_poll_params *out_params = (struct afd_poll_params *)out_buffer; int large_buffer_size = 1024 * 1024; SOCKET client, server, listener; + OVERLAPPED overlapped = {0}; struct sockaddr_in addr; + DWORD size, flags = 0; char *large_buffer; IO_STATUS_BLOCK io; LARGE_INTEGER now; ULONG params_size; + WSABUF wsabuf; HANDLE event; int ret, len; @@ -166,6 +169,7 @@ static void test_poll(void) memset(in_buffer, 0, sizeof(in_buffer)); memset(out_buffer, 0, sizeof(out_buffer)); event = CreateEventW(NULL, TRUE, FALSE, NULL); + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ret = bind(listener, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); @@ -329,6 +333,50 @@ static void test_poll(void) check_poll(client, event, AFD_POLL_WRITE | AFD_POLL_CONNECT | AFD_POLL_READ); check_poll(server, event, AFD_POLL_CONNECT); + /* Test sending data while there is a pending WSARecv(). */ + + in_params->timeout = -1000 * 10000; + in_params->count = 1; + in_params->sockets[0].socket = server; + in_params->sockets[0].flags = AFD_POLL_READ; + + ret = NtDeviceIoControlFile((HANDLE)server, event, NULL, NULL, &io, + IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); + ok(ret == STATUS_PENDING, "got %#x\n", ret); + + wsabuf.buf = large_buffer; + wsabuf.len = 1; + ret = WSARecv(server, &wsabuf, 1, NULL, &flags, &overlapped, NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + + ret = send(client, "a", 1, 0); + ok(ret == 1, "got %d\n", ret); + + ret = WaitForSingleObject(overlapped.hEvent, 200); + ok(!ret, "got %d\n", ret); + ret = GetOverlappedResult((HANDLE)server, &overlapped, &size, FALSE); + ok(ret, "got error %lu\n", GetLastError()); + ok(size == 1, "got size %lu\n", size); + + ret = WaitForSingleObject(event, 0); + todo_wine ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + ret = send(client, "a", 1, 0); + ok(ret == 1, "got %d\n", ret); + + ret = WaitForSingleObject(event, 200); + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#lx\n", io.Status); + ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); + ok(out_params->count == 1, "got count %u\n", out_params->count); + ok(out_params->sockets[0].socket == server, "got socket %#Ix\n", out_params->sockets[0].socket); + ok(out_params->sockets[0].flags == AFD_POLL_READ, "got flags %#x\n", out_params->sockets[0].flags); + ok(!out_params->sockets[0].status, "got status %#x\n", out_params->sockets[0].status); + + ret = recv(server, large_buffer, 1, 0); + ok(ret == 1, "got %d\n", ret); + /* Test sending out-of-band data. */ ret = send(client, "a", 1, MSG_OOB); @@ -745,6 +793,7 @@ static void test_poll(void) closesocket(client); closesocket(server); + CloseHandle(overlapped.hEvent); CloseHandle(event); free(large_buffer); } -- 2.34.1

2 5

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-devel