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

Francois Gouget : kernel32/tests: Test GetDateFormatA()'s Unicode to ANSI conversion.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 263157a03d7174824d0a6b1f28e0e274455f1bc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=263157a03d7174824d0a6b1f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 26 18:26:29 2021 +0200 kernel32/tests: Test GetDateFormatA()'s Unicode to ANSI conversion. The ANSI string may be longer than the Unicode one and GetDateFormatA()'s return value should reflect that. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 45bf56d8ad7..43dcf2a7dbf 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -839,6 +839,7 @@ static void test_GetDateFormatA(void) SYSTEMTIME curtime; LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); LCID lcid_ru = MAKELCID(MAKELANGID(LANG_RUSSIAN, SUBLANG_NEUTRAL), SORT_DEFAULT); + LCID lcid_ja = MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN), SORT_DEFAULT); char buffer[BUFFER_SIZE], Expected[BUFFER_SIZE]; char short_day[10], month[10], genitive_month[10]; @@ -959,6 +960,27 @@ static void test_GetDateFormatA(void) ret = GetDateFormatA(lcid_ru, 0, &curtime, "ddd',' MMMM dd", buffer, ARRAY_SIZE(buffer)); sprintf(Expected, "%s, %s 04", short_day, genitive_month); expect_str(ret, buffer, Expected); + + /* The ANSI string may be longer than the Unicode one. + * In particular, in the Japanese code page, "\x93\xfa" = L"\x65e5". + * See the corresponding GetDateFormatW() test. + */ + + ret = GetDateFormatA(lcid_ja, 0, &curtime, "d\x93\xfa", buffer, 4); + if (broken(1)) /* FIXME Remove once Wine is less broken */ + expect_str(ret, buffer, "4\x93\xfa"); /* only 2+1 WCHARs */ + todo_wine ok(ret == strlen("4\x93\xfa") + 1, "Expected ret %d, got %d\n", strlen("4\x93\xfa") + 1, ret); + ok(strcmp(buffer, "4\x93\xfa") == 0, "Expected '4\x93\xfa', got '%s'\n", buffer); + + ret = GetDateFormatA(lcid_ja, 0, &curtime, "d\x93\xfa", buffer, 3); + todo_wine expect_err(ret, NULL, ERROR_INSUFFICIENT_BUFFER); + SetLastError(0xdeadbeef); + + strcpy(buffer, "pristine"); /* clear previous identical result */ + ret = GetDateFormatA(lcid_ja, 0, &curtime, "d\x93\xfa", NULL, 0); + if (broken(1)) /* FIXME Remove once Wine is less broken */ + expect_str(ret, NULL, "4\x93\xfa"); + todo_wine ok(ret == strlen("4\x93\xfa") + 1, "Expected ret %d, got %d\n", strlen("4\x93\xfa") + 1, ret); } static void test_GetDateFormatEx(void) @@ -1115,6 +1137,20 @@ static void test_GetDateFormatW(void) wcscpy(buffer, L"pristine"); ret = GetDateFormatW (lcid, 0, &curtime, L"dddd d MMMM yyyy", buffer, ARRAY_SIZE(buffer)); expect_werr(ret, buffer, ERROR_INVALID_PARAMETER); + SetLastError(0xdeadbeef); + + /* See the corresponding GetDateFormatA() test */ + + lcid = MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN), SORT_DEFAULT); + + curtime.wYear = 2002; + curtime.wMonth = 5; + curtime.wDay = 4; + ret = GetDateFormatW(lcid, 0, &curtime, L"d\x65e5", buffer, 3); + expect_wstr(ret, buffer, L"4\x65e5"); + + ret = GetDateFormatW(lcid, 0, &curtime, L"d\x65e5", NULL, 0); + expect_wstr(ret, NULL, L"4\x65e5"); }

1 0

Francois Gouget : wined3d: Fix the spelling of a comment.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 135633bc2001e972a86a2b1708857df1eeaada55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=135633bc2001e972a86a2b17… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 14:50:14 2021 +0200 wined3d: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index c84fcba7d7d..24892e42b34 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1682,9 +1682,9 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) return false; } - /* A query need to either begin and end inside a single render pass, - * or begin and end ouside of a render pass. Occlusion queries, if issued - * ouside of a render pass, are queued up and only begun when a render + /* A query needs to either begin and end inside a single render pass, + * or begin and end outside of a render pass. Occlusion queries, if issued + * outside of a render pass, are queued up and only begun when a render * pass is started, to avoid interrupting it when the query ends. */ if (context_vk->vk_render_pass) {

1 0

Francois Gouget : ntoskrnl.exe: Fix the spelling of some comments.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 87a42df9f704e7d25eaaf2ec741531e26defdb99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87a42df9f704e7d25eaaf2ec… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 16:43:19 2021 +0200 ntoskrnl.exe: Fix the spelling of some comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index f11dce1cc93..9886be69ccb 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1355,7 +1355,7 @@ static void test_pnp_devices(void) ok(!ret, "failed to open child: %#x\n", ret); ret = DeviceIoControl(child, IOCTL_WINETEST_MARK_PENDING, NULL, 0, NULL, 0, &size, &ovl); - ok(!ret, "DeviceIoControl succeded\n"); + ok(!ret, "DeviceIoControl succeeded\n"); ok(GetLastError() == ERROR_IO_PENDING, "got error %u\n", GetLastError()); ok(size == 0, "got size %u\n", size); @@ -2693,12 +2693,12 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled SetLastError(0xdeadbeef); ret = ReadFile(async_file, report, caps.InputReportByteLength, NULL, &overlapped); - ok(!ret, "ReadFile succeded\n"); + ok(!ret, "ReadFile succeeded\n"); ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = ReadFile(async_file, buffer, caps.InputReportByteLength, NULL, &overlapped2); - ok(!ret, "ReadFile succeded\n"); + ok(!ret, "ReadFile succeeded\n"); ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError()); /* wait for second report to be ready */

1 0

Francois Gouget : include: Fix the spelling of a comment.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 8574c52095c6936653edbf09cd8255b702ed9496 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8574c52095c6936653edbf09… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 14:50:04 2021 +0200 include: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ntgdi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ntgdi.h b/include/ntgdi.h index 7e75b944e85..7d95c186c8f 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -134,7 +134,7 @@ enum typedef struct DC_ATTR { HDC hdc; /* handle to self */ - LONG disabled; /* disabled flag, controled by DCHF_(DISABLE|ENABLE)DC */ + LONG disabled; /* disabled flag, controlled by DCHF_(DISABLE|ENABLE)DC */ int save_level; COLORREF background_color; COLORREF brush_color;

1 0

Jacek Caban : gdi32: Use NtGdiGetCharWidthW for GetCharWidthI.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 7429be11f2804b71e1c18865e70d0c8f3716c91c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7429be11f2804b71e1c18865… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 26 13:45:18 2021 +0100 gdi32: Use NtGdiGetCharWidthW for GetCharWidthI. 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/gdi32/font.c | 67 +++++++++++++++++++------------------------------------ dlls/gdi32/text.c | 10 +++++++++ 2 files changed, 33 insertions(+), 44 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 4faaaacdfce..e80143066b5 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4872,9 +4872,30 @@ BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first, UINT last, WCHAR *chars, UINT i, count = last; BOOL ret; PHYSDEV dev; - DC * dc = get_dc_ptr( hdc ); + DC *dc; - if (!dc) return FALSE; + if (flags & NTGDI_GETCHARWIDTH_INDICES) + { + ABC *abc; + unsigned int i; + + if (!(abc = HeapAlloc(GetProcessHeap(), 0, count * sizeof(ABC)))) + return FALSE; + + if (!GetCharABCWidthsI( hdc, first, last, chars, abc )) + { + HeapFree( GetProcessHeap(), 0, abc ); + return FALSE; + } + + for (i = 0; i < count; i++) + ((INT *)buf)[i] = abc[i].abcA + abc[i].abcB + abc[i].abcC; + + HeapFree(GetProcessHeap(), 0, abc); + return TRUE; + } + + if (!(dc = get_dc_ptr( hdc ))) return FALSE; if (!chars) count = last - first + 1; dev = GET_DC_PHYSDEV( dc, pGetCharWidth ); @@ -7114,48 +7135,6 @@ BOOL WINAPI EnableEUDC(BOOL fEnableEUDC) return FALSE; } -/*********************************************************************** - * GetCharWidthI (GDI32.@) - * - * Retrieve widths of characters. - * - * PARAMS - * hdc [I] Handle to a device context. - * first [I] First glyph in range to query. - * count [I] Number of glyph indices to query. - * glyphs [I] Array of glyphs to query. - * buffer [O] Buffer to receive character widths. - * - * NOTES - * Only works with TrueType fonts. - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI GetCharWidthI(HDC hdc, UINT first, UINT count, LPWORD glyphs, LPINT buffer) -{ - ABC *abc; - unsigned int i; - - TRACE("(%p, %d, %d, %p, %p)\n", hdc, first, count, glyphs, buffer); - - if (!(abc = HeapAlloc(GetProcessHeap(), 0, count * sizeof(ABC)))) - return FALSE; - - if (!GetCharABCWidthsI(hdc, first, count, glyphs, abc)) - { - HeapFree(GetProcessHeap(), 0, abc); - return FALSE; - } - - for (i = 0; i < count; i++) - buffer[i] = abc[i].abcA + abc[i].abcB + abc[i].abcC; - - HeapFree(GetProcessHeap(), 0, abc); - return TRUE; -} - /*********************************************************************** * GetFontUnicodeRanges (GDI32.@) * diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index b31196252ad..c3d72938eba 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1672,3 +1672,13 @@ BOOL WINAPI GetCharWidthFloatA( HDC hdc, UINT first, UINT last, float *buffer ) HeapFree( GetProcessHeap(), 0, chars ); return ret; } + +/*********************************************************************** + * GetCharWidthI (GDI32.@) + */ +BOOL WINAPI GetCharWidthI( HDC hdc, UINT first, UINT count, WORD *glyphs, INT *buffer ) +{ + TRACE( "(%p, %d, %d, %p, %p)\n", hdc, first, count, glyphs, buffer ); + return NtGdiGetCharWidthW( hdc, first, count, glyphs, + NTGDI_GETCHARWIDTH_INT | NTGDI_GETCHARWIDTH_INDICES, buffer ); +}

1 0

Jacek Caban : gdi32: Use NtGdiGetCharWidthW for GetCharWidthFloatA.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 690a861b0a0290e3cfa7e3c63685bd0ea298f10d URL: https://source.winehq.org/git/wine.git/?a=commit;h=690a861b0a0290e3cfa7e3c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 26 13:45:17 2021 +0100 gdi32: Use NtGdiGetCharWidthW for GetCharWidthFloatA. 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/gdi32/font.c | 26 -------------------------- dlls/gdi32/text.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index cbf3f6fb555..4faaaacdfce 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6443,32 +6443,6 @@ done: return ret; } -/************************************************************************* - * GetCharWidthFloatA [GDI32.@] - */ -BOOL WINAPI GetCharWidthFloatA( HDC hdc, UINT first, UINT last, float *buffer ) -{ - WCHAR *wstr; - int i, wlen; - char *str; - - if (!(str = FONT_GetCharsByRangeA( hdc, first, last, &i ))) - return FALSE; - wstr = FONT_mbtowc( hdc, str, i, &wlen, NULL ); - heap_free(str); - - for (i = 0; i < wlen; ++i) - { - if (!GetCharWidthFloatW( hdc, wstr[i], wstr[i], &buffer[i] )) - { - heap_free(wstr); - return FALSE; - } - } - heap_free(wstr); - return TRUE; -} - /*********************************************************************** * * * Font Resource API * diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index b753dac7052..b31196252ad 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1657,3 +1657,18 @@ BOOL WINAPI GetCharWidthFloatW( HDC hdc, UINT first, UINT last, float *buffer ) { return NtGdiGetCharWidthW( hdc, first, last, NULL, 0, buffer ); } + +/*********************************************************************** + * GetCharWidthFloatA (GDI32.@) + */ +BOOL WINAPI GetCharWidthFloatA( HDC hdc, UINT first, UINT last, float *buffer ) +{ + WCHAR *chars; + INT count; + BOOL ret; + + if (!(chars = get_chars_by_range( hdc, first, last, &count ))) return FALSE; + ret = NtGdiGetCharWidthW( hdc, 0, count, chars, 0, buffer ); + HeapFree( GetProcessHeap(), 0, chars ); + return ret; +}

1 0

Piotr Caban : msvcp90: Fix _Xmem and _Nomemory exception message.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 5630ce26382cbf0eed29cdf9df68e087f188419f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5630ce26382cbf0eed29cdf9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 26 14:21:19 2021 +0200 msvcp90: Fix _Xmem and _Nomemory exception message. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 4eac9e92bc8..eec72b9964d 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -870,14 +870,14 @@ DEFINE_CXX_DATA2(range_error, &runtime_error_cxx_type_info, &exception_cxx_type_ void __cdecl _Nomemory(void) { TRACE("()\n"); - throw_exception(EXCEPTION_BAD_ALLOC, NULL); + throw_exception(EXCEPTION_BAD_ALLOC, "bad allocation"); } /* ?_Xmem(a)tr1@std@@YAXXZ */ void __cdecl _Xmem(void) { TRACE("()\n"); - throw_exception(EXCEPTION_BAD_ALLOC, NULL); + throw_exception(EXCEPTION_BAD_ALLOC, "bad allocation"); } /* ?_Xinvalid_argument(a)std@@YAXPBD(a)Z */

1 0

Piotr Caban : msvcp90: Don't use throw_exception helper for rethrow.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: eebc5c505e4eecb31d7829715b4bb1df393a9ea9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eebc5c505e4eecb31d782971… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 26 14:21:03 2021 +0200 msvcp90: Don't use throw_exception helper for rethrow. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 2 +- dlls/msvcp60/msvcp.h | 2 ++ dlls/msvcp90/cxx.h | 1 - dlls/msvcp90/details.c | 2 +- dlls/msvcp90/exception.c | 3 --- dlls/msvcp90/ios.c | 2 +- dlls/msvcp90/msvcp90.h | 2 ++ 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 764ec72e264..8657fd9b3e5 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -4847,7 +4847,7 @@ void __thiscall ios_base_clear_reraise(ios_base *this, IOSB_iostate state, bool return; if(reraise) - throw_exception(EXCEPTION_RERAISE, NULL); + _CxxThrowException(NULL, NULL); else if(this->state & this->except & IOSTATE_eofbit) throw_exception(EXCEPTION_FAILURE, "eofbit is set"); else if(this->state & this->except & IOSTATE_failbit) diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index fa42ba1b6be..d60a588b3eb 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -483,3 +483,5 @@ typedef struct { double real; double imag; } complex_double; + +void WINAPI DECLSPEC_NORETURN _CxxThrowException(exception*,const cxx_exception_type*); diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 012354ac9c8..50d78dbddb6 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -316,7 +316,6 @@ typedef struct __exception /* Internal: throws selected exception */ typedef enum __exception_type { - EXCEPTION_RERAISE, EXCEPTION, EXCEPTION_BAD_ALLOC, EXCEPTION_BAD_CAST, diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index 4d3abf46141..b265bf1be71 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -526,7 +526,7 @@ static void concurrent_vector_alloc_segment(_Concurrent_vector_base_v4 *this, __EXCEPT_ALL { this->segment[seg] = NULL; - throw_exception(EXCEPTION_RERAISE, NULL); + _CxxThrowException(NULL, NULL); } __ENDTRY if(!this->segment[seg]) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 7b87c44c1af..4eac9e92bc8 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -31,7 +31,6 @@ CREATE_TYPE_INFO_VTABLE #define CLASS_IS_SIMPLE_TYPE 1 #define CLASS_HAS_VIRTUAL_BASE_CLASS 4 -void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); int* __cdecl __processing_throw(void); #if _MSVCP_VER >= 70 || defined(_MSVCIRT) @@ -1044,8 +1043,6 @@ void throw_exception(exception_type et, const char *str) exception_name name = EXCEPTION_NAME(str); switch(et) { - case EXCEPTION_RERAISE: - _CxxThrowException(NULL, NULL); case EXCEPTION: { exception e; MSVCP_exception_ctor(&e, name); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index ea0c8783491..8275635096a 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5264,7 +5264,7 @@ void __thiscall ios_base_clear_reraise(ios_base *this, IOSB_iostate state, bool return; if(reraise) - throw_exception(EXCEPTION_RERAISE, NULL); + _CxxThrowException(NULL, NULL); else if(this->state & this->except & IOSTATE_eofbit) throw_exception(EXCEPTION_FAILURE, "eofbit is set"); else if(this->state & this->except & IOSTATE_failbit) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index a525c8adc1e..94098d84135 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -662,3 +662,5 @@ static inline int mbstowcs_wrapper( size_t *ret, wchar_t *wcs, size_t size, cons #define mbstowcs_s( ret, wcs, size, mbs, count ) mbstowcs_wrapper( ret, wcs, size, mbs, count ) #define hypotf( x, y ) ((float)hypot( (double)(x), (double)(y) )) #endif + +void WINAPI _CxxThrowException(exception*,const cxx_exception_type*);

1 0

Francois Gouget : user32/tests: Fix ASCII / ANSI mixups in dde comments.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: fa18bc566067c5b1dfff617b2ad517c10559fa74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa18bc566067c5b1dfff617b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:13:47 2021 +0200 user32/tests: Fix ASCII / ANSI mixups in dde comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dde.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 888801dad90..dc0bb85d736 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2438,7 +2438,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV test_cmd_w_to_a, sizeof(test_cmd_w_to_a), NULL, NULL ); switch (str_index) { - case 0: /* ASCII string */ + case 0: /* ANSI string */ if (unicode_server) { ok(size == size_a_to_w, "Wrong size %d/%d, msg_index=%d\n", size, size_a_to_w, msg_index); @@ -2447,7 +2447,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV } else if (unicode_client) { - /* ASCII string mapped W->A -> garbage */ + /* ANSI string mapped W->A -> garbage */ } else {

1 0

Piotr Caban : msvcp90: Remove MSVCP_SIZE_T_MAX definition.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 38d6dbc6f7bf4fc01d76e12556984b31879d53a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38d6dbc6f7bf4fc01d76e125… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 26 14:20:59 2021 +0200 msvcp90: Remove MSVCP_SIZE_T_MAX definition. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/details.c | 12 ++++++------ dlls/msvcp90/msvcp90.h | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index 4dc5c0ea98c..4d3abf46141 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -671,7 +671,7 @@ void * __thiscall _Concurrent_vector_base_v4__Internal_compact( (alloc_seg + 1) * sizeof(this->segment[0])); this->first_block = 0; _Concurrent_vector_base_v4__Internal_reserve(this, size, element_size, - MSVCP_SIZE_T_MAX / element_size); + ~(size_t)0 / element_size); for(i = 0; i < seg_no; i++) copy(this->segment[i], b->blocks[i], i ? 1 << i : 2); copy_element = size - ((1 << seg_no) & ~1); @@ -703,7 +703,7 @@ void __thiscall _Concurrent_vector_base_v4__Internal_copy( return; } _Concurrent_vector_base_v4__Internal_reserve(this, v_size, - element_size, MSVCP_SIZE_T_MAX / element_size); + element_size, ~(size_t)0 / element_size); seg_no = _vector_base_v4__Segment_index_of(v_size - 1); for(i = 0; i < seg_no; i++) copy(this->segment[i], v->segment[i], i ? 1 << i : 2); @@ -764,7 +764,7 @@ void __thiscall _Concurrent_vector_base_v4__Internal_assign( if(i < v_seg_no) { _Concurrent_vector_base_v4__Internal_reserve(this, v_size, - element_size, MSVCP_SIZE_T_MAX / element_size); + element_size, ~(size_t)0 / element_size); for(i++; i < v_seg_no; i++) copy(this->segment[i], v->segment[i], 1 << i); copy(this->segment[i], v->segment[i], v->early_size - (1 << i)); @@ -788,7 +788,7 @@ size_t __thiscall _Concurrent_vector_base_v4__Internal_grow_by( do { size = this->early_size; _Concurrent_vector_base_v4__Internal_reserve(this, size + count, element_size, - MSVCP_SIZE_T_MAX / element_size); + ~(size_t)0 / element_size); } while(InterlockedCompareExchangeSizeT(&this->early_size, size + count, size) != size); seg_no = size ? _vector_base_v4__Segment_index_of(size - 1) : 0; @@ -818,7 +818,7 @@ size_t __thiscall _Concurrent_vector_base_v4__Internal_grow_to_at_least_with_res TRACE("(%p %Iu %Iu %p %p)\n", this, count, element_size, copy, v); _Concurrent_vector_base_v4__Internal_reserve(this, count, element_size, - MSVCP_SIZE_T_MAX / element_size); + ~(size_t)0 / element_size); do { size = this->early_size; if(size >= count) return size; @@ -853,7 +853,7 @@ void * __thiscall _Concurrent_vector_base_v4__Internal_push_back( do { index = this->early_size; _Concurrent_vector_base_v4__Internal_reserve(this, index + 1, - element_size, MSVCP_SIZE_T_MAX / element_size); + element_size, ~(size_t)0 / element_size); } while(InterlockedCompareExchangeSizeT(&this->early_size, index + 1, index) != index); seg = _vector_base_v4__Segment_index_of(index); segment_base = (seg == 0) ? 0 : (1 << seg); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 6aee436df53..a525c8adc1e 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -24,7 +24,6 @@ #define CXX_EXCEPTION 0xe06d7363 #define ALIGNED_SIZE(size, alignment) (((size)+((alignment)-1))/(alignment)*(alignment)) -#define MSVCP_SIZE_T_MAX (~(size_t)0) #if _MSVCP_VER >= 100 typedef __int64 DECLSPEC_ALIGN(8) streamoff; typedef __int64 DECLSPEC_ALIGN(8) streamsize;

1 0