May 2020 - Wine-devel - list.winehq.org

[PATCH] gduplusenums.h: Remove PaletteFlags.
by Jacek Caban 18 May '20

18 May '20

It's not present there in Windows SDK. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/gdiplusenums.h | 1 - 1 file changed, 1 deletion(-)

1 0

[PATCH] dmusicf.h: Move typedef below enum declarations.
by Jacek Caban 18 May '20

18 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/dmusicf.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)

1 0

[PATCH] mfreadwrite/reader: Add recognition of ftypemp42 mp4 header.
by Nikolay Sivov 18 May '20

18 May '20

From: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index e69c2b980b1..96a82b798ab 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2162,6 +2162,7 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) static const unsigned char wavmagic[] = { 'R', 'I', 'F', 'F',0x00,0x00,0x00,0x00, 'W', 'A', 'V', 'E', 'f', 'm', 't', ' '}; static const unsigned char wavmask[] = {0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; static const unsigned char isommagic[] = {0x00,0x00,0x00,0x00, 'f', 't', 'y', 'p', 'i', 's', 'o', 'm',0x00,0x00,0x00,0x00}; + static const unsigned char mp42magic[] = {0x00,0x00,0x00,0x00, 'f', 't', 'y', 'p', 'm', 'p', '4', '2',0x00,0x00,0x00,0x00}; static const unsigned char mp4mask[] = {0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00}; static const struct stream_content_url_hint { @@ -2174,6 +2175,7 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) { asfmagic, L".asf" }, { wavmagic, L".wav", wavmask }, { isommagic, L".mp4", mp4mask }, + { mp42magic, L".mp4", mp4mask }, }; unsigned char buffer[4 * sizeof(unsigned int)], pattern[4 * sizeof(unsigned int)]; unsigned int i, j, length = 0, caps = 0; -- 2.26.2

1 0

[PATCH] wine/test.h: Remove NAN and INFINITY macros.
by Jacek Caban 18 May '20

18 May '20

Those are available in UCRT (MSVC since 2015) and cause redefinition warnings if math.h is included after test.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/test.h | 9 --------- 1 file changed, 9 deletions(-)

1 0

[PATCH 1/3] ntdll: Fix arm64 unwind across ELF/PE boundaries
by Martin Storsjo 18 May '20

18 May '20

The previous implementation might have given the impression of working, as long in some cases where the PE code actually used frame pointers, but turned out to be subly wrong. This essentially reverts the functional aspects of 1c9fdaab0f4. Use the new value of the Lr register, after fetching the registers from unw_step, as the return value. To make single-stepping unwinding work properly, treat the registers consistently: - Make RtlCaptureContext store the current values of x29/Fp and x30/Lr from within the function, not the ones backed up from the stack. - After unwinding one step, first fetch the new values of all registers, including the new value of Lr - then use this value of Lr to set the new value of Pc (the address to actually return to). This makes the unwinding actually coherent in reading unwind opcodes and return addresses from one single function; previously these were out of sync where the return address ended up being read from the function one step further up in the call stack. This fixes unwinding for setjmp for binaries compiled with clang (in mingw mode). Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/ntdll/signal_arm64.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 9a7fce930d..390315bf93 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -267,8 +267,7 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, "stp x23, x24, [x0, #0xc0]\n\t" /* context->X23,X24 */ "stp x25, x26, [x0, #0xd0]\n\t" /* context->X25,X26 */ "stp x27, x28, [x0, #0xe0]\n\t" /* context->X27,X28 */ - "ldp x1, x2, [x29]\n\t" - "stp x1, x2, [x0, #0xf0]\n\t" /* context->Fp,Lr */ + "stp x29, x30, [x0, #0xf0]\n\t" /* context->Fp,Lr */ "add x1, x29, #0x10\n\t" "stp x1, x30, [x0, #0x100]\n\t" /* context->Sp,Pc */ "mov w1, #0x400000\n\t" /* CONTEXT_ARM64 */ @@ -547,7 +546,6 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX *handler = (void *)info.handler; *handler_data = (void *)info.lsda; *frame = context->Sp; - context->Pc = context->u.s.Lr; unw_get_reg( &cursor, UNW_AARCH64_X0, (unw_word_t *)&context->u.s.X0 ); unw_get_reg( &cursor, UNW_AARCH64_X1, (unw_word_t *)&context->u.s.X1 ); unw_get_reg( &cursor, UNW_AARCH64_X2, (unw_word_t *)&context->u.s.X2 ); @@ -580,6 +578,7 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX unw_get_reg( &cursor, UNW_AARCH64_X29, (unw_word_t *)&context->u.s.Fp ); unw_get_reg( &cursor, UNW_AARCH64_X30, (unw_word_t *)&context->u.s.Lr ); unw_get_reg( &cursor, UNW_AARCH64_SP, (unw_word_t *)&context->Sp ); + context->Pc = context->u.s.Lr; TRACE( "next function pc=%016lx%s\n", context->Pc, rc ? "" : " (last frame)" ); TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", -- 2.17.1

2 3

[PATCH] winnt.h: Add ARRAYSIZE macro.
by Jacek Caban 18 May '20

18 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- It's needed by SDL2. include/winnt.h | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 1/2] makedep: Add support for .h.in files in the local directory.
by Francois Gouget 18 May '20

18 May '20

This is needed so libraries and programs can use the Wine properties such as PACKAGE_BUGREPORT. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Since most are now getting 'cross-compiled' they cannot use config.h and thus need another way of getting these values. tools/makedep.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index 193de2d4d87..cb46d0f0809 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1472,6 +1472,16 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ return file; } + /* check for corresponding .in file in source dir */ + + if (strendswith( pFile->name, ".h" ) && + (file = open_local_file( make, replace_extension( pFile->name, ".h", ".h.in" ), &filename ))) + { + pFile->sourcename = filename; + pFile->filename = obj_dir_path( make, pFile->name ); + return file; + } + /* check for extra targets */ if (strarray_exists( &make->extra_targets, pFile->name )) { -- 2.20.1

3 3

[PATCH] ole32: Use an object for Regsitered DragDrop windows.
by Alistair Leslie-Hughes 18 May '20

18 May '20

The BCG library registers just about every window it creates for Drag and Drop. The current method creates a file for each window registered for DnD, and in the case of a large application that uses BCG, 1000's of files can be created. Reducing the amount of file an application can use. The new way, uses an unique guid for each regsitered window and then use that guid to lookup whether it supports Drag and Drop. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ole32/ole2.c | 183 ++++++++++++---------------------------- dlls/winex11.drv/xdnd.c | 68 +++++---------- 2 files changed, 73 insertions(+), 178 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 6653fac34229..531085739fe8 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -114,10 +114,13 @@ static const WCHAR prop_olemenuW[] = static const WCHAR prop_oledroptarget[] = {'O','l','e','D','r','o','p','T','a','r','g','e','t','I','n','t','e','r','f','a','c','e',0}; -/* property to store Marshalled IDropTarget pointer */ +/* property to store Marshalled Atom value */ static const WCHAR prop_marshalleddroptarget[] = {'W','i','n','e','M','a','r','s','h','a','l','l','e','d','D','r','o','p','T','a','r','g','e','t',0}; +static const WCHAR prop_marshalledcookie[] = + {'W','i','n','e','M','a','r','s','h','a','l','l','e','d','C','o','o','k','i','e',0}; + static const WCHAR emptyW[] = { 0 }; /****************************************************************************** @@ -276,9 +279,9 @@ HRESULT WINAPI OleInitializeWOW(DWORD x, DWORD y) { * This handle belongs to the process that called RegisterDragDrop. * See get_droptarget_local_handle(). */ -static inline HANDLE get_droptarget_handle(HWND hwnd) +static inline ATOM get_droptarget_handle(HWND hwnd) { - return GetPropW(hwnd, prop_marshalleddroptarget); + return HandleToULong(GetPropW(hwnd, prop_marshalleddroptarget)); } /************************************************************* @@ -291,91 +294,6 @@ static inline BOOL is_droptarget(HWND hwnd) return get_droptarget_handle(hwnd) != 0; } -/************************************************************* - * get_droptarget_local_handle - * - * Retrieve a handle to the map containing the marshalled IDropTarget. - * The handle should be closed when finished with. - */ -static HANDLE get_droptarget_local_handle(HWND hwnd) -{ - HANDLE handle, local_handle = 0; - - handle = get_droptarget_handle(hwnd); - - if(handle) - { - DWORD pid; - HANDLE process; - - GetWindowThreadProcessId(hwnd, &pid); - process = OpenProcess(PROCESS_DUP_HANDLE, FALSE, pid); - if(process) - { - DuplicateHandle(process, handle, GetCurrentProcess(), &local_handle, 0, FALSE, DUPLICATE_SAME_ACCESS); - CloseHandle(process); - } - } - return local_handle; -} - -/*********************************************************************** - * create_map_from_stream - * - * Helper for RegisterDragDrop. Creates a file mapping object - * with the contents of the provided stream. The stream must - * be a global memory backed stream. - */ -static HRESULT create_map_from_stream(IStream *stream, HANDLE *map) -{ - HGLOBAL hmem; - DWORD size; - HRESULT hr; - void *data; - - hr = GetHGlobalFromStream(stream, &hmem); - if(FAILED(hr)) return hr; - - size = GlobalSize(hmem); - *map = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, size, NULL); - if(!*map) return E_OUTOFMEMORY; - - data = MapViewOfFile(*map, FILE_MAP_WRITE, 0, 0, size); - memcpy(data, GlobalLock(hmem), size); - GlobalUnlock(hmem); - UnmapViewOfFile(data); - return S_OK; -} - -/*********************************************************************** - * create_stream_from_map - * - * Creates a stream from the provided map. - */ -static HRESULT create_stream_from_map(HANDLE map, IStream **stream) -{ - HRESULT hr = E_OUTOFMEMORY; - HGLOBAL hmem; - void *data; - MEMORY_BASIC_INFORMATION info; - - data = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 0); - if(!data) return hr; - - VirtualQuery(data, &info, sizeof(info)); - TRACE("size %d\n", (int)info.RegionSize); - - hmem = GlobalAlloc(GMEM_MOVEABLE, info.RegionSize); - if(hmem) - { - memcpy(GlobalLock(hmem), data, info.RegionSize); - GlobalUnlock(hmem); - hr = CreateStreamOnHGlobal(hmem, TRUE, stream); - } - UnmapViewOfFile(data); - return hr; -} - /* This is to work around apps which break COM rules by not implementing * IDropTarget::QueryInterface(). Windows doesn't expose this because it * doesn't call CoMarshallInterface() in RegisterDragDrop(). @@ -528,18 +446,29 @@ static IDropTarget* WrapDropTarget( HWND hwnd ) static IDropTarget* get_droptarget_pointer(HWND hwnd) { IDropTarget *droptarget = NULL; - HANDLE map; - IStream *stream; + ATOM atom; + WCHAR guid_str[40]; + GUID guid; + HRESULT hr; + + atom = get_droptarget_handle(hwnd); + if (!atom) return NULL; - map = get_droptarget_local_handle(hwnd); - if(!map) return NULL; + if (GlobalGetAtomNameW(atom, guid_str, ARRAY_SIZE(guid_str)) == 0) + return NULL; - if(SUCCEEDED(create_stream_from_map(map, &stream))) + if (CLSIDFromString(guid_str, &guid) != S_OK) { - CoUnmarshalInterface(stream, &IID_IDropTarget, (void**)&droptarget); - IStream_Release(stream); + ERR("Failed to convert string %s\n", debugstr_w(guid_str)); + return NULL; } - CloseHandle(map); + + hr = CoGetClassObject(&guid, CLSCTX_SERVER, NULL, &IID_IDropTarget, (void**)&droptarget); + if (FAILED(hr)) + { + WARN("CoGetClassObject failed (0x%08x)\n", hr); + } + return droptarget; } @@ -550,9 +479,9 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) { DWORD pid = 0; HRESULT hr; - IStream *stream; - HANDLE map; IDropTarget *wrapper; + GUID guid; + DWORD cookie; TRACE("(%p,%p)\n", hwnd, pDropTarget); @@ -590,37 +519,38 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) * "OleDropTargetInterface" prop for compatibility with Windows. */ - hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - if(FAILED(hr)) return hr; + CoCreateGuid(&guid); /* IDropTarget::QueryInterface() shouldn't be called, some (broken) apps depend on this. */ wrapper = WrapDropTarget( hwnd ); if(!wrapper) { - IStream_Release(stream); return E_OUTOFMEMORY; } - hr = CoMarshalInterface(stream, &IID_IDropTarget, (IUnknown*)wrapper, MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); + + hr = CoRegisterClassObject(&guid, (IUnknown*)wrapper, CLSCTX_SERVER, REGCLS_MULTIPLEUSE, + &cookie); + if (FAILED(hr)) + ERR("Failed to register class 0x%08x\n", hr); IDropTarget_Release(wrapper); if(SUCCEEDED(hr)) { - hr = create_map_from_stream(stream, &map); - if(SUCCEEDED(hr)) - { - IDropTarget_AddRef(pDropTarget); - SetPropW(hwnd, prop_oledroptarget, pDropTarget); - SetPropW(hwnd, prop_marshalleddroptarget, map); - } - else - { - LARGE_INTEGER zero; - zero.QuadPart = 0; - IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); - CoReleaseMarshalData(stream); - } + WCHAR *guid_str; + ATOM atom; + + IDropTarget_AddRef(pDropTarget); + SetPropW(hwnd, prop_oledroptarget, pDropTarget); + + StringFromCLSID(&guid, &guid_str); + + atom = GlobalAddAtomW(guid_str); + + SetPropW(hwnd, prop_marshalleddroptarget, ULongToHandle(atom)); + SetPropW(hwnd, prop_marshalledcookie, ULongToHandle(cookie)); + + CoTaskMemFree(guid_str); } - IStream_Release(stream); return hr; } @@ -630,10 +560,9 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) */ HRESULT WINAPI RevokeDragDrop(HWND hwnd) { - HANDLE map; - IStream *stream; + ATOM atom; IDropTarget *drop_target; - HRESULT hr; + DWORD cookie; TRACE("(%p)\n", hwnd); @@ -644,24 +573,20 @@ HRESULT WINAPI RevokeDragDrop(HWND hwnd) } /* no registration data */ - if (!(map = get_droptarget_handle(hwnd))) + if (!(atom = get_droptarget_handle(hwnd))) return DRAGDROP_E_NOTREGISTERED; drop_target = GetPropW(hwnd, prop_oledroptarget); if(drop_target) IDropTarget_Release(drop_target); + cookie = HandleToULong(GetPropW(hwnd, prop_marshalledcookie)); RemovePropW(hwnd, prop_oledroptarget); RemovePropW(hwnd, prop_marshalleddroptarget); - hr = create_stream_from_map(map, &stream); - if(SUCCEEDED(hr)) - { - CoReleaseMarshalData(stream); - IStream_Release(stream); - } - CloseHandle(map); + CoRevokeClassObject(cookie); + GlobalDeleteAtom(atom); - return hr; + return S_OK; } /*********************************************************************** diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 14ca82aa3076..2c0a2e449531 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -85,69 +85,39 @@ static CRITICAL_SECTION xdnd_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; /* Based on functions in dlls/ole32/ole2.c */ -static HANDLE get_droptarget_local_handle(HWND hwnd) +static ATOM get_droptarget_local_handle(HWND hwnd) { static const WCHAR prop_marshalleddroptarget[] = {'W','i','n','e','M','a','r','s','h','a','l','l','e','d','D','r','o','p','T','a','r','g','e','t',0}; - HANDLE handle; - HANDLE local_handle = 0; - - handle = GetPropW(hwnd, prop_marshalleddroptarget); - if (handle) - { - DWORD pid; - HANDLE process; - - GetWindowThreadProcessId(hwnd, &pid); - process = OpenProcess(PROCESS_DUP_HANDLE, FALSE, pid); - if (process) - { - DuplicateHandle(process, handle, GetCurrentProcess(), &local_handle, 0, FALSE, DUPLICATE_SAME_ACCESS); - CloseHandle(process); - } - } - return local_handle; + return HandleToULong(GetPropW(hwnd, prop_marshalleddroptarget)); } -static HRESULT create_stream_from_map(HANDLE map, IStream **stream) +static IDropTarget* get_droptarget_pointer(HWND hwnd) { - HRESULT hr = E_OUTOFMEMORY; - HGLOBAL hmem; - void *data; - MEMORY_BASIC_INFORMATION info; + IDropTarget *droptarget = NULL; + ATOM atom; + WCHAR guid_str[40]; + GUID guid; + HRESULT hr; - data = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 0); - if(!data) return hr; + atom = get_droptarget_local_handle(hwnd); + if (!atom) return NULL; - VirtualQuery(data, &info, sizeof(info)); - TRACE("size %d\n", (int)info.RegionSize); + if (GlobalGetAtomNameW(atom, guid_str, ARRAY_SIZE(guid_str)) == 0) + return NULL; - hmem = GlobalAlloc(GMEM_MOVEABLE, info.RegionSize); - if(hmem) + if (CLSIDFromString(guid_str, &guid) != S_OK) { - memcpy(GlobalLock(hmem), data, info.RegionSize); - GlobalUnlock(hmem); - hr = CreateStreamOnHGlobal(hmem, TRUE, stream); + ERR("Failed to convert string %s\n", debugstr_w(guid_str)); + return NULL; } - UnmapViewOfFile(data); - return hr; -} - -static IDropTarget* get_droptarget_pointer(HWND hwnd) -{ - IDropTarget *droptarget = NULL; - HANDLE map; - IStream *stream; - map = get_droptarget_local_handle(hwnd); - if(!map) return NULL; - - if(SUCCEEDED(create_stream_from_map(map, &stream))) + hr = CoGetClassObject(&guid, CLSCTX_SERVER, NULL, &IID_IDropTarget, (void**)&droptarget); + if (FAILED(hr)) { - CoUnmarshalInterface(stream, &IID_IDropTarget, (void**)&droptarget); - IStream_Release(stream); + ERR("CoGetClassObject failed (0x%08x)\n", hr); } - CloseHandle(map); + return droptarget; } -- 2.26.2

1 0

[PATCH] ntoskrnl.exe: Emulate full user shared data area range.
by Paul Gofman 18 May '20

18 May '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntoskrnl.exe/instr.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 0973b3a80a..dad4e5d660 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -33,6 +33,8 @@ #include "wine/debug.h" #include "wine/exception.h" +#define KSHARED_USER_DATA_PAGE_SIZE 0x1000 + #ifdef __i386__ WINE_DEFAULT_DEBUG_CHANNEL(int); @@ -790,9 +792,11 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) unsigned int data_size = (instr[1] == 0xb7) ? 2 : 1; SIZE_T offset = data - user_shared_data; - if (offset <= sizeof(KSHARED_USER_DATA) - data_size) + if (offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size) { ULONGLONG temp = 0; + + TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); memcpy( &temp, wine_user_shared_data + offset, data_size ); store_reg_word( context, instr[2], (BYTE *)&temp, long_op, rex ); context->Rip += prefixlen + len + 2; @@ -811,8 +815,9 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) unsigned int data_size = (*instr == 0x8b) ? get_op_size( long_op, rex ) : 1; SIZE_T offset = data - user_shared_data; - if (offset <= sizeof(KSHARED_USER_DATA) - data_size) + if (offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size) { + TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); switch (*instr) { case 0x8a: store_reg_byte( context, instr[1], wine_user_shared_data + offset, rex ); break; @@ -832,8 +837,9 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) SIZE_T offset = data - user_shared_data; len = long_addr ? sizeof(DWORD64) : sizeof(DWORD); - if (offset <= sizeof(KSHARED_USER_DATA) - data_size) + if (offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size) { + TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); memcpy( &context->Rax, wine_user_shared_data + offset, data_size ); context->Rip += prefixlen + len + 1; return ExceptionContinueExecution; -- 2.26.2

1 0

[PATCH] msvcrt: Fix a couple of spelling errors in comments.
by Francois Gouget 18 May '20

18 May '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msvcrt/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 407f819884d..7baf8eee8e8 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -864,7 +864,7 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), if(b.data[BNUM_IDX(b.b)]) break; } - /* move decimal point to limb boundry */ + /* move decimal point to limb boundary */ if(limb_digits==dp && b.b==b.e-1) return make_double(sign, 0, b.data[BNUM_IDX(b.e-1)], ROUND_ZERO, err); off = (dp - limb_digits) % LIMB_DIGITS; @@ -893,7 +893,7 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), } /* Check if fractional part is non-zero */ - /* Caution: it's only correct because bnum_to_mant returns more then 53 bits */ + /* Caution: it's only correct because bnum_to_mant returns more than 53 bits */ for(i=b.e-3; i>=b.b; i--) { if (!b.data[BNUM_IDX(b.b)]) continue; round = ROUND_DOWN; -- 2.20.1

2 1