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

Huw Davies : riched20: Handle EM_FINDTEXT's unicode conversion in the host.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: c80be66cc45cd1c8afc4164560d8679615891815 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c80be66cc45cd1c8afc41645… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 12 09:01:37 2021 +0000 riched20: Handle EM_FINDTEXT's unicode conversion in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 19 +------------------ dlls/riched20/txthost.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f96f52ef56d..93daa472048 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4167,24 +4167,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { return editor->nTextLimit; } - case EM_FINDTEXT: - { - LRESULT r; - if(!unicode){ - FINDTEXTA *ft = (FINDTEXTA *)lParam; - int nChars = MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, NULL, 0); - WCHAR *tmp; - - if ((tmp = heap_alloc(nChars * sizeof(*tmp))) != NULL) - MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, tmp, nChars); - r = ME_FindText(editor, wParam, &ft->chrg, tmp, NULL); - heap_free(tmp); - }else{ - FINDTEXTW *ft = (FINDTEXTW *)lParam; - r = ME_FindText(editor, wParam, &ft->chrg, ft->lpstrText, NULL); - } - return r; - } case EM_FINDTEXTEX: { LRESULT r; @@ -4203,6 +4185,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } return r; } + case EM_FINDTEXT: case EM_FINDTEXTW: { FINDTEXTW *ft = (FINDTEXTW *)lParam; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 3c968ddfecc..00801b5b9af 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -834,6 +834,22 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, FillRect( hdc, &rc, editor->hbrBackground ); return 1; } + case EM_FINDTEXT: + { + FINDTEXTW *params = (FINDTEXTW *)lparam; + FINDTEXTW new_params; + int len; + + if (!unicode) + { + new_params.chrg = params->chrg; + new_params.lpstrText = ME_ToUnicode( CP_ACP, (char *)params->lpstrText, &len ); + params = &new_params; + } + hr = ITextServices_TxSendMessage( host->text_srv, EM_FINDTEXTW, wparam, (LPARAM)params, &res ); + if (!unicode) ME_EndToUnicode( CP_ACP, (WCHAR *)new_params.lpstrText ); + break; + } case WM_GETTEXT: { GETTEXTEX params;

1 0

Rémi Bernon : kernelbase: Do not forcefully reset console_flags to 0.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: ae5cd00fccecde5b3060dc99b62951e0f77a792d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae5cd00fccecde5b3060dc99… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 12 11:02:51 2021 +0100 kernelbase: Do not forcefully reset console_flags to 0. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 8d440c89296..6a3bfdeba65 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1844,7 +1844,6 @@ void init_console( void ) if (params->ConsoleHandle && create_console_connection( params->ConsoleHandle )) { init_console_std_handles( FALSE ); - console_flags = 0; } } else if (params->ConsoleHandle == CONSOLE_HANDLE_ALLOC)

1 0

Zebediah Figura : strmbase: Rename pfnBreakConnect to renderer_disconnect.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 4bede3b27be2073560d185e2a047949f18df6d7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bede3b27be2073560d185e2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 11 17:21:58 2021 -0600 strmbase: Rename pfnBreakConnect to renderer_disconnect. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 4 ++-- dlls/strmbase/renderer.c | 4 ++-- include/wine/strmbase.h | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index b5344207398..6ac01c3b8ae 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -512,7 +512,7 @@ static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE return hr; } -static HRESULT WINAPI VMR9_BreakConnect(struct strmbase_renderer *This) +static HRESULT vmr_disconnect(struct strmbase_renderer *This) { struct quartz_vmr *filter = impl_from_IBaseFilter(&This->filter.IBaseFilter_iface); HRESULT hr = S_OK; @@ -638,7 +638,7 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_start_stream = vmr_start_stream, .renderer_stop_stream = vmr_stop_stream, .renderer_connect = vmr_connect, - .pfnBreakConnect = VMR9_BreakConnect, + .renderer_disconnect = vmr_disconnect, .renderer_destroy = vmr_destroy, .renderer_query_interface = vmr_query_interface, .renderer_pin_query_interface = vmr_pin_query_interface, diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index e6adf41add9..47be6e0fd30 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -427,8 +427,8 @@ static void sink_disconnect(struct strmbase_sink *iface) { struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); - if (filter->pFuncsTable->pfnBreakConnect) - filter->pFuncsTable->pfnBreakConnect(filter); + if (filter->pFuncsTable->renderer_disconnect) + filter->pFuncsTable->renderer_disconnect(filter); } static HRESULT sink_eos(struct strmbase_sink *iface) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 347482b1eb9..dcb9b1bf3d9 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -305,8 +305,6 @@ struct strmbase_renderer BOOL eos; }; -typedef HRESULT (WINAPI *BaseRenderer_BreakConnect) (struct strmbase_renderer *iface); - struct strmbase_renderer_ops { HRESULT (*renderer_query_accept)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); @@ -315,7 +313,7 @@ struct strmbase_renderer_ops void (*renderer_start_stream)(struct strmbase_renderer *iface); void (*renderer_stop_stream)(struct strmbase_renderer *iface); HRESULT (*renderer_connect)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); - BaseRenderer_BreakConnect pfnBreakConnect; + HRESULT (*renderer_disconnect)(struct strmbase_renderer *iface); void (*renderer_destroy)(struct strmbase_renderer *iface); HRESULT (*renderer_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out); HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out);

1 0

Zebediah Figura : quartz/vmr9: Assume that the filter is connected and stopped in VMR9_BreakConnect().
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 40d77283eba0b88b3258bcdba5ad3b95d0461615 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40d77283eba0b88b3258bcdb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 11 17:21:57 2021 -0600 quartz/vmr9: Assume that the filter is connected and stopped in VMR9_BreakConnect(). strmbase provides those guarantees. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index f95c2bfbce2..b5344207398 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -514,26 +514,21 @@ static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE static HRESULT WINAPI VMR9_BreakConnect(struct strmbase_renderer *This) { - struct quartz_vmr *pVMR9 = impl_from_IBaseFilter(&This->filter.IBaseFilter_iface); + struct quartz_vmr *filter = impl_from_IBaseFilter(&This->filter.IBaseFilter_iface); HRESULT hr = S_OK; DWORD i; - if (!pVMR9->mode) + if (!filter->mode) return S_FALSE; - if (This->sink.pin.peer && pVMR9->allocator && pVMR9->presenter) + + if (filter->allocator && filter->presenter) { - if (pVMR9->renderer.filter.state != State_Stopped) - { - ERR("Disconnecting while not stopped! UNTESTED!!\n"); - } - if (pVMR9->renderer.filter.state == State_Running) - hr = IVMRImagePresenter9_StopPresenting(pVMR9->presenter, pVMR9->cookie); - - for (i = 0; i < pVMR9->num_surfaces; ++i) - IDirect3DSurface9_Release(pVMR9->surfaces[i]); - free(pVMR9->surfaces); - IVMRSurfaceAllocator9_TerminateDevice(pVMR9->allocator, pVMR9->cookie); - pVMR9->num_surfaces = 0; + for (i = 0; i < filter->num_surfaces; ++i) + IDirect3DSurface9_Release(filter->surfaces[i]); + free(filter->surfaces); + + IVMRSurfaceAllocator9_TerminateDevice(filter->allocator, filter->cookie); + filter->num_surfaces = 0; } return hr; }

1 0

Hugh McMaster : reg: Stop parsing REG_SZ values containing NUL character sequences.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 272d35afc6905dfdf1ffcf0ef2963e3bded1303d URL: https://source.winehq.org/git/wine.git/?a=commit;h=272d35afc6905dfdf1ffcf0e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Mar 12 22:32:24 2021 +1100 reg: Stop parsing REG_SZ values containing NUL character sequences. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 3 +-- programs/reg/tests/import.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index f7f87939e23..7ad7b35d5dc 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -324,8 +324,7 @@ static BOOL unescape_string(WCHAR *str, WCHAR **unparsed) str[val_idx] = '\r'; break; case '0': - str[val_idx] = '\0'; - break; + return FALSE; case '\\': case '"': str[val_idx] = str[str_idx]; diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index f8e7e4b7acb..06f9cb05f6c 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -1600,12 +1600,12 @@ static void test_import(void) "\"Wine70e\"=\"Value3\\0Value4\"\n" "\"Wine70f\"=\"\\0Value5\"\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine70a"); - todo_wine verify_reg_nonexist(hkey, "Wine70b"); - todo_wine verify_reg_nonexist(hkey, "Wine70c"); - todo_wine verify_reg_nonexist(hkey, "Wine70d"); - todo_wine verify_reg_nonexist(hkey, "Wine70e"); - todo_wine verify_reg_nonexist(hkey, "Wine70f"); + verify_reg_nonexist(hkey, "Wine70a"); + verify_reg_nonexist(hkey, "Wine70b"); + verify_reg_nonexist(hkey, "Wine70c"); + verify_reg_nonexist(hkey, "Wine70d"); + verify_reg_nonexist(hkey, "Wine70e"); + verify_reg_nonexist(hkey, "Wine70f"); /* Test forward and back slashes */ test_import_str("REGEDIT4\n\n" @@ -3149,12 +3149,12 @@ static void test_unicode_import(void) "\"Wine70e\"=\"Value3\\0Value4\"\n" "\"Wine70f\"=\"\\0Value5\"\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine70a"); - todo_wine verify_reg_nonexist(hkey, "Wine70b"); - todo_wine verify_reg_nonexist(hkey, "Wine70c"); - todo_wine verify_reg_nonexist(hkey, "Wine70d"); - todo_wine verify_reg_nonexist(hkey, "Wine70e"); - todo_wine verify_reg_nonexist(hkey, "Wine70f"); + verify_reg_nonexist(hkey, "Wine70a"); + verify_reg_nonexist(hkey, "Wine70b"); + verify_reg_nonexist(hkey, "Wine70c"); + verify_reg_nonexist(hkey, "Wine70d"); + verify_reg_nonexist(hkey, "Wine70e"); + verify_reg_nonexist(hkey, "Wine70f"); /* Test forward and back slashes */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"

1 0

Rémi Bernon : msvcrt: Lazily initialize console handles.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: d5ab1401c0988b8c8c14ae7c64da0a55f4e4bbeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5ab1401c0988b8c8c14ae7c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 12 14:02:39 2021 +0100 msvcrt: Lazily initialize console handles. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/console.c | 78 +++++++++++++++++++++++++++++---------------------- dlls/msvcrt/main.c | 1 - dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 44 insertions(+), 36 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 26f7b554636..cd9119cf20f 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -33,25 +33,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define LOCK_CONSOLE _lock(_CONIO_LOCK) #define UNLOCK_CONSOLE _unlock(_CONIO_LOCK) -static HANDLE MSVCRT_console_in = INVALID_HANDLE_VALUE; -static HANDLE MSVCRT_console_out= INVALID_HANDLE_VALUE; +static HANDLE MSVCRT_console_in; +static HANDLE MSVCRT_console_out; static int __MSVCRT_console_buffer = EOF; static wchar_t __MSVCRT_console_buffer_w = WEOF; -/* INTERNAL: Initialise console handles */ -void msvcrt_init_console(void) +/* INTERNAL: Initialise console handles, _CONIO_LOCK must be held */ +static HANDLE msvcrt_input_console(void) { - TRACE(":Opening console handles\n"); - - MSVCRT_console_in = CreateFileA("CONIN$", GENERIC_WRITE|GENERIC_READ, - FILE_SHARE_WRITE|FILE_SHARE_READ, - NULL, OPEN_EXISTING, 0, NULL); - MSVCRT_console_out= CreateFileA("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, 0, NULL); + if (!MSVCRT_console_in) + { + MSVCRT_console_in = CreateFileA("CONIN$", GENERIC_WRITE|GENERIC_READ, + FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + if (MSVCRT_console_in == INVALID_HANDLE_VALUE) + WARN("Input console handle initialization failed!\n"); + } + return MSVCRT_console_in; +} - if ((MSVCRT_console_in == INVALID_HANDLE_VALUE) || - (MSVCRT_console_out== INVALID_HANDLE_VALUE)) - WARN(":Console handle Initialisation FAILED!\n"); +static HANDLE msvcrt_output_console(void) +{ + if (!MSVCRT_console_out) + { + MSVCRT_console_out = CreateFileA("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + if (MSVCRT_console_out == INVALID_HANDLE_VALUE) + WARN("Output console handle initialization failed!\n"); + } + return MSVCRT_console_out; } /* INTERNAL: Free console handles */ @@ -74,7 +84,7 @@ int CDECL _cputs(const char* str) len = strlen(str); LOCK_CONSOLE; - if (WriteConsoleA(MSVCRT_console_out, str, len, &count, NULL) + if (WriteConsoleA(msvcrt_output_console(), str, len, &count, NULL) && count == len) retval = 0; UNLOCK_CONSOLE; @@ -93,7 +103,7 @@ int CDECL _cputws(const wchar_t* str) len = wcslen(str); LOCK_CONSOLE; - if (WriteConsoleW(MSVCRT_console_out, str, len, &count, NULL) + if (WriteConsoleW(msvcrt_output_console(), str, len, &count, NULL) && count == len) retval = 0; UNLOCK_CONSOLE; @@ -166,12 +176,12 @@ int CDECL _getch_nolock(void) DWORD count; DWORD mode = 0; - GetConsoleMode(MSVCRT_console_in, &mode); + GetConsoleMode(msvcrt_input_console(), &mode); if(mode) - SetConsoleMode(MSVCRT_console_in, 0); + SetConsoleMode(msvcrt_input_console(), 0); do { - if (ReadConsoleInputA(MSVCRT_console_in, &ir, 1, &count)) + if (ReadConsoleInputA(msvcrt_input_console(), &ir, 1, &count)) { /* Only interested in ASCII chars */ if (ir.EventType == KEY_EVENT && @@ -197,7 +207,7 @@ int CDECL _getch_nolock(void) break; } while(1); if (mode) - SetConsoleMode(MSVCRT_console_in, mode); + SetConsoleMode(msvcrt_input_console(), mode); } return retval; } @@ -233,12 +243,12 @@ wchar_t CDECL _getwch_nolock(void) DWORD count; DWORD mode = 0; - GetConsoleMode(MSVCRT_console_in, &mode); + GetConsoleMode(msvcrt_input_console(), &mode); if(mode) - SetConsoleMode(MSVCRT_console_in, 0); + SetConsoleMode(msvcrt_input_console(), 0); do { - if (ReadConsoleInputW(MSVCRT_console_in, &ir, 1, &count)) + if (ReadConsoleInputW(msvcrt_input_console(), &ir, 1, &count)) { /* Only interested in ASCII chars */ if (ir.EventType == KEY_EVENT && @@ -264,7 +274,7 @@ wchar_t CDECL _getwch_nolock(void) break; } while(1); if (mode) - SetConsoleMode(MSVCRT_console_in, mode); + SetConsoleMode(msvcrt_input_console(), mode); } return retval; } @@ -288,7 +298,7 @@ wchar_t CDECL _getwch(void) int CDECL _putch_nolock(int c) { DWORD count; - if (WriteConsoleA(MSVCRT_console_out, &c, 1, &count, NULL) && count == 1) + if (WriteConsoleA(msvcrt_output_console(), &c, 1, &count, NULL) && count == 1) return c; return EOF; } @@ -310,7 +320,7 @@ int CDECL _putch(int c) wchar_t CDECL _putwch_nolock(wchar_t c) { DWORD count; - if (WriteConsoleW(MSVCRT_console_out, &c, 1, &count, NULL) && count==1) + if (WriteConsoleW(msvcrt_output_console(), &c, 1, &count, NULL) && count==1) return c; return WEOF; } @@ -388,10 +398,10 @@ char* CDECL _cgets(char* str) TRACE("(%p)\n", str); str[1] = 0; /* Length */ LOCK_CONSOLE; - GetConsoleMode(MSVCRT_console_in, &conmode); - SetConsoleMode(MSVCRT_console_in, ENABLE_LINE_INPUT|ENABLE_ECHO_INPUT|ENABLE_PROCESSED_INPUT); + GetConsoleMode(msvcrt_input_console(), &conmode); + SetConsoleMode(msvcrt_input_console(), ENABLE_LINE_INPUT|ENABLE_ECHO_INPUT|ENABLE_PROCESSED_INPUT); - if(ReadConsoleA(MSVCRT_console_in, buf, str[0], &got, NULL)) { + if(ReadConsoleA(msvcrt_input_console(), buf, str[0], &got, NULL)) { if(buf[got-2] == '\r') { buf[got-2] = 0; str[1] = got-2; @@ -409,7 +419,7 @@ char* CDECL _cgets(char* str) } else buf = NULL; - SetConsoleMode(MSVCRT_console_in, conmode); + SetConsoleMode(msvcrt_input_console(), conmode); UNLOCK_CONSOLE; return buf; } @@ -474,10 +484,10 @@ int CDECL _kbhit(void) INPUT_RECORD *ir = NULL; DWORD count = 0, i; - GetNumberOfConsoleInputEvents(MSVCRT_console_in, &count); + GetNumberOfConsoleInputEvents(msvcrt_input_console(), &count); if (count && (ir = malloc(count * sizeof(INPUT_RECORD))) && - PeekConsoleInputA(MSVCRT_console_in, ir, count, &count)) + PeekConsoleInputA(msvcrt_input_console(), ir, count, &count)) for(i = 0; i < count - 1; i++) { if (ir[i].EventType == KEY_EVENT && @@ -497,7 +507,7 @@ int CDECL _kbhit(void) static int puts_clbk_console_a(void *ctx, int len, const char *str) { LOCK_CONSOLE; - if(!WriteConsoleA(MSVCRT_console_out, str, len, NULL, NULL)) + if(!WriteConsoleA(msvcrt_output_console(), str, len, NULL, NULL)) len = -1; UNLOCK_CONSOLE; return len; @@ -506,7 +516,7 @@ static int puts_clbk_console_a(void *ctx, int len, const char *str) static int puts_clbk_console_w(void *ctx, int len, const wchar_t *str) { LOCK_CONSOLE; - if(!WriteConsoleW(MSVCRT_console_out, str, len, NULL, NULL)) + if(!WriteConsoleW(msvcrt_output_console(), str, len, NULL, NULL)) len = -1; UNLOCK_CONSOLE; return len; diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 0da4885c7a5..61e8479bf90 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -113,7 +113,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } msvcrt_init_math(hinstDLL); msvcrt_init_io(); - msvcrt_init_console(); msvcrt_init_args(); msvcrt_init_signals(); #if _MSVCR_VER >= 100 && _MSVCR_VER <= 120 diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 0a742807430..8f6ee08ef2a 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -232,7 +232,6 @@ extern BOOL msvcrt_init_locale(void) DECLSPEC_HIDDEN; extern void msvcrt_init_math(void*) DECLSPEC_HIDDEN; extern void msvcrt_init_io(void) DECLSPEC_HIDDEN; extern void msvcrt_free_io(void) DECLSPEC_HIDDEN; -extern void msvcrt_init_console(void) DECLSPEC_HIDDEN; extern void msvcrt_free_console(void) DECLSPEC_HIDDEN; extern void msvcrt_init_args(void) DECLSPEC_HIDDEN; extern void msvcrt_free_args(void) DECLSPEC_HIDDEN;

1 0

Alistair Leslie-Hughes : include: Add colrst.idl.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 01155b3693c1f70b96de34353844034c7bd44196 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01155b3693c1f70b96de3435… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 12 18:58:46 2021 +1100 include: Add colrst.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 30 ++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/colrst.idl | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 4 files changed, 80 insertions(+) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index a71dbd5f5a5..27de85077b8 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1583,6 +1583,36 @@ HRESULT CALLBACK IGetDataSource_GetDataSource_Proxy(IGetDataSource* This, REFIID return E_NOTIMPL; } +HRESULT CALLBACK IColumnsRowset_GetAvailableColumns_Proxy(IColumnsRowset* This, DBORDINAL *count, DBID **columns) +{ + FIXME("(%p)->(%p %p): stub\n", This, count, columns); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IColumnsRowset_GetAvailableColumns_Stub(IColumnsRowset* This, DBORDINAL *count, DBID **columns, + IErrorInfo **error) +{ + FIXME("(%p)->(%p %p %p): stub\n", This, count, columns, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK IColumnsRowset_GetColumnsRowset_Proxy(IColumnsRowset* This, IUnknown *outer, DBORDINAL count, + const DBID columns[], REFIID riid, ULONG property_cnt, DBPROPSET property_sets[], IUnknown **rowset) +{ + FIXME("(%p)->(%p %ld %p %s %d %p %p): stub\n", This, outer, count, columns, debugstr_guid(riid), + property_cnt, property_sets, rowset); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IColumnsRowset_GetColumnsRowset_Stub(IColumnsRowset* This, IUnknown *outer, + DBORDINAL count, const DBID *columns, REFIID riid, ULONG property_cnt, DBPROPSET *property_sets, + IUnknown **rowset, ULONG props_cnt, DBPROPSTATUS *prop_status, IErrorInfo **error) +{ + FIXME("(%p)->(%p %ld %p %s %d %p %p %u %p %p): stub\n", This, outer, count, columns, debugstr_guid(riid), + property_cnt, property_sets, rowset, props_cnt, prop_status, error); + return E_NOTIMPL; +} + HRESULT __RPC_STUB IGetDataSource_GetDataSource_Stub(IGetDataSource* This, REFIID riid, IUnknown **datasource, IErrorInfo **error) { diff --git a/include/Makefile.in b/include/Makefile.in index 6c16e01a271..d3494dde7a0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -71,6 +71,7 @@ SOURCES = \ codecapi.h \ colinf.idl \ colordlg.h \ + colrst.idl \ comcat.idl \ commctrl.h \ commctrl.rh \ diff --git a/include/colrst.idl b/include/colrst.idl new file mode 100644 index 00000000000..7e4d399e3d5 --- /dev/null +++ b/include/colrst.idl @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2021 Alistair Leslie-Hughes + * + * 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 + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a10-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] + +interface IColumnsRowset : IUnknown +{ + [local] + HRESULT GetAvailableColumns( [in, out] DBORDINAL *count, [out, size_is(,(ULONG)*count)] DBID **columns); + + [call_as(GetAvailableColumns)] + HRESULT RemoteGetAvailableColumns([in, out] DBORDINAL *count, [out, size_is(,(ULONG)*count)] DBID **columns, + [out] IErrorInfo **error); + + [local] + HRESULT GetColumnsRowset([in] IUnknown *outer, [in] DBORDINAL count, [in, size_is((ULONG)count)] const DBID columns[], + [in] REFIID riid, [in] ULONG property_cnt, [in, out, size_is((ULONG)property_cnt)] DBPROPSET property_sets[], + [out, iid_is(riid)] IUnknown **rowset); + + [call_as(GetColumnsRowset)] + HRESULT RemoteGetColumnsRowset([in] IUnknown *outer, [in] DBORDINAL count, [in, unique, size_is((ULONG)count)] const DBID *columns, + [in] REFIID riid, [in] ULONG property_cnt, [in, unique, size_is((ULONG)property_cnt)] DBPROPSET * roperty_sets, + [out, iid_is(riid)] IUnknown **rowset, [in] ULONG props_cnt, [out, size_is((ULONG)props_cnt)] DBPROPSTATUS *prop_status, + [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 475eb85642e..4976a8ce33e 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -52,6 +52,7 @@ typedef LONG_PTR DB_LRESERVE; #include "cmdbas.idl" #include "cmdtxt.idl" #include "colinf.idl" +#include "colrst.idl" #include "dbccmd.idl" #include "dbcses.idl" #include "srcrst.idl"

1 0

Daniel Lehman : msvcr120: Add feclearexcept.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: fd0c03c6447d272f22cde9ef6d4680995ecb6e5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd0c03c6447d272f22cde9ef… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Mar 11 23:12:09 2021 -0800 msvcr120: Add feclearexcept. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 26 ++++++++++++++++++++-- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 12 ++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- include/msvcrt/fenv.h | 1 + 7 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 1440e96db17..017155c65d5 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -87,7 +87,7 @@ @ cdecl _wsystem(wstr) ucrtbase._wsystem @ cdecl abort() ucrtbase.abort @ cdecl exit(long) ucrtbase.exit -@ stub feclearexcept +@ cdecl feclearexcept(long) ucrtbase.feclearexcept @ cdecl fegetenv(ptr) ucrtbase.fegetenv @ stub fegetexceptflag @ cdecl fegetround() ucrtbase.fegetround diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7719bc662e0..105c349355e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2143,7 +2143,7 @@ @ cdecl fdim(double double) @ cdecl fdimf(float float) @ cdecl fdiml(double double) fdim -@ stub feclearexcept +@ cdecl feclearexcept(long) @ cdecl fegetenv(ptr) @ stub fegetexceptflag @ cdecl fegetround() diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 9104cfcd447..cff6128bbe9 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -184,6 +184,7 @@ static int (CDECL *p_fegetround)(void); static int (CDECL *p_fesetround)(int); static int (CDECL *p_fesetexceptflag)(const fexcept_t*,int); static int (CDECL *p_fetestexcept)(int); +static int (CDECL *p_feclearexcept)(int); static int (CDECL *p__clearfp)(void); static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); @@ -261,6 +262,7 @@ static BOOL init(void) SET(p_fesetround, "fesetround"); SET(p_fesetexceptflag, "fesetexceptflag"); SET(p_fetestexcept, "fetestexcept"); + SET(p_feclearexcept, "feclearexcept"); SET(p__clearfp, "_clearfp"); SET(p_vsscanf, "vsscanf"); @@ -854,6 +856,11 @@ static void test_feenv(void) except = p_fetestexcept(FE_ALL_EXCEPT); ok(except == (FE_INEXACT|FE_UNDERFLOW), "expected %x, got %lx\n", FE_INEXACT|FE_UNDERFLOW, except); + ret = p_feclearexcept(~FE_ALL_EXCEPT); + ok(!ret, "feclearexceptflag returned %x\n", ret); + except = p_fetestexcept(FE_ALL_EXCEPT); + ok(except == (FE_INEXACT|FE_UNDERFLOW), "expected %x, got %lx\n", FE_INEXACT|FE_UNDERFLOW, except); + /* no crash, but no-op */ ret = p_fesetexceptflag(NULL, 0); ok(!ret, "fesetexceptflag returned %x\n", ret); @@ -885,7 +892,18 @@ static void test_feenv(void) ok(ret == flags, "Test %d: expected %x, got %x\n", i, flags, ret); } - p__clearfp(); + for(i=0; i<ARRAY_SIZE(tests); i++) { + ret = p_feclearexcept(tests[i]); + ok(!ret, "Test %d: feclearexceptflag returned %x\n", i, ret); + + flags &= ~tests[i]; + except = p_fetestexcept(tests[i]); + ok(!except, "Test %d: expected %x, got %lx\n", i, flags, except); + } + + except = p_fetestexcept(FE_ALL_EXCEPT); + ok(!except, "expected 0, got %lx\n", except); + /* setting bits with except */ for(i=0; i<ARRAY_SIZE(tests); i++) { except = tests[i]; @@ -909,7 +927,11 @@ static void test_feenv(void) ret = p_fetestexcept(tests2[i].get); ok(ret == tests2[i].expect, "Test %d: expected %lx, got %x\n", i, tests2[i].expect, ret); } - p__clearfp(); + + ret = p_feclearexcept(FE_ALL_EXCEPT); + ok(!ret, "feclearexceptflag returned %x\n", ret); + except = p_fetestexcept(FE_ALL_EXCEPT); + ok(!except, "expected 0, got %lx\n", except); } static void test__wcreate_locale(void) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 24d98427acf..e3cda9a0022 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1809,7 +1809,7 @@ @ cdecl fdim(double double) msvcr120.fdim @ cdecl fdimf(float float) msvcr120.fdimf @ cdecl fdiml(double double) msvcr120.fdiml -@ stub feclearexcept +@ cdecl feclearexcept(long) msvcr120.feclearexcept @ cdecl fegetenv(ptr) msvcr120.fegetenv @ stub fegetexceptflag @ cdecl fegetround() msvcr120.fegetround diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 16ff50f0334..16e940c21ce 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2239,6 +2239,18 @@ int CDECL fesetexceptflag(const fexcept_t *status, int excepts) env._Fe_stat |= (*status & excepts); return fesetenv(&env); } + +/********************************************************************* + * feclearexcept (MSVCR120.@) + */ +int CDECL feclearexcept(int flags) +{ + fenv_t env; + + fegetenv(&env); + env._Fe_stat &= ~(flags & FE_ALL_EXCEPT); + return fesetenv(&env); +} #endif #if _MSVCR_VER>=140 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index cd012aa0ab9..1df40c81b76 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2286,7 +2286,7 @@ @ cdecl fdim(double double) @ cdecl fdimf(float float) @ cdecl fdiml(double double) fdim -@ stub feclearexcept +@ cdecl feclearexcept(long) @ cdecl fegetenv(ptr) @ stub fegetexceptflag @ cdecl fegetround() diff --git a/include/msvcrt/fenv.h b/include/msvcrt/fenv.h index 6396bd688f3..b37fbc100bf 100644 --- a/include/msvcrt/fenv.h +++ b/include/msvcrt/fenv.h @@ -37,6 +37,7 @@ _ACRTIMP int __cdecl fesetenv(const fenv_t*); _ACRTIMP int __cdecl fegetround(void); _ACRTIMP int __cdecl fesetround(int); _ACRTIMP int __cdecl fesetexceptflag(const fexcept_t*, int); +_ACRTIMP int __cdecl feclearexcept(int); _ACRTIMP int __cdecl fetestexcept(int); #ifdef __cplusplus

1 0

Daniel Lehman : msvcr120: Add fegetexceptflag.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 9fa81aab5fcd148cb372d6f72088014c5e17c533 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fa81aab5fcd148cb372d6f7… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Mar 11 23:12:10 2021 -0800 msvcr120: Add fegetexceptflag. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 13 +++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- include/msvcrt/fenv.h | 1 + 7 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 017155c65d5..3733a524382 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -89,7 +89,7 @@ @ cdecl exit(long) ucrtbase.exit @ cdecl feclearexcept(long) ucrtbase.feclearexcept @ cdecl fegetenv(ptr) ucrtbase.fegetenv -@ stub fegetexceptflag +@ cdecl fegetexceptflag(ptr long) ucrtbase.fegetexceptflag @ cdecl fegetround() ucrtbase.fegetround @ stub feholdexcept @ cdecl fesetenv(ptr) ucrtbase.fesetenv diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 105c349355e..306bee5f50c 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2145,7 +2145,7 @@ @ cdecl fdiml(double double) fdim @ cdecl feclearexcept(long) @ cdecl fegetenv(ptr) -@ stub fegetexceptflag +@ cdecl fegetexceptflag(ptr long) @ cdecl fegetround() @ stub feholdexcept @ cdecl feof(ptr) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index cff6128bbe9..151989f8f74 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -182,6 +182,7 @@ static int (CDECL *p_fegetenv)(fenv_t*); static int (CDECL *p_fesetenv)(const fenv_t*); static int (CDECL *p_fegetround)(void); static int (CDECL *p_fesetround)(int); +static int (CDECL *p_fegetexceptflag)(fexcept_t*,int); static int (CDECL *p_fesetexceptflag)(const fexcept_t*,int); static int (CDECL *p_fetestexcept)(int); static int (CDECL *p_feclearexcept)(int); @@ -260,6 +261,7 @@ static BOOL init(void) SET(p_fesetenv, "fesetenv"); SET(p_fegetround, "fegetround"); SET(p_fesetround, "fesetround"); + SET(p_fegetexceptflag, "fegetexceptflag"); SET(p_fesetexceptflag, "fesetexceptflag"); SET(p_fetestexcept, "fetestexcept"); SET(p_feclearexcept, "feclearexcept"); @@ -849,6 +851,7 @@ static void test_feenv(void) if(0) { /* crash on windows */ p_fesetexceptflag(NULL, FE_ALL_EXCEPT); + p_fegetexceptflag(NULL, 0); } except = FE_ALL_EXCEPT; ret = p_fesetexceptflag(&except, FE_INEXACT|FE_UNDERFLOW); @@ -890,6 +893,16 @@ static void test_feenv(void) flags |= tests[i]; ret = p_fetestexcept(FE_ALL_EXCEPT); ok(ret == flags, "Test %d: expected %x, got %x\n", i, flags, ret); + + except = ~0; + ret = p_fegetexceptflag(&except, ~0); + ok(!ret, "Test %d: fegetexceptflag returned %x.\n", i, ret); + ok(except == flags, "Test %d: expected %x, got %lx\n", i, flags, except); + + except = ~0; + ret = p_fegetexceptflag(&except, tests[i]); + ok(!ret, "Test %d: fegetexceptflag returned %x.\n", i, ret); + ok(except == tests[i], "Test %d: expected %x, got %lx\n", i, tests[i], except); } for(i=0; i<ARRAY_SIZE(tests); i++) { diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index e3cda9a0022..b16d1a5b3f0 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1811,7 +1811,7 @@ @ cdecl fdiml(double double) msvcr120.fdiml @ cdecl feclearexcept(long) msvcr120.feclearexcept @ cdecl fegetenv(ptr) msvcr120.fegetenv -@ stub fegetexceptflag +@ cdecl fegetexceptflag(ptr long) msvcr120.fegetexceptflag @ cdecl fegetround() msvcr120.fegetround @ stub feholdexcept @ cdecl feof(ptr) msvcr120.feof diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 16e940c21ce..6b2d08a8294 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2251,6 +2251,15 @@ int CDECL feclearexcept(int flags) env._Fe_stat &= ~(flags & FE_ALL_EXCEPT); return fesetenv(&env); } + +/********************************************************************* + * fegetexceptflag (MSVCR120.@) + */ +int CDECL fegetexceptflag(fexcept_t *status, int excepts) +{ + *status = _statusfp() & excepts; + return 0; +} #endif #if _MSVCR_VER>=140 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1df40c81b76..8f331825fc4 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2288,7 +2288,7 @@ @ cdecl fdiml(double double) fdim @ cdecl feclearexcept(long) @ cdecl fegetenv(ptr) -@ stub fegetexceptflag +@ cdecl fegetexceptflag(ptr long) @ cdecl fegetround() @ stub feholdexcept @ cdecl feof(ptr) diff --git a/include/msvcrt/fenv.h b/include/msvcrt/fenv.h index b37fbc100bf..a6b53eca567 100644 --- a/include/msvcrt/fenv.h +++ b/include/msvcrt/fenv.h @@ -34,6 +34,7 @@ typedef __msvcrt_ulong fexcept_t; _ACRTIMP int __cdecl fegetenv(fenv_t*); _ACRTIMP int __cdecl fesetenv(const fenv_t*); +_ACRTIMP int __cdecl fegetexceptflag(fexcept_t*, int); _ACRTIMP int __cdecl fegetround(void); _ACRTIMP int __cdecl fesetround(int); _ACRTIMP int __cdecl fesetexceptflag(const fexcept_t*, int);

1 0

Daniel Lehman : msvcr120: Add fesetexceptflag.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 5fd512504ce4e2518aba34ad264e03703cecefb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fd512504ce4e2518aba34ad… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Mar 11 23:12:08 2021 -0800 msvcr120: Add fesetexceptflag. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 82 ++++++++++++++++++++-- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 17 +++++ dlls/ucrtbase/ucrtbase.spec | 2 +- include/msvcrt/fenv.h | 3 + 7 files changed, 101 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 66c2d8cc264..1440e96db17 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -93,7 +93,7 @@ @ cdecl fegetround() ucrtbase.fegetround @ stub feholdexcept @ cdecl fesetenv(ptr) ucrtbase.fesetenv -@ stub fesetexceptflag +@ cdecl fesetexceptflag(ptr long) ucrtbase.fesetexceptflag @ cdecl fesetround(long) ucrtbase.fesetround @ cdecl fetestexcept(long) ucrtbase.fetestexcept @ cdecl perror(str) ucrtbase.perror diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 27ae5a930f6..7719bc662e0 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2152,7 +2152,7 @@ @ stub feraiseexcept @ cdecl ferror(ptr) @ cdecl fesetenv(ptr) -@ stub fesetexceptflag +@ cdecl fesetexceptflag(ptr long) @ cdecl fesetround(long) @ cdecl fetestexcept(long) @ stub feupdateenv diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 537e9077402..9104cfcd447 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -182,6 +182,7 @@ static int (CDECL *p_fegetenv)(fenv_t*); static int (CDECL *p_fesetenv)(const fenv_t*); static int (CDECL *p_fegetround)(void); static int (CDECL *p_fesetround)(int); +static int (CDECL *p_fesetexceptflag)(const fexcept_t*,int); static int (CDECL *p_fetestexcept)(int); static int (CDECL *p__clearfp)(void); static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); @@ -258,6 +259,7 @@ static BOOL init(void) SET(p_fesetenv, "fesetenv"); SET(p_fegetround, "fegetround"); SET(p_fesetround, "fesetround"); + SET(p_fesetexceptflag, "fesetexceptflag"); SET(p_fetestexcept, "fetestexcept"); SET(p__clearfp, "_clearfp"); @@ -799,7 +801,31 @@ static void test_feenv(void) FE_INVALID, FE_ALL_EXCEPT, }; + static const struct { + fexcept_t except; + unsigned int flag; + unsigned int get; + fexcept_t expect; + } tests2[] = { + /* except flag get expect */ + { 0, 0, 0, 0 }, + { FE_ALL_EXCEPT, FE_INEXACT, 0, 0 }, + { FE_ALL_EXCEPT, FE_INEXACT, FE_ALL_EXCEPT, FE_INEXACT }, + { FE_ALL_EXCEPT, FE_INEXACT, FE_INEXACT, FE_INEXACT }, + { FE_ALL_EXCEPT, FE_INEXACT, FE_OVERFLOW, 0 }, + { FE_ALL_EXCEPT, FE_ALL_EXCEPT, FE_ALL_EXCEPT, FE_ALL_EXCEPT }, + { FE_ALL_EXCEPT, FE_ALL_EXCEPT, FE_INEXACT, FE_INEXACT }, + { FE_ALL_EXCEPT, FE_ALL_EXCEPT, 0, 0 }, + { FE_ALL_EXCEPT, FE_ALL_EXCEPT, ~0, FE_ALL_EXCEPT }, + { FE_ALL_EXCEPT, FE_ALL_EXCEPT, ~FE_ALL_EXCEPT, 0 }, + { FE_INEXACT, FE_ALL_EXCEPT, FE_ALL_EXCEPT, FE_INEXACT }, + { FE_INEXACT, FE_UNDERFLOW, FE_ALL_EXCEPT, 0 }, + { FE_UNDERFLOW, FE_INEXACT, FE_ALL_EXCEPT, 0 }, + { FE_INEXACT|FE_UNDERFLOW, FE_UNDERFLOW, FE_ALL_EXCEPT, FE_UNDERFLOW }, + { FE_UNDERFLOW, FE_INEXACT|FE_UNDERFLOW, FE_ALL_EXCEPT, FE_UNDERFLOW }, + }; fenv_t env, env2; + fexcept_t except; int i, ret, flags; p__clearfp(); @@ -819,16 +845,37 @@ static void test_feenv(void) ret = p_fegetround(); ok(ret == FE_TONEAREST, "Got unexpected round mode %#x.\n", ret); + if(0) { /* crash on windows */ + p_fesetexceptflag(NULL, FE_ALL_EXCEPT); + } + except = FE_ALL_EXCEPT; + ret = p_fesetexceptflag(&except, FE_INEXACT|FE_UNDERFLOW); + ok(!ret, "fesetexceptflag returned %x\n", ret); + except = p_fetestexcept(FE_ALL_EXCEPT); + ok(except == (FE_INEXACT|FE_UNDERFLOW), "expected %x, got %lx\n", FE_INEXACT|FE_UNDERFLOW, except); + + /* no crash, but no-op */ + ret = p_fesetexceptflag(NULL, 0); + ok(!ret, "fesetexceptflag returned %x\n", ret); + except = p_fetestexcept(FE_ALL_EXCEPT); + ok(except == (FE_INEXACT|FE_UNDERFLOW), "expected %x, got %lx\n", FE_INEXACT|FE_UNDERFLOW, except); + + /* zero clears all */ + except = 0; + ret = p_fesetexceptflag(&except, FE_ALL_EXCEPT); + ok(!ret, "fesetexceptflag returned %x\n", ret); + except = p_fetestexcept(FE_ALL_EXCEPT); + ok(!except, "expected 0, got %lx\n", except); + ret = p_fetestexcept(FE_ALL_EXCEPT); ok(!ret, "fetestexcept returned %x\n", ret); flags = 0; + /* adding bits with flags */ for(i=0; i<ARRAY_SIZE(tests); i++) { - ret = p_fegetenv(&env); - ok(!ret, "Test %d: fegetenv returned %x\n", i, ret); - env._Fe_stat |= tests[i]; - ret = p_fesetenv(&env); - ok(!ret, "Test %d: fesetenv returned %x\n", i, ret); + except = FE_ALL_EXCEPT; + ret = p_fesetexceptflag(&except, tests[i]); + ok(!ret, "Test %d: fesetexceptflag returned %x\n", i, ret); ret = p_fetestexcept(tests[i]); ok(ret == tests[i], "Test %d: expected %x, got %x\n", i, tests[i], ret); @@ -837,6 +884,31 @@ static void test_feenv(void) ret = p_fetestexcept(FE_ALL_EXCEPT); ok(ret == flags, "Test %d: expected %x, got %x\n", i, flags, ret); } + + p__clearfp(); + /* setting bits with except */ + for(i=0; i<ARRAY_SIZE(tests); i++) { + except = tests[i]; + ret = p_fesetexceptflag(&except, FE_ALL_EXCEPT); + ok(!ret, "Test %d: fesetexceptflag returned %x\n", i, ret); + + ret = p_fetestexcept(tests[i]); + ok(ret == tests[i], "Test %d: expected %x, got %x\n", i, tests[i], ret); + + ret = p_fetestexcept(FE_ALL_EXCEPT); + ok(ret == tests[i], "Test %d: expected %x, got %x\n", i, tests[i], ret); + } + + for(i=0; i<ARRAY_SIZE(tests2); i++) { + p__clearfp(); + + except = tests2[i].except; + ret = p_fesetexceptflag(&except, tests2[i].flag); + ok(!ret, "Test %d: fesetexceptflag returned %x\n", i, ret); + + ret = p_fetestexcept(tests2[i].get); + ok(ret == tests2[i].expect, "Test %d: expected %lx, got %x\n", i, tests2[i].expect, ret); + } p__clearfp(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index daee644d965..24d98427acf 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1818,7 +1818,7 @@ @ stub feraiseexcept @ cdecl ferror(ptr) msvcr120.ferror @ cdecl fesetenv(ptr) msvcr120.fesetenv -@ stub fesetexceptflag +@ cdecl fesetexceptflag(ptr long) msvcr120.fesetexceptflag @ cdecl fesetround(long) msvcr120.fesetround @ cdecl fetestexcept(long) msvcr120.fetestexcept @ stub feupdateenv diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6c1d665c843..16ff50f0334 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2222,6 +2222,23 @@ int CDECL fetestexcept(int flags) { return _statusfp() & flags; } + +/********************************************************************* + * fesetexceptflag (MSVCR120.@) + */ +int CDECL fesetexceptflag(const fexcept_t *status, int excepts) +{ + fenv_t env; + + if(!excepts) + return 0; + + fegetenv(&env); + excepts &= FE_ALL_EXCEPT; + env._Fe_stat &= ~excepts; + env._Fe_stat |= (*status & excepts); + return fesetenv(&env); +} #endif #if _MSVCR_VER>=140 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d40df5e0efc..cd012aa0ab9 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2294,7 +2294,7 @@ @ cdecl feof(ptr) @ cdecl ferror(ptr) @ cdecl fesetenv(ptr) -@ stub fesetexceptflag +@ cdecl fesetexceptflag(ptr long) @ cdecl fesetround(long) @ cdecl fetestexcept(long) @ cdecl fflush(ptr) diff --git a/include/msvcrt/fenv.h b/include/msvcrt/fenv.h index 3dcbcf0b8fe..6396bd688f3 100644 --- a/include/msvcrt/fenv.h +++ b/include/msvcrt/fenv.h @@ -30,10 +30,13 @@ typedef struct __msvcrt_ulong _Fe_stat; } fenv_t; +typedef __msvcrt_ulong fexcept_t; + _ACRTIMP int __cdecl fegetenv(fenv_t*); _ACRTIMP int __cdecl fesetenv(const fenv_t*); _ACRTIMP int __cdecl fegetround(void); _ACRTIMP int __cdecl fesetround(int); +_ACRTIMP int __cdecl fesetexceptflag(const fexcept_t*, int); _ACRTIMP int __cdecl fetestexcept(int); #ifdef __cplusplus

1 0