January 2020 - Wine-devel - list.winehq.org

[PATCH] msvcrt: Add support for quoted paths in _searchenv.
by Piotr Caban 28 Jan '20

28 Jan '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/dir.c | 21 ++++++++++++++++++--- dlls/msvcrt/tests/dir.c | 14 ++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-)

1 0

[PATCH] gdi32: Add D3DKMTSetQueuedLimit() stub.
by Chip Davis 28 Jan '20

28 Jan '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/gdi32/driver.c | 9 +++++++++ dlls/gdi32/gdi32.spec | 1 + include/ddk/d3dkmthk.h | 22 ++++++++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index d84584da8695..90977383a58f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1470,6 +1470,15 @@ NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats) return STATUS_SUCCESS; } +/****************************************************************************** + * D3DKMTSetQueuedLimit [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTSetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ) +{ + FIXME( "(%p): stub\n", desc ); + return STATUS_NOT_IMPLEMENTED; +} + /****************************************************************************** * D3DKMTSetVidPnSourceOwner [GDI32.@] */ diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 8faa2978f496..725afebb8eb8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -90,6 +90,7 @@ @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) @ stdcall D3DKMTQueryStatistics(ptr) +@ stdcall D3DKMTSetQueuedLimit(ptr) @ stdcall D3DKMTSetVidPnSourceOwner(ptr) @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 6d6a1d68cd0c..f9dd2d85eed3 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -597,6 +597,27 @@ typedef struct _D3DKMT_QUERYSTATISTICS }; } D3DKMT_QUERYSTATISTICS; +typedef enum _D3DKMT_QUEUEDLIMIT_TYPE +{ + D3DKMT_SET_QUEUEDLIMIT_PRESENT, + D3DKMT_GET_QUEUEDLIMIT_PRESENT +} D3DKMT_QUEUEDLIMIT_TYPE; + +typedef struct _D3DKMT_SETQUEUEDLIMIT +{ + D3DKMT_HANDLE hDevice; + D3DKMT_QUEUEDLIMIT_TYPE Type; + union + { + UINT QueuedPresentLimit; + struct + { + D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId; + UINT QueuedPendingFlipLimit; + }; + }; +} D3DKMT_SETQUEUEDLIMIT; + #ifdef __cplusplus extern "C" { @@ -610,6 +631,7 @@ NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc NTSTATUS WINAPI D3DKMTDestroyDevice(const D3DKMT_DESTROYDEVICE *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats); +NTSTATUS WINAPI D3DKMTSetQueuedLimit(D3DKMT_SETQUEUEDLIMIT *desc); NTSTATUS WINAPI D3DKMTSetVidPnSourceOwner(const D3DKMT_SETVIDPNSOURCEOWNER *desc); #ifdef __cplusplus -- 2.24.0

2 2

[PATCH] widl: Output a registry script for all interfaces written into the typelib.
by Zebediah Figura 28 Jan '20

28 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46005 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- tools/widl/parser.y | 1 + tools/widl/register.c | 11 +++-------- tools/widl/widltypes.h | 3 +++ tools/widl/write_msft.c | 11 +++++++++++ 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5f6eb508780..92b4f8ebd5a 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1792,6 +1792,7 @@ static type_t *make_safearray(type_t *type) static typelib_t *make_library(const char *name, const attr_list_t *attrs) { typelib_t *typelib = xmalloc(sizeof(*typelib)); + memset(typelib, 0, sizeof(*typelib)); typelib->name = xstrdup(name); typelib->attrs = attrs; list_init( &typelib->importlibs ); diff --git a/tools/widl/register.c b/tools/widl/register.c index f65cbddf531..c03ab3c56b1 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -119,8 +119,6 @@ static void write_typelib_interface( const type_t *iface, const typelib_t *typel if (!uuid) return; if (!is_object( iface )) return; - if (!is_attr( iface->attrs, ATTR_OLEAUTOMATION ) && !is_attr( iface->attrs, ATTR_DISPINTERFACE )) - return; put_str( indent, "'%s' = s '%s'\n", format_uuid( uuid ), iface->name ); put_str( indent, "{\n" ); indent++; @@ -137,13 +135,10 @@ static void write_typelib_interface( const type_t *iface, const typelib_t *typel static void write_typelib_interfaces( const typelib_t *typelib ) { - const statement_t *stmt; + unsigned int i; - if (typelib->stmts) LIST_FOR_EACH_ENTRY( stmt, typelib->stmts, const statement_t, entry ) - { - if (stmt->type == STMT_TYPE && type_get_type( stmt->u.type ) == TYPE_INTERFACE) - write_typelib_interface( stmt->u.type, typelib ); - } + for (i = 0; i < typelib->reg_iface_count; ++i) + write_typelib_interface( typelib->reg_ifaces[i], typelib ); } static int write_coclass( const type_t *class, const typelib_t *typelib ) diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 5e283292785..085a0ff55f5 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -538,6 +538,9 @@ struct _typelib_t { const attr_list_t *attrs; struct list importlibs; statement_list_t *stmts; + + type_t **reg_ifaces; + unsigned int reg_iface_count; }; struct _user_type_t { diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index dc0a6cb45b9..3a11d2ddd74 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2068,6 +2068,10 @@ static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinte if(add_func_desc(msft_typeinfo, func, idx) == S_OK) idx++; } + + typelib->typelib->reg_ifaces = xrealloc(typelib->typelib->reg_ifaces, + (typelib->typelib->reg_iface_count + 1) * sizeof(dispinterface)); + typelib->typelib->reg_ifaces[typelib->typelib->reg_iface_count++] = dispinterface; } static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) @@ -2142,6 +2146,13 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) if(add_func_desc(msft_typeinfo, func, idx) == S_OK) idx++; } + + if (is_attr(interface->attrs, ATTR_OLEAUTOMATION) || is_attr(interface->attrs, ATTR_DUAL)) + { + typelib->typelib->reg_ifaces = xrealloc(typelib->typelib->reg_ifaces, + (typelib->typelib->reg_iface_count + 1) * sizeof(interface)); + typelib->typelib->reg_ifaces[typelib->typelib->reg_iface_count++] = interface; + } } static void add_structure_typeinfo(msft_typelib_t *typelib, type_t *structure) -- 2.25.0

1 0

[PATCH 4/8] jscript: Store separated flag indicating if current exception value is valid.
by Jacek Caban 28 Jan '20

28 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 26 ++++++++++++++++++++------ dlls/jscript/engine.h | 3 +++ dlls/jscript/error.c | 3 ++- dlls/jscript/jscript.c | 3 ++- dlls/jscript/jscript.h | 1 - dlls/jscript/jsregexp.c | 4 +--- 6 files changed, 28 insertions(+), 12 deletions(-)

1 1

[PATCH] mshtml/tests: Get rid of strstr_wa.
by Jacek Caban 28 Jan '20

28 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/style.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-)

1 0

[PATCH 8/8] jscript: Add IActiveScriptError implementation.
by Jacek Caban 28 Jan '20

28 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jscript.c | 136 +++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/run.c | 13 ++-- 2 files changed, 141 insertions(+), 8 deletions(-)

1 0

[PATCH 7/8] jscript: Support DISP_E_EXCEPTION InvokeEx result.
by Jacek Caban 28 Jan '20

28 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)

1 0

[PATCH 6/8] jscript: Use enter_script and leave_script to call script site notifications.
by Jacek Caban 28 Jan '20

28 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 5 +++++ dlls/jscript/engine.h | 1 + dlls/jscript/jscript.c | 22 ++++------------------ dlls/jscript/tests/caller.c | 2 -- 4 files changed, 10 insertions(+), 20 deletions(-)

1 0

[PATCH 5/8] jscript: Store error code in jsexcept_t.
by Jacek Caban 28 Jan '20

28 Jan '20

1 0

[PATCH 3/8] jscript: Use separated jsexcept_t instance for each external call.
by Jacek Caban 28 Jan '20

28 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 15 ++++---- dlls/jscript/engine.c | 24 +++++-------- dlls/jscript/engine.h | 8 +++++ dlls/jscript/error.c | 5 +-- dlls/jscript/jscript.c | 76 ++++++++++++++++++++++++++++------------- dlls/jscript/jscript.h | 10 ++---- dlls/jscript/jsregexp.c | 2 +- dlls/jscript/jsutils.c | 5 ++- 8 files changed, 87 insertions(+), 58 deletions(-)

1 0