March 2021 - Wine-Commits - list.winehq.org

Robert Wilhelm : vbscript: Parse decimal literals between -1 and 1 without 0 in front.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: e1460b2794d8e34a42c06e5077eaeb59b4aa838a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1460b2794d8e34a42c06e50… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Sep 15 13:33:38 2020 +0200 vbscript: Parse decimal literals between -1 and 1 without 0 in front. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49820 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a31023a67812714f503250dc25abbc086439790a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/lex.c | 11 +++++++++-- dlls/vbscript/tests/lang.vbs | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 444774b4341..2fee702ac8f 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -390,11 +390,18 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) /* * We need to distinguish between '.' used as part of a member expression and * a beginning of a dot expression (a member expression accessing with statement - * expression). + * expression) and a floating point number like ".2" . */ c = ctx->ptr > ctx->code ? ctx->ptr[-1] : '\n'; + if (is_identifier_char(c) || c == ')') { + ctx->ptr++; + return '.'; + } + c = ctx->ptr[1]; + if('0' <= c && c <= '9') + return parse_numeric_literal(ctx, lval); ctx->ptr++; - return is_identifier_char(c) || c == ')' ? '.' : tDOT; + return tDOT; case '-': if(ctx->is_html && ctx->ptr[1] == '-' && ctx->ptr[2] == '>') return comment_line(ctx); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 570b5befeaa..95988a4e1d9 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -47,6 +47,8 @@ Call ok(56.789e-2 = 0.56789, "56.789e-2 <> 0.56789") Call ok(1e-94938484 = 0, "1e-... <> 0") Call ok(34e0 = 34, "34e0 <> 34") Call ok(34E1 = 340, "34E0 <> 340") +Call ok(.5 = 0.5, ".5 <> 0.5") +Call ok(.5e1 = 5, ".5e1 <> 5") Call ok(--1 = 1, "--1 = " & --1) Call ok(-empty = 0, "-empty = " & (-empty)) Call ok(true = -1, "! true = -1") @@ -81,6 +83,7 @@ Call ok(getVT(null) = "VT_NULL", "getVT(null) is not VT_NULL") Call ok(getVT(0) = "VT_I2", "getVT(0) is not VT_I2") Call ok(getVT(1) = "VT_I2", "getVT(1) is not VT_I2") Call ok(getVT(0.5) = "VT_R8", "getVT(0.5) is not VT_R8") +Call ok(getVT(.5) = "VT_R8", "getVT(.5) is not VT_R8") Call ok(getVT(0.0) = "VT_R8", "getVT(0.0) is not VT_R8") Call ok(getVT(2147483647) = "VT_I4", "getVT(2147483647) is not VT_I4") Call ok(getVT(2147483648) = "VT_R8", "getVT(2147483648) is not VT_R8")

1 0

Arkadiusz Hiler : gdi32: Limit GetGlyphOutlineW(uChar) to a WORD.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 593561edfddda914a8997b8a42ee6ee278a4b481 URL: https://source.winehq.org/git/wine.git/?a=commit;h=593561edfddda914a8997b8a… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Sep 28 12:16:49 2020 +0300 gdi32: Limit GetGlyphOutlineW(uChar) to a WORD. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45400 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 45aee6375d0f2dcfe7bd47b5d0e4866916a345db) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/font.c | 2 ++ dlls/gdi32/tests/font.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d451f30c3ee..72d08ff0c35 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2905,6 +2905,8 @@ DWORD WINAPI GetGlyphOutlineW( HDC hdc, UINT uChar, UINT fuFormat, dc = get_dc_ptr(hdc); if(!dc) return GDI_ERROR; + uChar &= 0xffff; + dev = GET_DC_PHYSDEV( dc, pGetGlyphOutline ); ret = dev->funcs->pGetGlyphOutline( dev, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, lpmat2 ); release_dc_ptr( dc ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ea1bb960df6..47eed850a5b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5842,6 +5842,57 @@ todo_wine ReleaseDC(NULL, hdc); } +static void test_GetGlyphOutline_character(void) +{ + HFONT hfont, hfont_old; + LOGFONTA lf; + HDC hdc; + DWORD ret; + GLYPHMETRICS gm1, gm2, gmn; + char test_chars[] = { 'A', 'D', '!', '\0' }; + char *current_char; + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = 72; + lstrcpyA(lf.lfFaceName, "wine_test"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hdc = GetDC(NULL); + + hfont_old = SelectObject(hdc, hfont); + ok(hfont_old != NULL, "SelectObject failed\n"); + + ret = GetGlyphOutlineW(hdc, 'Z', GGO_METRICS, &gmn, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed to default to .notdef for character 'Z'\n"); + + for (current_char = test_chars; *current_char != '\0'; current_char++) + { + ret = GetGlyphOutlineW(hdc, *current_char, GGO_METRICS, &gm1, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed for '%c'\n", *current_char); + ok(memcmp(&gm1, &gmn, sizeof(gmn)) != 0, "the test character '%c' matches .notdef\n", *current_char); + + ret = GetGlyphOutlineW(hdc, 0x10000 + *current_char, GGO_METRICS, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed for 0x10000 + '%c'\n", *current_char); + ok(memcmp(&gm1, &gm2, sizeof(gmn)) == 0, "GetGlyphOutlineW returned wrong metrics for character 0x10000 + '%c'\n", *current_char); + } + + ret = GetGlyphOutlineW(hdc, 0x3, GGO_METRICS|GGO_GLYPH_INDEX, &gm1, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed for glyph index 0x3\n"); + + ret = GetGlyphOutlineW(hdc, 0xFFFF, GGO_METRICS|GGO_GLYPH_INDEX, &gm2, 0, NULL, &mat); + ok(ret == GDI_ERROR, "GetGlyphOutlineW for nonexistent glyph index 0xFFFF has succeded\n"); + + ret = GetGlyphOutlineW(hdc, 0x10003, GGO_METRICS|GGO_GLYPH_INDEX, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW for index 0x10003 has failed\n"); + ok(memcmp(&gm1, &gm2, sizeof(gmn)) == 0, "GetGlyphOutlineW returned wrong metrics for glyph 0x10003\n"); + + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); +} + static void test_fstype_fixup(void) { HDC hdc; @@ -5964,6 +6015,7 @@ static void test_CreateScalableFontResource(void) test_GetGlyphOutline_empty_contour(); test_GetGlyphOutline_metric_clipping(); + test_GetGlyphOutline_character(); test_fstype_fixup(); ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0);

1 0

Robert Wilhelm : vbscript: Fix vanishing statements.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 25491ebd2ac2fc5f0f1eff5f7211c8c493e23c7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=25491ebd2ac2fc5f0f1eff5f… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Sep 22 22:14:29 2020 +0200 vbscript: Fix vanishing statements. When adding multiple statements (e.g. colon separated SimpleStatements) in function source_add_statement(), tail of linked list was not adjusted. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fe59d1a5d35f4d0d9e2a262c25cbfefb91cdad3c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/parser.y | 5 +++++ dlls/vbscript/tests/lang.vbs | 3 +++ 2 files changed, 8 insertions(+) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 9a395f94961..9507e97e8ca 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -511,12 +511,17 @@ static void source_add_statement(parser_ctx_t *ctx, statement_t *stat) if(!stat) return; + /* concatenate both linked lists */ if(ctx->stats) { ctx->stats_tail->next = stat; ctx->stats_tail = stat; }else { ctx->stats = ctx->stats_tail = stat; } + /* find new tail */ + while(ctx->stats_tail->next) { + ctx->stats_tail=ctx->stats_tail->next; + } } static void source_add_class(parser_ctx_t *ctx, class_decl_t *class_decl) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 95988a4e1d9..14761cf5a52 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -62,6 +62,9 @@ Call ok(W = 5, "W = " & W & " expected " & 5) x = "xx" Call ok(x = "xx", "x = " & x & " expected ""xx""") +Dim public1 : public1 = 42 +Call ok(public1 = 42, "public1=" & public1 & " expected & " & 42) + Call ok(true <> false, "true <> false is false") Call ok(not (true <> true), "true <> true is true") Call ok(not ("x" <> "x"), """x"" <> ""x"" is true")

1 0

Myah Caron : shell32: Implement ShellLinkObject::get_Path.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: cc1f837b9b5a8919e624d1b2b89196c1f17ec1b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc1f837b9b5a8919e624d1b2… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Mon Sep 14 20:52:47 2020 +0000 shell32: Implement ShellLinkObject::get_Path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49591 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4c99e3ef341a6b4eda67dffa13a86829fa343bbb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shelldispatch.c | 53 ++++++++++++++++++++++++++++++++++---- dlls/shell32/tests/shelldispatch.c | 2 +- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 5eda5c76eef..de581dec427 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -106,6 +106,8 @@ typedef struct { typedef struct { IShellLinkDual2 IShellLinkDual2_iface; LONG ref; + + IShellLinkW *shell_link; } ShellLinkObjectImpl; static inline ShellDispatch *impl_from_IShellDispatch6(IShellDispatch6 *iface) @@ -671,6 +673,7 @@ static ULONG WINAPI ShellLinkObject_Release(IShellLinkDual2 *iface) if (!ref) { + if (This->shell_link) IShellLinkW_Release(This->shell_link); heap_free(This); } return ref; @@ -732,9 +735,20 @@ static HRESULT WINAPI ShellLinkObject_Invoke(IShellLinkDual2 *iface, DISPID disp static HRESULT WINAPI ShellLinkObject_get_Path(IShellLinkDual2 *iface, BSTR *pbs) { - FIXME("(%p, %p)\n", iface, pbs); + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + WCHAR path[MAX_PATH]; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %p)\n", iface, pbs); + + *pbs = NULL; + + hr = IShellLinkW_GetPath(This->shell_link, path, MAX_PATH, NULL, 0); + if (hr != S_OK) + return hr; + + *pbs = SysAllocString(path); + return hr; } static HRESULT WINAPI ShellLinkObject_put_Path(IShellLinkDual2 *iface, BSTR bs) @@ -878,11 +892,13 @@ static const IShellLinkDual2Vtbl ShellLinkObjectVtbl = { ShellLinkObject_get_Target, }; -static HRESULT ShellLinkObject_Constructor(IShellLinkDual2 **link) +static HRESULT ShellLinkObject_Constructor(FolderItemImpl *item, IShellLinkDual2 **link) { + HRESULT hr; + IPersistFile *persist_file = NULL; ShellLinkObjectImpl *This; - FIXME("(%p)\n", link); + TRACE("(%p, %p)\n", item, link); *link = NULL; @@ -891,6 +907,33 @@ static HRESULT ShellLinkObject_Constructor(IShellLinkDual2 **link) This->IShellLinkDual2_iface.lpVtbl = &ShellLinkObjectVtbl; This->ref = 1; + This->shell_link = NULL; + hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, (LPVOID*)&This->shell_link); + if (FAILED(hr)) + { + heap_free(This); + return hr; + } + + hr = IShellLinkW_QueryInterface(This->shell_link, &IID_IPersistFile, + (LPVOID*)&persist_file); + if (FAILED(hr)) + { + IShellLinkW_Release(This->shell_link); + heap_free(This); + return hr; + } + + hr = IPersistFile_Load(persist_file, item->path, STGM_READ); + IPersistFile_Release(persist_file); + if (FAILED(hr)) + { + IShellLinkW_Release(This->shell_link); + heap_free(This); + return hr; + } + *link = (IShellLinkDual2 *)&This->IShellLinkDual2_iface; return S_OK; } @@ -1092,7 +1135,7 @@ static HRESULT WINAPI FolderItemImpl_get_GetLink(FolderItem2 *iface, if (!(This->attributes & SFGAO_LINK)) return E_NOTIMPL; - hr = ShellLinkObject_Constructor(&link); + hr = ShellLinkObject_Constructor(This, &link); if (hr != S_OK) return hr; diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 9bd2cfd7155..8a9b8690b06 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1481,7 +1481,7 @@ static void test_ShellLinkObject(void) str = NULL; hr = IShellLinkDual2_get_Path(sld, &str); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { ok(!wcscmp(str, empty_path), "got %s (wanted %s)\n", wine_dbgstr_w(str), wine_dbgstr_w(empty_path));

1 0

Myah Caron : shell32: Add ShellLinkObject stubs.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 9985b86707cf4ee1030173b38554bafbea62dbe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9985b86707cf4ee1030173b3… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Mon Sep 14 20:52:16 2020 +0000 shell32: Add ShellLinkObject stubs. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1c26b3dc759e7784bf98a2484e4fb5959259e52b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32_main.h | 1 + dlls/shell32/shelldispatch.c | 297 ++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shelldispatch.c | 149 +++++++++++++++++++ 3 files changed, 444 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9985b86707cf4ee10301…

1 0

Vijay Kiran Kamuju : include: Add IMarkupServices2, IMarkupContainer2 and IMarkupPointer2 related interfaces.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 18d22fe7fb9449b8277a11300ceab2d7bd00d5e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18d22fe7fb9449b8277a1130… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Jun 7 21:49:28 2020 +0200 include: Add IMarkupServices2, IMarkupContainer2 and IMarkupPointer2 related interfaces. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cbf16e4c4c119eedcdf00bbd4706c563ef8a488e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/mshtml.idl | 282 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 266 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=18d22fe7fb9449b8277a…

1 0

Jacek Caban : mshtml: Add IMarkupServices::CreateMarkupPointer implementation.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 7bfaf46e7b0a0d5624978c56cf9689cbc026f87d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bfaf46e7b0a0d5624978c56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 16:57:21 2020 +0200 mshtml: Add IMarkupServices::CreateMarkupPointer implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5679312635c075c7fc9a8ec7c2fc3c01a509bb30) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/htmldoc.c | 6 +- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/range.c | 294 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 22 ++++ 4 files changed, 321 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7bfaf46e7b0a0d562497…

1 0

Michael Müller : fsutil: Add support for creating hardlinks.
by Alexandre Julliard March 23, 2021

March 23, 2021

1 0

Arkadiusz Hiler : msvcirt: Implement most of ifstream.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 2fcb70a75f70bb68a13dc843fe487052b7dafc26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fcb70a75f70bb68a13dc843… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed Sep 2 19:56:33 2020 +0300 msvcirt: Implement most of ifstream. Based on semi-stubs by Gijs Vermeulen. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22616 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30014 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a0faee89e01fe4daf7a25ebc4240cda4fe34da59) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 185 +++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 68 ++++++------ dlls/msvcirt/tests/msvcirt.c | 251 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 68 ++++++------ dlls/msvcrt40/msvcrt40.spec | 68 ++++++------ 5 files changed, 538 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2fcb70a75f70bb68a13d…

1 0

Nikolay Sivov : widl: Add null source pointer check for typelib writer.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: d9fe1d2d57c40705a1eda5fb2d37ebb35687afa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9fe1d2d57c40705a1eda5fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 23 20:46:22 2020 +0300 widl: Add null source pointer check for typelib writer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38964 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fe5bfa5b7196786633c1e702d9e6d55f0bad3ccb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/widl/write_msft.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 3a11d2ddd74..e4a88906836 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2553,7 +2553,8 @@ static void set_lib_flags(msft_typelib_t *typelib) static void ctl2_write_segment(msft_typelib_t *typelib, int segment) { - put_data(typelib->typelib_segment_data[segment], typelib->typelib_segdir[segment].length); + if (typelib->typelib_segment_data[segment]) + put_data(typelib->typelib_segment_data[segment], typelib->typelib_segdir[segment].length); } static void ctl2_finalize_typeinfos(msft_typelib_t *typelib, int filesize)

1 0