September 2023 - Wine-commits

Joel Holdsworth : ntdll/tests: Update link test to reflect Windows 11 behaviour.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: wine Branch: master Commit: 50dfe977b7cf1dfb4a929fd9468798ef5f233bd7 URL: https://gitlab.winehq.org/wine/wine/-/commit/50dfe977b7cf1dfb4a929fd9468798… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon Aug 7 14:50:43 2023 +0100 ntdll/tests: Update link test to reflect Windows 11 behaviour. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 556ba351809..41882778488 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2413,7 +2413,8 @@ static void test_file_link_information(void) io.Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( io.Status == 0xdeadbeef , "io.Status expected 0xdeadbeef, got %lx\n", io.Status ); + ok( io.Status == 0xdeadbeef || io.Status == STATUS_FILE_IS_A_DIRECTORY , + "io.Status expected 0xdeadbeef or STATUS_FILE_IS_A_DIRECTORY, got %lx\n", io.Status ); ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); @@ -2460,7 +2461,8 @@ static void test_file_link_information(void) io.Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( io.Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", io.Status ); + ok( io.Status == 0xdeadbeef || io.Status == STATUS_FILE_IS_A_DIRECTORY, + "io.Status expected 0xdeadbeef or STATUS_FILE_IS_A_DIRECTORY, got %lx\n", io.Status ); ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); @@ -2494,7 +2496,8 @@ static void test_file_link_information(void) io.Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( io.Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", io.Status ); + ok( io.Status == 0xdeadbeef || io.Status == STATUS_FILE_IS_A_DIRECTORY, + "io.Status expected 0xdeadbeef or STATUS_FILE_IS_A_DIRECTORY, got %lx\n", io.Status ); ok( res == STATUS_OBJECT_NAME_COLLISION || res == STATUS_FILE_IS_A_DIRECTORY /* > Win XP */, "res expected STATUS_OBJECT_NAME_COLLISION or STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2531,7 +2534,8 @@ static void test_file_link_information(void) io.Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( io.Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", io.Status ); + ok( io.Status == 0xdeadbeef || io.Status == STATUS_FILE_IS_A_DIRECTORY, + "io.Status expected 0xdeadbeef or STATUS_FILE_IS_A_DIRECTORY, got %lx\n", io.Status ); ok( res == STATUS_OBJECT_NAME_COLLISION || res == STATUS_FILE_IS_A_DIRECTORY /* > Win XP */, "res expected STATUS_OBJECT_NAME_COLLISION or STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2566,7 +2570,8 @@ static void test_file_link_information(void) io.Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( io.Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", io.Status ); + ok( io.Status == 0xdeadbeef || io.Status == STATUS_FILE_IS_A_DIRECTORY, + "io.Status expected 0xdeadbeef or STATUS_FILE_IS_A_DIRECTORY, got %lx\n", io.Status ); ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); @@ -2602,7 +2607,8 @@ static void test_file_link_information(void) io.Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( io.Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", io.Status ); + ok( io.Status == 0xdeadbeef || io.Status == STATUS_FILE_IS_A_DIRECTORY, + "io.Status expected 0xdeadbeef or STATUS_FILE_IS_A_DIRECTORY, got %lx\n", io.Status ); ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); @@ -2639,7 +2645,8 @@ static void test_file_link_information(void) io.Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( io.Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", io.Status ); + ok( io.Status == 0xdeadbeef || io.Status == STATUS_FILE_IS_A_DIRECTORY, + "io.Status expected 0xdeadbeef or STATUS_FILE_IS_A_DIRECTORY, got %lx\n", io.Status ); ok( res == STATUS_OBJECT_NAME_COLLISION || res == STATUS_FILE_IS_A_DIRECTORY /* > Win XP */, "res expected STATUS_OBJECT_NAME_COLLISION or STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2676,7 +2683,8 @@ static void test_file_link_information(void) io.Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( io.Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", io.Status ); + ok( io.Status == 0xdeadbeef || io.Status == STATUS_FILE_IS_A_DIRECTORY, + "io.Status expected 0xdeadbeef or STATUS_FILE_IS_A_DIRECTORY, got %lx\n", io.Status ); ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); @@ -2715,7 +2723,8 @@ static void test_file_link_information(void) io.Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); - todo_wine ok( io.Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", io.Status ); + ok( io.Status == 0xdeadbeef || io.Status == STATUS_FILE_IS_A_DIRECTORY, + "io.Status expected 0xdeadbeef or STATUS_FILE_IS_A_DIRECTORY, got %lx\n", io.Status ); ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" );

1 0

Alexandre Julliard : include: Add DECLSPEC_NOINLINE macro.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: wine Branch: master Commit: d08723fbf797d89599255e4cd5cfe2f7d9cc8956 URL: https://gitlab.winehq.org/wine/wine/-/commit/d08723fbf797d89599255e4cd5cfe2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 13 22:05:17 2023 +0200 include: Add DECLSPEC_NOINLINE macro. --- include/winnt.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index c1f007d0536..e5dc402c694 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -155,6 +155,16 @@ extern "C" { # endif #endif +#ifndef DECLSPEC_NOINLINE +# if defined(_MSC_VER) && (_MSC_VER >= 1300) +# define DECLSPEC_NOINLINE __declspec(noinline) +# elif defined(__GNUC__) +# define DECLSPEC_NOINLINE __attribute__((noinline)) +# else +# define DECLSPEC_NOINLINE +# endif +#endif + #ifndef DECLSPEC_DEPRECATED # if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(MIDL_PASS) # define DECLSPEC_DEPRECATED __declspec(deprecated)

1 0

Alexandre Julliard : ntdll/tests: Fix some test failures on ARM64 Windows.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: wine Branch: master Commit: 78c77ae3e06e767a2aabb8e92626dd4e8a71daf7 URL: https://gitlab.winehq.org/wine/wine/-/commit/78c77ae3e06e767a2aabb8e92626dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 13 20:31:28 2023 +0200 ntdll/tests: Fix some test failures on ARM64 Windows. --- dlls/ntdll/tests/directory.c | 6 +++--- dlls/ntdll/tests/exception.c | 2 +- dlls/ntdll/tests/file.c | 22 +++++++++++----------- dlls/ntdll/tests/info.c | 2 +- dlls/ntdll/tests/pipe.c | 16 ++++++++-------- dlls/ntdll/tests/rtl.c | 26 ++++++++++++++------------ dlls/ntdll/tests/virtual.c | 12 ++++++++---- 7 files changed, 46 insertions(+), 40 deletions(-)

1 0

Jacek Caban : mshtml: Use unsigned types for bitfields.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: wine Branch: master Commit: 1913d265d755400851e9f8a366901571265a065f URL: https://gitlab.winehq.org/wine/wine/-/commit/1913d265d755400851e9f8a3669015… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 13 12:14:44 2023 +0200 mshtml: Use unsigned types for bitfields. --- dlls/mshtml/mshtml_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 59fbffa078c..5b9b1fac1b5 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -958,8 +958,8 @@ struct HTMLDocumentNode { nsIDOMDocument *dom_document; nsIDOMHTMLDocument *html_document; - BOOL content_ready : 1; - BOOL unload_sent : 1; + unsigned int content_ready : 1; + unsigned int unload_sent : 1; IHTMLDOMImplementation *dom_implementation; IHTMLNamespaceCollection *namespaces;

1 0

Jacek Caban : msvcrt: Use unsigned types for bitfields.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: wine Branch: master Commit: 7848941a4537e1ac18796ba67f2d2ba45a42ad26 URL: https://gitlab.winehq.org/wine/wine/-/commit/7848941a4537e1ac18796ba67f2d2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 13 12:14:49 2023 +0200 msvcrt: Use unsigned types for bitfields. --- dlls/msvcrt/file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 24d801a5306..58a607e3bbe 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -109,9 +109,9 @@ typedef struct { unsigned char wxflag; char textmode; char lookahead[3]; - char unicode : 1; - char utf8translations : 1; - char dbcsBufferUsed : 1; + unsigned int unicode : 1; + unsigned int utf8translations : 1; + unsigned int dbcsBufferUsed : 1; char dbcsBuffer[MB_LEN_MAX]; } ioinfo;

1 0

Jacek Caban : ole32/tests: Don't use bitfield for called_todo.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: wine Branch: master Commit: 3d50c79b64678dc5998021315f0c8e5f761714ac URL: https://gitlab.winehq.org/wine/wine/-/commit/3d50c79b64678dc5998021315f0c8e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 13 12:15:38 2023 +0200 ole32/tests: Don't use bitfield for called_todo. --- dlls/ole32/tests/dragdrop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index cc24efdcbd2..bd63c11401f 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -72,7 +72,7 @@ struct method_call HRESULT set_ret; DWORD set_param; - int called_todo : 1; + BOOL called_todo; }; const struct method_call *call_ptr;

1 0

Jacek Caban : regedit: Use unsigned types for bitfields.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: wine Branch: master Commit: 555394b79c5e993e8155a7e0dce8bcea25db99fc URL: https://gitlab.winehq.org/wine/wine/-/commit/555394b79c5e993e8155a7e0dce8bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 13 12:16:03 2023 +0200 regedit: Use unsigned types for bitfields. --- programs/regedit/hexedit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index d29c916918e..ac47b61dd6e 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -43,9 +43,9 @@ typedef struct tagHEXEDIT_INFO { HWND hwndSelf; HFONT hFont; - BOOL bFocus : 1; - BOOL bFocusHex : 1; /* TRUE if focus is on hex, FALSE if focus on ASCII */ - BOOL bInsert : 1; /* insert mode if TRUE, overwrite mode if FALSE */ + UINT bFocus : 1; + UINT bFocusHex : 1; /* TRUE if focus is on hex, FALSE if focus on ASCII */ + UINT bInsert : 1; /* insert mode if TRUE, overwrite mode if FALSE */ INT nHeight; /* height of text */ INT nCaretPos; /* caret pos in nibbles */ BYTE *pData;

1 0

Jacek Caban : shell32: Use unsigned types for bit fields.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: wine Branch: master Commit: 50adef1949d477e017c05ca414d3bf81c3af6783 URL: https://gitlab.winehq.org/wine/wine/-/commit/50adef1949d477e017c05ca414d3bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 13 12:16:55 2023 +0200 shell32: Use unsigned types for bit fields. --- dlls/shell32/shellpath.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index b09b35795fb..015d7cdd4e2 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3289,9 +3289,9 @@ static HRESULT set_folder_attributes(void) static const struct { const CLSID *clsid; - BOOL wfparsing : 1; - BOOL wfdisplay : 1; - BOOL hideasdel : 1; + unsigned int wfparsing : 1; + unsigned int wfdisplay : 1; + unsigned int hideasdel : 1; DWORD attr; DWORD call_for_attr; } folders[] =

1 0

Jacek Caban : shell32: Use a signed value to assign single signed bitfields values.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: wine Branch: master Commit: 81c05589afa9d88e5b7c4f3b3074d457a3df14b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/81c05589afa9d88e5b7c4f3b3074d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 13 12:18:10 2023 +0200 shell32: Use a signed value to assign single signed bitfields values. --- dlls/shell32/shellord.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 56f386c7944..a007c0e5c60 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -306,12 +306,12 @@ VOID WINAPI SHGetSettings(LPSHELLFLAGSTATE lpsfs, DWORD dwMask) if (SSF_SHOWSYSFILES & dwMask) lpsfs->fShowSysFiles = 0; } else if (dwData == 1) - { if (SSF_SHOWALLOBJECTS & dwMask) lpsfs->fShowAllObjects = 1; + { if (SSF_SHOWALLOBJECTS & dwMask) lpsfs->fShowAllObjects = -1; if (SSF_SHOWSYSFILES & dwMask) lpsfs->fShowSysFiles = 0; } else if (dwData == 2) { if (SSF_SHOWALLOBJECTS & dwMask) lpsfs->fShowAllObjects = 0; - if (SSF_SHOWSYSFILES & dwMask) lpsfs->fShowSysFiles = 1; + if (SSF_SHOWSYSFILES & dwMask) lpsfs->fShowSysFiles = -1; } } RegCloseKey (hKey); @@ -1182,15 +1182,15 @@ BOOL WINAPI ReadCabinetState(CABINETSTATE *cs, int length) memset(cs, 0, sizeof(*cs)); cs->cLength = sizeof(*cs); cs->nVersion = 2; - cs->fFullPathTitle = FALSE; - cs->fSaveLocalView = TRUE; - cs->fNotShell = FALSE; - cs->fSimpleDefault = TRUE; - cs->fDontShowDescBar = FALSE; - cs->fNewWindowMode = FALSE; - cs->fShowCompColor = FALSE; - cs->fDontPrettyNames = FALSE; - cs->fAdminsCreateCommonGroups = TRUE; + cs->fFullPathTitle = 0; + cs->fSaveLocalView = -1; + cs->fNotShell = 0; + cs->fSimpleDefault = -1; + cs->fDontShowDescBar = 0; + cs->fNewWindowMode = 0; + cs->fShowCompColor = 0; + cs->fDontPrettyNames = 0; + cs->fAdminsCreateCommonGroups = -1; cs->fMenuEnumFilter = 96; }

1 0

Daniel Lehman : msvcp110: Add std::_Throw_future_error.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: wine Branch: master Commit: c66eb79ed1439368562d7a58a3cb0e2d5c57efa7 URL: https://gitlab.winehq.org/wine/wine/-/commit/c66eb79ed1439368562d7a58a3cb0e… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Sep 7 22:16:39 2023 -0700 msvcp110: Add std::_Throw_future_error. --- dlls/msvcp110/msvcp110.spec | 4 +- dlls/msvcp120/msvcp120.spec | 4 +- dlls/msvcp120_app/msvcp120_app.spec | 4 +- dlls/msvcp140/msvcp140.spec | 4 +- dlls/msvcp90/exception.c | 73 +++++++++++++++++++++++++++++++++++++ dlls/msvcp_win/msvcp_win.spec | 4 +- 6 files changed, 83 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 074ca946b19..4326e9a4589 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1780,8 +1780,8 @@ @ cdecl -arch=win64 ?_Syserror_map(a)std@@YAPEBDH(a)Z(long) _Syserror_map @ stub ?_Throw_C_error(a)std@@YAXH(a)Z @ stub ?_Throw_Cpp_error(a)std@@YAXH(a)Z -@ stub -arch=win32 ?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z -@ stub -arch=win64 ?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z +@ cdecl -arch=win32 ?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z(ptr) _Throw_future_error +@ cdecl -arch=win64 ?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z(ptr) _Throw_future_error @ stub ?_Throw_lock_error(a)threads@stdext@@YAXXZ @ stub ?_Throw_resource_error(a)threads@stdext@@YAXXZ @ cdecl -arch=arm ?_Tidy@?$_Yarn(a)D@std@@AAAXXZ(ptr) _Yarn_char__Tidy diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 0d2a5fe0fca..615172a3376 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1741,8 +1741,8 @@ @ cdecl -arch=win64 ?_Syserror_map(a)std@@YAPEBDH(a)Z(long) _Syserror_map @ stub ?_Throw_C_error(a)std@@YAXH(a)Z @ stub ?_Throw_Cpp_error(a)std@@YAXH(a)Z -@ stub -arch=win32 ?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z -@ stub -arch=win64 ?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z +@ cdecl -arch=win32 ?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z(ptr) _Throw_future_error +@ cdecl -arch=win64 ?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z(ptr) _Throw_future_error @ stub ?_Throw_lock_error(a)threads@stdext@@YAXXZ @ stub ?_Throw_resource_error(a)threads@stdext@@YAXXZ @ cdecl -arch=arm ?_Tidy@?$_Yarn(a)D@std@@AAAXXZ(ptr) _Yarn_char__Tidy diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index d11ba788898..b8f7e4b69e2 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1741,8 +1741,8 @@ @ cdecl -arch=win64 ?_Syserror_map(a)std@@YAPEBDH(a)Z(long) msvcp120.?_Syserror_map(a)std@@YAPEBDH(a)Z @ stub ?_Throw_C_error(a)std@@YAXH(a)Z @ stub ?_Throw_Cpp_error(a)std@@YAXH(a)Z -@ stub -arch=win32 ?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z -@ stub -arch=win64 ?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z +@ cdecl -arch=win32 ?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z(ptr) msvcp120.?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z +@ cdecl -arch=win64 ?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z(ptr) msvcp120.?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z @ stub ?_Throw_lock_error(a)threads@stdext@@YAXXZ @ stub ?_Throw_resource_error(a)threads@stdext@@YAXXZ @ cdecl -arch=arm ?_Tidy@?$_Yarn(a)D@std@@AAAXXZ(ptr) msvcp120.?_Tidy@?$_Yarn(a)D@std@@AAAXXZ diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 8e57b828182..258a5acc648 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1625,8 +1625,8 @@ @ cdecl -arch=win64 ?_Syserror_map(a)std@@YAPEBDH(a)Z(long) _Syserror_map @ stub ?_Throw_C_error(a)std@@YAXH(a)Z @ stub ?_Throw_Cpp_error(a)std@@YAXH(a)Z -@ stub -arch=win32 ?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z -@ stub -arch=win64 ?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z +@ cdecl -arch=win32 ?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z(ptr) _Throw_future_error +@ cdecl -arch=win64 ?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z(ptr) _Throw_future_error @ cdecl -arch=arm ?_Tidy@?$_Yarn(a)D@std@@AAAXXZ(ptr) _Yarn_char__Tidy @ thiscall -arch=i386 ?_Tidy@?$_Yarn(a)D@std@@AAEXXZ(ptr) _Yarn_char__Tidy @ cdecl -arch=win64 ?_Tidy@?$_Yarn(a)D@std@@AEAAXXZ(ptr) _Yarn_char__Tidy diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 66a5061a4f0..63c698f3c6c 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -948,6 +948,68 @@ bool __cdecl MSVCP__uncaught_exception(void) } #if _MSVCP_VER >= 110 +typedef struct +{ + int code; + void *category; +} error_code; + +typedef struct +{ + logic_error base; + error_code code; +} future_error; + +extern const vtable_ptr future_error_vtable; + +DEFINE_THISCALL_WRAPPER(future_error_copy_ctor, 8) +future_error* __thiscall future_error_copy_ctor(future_error *this, const future_error *rhs) +{ + logic_error_copy_ctor(&this->base, &rhs->base); + this->code = rhs->code; + this->base.e.vtable = &future_error_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_future_error_what, 4) +const char* __thiscall MSVCP_future_error_what(future_error *this) +{ + const char *names[4] = { + "broken promise", + "future already retrieved", + "promise already satisfied", + "no state", + }; +#if _MSVCP_VER == 110 + int code = this->code.code; +#else + int code = this->code.code-1; +#endif + TRACE("%p\n", this); + return code >= 0 && code < ARRAY_SIZE(names) ? names[code] : NULL; +} + +DEFINE_RTTI_DATA3(future_error, 0, &future_error_rtti_base_descriptor, + &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, + ".?AVfuture_error(a)std@@") +DEFINE_CXX_DATA3(future_error, &logic_error_cxx_type_info, &logic_error_cxx_type_info, + &exception_cxx_type_info, MSVCP_logic_error_dtor) + +/* ?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z */ +/* ?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z */ +void __cdecl DECLSPEC_NORETURN _Throw_future_error( const error_code *error_code ) +{ + future_error e; + const char *name = ""; + + TRACE("(%p)\n", error_code); + + MSVCP_logic_error_ctor(&e.base, EXCEPTION_NAME(name)); + e.code = *error_code; + e.base.e.vtable = &future_error_vtable; + _CxxThrowException(&e, &future_error_cxx_type); +} + typedef struct { EXCEPTION_RECORD *rec; @@ -1360,6 +1422,11 @@ __ASM_BLOCK_BEGIN(exception_vtables) EXCEPTION_VTABLE(runtime_error, VTABLE_ADD_FUNC(MSVCP_runtime_error_vector_dtor) VTABLE_ADD_FUNC(MSVCP_runtime_error_what)); +#if _MSVCP_VER >= 110 + EXCEPTION_VTABLE(future_error, + VTABLE_ADD_FUNC(MSVCP_logic_error_vector_dtor) + VTABLE_ADD_FUNC(MSVCP_future_error_what)); +#endif #if _MSVCP_VER > 110 EXCEPTION_VTABLE(_System_error, VTABLE_ADD_FUNC(MSVCP_failure_vector_dtor) @@ -1422,6 +1489,9 @@ void init_exception(void *base) init_out_of_range_rtti(base); init_invalid_argument_rtti(base); init_runtime_error_rtti(base); +#if _MSVCP_VER >= 110 + init_future_error_rtti(base); +#endif #if _MSVCP_VER > 110 init__System_error_rtti(base); #endif @@ -1439,6 +1509,9 @@ void init_exception(void *base) init_out_of_range_cxx(base); init_invalid_argument_cxx(base); init_runtime_error_cxx(base); +#if _MSVCP_VER >= 110 + init_future_error_cxx(base); +#endif #if _MSVCP_VER > 110 init__System_error_cxx_type_info(base); #endif diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index 0e05582e251..99b34ccc9ac 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -1625,8 +1625,8 @@ @ cdecl -arch=win64 ?_Syserror_map(a)std@@YAPEBDH(a)Z(long) msvcp140.?_Syserror_map(a)std@@YAPEBDH(a)Z @ stub ?_Throw_C_error(a)std@@YAXH(a)Z @ stub ?_Throw_Cpp_error(a)std@@YAXH(a)Z -@ stub -arch=win32 ?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z -@ stub -arch=win64 ?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z +@ cdecl -arch=win32 ?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z(ptr) msvcp140.?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z +@ cdecl -arch=win64 ?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z(ptr) msvcp140.?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z @ cdecl -arch=arm ?_Tidy@?$_Yarn(a)D@std@@AAAXXZ(ptr) msvcp140.?_Tidy@?$_Yarn(a)D@std@@AAAXXZ @ thiscall -arch=i386 ?_Tidy@?$_Yarn(a)D@std@@AAEXXZ(ptr) msvcp140.?_Tidy@?$_Yarn(a)D@std@@AAEXXZ @ cdecl -arch=win64 ?_Tidy@?$_Yarn(a)D@std@@AEAAXXZ(ptr) msvcp140.?_Tidy@?$_Yarn(a)D@std@@AEAAXXZ

1 0