January 2018 - Wine-Commits

Piotr Caban : wine.inf: Add Windows Messaging Subsystem MAPI registry key.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 62c723194a4d3ac231847ace31bdf2768427fdc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62c723194a4d3ac231847ace… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 31 19:42:53 2017 +0100 wine.inf: Add Windows Messaging Subsystem MAPI registry key. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bc865fa41a56dfb54b0ed59c02bf180fa764a4c6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 923b3ab..64fa25a 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -679,6 +679,7 @@ HKLM,Software\Microsoft\SystemCertificates,,16 HKLM,Software\Microsoft\TermServLicensing,,16 HKLM,Software\Microsoft\Transaction Server,,16 HKLM,Software\Microsoft\WBEM,"Installation Directory",2,"%11%\wbem" +HKLM,Software\Microsoft\Windows Messaging Subsystem,"MAPI",2,"1" HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\hivelist,,16

1 0

Huw Davies : ole32: In the non-aggregated case a request for IUnknown actually returns IOleCache2.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: b1fdac06896b73c55c678699d65a3a78fd6edf1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1fdac06896b73c55c678699… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 5 13:11:06 2017 +0100 ole32: In the non-aggregated case a request for IUnknown actually returns IOleCache2. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 87ccecbfa24e88d80c292d165b3223683b409bfa) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/datacache.c | 5 ++++- dlls/ole32/tests/ole2.c | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 441a874..71c87fa 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -886,7 +886,10 @@ static HRESULT WINAPI DataCache_NDIUnknown_QueryInterface( if (IsEqualIID(&IID_IUnknown, riid)) { - *ppvObject = iface; + if (this->outer_unk == iface) /* non-aggregated, return IUnknown from IOleCache2 */ + *ppvObject = &this->IOleCache2_iface; + else + *ppvObject = iface; } else if (IsEqualIID(&IID_IDataObject, riid)) { diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index afff6ba..7367beb 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1528,7 +1528,7 @@ static void test_data_cache(void) IOleCache2 *pOleCache; IOleCache *olecache; IStorage *pStorage; - IUnknown *unk; + IUnknown *unk, *unk2; IPersistStorage *pPS; IViewObject *pViewObject; IOleCacheControl *pOleCacheControl; @@ -1619,10 +1619,12 @@ static void test_data_cache(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IUnknown_QueryInterface(unk, &IID_IOleCache2, (void**)&pOleCache); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void**)&unk2); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(unk == (IUnknown*)olecache, "got %p, expected %p\n", olecache, unk); ok(unk == (IUnknown*)pOleCache, "got %p, expected %p\n", pOleCache, unk); -} + ok(unk == unk2, "got %p, expected %p\n", unk2, unk); + IUnknown_Release(unk2); IOleCache2_Release(pOleCache); IOleCache_Release(olecache); IUnknown_Release(unk);

1 0

Fabian Maurer : wineboot: In ProcessRunKeys use correct parentheses in condition.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 15d541f667c17f7ad69cd0e797cddf8b8707f1f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15d541f667c17f7ad69cd0e7… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 24 20:05:52 2017 +0200 wineboot: In ProcessRunKeys use correct parentheses in condition. Spotted by David Binderman. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8fc3f3437c260db23ddff453f9a9d5f79564b24d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wineboot/wineboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index ee5b8d4..2a65b9e 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -682,7 +682,7 @@ static BOOL ProcessRunKeys( HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete, return TRUE; if ((res = RegCreateKeyExW( hkWin, szKeyName, 0, NULL, 0, bDelete ? KEY_ALL_ACCESS : KEY_READ, - NULL, &hkRun, &dispos ) != ERROR_SUCCESS)) + NULL, &hkRun, &dispos )) != ERROR_SUCCESS) { RegCloseKey( hkWin ); return TRUE;

1 0

Vincent Povirk : wine.inf: Put 64-bit .ds fakedlls in windows/twain_64.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 82c3db595fa78492fc6ab86fe7e7a77930cacb2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c3db595fa78492fc6ab86f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 18 16:44:26 2017 -0500 wine.inf: Put 64-bit .ds fakedlls in windows/twain_64. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 02c35582f6b1f2cd990b705eee09b36517be7d98) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 766a6e7..923b3ab 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -79,7 +79,7 @@ AddReg=\ [DefaultInstall.ntamd64] RegisterDlls=RegisterDllsSection -WineFakeDlls=FakeDlls +WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni CopyFiles=(a)l_intl.nls @@ -2529,6 +2529,11 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,dsound.vxd 11,,winhlp32.exe +; 64bit-only fake dlls +[FakeDllsWin64] +10,twain_64,sane.ds +10,twain_64,gphoto2.ds + ; Wow64-only fake dlls [FakeDllsWow64] ; create some directories first

1 0

Zebediah Figura : d3dcompiler: Fix a buffer size computation.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 483a9a47fa875445c3e2226f5d08414a6922ec0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=483a9a47fa875445c3e2226f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 7 11:38:58 2017 -0500 d3dcompiler: Fix a buffer size computation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 63d6dce04746237c1cb39c22914ed666c55178e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index c5f66d6..c2c415f 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1151,7 +1151,7 @@ preproc_directive: PRE_LINE STRING hlsl_ctx.line_no = $1; if (strcmp($2, hlsl_ctx.source_file)) new_array = d3dcompiler_realloc(hlsl_ctx.source_files, - sizeof(*hlsl_ctx.source_files) * hlsl_ctx.source_files_count + 1); + sizeof(*hlsl_ctx.source_files) * (hlsl_ctx.source_files_count + 1)); if (new_array) {

1 0

Alex Henrie : user32: Implement IDI_SHIELD.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: ee6db1cb74489ea32f8dce795c7d795f6aa9fc4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee6db1cb74489ea32f8dce79… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 19 10:23:46 2017 -0600 user32: Implement IDI_SHIELD. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c14a16b08911d1695e42b75c60436ace9f42ea01) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/Makefile.in | 1 + dlls/user32/resources/oic_shield.ico | Bin 0 -> 34494 bytes dlls/user32/resources/oic_shield.svg | 271 +++++++++++++++++++++++++++++++++++ dlls/user32/user32.rc | 2 + 4 files changed, 274 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee6db1cb74489ea32f8d…

1 0

Huw Davies : riched20: Add support for EM_PASTESPECIAL.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: b61290f53f57a4aa6762f0780406b264af8728ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=b61290f53f57a4aa6762f078… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 21 12:31:48 2017 +0100 riched20: Add support for EM_PASTESPECIAL. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9bec53fbad3b773db991dea9091fb0390592020d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/editor.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 103 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1ce444e..31f68cd 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2210,6 +2210,106 @@ static DWORD CALLBACK ME_ReadFromHGLOBALRTF(DWORD_PTR dwCookie, LPBYTE lpBuff, L return 0; } +static const WCHAR rtfW[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; + +static HRESULT paste_rtf(ME_TextEditor *editor, FORMATETC *fmt, STGMEDIUM *med) +{ + EDITSTREAM es; + ME_GlobalDestStruct gds; + HRESULT hr; + + gds.hData = med->u.hGlobal; + gds.nLength = 0; + es.dwCookie = (DWORD_PTR)&gds; + es.pfnCallback = ME_ReadFromHGLOBALRTF; + hr = ME_StreamIn( editor, SF_RTF | SFF_SELECTION, &es, FALSE ) == 0 ? E_FAIL : S_OK; + ReleaseStgMedium( med ); + return hr; +} + +static HRESULT paste_text(ME_TextEditor *editor, FORMATETC *fmt, STGMEDIUM *med) +{ + EDITSTREAM es; + ME_GlobalDestStruct gds; + HRESULT hr; + + gds.hData = med->u.hGlobal; + gds.nLength = 0; + es.dwCookie = (DWORD_PTR)&gds; + es.pfnCallback = ME_ReadFromHGLOBALUnicode; + hr = ME_StreamIn( editor, SF_TEXT | SF_UNICODE | SFF_SELECTION, &es, FALSE ) == 0 ? E_FAIL : S_OK; + ReleaseStgMedium( med ); + return hr; +} + +static struct paste_format +{ + FORMATETC fmt; + HRESULT (*paste)(ME_TextEditor *, FORMATETC *, STGMEDIUM *); + const WCHAR *name; +} paste_formats[] = +{ + {{ -1, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, paste_rtf, rtfW }, + {{ CF_UNICODETEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, paste_text }, + {{ 0 }} +}; + +static void init_paste_formats(void) +{ + struct paste_format *format; + static int done; + + if (!done) + { + for (format = paste_formats; format->fmt.cfFormat; format++) + { + if (format->name) + format->fmt.cfFormat = RegisterClipboardFormatW( format->name ); + } + done = 1; + } +} + +static BOOL paste_special(ME_TextEditor *editor, UINT cf, REPASTESPECIAL *ps, BOOL check_only) +{ + HRESULT hr; + STGMEDIUM med; + struct paste_format *format; + IDataObject *data; + + init_paste_formats(); + + if (ps && ps->dwAspect != DVASPECT_CONTENT) + FIXME("Ignoring aspect %x\n", ps->dwAspect); + + hr = OleGetClipboard( &data ); + if (hr != S_OK) return FALSE; + + if (cf == CF_TEXT) cf = CF_UNICODETEXT; + + hr = S_FALSE; + for (format = paste_formats; format->fmt.cfFormat; format++) + { + if (cf && cf != format->fmt.cfFormat) continue; + hr = IDataObject_QueryGetData( data, &format->fmt ); + if (hr == S_OK) + { + if (!check_only) + { + hr = IDataObject_GetData( data, &format->fmt, &med ); + if (hr != S_OK) goto done; + hr = format->paste( editor, &format->fmt, &med ); + } + break; + } + } + +done: + IDataObject_Release( data ); + + return hr == S_OK; +} + static BOOL ME_Paste(ME_TextEditor *editor) { DWORD dwFormat = 0; @@ -3414,7 +3514,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, UNSUPPORTED_MSG(EM_GETTYPOGRAPHYOPTIONS) UNSUPPORTED_MSG(EM_GETUNDONAME) UNSUPPORTED_MSG(EM_GETWORDBREAKPROCEX) - UNSUPPORTED_MSG(EM_PASTESPECIAL) UNSUPPORTED_MSG(EM_SELECTIONTYPE) UNSUPPORTED_MSG(EM_SETBIDIOPTIONS) UNSUPPORTED_MSG(EM_SETEDITSTYLE) @@ -3983,6 +4082,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_MBUTTONDOWN: ME_Paste(editor); return 0; + case EM_PASTESPECIAL: + paste_special( editor, wParam, (REPASTESPECIAL *)lParam, FALSE ); + return 0; case WM_CUT: case WM_COPY: {

1 0

Alexandre Julliard : ntdll: Ignore the preload start address if it is zero.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 90d397109fac1d1503a677dd86fecc3bb8b5778f URL: https://source.winehq.org/git/wine.git/?a=commit;h=90d397109fac1d1503a677dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 9 10:44:29 2017 +0200 ntdll: Ignore the preload start address if it is zero. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0374d86c571724b7100308047653d8b300072afb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/virtual.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e225639..5a50312 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1327,7 +1327,8 @@ void virtual_init(void) preload_reserve_start = (void *)start; preload_reserve_end = (void *)end; /* some apps start inside the DOS area */ - address_space_start = min( address_space_start, preload_reserve_start ); + if (preload_reserve_start) + address_space_start = min( address_space_start, preload_reserve_start ); } }

1 0

Alexandre Julliard : ntdll: Support loading binaries that start inside the DOS area.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 7b34af8dccdca38290ec760678c666d9f111105b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b34af8dccdca38290ec7606… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 27 09:30:05 2017 +0200 ntdll: Support loading binaries that start inside the DOS area. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a27f187503f55de4b0c703bdb2d24dd07cd63cc1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/virtual.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e826fa0..e225639 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1326,6 +1326,8 @@ void virtual_init(void) { preload_reserve_start = (void *)start; preload_reserve_end = (void *)end; + /* some apps start inside the DOS area */ + address_space_start = min( address_space_start, preload_reserve_start ); } }

1 0

Daniel Lehman : msvcrt: Add __ExceptionPtrAssign.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 946bae9bbc01538fb5696286bed026fb45612f67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=946bae9bbc01538fb5696286… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Apr 4 10:00:31 2017 -0700 msvcrt: Add __ExceptionPtrAssign. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 867a27c96429cafaf8858c361625612b7817e951) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/cpp.c | 12 ++++++++++++ 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index ec8ae3b..a1aa8ec 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1689,8 +1689,8 @@ @ stub ?_Xregex_error(a)std@@YAXW4error_type(a)regex_constants@1@@Z @ cdecl -arch=win32 ?_Xruntime_error(a)std@@YAXPBD(a)Z(str) _Xruntime_error @ cdecl -arch=win64 ?_Xruntime_error(a)std@@YAXPEBD(a)Z(str) _Xruntime_error -@ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPAXPBX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPBX0(a)Z @ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPEBX0(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX(a)Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index cc610f6..f45ecf9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -408,8 +408,8 @@ @ stub -arch=win32 ?_ValidateWrite@@YAHPAXI(a)Z @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI(a)Z @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() SpinCount__Value -@ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrAssign +@ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c37cfdd..8e44ded 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -686,8 +686,8 @@ @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI(a)Z @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() SpinCount__Value @ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ -@ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrAssign +@ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index fc3e06c..18b5b76 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -668,8 +668,8 @@ @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI(a)Z @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() SpinCount__Value @ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ -@ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrAssign +@ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index fde270e..3bc8270 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -664,8 +664,8 @@ @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI(a)Z @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() msvcr120.?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ @ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ -@ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPAXPBX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPBX0(a)Z @ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPEBX0(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX(a)Z diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index eedd0db..4d0d9b5 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1347,6 +1347,18 @@ void __cdecl __ExceptionPtrCopy(exception_ptr *ep, const exception_ptr *copy) } /********************************************************************* + * ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z + * ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z + */ +void __cdecl __ExceptionPtrAssign(exception_ptr *ep, const exception_ptr *assign) +{ + TRACE("(%p %p)\n", ep, assign); + + /* don't destroy object stored in ep */ + *ep = *assign; +} + +/********************************************************************* * ?__ExceptionPtrRethrow@@YAXPBX(a)Z * ?__ExceptionPtrRethrow@@YAXPEBX(a)Z */

1 0