wine-commits

wine-commits@winehq.org

1 participants
185885 discussions

Benjamin Mayes : windowscodecs: Add conversions from PixelFormat32bppBGRA->PixelFormat16bppBGRA5551.
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: dcb5c97d02d58a0478e735eb7158c9bf3239791c URL: https://gitlab.winehq.org/wine/wine/-/commit/dcb5c97d02d58a0478e735eb7158c9… Author: Benjamin Mayes <czahrien(a)gmail.com> Date: Fri May 31 22:54:12 2024 -0400 windowscodecs: Add conversions from PixelFormat32bppBGRA->PixelFormat16bppBGRA5551. --- dlls/windowscodecs/converter.c | 65 +++++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/converter.c | 21 ++++++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 32109d917c5..c2657dc0d33 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -1492,6 +1492,69 @@ static HRESULT copypixels_to_8bppIndexed(struct FormatConverter *This, const WIC return hr; } +static HRESULT copypixels_to_16bppBGRA5551(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + switch (source_format) + { + case format_16bppBGRA5551: + if (prc) + return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + return S_OK; + case format_32bppBGRA: + if(prc) + { + HRESULT res; + INT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const DWORD *srcpixel; + BYTE *dstrow; + DWORD srcval = 0; + WORD *dstpixel; + + int a, r, g, b; + + srcstride = 4 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = malloc(srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + if(SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for(y=0; y< prc->Height; y++) { + srcpixel = (const DWORD*)srcrow; + dstpixel = (WORD *)dstrow; + for(x=0; x<prc->Width; x++) { + srcval=*srcpixel++; + a = (srcval & 0xff000000) >> 24; + r = (srcval & 0x00ff0000) >> 16; + g = (srcval & 0x0000ff00) >> 8; + b = (srcval & 0x000000ff); + a = (a >> 7) << 15; + r = (r >> 3) << 10; + g = (g >> 3) << 5; + b = (b >> 3); + *dstpixel++ = (a|r|g|b); + } + srcrow += srcstride; + dstrow += cbStride; + } + } + free(srcdata); + } + return S_OK; + default: + FIXME("Unimplemented conversion path! %d\n", source_format); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; + } +} + static const struct pixelformatinfo supported_formats[] = { {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL, TRUE}, {format_2bppIndexed, &GUID_WICPixelFormat2bppIndexed, NULL, TRUE}, @@ -1504,7 +1567,7 @@ static const struct pixelformatinfo supported_formats[] = { {format_16bppGray, &GUID_WICPixelFormat16bppGray, NULL}, {format_16bppBGR555, &GUID_WICPixelFormat16bppBGR555, NULL}, {format_16bppBGR565, &GUID_WICPixelFormat16bppBGR565, NULL}, - {format_16bppBGRA5551, &GUID_WICPixelFormat16bppBGRA5551, NULL}, + {format_16bppBGRA5551, &GUID_WICPixelFormat16bppBGRA5551, copypixels_to_16bppBGRA5551}, {format_24bppBGR, &GUID_WICPixelFormat24bppBGR, copypixels_to_24bppBGR}, {format_24bppRGB, &GUID_WICPixelFormat24bppRGB, copypixels_to_24bppRGB}, {format_32bppGrayFloat, &GUID_WICPixelFormat32bppGrayFloat, copypixels_to_32bppGrayFloat}, diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index d13ee896e95..ff2a1e0a067 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -602,6 +602,26 @@ static const BYTE bits_24bppBGR_gray[] = { static const struct bitmap_data testdata_24bppBGR_gray = { &GUID_WICPixelFormat24bppBGR, 24, bits_24bppBGR_gray, 32, 2, 96.0, 96.0}; +#define TO_16bppBGRA5551(b,g,r,a) ( \ + ((a >> 7) << 15) | \ + ((r >> 3) << 10) | \ + ((g >> 3) << 5) | \ + ((b >> 3)) \ +) + +static const WORD bits_16bppBGRA5551[] = { + TO_16bppBGRA5551(255,0,0,255), TO_16bppBGRA5551(0,255,0,255), TO_16bppBGRA5551(0,0,255,255), TO_16bppBGRA5551(0,0,0,255), TO_16bppBGRA5551(255,0,0,255), TO_16bppBGRA5551(0,255,0,255), TO_16bppBGRA5551(0,0,255,255), TO_16bppBGRA5551(0,0,0,255), + TO_16bppBGRA5551(255,0,0,255), TO_16bppBGRA5551(0,255,0,255), TO_16bppBGRA5551(0,0,255,255), TO_16bppBGRA5551(0,0,0,255), TO_16bppBGRA5551(255,0,0,255), TO_16bppBGRA5551(0,255,0,255), TO_16bppBGRA5551(0,0,255,255), TO_16bppBGRA5551(0,0,0,255), + TO_16bppBGRA5551(255,0,0,255), TO_16bppBGRA5551(0,255,0,255), TO_16bppBGRA5551(0,0,255,255), TO_16bppBGRA5551(0,0,0,255), TO_16bppBGRA5551(255,0,0,255), TO_16bppBGRA5551(0,255,0,255), TO_16bppBGRA5551(0,0,255,255), TO_16bppBGRA5551(0,0,0,255), + TO_16bppBGRA5551(255,0,0,255), TO_16bppBGRA5551(0,255,0,255), TO_16bppBGRA5551(0,0,255,255), TO_16bppBGRA5551(0,0,0,255), TO_16bppBGRA5551(255,0,0,255), TO_16bppBGRA5551(0,255,0,255), TO_16bppBGRA5551(0,0,255,255), TO_16bppBGRA5551(0,0,0,255), + TO_16bppBGRA5551(0,255,255,255), TO_16bppBGRA5551(255,0,255,255), TO_16bppBGRA5551(255,255,0,255), TO_16bppBGRA5551(255,255,255,255), TO_16bppBGRA5551(0,255,255,255), TO_16bppBGRA5551(255,0,255,255), TO_16bppBGRA5551(255,255,0,255), TO_16bppBGRA5551(255,255,255,255), + TO_16bppBGRA5551(0,255,255,255), TO_16bppBGRA5551(255,0,255,255), TO_16bppBGRA5551(255,255,0,255), TO_16bppBGRA5551(255,255,255,255), TO_16bppBGRA5551(0,255,255,255), TO_16bppBGRA5551(255,0,255,255), TO_16bppBGRA5551(255,255,0,255), TO_16bppBGRA5551(255,255,255,255), + TO_16bppBGRA5551(0,255,255,255), TO_16bppBGRA5551(255,0,255,255), TO_16bppBGRA5551(255,255,0,255), TO_16bppBGRA5551(255,255,255,255), TO_16bppBGRA5551(0,255,255,255), TO_16bppBGRA5551(255,0,255,255), TO_16bppBGRA5551(255,255,0,255), TO_16bppBGRA5551(255,255,255,255), + TO_16bppBGRA5551(0,255,255,255), TO_16bppBGRA5551(255,0,255,255), TO_16bppBGRA5551(255,255,0,255), TO_16bppBGRA5551(255,255,255,255), TO_16bppBGRA5551(0,255,255,255), TO_16bppBGRA5551(255,0,255,255), TO_16bppBGRA5551(255,255,0,255), TO_16bppBGRA5551(255,255,255,255)}; + +static const struct bitmap_data testdata_16bppBGRA5551 = { + &GUID_WICPixelFormat16bppBGRA5551, 16, (BYTE*)bits_16bppBGRA5551, 32, 2, 96.0, 96.0}; + static void test_conversion(const struct bitmap_data *src, const struct bitmap_data *dst, const char *name, BOOL todo) { BitmapTestSrc *src_obj; @@ -2054,6 +2074,7 @@ START_TEST(converter) test_conversion(&testdata_32bppBGR, &testdata_8bppGray, "32bppBGR -> 8bppGray", FALSE); test_conversion(&testdata_32bppGrayFloat, &testdata_24bppBGR_gray, "32bppGrayFloat -> 24bppBGR gray", FALSE); test_conversion(&testdata_32bppGrayFloat, &testdata_8bppGray, "32bppGrayFloat -> 8bppGray", FALSE); + test_conversion(&testdata_32bppBGRA, &testdata_16bppBGRA5551, "32bppBGRA -> 16bppBGRA5551", FALSE); test_invalid_conversion(); test_default_converter();

1 0

Mohamad Al-Jaf : coremessaging: Add CreateDispatcherQueueController() stub.
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: 6070536f170afa1936d70d6c22f4977686fff530 URL: https://gitlab.winehq.org/wine/wine/-/commit/6070536f170afa1936d70d6c22f497… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue May 28 23:46:36 2024 -0400 coremessaging: Add CreateDispatcherQueueController() stub. Needed by Photoshop 2024. --- dlls/coremessaging/Makefile.in | 3 +++ dlls/coremessaging/coremessaging.spec | 2 +- dlls/coremessaging/main.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/coremessaging/Makefile.in b/dlls/coremessaging/Makefile.in index 2d43a9077cd..0aa0fc43a9b 100644 --- a/dlls/coremessaging/Makefile.in +++ b/dlls/coremessaging/Makefile.in @@ -1 +1,4 @@ MODULE = coremessaging.dll + +SOURCES = \ + main.c diff --git a/dlls/coremessaging/coremessaging.spec b/dlls/coremessaging/coremessaging.spec index f8c31e6fbdb..58f2be2dc8e 100644 --- a/dlls/coremessaging/coremessaging.spec +++ b/dlls/coremessaging/coremessaging.spec @@ -15,7 +15,7 @@ @ stub CoreUIOpenExisting @ stub CoreUIRouteToTestRegistrar @ stub CoreUIUninitializeTestService -@ stub CreateDispatcherQueueController +@ stdcall CreateDispatcherQueueController(long long long ptr) @ stub CreateDispatcherQueueForCurrentThread @ stdcall -private DllCanUnloadNow() @ stub DllGetActivationFactory diff --git a/dlls/coremessaging/main.c b/dlls/coremessaging/main.c new file mode 100644 index 00000000000..4944f28a49a --- /dev/null +++ b/dlls/coremessaging/main.c @@ -0,0 +1,30 @@ +/* WinRT CoreMessaging Implementation + * + * Copyright (C) 2024 Mohamad Al-Jaf + * + * 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 + */ + +#include "dispatcherqueue.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(messaging); + +HRESULT WINAPI CreateDispatcherQueueController( DispatcherQueueOptions options, PDISPATCHERQUEUECONTROLLER *queue_controller ) +{ + FIXME( "options.dwSize = %lu, options.threadType = %d, options.apartmentType = %d, queue_controller %p stub!\n", + options.dwSize, options.threadType, options.apartmentType, queue_controller ); + return E_NOTIMPL; +}

1 0

Mohamad Al-Jaf : include: Add dispatcherqueue.idl file.
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: 05ff16ebb61081ef6bfba3ecd8df98856668f8a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/05ff16ebb61081ef6bfba3ecd8df98… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue May 28 23:34:49 2024 -0400 include: Add dispatcherqueue.idl file. --- include/Makefile.in | 1 + include/dispatcherqueue.idl | 48 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index fa8c096eabd..81ff6cfa634 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -239,6 +239,7 @@ SOURCES = \ dinput.h \ dinputd.h \ directmanipulation.idl \ + dispatcherqueue.idl \ dispdib.h \ dispex.idl \ dlgs.h \ diff --git a/include/dispatcherqueue.idl b/include/dispatcherqueue.idl new file mode 100644 index 00000000000..7a4be6ede0e --- /dev/null +++ b/include/dispatcherqueue.idl @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2024 Mohamad Al-Jaf + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "windows.system.idl"; + +typedef Windows.System.IDispatcherQueue *PDISPATCHERQUEUE; +typedef Windows.System.IDispatcherQueueController *PDISPATCHERQUEUECONTROLLER; + +typedef enum DISPATCHERQUEUE_THREAD_APARTMENTTYPE +{ + DQTAT_COM_NONE = 0, + DQTAT_COM_ASTA = 1, + DQTAT_COM_STA = 2, +} DISPATCHERQUEUE_THREAD_APARTMENTTYPE; + +typedef enum DISPATCHERQUEUE_THREAD_TYPE +{ + DQTYPE_THREAD_DEDICATED = 1, + DQTYPE_THREAD_CURRENT = 2, +} DISPATCHERQUEUE_THREAD_TYPE; + +typedef struct DispatcherQueueOptions +{ + DWORD dwSize; + DISPATCHERQUEUE_THREAD_TYPE threadType; + DISPATCHERQUEUE_THREAD_APARTMENTTYPE apartmentType; +} DispatcherQueueOptions; + +[local] HRESULT __stdcall CreateDispatcherQueueController(DispatcherQueueOptions options, PDISPATCHERQUEUECONTROLLER *queue_controller);

1 0

Rémi Bernon : widl: Use mangled namespace names in typedef pointer types.
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: ee908ad076e8bfb7f0b178d9f6c7f0130bf64f91 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee908ad076e8bfb7f0b178d9f6c7f0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 30 10:38:46 2024 +0200 widl: Use mangled namespace names in typedef pointer types. --- tools/widl/header.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index ab931f0193e..bb30156b8a3 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -819,8 +819,8 @@ static void write_generic_handle_routines(FILE *header) static void write_typedef(FILE *header, type_t *type, bool define) { - type_t *t = type_alias_get_aliasee_type(type); - if (winrt_mode && t->namespace && !is_global_namespace(t->namespace)) + type_t *t = type_alias_get_aliasee_type(type), *root = type_pointer_get_root_type(t); + if (winrt_mode && root->namespace && !is_global_namespace(root->namespace)) { fprintf(header, "#ifndef __cplusplus\n"); fprintf(header, "typedef "); @@ -829,12 +829,12 @@ static void write_typedef(FILE *header, type_t *type, bool define) if (type_get_type_detect_alias(t) != TYPE_ENUM) { fprintf(header, "#else /* __cplusplus */\n"); - write_namespace_start(header, t->namespace); + if (t->namespace && !is_global_namespace(t->namespace)) write_namespace_start(header, t->namespace); indent(header, 0); fprintf(header, "typedef "); write_type_v(header, type_alias_get_aliasee(type), FALSE, false, type->name, NAME_DEFAULT); fprintf(header, ";\n"); - write_namespace_end(header, t->namespace); + if (t->namespace && !is_global_namespace(t->namespace)) write_namespace_end(header, t->namespace); } fprintf(header, "#endif /* __cplusplus */\n\n"); }

1 0

Mohamad Al-Jaf : coremessaging: Add stub DLL.
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: c0878d7f9561742ce8e6fdf251580013c5a5caad URL: https://gitlab.winehq.org/wine/wine/-/commit/c0878d7f9561742ce8e6fdf2515800… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue May 28 22:50:40 2024 -0400 coremessaging: Add stub DLL. Needed by Photoshop 2024. --- configure | 2 ++ configure.ac | 1 + dlls/coremessaging/Makefile.in | 1 + dlls/coremessaging/coremessaging.spec | 31 +++++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+) diff --git a/configure b/configure index 4f4c37756c1..101981ad8df 100755 --- a/configure +++ b/configure @@ -1027,6 +1027,7 @@ enable_compstui enable_comsvcs enable_concrt140 enable_connect +enable_coremessaging enable_credui enable_crtdll enable_crypt32 @@ -21985,6 +21986,7 @@ wine_fn_config_makefile dlls/comsvcs/tests enable_tests wine_fn_config_makefile dlls/concrt140 enable_concrt140 wine_fn_config_makefile dlls/concrt140/tests enable_tests wine_fn_config_makefile dlls/connect enable_connect +wine_fn_config_makefile dlls/coremessaging enable_coremessaging wine_fn_config_makefile dlls/credui enable_credui wine_fn_config_makefile dlls/credui/tests enable_tests wine_fn_config_makefile dlls/crtdll enable_crtdll diff --git a/configure.ac b/configure.ac index 3f54230b46b..231ec7f17d6 100644 --- a/configure.ac +++ b/configure.ac @@ -2494,6 +2494,7 @@ WINE_CONFIG_MAKEFILE(dlls/comsvcs/tests) WINE_CONFIG_MAKEFILE(dlls/concrt140) WINE_CONFIG_MAKEFILE(dlls/concrt140/tests) WINE_CONFIG_MAKEFILE(dlls/connect) +WINE_CONFIG_MAKEFILE(dlls/coremessaging) WINE_CONFIG_MAKEFILE(dlls/credui) WINE_CONFIG_MAKEFILE(dlls/credui/tests) WINE_CONFIG_MAKEFILE(dlls/crtdll) diff --git a/dlls/coremessaging/Makefile.in b/dlls/coremessaging/Makefile.in new file mode 100644 index 00000000000..2d43a9077cd --- /dev/null +++ b/dlls/coremessaging/Makefile.in @@ -0,0 +1 @@ +MODULE = coremessaging.dll diff --git a/dlls/coremessaging/coremessaging.spec b/dlls/coremessaging/coremessaging.spec new file mode 100644 index 00000000000..f8c31e6fbdb --- /dev/null +++ b/dlls/coremessaging/coremessaging.spec @@ -0,0 +1,31 @@ +@ stub CoreUICallComputeMaximumMessageSize +@ stub CoreUICallCreateConversationHost +@ stub CoreUICallCreateEndpointHost +@ stub CoreUICallCreateEndpointHostWithSendPriority +@ stub CoreUICallGetAddressOfParameterInBuffer +@ stub CoreUICallReceive +@ stub CoreUICallSend +@ stub CoreUICallSendVaList +@ stub CoreUIConfigureTestHost +@ stub CoreUIConfigureUserIntegration +@ stub CoreUICreate +@ stub CoreUICreateAnonymousStream +@ stub CoreUICreateEx +@ stub CoreUIInitializeTestService +@ stub CoreUIOpenExisting +@ stub CoreUIRouteToTestRegistrar +@ stub CoreUIUninitializeTestService +@ stub CreateDispatcherQueueController +@ stub CreateDispatcherQueueForCurrentThread +@ stdcall -private DllCanUnloadNow() +@ stub DllGetActivationFactory +@ stub DllGetClassObject +@ stub GetDispatcherQueueForCurrentThread +@ stub MsgBlobCreateShared +@ stub MsgBlobCreateStack +@ stub MsgBufferShare +@ stub MsgRelease +@ stub MsgStringCreateShared +@ stub MsgStringCreateStack +@ stub ServiceMain +@ stub SvchostPushServiceGlobals

1 0

Elizabeth Figura : widl: Do not write type definitions for types defined in an imported header.
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: 93d50fd9de906b7acfa4b5b8c40bff394a2df4e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/93d50fd9de906b7acfa4b5b8c40bff… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Mar 25 18:37:42 2024 -0500 widl: Do not write type definitions for types defined in an imported header. midl does not, and this would result in redefinition errors. An equivalent (and arguably a bit more declarative) way to do this would be to keep track in the parser whether a type or typedef statement is actually a definition or not, and record that information in the statement_t. However, this would require passing additional information alongside the type_t from each relevant bison rule, which would thrash a lot of code. --- tools/widl/parser.y | 6 +++--- tools/widl/typetree.c | 2 ++ tools/widl/widltypes.h | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d8363afa981..f5b82f29db3 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1359,7 +1359,7 @@ type: typedef: m_attributes tTYPEDEF m_attributes decl_spec declarator_list { $1 = append_attribs($1, $3); reg_typedefs( @$, $4, $5, check_typedef_attrs( $1 ) ); - $$ = make_statement_typedef($5, $4->type->defined); + $$ = make_statement_typedef($5, $4->type->defined && !$4->type->defined_in_import); } ; @@ -1719,7 +1719,7 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, declarator v->declspec.type = decl->type; v->declspec.qualifier = decl->qualifier; v->attrs = attrs; - v->is_defined = type->defined; + v->is_defined = type->defined && !type->defined_in_import; if (is_attr(type->attrs, ATTR_CALLCONV) && !is_func(type)) error_loc("calling convention applied to non-function type\n"); @@ -2833,7 +2833,7 @@ static statement_t *make_statement_type_decl(type_t *type) { statement_t *stmt = make_statement(STMT_TYPE); stmt->u.type = type; - stmt->is_defined = type->defined; + stmt->is_defined = type->defined && !type->defined_in_import; return stmt; } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index ea17f16e0c8..af41906c42b 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -536,6 +536,7 @@ static void define_type(type_t *type, const struct location *where) error_loc("type %s already defined at %s:%d\n", type->name, type->where.input_name, type->where.first_line ); type->defined = TRUE; + type->defined_in_import = parse_only; type->where = *where; } @@ -935,6 +936,7 @@ type_t *type_delegate_define(type_t *delegate, attr_list_t *attrs, iface->details.iface->disp_inherit = NULL; iface->details.iface->async_iface = NULL; iface->details.iface->requires = NULL; + define_type(iface, where); iface->defined = TRUE; compute_method_indexes(iface); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 9d99c83a25e..7bc24fad0d3 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -523,6 +523,7 @@ struct _type_t { struct location where; unsigned int ignore : 1; unsigned int defined : 1; + unsigned int defined_in_import : 1; unsigned int written : 1; unsigned int user_types_registered : 1; unsigned int tfswrite : 1; /* if the type needs to be written to the TFS */

1 0

Elizabeth Figura : widl: Update the type location in define_type().
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: 1db2eaf0b39c7839fd6f41ecd583bc9852f1fde9 URL: https://gitlab.winehq.org/wine/wine/-/commit/1db2eaf0b39c7839fd6f41ecd583bc… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Mar 25 18:26:42 2024 -0500 widl: Update the type location in define_type(). This improves error reporting for the following IDL: interface apple; [uuid(12345678-1234-1234-1234-123456654321)] interface apple {void func(void);} [uuid(12345678-1234-1234-1234-123456654321)] interface apple {void func(void);} Previously widl would report: test2.idl:19:34: error: type apple already defined at test2.idl:2 This changes it to refer to line 5, where the interface is actually defined. --- tools/widl/parser.y | 42 ++++++++++++++--------------- tools/widl/typetree.c | 74 ++++++++++++++++++++++++++++++--------------------- tools/widl/typetree.h | 41 ++++++++++++++++++---------- 3 files changed, 92 insertions(+), 65 deletions(-)

1 0

Elizabeth Figura : widl: Factor out a define_type() helper.
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: 1522d7b727da45c7fa313755d6bbfb12dfb443c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/1522d7b727da45c7fa313755d6bbfb… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Mar 25 18:25:55 2024 -0500 widl: Factor out a define_type() helper. --- tools/widl/typetree.c | 95 ++++++++++++++++----------------------------------- 1 file changed, 30 insertions(+), 65 deletions(-)

1 0

Elizabeth Figura : widl: Invert "declonly".
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: da8d81c63ddb066ca37dcfe2c7d58b8372a2fa20 URL: https://gitlab.winehq.org/wine/wine/-/commit/da8d81c63ddb066ca37dcfe2c7d58b… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Mar 25 17:18:21 2024 -0500 widl: Invert "declonly". This makes the logic around it a bit simpler, and I find it easier to understand as well. --- tools/widl/header.c | 58 +++++++++++++++++++++++++------------------------- tools/widl/header.h | 2 +- tools/widl/parser.y | 16 +++++++------- tools/widl/typegen.c | 8 +++---- tools/widl/widltypes.h | 8 +++++-- 5 files changed, 48 insertions(+), 44 deletions(-)

1 0

Elizabeth Figura : widl: Allow using UDTs with the keyword even when the identifier is also a typedef.
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: 9839a0d68d86473008b349cf01418c0888a04401 URL: https://gitlab.winehq.org/wine/wine/-/commit/9839a0d68d86473008b349cf01418c… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Mar 25 15:21:44 2024 -0500 widl: Allow using UDTs with the keyword even when the identifier is also a typedef. E.g. in cases like typedef int apple; struct apple { ... }; allow subsequently using "struct apple" in future expressions. Note that this already worked for UDT definitions (so the above example by itself was legal in widl), but any attempt to use the defined type would result in a syntax error. --- tools/widl/parser.y | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index e5e28fd7b24..097d927dbc2 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -500,11 +500,11 @@ warnings: typedecl: enumdef - | tENUM aIDENTIFIER { $$ = type_new_enum($2, current_namespace, FALSE, NULL); } + | tENUM typename { $$ = type_new_enum($2, current_namespace, FALSE, NULL); } | structdef - | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, current_namespace, FALSE, NULL); } + | tSTRUCT typename { $$ = type_new_struct($2, current_namespace, FALSE, NULL); } | uniondef - | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, current_namespace, FALSE, NULL); } + | tUNION typename { $$ = type_new_nonencapsulated_union($2, current_namespace, FALSE, NULL); } | attributes enumdef { $$ = $2; $$->attrs = check_enum_attrs($1); } | attributes structdef { $$ = $2; $$->attrs = check_struct_attrs($1); } | attributes uniondef { $$ = $2; $$->attrs = check_union_attrs($1); } @@ -1338,17 +1338,17 @@ structdef: tSTRUCT m_typename '{' fields '}' { $$ = type_new_struct($2, current_ ; unqualified_type: - tVOID { $$ = type_new_void(); } - | base_type { $$ = $1; } - | enumdef { $$ = $1; } - | tENUM aIDENTIFIER { $$ = type_new_enum($2, current_namespace, FALSE, NULL); } - | structdef { $$ = $1; } - | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, current_namespace, FALSE, NULL); } - | uniondef { $$ = $1; } - | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, current_namespace, FALSE, NULL); } - | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } - | aKNOWNTYPE { $$ = find_type_or_error(current_namespace, $1); } - ; + tVOID { $$ = type_new_void(); } + | base_type { $$ = $1; } + | enumdef { $$ = $1; } + | tENUM typename { $$ = type_new_enum($2, current_namespace, FALSE, NULL); } + | structdef { $$ = $1; } + | tSTRUCT typename { $$ = type_new_struct($2, current_namespace, FALSE, NULL); } + | uniondef { $$ = $1; } + | tUNION typename { $$ = type_new_nonencapsulated_union($2, current_namespace, FALSE, NULL); } + | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } + | aKNOWNTYPE { $$ = find_type_or_error(current_namespace, $1); } + ; type: unqualified_type

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