wine-commits March 2021

2 participants
1163 discussions

Paul Gofman : server: Do not cancel process sigkill in kill_process().

by Alexandre Julliard

Module: wine Branch: master Commit: df066eabdc896eb3ea249ee639d703875214250f URL: https://source.winehq.org/git/wine.git/?a=commit;h=df066eabdc896eb3ea249ee6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 30 20:32:13 2021 +0300 server: Do not cancel process sigkill in kill_process(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/server/process.c b/server/process.c index 7bc096a7b1f..9ca1eb64469 100644 --- a/server/process.c +++ b/server/process.c @@ -945,13 +945,7 @@ void kill_process( struct process *process, int violent_death ) process->msg_fd = NULL; } - if (process->sigkill_timeout) /* already waiting for it to die */ - { - remove_timeout_user( process->sigkill_timeout ); - process->sigkill_timeout = NULL; - process_died( process ); - return; - } + if (process->sigkill_timeout) return; /* already waiting for it to die */ if (violent_death) terminate_process( process, NULL, 1 ); else

3 years, 1 month

Esme Povirk : mscoree: Update Wine Mono to 6.1.1.

by Alexandre Julliard

Module: wine Branch: master Commit: 2c94b7a609fe40a79ea30096bdb2dcac4198069e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c94b7a609fe40a79ea30096… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Mar 31 11:03:07 2021 -0500 mscoree: Update Wine Mono to 6.1.1. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index b2e726422da..e3004c972f1 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "6.0.0" +#define MONO_VERSION "6.1.1" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "5c7af5976d101be359a77045c9cc8fc40feac028263d00e731578864e8b183d0" +#define MONO_SHA "ac3b14beafde34b8482287e597000113dc06a915f32c9fd06c77eb819079e38b" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 69c30e5e3e0..e396d855e71 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "6.0.0" +#define WINE_MONO_VERSION "6.1.1" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

3 years, 1 month

Hans Leidekker : dnsapi/tests: Don't fail on query timeouts.

by Alexandre Julliard

Module: wine Branch: master Commit: c511511e62d915986aa7c5a7ad9ab38248efb42c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c511511e62d915986aa7c5a7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 31 14:06:20 2021 +0200 dnsapi/tests: Don't fail on query timeouts. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/tests/query.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index 74669005a33..d68e9383204 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -40,7 +40,12 @@ static void test_DnsQuery(void) rec = NULL; status = DnsQuery_W(L"winehq.org", DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); - ok(status == ERROR_SUCCESS, "DnsQuery_W(%s) => %d\n", wine_dbgstr_w(name), status); + if (status == ERROR_TIMEOUT) + { + skip("query timed out\n"); + return; + } + ok(status == ERROR_SUCCESS, "got %d\n", status); DnsRecordListFree(rec, DnsFreeRecordList); status = DnsQuery_W(L"", DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL);

3 years, 1 month

Huw Davies : riched20/tests: Silence the beeps.

by Alexandre Julliard

Module: wine Branch: master Commit: a412a4b9613fccbbdd8c6500ed961e49b9daed5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a412a4b9613fccbbdd8c6500… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 31 12:23:06 2021 +0100 riched20/tests: Silence the beeps. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 8ef88bd1b21..3a6a072f1f8 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -33,6 +33,8 @@ #include <ole2.h> #include <richedit.h> #include <richole.h> +#include <imm.h> +#include <textserv.h> #include <commdlg.h> #include <time.h> #include <wine/test.h> @@ -51,12 +53,38 @@ static CHAR string1[MAX_PATH], string2[MAX_PATH], string3[MAX_PATH]; static HMODULE hmoduleRichEdit; static BOOL is_lang_japanese; +#if defined(__i386__) && !defined(__MINGW32__) && (!defined(_MSC_VER) || !defined(__clang__)) +static void disable_beep( HWND hwnd ) +{ + /* don't attempt to disable beep if we don't have thiscall compiler support */ +} +#else +#define ITextServices_OnTxPropertyBitsChange(This,a,b) (This)->lpVtbl->OnTxPropertyBitsChange(This,a,b) +static void disable_beep( HWND hwnd ) +{ + IRichEditOle *richole; + ITextServices *services; + IID *pIID_ITextServices = (IID *)GetProcAddress( hmoduleRichEdit, "IID_ITextServices" ); + + if (SendMessageW( hwnd, EM_GETOLEINTERFACE, 0, (LPARAM)&richole )) + { + if (SUCCEEDED( IRichEditOle_QueryInterface( richole, pIID_ITextServices, (void **)&services ) )) + { + ITextServices_OnTxPropertyBitsChange( services, TXTBIT_ALLOWBEEP, 0 ); + ITextServices_Release( services ); + } + IRichEditOle_Release( richole ); + } +} +#endif + static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) { HWND hwnd; hwnd = CreateWindowA(lpClassName, NULL, dwStyle|WS_POPUP|WS_HSCROLL|WS_VSCROLL |WS_VISIBLE, 0, 0, 200, 60, parent, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "class: %s, error: %d\n", lpClassName, (int) GetLastError()); + disable_beep( hwnd ); return hwnd; } @@ -66,6 +94,7 @@ static HWND new_windowW(LPCWSTR lpClassName, DWORD dwStyle, HWND parent) { |WS_VISIBLE, 0, 0, 200, 60, parent, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "class: %s, error: %d\n", wine_dbgstr_w(lpClassName), (int) GetLastError()); + disable_beep( hwnd ); return hwnd; } @@ -1862,6 +1891,7 @@ static void test_EM_SETOPTIONS(void) hmoduleRichEdit, NULL); ok(hwndRichEdit != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS20A, (int) GetLastError()); + disable_beep( hwndRichEdit ); options = SendMessageA(hwndRichEdit, EM_GETOPTIONS, 0, 0); /* WS_[VH]SCROLL cause the ECO_AUTO[VH]SCROLL options to be set */ ok(options == (ECO_AUTOVSCROLL|ECO_AUTOHSCROLL), @@ -6337,6 +6367,7 @@ static void test_WM_CHAR(void) hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP, 0, 0, 200, 60, 0, 0, 0, 0); ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError()); + disable_beep( hwnd ); p = char_list; while (*p != '\0') { @@ -6940,6 +6971,7 @@ static void test_undo_coalescing(void) hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP|ES_MULTILINE, 0, 0, 200, 60, 0, 0, 0, 0); ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError()); + disable_beep( hwnd ); result = SendMessageA(hwnd, EM_CANUNDO, 0, 0); ok (result == FALSE, "Can undo after window creation.\n");

3 years, 1 month

Huw Davies : riched20/tests: Add some object identity tests.

by Alexandre Julliard

Module: wine Branch: master Commit: f81805507e182519a6347128c1f4c92077890e9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f81805507e182519a6347128… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 31 12:23:05 2021 +0100 riched20/tests: Add some object identity tests. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/richole.c | 9 +++++++++ dlls/riched20/tests/txtsrv.c | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 3cea9902620..e6329c5b1b6 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -149,6 +149,7 @@ static void test_Interfaces(void) LRESULT res; HWND w; ULONG refcount; + IUnknown *unk, *unk2; w = new_richedit(NULL); if (!w) { @@ -180,6 +181,14 @@ static void test_Interfaces(void) hres = ITextDocument_GetSelection(txtDoc, &txtSel); ok(hres == S_OK, "got 0x%08x\n", hres); + hres = ITextDocument_QueryInterface(txtDoc, &IID_IUnknown, (void **)&unk); + ok(hres == S_OK, "got 0x%08x\n", hres); + hres = ITextSelection_QueryInterface(txtSel, &IID_IUnknown, (void **)&unk2); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(unk != unk2, "unknowns are the same\n"); + IUnknown_Release(unk2); + IUnknown_Release(unk); + EXPECT_REF(txtDoc, 4); EXPECT_REF(txtSel, 2); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 6834e38b7f5..fe27be26edb 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -917,6 +917,7 @@ static void test_QueryInterface(void) IRichEditOle *reole, *txtsrv_reole; ITextDocument *txtdoc, *txtsrv_txtdoc; ITextDocument2Old *txtdoc2old, *txtsrv_txtdoc2old; + IUnknown *unk, *unk2; ULONG refcount; if(!init_texthost(&txtserv, &host)) @@ -933,6 +934,14 @@ static void test_QueryInterface(void) refcount = get_refcount((IUnknown *)txtsrv_reole); ok(refcount == 2, "got wrong ref count: %d\n", refcount); + hres = ITextServices_QueryInterface( txtserv, &IID_IUnknown, (void **)&unk ); + ok( hres == S_OK, "got 0x%08x\n", hres ); + hres = IRichEditOle_QueryInterface( txtsrv_reole, &IID_IUnknown, (void **)&unk2 ); + ok( hres == S_OK, "got 0x%08x\n", hres ); + ok( unk == unk2, "unknowns differ\n" ); + IUnknown_Release( unk2 ); + IUnknown_Release( unk ); + hres = IRichEditOle_QueryInterface(txtsrv_reole, &IID_ITextDocument, (void **)&txtdoc); ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); refcount = get_refcount((IUnknown *)txtserv);

3 years, 1 month

Huw Davies : riched20: Merge the richole object with the text services object.

by Alexandre Julliard

Module: wine Branch: master Commit: 43d377c260538847395a6844edec09727fc8d47e URL: https://source.winehq.org/git/wine.git/?a=commit;h=43d377c260538847395a6844… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 31 12:23:04 2021 +0100 riched20: Merge the richole object with the text services object. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 31 +- dlls/riched20/editor.h | 4 +- dlls/riched20/editstr.h | 26 +- dlls/riched20/richole.c | 897 +++++++++++++++++++++--------------------------- dlls/riched20/txtsrv.c | 29 +- 5 files changed, 444 insertions(+), 543 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43d377c260538847395a…

3 years, 1 month

Huw Davies : riched20: Add support for TXTBIT_ALLOWBEEP.

by Alexandre Julliard

Module: wine Branch: master Commit: ac6ddbc954e8f7e8c2e5fe7b7d9507476dbaa321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac6ddbc954e8f7e8c2e5fe7b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 31 12:23:03 2021 +0100 riched20: Add support for TXTBIT_ALLOWBEEP. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index fe05d1e7444..deb0a93c8dc 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -279,6 +279,11 @@ ME_Paragraph *editor_end_para( ME_TextEditor *editor ) return &editor->pBuffer->pLast->member.para; } +static BOOL editor_beep( ME_TextEditor *editor, UINT type ) +{ + return editor->props & TXTBIT_ALLOWBEEP && MessageBeep( type ); +} + static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStream *stream, ME_Style *style) { WCHAR *pText; @@ -2281,7 +2286,7 @@ static BOOL paste_special(ME_TextEditor *editor, UINT cf, REPASTESPECIAL *ps, BO /* Protect read-only edit control from modification */ if (editor->props & TXTBIT_READONLY) { - if (!check_only) MessageBeep(MB_ICONERROR); + if (!check_only) editor_beep( editor, MB_ICONERROR ); return FALSE; } @@ -2379,7 +2384,7 @@ static BOOL copy_or_cut( ME_TextEditor *editor, BOOL cut ) count -= offs; hr = editor_copy_or_cut( editor, cut, sel_start, count, NULL ); - if (FAILED( hr )) MessageBeep( MB_ICONERROR ); + if (FAILED( hr )) editor_beep( editor, MB_ICONERROR ); return SUCCEEDED( hr ); } @@ -2422,7 +2427,7 @@ static BOOL handle_enter(ME_TextEditor *editor) if (editor->props & TXTBIT_READONLY) { - MessageBeep(MB_ICONERROR); + editor_beep( editor, MB_ICONERROR ); return TRUE; } @@ -2683,7 +2688,7 @@ static LRESULT handle_wm_char( ME_TextEditor *editor, WCHAR wstr, LPARAM flags ) if (editor->props & TXTBIT_READONLY) { - MessageBeep(MB_ICONERROR); + editor_beep( editor, MB_ICONERROR ); return 0; /* FIXME really 0 ? */ } @@ -2737,7 +2742,7 @@ static LRESULT handle_wm_char( ME_TextEditor *editor, WCHAR wstr, LPARAM flags ) if (para_in_table( para ) && cursor.run->nFlags & MERF_ENDPARA && from == to) { /* Text should not be inserted at the end of the table. */ - MessageBeep(-1); + editor_beep( editor, -1 ); return 0; } } @@ -2951,7 +2956,8 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->total_rows = 0; ITextHost_TxGetPropertyBits( ed->texthost, TXTBIT_RICHTEXT | TXTBIT_MULTILINE | TXTBIT_READONLY | TXTBIT_USEPASSWORD | TXTBIT_HIDESELECTION | TXTBIT_SAVESELECTION | - TXTBIT_AUTOWORDSEL | TXTBIT_VERTICAL | TXTBIT_WORDWRAP | TXTBIT_DISABLEDRAG, + TXTBIT_AUTOWORDSEL | TXTBIT_VERTICAL | TXTBIT_WORDWRAP | TXTBIT_ALLOWBEEP | + TXTBIT_DISABLEDRAG, &ed->props ); ITextHost_TxGetScrollBars( ed->texthost, &ed->scrollbars ); ed->pBuffer = ME_MakeText();

3 years, 1 month

Nikolay Sivov : shcore: Added another api-ms-* forwarding dll.

by Alexandre Julliard

Module: wine Branch: master Commit: 7f7fdd6c8657ebe4079c9f959bbfba508a2d1680 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f7fdd6c8657ebe4079c9f95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 31 13:09:32 2021 +0300 shcore: Added another api-ms-* forwarding dll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-shcore-stream-winrt-l1-1-0/Makefile.in | 1 + .../api-ms-win-shcore-stream-winrt-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index 5d430365ea4..a19bb0b9581 100755 --- a/configure +++ b/configure @@ -1143,6 +1143,7 @@ enable_api_ms_win_service_winsvc_l1_2_0 enable_api_ms_win_shcore_obsolete_l1_1_0 enable_api_ms_win_shcore_scaling_l1_1_1 enable_api_ms_win_shcore_stream_l1_1_0 +enable_api_ms_win_shcore_stream_winrt_l1_1_0 enable_api_ms_win_shcore_thread_l1_1_0 enable_api_ms_win_shell_shellcom_l1_1_0 enable_api_ms_win_shell_shellfolders_l1_1_0 @@ -20349,6 +20350,7 @@ wine_fn_config_makefile dlls/api-ms-win-service-winsvc-l1-2-0 enable_api_ms_win_ wine_fn_config_makefile dlls/api-ms-win-shcore-obsolete-l1-1-0 enable_api_ms_win_shcore_obsolete_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-shcore-scaling-l1-1-1 enable_api_ms_win_shcore_scaling_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-shcore-stream-l1-1-0 enable_api_ms_win_shcore_stream_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-shcore-stream-winrt-l1-1-0 enable_api_ms_win_shcore_stream_winrt_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-shcore-thread-l1-1-0 enable_api_ms_win_shcore_thread_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-shell-shellcom-l1-1-0 enable_api_ms_win_shell_shellcom_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-shell-shellfolders-l1-1-0 enable_api_ms_win_shell_shellfolders_l1_1_0 diff --git a/configure.ac b/configure.ac index afd46b353ea..eb08e8b0f17 100644 --- a/configure.ac +++ b/configure.ac @@ -3025,6 +3025,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-service-winsvc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-scaling-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-stream-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-stream-winrt-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-thread-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shell-shellcom-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shell-shellfolders-l1-1-0) diff --git a/dlls/api-ms-win-shcore-stream-winrt-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-stream-winrt-l1-1-0/Makefile.in new file mode 100644 index 00000000000..7af35b2eed6 --- /dev/null +++ b/dlls/api-ms-win-shcore-stream-winrt-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-shcore-stream-winrt-l1-1-0.dll diff --git a/dlls/api-ms-win-shcore-stream-winrt-l1-1-0/api-ms-win-shcore-stream-winrt-l1-1-0.spec b/dlls/api-ms-win-shcore-stream-winrt-l1-1-0/api-ms-win-shcore-stream-winrt-l1-1-0.spec new file mode 100644 index 00000000000..e30eb81184d --- /dev/null +++ b/dlls/api-ms-win-shcore-stream-winrt-l1-1-0/api-ms-win-shcore-stream-winrt-l1-1-0.spec @@ -0,0 +1 @@ +@ stub CreateRandomAccessStreamOverStream diff --git a/tools/make_specfiles b/tools/make_specfiles index 3689a856b9f..9ff4974641a 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -356,6 +356,7 @@ my @dll_groups = "api-ms-win-shcore-obsolete-l1-1-0", "api-ms-win-shcore-thread-l1-1-0", "api-ms-win-shcore-stream-l1-1-0", + "api-ms-win-shcore-stream-winrt-l1-1-0", ], [ "shell32",

3 years, 1 month

Nikolay Sivov : dwrite: Use wide-char literals.

by Alexandre Julliard

Module: wine Branch: master Commit: fcd8508993719c0c01af93822def84d6610976be URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcd8508993719c0c01af9382… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 31 13:06:29 2021 +0300 dwrite: Use wide-char literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 10 +- dlls/dwrite/font.c | 408 ++++++++++++++++++++++--------------------------- dlls/dwrite/main.c | 6 +- dlls/dwrite/opentype.c | 25 ++- 4 files changed, 196 insertions(+), 253 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fcd8508993719c0c01af…

3 years, 1 month

Alexandre Julliard : kernelbase: Make sure that last error is set on LOAD_LIBRARY_AS_DATAFILE failure.

by Alexandre Julliard

Module: wine Branch: master Commit: 9f4c47501d7d03102aea0343e8678311e1796bb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f4c47501d7d03102aea0343… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 31 22:15:39 2021 +0200 kernelbase: Make sure that last error is set on LOAD_LIBRARY_AS_DATAFILE failure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/loader.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index bdc153b1a47..ac463528e3c 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -95,7 +95,6 @@ static BOOL load_library_as_datafile( LPCWSTR load_path, DWORD flags, LPCWSTR na file = CreateFileW( filenameW, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0 ); } - if (file == INVALID_HANDLE_VALUE) ERR("can't load %s\n", debugstr_w(name)); if (file == INVALID_HANDLE_VALUE) return FALSE; mapping = CreateFileMappingW( file, NULL, protect, 0, 0, NULL ); @@ -108,7 +107,11 @@ static BOOL load_library_as_datafile( LPCWSTR load_path, DWORD flags, LPCWSTR na if (!(flags & LOAD_LIBRARY_AS_IMAGE_RESOURCE)) { /* make sure it's a valid PE file */ - if (!RtlImageNtHeader( module )) goto failed; + if (!RtlImageNtHeader( module )) + { + SetLastError( ERROR_BAD_EXE_FORMAT ); + goto failed; + } *mod_ret = (HMODULE)((char *)module + 1); /* set bit 0 for data file module */ if (flags & LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE)

3 years, 1 month

Jump to page:

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 March 2021