October 2021 - Wine-commits

Ted Lyngmo : ucrtbase: Add support for x mode in fopen.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 51b9f4cd2b7faa04d5bfd50dfe9a4382e0b76fc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51b9f4cd2b7faa04d5bfd50d… Author: Ted Lyngmo <ted(a)lyncon.se> Date: Mon Oct 11 16:15:39 2021 +0200 ucrtbase: Add support for x mode in fopen. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51846 Signed-off-by: Ted Lyngmo <ted(a)lyncon.se> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 7 +++++++ dlls/ucrtbase/tests/misc.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index da43316ebb8..274ddd5a29b 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1586,6 +1586,13 @@ static int msvcrt_get_flags(const wchar_t* mode, int *open_flags, int* stream_fl *open_flags |= _O_TEXT; *open_flags &= ~_O_BINARY; break; +#if _MSVCR_VER>=140 + case 'x': + if(!MSVCRT_CHECK_PMT((*open_flags & (_O_CREAT | _O_APPEND)) == _O_CREAT)) + return -1; + *open_flags |= _O_EXCL; + break; +#endif case 'D': *open_flags |= _O_TEMPORARY; break; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index c2b6dc18d28..a91ea6c98b8 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1539,6 +1539,54 @@ static void test_fenv(void) ok(!except, "expected 0, got %lx\n", except); } +static void test_fopen_exclusive( void ) +{ + char path[MAX_PATH*2]; + DWORD len; + FILE *fp; + + if (!GetProcAddress(GetModuleHandleA("ucrtbase.dll"), "__std_terminate")) + { + win_skip("skipping fopen x mode tests.\n"); + return; + } + + len = GetTempPathA(MAX_PATH, path); + ok(len, "GetTempPathA failed\n"); + strcat(path, "\\fileexcl.tst"); + + fp = fopen(path, "wx"); + ok(fp != NULL, "creating file with mode wx failed\n"); + fclose(fp); + + fp = fopen(path, "wx"); + ok(!fp, "overwrote existing file with mode wx\n"); + unlink(path); + + fp = fopen(path, "w+x"); + ok(fp != NULL, "creating file with mode w+x failed\n"); + fclose(fp); + + fp = fopen(path, "w+x"); + ok(!fp, "overwrote existing file with mode w+x\n"); + + SET_EXPECT(global_invalid_parameter_handler); + fp = fopen(path, "rx"); + CHECK_CALLED(global_invalid_parameter_handler); + ok(!fp, "opening file with mode rx succeeded\n"); + unlink(path); + + SET_EXPECT(global_invalid_parameter_handler); + fp = fopen(path, "xw"); + CHECK_CALLED(global_invalid_parameter_handler); + ok(!fp, "creating file with mode xw succeeded\n"); + + fp = fopen(path, "wbx"); + ok(fp != NULL, "creating file with mode wx failed\n"); + fclose(fp); + unlink(path); +} + START_TEST(misc) { int arg_c; @@ -1580,4 +1628,5 @@ START_TEST(misc) test_clock(); test_thread_storage(); test_fenv(); + test_fopen_exclusive(); }

1 0

Hans Leidekker : wpcap: Accept interfaces without associated IPv4 or IPv6 address.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 487ec2d4568a1b1e81781d648a5686a91617dafb URL: https://source.winehq.org/git/wine.git/?a=commit;h=487ec2d4568a1b1e81781d64… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 11 16:54:39 2021 +0200 wpcap: Accept interfaces without associated IPv4 or IPv6 address. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 3a0b2381697..67d55b8f3f0 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -323,7 +323,7 @@ static struct pcap_interface *build_win32_device( const struct pcap_interface *u if (!(ret = calloc( 1, sizeof(*ret) ))) return NULL; if (!(ret->name = build_win32_name( source, adapter_name ))) goto err; if (!(ret->description = build_win32_description( unix_dev ))) goto err; - if (!(ret->addresses = build_win32_addresses( unix_dev->addresses ))) goto err; + ret->addresses = build_win32_addresses( unix_dev->addresses ); ret->flags = unix_dev->flags; return ret;

1 0

Jacek Caban : win32u: Use syscall interface for bitmap functions.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: c7171dea29635746524daa3e80ac24acf68d097b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7171dea29635746524daa3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 11 18:48:15 2021 +0200 win32u: Use syscall interface for bitmap functions. 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/win32u/gdiobj.c | 6 ---- dlls/win32u/syscall.c | 6 ++++ dlls/win32u/win32u.spec | 12 +++---- dlls/win32u/win32u_private.h | 9 ------ dlls/win32u/wrappers.c | 33 ------------------- dlls/wow64win/gdi.c | 68 ++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 8 ++++- dlls/wow64win/wow64win_private.h | 12 +++++++ 8 files changed, 99 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7171dea29635746524d…

1 0

Jacek Caban : win32u: Use syscall interface for region functions.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 59e6d3b693ecae32d0abaaf790204976a96e5a14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59e6d3b693ecae32d0abaaf7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 11 18:48:44 2021 +0200 win32u: Use syscall interface for region functions. 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/win32u/gdiobj.c | 13 ----- dlls/win32u/syscall.c | 13 +++++ dlls/win32u/win32u.spec | 26 +++++----- dlls/win32u/win32u_private.h | 14 ----- dlls/win32u/wrappers.c | 66 ----------------------- dlls/wow64win/gdi.c | 121 +++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 15 +++++- 7 files changed, 161 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=59e6d3b693ecae32d0ab…

1 0

Jacek Caban : win32u: Use syscall interface for some DC functions.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 277d37bcfbaf81510f4664ff7b3e0c10b38a1b2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=277d37bcfbaf81510f4664ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 11 18:49:07 2021 +0200 win32u: Use syscall interface for some DC functions. 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/win32u/gdiobj.c | 7 ------ dlls/win32u/syscall.c | 7 ++++++ dlls/win32u/win32u.spec | 14 +++++------ dlls/win32u/win32u_private.h | 8 ------ dlls/win32u/wrappers.c | 35 -------------------------- dlls/wow64win/gdi.c | 60 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 9 ++++++- 7 files changed, 82 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=277d37bcfbaf81510f46…

1 0

Jacek Caban : win32u: Use syscall interface for some font functions.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 0dfedf79b6eaeef7abd9d831a542ccd0950d86c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dfedf79b6eaeef7abd9d831… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 11 18:49:36 2021 +0200 win32u: Use syscall interface for some font functions. 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/win32u/gdiobj.c | 8 ---- dlls/win32u/syscall.c | 8 ++++ dlls/win32u/win32u.spec | 16 ++++---- dlls/win32u/win32u_private.h | 14 ------- dlls/win32u/wrappers.c | 46 --------------------- dlls/wow64win/gdi.c | 89 ++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 8 ++++ dlls/wow64win/wow64win_private.h | 12 ++++++ 8 files changed, 125 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0dfedf79b6eaeef7abd9…

1 0

Jacek Caban : win32u: Use syscall interface for some GDI objects functions.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 6fbbbe1f14a250d0d965849b7545331a54d2f82e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fbbbe1f14a250d0d965849b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 11 18:50:09 2021 +0200 win32u: Use syscall interface for some GDI objects functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/gdiobj.c | 6 ------ dlls/win32u/syscall.c | 6 ++++++ dlls/win32u/win32u.spec | 12 +++++------ dlls/win32u/win32u_private.h | 6 ------ dlls/win32u/wrappers.c | 30 ---------------------------- dlls/wow64win/gdi.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 6 ++++++ 7 files changed, 65 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6fbbbe1f14a250d0d965…

1 0

Jacek Caban : win32u: Use syscall interface for some mapping functions.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 21009822a38ad4b670cdfdb2c0719126af30bda6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21009822a38ad4b670cdfdb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 11 18:50:37 2021 +0200 win32u: Use syscall interface for some mapping functions. 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/win32u/gdiobj.c | 2 -- dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 4 ++-- dlls/win32u/win32u_private.h | 4 ---- dlls/win32u/wrappers.c | 12 ------------ dlls/wow64win/gdi.c | 22 ++++++++++++++++++++++ dlls/wow64win/syscall.h | 4 +++- 7 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 046ccffdc17..0c355f4d94c 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1176,7 +1176,6 @@ static struct unix_funcs unix_funcs = NtGdiSetMagicColors, NtGdiSetPixel, NtGdiSetSystemPaletteUse, - NtGdiSetVirtualResolution, NtGdiStartDoc, NtGdiStartPage, NtGdiStretchBlt, @@ -1184,7 +1183,6 @@ static struct unix_funcs unix_funcs = NtGdiStrokeAndFillPath, NtGdiStrokePath, NtGdiTransparentBlt, - NtGdiTransformPoints, NtGdiUnrealizeObject, NtGdiUpdateColors, NtGdiWidenPath, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 5f664da96c7..984e7b13e7a 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -78,7 +78,9 @@ static void * const syscalls[] = NtGdiSetPixelFormat, NtGdiSetRectRgn, NtGdiSetTextJustification, + NtGdiSetVirtualResolution, NtGdiSwapBuffers, + NtGdiTransformPoints, }; static BYTE arguments[ARRAY_SIZE(syscalls)]; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 02030d15418..8874894d4e7 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -617,7 +617,7 @@ @ stdcall NtGdiSetSystemPaletteUse(long long) @ stdcall -syscall NtGdiSetTextJustification(long long long) @ stub NtGdiSetUMPDSandboxState -@ stdcall NtGdiSetVirtualResolution(long long long long long) +@ stdcall -syscall NtGdiSetVirtualResolution(long long long long long) @ stdcall NtGdiStartDoc(long ptr ptr long) @ stdcall NtGdiStartPage(long) @ stdcall NtGdiStretchBlt(long long long long long long long long long long long long) @@ -625,7 +625,7 @@ @ stdcall NtGdiStrokeAndFillPath(long) @ stdcall NtGdiStrokePath(long) @ stdcall -syscall NtGdiSwapBuffers(long) -@ stdcall NtGdiTransformPoints(long ptr ptr long long) +@ stdcall -syscall NtGdiTransformPoints(long ptr ptr long long) @ stdcall NtGdiTransparentBlt(long long long long long long long long long long long) @ stub NtGdiUMPDEngFreeUserMem @ stub NtGdiUnloadPrinterDriver diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index c4e32ced460..ff956dbf167 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -193,8 +193,6 @@ struct unix_funcs BOOL (WINAPI *pNtGdiSetMagicColors)( HDC hdc, DWORD magic, ULONG index ); COLORREF (WINAPI *pNtGdiSetPixel)( HDC hdc, INT x, INT y, COLORREF color ); UINT (WINAPI *pNtGdiSetSystemPaletteUse)( HDC hdc, UINT use ); - BOOL (WINAPI *pNtGdiSetVirtualResolution)( HDC hdc, DWORD horz_res, DWORD vert_res, - DWORD horz_size, DWORD vert_size ); INT (WINAPI *pNtGdiStartDoc)( HDC hdc, const DOCINFOW *doc, BOOL *banding, INT job ); INT (WINAPI *pNtGdiStartPage)( HDC hdc ); BOOL (WINAPI *pNtGdiStretchBlt)( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT height_dst, @@ -210,8 +208,6 @@ struct unix_funcs BOOL (WINAPI *pNtGdiTransparentBlt)( HDC hdc, int x_dst, int y_dst, int width_dst, int height_dst, HDC hdc_src, int x_src, int y_src, int width_src, int height_src, UINT color ); - BOOL (WINAPI *pNtGdiTransformPoints)( HDC hdc, const POINT *points_in, POINT *points_out, - INT count, UINT mode ); BOOL (WINAPI *pNtGdiUnrealizeObject)( HGDIOBJ obj ); BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 3854ba9b6f8..dea3e072a3d 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -571,12 +571,6 @@ UINT WINAPI NtGdiSetSystemPaletteUse( HDC hdc, UINT use ) return unix_funcs->pNtGdiSetSystemPaletteUse( hdc, use ); } -BOOL WINAPI NtGdiSetVirtualResolution( HDC hdc, DWORD horz_res, DWORD vert_res, - DWORD horz_size, DWORD vert_size ) -{ - return unix_funcs->pNtGdiSetVirtualResolution( hdc, horz_res, vert_res, horz_size, vert_size ); -} - INT WINAPI NtGdiStartDoc( HDC hdc, const DOCINFOW *doc, BOOL *banding, INT job ) { return unix_funcs->pNtGdiStartDoc( hdc, doc, banding, job ); @@ -624,12 +618,6 @@ BOOL WINAPI NtGdiTransparentBlt( HDC hdc, int x_dst, int y_dst, int width_dst, i x_src, y_src, width_src, height_src, color ); } -BOOL WINAPI NtGdiTransformPoints( HDC hdc, const POINT *points_in, POINT *points_out, - INT count, UINT mode ) -{ - return unix_funcs->pNtGdiTransformPoints( hdc, points_in, points_out, count, mode ); -} - BOOL WINAPI NtGdiUnrealizeObject( HGDIOBJ obj ) { return unix_funcs->pNtGdiUnrealizeObject( obj ); diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index b113179f432..42a13cc3676 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -450,6 +450,28 @@ NTSTATUS WINAPI wow64_NtGdiSetColorAdjustment( UINT *args ) return NtGdiSetColorAdjustment( hdc, ca ); } +NTSTATUS WINAPI wow64_NtGdiSetVirtualResolution( UINT *args ) +{ + HDC hdc = get_handle( &args ); + DWORD horz_res = get_ulong( &args ); + DWORD vert_res = get_ulong( &args ); + DWORD horz_size = get_ulong( &args ); + DWORD vert_size = get_ulong( &args ); + + return NtGdiSetVirtualResolution( hdc, horz_res, vert_res, horz_size, vert_size ); +} + +NTSTATUS WINAPI wow64_NtGdiTransformPoints( UINT *args ) +{ + HDC hdc = get_handle( &args ); + const POINT *points_in = get_ptr( &args ); + POINT *points_out = get_ptr( &args ); + INT count = get_ulong( &args ); + UINT mode = get_ulong( &args ); + + return NtGdiTransformPoints( hdc, points_in, points_out, count, mode ); +} + NTSTATUS WINAPI wow64_NtGdiFlush( UINT *args ) { return NtGdiFlush(); diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index fd8b9f95365..c5f04b240bd 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -66,6 +66,8 @@ SYSCALL_ENTRY( NtGdiSetPixelFormat ) \ SYSCALL_ENTRY( NtGdiSetRectRgn ) \ SYSCALL_ENTRY( NtGdiSetTextJustification ) \ - SYSCALL_ENTRY( NtGdiSwapBuffers ) + SYSCALL_ENTRY( NtGdiSetVirtualResolution ) \ + SYSCALL_ENTRY( NtGdiSwapBuffers ) \ + SYSCALL_ENTRY( NtGdiTransformPoints ) #endif /* __WOW64WIN_SYSCALL_H */

1 0

Jacek Caban : win32u: Use syscall interface for some palette functions.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: fe96d12a89b8d43ab1d8dd3bd5432695ecc2869d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe96d12a89b8d43ab1d8dd3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 11 18:51:06 2021 +0200 win32u: Use syscall interface for some palette functions. 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/win32u/gdiobj.c | 5 ----- dlls/win32u/syscall.c | 5 +++++ dlls/win32u/win32u.spec | 10 +++++----- dlls/win32u/win32u_private.h | 5 ----- dlls/win32u/wrappers.c | 25 ------------------------- dlls/wow64win/gdi.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 5 +++++ 7 files changed, 54 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fe96d12a89b8d43ab1d8…

1 0

Alex Henrie : winemenubuilder: Return pointer from freedesktop_mime_type_for_extension.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 38eb26f047178b619c99ffcf546d3f196e519fe9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38eb26f047178b619c99ffcf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 3 23:51:22 2021 -0600 winemenubuilder: Return pointer from freedesktop_mime_type_for_extension. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index e02d7bd787f..51d83aed971 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1874,29 +1874,26 @@ static BOOL build_native_mime_types(struct list *mime_types) return ret; } -static BOOL freedesktop_mime_type_for_extension(struct list *native_mime_types, - LPCWSTR extensionW, - WCHAR **match) +static WCHAR *freedesktop_mime_type_for_extension(struct list *native_mime_types, + const WCHAR *extensionW) { struct xdg_mime_type *mime_type_entry; int matchLength = 0; - - *match = NULL; + const WCHAR* match = NULL; LIST_FOR_EACH_ENTRY(mime_type_entry, native_mime_types, struct xdg_mime_type, entry) { if (PathMatchSpecW( extensionW, mime_type_entry->glob )) { - if (*match == NULL || matchLength < lstrlenW(mime_type_entry->glob)) + if (match == NULL || matchLength < lstrlenW(mime_type_entry->glob)) { - *match = mime_type_entry->mimeType; + match = mime_type_entry->mimeType; matchLength = lstrlenW(mime_type_entry->glob); } } } - if (*match != NULL) *match = xwcsdup(*match); - return TRUE; + return match ? xwcsdup(match) : NULL; } static WCHAR* reg_get_valW(HKEY key, LPCWSTR subkey, LPCWSTR name) @@ -2190,8 +2187,7 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic if (contentTypeW) wcslwr(contentTypeW); - if (!freedesktop_mime_type_for_extension(&nativeMimeTypes, extensionW, &mimeType)) - goto end; + mimeType = freedesktop_mime_type_for_extension(&nativeMimeTypes, extensionW); if (mimeType == NULL) {

1 0