- wine-devel - winehq.org

0001-winex11.drv-Make-the-layered-window-set-transient-hi
by Chao Long 03 Sep '20

03 Sep '20

The Layer window did not reassociate TransientForHint after repainting. -------------- Chao Long

1 0

Regression in current directory initialization in wine-5.11+
by Puetz Kevin A 03 Sep '20

03 Sep '20

We've been having problems with a winelib tool executable (an oleaut typelib code generator somewhat like MSVC's #import) since wine-5.12, but we also have been having enough other issues that debugging it so we could upgrade to the latest wine-5.x hadn't reached the top of the pile to debug. Sorry for the delay in reporting this. The symptom is that it is now trying to write files outside the shadow build folder. This seems to be a regression with its use of libstdc++ file I/O and std::filesystem that are looking to the posix current directory. This use of posix I/O is deliberate; although it's using some wine functions internally, it is supposed to present a posix-path command-line interface since cmake/ninja/etc won't know anything about windows paths. However, the following change (maybe unintentionally) causes winelib executables to lose the cwd in which they were launched: >From df5e4764870e8ad1d8b206cb3475a073bc034e48 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard <julliard(a)winehq.org> Date: Wed, 17 Jun 2020 16:19:38 +0200 Subject: [PATCH] ntdll: Move the current directory initialization to the Unix library. ------------------------------- dlls/ntdll/env.c ------------------------------- index 992ec19fae..38f65c89d3 100644 @@ -1550,6 +1494,5 @@ done: RtlInitUnicodeString( &curdir, windows_dir ); RtlSetCurrentDirectory_U( &curdir ); } - if (!params->CurrentDirectory.Handle) chdir("/"); /* avoid locking removable devices */ set_wow64_environment( &params->Environment ); } ---------------------------- dlls/ntdll/unix/env.c ---------------------------- index 8b37d3dcca..de03bb566d 100644 @@ -919,4 +919,5 @@ void CDECL get_initial_directory MESSAGE("Warning: could not find DOS drive for current working directory '%s', " "starting in the Windows directory.\n", cwd ? cwd : "" ); free( cwd ); + chdir( "/" ); /* avoid locking removable devices */ } Note that the chdir("/") wasn't only moved into the unix library, it was also made unconditional instead of just being the fallback if there was no params->CurrentDirectory.Handle. So now winelib .exe.so programs are now almost always launched with their posix/win32 cwds mismatched, as can be seen with a simple test app: #include <windows.h> #include <stdio.h> #include <unistd.h> int main() { chdir("/tmp"); char win32_cwd[MAX_PATH]; char posix_cwd[MAX_PATH]; GetCurrentDirectory(sizeof(win32_cwd),win32_cwd); printf("win32_cwd = %s\n",win32_cwd); getcwd(posix_cwd,sizeof(posix_cwd)); printf("posix_cwd = %s\n",posix_cwd); } Which prints win32_cwd = Z:\home\foobar\cwd_test posix_cwd = / Up through wine 5.10, using "/" was just the fallback if there was no windows CurrentDirectory handle, so this would usually have printed: win32_cwd = Z:\home\foobar\cwd_test posix_cwd = /home/foobar/cwd_test Previously, if the current directory where the cwd.exe test script (or wine cwd.test.exe.so) was launched could be located by a windows path, the windows and posix cwds started out in sync with each other and with the process execution. Using Win32 or libstdc++ file I/O behaved consistently, which is what tlimport expected; if given relative paths it reads input and generates output in the current directory it was launched in. But params->CurrentDirectory is not visible in the unix half, so the condition can't just be restored, and I assume there was a good reason for moving this and you wouldn't want to just move the chdir back to ntdll But I'm not sure what that motivation was, so a fix or any input on what form of fix you'd like to see would be very welcome. If it *was* an intentional effect of the change, that's fine too; just say so. I can certainly adjust our tool to cope, it would just need something like chdir(wine_get_unix_file_name(GetCurrentDirectory())) in main() to get the two worlds back aligned. I'm not much concerned about the weird corner cases like running the tool in a deleted directory, where one couldn't navigate back by name. I think those would actually have had this behavior all along, since presumably wine couldn't have gotten params->CurrentDirectory.Handle

1 0

[PATCH v2] ws2_32: Very minimal support for AF_UNIX.
by Richard W.M. Jones 02 Sep '20

02 Sep '20

Any comments on this one? I previously posted a slightly different version: https://www.winehq.org/pipermail/wine-devel/2020-August/172582.html This version of the patch only changes the memcpy and memcmp calls so that we don't assume UNIX_PATH_MAX is always 108 bytes (on MacOS it's 104 bytes). I'm unable to test this on MacOS. On Linux I have tested this pretty extensively using nbdkit, our Network Block Device server, cross-compiled with mingw-w64 and running under Wine from git with this patch. https://github.com/libguestfs/nbdkit Rich.

3 3

[PATCH] crypt32: Remove unused variable in test_CryptBinaryToString().
by Gijs Vermeulen 02 Sep '20

02 Sep '20

This was missed in eb00dbd9134783242d0e3c21be8f5fafd4519d70. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/crypt32/tests/base64.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 7b9f4c1077..a48f0a5c44 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -240,7 +240,6 @@ static void test_CryptBinaryToString(void) { static const DWORD flags[] = { 0, CRYPT_STRING_NOCR, CRYPT_STRING_NOCRLF }; static const WCHAR hexdig[] = L"0123456789abcdef"; - OSVERSIONINFOA ver = { sizeof(ver) }; BYTE input[256 * sizeof(WCHAR)]; DWORD strLen, strLen2, i, j; WCHAR *hex, *cmp, *ptr; -- 2.28.0

1 0

[PATCH v3] msvcirt: Implement most of ifstream.
by Arkadiusz Hiler 02 Sep '20

02 Sep '20

Based on semi-stubs by Gijs Vermeulen. Tested with Power Tab Editor and GraphCalc - the crashes are gone and loading saved files seems to work correctly. ifstream::setbuf() is left as a stub - it will need some changes to filebuf::setbuf() first. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22616 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30014 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- v3: * constructors now return NULL and print a FIXME in OOM cases * ifstream_open_ctor and ifstream_open now come with implicit OPENMODE_in * IOSTATE is now handled in open, close and attach * test for IOSTATE changes as well as for lack of them * win32: fixed compilation warnings * fixed psb/pfb mixup v2: * use correct mangled symbols in the comment on top of setmode * set p_ifstream_dtor and p_ifstream_vbase_dtor in win32 path dlls/msvcirt/msvcirt.c | 182 +++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 68 +++++----- dlls/msvcirt/tests/msvcirt.c | 249 +++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 68 +++++----- dlls/msvcrt40/msvcrt40.spec | 68 +++++----- 5 files changed, 533 insertions(+), 102 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index f76eaf6d7ac..4c3bf8eb653 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -192,6 +192,8 @@ extern const vtable_ptr MSVCP_istream_vtable; extern const vtable_ptr MSVCP_istream_withassign_vtable; /* ??_7istrstream@@6B@ */ extern const vtable_ptr MSVCP_istrstream_vtable; +/* ??_7ifstream@@6B@ */ +extern const vtable_ptr MSVCP_ifstream_vtable; /* ??_7iostream@@6B@ */ extern const vtable_ptr MSVCP_iostream_vtable; /* ??_7strstream@@6B@ */ @@ -262,6 +264,8 @@ __ASM_BLOCK_BEGIN(vtables) VTABLE_ADD_FUNC(istream_vector_dtor)); __ASM_VTABLE(istrstream, VTABLE_ADD_FUNC(istream_vector_dtor)); + __ASM_VTABLE(ifstream, + VTABLE_ADD_FUNC(istream_vector_dtor)); __ASM_VTABLE(iostream, VTABLE_ADD_FUNC(iostream_vector_dtor)); __ASM_VTABLE(strstream, @@ -280,6 +284,7 @@ const int ostream_vbtable[] = {0, VBTABLE_ENTRY(ostream, FIELD_OFFSET(ostream, v /* ??_8istream@@7B@ */ /* ??_8istream_withassign@@7B@ */ /* ??_8istrstream@@7B@ */ +/* ??_8ifstream@@7B@ */ const int istream_vbtable[] = {0, VBTABLE_ENTRY(istream, FIELD_OFFSET(istream, vbtable), ios)}; /* ??_8iostream@@7Bistream@@@ */ /* ??_8stdiostream@@7Bistream@@@ */ @@ -305,6 +310,8 @@ DEFINE_RTTI_DATA2(istream_withassign, sizeof(istream), &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVistream_withassign@@") DEFINE_RTTI_DATA2(istrstream, sizeof(istream), &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVistrstream@@") +DEFINE_RTTI_DATA2(ifstream, sizeof(istream), + &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVifstream@@") DEFINE_RTTI_DATA4(iostream, sizeof(iostream), &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, &ostream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AViostream@@") @@ -3113,6 +3120,8 @@ istream* __thiscall istream_copy_ctor(istream *this, const istream *copy, BOOL v /* ??1istream_withassign@@UEAA@XZ */ /* ??1istrstream@@UAE@XZ */ /* ??1istrstream@@UEAA@XZ */ +/* ??1ifstream@@UAE@XZ */ +/* ??1ifstream@@UEAA@XZ */ DEFINE_THISCALL_WRAPPER(istream_dtor, 4) void __thiscall istream_dtor(ios *base) { @@ -3152,6 +3161,8 @@ istream* __thiscall istream_assign_sb(istream *this, streambuf *sb) /* ??4istream_withassign@@QEAAAEAVistream@@AEBV1@@Z */ /* ??4istrstream@@QAEAAV0@ABV0@@Z */ /* ??4istrstream@@QEAAAEAV0@AEBV0@@Z */ +/* ??4ifstream@@QAEAAV0@ABV0@@Z */ +/* ??4ifstream@@QEAAAEAV0@AEBV0@@Z */ DEFINE_THISCALL_WRAPPER(istream_assign, 8) istream* __thiscall istream_assign(istream *this, const istream *rhs) { @@ -3164,6 +3175,8 @@ istream* __thiscall istream_assign(istream *this, const istream *rhs) /* ??_Distream_withassign@@QEAAXXZ */ /* ??_Distrstream@@QAEXXZ */ /* ??_Distrstream@@QEAAXXZ */ +/* ??_Difstream@@QAEXXZ */ +/* ??_Difstream@@QEAAXXZ */ DEFINE_THISCALL_WRAPPER(istream_vbase_dtor, 4) void __thiscall istream_vbase_dtor(istream *this) { @@ -3178,6 +3191,7 @@ void __thiscall istream_vbase_dtor(istream *this) /* ??_Eistream@@UAEPAXI@Z */ /* ??_Eistream_withassign@@UAEPAXI@Z */ /* ??_Eistrstream@@UAEPAXI@Z */ +/* ??_Eifstream@@UAEPAXI@Z */ DEFINE_THISCALL_WRAPPER(istream_vector_dtor, 8) istream* __thiscall istream_vector_dtor(ios *base, unsigned int flags) { @@ -3203,6 +3217,7 @@ istream* __thiscall istream_vector_dtor(ios *base, unsigned int flags) /* ??_Gistream@@UAEPAXI@Z */ /* ??_Gistream_withassign@@UAEPAXI@Z */ /* ??_Gistrstream@@UAEPAXI@Z */ +/* ??_Gifstream@@UAEPAXI@Z */ DEFINE_THISCALL_WRAPPER(istream_scalar_dtor, 8) istream* __thiscall istream_scalar_dtor(ios *base, unsigned int flags) { @@ -4089,6 +4104,172 @@ char* __thiscall istrstream_str(istream *this) return strstreambuf_str(istrstream_rdbuf(this)); } +/* ??0ifstream@@QAE@ABV0@@Z */ +/* ??0ifstream@@QEAA@AEBV0@@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_copy_ctor, 12) +istream* __thiscall ifstream_copy_ctor(istream *this, const istream *copy, BOOL virt_init) +{ + TRACE("(%p %p %d)\n", this, copy, virt_init); + istream_withassign_copy_ctor(this, copy, virt_init); + istream_get_ios(this)->vtable = &MSVCP_ifstream_vtable; + return this; +} + +/* ??0ifstream@@QAE@HPADH@Z */ +/* ??0ifstream@@QEAA@HPEADH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_buffer_ctor, 20) +istream* __thiscall ifstream_buffer_ctor(istream *this, filedesc fd, char *buffer, int length, BOOL virt_init) +{ + ios *base; + filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); + + TRACE("(%p %d %p %d %d)\n", this, fd, buffer, length, virt_init); + + if (!fb) + { + FIXME("out of memory\n"); + return NULL; + } + + filebuf_fd_reserve_ctor(fb, fd, buffer, length); + istream_sb_ctor(this, &fb->base, virt_init); + + base = istream_get_ios(this); + base->vtable = &MSVCP_ifstream_vtable; + base->delbuf = 1; + + return this; +} + +/* ??0ifstream@@QAE@H@Z */ +/* ??0ifstream@@QEAA@H@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_fd_ctor, 12) +istream* __thiscall ifstream_fd_ctor(istream *this, filedesc fd, BOOL virt_init) +{ + ios *base; + filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); + + TRACE("(%p %d %d)\n", this, fd, virt_init); + + if (!fb) + { + FIXME("out of memory\n"); + return NULL; + } + + filebuf_fd_ctor(fb, fd); + istream_sb_ctor(this, &fb->base, virt_init); + + base = istream_get_ios(this); + base->vtable = &MSVCP_ifstream_vtable; + base->delbuf = 1; + + return this; +} + +/* ??0ifstream@@QAE@PBDHH@Z */ +/* ??0ifstream@@QEAA@PEBDHH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_open_ctor, 20) +istream* __thiscall ifstream_open_ctor(istream *this, const char *name, ios_open_mode mode, int protection, BOOL virt_init) +{ + ios *base; + filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); + + TRACE("(%p %s %d %d %d)\n", this, name, mode, protection, virt_init); + + if (!fb) + { + FIXME("out of memory\n"); + return NULL; + } + + filebuf_ctor(fb); + istream_sb_ctor(this, &fb->base, virt_init); + filebuf_open(fb, name, mode|OPENMODE_in, protection); + + base = istream_get_ios(this); + base->vtable = &MSVCP_ifstream_vtable; + base->delbuf = 1; + + return this; +} + +/* ??0ifstream@@QAE@XZ */ +/* ??0ifstream@@QEAA@XZ */ +DEFINE_THISCALL_WRAPPER(ifstream_ctor, 8) +istream* __thiscall ifstream_ctor(istream *this, BOOL virt_init) +{ + return ifstream_fd_ctor(this, -1, virt_init); +} + +/* ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ */ +/* ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ */ +DEFINE_THISCALL_WRAPPER(ifstream_rdbuf, 4) +filebuf* __thiscall ifstream_rdbuf(const istream *this) +{ + TRACE("(%p)\n", this); + return (filebuf*) istream_get_ios(this)->sb; +} + +/* ?fd@ifstream@@QBEHXZ */ +/* ?fd@ifstream@@QEBAHXZ */ +DEFINE_THISCALL_WRAPPER(ifstream_fd, 4) +filedesc __thiscall ifstream_fd(istream *this) +{ + TRACE("(%p)\n", this); + return filebuf_fd(ifstream_rdbuf(this)); +} + +/* ?attach@ifstream@@QAEXH@Z */ +/* ?attach@ifstream@@QEAAXH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_attach, 8) +void __thiscall ifstream_attach(istream *this, filedesc fd) +{ + TRACE("(%p %d)\n", this, fd); + if (filebuf_attach(ifstream_rdbuf(this), fd) == NULL) + ios_clear(istream_get_ios(this), IOSTATE_failbit); +} + +/* ?close@ifstream@@QAEXXZ */ +/* ?close@ifstream@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(ifstream_close, 4) +void __thiscall ifstream_close(istream *this) +{ + TRACE("(%p)\n", this); + if (filebuf_close(ifstream_rdbuf(this)) == NULL) + ios_clear(istream_get_ios(this), IOSTATE_failbit); + else + ios_clear(istream_get_ios(this), IOSTATE_goodbit); +} + +/* ?is_open@ifstream@@QBEHXZ */ +/* ?is_open@ifstream@@QEBAHXZ */ +DEFINE_THISCALL_WRAPPER(ifstream_is_open, 4) +int __thiscall ifstream_is_open(const istream *this) +{ + TRACE("(%p)\n", this); + return filebuf_is_open(ifstream_rdbuf(this)); +} + +/* ?open@ifstream@@QAEXPBDHH@Z */ +/* ?open@ifstream@@QEAAXPEBDHH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_open, 16) +void __thiscall ifstream_open(istream *this, const char *name, ios_open_mode mode, int protection) +{ + TRACE("(%p %s %d %d)\n", this, name, mode, protection); + if (filebuf_open(ifstream_rdbuf(this), name, mode|OPENMODE_in, protection) == NULL) + ios_clear(istream_get_ios(this), IOSTATE_failbit); +} + +/* ?setmode@ifstream@@QAEHH@Z */ +/* ?setmode@ifstream@@QEAAHH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_setmode, 8) +int __thiscall ifstream_setmode(istream *this, int mode) +{ + TRACE("(%p %d)\n", this, mode); + return filebuf_setmode(ifstream_rdbuf(this), mode); +} + static inline ios* iostream_to_ios(const iostream *this) { return (ios*)((char*)this + iostream_vbtable_istream[1]); @@ -4522,6 +4703,7 @@ static void init_io(void *base) init_istream_rtti(base); init_istream_withassign_rtti(base); init_istrstream_rtti(base); + init_ifstream_rtti(base); init_iostream_rtti(base); init_strstream_rtti(base); init_stdiostream_rtti(base); diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index f2e875695ef..75ae312b486 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -26,16 +26,16 @@ @ stub -arch=win64 ??0fstream@@QEAA@PEBDHH@Z @ stub -arch=win32 ??0fstream@@QAE@XZ # __thiscall fstream::fstream(void) @ stub -arch=win64 ??0fstream@@QEAA@XZ -@ stub -arch=win32 ??0ifstream@@QAE@ABV0@@Z # __thiscall ifstream::ifstream(class ifstream const &) -@ stub -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z -@ stub -arch=win32 ??0ifstream@@QAE@H@Z # __thiscall ifstream::ifstream(int) -@ stub -arch=win64 ??0ifstream@@QEAA@H@Z -@ stub -arch=win32 ??0ifstream@@QAE@HPADH@Z # __thiscall ifstream::ifstream(int,char *,int) -@ stub -arch=win64 ??0ifstream@@QEAA@HPEADH@Z -@ stub -arch=win32 ??0ifstream@@QAE@PBDHH@Z # __thiscall ifstream::ifstream(char const *,int,int) -@ stub -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z -@ stub -arch=win32 ??0ifstream@@QAE@XZ # __thiscall ifstream::ifstream(void) -@ stub -arch=win64 ??0ifstream@@QEAA@XZ +@ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) ifstream_copy_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z(ptr ptr long) ifstream_copy_ctor +@ thiscall -arch=win32 ??0ifstream@@QAE@H@Z(ptr long long) ifstream_fd_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@H@Z(ptr long long) ifstream_fd_ctor +@ thiscall -arch=win32 ??0ifstream@@QAE@HPADH@Z(ptr long ptr long long) ifstream_buffer_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@HPEADH@Z(ptr long ptr long long) ifstream_buffer_ctor +@ thiscall -arch=win32 ??0ifstream@@QAE@PBDHH@Z(ptr str long long long) ifstream_open_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z(ptr str long long long) ifstream_open_ctor +@ thiscall -arch=win32 ??0ifstream@@QAE@XZ(ptr long) ifstream_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@XZ(ptr long) ifstream_ctor @ thiscall -arch=win32 ??0ios@@IAE@ABV0@@Z(ptr ptr) ios_copy_ctor @ cdecl -arch=win64 ??0ios@@IEAA@AEBV0@@Z(ptr ptr) ios_copy_ctor @ thiscall -arch=win32 ??0ios@@IAE@XZ(ptr) ios_ctor @@ -138,8 +138,8 @@ @ cdecl -arch=win64 ??1filebuf@@UEAA@XZ(ptr) filebuf_dtor @ stub -arch=win32 ??1fstream@@UAE@XZ # virtual __thiscall fstream::~fstream(void) @ stub -arch=win64 ??1fstream@@UEAA@XZ -@ stub -arch=win32 ??1ifstream@@UAE@XZ # virtual __thiscall ifstream::~ifstream(void) -@ stub -arch=win64 ??1ifstream@@UEAA@XZ +@ thiscall -arch=win32 ??1ifstream@@UAE@XZ(ptr) istream_dtor +@ cdecl -arch=win64 ??1ifstream@@UEAA@XZ(ptr) istream_dtor @ thiscall -arch=win32 ??1ios@@UAE@XZ(ptr) ios_dtor @ cdecl -arch=win64 ??1ios@@UEAA@XZ(ptr) ios_dtor @ thiscall -arch=win32 ??1iostream@@UAE@XZ(ptr) iostream_dtor @@ -178,8 +178,8 @@ @ cdecl -arch=win64 ??4filebuf@@QEAAAEAV0@AEBV0@@Z(ptr ptr) filebuf_assign @ stub -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z # class fstream & __thiscall fstream::operator=(class fstream &) @ stub -arch=win64 ??4fstream@@QEAAAEAV0@AEAV0@@Z -@ stub -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z # class ifstream & __thiscall ifstream::operator=(class ifstream const &) -@ stub -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z +@ thiscall -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z(ptr ptr) istream_assign +@ cdecl -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z(ptr ptr) istream_assign @ thiscall -arch=win32 ??4ios@@IAEAAV0@ABV0@@Z(ptr ptr) ios_assign @ cdecl -arch=win64 ??4ios@@IEAAAEAV0@AEBV0@@Z(ptr ptr) ios_assign @ thiscall -arch=win32 ??4iostream@@IAEAAV0@AAV0@@Z(ptr ptr) iostream_assign @@ -305,7 +305,7 @@ @ extern ??_7exception@@6B@ MSVCP_exception_vtable @ extern ??_7filebuf@@6B@ MSVCP_filebuf_vtable # @ extern ??_7fstream@@6B@ # const fstream::`vftable' -# @ extern ??_7ifstream@@6B@ # const ifstream::`vftable' +@ extern ??_7ifstream@@6B@ MSVCP_ifstream_vtable @ extern ??_7ios@@6B@ MSVCP_ios_vtable @ extern ??_7iostream@@6B@ MSVCP_iostream_vtable @ extern ??_7istream@@6B@ MSVCP_istream_vtable @@ -323,7 +323,7 @@ @ extern ??_7strstreambuf@@6B@ MSVCP_strstreambuf_vtable # @ extern ??_8fstream@@7Bistream@@@ # const fstream::`vbtable'{for `istream'} # @ extern ??_8fstream@@7Bostream@@@ # const fstream::`vbtable'{for `ostream'} -# @ extern ??_8ifstream@@7B@ # const ifstream::`vbtable' +@ extern ??_8ifstream@@7B@ istream_vbtable @ extern ??_8iostream@@7Bistream@@@ iostream_vbtable_istream @ extern ??_8iostream@@7Bostream@@@ iostream_vbtable_ostream @ extern ??_8istream@@7B@ istream_vbtable @@ -339,8 +339,8 @@ @ extern ??_8strstream@@7Bostream@@@ iostream_vbtable_ostream @ stub -arch=win32 ??_Dfstream@@QAEXXZ # void __thiscall fstream::`vbase destructor'(void) @ stub -arch=win64 ??_Dfstream@@QEAAXXZ -@ stub -arch=win32 ??_Difstream@@QAEXXZ # void __thiscall ifstream::`vbase destructor'(void) -@ stub -arch=win64 ??_Difstream@@QEAAXXZ +@ thiscall -arch=win32 ??_Difstream@@QAEXXZ(ptr) istream_vbase_dtor +@ cdecl -arch=win64 ??_Difstream@@QEAAXXZ(ptr) istream_vbase_dtor @ thiscall -arch=win32 ??_Diostream@@QAEXXZ(ptr) iostream_vbase_dtor @ cdecl -arch=win64 ??_Diostream@@QEAAXXZ(ptr) iostream_vbase_dtor @ thiscall -arch=win32 ??_Distream@@QAEXXZ(ptr) istream_vbase_dtor @@ -364,7 +364,7 @@ @ thiscall -arch=win32 ??_Eexception@@UAEPAXI@Z(ptr long) MSVCP_exception_vector_dtor @ thiscall -arch=win32 ??_Efilebuf@@UAEPAXI@Z(ptr long) filebuf_vector_dtor @ stub -arch=win32 ??_Efstream@@UAEPAXI@Z # virtual void * __thiscall fstream::`vector deleting destructor'(unsigned int) -@ stub -arch=win32 ??_Eifstream@@UAEPAXI@Z # virtual void * __thiscall ifstream::`vector deleting destructor'(unsigned int) +@ thiscall -arch=win32 ??_Eifstream@@UAEPAXI@Z(ptr long) istream_vector_dtor @ thiscall -arch=win32 ??_Eios@@UAEPAXI@Z(ptr long) ios_vector_dtor @ thiscall -arch=win32 ??_Eiostream@@UAEPAXI@Z(ptr long) iostream_vector_dtor @ thiscall -arch=win32 ??_Eistream@@UAEPAXI@Z(ptr long) istream_vector_dtor @@ -383,7 +383,7 @@ @ thiscall -arch=win32 ??_Gexception@@UAEPAXI@Z(ptr long) MSVCP_exception_scalar_dtor @ thiscall -arch=win32 ??_Gfilebuf@@UAEPAXI@Z(ptr long) filebuf_scalar_dtor @ stub -arch=win32 ??_Gfstream@@UAEPAXI@Z # virtual void * __thiscall fstream::`scalar deleting destructor'(unsigned int) -@ stub -arch=win32 ??_Gifstream@@UAEPAXI@Z # virtual void * __thiscall ifstream::`scalar deleting destructor'(unsigned int) +@ thiscall -arch=win32 ??_Gifstream@@UAEPAXI@Z(ptr long) istream_scalar_dtor @ thiscall -arch=win32 ??_Gios@@UAEPAXI@Z(ptr long) ios_scalar_dtor @ thiscall -arch=win32 ??_Giostream@@UAEPAXI@Z(ptr long) iostream_scalar_dtor @ thiscall -arch=win32 ??_Gistream@@UAEPAXI@Z(ptr long) istream_scalar_dtor @@ -406,8 +406,8 @@ @ cdecl -arch=win64 ?attach@filebuf@@QEAAPEAV1@H@Z(ptr long) filebuf_attach @ stub -arch=win32 ?attach@fstream@@QAEXH@Z # void __thiscall fstream::attach(int) @ stub -arch=win64 ?attach@fstream@@QEAAXH@Z -@ stub -arch=win32 ?attach@ifstream@@QAEXH@Z # void __thiscall ifstream::attach(int) -@ stub -arch=win64 ?attach@ifstream@@QEAAXH@Z +@ thiscall -arch=win32 ?attach@ifstream@@QAEXH@Z(ptr long) ifstream_attach +@ cdecl -arch=win64 ?attach@ifstream@@QEAAXH@Z(ptr long) ifstream_attach @ stub -arch=win32 ?attach@ofstream@@QAEXH@Z # void __thiscall ofstream::attach(int) @ stub -arch=win64 ?attach@ofstream@@QEAAXH@Z @ thiscall -arch=win32 ?bad@ios@@QBEHXZ(ptr) ios_bad @@ -428,8 +428,8 @@ @ cdecl -arch=win64 ?close@filebuf@@QEAAPEAV1@XZ(ptr) filebuf_close @ stub -arch=win32 ?close@fstream@@QAEXXZ # void __thiscall fstream::close(void) @ stub -arch=win64 ?close@fstream@@QEAAXXZ -@ stub -arch=win32 ?close@ifstream@@QAEXXZ # void __thiscall ifstream::close(void) -@ stub -arch=win64 ?close@ifstream@@QEAAXXZ +@ thiscall -arch=win32 ?close@ifstream@@QAEXXZ(ptr) ifstream_close +@ cdecl -arch=win64 ?close@ifstream@@QEAAXXZ(ptr) ifstream_close @ stub -arch=win32 ?close@ofstream@@QAEXXZ # void __thiscall ofstream::close(void) @ stub -arch=win64 ?close@ofstream@@QEAAXXZ @ cdecl -arch=win32 ?clrlock@ios@@QAAXXZ(ptr) ios_clrlock @@ -472,8 +472,8 @@ @ cdecl -arch=win64 ?fd@filebuf@@QEBAHXZ(ptr) filebuf_fd @ stub -arch=win32 ?fd@fstream@@QBEHXZ # int __thiscall fstream::fd(void)const @ stub -arch=win64 ?fd@fstream@@QEBAHXZ -@ stub -arch=win32 ?fd@ifstream@@QBEHXZ # int __thiscall ifstream::fd(void)const -@ stub -arch=win64 ?fd@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?fd@ifstream@@QBEHXZ(ptr) ifstream_fd +@ cdecl -arch=win64 ?fd@ifstream@@QEBAHXZ(ptr) ifstream_fd @ stub -arch=win32 ?fd@ofstream@@QBEHXZ # int __thiscall ofstream::fd(void)const @ stub -arch=win64 ?fd@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?fill@ios@@QAEDD@Z(ptr long) ios_fill_set @@ -541,8 +541,8 @@ @ cdecl -arch=win64 ?is_open@filebuf@@QEBAHXZ(ptr) filebuf_is_open @ stub -arch=win32 ?is_open@fstream@@QBEHXZ # int __thiscall fstream::is_open(void)const @ stub -arch=win64 ?is_open@fstream@@QEBAHXZ -@ stub -arch=win32 ?is_open@ifstream@@QBEHXZ # int __thiscall ifstream::is_open(void)const -@ stub -arch=win64 ?is_open@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?is_open@ifstream@@QBEHXZ(ptr) ifstream_is_open +@ cdecl -arch=win64 ?is_open@ifstream@@QEBAHXZ(ptr) ifstream_is_open @ stub -arch=win32 ?is_open@ofstream@@QBEHXZ # int __thiscall ofstream::is_open(void)const @ stub -arch=win64 ?is_open@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?isfx@istream@@QAEXXZ(ptr) istream_isfx @@ -566,8 +566,8 @@ @ cdecl -arch=win64 ?open@filebuf@@QEAAPEAV1@PEBDHH@Z(ptr str long long) filebuf_open @ stub -arch=win32 ?open@fstream@@QAEXPBDHH@Z # void __thiscall fstream::open(char const *,int,int) @ stub -arch=win64 ?open@fstream@@QEAAXPEBDHH@Z -@ stub -arch=win32 ?open@ifstream@@QAEXPBDHH@Z # void __thiscall ifstream::open(char const *,int,int) -@ stub -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z +@ thiscall -arch=win32 ?open@ifstream@@QAEXPBDHH@Z(ptr str long long) ifstream_open +@ cdecl -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z(ptr str long long) ifstream_open @ stub -arch=win32 ?open@ofstream@@QAEXPBDHH@Z # void __thiscall ofstream::open(char const *,int,int) @ stub -arch=win64 ?open@ofstream@@QEAAXPEBDHH@Z @ extern ?openprot@filebuf@@2HB filebuf_openprot @@ -615,8 +615,8 @@ @ cdecl -arch=win64 ?pword@ios@@QEBAAEAPEAXH@Z(ptr long) ios_pword @ stub -arch=win32 ?rdbuf@fstream@@QBEPAVfilebuf@@XZ # class filebuf * __thiscall fstream::rdbuf(void)const @ stub -arch=win64 ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ -@ stub -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ # class filebuf * __thiscall ifstream::rdbuf(void)const -@ stub -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ +@ thiscall -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ(ptr) ifstream_rdbuf +@ cdecl -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ(ptr) ifstream_rdbuf @ thiscall -arch=win32 ?rdbuf@ios@@QBEPAVstreambuf@@XZ(ptr) ios_rdbuf @ cdecl -arch=win64 ?rdbuf@ios@@QEBAPEAVstreambuf@@XZ(ptr) ios_rdbuf @ thiscall -arch=win32 ?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ(ptr) istrstream_rdbuf @@ -685,8 +685,8 @@ @ cdecl -arch=win64 ?setmode@filebuf@@QEAAHH@Z(ptr long) filebuf_setmode @ stub -arch=win32 ?setmode@fstream@@QAEHH@Z # int __thiscall fstream::setmode(int) @ stub -arch=win64 ?setmode@fstream@@QEAAHH@Z -@ stub -arch=win32 ?setmode@ifstream@@QAEHH@Z # int __thiscall ifstream::setmode(int) -@ stub -arch=win64 ?setmode@ifstream@@QEAAHH@Z +@ thiscall -arch=win32 ?setmode@ifstream@@QAEHH@Z(ptr long) ifstream_setmode +@ cdecl -arch=win64 ?setmode@ifstream@@QEAAHH@Z(ptr long) ifstream_setmode @ stub -arch=win32 ?setmode@ofstream@@QAEHH@Z # int __thiscall ofstream::setmode(int) @ stub -arch=win64 ?setmode@ofstream@@QEAAHH@Z @ thiscall -arch=win32 ?setp@streambuf@@IAEXPAD0@Z(ptr ptr ptr) streambuf_setp diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 6440bc0dab7..8c0eb1ba131 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <windef.h> #include <winbase.h> +#include <sys/stat.h> #include "wine/test.h" typedef void (*vtable_ptr)(void); @@ -403,6 +404,22 @@ static void (*__thiscall p_iostream_vbase_dtor)(iostream*); static iostream* (*__thiscall p_iostream_assign_sb)(iostream*, streambuf*); static iostream* (*__thiscall p_iostream_assign)(iostream*, const iostream*); +/* ifstream */ +static istream* (*__thiscall p_ifstream_copy_ctor)(istream*, const istream*, BOOL); +static istream* (*__thiscall p_ifstream_buffer_ctor)(istream*, filedesc, char*, int, BOOL); +static istream* (*__thiscall p_ifstream_fd_ctor)(istream*, filedesc fd, BOOL virt_init); +static istream* (*__thiscall p_ifstream_open_ctor)(istream*, const char *name, ios_open_mode, int, BOOL); +static istream* (*__thiscall p_ifstream_ctor)(istream*, BOOL); +static void (*__thiscall p_ifstream_dtor)(ios*); +static void (*__thiscall p_ifstream_vbase_dtor)(istream*); +static void (*__thiscall p_ifstream_attach)(istream*, filedesc); +static void (*__thiscall p_ifstream_close)(istream*); +static filedesc (*__thiscall p_ifstream_fd)(istream*); +static int (*__thiscall p_ifstream_is_open)(const istream*); +static void (*__thiscall p_ifstream_open)(istream*, const char*, ios_open_mode, int); +static filebuf* (*__thiscall p_ifstream_rdbuf)(const istream*); +static int (*__thiscall p_ifstream_setmode)(istream*, int); + /* strstream */ static iostream* (*__thiscall p_strstream_copy_ctor)(iostream*, const iostream*, BOOL); static iostream* (*__thiscall p_strstream_buffer_ctor)(iostream*, char*, int, int, BOOL); @@ -703,6 +720,21 @@ static BOOL init(void) SET(p_iostream_assign_sb, "??4iostream@@IEAAAEAV0@PEAVstreambuf@@@Z"); SET(p_iostream_assign, "??4iostream@@IEAAAEAV0@AEAV0@@Z"); + SET(p_ifstream_copy_ctor, "??0ifstream@@QEAA@AEBV0@@Z"); + SET(p_ifstream_buffer_ctor, "??0ifstream@@QEAA@HPEADH@Z"); + SET(p_ifstream_fd_ctor, "??0ifstream@@QEAA@H@Z"); + SET(p_ifstream_open_ctor, "??0ifstream@@QEAA@PEBDHH@Z"); + SET(p_ifstream_ctor, "??0ifstream@@QEAA@XZ"); + SET(p_ifstream_dtor, "??1ifstream@@UEAA@XZ"); + SET(p_ifstream_vbase_dtor, "??_Difstream@@QEAAXXZ"); + SET(p_ifstream_attach, "?attach@ifstream@@QEAAXH@Z"); + SET(p_ifstream_close, "?close@ifstream@@QEAAXXZ"); + SET(p_ifstream_fd, "?fd@ifstream@@QEBAHXZ"); + SET(p_ifstream_is_open, "?is_open@ifstream@@QEBAHXZ"); + SET(p_ifstream_open, "?open@ifstream@@QEAAXPEBDHH@Z"); + SET(p_ifstream_rdbuf, "?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ"); + SET(p_ifstream_setmode, "?setmode@ifstream@@QEAAHH@Z"); + SET(p_strstream_copy_ctor, "??0strstream@@QEAA@AEBV0@@Z"); SET(p_strstream_buffer_ctor, "??0strstream@@QEAA@PEADHH@Z"); SET(p_strstream_ctor, "??0strstream@@QEAA@XZ"); @@ -917,6 +949,21 @@ static BOOL init(void) SET(p_iostream_assign_sb, "??4iostream@@IAEAAV0@PAVstreambuf@@@Z"); SET(p_iostream_assign, "??4iostream@@IAEAAV0@AAV0@@Z"); + SET(p_ifstream_copy_ctor, "??0ifstream@@QAE@ABV0@@Z"); + SET(p_ifstream_fd_ctor, "??0ifstream@@QAE@H@Z"); + SET(p_ifstream_buffer_ctor, "??0ifstream@@QAE@HPADH@Z"); + SET(p_ifstream_open_ctor, "??0ifstream@@QAE@PBDHH@Z"); + SET(p_ifstream_ctor, "??0ifstream@@QAE@XZ"); + SET(p_ifstream_dtor, "??1ifstream@@UAE@XZ"); + SET(p_ifstream_vbase_dtor, "??_Difstream@@QAEXXZ"); + SET(p_ifstream_attach, "?attach@ifstream@@QAEXH@Z"); + SET(p_ifstream_close, "?close@ifstream@@QAEXXZ"); + SET(p_ifstream_fd, "?fd@ifstream@@QBEHXZ"); + SET(p_ifstream_is_open, "?is_open@ifstream@@QBEHXZ"); + SET(p_ifstream_open, "?open@ifstream@@QAEXPBDHH@Z"); + SET(p_ifstream_rdbuf, "?rdbuf@ifstream@@QBEPAVfilebuf@@XZ"); + SET(p_ifstream_setmode, "?setmode@ifstream@@QAEHH@Z"); + SET(p_strstream_copy_ctor, "??0strstream@@QAE@ABV0@@Z"); SET(p_strstream_buffer_ctor, "??0strstream@@QAE@PADHH@Z"); SET(p_strstream_ctor, "??0strstream@@QAE@XZ"); @@ -6720,6 +6767,207 @@ static void test_iostream(void) ok(ios2.base_ios.do_lock == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base_ios.do_lock); } +static void test_ifstream(void) +{ + const char *filename = "ifstream_test"; + istream ifs, ifs_copy, *pifs; + filebuf *pfb; + char buffer[64]; + char st[8]; + int fd, ret, i; + + memset(&ifs, 0xab, sizeof(istream)); + + /* constructors/destructors */ + pifs = call_func2(p_ifstream_ctor, &ifs, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(ifs.extract_delim == 0, "expected 0 got %d\n", ifs.extract_delim); + ok(ifs.count == 0, "expected 0 got %d\n", ifs.count); + ok(ifs.base_ios.sb != NULL, "expected not %p got %p\n", NULL, ifs.base_ios.sb); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(ifs.base_ios.tie == NULL, "expected %p got %p\n", NULL, ifs.base_ios.tie); + ok(ifs.base_ios.flags == FLAGS_skipws, "expected %x got %x\n", FLAGS_skipws, ifs.base_ios.flags); + ok(ifs.base_ios.precision == 6, "expected 6 got %d\n", ifs.base_ios.precision); + ok(ifs.base_ios.fill == ' ', "expected 32 got %d\n", ifs.base_ios.fill); + ok(ifs.base_ios.width == 0, "expected 0 got %d\n", ifs.base_ios.width); + ok(ifs.base_ios.do_lock == -1, "expected -1 got %d\n", ifs.base_ios.do_lock); + ok(pfb->fd == -1, "wrong fd, expected -1 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == NULL, "wrong buffer, expected %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf == NULL, "wrong ebuf, expected %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd == -1, "wrong fd, expected 0 got %d\n", pfb->fd); + call_func1(p_ifstream_vbase_dtor, &ifs); + + pifs = call_func3(p_ifstream_fd_ctor, &ifs, 42, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == NULL, "wrong buffer, expected %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf == NULL, "wrong ebuf, expected %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd == 42, "wrong fd, expected 42 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + + pifs = call_func3(p_ifstream_copy_ctor, &ifs_copy, &ifs, TRUE); + pfb = (filebuf*) ifs_copy.base_ios.sb; + ok(pifs == &ifs_copy, "wrong return, expected %p got %p\n", &ifs_copy, pifs); + ok(ifs_copy.base_ios.sb == ifs.base_ios.sb, "expected shared streambuf\n"); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(ifs_copy.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs_copy.base_ios.state); + + call_func1(p_ifstream_vbase_dtor, &ifs_copy); + call_func1(p_ifstream_dtor, &ifs.base_ios); + + pifs = call_func5(p_ifstream_buffer_ctor, &ifs, 53, buffer, ARRAY_SIZE(buffer), TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, pfb->base.base); + ok(pfb->base.ebuf == buffer + ARRAY_SIZE(buffer), "wrong ebuf, expected %p got %p\n", buffer + ARRAY_SIZE(buffer), pfb->base.ebuf); + ok(pfb->fd == 53, "wrong fd, expected 53 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + call_func1(p_ifstream_dtor, &ifs.base_ios); + + pifs = call_func5(p_ifstream_buffer_ctor, &ifs, 64, NULL, 0, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == NULL, "wrong buffer, expected %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf == NULL, "wrong ebuf, expected %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd == 64, "wrong fd, expected 64 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + call_func1(p_ifstream_vbase_dtor, &ifs); + + pifs = call_func5(p_ifstream_open_ctor, &ifs, filename, OPENMODE_in, filebuf_openprot, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(pfb->base.allocated == 1, "wrong allocate value, expected 1 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base != NULL, "wrong buffer, expected not %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf != NULL, "wrong ebuf, expected not %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd != -1, "wrong fd, expected not -1 got %d\n", pfb->fd); + fd = pfb->fd; + ok(pfb->close == 1, "wrong value, expected 1 got %d\n", pfb->close); + call_func1(p_ifstream_vbase_dtor, &ifs); + ok(_close(fd) == -1, "expected ifstream to close opened file\n"); + + /* attach */ + pifs = call_func2(p_ifstream_ctor, &ifs, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + call_func2(p_ifstream_attach, &ifs, 42); + ok(ifs.base_ios.state == IOSTATE_goodbit, "attaching on vanilla stream set some state bits\n"); + fd = (int) call_func1(p_ifstream_fd, &ifs); + ok(fd == 42, "wrong fd, expected 42 got %d\n", fd); + ok(pfb->close == 0, "wrong close value, expected 0 got %d\n", pfb->close); + call_func2(p_ifstream_attach, &ifs, 53); + ok(ifs.base_ios.state == IOSTATE_failbit, "attaching on already setup stream did not set failbit\n"); + ok(fd == 42, "wrong fd, expected 42 got %d\n", fd); + call_func1(p_ifstream_vbase_dtor, &ifs); + + /* fd */ + pifs = call_func2(p_ifstream_ctor, &ifs, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + fd = (int) call_func1(p_ifstream_fd, &ifs); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(fd == -1, "wrong fd, expected -1 but got %d\n", fd); + call_func1(p_ifstream_vbase_dtor, &ifs); + + pifs = call_func5(p_ifstream_open_ctor, &ifs, filename, OPENMODE_in, filebuf_openprot, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + fd = (int) call_func1(p_ifstream_fd, &ifs); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(fd == pfb->fd, "wrong fd, expected %d but got %d\n", pfb->fd, fd); + + /* rdbuf */ + pfb = (filebuf*) call_func1(p_ifstream_rdbuf, &ifs); + ok((streambuf*) pfb == ifs.base_ios.sb, "wrong return, expected %p got %p\n", ifs.base_ios.sb, pfb); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + + /* setmode */ + ret = (int) call_func2(p_ifstream_setmode, &ifs, filebuf_binary); + ok(ret == filebuf_text, "wrong return, expected %d got %d\n", filebuf_text, ret); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ret = (int) call_func2(p_ifstream_setmode, &ifs, filebuf_binary); + ok(ret == filebuf_binary, "wrong return, expected %d got %d\n", filebuf_binary, ret); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ret = (int) call_func2(p_ifstream_setmode, &ifs, filebuf_text); + ok(ret == filebuf_binary, "wrong return, expected %d got %d\n", filebuf_binary, ret); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ret = (int) call_func2(p_ifstream_setmode, &ifs, 0x9000); + ok(ret == -1, "wrong return, expected -1 got %d\n", ret); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + + /* close && is_open */ + ok((int) call_func1(p_ifstream_is_open, &ifs) == 1, "expected ifstream to be open\n"); + ifs.base_ios.state = IOSTATE_failbit|IOSTATE_eofbit; + call_func1(p_ifstream_close, &ifs); + ok(ifs.base_ios.state == 0, "close did not clear state = %d\n", ifs.base_ios.state); + call_func1(p_ifstream_close, &ifs); + ok(ifs.base_ios.state == IOSTATE_failbit, "close on a closed stream did not set state to failbit\n"); + ok((int) call_func1(p_ifstream_is_open, &ifs) == 0, "expected ifstream to not be open\n"); + ok(_close(fd) == -1, "expected close to close the opened file\n"); + + /* open */ + ifs.base_ios.state = IOSTATE_goodbit; /* open doesn't clear the state */ + call_func4(p_ifstream_open, &ifs, filename, OPENMODE_in, filebuf_openprot); + fd = (int) call_func1(p_ifstream_fd, &ifs); + ok(fd != -1, "wrong fd, expected not -1 got %d\n", fd); + ok(ifs.base_ios.state == IOSTATE_goodbit, "open did not succeed\n"); + call_func4(p_ifstream_open, &ifs, filename, OPENMODE_in, filebuf_openprot); + ok(ifs.base_ios.state == IOSTATE_failbit, "second open did not set state to failbit\n"); + call_func1(p_ifstream_close, &ifs); + + /* write something we can read later */ + fd = _open(filename, _O_TRUNC|_O_CREAT|_O_RDWR, _S_IWRITE); + ok(fd != -1, "_open failed\n"); + ok(_write(fd, "test 12", 7) == 7, "_write failed\n"); + ok(_close(fd) == 0, "_close failed\n"); + + /* integration with parent istream - reading */ + ifs.base_ios.state = IOSTATE_goodbit; /* open doesn't clear the state */ + call_func4(p_ifstream_open, &ifs, filename, OPENMODE_out, filebuf_openprot); /* make sure that OPENMODE_in is implicit */ + memset(st, 'A', sizeof(st)); + st[7] = 0; + pifs = call_func2(p_istream_read_str, &ifs, st); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(!strcmp(st, "test"), "expected 'test' got '%s'\n", st); + + i = 12345; + pifs = call_func2(p_istream_read_int, pifs, &i); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(i == 12, "expected 12 got %d\n", i); + call_func1(p_ifstream_vbase_dtor, &ifs); + + /* make sure that OPENMODE_in is implicit with open_ctor */ + pifs = call_func5(p_ifstream_open_ctor, &ifs, filename, OPENMODE_out, filebuf_openprot, TRUE); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + memset(st, 'A', sizeof(st)); + st[7] = 0; + pifs = call_func2(p_istream_read_str, &ifs, st); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(!strcmp(st, "test"), "expected 'test' got '%s'\n", st); + call_func1(p_ifstream_vbase_dtor, &ifs); + ok(_unlink(filename) == 0, "Couldn't unlink file named '%s'\n", filename); +} + static void test_strstream(void) { iostream ios1, ios2, *pios; @@ -7538,6 +7786,7 @@ START_TEST(msvcirt) test_istream_withassign(); test_istrstream(); test_iostream(); + test_ifstream(); test_strstream(); test_stdiostream(); test_Iostream_init(); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index f06a53cc601..96c6c681478 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -20,16 +20,16 @@ @ stub -arch=win64 ??0fstream@@QEAA@PEBDHH@Z @ stub -arch=win32 ??0fstream@@QAE@XZ @ stub -arch=win64 ??0fstream@@QEAA@XZ -@ stub -arch=win32 ??0ifstream@@QAE@ABV0@@Z -@ stub -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z -@ stub -arch=win32 ??0ifstream@@QAE@H@Z -@ stub -arch=win64 ??0ifstream@@QEAA@H@Z -@ stub -arch=win32 ??0ifstream@@QAE@HPADH@Z -@ stub -arch=win64 ??0ifstream@@QEAA@HPEADH@Z -@ stub -arch=win32 ??0ifstream@@QAE@PBDHH@Z -@ stub -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z -@ stub -arch=win32 ??0ifstream@@QAE@XZ -@ stub -arch=win64 ??0ifstream@@QEAA@XZ +@ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QAE@ABV0@@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QEAA@AEBV0@@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@H@Z(ptr long long) msvcirt.??0ifstream@@QAE@H@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@H@Z(ptr long long) msvcirt.??0ifstream@@QEAA@H@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@HPADH@Z(ptr long ptr long long) msvcirt.??0ifstream@@QAE@HPADH@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@HPEADH@Z(ptr long ptr long long) msvcirt.??0ifstream@@QEAA@HPEADH@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@PBDHH@Z(ptr str long long long) msvcirt.??0ifstream@@QAE@PBDHH@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z(ptr str long long long) msvcirt.??0ifstream@@QEAA@PEBDHH@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@XZ(ptr long) msvcirt.??0ifstream@@QAE@XZ +@ cdecl -arch=win64 ??0ifstream@@QEAA@XZ(ptr long) msvcirt.??0ifstream@@QEAA@XZ @ thiscall -arch=win32 ??0ios@@IAE@ABV0@@Z(ptr ptr) msvcirt.??0ios@@IAE@ABV0@@Z @ cdecl -arch=win64 ??0ios@@IEAA@AEBV0@@Z(ptr ptr) msvcirt.??0ios@@IEAA@AEBV0@@Z @ thiscall -arch=win32 ??0ios@@IAE@XZ(ptr) msvcirt.??0ios@@IAE@XZ @@ -124,8 +124,8 @@ @ cdecl -arch=win64 ??1filebuf@@UEAA@XZ(ptr) msvcirt.??1filebuf@@UEAA@XZ @ stub -arch=win32 ??1fstream@@UAE@XZ @ stub -arch=win64 ??1fstream@@UEAA@XZ -@ stub -arch=win32 ??1ifstream@@UAE@XZ -@ stub -arch=win64 ??1ifstream@@UEAA@XZ +@ thiscall -arch=win32 ??1ifstream@@UAE@XZ(ptr) msvcirt.??1ifstream@@UAE@XZ +@ cdecl -arch=win64 ??1ifstream@@UEAA@XZ(ptr) msvcirt.??1ifstream@@UEAA@XZ @ thiscall -arch=win32 ??1ios@@UAE@XZ(ptr) msvcirt.??1ios@@UAE@XZ @ cdecl -arch=win64 ??1ios@@UEAA@XZ(ptr) msvcirt.??1ios@@UEAA@XZ @ thiscall -arch=win32 ??1iostream@@UAE@XZ(ptr) msvcirt.??1iostream@@UAE@XZ @@ -164,8 +164,8 @@ @ cdecl -arch=win64 ??4filebuf@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4filebuf@@QEAAAEAV0@AEBV0@@Z @ stub -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z @ stub -arch=win64 ??4fstream@@QEAAAEAV0@AEAV0@@Z -@ stub -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z -@ stub -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z +@ thiscall -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ifstream@@QAEAAV0@ABV0@@Z +@ cdecl -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ifstream@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4ios@@IAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ios@@IAEAAV0@ABV0@@Z @ cdecl -arch=win64 ??4ios@@IEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ios@@IEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4iostream@@IAEAAV0@AAV0@@Z(ptr ptr) msvcirt.??4iostream@@IAEAAV0@AAV0@@Z @@ -288,7 +288,7 @@ @ cdecl -arch=win64 ??Bios@@QEBAPEAXXZ(ptr) msvcirt.??Bios@@QEBAPEAXXZ @ extern ??_7filebuf@@6B@ msvcirt.??_7filebuf@@6B@ # @ extern ??_7fstream@@6B@ -# @ extern ??_7ifstream@@6B@ +@ extern ??_7ifstream@@6B@ msvcirt.??_7ifstream@@6B@ @ extern ??_7ios@@6B@ msvcirt.??_7ios@@6B@ @ extern ??_7iostream@@6B@ msvcirt.??_7iostream@@6B@ @ extern ??_7istream@@6B@ msvcirt.??_7istream@@6B@ @@ -305,7 +305,7 @@ @ extern ??_7strstreambuf@@6B@ msvcirt.??_7strstreambuf@@6B@ # @ extern ??_8fstream@@7Bistream@@@ # @ extern ??_8fstream@@7Bostream@@@ -# @ extern ??_8ifstream@@7B@ +@ extern ??_8ifstream@@7B@ msvcirt.??_8ifstream@@7B@ @ extern ??_8iostream@@7Bistream@@@ msvcirt.??_8iostream@@7Bistream@@@ @ extern ??_8iostream@@7Bostream@@@ msvcirt.??_8iostream@@7Bostream@@@ @ extern ??_8istream@@7B@ msvcirt.??_8istream@@7B@ @@ -321,8 +321,8 @@ @ extern ??_8strstream@@7Bostream@@@ msvcirt.??_8strstream@@7Bostream@@@ @ stub -arch=win32 ??_Dfstream@@QAEXXZ @ stub -arch=win64 ??_Dfstream@@QEAAXXZ -@ stub -arch=win32 ??_Difstream@@QAEXXZ -@ stub -arch=win64 ??_Difstream@@QEAAXXZ +@ thiscall -arch=win32 ??_Difstream@@QAEXXZ(ptr) msvcirt.??_Difstream@@QAEXXZ +@ cdecl -arch=win64 ??_Difstream@@QEAAXXZ(ptr) msvcirt.??_Difstream@@QEAAXXZ @ thiscall -arch=win32 ??_Diostream@@QAEXXZ(ptr) msvcirt.??_Diostream@@QAEXXZ @ cdecl -arch=win64 ??_Diostream@@QEAAXXZ(ptr) msvcirt.??_Diostream@@QEAAXXZ @ thiscall -arch=win32 ??_Distream@@QAEXXZ(ptr) msvcirt.??_Distream@@QAEXXZ @@ -346,7 +346,7 @@ @ stub -arch=win32 ??_EIostream_init@@QAEPAXI@Z @ thiscall -arch=win32 ??_Efilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Efilebuf@@UAEPAXI@Z @ stub -arch=win32 ??_Efstream@@UAEPAXI@Z -@ stub -arch=win32 ??_Eifstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Eifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Eifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eios@@UAEPAXI@Z(ptr long) msvcirt.??_Eios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eiostream@@UAEPAXI@Z(ptr long) msvcirt.??_Eiostream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eistream@@UAEPAXI@Z(ptr long) msvcirt.??_Eistream@@UAEPAXI@Z @@ -364,7 +364,7 @@ @ stub -arch=win32 ??_GIostream_init@@QAEPAXI@Z @ thiscall -arch=win32 ??_Gfilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Gfilebuf@@UAEPAXI@Z @ stub -arch=win32 ??_Gfstream@@UAEPAXI@Z -@ stub -arch=win32 ??_Gifstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Gifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Gifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gios@@UAEPAXI@Z(ptr long) msvcirt.??_Gios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Giostream@@UAEPAXI@Z(ptr long) msvcirt.??_Giostream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gistream@@UAEPAXI@Z(ptr long) msvcirt.??_Gistream@@UAEPAXI@Z @@ -394,8 +394,8 @@ @ cdecl -arch=win64 ?attach@filebuf@@QEAAPEAV1@H@Z(ptr long) msvcirt.?attach@filebuf@@QEAAPEAV1@H@Z @ stub -arch=win32 ?attach@fstream@@QAEXH@Z @ stub -arch=win64 ?attach@fstream@@QEAAXH@Z -@ stub -arch=win32 ?attach@ifstream@@QAEXH@Z -@ stub -arch=win64 ?attach@ifstream@@QEAAXH@Z +@ thiscall -arch=win32 ?attach@ifstream@@QAEXH@Z(ptr long) msvcirt.?attach@ifstream@@QAEXH@Z +@ cdecl -arch=win64 ?attach@ifstream@@QEAAXH@Z(ptr long) msvcirt.?attach@ifstream@@QEAAXH@Z @ stub -arch=win32 ?attach@ofstream@@QAEXH@Z @ stub -arch=win64 ?attach@ofstream@@QEAAXH@Z @ thiscall -arch=win32 ?bad@ios@@QBEHXZ(ptr) msvcirt.?bad@ios@@QBEHXZ @@ -416,8 +416,8 @@ @ cdecl -arch=win64 ?close@filebuf@@QEAAPEAV1@XZ(ptr) msvcirt.?close@filebuf@@QEAAPEAV1@XZ @ stub -arch=win32 ?close@fstream@@QAEXXZ @ stub -arch=win64 ?close@fstream@@QEAAXXZ -@ stub -arch=win32 ?close@ifstream@@QAEXXZ -@ stub -arch=win64 ?close@ifstream@@QEAAXXZ +@ thiscall -arch=win32 ?close@ifstream@@QAEXXZ(ptr) msvcirt.?close@ifstream@@QAEXXZ +@ cdecl -arch=win64 ?close@ifstream@@QEAAXXZ(ptr) msvcirt.?close@ifstream@@QEAAXXZ @ stub -arch=win32 ?close@ofstream@@QAEXXZ @ stub -arch=win64 ?close@ofstream@@QEAAXXZ @ cdecl -arch=win32 ?clrlock@ios@@QAAXXZ(ptr) msvcirt.?clrlock@ios@@QAAXXZ @@ -460,8 +460,8 @@ @ cdecl -arch=win64 ?fd@filebuf@@QEBAHXZ(ptr) msvcirt.?fd@filebuf@@QEBAHXZ @ stub -arch=win32 ?fd@fstream@@QBEHXZ @ stub -arch=win64 ?fd@fstream@@QEBAHXZ -@ stub -arch=win32 ?fd@ifstream@@QBEHXZ -@ stub -arch=win64 ?fd@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?fd@ifstream@@QBEHXZ(ptr) msvcirt.?fd@ifstream@@QBEHXZ +@ cdecl -arch=win64 ?fd@ifstream@@QEBAHXZ(ptr) msvcirt.?fd@ifstream@@QEBAHXZ @ stub -arch=win32 ?fd@ofstream@@QBEHXZ @ stub -arch=win64 ?fd@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?fill@ios@@QAEDD@Z(ptr long) msvcirt.?fill@ios@@QAEDD@Z @@ -527,8 +527,8 @@ @ cdecl -arch=win64 ?is_open@filebuf@@QEBAHXZ(ptr) msvcirt.?is_open@filebuf@@QEBAHXZ @ stub -arch=win32 ?is_open@fstream@@QBEHXZ @ stub -arch=win64 ?is_open@fstream@@QEBAHXZ -@ stub -arch=win32 ?is_open@ifstream@@QBEHXZ -@ stub -arch=win64 ?is_open@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?is_open@ifstream@@QBEHXZ(ptr) msvcirt.?is_open@ifstream@@QBEHXZ +@ cdecl -arch=win64 ?is_open@ifstream@@QEBAHXZ(ptr) msvcirt.?is_open@ifstream@@QEBAHXZ @ stub -arch=win32 ?is_open@ofstream@@QBEHXZ @ stub -arch=win64 ?is_open@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?isfx@istream@@QAEXXZ(ptr) msvcirt.?isfx@istream@@QAEXXZ @@ -552,8 +552,8 @@ @ cdecl -arch=win64 ?open@filebuf@@QEAAPEAV1@PEBDHH@Z(ptr str long long) msvcirt.?open@filebuf@@QEAAPEAV1@PEBDHH@Z @ stub -arch=win32 ?open@fstream@@QAEXPBDHH@Z @ stub -arch=win64 ?open@fstream@@QEAAXPEBDHH@Z -@ stub -arch=win32 ?open@ifstream@@QAEXPBDHH@Z -@ stub -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z +@ thiscall -arch=win32 ?open@ifstream@@QAEXPBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QAEXPBDHH@Z +@ cdecl -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QEAAXPEBDHH@Z @ stub -arch=win32 ?open@ofstream@@QAEXPBDHH@Z @ stub -arch=win64 ?open@ofstream@@QEAAXPEBDHH@Z @ extern ?openprot@filebuf@@2HB msvcirt.?openprot@filebuf@@2HB @@ -601,8 +601,8 @@ @ cdecl -arch=win64 ?pword@ios@@QEBAAEAPEAXH@Z(ptr long) msvcirt.?pword@ios@@QEBAAEAPEAXH@Z @ stub -arch=win32 ?rdbuf@fstream@@QBEPAVfilebuf@@XZ @ stub -arch=win64 ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ -@ stub -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ -@ stub -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ +@ thiscall -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QBEPAVfilebuf@@XZ +@ cdecl -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ @ thiscall -arch=win32 ?rdbuf@ios@@QBEPAVstreambuf@@XZ(ptr) msvcirt.?rdbuf@ios@@QBEPAVstreambuf@@XZ @ cdecl -arch=win64 ?rdbuf@ios@@QEBAPEAVstreambuf@@XZ(ptr) msvcirt.?rdbuf@ios@@QEBAPEAVstreambuf@@XZ @ thiscall -arch=win32 ?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ(ptr) msvcirt.?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ @@ -673,8 +673,8 @@ @ cdecl -arch=win64 ?setmode@filebuf@@QEAAHH@Z(ptr long) msvcirt.?setmode@filebuf@@QEAAHH@Z @ stub -arch=win32 ?setmode@fstream@@QAEHH@Z @ stub -arch=win64 ?setmode@fstream@@QEAAHH@Z -@ stub -arch=win32 ?setmode@ifstream@@QAEHH@Z -@ stub -arch=win64 ?setmode@ifstream@@QEAAHH@Z +@ thiscall -arch=win32 ?setmode@ifstream@@QAEHH@Z(ptr long) msvcirt.?setmode@ifstream@@QAEHH@Z +@ cdecl -arch=win64 ?setmode@ifstream@@QEAAHH@Z(ptr long) msvcirt.?setmode@ifstream@@QEAAHH@Z @ stub -arch=win32 ?setmode@ofstream@@QAEHH@Z @ stub -arch=win64 ?setmode@ofstream@@QEAAHH@Z @ thiscall -arch=win32 ?setp@streambuf@@IAEXPAD0@Z(ptr ptr ptr) msvcirt.?setp@streambuf@@IAEXPAD0@Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index f0d966acd7c..6a2c9a7e52e 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -38,16 +38,16 @@ @ stub -arch=win64 ??0fstream@@QEAA@PEBDHH@Z @ stub -arch=win32 ??0fstream@@QAE@XZ @ stub -arch=win64 ??0fstream@@QEAA@XZ -@ stub -arch=win32 ??0ifstream@@QAE@ABV0@@Z -@ stub -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z -@ stub -arch=win32 ??0ifstream@@QAE@H@Z -@ stub -arch=win64 ??0ifstream@@QEAA@H@Z -@ stub -arch=win32 ??0ifstream@@QAE@HPADH@Z -@ stub -arch=win64 ??0ifstream@@QEAA@HPEADH@Z -@ stub -arch=win32 ??0ifstream@@QAE@PBDHH@Z -@ stub -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z -@ stub -arch=win32 ??0ifstream@@QAE@XZ -@ stub -arch=win64 ??0ifstream@@QEAA@XZ +@ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QAE@ABV0@@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QEAA@AEBV0@@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@H@Z(ptr long long) msvcirt.??0ifstream@@QAE@H@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@H@Z(ptr long long) msvcirt.??0ifstream@@QEAA@H@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@HPADH@Z(ptr long ptr long long) msvcirt.??0ifstream@@QAE@HPADH@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@HPEADH@Z(ptr long ptr long long) msvcirt.??0ifstream@@QEAA@HPEADH@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@PBDHH@Z(ptr str long long long) msvcirt.??0ifstream@@QAE@PBDHH@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z(ptr str long long long) msvcirt.??0ifstream@@QEAA@PEBDHH@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@XZ(ptr long) msvcirt.??0ifstream@@QAE@XZ +@ cdecl -arch=win64 ??0ifstream@@QEAA@XZ(ptr long) msvcirt.??0ifstream@@QEAA@XZ @ thiscall -arch=win32 ??0ios@@IAE@ABV0@@Z(ptr ptr) msvcirt.??0ios@@IAE@ABV0@@Z @ cdecl -arch=win64 ??0ios@@IEAA@AEBV0@@Z(ptr ptr) msvcirt.??0ios@@IEAA@AEBV0@@Z @ thiscall -arch=win32 ??0ios@@IAE@XZ(ptr) msvcirt.??0ios@@IAE@XZ @@ -154,8 +154,8 @@ @ cdecl -arch=win64 ??1filebuf@@UEAA@XZ(ptr) msvcirt.??1filebuf@@UEAA@XZ @ stub -arch=win32 ??1fstream@@UAE@XZ @ stub -arch=win64 ??1fstream@@UEAA@XZ -@ stub -arch=win32 ??1ifstream@@UAE@XZ -@ stub -arch=win64 ??1ifstream@@UEAA@XZ +@ thiscall -arch=win32 ??1ifstream@@UAE@XZ(ptr) msvcirt.??1ifstream@@UAE@XZ +@ cdecl -arch=win64 ??1ifstream@@UEAA@XZ(ptr) msvcirt.??1ifstream@@UEAA@XZ @ thiscall -arch=win32 ??1ios@@UAE@XZ(ptr) msvcirt.??1ios@@UAE@XZ @ cdecl -arch=win64 ??1ios@@UEAA@XZ(ptr) msvcirt.??1ios@@UEAA@XZ @ thiscall -arch=win32 ??1iostream@@UAE@XZ(ptr) msvcirt.??1iostream@@UAE@XZ @@ -206,8 +206,8 @@ @ cdecl -arch=win64 ??4filebuf@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4filebuf@@QEAAAEAV0@AEBV0@@Z @ stub -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z @ stub -arch=win64 ??4fstream@@QEAAAEAV0@AEAV0@@Z -@ stub -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z -@ stub -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z +@ thiscall -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ifstream@@QAEAAV0@ABV0@@Z +@ cdecl -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ifstream@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4ios@@IAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ios@@IAEAAV0@ABV0@@Z @ cdecl -arch=win64 ??4ios@@IEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ios@@IEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4iostream@@IAEAAV0@AAV0@@Z(ptr ptr) msvcirt.??4iostream@@IAEAAV0@AAV0@@Z @@ -340,7 +340,7 @@ @ extern ??_7exception@@6B@ msvcrt.??_7exception@@6B@ @ extern ??_7filebuf@@6B@ msvcirt.??_7filebuf@@6B@ # @ extern ??_7fstream@@6B@ -# @ extern ??_7ifstream@@6B@ +@ extern ??_7ifstream@@6B@ msvcirt.??_7ifstream@@6B@ @ extern ??_7ios@@6B@ msvcirt.??_7ios@@6B@ @ extern ??_7iostream@@6B@ msvcirt.??_7iostream@@6B@ @ extern ??_7istream@@6B@ msvcirt.??_7istream@@6B@ @@ -358,7 +358,7 @@ @ extern ??_7strstreambuf@@6B@ msvcirt.??_7strstreambuf@@6B@ # @ extern ??_8fstream@@7Bistream@@@ # @ extern ??_8fstream@@7Bostream@@@ -# @ extern ??_8ifstream@@7B@ +@ extern ??_8ifstream@@7B@ msvcirt.??_8ifstream@@7B@ @ extern ??_8iostream@@7Bistream@@@ msvcirt.??_8iostream@@7Bistream@@@ @ extern ??_8iostream@@7Bostream@@@ msvcirt.??_8iostream@@7Bostream@@@ @ extern ??_8istream@@7B@ msvcirt.??_8istream@@7B@ @@ -374,8 +374,8 @@ @ extern ??_8strstream@@7Bostream@@@ msvcirt.??_8strstream@@7Bostream@@@ @ stub -arch=win32 ??_Dfstream@@QAEXXZ @ stub -arch=win64 ??_Dfstream@@QEAAXXZ -@ stub -arch=win32 ??_Difstream@@QAEXXZ -@ stub -arch=win64 ??_Difstream@@QEAAXXZ +@ thiscall -arch=win32 ??_Difstream@@QAEXXZ(ptr) msvcirt.??_Difstream@@QAEXXZ +@ cdecl -arch=win64 ??_Difstream@@QEAAXXZ(ptr) msvcirt.??_Difstream@@QEAAXXZ @ thiscall -arch=win32 ??_Diostream@@QAEXXZ(ptr) msvcirt.??_Diostream@@QAEXXZ @ cdecl -arch=win64 ??_Diostream@@QEAAXXZ(ptr) msvcirt.??_Diostream@@QEAAXXZ @ thiscall -arch=win32 ??_Distream@@QAEXXZ(ptr) msvcirt.??_Distream@@QAEXXZ @@ -403,7 +403,7 @@ @ thiscall -arch=win32 ??_Eexception@@UAEPAXI@Z(ptr long) msvcrt.??_Eexception@@UAEPAXI@Z @ thiscall -arch=win32 ??_Efilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Efilebuf@@UAEPAXI@Z @ stub -arch=win32 ??_Efstream@@UAEPAXI@Z -@ stub -arch=win32 ??_Eifstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Eifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Eifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eios@@UAEPAXI@Z(ptr long) msvcirt.??_Eios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eiostream@@UAEPAXI@Z(ptr long) msvcirt.??_Eiostream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eistream@@UAEPAXI@Z(ptr long) msvcirt.??_Eistream@@UAEPAXI@Z @@ -426,7 +426,7 @@ @ thiscall -arch=win32 ??_Gexception@@UAEPAXI@Z(ptr long) msvcrt.??_Gexception@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gfilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Gfilebuf@@UAEPAXI@Z @ stub -arch=win32 ??_Gfstream@@UAEPAXI@Z -@ stub -arch=win32 ??_Gifstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Gifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Gifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gios@@UAEPAXI@Z(ptr long) msvcirt.??_Gios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Giostream@@UAEPAXI@Z(ptr long) msvcirt.??_Giostream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gistream@@UAEPAXI@Z(ptr long) msvcirt.??_Gistream@@UAEPAXI@Z @@ -457,8 +457,8 @@ @ cdecl -arch=win64 ?attach@filebuf@@QEAAPEAV1@H@Z(ptr long) msvcirt.?attach@filebuf@@QEAAPEAV1@H@Z @ stub -arch=win32 ?attach@fstream@@QAEXH@Z @ stub -arch=win64 ?attach@fstream@@QEAAXH@Z -@ stub -arch=win32 ?attach@ifstream@@QAEXH@Z -@ stub -arch=win64 ?attach@ifstream@@QEAAXH@Z +@ thiscall -arch=win32 ?attach@ifstream@@QAEXH@Z(ptr long) msvcirt.?attach@ifstream@@QAEXH@Z +@ cdecl -arch=win64 ?attach@ifstream@@QEAAXH@Z(ptr long) msvcirt.?attach@ifstream@@QEAAXH@Z @ stub -arch=win32 ?attach@ofstream@@QAEXH@Z @ stub -arch=win64 ?attach@ofstream@@QEAAXH@Z @ thiscall -arch=win32 ?bad@ios@@QBEHXZ(ptr) msvcirt.?bad@ios@@QBEHXZ @@ -481,8 +481,8 @@ @ cdecl -arch=win64 ?close@filebuf@@QEAAPEAV1@XZ(ptr) msvcirt.?close@filebuf@@QEAAPEAV1@XZ @ stub -arch=win32 ?close@fstream@@QAEXXZ @ stub -arch=win64 ?close@fstream@@QEAAXXZ -@ stub -arch=win32 ?close@ifstream@@QAEXXZ -@ stub -arch=win64 ?close@ifstream@@QEAAXXZ +@ thiscall -arch=win32 ?close@ifstream@@QAEXXZ(ptr) msvcirt.?close@ifstream@@QAEXXZ +@ cdecl -arch=win64 ?close@ifstream@@QEAAXXZ(ptr) msvcirt.?close@ifstream@@QEAAXXZ @ stub -arch=win32 ?close@ofstream@@QAEXXZ @ stub -arch=win64 ?close@ofstream@@QEAAXXZ @ cdecl -arch=win32 ?clrlock@ios@@QAAXXZ(ptr) msvcirt.?clrlock@ios@@QAAXXZ @@ -525,8 +525,8 @@ @ cdecl -arch=win64 ?fd@filebuf@@QEBAHXZ(ptr) msvcirt.?fd@filebuf@@QEBAHXZ @ stub -arch=win32 ?fd@fstream@@QBEHXZ @ stub -arch=win64 ?fd@fstream@@QEBAHXZ -@ stub -arch=win32 ?fd@ifstream@@QBEHXZ -@ stub -arch=win64 ?fd@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?fd@ifstream@@QBEHXZ(ptr) msvcirt.?fd@ifstream@@QBEHXZ +@ cdecl -arch=win64 ?fd@ifstream@@QEBAHXZ(ptr) msvcirt.?fd@ifstream@@QEBAHXZ @ stub -arch=win32 ?fd@ofstream@@QBEHXZ @ stub -arch=win64 ?fd@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?fill@ios@@QAEDD@Z(ptr long) msvcirt.?fill@ios@@QAEDD@Z @@ -594,8 +594,8 @@ @ cdecl -arch=win64 ?is_open@filebuf@@QEBAHXZ(ptr) msvcirt.?is_open@filebuf@@QEBAHXZ @ stub -arch=win32 ?is_open@fstream@@QBEHXZ @ stub -arch=win64 ?is_open@fstream@@QEBAHXZ -@ stub -arch=win32 ?is_open@ifstream@@QBEHXZ -@ stub -arch=win64 ?is_open@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?is_open@ifstream@@QBEHXZ(ptr) msvcirt.?is_open@ifstream@@QBEHXZ +@ cdecl -arch=win64 ?is_open@ifstream@@QEBAHXZ(ptr) msvcirt.?is_open@ifstream@@QEBAHXZ @ stub -arch=win32 ?is_open@ofstream@@QBEHXZ @ stub -arch=win64 ?is_open@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?isfx@istream@@QAEXXZ(ptr) msvcirt.?isfx@istream@@QAEXXZ @@ -621,8 +621,8 @@ @ cdecl -arch=win64 ?open@filebuf@@QEAAPEAV1@PEBDHH@Z(ptr str long long) msvcirt.?open@filebuf@@QEAAPEAV1@PEBDHH@Z @ stub -arch=win32 ?open@fstream@@QAEXPBDHH@Z @ stub -arch=win64 ?open@fstream@@QEAAXPEBDHH@Z -@ stub -arch=win32 ?open@ifstream@@QAEXPBDHH@Z -@ stub -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z +@ thiscall -arch=win32 ?open@ifstream@@QAEXPBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QAEXPBDHH@Z +@ cdecl -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QEAAXPEBDHH@Z @ stub -arch=win32 ?open@ofstream@@QAEXPBDHH@Z @ stub -arch=win64 ?open@ofstream@@QEAAXPEBDHH@Z @ extern ?openprot@filebuf@@2HB msvcirt.?openprot@filebuf@@2HB @@ -672,8 +672,8 @@ @ cdecl -arch=win64 ?raw_name@type_info@@QEBAPEBDXZ(ptr) msvcrt.?raw_name@type_info@@QEBAPEBDXZ @ stub -arch=win32 ?rdbuf@fstream@@QBEPAVfilebuf@@XZ @ stub -arch=win64 ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ -@ stub -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ -@ stub -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ +@ thiscall -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QBEPAVfilebuf@@XZ +@ cdecl -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ @ thiscall -arch=win32 ?rdbuf@ios@@QBEPAVstreambuf@@XZ(ptr) msvcirt.?rdbuf@ios@@QBEPAVstreambuf@@XZ @ cdecl -arch=win64 ?rdbuf@ios@@QEBAPEAVstreambuf@@XZ(ptr) msvcirt.?rdbuf@ios@@QEBAPEAVstreambuf@@XZ @ thiscall -arch=win32 ?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ(ptr) msvcirt.?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ @@ -745,8 +745,8 @@ @ cdecl -arch=win64 ?setmode@filebuf@@QEAAHH@Z(ptr long) msvcirt.?setmode@filebuf@@QEAAHH@Z @ stub -arch=win32 ?setmode@fstream@@QAEHH@Z @ stub -arch=win64 ?setmode@fstream@@QEAAHH@Z -@ stub -arch=win32 ?setmode@ifstream@@QAEHH@Z -@ stub -arch=win64 ?setmode@ifstream@@QEAAHH@Z +@ thiscall -arch=win32 ?setmode@ifstream@@QAEHH@Z(ptr long) msvcirt.?setmode@ifstream@@QAEHH@Z +@ cdecl -arch=win64 ?setmode@ifstream@@QEAAHH@Z(ptr long) msvcirt.?setmode@ifstream@@QEAAHH@Z @ stub -arch=win32 ?setmode@ofstream@@QAEHH@Z @ stub -arch=win64 ?setmode@ofstream@@QEAAHH@Z @ thiscall -arch=win32 ?setp@streambuf@@IAEXPAD0@Z(ptr ptr ptr) msvcirt.?setp@streambuf@@IAEXPAD0@Z -- 2.28.0

3 3

[PATCH v2 1/5] user32/tests: Attach a debugger to help SetForegroundWindow succeed.
by Rémi Bernon 02 Sep '20

02 Sep '20

This is not strictly required and it does not even work all the time regardless of what MSDN says, but it helps, especially when multiple processes are creating windows. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Note that this patch is completely optional and can be ignored. I had more consistent results with it when running the test on my Windows 10 VM though but it doesn't seem to change much for the testbot. v2: For the whole series, mostly whitespace fixes, and a rework of the fix implementation to avoid messing with the message queues. dlls/user32/tests/win.c | 50 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 843da8900f1..c001247b651 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11896,6 +11896,53 @@ static void test_other_process_window(const char *argv0) DestroyWindow(hwnd); } +static void start_debugger( int argc, char **argv ) +{ + HANDLE debug_ready; + BOOL ret; + char event_name[MAX_PATH]; + + if (argc == 4 && !strcmp( argv[2], "debugger" )) + { + DWORD pid; + DEBUG_EVENT de; + + sprintf( event_name, "test_debug_%s", argv[3] ); + debug_ready = OpenEventA( EVENT_ALL_ACCESS, FALSE, event_name ); + ok( debug_ready != 0, "OpenEventA failed\n" ); + + sscanf( argv[3], "%x", &pid ); + ret = DebugActiveProcess( pid ); + ok( ret, "DebugActiveProcess failed, last error: %#x.\n", GetLastError() ); + + SetEvent( debug_ready ); + ok( ret, "SetEvent failed, last error %#x.\n", GetLastError() ); + CloseHandle( debug_ready ); + + while (WaitForDebugEvent( &de, INFINITE )) + ContinueDebugEvent( de.dwProcessId, de.dwThreadId, DBG_EXCEPTION_NOT_HANDLED ); + + exit( 0 ); + } + else + { + PROCESS_INFORMATION pi; + STARTUPINFOA si = {sizeof(si)}; + char cmd[MAX_PATH]; + + sprintf( event_name, "test_debug_%x", GetCurrentProcessId() ); + debug_ready = CreateEventA( NULL, FALSE, FALSE, event_name ); + ok( debug_ready != 0, "CreateEventA failed\n" ); + + sprintf( cmd, "%s win debugger %x", argv[0], GetCurrentProcessId() ); + ret = CreateProcessA( NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + ok( ret, "CreateProcessA failed, last error: %#x.\n", GetLastError() ); + + WaitForSingleObject( debug_ready, INFINITE ); + CloseHandle( debug_ready ); + } +} + START_TEST(win) { char **argv; @@ -11920,6 +11967,9 @@ START_TEST(win) pAdjustWindowRectExForDpi = (void *)GetProcAddress( user32, "AdjustWindowRectExForDpi" ); pSystemParametersInfoForDpi = (void *)GetProcAddress( user32, "SystemParametersInfoForDpi" ); + /* attaching a debugger to the current process will make sure SetForegroundWindow always succeed */ + start_debugger( argc, argv ); + if (argc == 4) { HWND hwnd; -- 2.28.0

2 9

[PATCH] advapi32: add stub for LogonUserEx{A,W}
by Louis Lenders 02 Sep '20

02 Sep '20

This was API mentioned on forum: https://forum.winehq.org/viewtopic.php?f=2&t=34291 (The app is ConsultantPlus) Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/advapi32/advapi.c | 57 ++++++++++++++++++++++++++----------- dlls/advapi32/advapi32.spec | 4 +-- 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 589405b59e..b494740bd8 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -237,36 +237,59 @@ DWORD WINAPI InitiateShutdownW(WCHAR *name, WCHAR *message, DWORD seconds, DWORD return ERROR_CALL_NOT_IMPLEMENTED; } -BOOL WINAPI LogonUserA( LPCSTR lpszUsername, LPCSTR lpszDomain, LPCSTR lpszPassword, - DWORD dwLogonType, DWORD dwLogonProvider, PHANDLE phToken ) +BOOL WINAPI LogonUserExW ( const WCHAR *name, const WCHAR *domain, const WCHAR *pwd, + DWORD type, DWORD provider, HANDLE *token, SID **sid, VOID **buf, + DWORD *size, QUOTA_LIMITS *quota_limits ) { - WCHAR *usernameW = NULL, *domainW = NULL, *passwordW = NULL; + FIXME("%s %s %s 0x%08x 0x%08x %p %p %p %p %p\n", debugstr_w(name), + debugstr_w(domain), debugstr_w(pwd), type, provider, token, sid, buf, size, quota_limits); + + if ( sid || buf || size || quota_limits ) + { + FIXME(" %p %p %p %p - unsupported arguments\n", sid, buf, size, quota_limits); + return FALSE; + } + + if ( token ) + *token = (HANDLE *)0xdeadbeef; + + return TRUE; +} + +BOOL WINAPI LogonUserExA ( const char *name, const char *domain, const char *pwd, + DWORD type, DWORD provider, HANDLE *token, SID **sid, VOID **buf, + DWORD *size, QUOTA_LIMITS *quota_limits ) +{ + WCHAR *nameW = NULL, *domainW = NULL, *pwdW = NULL; BOOL ret = FALSE; - TRACE("%s %s %p 0x%08x 0x%08x %p\n", debugstr_a(lpszUsername), - debugstr_a(lpszDomain), lpszPassword, dwLogonType, dwLogonProvider, phToken); + TRACE("%s %s %s 0x%08x 0x%08x %p %p %p %p %p\n", debugstr_a(name), + debugstr_a(domain), debugstr_a(pwd), type, provider, token, sid, buf, size, quota_limits); - if (lpszUsername && !(usernameW = strdupAW( lpszUsername ))) return FALSE; - if (lpszDomain && !(domainW = strdupAW( lpszUsername ))) goto done; - if (lpszPassword && !(passwordW = strdupAW( lpszPassword ))) goto done; + if (name && !(nameW = strdupAW( name ))) return FALSE; + if (domain && !(domainW = strdupAW( domain ))) goto done; + if (pwd && !(pwdW = strdupAW( pwd ))) goto done; - ret = LogonUserW( usernameW, domainW, passwordW, dwLogonType, dwLogonProvider, phToken ); + ret = LogonUserExW( nameW, domainW, pwdW, type, provider, token, sid, buf, size, quota_limits ); done: - heap_free( usernameW ); + heap_free( nameW ); heap_free( domainW ); - heap_free( passwordW ); + heap_free( pwdW ); return ret; } -BOOL WINAPI LogonUserW( LPCWSTR lpszUsername, LPCWSTR lpszDomain, LPCWSTR lpszPassword, - DWORD dwLogonType, DWORD dwLogonProvider, PHANDLE phToken ) +BOOL WINAPI LogonUserW( const WCHAR *name, const WCHAR *domain, const WCHAR *pwd, + DWORD type, DWORD provider, HANDLE *token ) { - FIXME("%s %s %p 0x%08x 0x%08x %p - stub\n", debugstr_w(lpszUsername), - debugstr_w(lpszDomain), lpszPassword, dwLogonType, dwLogonProvider, phToken); + return LogonUserExW ( name, domain, pwd, type, provider, token, NULL, NULL, NULL, NULL ); +} - *phToken = (HANDLE *)0xdeadbeef; - return TRUE; + +BOOL WINAPI LogonUserA( const char *name, const char *domain, const char *pwd, + DWORD type, DWORD provider, HANDLE *token ) +{ + return LogonUserExA ( name, domain, pwd, type, provider, token, NULL, NULL, NULL, NULL ); } typedef UINT (WINAPI *fnMsiProvideComponentFromDescriptor)(LPCWSTR,LPWSTR,DWORD*,DWORD*); diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index fcef859a7c..6b41eb77dd 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -423,9 +423,9 @@ @ stdcall -import IsWellKnownSid(ptr long) @ stdcall LockServiceDatabase(ptr) @ stdcall LogonUserA(str str str long long ptr) -# @ stub LogonUserExA +@ stdcall LogonUserExA(str str str long long ptr ptr ptr ptr ptr) # @ stub LogonUserExExW -# @ stub LogonUserExW +@ stdcall LogonUserExW(wstr wstr wstr long long ptr ptr ptr ptr ptr) @ stdcall LogonUserW(wstr wstr wstr long long ptr) @ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) -- 2.28.0

1 0

[PATCH v2] msvcirt: Implement ifstream.
by Arkadiusz Hiler 02 Sep '20

02 Sep '20

Based on the semi-stubs by Gijs Vermeulen. We need to check that calls to different methods translate correctly to modifications done on the internal filebuf - not all methods call their filebuf counterparts directly (see setbuf). Tested with Power Tab Editor and GraphCalc - the crashes are gone and loading saved files seems to work correctly. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22616 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30014 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- v2: * use correct mangled symbols in the comment on top of setmode * set p_ifstream_dtor and p_ifstream_vbase_dtor in win32 path dlls/msvcirt/msvcirt.c | 185 ++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 72 +++++------ dlls/msvcirt/tests/msvcirt.c | 243 +++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 72 +++++------ dlls/msvcrt40/msvcrt40.spec | 72 +++++------ 5 files changed, 536 insertions(+), 108 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index f76eaf6d7ac..df2d7dcffad 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -192,6 +192,8 @@ extern const vtable_ptr MSVCP_istream_vtable; extern const vtable_ptr MSVCP_istream_withassign_vtable; /* ??_7istrstream@@6B@ */ extern const vtable_ptr MSVCP_istrstream_vtable; +/* ??_7ifstream@@6B@ */ +extern const vtable_ptr MSVCP_ifstream_vtable; /* ??_7iostream@@6B@ */ extern const vtable_ptr MSVCP_iostream_vtable; /* ??_7strstream@@6B@ */ @@ -262,6 +264,8 @@ __ASM_BLOCK_BEGIN(vtables) VTABLE_ADD_FUNC(istream_vector_dtor)); __ASM_VTABLE(istrstream, VTABLE_ADD_FUNC(istream_vector_dtor)); + __ASM_VTABLE(ifstream, + VTABLE_ADD_FUNC(istream_vector_dtor)); __ASM_VTABLE(iostream, VTABLE_ADD_FUNC(iostream_vector_dtor)); __ASM_VTABLE(strstream, @@ -280,6 +284,7 @@ const int ostream_vbtable[] = {0, VBTABLE_ENTRY(ostream, FIELD_OFFSET(ostream, v /* ??_8istream@@7B@ */ /* ??_8istream_withassign@@7B@ */ /* ??_8istrstream@@7B@ */ +/* ??_8ifstream@@7B@ */ const int istream_vbtable[] = {0, VBTABLE_ENTRY(istream, FIELD_OFFSET(istream, vbtable), ios)}; /* ??_8iostream@@7Bistream@@@ */ /* ??_8stdiostream@@7Bistream@@@ */ @@ -305,6 +310,8 @@ DEFINE_RTTI_DATA2(istream_withassign, sizeof(istream), &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVistream_withassign@@") DEFINE_RTTI_DATA2(istrstream, sizeof(istream), &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVistrstream@@") +DEFINE_RTTI_DATA2(ifstream, sizeof(istream), + &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVifstream@@") DEFINE_RTTI_DATA4(iostream, sizeof(iostream), &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, &ostream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AViostream@@") @@ -3113,6 +3120,8 @@ istream* __thiscall istream_copy_ctor(istream *this, const istream *copy, BOOL v /* ??1istream_withassign@@UEAA@XZ */ /* ??1istrstream@@UAE@XZ */ /* ??1istrstream@@UEAA@XZ */ +/* ??1ifstream@@UAE@XZ */ +/* ??1ifstream@@UEAA@XZ */ DEFINE_THISCALL_WRAPPER(istream_dtor, 4) void __thiscall istream_dtor(ios *base) { @@ -3152,6 +3161,8 @@ istream* __thiscall istream_assign_sb(istream *this, streambuf *sb) /* ??4istream_withassign@@QEAAAEAVistream@@AEBV1@@Z */ /* ??4istrstream@@QAEAAV0@ABV0@@Z */ /* ??4istrstream@@QEAAAEAV0@AEBV0@@Z */ +/* ??4ifstream@@QAEAAV0@ABV0@@Z */ +/* ??4ifstream@@QEAAAEAV0@AEBV0@@Z */ DEFINE_THISCALL_WRAPPER(istream_assign, 8) istream* __thiscall istream_assign(istream *this, const istream *rhs) { @@ -3164,6 +3175,8 @@ istream* __thiscall istream_assign(istream *this, const istream *rhs) /* ??_Distream_withassign@@QEAAXXZ */ /* ??_Distrstream@@QAEXXZ */ /* ??_Distrstream@@QEAAXXZ */ +/* ??_Difstream@@QAEXXZ */ +/* ??_Difstream@@QEAAXXZ */ DEFINE_THISCALL_WRAPPER(istream_vbase_dtor, 4) void __thiscall istream_vbase_dtor(istream *this) { @@ -3178,6 +3191,7 @@ void __thiscall istream_vbase_dtor(istream *this) /* ??_Eistream@@UAEPAXI@Z */ /* ??_Eistream_withassign@@UAEPAXI@Z */ /* ??_Eistrstream@@UAEPAXI@Z */ +/* ??_Eifstream@@UAEPAXI@Z */ DEFINE_THISCALL_WRAPPER(istream_vector_dtor, 8) istream* __thiscall istream_vector_dtor(ios *base, unsigned int flags) { @@ -3203,6 +3217,7 @@ istream* __thiscall istream_vector_dtor(ios *base, unsigned int flags) /* ??_Gistream@@UAEPAXI@Z */ /* ??_Gistream_withassign@@UAEPAXI@Z */ /* ??_Gistrstream@@UAEPAXI@Z */ +/* ??_Gifstream@@UAEPAXI@Z */ DEFINE_THISCALL_WRAPPER(istream_scalar_dtor, 8) istream* __thiscall istream_scalar_dtor(ios *base, unsigned int flags) { @@ -4089,6 +4104,175 @@ char* __thiscall istrstream_str(istream *this) return strstreambuf_str(istrstream_rdbuf(this)); } +/* ??0ifstream@@QAE@ABV0@@Z */ +/* ??0ifstream@@QEAA@AEBV0@@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_copy_ctor, 12) +istream* __thiscall ifstream_copy_ctor(istream *this, const istream *copy, BOOL virt_init) +{ + TRACE("(%p %p %d)\n", this, copy, virt_init); + + istream_withassign_copy_ctor(this, copy, virt_init); + istream_get_ios(this)->vtable = &MSVCP_ifstream_vtable; + + return this; +} + +/* ??0ifstream@@QAE@HPADH@Z */ +/* ??0ifstream@@QEAA@HPEADH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_buffer_ctor, 20) +istream* __thiscall ifstream_buffer_ctor(istream *this, filedesc fd, char *buffer, int length, BOOL virt_init) +{ + ios *base; + filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); + + TRACE("(%p %d %p %d %d)\n", this, fd, buffer, length, virt_init); + + if (fb) + { + filebuf_fd_reserve_ctor(fb, fd, buffer, length); + istream_sb_ctor(this, &fb->base, virt_init); + } + else + istream_ctor(this, virt_init); + + base = istream_get_ios(this); + base->vtable = &MSVCP_ifstream_vtable; + base->delbuf = 1; + + return this; +} + +/* ??0ifstream@@QAE@H@Z */ +/* ??0ifstream@@QEAA@H@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_fd_ctor, 12) +istream* __thiscall ifstream_fd_ctor(istream *this, filedesc fd, BOOL virt_init) +{ + ios *base; + filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); + + TRACE("(%p %d %d)\n", this, fd, virt_init); + + if (fb) + { + filebuf_fd_ctor(fb, fd); + istream_sb_ctor(this, &fb->base, virt_init); + } + else + istream_ctor(this, virt_init); + + base = istream_get_ios(this); + base->vtable = &MSVCP_ifstream_vtable; + base->delbuf = 1; + + return this; +} + +/* ??0ifstream@@QAE@PBDHH@Z */ +/* ??0ifstream@@QEAA@PEBDHH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_open_ctor, 20) +istream* __thiscall ifstream_open_ctor(istream *this, const char *name, ios_open_mode mode, int protection, BOOL virt_init) +{ + ios *base; + filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); + + TRACE("(%p %s %d %d %d)\n", this, name, mode, protection, virt_init); + + if (fb) + { + filebuf_ctor(fb); + istream_sb_ctor(this, &fb->base, virt_init); + filebuf_open(fb, name, mode, protection); + } + else + istream_ctor(this, virt_init); + + base = istream_get_ios(this); + base->vtable = &MSVCP_ifstream_vtable; + base->delbuf = 1; + + return this; +} + +/* ??0ifstream@@QAE@XZ */ +/* ??0ifstream@@QEAA@XZ */ +DEFINE_THISCALL_WRAPPER(ifstream_ctor, 8) +istream* __thiscall ifstream_ctor(istream *this, BOOL virt_init) +{ + return ifstream_fd_ctor(this, -1, virt_init); +} + +/* ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ */ +/* ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ */ +DEFINE_THISCALL_WRAPPER(ifstream_rdbuf, 4) +filebuf* __thiscall ifstream_rdbuf(const istream *this) +{ + TRACE("(%p)\n", this); + return (filebuf*) istream_get_ios(this)->sb; +} + +/* ?fd@ifstream@@QBEHXZ */ +/* ?fd@ifstream@@QEBAHXZ */ +DEFINE_THISCALL_WRAPPER(ifstream_fd, 4) +filedesc __thiscall ifstream_fd(istream *this) +{ + TRACE("(%p)\n", this); + return filebuf_fd(ifstream_rdbuf(this)); +} + +/* ?attach@ifstream@@QAEXH@Z */ +/* ?attach@ifstream@@QEAAXH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_attach, 8) +void __thiscall ifstream_attach(istream *this, filedesc fd) +{ + TRACE("(%p %d)\n", this, fd); + filebuf_attach(ifstream_rdbuf(this), fd); +} + +/* ?close@ifstream@@QAEXXZ */ +/* ?close@ifstream@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(ifstream_close, 4) +void __thiscall ifstream_close(istream *this) +{ + TRACE("(%p)\n", this); + filebuf_close(ifstream_rdbuf(this)); +} + +/* ?is_open@ifstream@@QBEHXZ */ +/* ?is_open@ifstream@@QEBAHXZ */ +DEFINE_THISCALL_WRAPPER(ifstream_is_open, 4) +int __thiscall ifstream_is_open(const istream *this) +{ + TRACE("(%p)\n", this); + return filebuf_is_open(ifstream_rdbuf(this)); +} + +/* ?open@ifstream@@QAEXPBDHH@Z */ +/* ?open@ifstream@@QEAAXPEBDHH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_open, 16) +void __thiscall ifstream_open(istream *this, const char *name, ios_open_mode mode, int protection) +{ + TRACE("(%p %s %d %d)\n", this, name, mode, protection); + filebuf_open(ifstream_rdbuf(this), name, mode, protection); +} + +/* ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z */ +/* ?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_setbuf, 12) +streambuf* __thiscall ifstream_setbuf(istream *this, char *buffer, int length) +{ + TRACE("(%p %p %d)\n", this, buffer, length); + return NULL; +} + +/* ?setmode@ifstream@@QAEHH@Z */ +/* ?setmode@ifstream@@QEAAHH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_setmode, 8) +int __thiscall ifstream_setmode(istream *this, int mode) +{ + TRACE("(%p %d)\n", this, mode); + return filebuf_setmode(ifstream_rdbuf(this), mode); +} + static inline ios* iostream_to_ios(const iostream *this) { return (ios*)((char*)this + iostream_vbtable_istream[1]); @@ -4522,6 +4706,7 @@ static void init_io(void *base) init_istream_rtti(base); init_istream_withassign_rtti(base); init_istrstream_rtti(base); + init_ifstream_rtti(base); init_iostream_rtti(base); init_strstream_rtti(base); init_stdiostream_rtti(base); diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index f2e875695ef..c2b4b9d30eb 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -26,16 +26,16 @@ @ stub -arch=win64 ??0fstream@@QEAA@PEBDHH@Z @ stub -arch=win32 ??0fstream@@QAE@XZ # __thiscall fstream::fstream(void) @ stub -arch=win64 ??0fstream@@QEAA@XZ -@ stub -arch=win32 ??0ifstream@@QAE@ABV0@@Z # __thiscall ifstream::ifstream(class ifstream const &) -@ stub -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z -@ stub -arch=win32 ??0ifstream@@QAE@H@Z # __thiscall ifstream::ifstream(int) -@ stub -arch=win64 ??0ifstream@@QEAA@H@Z -@ stub -arch=win32 ??0ifstream@@QAE@HPADH@Z # __thiscall ifstream::ifstream(int,char *,int) -@ stub -arch=win64 ??0ifstream@@QEAA@HPEADH@Z -@ stub -arch=win32 ??0ifstream@@QAE@PBDHH@Z # __thiscall ifstream::ifstream(char const *,int,int) -@ stub -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z -@ stub -arch=win32 ??0ifstream@@QAE@XZ # __thiscall ifstream::ifstream(void) -@ stub -arch=win64 ??0ifstream@@QEAA@XZ +@ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) ifstream_copy_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z(ptr ptr long) ifstream_copy_ctor +@ thiscall -arch=win32 ??0ifstream@@QAE@H@Z(ptr long long) ifstream_fd_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@H@Z(ptr long long) ifstream_fd_ctor +@ thiscall -arch=win32 ??0ifstream@@QAE@HPADH@Z(ptr long ptr long long) ifstream_buffer_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@HPEADH@Z(ptr long ptr long long) ifstream_buffer_ctor +@ thiscall -arch=win32 ??0ifstream@@QAE@PBDHH@Z(ptr str long long long) ifstream_open_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z(ptr str long long long) ifstream_open_ctor +@ thiscall -arch=win32 ??0ifstream@@QAE@XZ(ptr long) ifstream_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@XZ(ptr long) ifstream_ctor @ thiscall -arch=win32 ??0ios@@IAE@ABV0@@Z(ptr ptr) ios_copy_ctor @ cdecl -arch=win64 ??0ios@@IEAA@AEBV0@@Z(ptr ptr) ios_copy_ctor @ thiscall -arch=win32 ??0ios@@IAE@XZ(ptr) ios_ctor @@ -138,8 +138,8 @@ @ cdecl -arch=win64 ??1filebuf@@UEAA@XZ(ptr) filebuf_dtor @ stub -arch=win32 ??1fstream@@UAE@XZ # virtual __thiscall fstream::~fstream(void) @ stub -arch=win64 ??1fstream@@UEAA@XZ -@ stub -arch=win32 ??1ifstream@@UAE@XZ # virtual __thiscall ifstream::~ifstream(void) -@ stub -arch=win64 ??1ifstream@@UEAA@XZ +@ thiscall -arch=win32 ??1ifstream@@UAE@XZ(ptr) istream_dtor +@ cdecl -arch=win64 ??1ifstream@@UEAA@XZ(ptr) istream_dtor @ thiscall -arch=win32 ??1ios@@UAE@XZ(ptr) ios_dtor @ cdecl -arch=win64 ??1ios@@UEAA@XZ(ptr) ios_dtor @ thiscall -arch=win32 ??1iostream@@UAE@XZ(ptr) iostream_dtor @@ -178,8 +178,8 @@ @ cdecl -arch=win64 ??4filebuf@@QEAAAEAV0@AEBV0@@Z(ptr ptr) filebuf_assign @ stub -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z # class fstream & __thiscall fstream::operator=(class fstream &) @ stub -arch=win64 ??4fstream@@QEAAAEAV0@AEAV0@@Z -@ stub -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z # class ifstream & __thiscall ifstream::operator=(class ifstream const &) -@ stub -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z +@ thiscall -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z(ptr ptr) istream_assign +@ cdecl -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z(ptr ptr) istream_assign @ thiscall -arch=win32 ??4ios@@IAEAAV0@ABV0@@Z(ptr ptr) ios_assign @ cdecl -arch=win64 ??4ios@@IEAAAEAV0@AEBV0@@Z(ptr ptr) ios_assign @ thiscall -arch=win32 ??4iostream@@IAEAAV0@AAV0@@Z(ptr ptr) iostream_assign @@ -305,7 +305,7 @@ @ extern ??_7exception@@6B@ MSVCP_exception_vtable @ extern ??_7filebuf@@6B@ MSVCP_filebuf_vtable # @ extern ??_7fstream@@6B@ # const fstream::`vftable' -# @ extern ??_7ifstream@@6B@ # const ifstream::`vftable' +@ extern ??_7ifstream@@6B@ MSVCP_ifstream_vtable @ extern ??_7ios@@6B@ MSVCP_ios_vtable @ extern ??_7iostream@@6B@ MSVCP_iostream_vtable @ extern ??_7istream@@6B@ MSVCP_istream_vtable @@ -323,7 +323,7 @@ @ extern ??_7strstreambuf@@6B@ MSVCP_strstreambuf_vtable # @ extern ??_8fstream@@7Bistream@@@ # const fstream::`vbtable'{for `istream'} # @ extern ??_8fstream@@7Bostream@@@ # const fstream::`vbtable'{for `ostream'} -# @ extern ??_8ifstream@@7B@ # const ifstream::`vbtable' +@ extern ??_8ifstream@@7B@ istream_vbtable @ extern ??_8iostream@@7Bistream@@@ iostream_vbtable_istream @ extern ??_8iostream@@7Bostream@@@ iostream_vbtable_ostream @ extern ??_8istream@@7B@ istream_vbtable @@ -339,8 +339,8 @@ @ extern ??_8strstream@@7Bostream@@@ iostream_vbtable_ostream @ stub -arch=win32 ??_Dfstream@@QAEXXZ # void __thiscall fstream::`vbase destructor'(void) @ stub -arch=win64 ??_Dfstream@@QEAAXXZ -@ stub -arch=win32 ??_Difstream@@QAEXXZ # void __thiscall ifstream::`vbase destructor'(void) -@ stub -arch=win64 ??_Difstream@@QEAAXXZ +@ thiscall -arch=win32 ??_Difstream@@QAEXXZ(ptr) istream_vbase_dtor +@ cdecl -arch=win64 ??_Difstream@@QEAAXXZ(ptr) istream_vbase_dtor @ thiscall -arch=win32 ??_Diostream@@QAEXXZ(ptr) iostream_vbase_dtor @ cdecl -arch=win64 ??_Diostream@@QEAAXXZ(ptr) iostream_vbase_dtor @ thiscall -arch=win32 ??_Distream@@QAEXXZ(ptr) istream_vbase_dtor @@ -364,7 +364,7 @@ @ thiscall -arch=win32 ??_Eexception@@UAEPAXI@Z(ptr long) MSVCP_exception_vector_dtor @ thiscall -arch=win32 ??_Efilebuf@@UAEPAXI@Z(ptr long) filebuf_vector_dtor @ stub -arch=win32 ??_Efstream@@UAEPAXI@Z # virtual void * __thiscall fstream::`vector deleting destructor'(unsigned int) -@ stub -arch=win32 ??_Eifstream@@UAEPAXI@Z # virtual void * __thiscall ifstream::`vector deleting destructor'(unsigned int) +@ thiscall -arch=win32 ??_Eifstream@@UAEPAXI@Z(ptr long) istream_vector_dtor @ thiscall -arch=win32 ??_Eios@@UAEPAXI@Z(ptr long) ios_vector_dtor @ thiscall -arch=win32 ??_Eiostream@@UAEPAXI@Z(ptr long) iostream_vector_dtor @ thiscall -arch=win32 ??_Eistream@@UAEPAXI@Z(ptr long) istream_vector_dtor @@ -383,7 +383,7 @@ @ thiscall -arch=win32 ??_Gexception@@UAEPAXI@Z(ptr long) MSVCP_exception_scalar_dtor @ thiscall -arch=win32 ??_Gfilebuf@@UAEPAXI@Z(ptr long) filebuf_scalar_dtor @ stub -arch=win32 ??_Gfstream@@UAEPAXI@Z # virtual void * __thiscall fstream::`scalar deleting destructor'(unsigned int) -@ stub -arch=win32 ??_Gifstream@@UAEPAXI@Z # virtual void * __thiscall ifstream::`scalar deleting destructor'(unsigned int) +@ thiscall -arch=win32 ??_Gifstream@@UAEPAXI@Z(ptr long) istream_scalar_dtor @ thiscall -arch=win32 ??_Gios@@UAEPAXI@Z(ptr long) ios_scalar_dtor @ thiscall -arch=win32 ??_Giostream@@UAEPAXI@Z(ptr long) iostream_scalar_dtor @ thiscall -arch=win32 ??_Gistream@@UAEPAXI@Z(ptr long) istream_scalar_dtor @@ -406,8 +406,8 @@ @ cdecl -arch=win64 ?attach@filebuf@@QEAAPEAV1@H@Z(ptr long) filebuf_attach @ stub -arch=win32 ?attach@fstream@@QAEXH@Z # void __thiscall fstream::attach(int) @ stub -arch=win64 ?attach@fstream@@QEAAXH@Z -@ stub -arch=win32 ?attach@ifstream@@QAEXH@Z # void __thiscall ifstream::attach(int) -@ stub -arch=win64 ?attach@ifstream@@QEAAXH@Z +@ thiscall -arch=win32 ?attach@ifstream@@QAEXH@Z(ptr long) ifstream_attach +@ cdecl -arch=win64 ?attach@ifstream@@QEAAXH@Z(ptr long) ifstream_attach @ stub -arch=win32 ?attach@ofstream@@QAEXH@Z # void __thiscall ofstream::attach(int) @ stub -arch=win64 ?attach@ofstream@@QEAAXH@Z @ thiscall -arch=win32 ?bad@ios@@QBEHXZ(ptr) ios_bad @@ -428,8 +428,8 @@ @ cdecl -arch=win64 ?close@filebuf@@QEAAPEAV1@XZ(ptr) filebuf_close @ stub -arch=win32 ?close@fstream@@QAEXXZ # void __thiscall fstream::close(void) @ stub -arch=win64 ?close@fstream@@QEAAXXZ -@ stub -arch=win32 ?close@ifstream@@QAEXXZ # void __thiscall ifstream::close(void) -@ stub -arch=win64 ?close@ifstream@@QEAAXXZ +@ thiscall -arch=win32 ?close@ifstream@@QAEXXZ(ptr) ifstream_close +@ cdecl -arch=win64 ?close@ifstream@@QEAAXXZ(ptr) ifstream_close @ stub -arch=win32 ?close@ofstream@@QAEXXZ # void __thiscall ofstream::close(void) @ stub -arch=win64 ?close@ofstream@@QEAAXXZ @ cdecl -arch=win32 ?clrlock@ios@@QAAXXZ(ptr) ios_clrlock @@ -472,8 +472,8 @@ @ cdecl -arch=win64 ?fd@filebuf@@QEBAHXZ(ptr) filebuf_fd @ stub -arch=win32 ?fd@fstream@@QBEHXZ # int __thiscall fstream::fd(void)const @ stub -arch=win64 ?fd@fstream@@QEBAHXZ -@ stub -arch=win32 ?fd@ifstream@@QBEHXZ # int __thiscall ifstream::fd(void)const -@ stub -arch=win64 ?fd@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?fd@ifstream@@QBEHXZ(ptr) ifstream_fd +@ cdecl -arch=win64 ?fd@ifstream@@QEBAHXZ(ptr) ifstream_fd @ stub -arch=win32 ?fd@ofstream@@QBEHXZ # int __thiscall ofstream::fd(void)const @ stub -arch=win64 ?fd@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?fill@ios@@QAEDD@Z(ptr long) ios_fill_set @@ -541,8 +541,8 @@ @ cdecl -arch=win64 ?is_open@filebuf@@QEBAHXZ(ptr) filebuf_is_open @ stub -arch=win32 ?is_open@fstream@@QBEHXZ # int __thiscall fstream::is_open(void)const @ stub -arch=win64 ?is_open@fstream@@QEBAHXZ -@ stub -arch=win32 ?is_open@ifstream@@QBEHXZ # int __thiscall ifstream::is_open(void)const -@ stub -arch=win64 ?is_open@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?is_open@ifstream@@QBEHXZ(ptr) ifstream_is_open +@ cdecl -arch=win64 ?is_open@ifstream@@QEBAHXZ(ptr) ifstream_is_open @ stub -arch=win32 ?is_open@ofstream@@QBEHXZ # int __thiscall ofstream::is_open(void)const @ stub -arch=win64 ?is_open@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?isfx@istream@@QAEXXZ(ptr) istream_isfx @@ -566,8 +566,8 @@ @ cdecl -arch=win64 ?open@filebuf@@QEAAPEAV1@PEBDHH@Z(ptr str long long) filebuf_open @ stub -arch=win32 ?open@fstream@@QAEXPBDHH@Z # void __thiscall fstream::open(char const *,int,int) @ stub -arch=win64 ?open@fstream@@QEAAXPEBDHH@Z -@ stub -arch=win32 ?open@ifstream@@QAEXPBDHH@Z # void __thiscall ifstream::open(char const *,int,int) -@ stub -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z +@ thiscall -arch=win32 ?open@ifstream@@QAEXPBDHH@Z(ptr str long long) ifstream_open +@ cdecl -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z(ptr str long long) ifstream_open @ stub -arch=win32 ?open@ofstream@@QAEXPBDHH@Z # void __thiscall ofstream::open(char const *,int,int) @ stub -arch=win64 ?open@ofstream@@QEAAXPEBDHH@Z @ extern ?openprot@filebuf@@2HB filebuf_openprot @@ -615,8 +615,8 @@ @ cdecl -arch=win64 ?pword@ios@@QEBAAEAPEAXH@Z(ptr long) ios_pword @ stub -arch=win32 ?rdbuf@fstream@@QBEPAVfilebuf@@XZ # class filebuf * __thiscall fstream::rdbuf(void)const @ stub -arch=win64 ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ -@ stub -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ # class filebuf * __thiscall ifstream::rdbuf(void)const -@ stub -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ +@ thiscall -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ(ptr) ifstream_rdbuf +@ cdecl -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ(ptr) ifstream_rdbuf @ thiscall -arch=win32 ?rdbuf@ios@@QBEPAVstreambuf@@XZ(ptr) ios_rdbuf @ cdecl -arch=win64 ?rdbuf@ios@@QEBAPEAVstreambuf@@XZ(ptr) ios_rdbuf @ thiscall -arch=win32 ?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ(ptr) istrstream_rdbuf @@ -663,8 +663,8 @@ @ cdecl -arch=win64 ?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) filebuf_setbuf @ stub -arch=win32 ?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z # class streambuf * __thiscall fstream::setbuf(char *,int) @ stub -arch=win64 ?setbuf@fstream@@QEAAPEAVstreambuf@@PEADH@Z -@ stub -arch=win32 ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z # class streambuf * __thiscall ifstream::setbuf(char *,int) -@ stub -arch=win64 ?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z +@ thiscall -arch=win32 ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z(ptr ptr long) ifstream_setbuf +@ cdecl -arch=win64 ?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) ifstream_setbuf @ stub -arch=win32 ?setbuf@ofstream@@QAEPAVstreambuf@@PADH@Z # class streambuf * __thiscall ofstream::setbuf(char *,int) @ stub -arch=win64 ?setbuf@ofstream@@QEAAPEAVstreambuf@@PEADH@Z @ thiscall -arch=win32 ?setbuf@streambuf@@UAEPAV1@PADH@Z(ptr ptr long) streambuf_setbuf @@ -685,8 +685,8 @@ @ cdecl -arch=win64 ?setmode@filebuf@@QEAAHH@Z(ptr long) filebuf_setmode @ stub -arch=win32 ?setmode@fstream@@QAEHH@Z # int __thiscall fstream::setmode(int) @ stub -arch=win64 ?setmode@fstream@@QEAAHH@Z -@ stub -arch=win32 ?setmode@ifstream@@QAEHH@Z # int __thiscall ifstream::setmode(int) -@ stub -arch=win64 ?setmode@ifstream@@QEAAHH@Z +@ thiscall -arch=win32 ?setmode@ifstream@@QAEHH@Z(ptr long) ifstream_setmode +@ cdecl -arch=win64 ?setmode@ifstream@@QEAAHH@Z(ptr long) ifstream_setmode @ stub -arch=win32 ?setmode@ofstream@@QAEHH@Z # int __thiscall ofstream::setmode(int) @ stub -arch=win64 ?setmode@ofstream@@QEAAHH@Z @ thiscall -arch=win32 ?setp@streambuf@@IAEXPAD0@Z(ptr ptr ptr) streambuf_setp diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 6440bc0dab7..fa1f001d6cd 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <windef.h> #include <winbase.h> +#include <sys/stat.h> #include "wine/test.h" typedef void (*vtable_ptr)(void); @@ -403,6 +404,23 @@ static void (*__thiscall p_iostream_vbase_dtor)(iostream*); static iostream* (*__thiscall p_iostream_assign_sb)(iostream*, streambuf*); static iostream* (*__thiscall p_iostream_assign)(iostream*, const iostream*); +/* ifstream */ +static istream* (*__thiscall p_ifstream_copy_ctor)(istream*, const istream*, BOOL); +static istream* (*__thiscall p_ifstream_buffer_ctor)(istream*, filedesc, char*, int, BOOL); +static istream* (*__thiscall p_ifstream_fd_ctor)(istream*, filedesc fd, BOOL virt_init); +static istream* (*__thiscall p_ifstream_open_ctor)(istream*, const char *name, ios_open_mode, int, BOOL); +static istream* (*__thiscall p_ifstream_ctor)(istream*, BOOL); +static void (*__thiscall p_ifstream_dtor)(ios*); +static void (*__thiscall p_ifstream_vbase_dtor)(istream*); +static void (*__thiscall p_ifstream_attach)(istream*, filedesc); +static void (*__thiscall p_ifstream_close)(istream*); +static filedesc (*__thiscall p_ifstream_fd)(istream*); +static int (*__thiscall p_ifstream_is_open)(const istream*); +static void (*__thiscall p_ifstream_open)(istream*, const char*, ios_open_mode, int); +static filebuf* (*__thiscall p_ifstream_rdbuf)(const istream*); +static streambuf* (*__thiscall p_ifstream_setbuf)(istream*, char*, int); +static int (*__thiscall p_ifstream_setmode)(istream*, int); + /* strstream */ static iostream* (*__thiscall p_strstream_copy_ctor)(iostream*, const iostream*, BOOL); static iostream* (*__thiscall p_strstream_buffer_ctor)(iostream*, char*, int, int, BOOL); @@ -703,6 +721,22 @@ static BOOL init(void) SET(p_iostream_assign_sb, "??4iostream@@IEAAAEAV0@PEAVstreambuf@@@Z"); SET(p_iostream_assign, "??4iostream@@IEAAAEAV0@AEAV0@@Z"); + SET(p_ifstream_copy_ctor, "??0ifstream@@QEAA@AEBV0@@Z"); + SET(p_ifstream_buffer_ctor, "??0ifstream@@QEAA@HPEADH@Z"); + SET(p_ifstream_fd_ctor, "??0ifstream@@QEAA@H@Z"); + SET(p_ifstream_open_ctor, "??0ifstream@@QEAA@PEBDHH@Z"); + SET(p_ifstream_ctor, "??0ifstream@@QEAA@XZ"); + SET(p_ifstream_dtor, "??1ifstream@@UEAA@XZ"); + SET(p_ifstream_vbase_dtor, "??_Difstream@@QEAAXXZ"); + SET(p_ifstream_attach, "?attach@ifstream@@QEAAXH@Z"); + SET(p_ifstream_close, "?close@ifstream@@QEAAXXZ"); + SET(p_ifstream_fd, "?fd@ifstream@@QEBAHXZ"); + SET(p_ifstream_is_open, "?is_open@ifstream@@QEBAHXZ"); + SET(p_ifstream_open, "?open@ifstream@@QEAAXPEBDHH@Z"); + SET(p_ifstream_rdbuf, "?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ"); + SET(p_ifstream_setbuf, "?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z"); + SET(p_ifstream_setmode, "?setmode@ifstream@@QEAAHH@Z"); + SET(p_strstream_copy_ctor, "??0strstream@@QEAA@AEBV0@@Z"); SET(p_strstream_buffer_ctor, "??0strstream@@QEAA@PEADHH@Z"); SET(p_strstream_ctor, "??0strstream@@QEAA@XZ"); @@ -917,6 +951,22 @@ static BOOL init(void) SET(p_iostream_assign_sb, "??4iostream@@IAEAAV0@PAVstreambuf@@@Z"); SET(p_iostream_assign, "??4iostream@@IAEAAV0@AAV0@@Z"); + SET(p_ifstream_copy_ctor, "??0ifstream@@QAE@ABV0@@Z"); + SET(p_ifstream_fd_ctor, "??0ifstream@@QAE@H@Z"); + SET(p_ifstream_buffer_ctor, "??0ifstream@@QAE@HPADH@Z"); + SET(p_ifstream_open_ctor, "??0ifstream@@QAE@PBDHH@Z"); + SET(p_ifstream_ctor, "??0ifstream@@QAE@XZ"); + SET(p_ifstream_dtor, "??1ifstream@@UAE@XZ"); + SET(p_ifstream_vbase_dtor, "??_Difstream@@QAEXXZ"); + SET(p_ifstream_attach, "?attach@ifstream@@QAEXH@Z"); + SET(p_ifstream_close, "?close@ifstream@@QAEXXZ"); + SET(p_ifstream_fd, "?fd@ifstream@@QBEHXZ"); + SET(p_ifstream_is_open, "?is_open@ifstream@@QBEHXZ"); + SET(p_ifstream_open, "?open@ifstream@@QAEXPBDHH@Z"); + SET(p_ifstream_rdbuf, "?rdbuf@ifstream@@QBEPAVfilebuf@@XZ"); + SET(p_ifstream_setbuf, "?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z"); + SET(p_ifstream_setmode, "?setmode@ifstream@@QAEHH@Z"); + SET(p_strstream_copy_ctor, "??0strstream@@QAE@ABV0@@Z"); SET(p_strstream_buffer_ctor, "??0strstream@@QAE@PADHH@Z"); SET(p_strstream_ctor, "??0strstream@@QAE@XZ"); @@ -6720,6 +6770,198 @@ static void test_iostream(void) ok(ios2.base_ios.do_lock == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base_ios.do_lock); } +static void test_ifstream(void) +{ + const char *filename = "ifstream_test"; + istream ifs, ifs_copy, *pifs; + streambuf *psb; + filebuf *pfb; + char buffer[64]; + char st[8]; + int fd, ret, i; + + memset(&ifs, 0xab, sizeof(istream)); + + /* constructors/destructors */ + pifs = call_func2(p_ifstream_ctor, &ifs, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(ifs.extract_delim == 0, "expected 0 got %d\n", ifs.extract_delim); + ok(ifs.count == 0, "expected 0 got %d\n", ifs.count); + ok(ifs.base_ios.sb != NULL, "expected not %p got %p\n", NULL, ifs.base_ios.sb); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(ifs.base_ios.tie == NULL, "expected %p got %p\n", NULL, ifs.base_ios.tie); + ok(ifs.base_ios.flags == FLAGS_skipws, "expected %x got %x\n", FLAGS_skipws, ifs.base_ios.flags); + ok(ifs.base_ios.precision == 6, "expected 6 got %d\n", ifs.base_ios.precision); + ok(ifs.base_ios.fill == ' ', "expected 32 got %d\n", ifs.base_ios.fill); + ok(ifs.base_ios.width == 0, "expected 0 got %d\n", ifs.base_ios.width); + ok(ifs.base_ios.do_lock == -1, "expected -1 got %d\n", ifs.base_ios.do_lock); + ok(pfb->fd == -1, "wrong fd, expected -1 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == NULL, "wrong buffer, expected %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf == NULL, "wrong ebuf, expected %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd == -1, "wrong fd, expected 0 got %d\n", pfb->fd); + call_func1(p_ifstream_vbase_dtor, &ifs); + + pifs = call_func3(p_ifstream_fd_ctor, &ifs, 42, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == NULL, "wrong buffer, expected %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf == NULL, "wrong ebuf, expected %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd == 42, "wrong fd, expected 42 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + + pifs = call_func3(p_ifstream_copy_ctor, &ifs_copy, &ifs, TRUE); + pfb = (filebuf*) ifs_copy.base_ios.sb; + ok(pifs == &ifs_copy, "wrong return, expected %p got %p\n", &ifs_copy, pifs); + ok(ifs_copy.base_ios.sb == ifs.base_ios.sb, "expected shared streambuf\n"); + + call_func1(p_ifstream_vbase_dtor, &ifs_copy); + call_func1(p_ifstream_dtor, &ifs.base_ios); + + pifs = call_func5(p_ifstream_buffer_ctor, &ifs, 53, buffer, ARRAY_SIZE(buffer), TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, pfb->base.base); + ok(pfb->base.ebuf == buffer + ARRAY_SIZE(buffer), "wrong ebuf, expected %p got %p\n", buffer + ARRAY_SIZE(buffer), pfb->base.ebuf); + ok(pfb->fd == 53, "wrong fd, expected 53 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + call_func1(p_ifstream_dtor, &ifs.base_ios); + + pifs = call_func5(p_ifstream_buffer_ctor, &ifs, 64, NULL, 0, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == NULL, "wrong buffer, expected %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf == NULL, "wrong ebuf, expected %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd == 64, "wrong fd, expected 64 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + call_func1(p_ifstream_vbase_dtor, &ifs); + + pifs = call_func5(p_ifstream_open_ctor, &ifs, filename, OPENMODE_in, filebuf_openprot, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(pfb->base.allocated == 1, "wrong allocate value, expected 1 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base != NULL, "wrong buffer, expected not %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf != NULL, "wrong ebuf, expected not %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd != -1, "wrong fd, expected not -1 got %d\n", pfb->fd); + fd = pfb->fd; + ok(pfb->close == 1, "wrong value, expected 1 got %d\n", pfb->close); + call_func1(p_ifstream_vbase_dtor, &ifs); + ok(_close(fd) == -1, "expected ifstream to close opened file\n"); + + /* setbuf - seems to be a nop and always return NULL */ + pifs = call_func5(p_ifstream_buffer_ctor, &ifs, 64, NULL, 0, TRUE); + ok(ifs.base_ios.sb->base == NULL, "wrong base value, expected NULL got %p\n", ifs.base_ios.sb->base); + ok(ifs.base_ios.sb->ebuf == NULL, "wrong ebuf value, expected NULL got %p\n", ifs.base_ios.sb->ebuf); + ok(ifs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", pfb->base.unbuffered); + ok(ifs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got %d\n", ifs.base_ios.sb->allocated); + + psb = call_func3(p_ifstream_setbuf, &ifs, buffer, ARRAY_SIZE(buffer)); + ok(psb == NULL, "wrong return, expected NULL got %p\n", pfb); + ok(ifs.base_ios.sb->base == NULL, "wrong base value, expected NULL got %p\n", ifs.base_ios.sb->base); + ok(ifs.base_ios.sb->ebuf == NULL, "wrong ebuf value, expected NULL got %p\n", ifs.base_ios.sb->ebuf); + ok(ifs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", ifs.base_ios.sb->unbuffered); + ok(ifs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got %d\n", ifs.base_ios.sb->allocated); + + psb = call_func3(p_ifstream_setbuf, &ifs, NULL, 0); + ok(psb == NULL, "wrong return, expected NULL got %p\n", pfb); + ok(ifs.base_ios.sb->base == NULL, "wrong base value, expected NULL got %p\n", ifs.base_ios.sb->base); + ok(ifs.base_ios.sb->ebuf == NULL, "wrong ebuf value, expected NULL got %p\n", ifs.base_ios.sb->ebuf); + ok(ifs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", ifs.base_ios.sb->unbuffered); + ok(ifs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got \n", ifs.base_ios.sb->allocated); + call_func1(p_ifstream_vbase_dtor, &ifs); + + pifs = call_func5(p_ifstream_open_ctor, &ifs, filename, OPENMODE_in, filebuf_openprot, TRUE); + psb = call_func3(p_ifstream_setbuf, &ifs, NULL, 0); + ok(psb == NULL, "wrong return, expected NULL got %p\n", pfb); + ok(ifs.base_ios.sb->base != NULL, "wrong base value, expected NULL got %p\n", ifs.base_ios.sb->base); + ok(ifs.base_ios.sb->ebuf != NULL, "wrong ebuf value, expected NULL got %p\n", ifs.base_ios.sb->ebuf); + ok(ifs.base_ios.sb->unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", ifs.base_ios.sb->unbuffered); + ok(ifs.base_ios.sb->allocated == 1, "wrong allocated value, expected 1 got %d\n", ifs.base_ios.sb->allocated); + + psb = call_func3(p_ifstream_setbuf, &ifs, buffer, ARRAY_SIZE(buffer)); + ok(psb == NULL, "wrong return, expected NULL got %p\n", pfb); + ok(ifs.base_ios.sb->base != NULL, "wrong base value, expected NULL got %p\n", ifs.base_ios.sb->base); + ok(ifs.base_ios.sb->base != buffer, "wrong base value, expected not %p got %p\n", buffer, ifs.base_ios.sb->base); + ok(ifs.base_ios.sb->unbuffered == 0, "wrong unbuffered value, expected 1 got %d\n", ifs.base_ios.sb->unbuffered); + ok(ifs.base_ios.sb->allocated == 1, "wrong allocated value, expected 0 got %d\n", ifs.base_ios.sb->allocated); + call_func1(p_ifstream_vbase_dtor, &ifs); + + /* attach */ + pifs = call_func2(p_ifstream_ctor, &ifs, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + call_func2(p_ifstream_attach, &ifs, 42); + fd = call_func1(p_ifstream_fd, &ifs); + ok(fd == 42, "wrong fd, expected 42 got %d\n", fd); + ok(pfb->close == 0, "wrong close value, expected 0 got %d\n", pfb->close); + call_func2(p_ifstream_attach, &ifs, 53); + ok(fd == 42, "wrong fd, expected 42 got %d\n", fd); + call_func1(p_ifstream_vbase_dtor, &ifs); + + /* fd */ + pifs = call_func5(p_ifstream_open_ctor, &ifs, filename, OPENMODE_in, filebuf_openprot, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + fd = call_func1(p_ifstream_fd, &ifs); + ok(fd == pfb->fd, "wrong fd, expected %d but got %d\n", pfb->fd, fd); + + /* rdbuf */ + pfb = (filebuf*) call_func1(p_ifstream_rdbuf, &ifs); + ok((streambuf*) pfb == ifs.base_ios.sb, "wrong return, expected %p got %p\n", ifs.base_ios.sb, pfb); + + /* setmode */ + ret = call_func2(p_ifstream_setmode, &ifs, filebuf_binary); + ok(ret == filebuf_text, "wrong return, expected %d got %d\n", filebuf_text, ret); + ret = call_func2(p_ifstream_setmode, &ifs, filebuf_binary); + ok(ret == filebuf_binary, "wrong return, expected %d got %d\n", filebuf_binary, ret); + ret = call_func2(p_ifstream_setmode, &ifs, filebuf_text); + ok(ret == filebuf_binary, "wrong return, expected %d got %d\n", filebuf_binary, ret); + ret = call_func2(p_ifstream_setmode, &ifs, 0x9000); + ok(ret == -1, "wrong return, expected -1 got %d\n", ret); + + /* close && is_open */ + ok(call_func1(p_ifstream_is_open, &ifs) == 1, "expected ifstream to be open\n"); + call_func1(p_ifstream_close, &ifs); + ok(call_func1(p_ifstream_is_open, &ifs) == 0, "expected ifstream to not be open\n"); + ok(_close(fd) == -1, "expected close to close the opened file\n"); + + /* integration with parent istream - reading */ + fd = _open(filename, _O_TRUNC|_O_CREAT|_O_RDWR, _S_IWRITE); + ok(fd != -1, "_open failed\n"); + ok(_write(fd, "test 12", 7) == 7, "_write failed\n"); + ok(_close(fd) == 0, "_close failed\n"); + + call_func4(p_ifstream_open, &ifs, filename, OPENMODE_in, filebuf_openprot); + memset(st, 'A', sizeof(st)); + st[7] = 0; + pifs = call_func2(p_istream_read_str, &ifs, st); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(!strcmp(st, "test"), "expected 'test' got '%s'\n", st); + + i = 12345; + pifs = call_func2(p_istream_read_int, pifs, &i); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(i == 12, "expected 12 got %d\n", i); + + call_func1(p_ifstream_vbase_dtor, &ifs); + ok(_unlink(filename) == 0, "Couldn't unlink file named '%s'\n", filename); +} + static void test_strstream(void) { iostream ios1, ios2, *pios; @@ -7538,6 +7780,7 @@ START_TEST(msvcirt) test_istream_withassign(); test_istrstream(); test_iostream(); + test_ifstream(); test_strstream(); test_stdiostream(); test_Iostream_init(); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index f06a53cc601..2ce72c6b13c 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -20,16 +20,16 @@ @ stub -arch=win64 ??0fstream@@QEAA@PEBDHH@Z @ stub -arch=win32 ??0fstream@@QAE@XZ @ stub -arch=win64 ??0fstream@@QEAA@XZ -@ stub -arch=win32 ??0ifstream@@QAE@ABV0@@Z -@ stub -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z -@ stub -arch=win32 ??0ifstream@@QAE@H@Z -@ stub -arch=win64 ??0ifstream@@QEAA@H@Z -@ stub -arch=win32 ??0ifstream@@QAE@HPADH@Z -@ stub -arch=win64 ??0ifstream@@QEAA@HPEADH@Z -@ stub -arch=win32 ??0ifstream@@QAE@PBDHH@Z -@ stub -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z -@ stub -arch=win32 ??0ifstream@@QAE@XZ -@ stub -arch=win64 ??0ifstream@@QEAA@XZ +@ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QAE@ABV0@@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QEAA@AEBV0@@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@H@Z(ptr long long) msvcirt.??0ifstream@@QAE@H@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@H@Z(ptr long long) msvcirt.??0ifstream@@QEAA@H@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@HPADH@Z(ptr long ptr long long) msvcirt.??0ifstream@@QAE@HPADH@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@HPEADH@Z(ptr long ptr long long) msvcirt.??0ifstream@@QEAA@HPEADH@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@PBDHH@Z(ptr str long long long) msvcirt.??0ifstream@@QAE@PBDHH@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z(ptr str long long long) msvcirt.??0ifstream@@QEAA@PEBDHH@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@XZ(ptr long) msvcirt.??0ifstream@@QAE@XZ +@ cdecl -arch=win64 ??0ifstream@@QEAA@XZ(ptr long) msvcirt.??0ifstream@@QEAA@XZ @ thiscall -arch=win32 ??0ios@@IAE@ABV0@@Z(ptr ptr) msvcirt.??0ios@@IAE@ABV0@@Z @ cdecl -arch=win64 ??0ios@@IEAA@AEBV0@@Z(ptr ptr) msvcirt.??0ios@@IEAA@AEBV0@@Z @ thiscall -arch=win32 ??0ios@@IAE@XZ(ptr) msvcirt.??0ios@@IAE@XZ @@ -124,8 +124,8 @@ @ cdecl -arch=win64 ??1filebuf@@UEAA@XZ(ptr) msvcirt.??1filebuf@@UEAA@XZ @ stub -arch=win32 ??1fstream@@UAE@XZ @ stub -arch=win64 ??1fstream@@UEAA@XZ -@ stub -arch=win32 ??1ifstream@@UAE@XZ -@ stub -arch=win64 ??1ifstream@@UEAA@XZ +@ thiscall -arch=win32 ??1ifstream@@UAE@XZ(ptr) msvcirt.??1ifstream@@UAE@XZ +@ cdecl -arch=win64 ??1ifstream@@UEAA@XZ(ptr) msvcirt.??1ifstream@@UEAA@XZ @ thiscall -arch=win32 ??1ios@@UAE@XZ(ptr) msvcirt.??1ios@@UAE@XZ @ cdecl -arch=win64 ??1ios@@UEAA@XZ(ptr) msvcirt.??1ios@@UEAA@XZ @ thiscall -arch=win32 ??1iostream@@UAE@XZ(ptr) msvcirt.??1iostream@@UAE@XZ @@ -164,8 +164,8 @@ @ cdecl -arch=win64 ??4filebuf@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4filebuf@@QEAAAEAV0@AEBV0@@Z @ stub -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z @ stub -arch=win64 ??4fstream@@QEAAAEAV0@AEAV0@@Z -@ stub -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z -@ stub -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z +@ thiscall -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ifstream@@QAEAAV0@ABV0@@Z +@ cdecl -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ifstream@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4ios@@IAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ios@@IAEAAV0@ABV0@@Z @ cdecl -arch=win64 ??4ios@@IEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ios@@IEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4iostream@@IAEAAV0@AAV0@@Z(ptr ptr) msvcirt.??4iostream@@IAEAAV0@AAV0@@Z @@ -288,7 +288,7 @@ @ cdecl -arch=win64 ??Bios@@QEBAPEAXXZ(ptr) msvcirt.??Bios@@QEBAPEAXXZ @ extern ??_7filebuf@@6B@ msvcirt.??_7filebuf@@6B@ # @ extern ??_7fstream@@6B@ -# @ extern ??_7ifstream@@6B@ +@ extern ??_7ifstream@@6B@ msvcirt.??_7ifstream@@6B@ @ extern ??_7ios@@6B@ msvcirt.??_7ios@@6B@ @ extern ??_7iostream@@6B@ msvcirt.??_7iostream@@6B@ @ extern ??_7istream@@6B@ msvcirt.??_7istream@@6B@ @@ -305,7 +305,7 @@ @ extern ??_7strstreambuf@@6B@ msvcirt.??_7strstreambuf@@6B@ # @ extern ??_8fstream@@7Bistream@@@ # @ extern ??_8fstream@@7Bostream@@@ -# @ extern ??_8ifstream@@7B@ +@ extern ??_8ifstream@@7B@ msvcirt.??_8ifstream@@7B@ @ extern ??_8iostream@@7Bistream@@@ msvcirt.??_8iostream@@7Bistream@@@ @ extern ??_8iostream@@7Bostream@@@ msvcirt.??_8iostream@@7Bostream@@@ @ extern ??_8istream@@7B@ msvcirt.??_8istream@@7B@ @@ -321,8 +321,8 @@ @ extern ??_8strstream@@7Bostream@@@ msvcirt.??_8strstream@@7Bostream@@@ @ stub -arch=win32 ??_Dfstream@@QAEXXZ @ stub -arch=win64 ??_Dfstream@@QEAAXXZ -@ stub -arch=win32 ??_Difstream@@QAEXXZ -@ stub -arch=win64 ??_Difstream@@QEAAXXZ +@ thiscall -arch=win32 ??_Difstream@@QAEXXZ(ptr) msvcirt.??_Difstream@@QAEXXZ +@ cdecl -arch=win64 ??_Difstream@@QEAAXXZ(ptr) msvcirt.??_Difstream@@QEAAXXZ @ thiscall -arch=win32 ??_Diostream@@QAEXXZ(ptr) msvcirt.??_Diostream@@QAEXXZ @ cdecl -arch=win64 ??_Diostream@@QEAAXXZ(ptr) msvcirt.??_Diostream@@QEAAXXZ @ thiscall -arch=win32 ??_Distream@@QAEXXZ(ptr) msvcirt.??_Distream@@QAEXXZ @@ -346,7 +346,7 @@ @ stub -arch=win32 ??_EIostream_init@@QAEPAXI@Z @ thiscall -arch=win32 ??_Efilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Efilebuf@@UAEPAXI@Z @ stub -arch=win32 ??_Efstream@@UAEPAXI@Z -@ stub -arch=win32 ??_Eifstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Eifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Eifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eios@@UAEPAXI@Z(ptr long) msvcirt.??_Eios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eiostream@@UAEPAXI@Z(ptr long) msvcirt.??_Eiostream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eistream@@UAEPAXI@Z(ptr long) msvcirt.??_Eistream@@UAEPAXI@Z @@ -364,7 +364,7 @@ @ stub -arch=win32 ??_GIostream_init@@QAEPAXI@Z @ thiscall -arch=win32 ??_Gfilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Gfilebuf@@UAEPAXI@Z @ stub -arch=win32 ??_Gfstream@@UAEPAXI@Z -@ stub -arch=win32 ??_Gifstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Gifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Gifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gios@@UAEPAXI@Z(ptr long) msvcirt.??_Gios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Giostream@@UAEPAXI@Z(ptr long) msvcirt.??_Giostream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gistream@@UAEPAXI@Z(ptr long) msvcirt.??_Gistream@@UAEPAXI@Z @@ -394,8 +394,8 @@ @ cdecl -arch=win64 ?attach@filebuf@@QEAAPEAV1@H@Z(ptr long) msvcirt.?attach@filebuf@@QEAAPEAV1@H@Z @ stub -arch=win32 ?attach@fstream@@QAEXH@Z @ stub -arch=win64 ?attach@fstream@@QEAAXH@Z -@ stub -arch=win32 ?attach@ifstream@@QAEXH@Z -@ stub -arch=win64 ?attach@ifstream@@QEAAXH@Z +@ thiscall -arch=win32 ?attach@ifstream@@QAEXH@Z(ptr long) msvcirt.?attach@ifstream@@QAEXH@Z +@ cdecl -arch=win64 ?attach@ifstream@@QEAAXH@Z(ptr long) msvcirt.?attach@ifstream@@QEAAXH@Z @ stub -arch=win32 ?attach@ofstream@@QAEXH@Z @ stub -arch=win64 ?attach@ofstream@@QEAAXH@Z @ thiscall -arch=win32 ?bad@ios@@QBEHXZ(ptr) msvcirt.?bad@ios@@QBEHXZ @@ -416,8 +416,8 @@ @ cdecl -arch=win64 ?close@filebuf@@QEAAPEAV1@XZ(ptr) msvcirt.?close@filebuf@@QEAAPEAV1@XZ @ stub -arch=win32 ?close@fstream@@QAEXXZ @ stub -arch=win64 ?close@fstream@@QEAAXXZ -@ stub -arch=win32 ?close@ifstream@@QAEXXZ -@ stub -arch=win64 ?close@ifstream@@QEAAXXZ +@ thiscall -arch=win32 ?close@ifstream@@QAEXXZ(ptr) msvcirt.?close@ifstream@@QAEXXZ +@ cdecl -arch=win64 ?close@ifstream@@QEAAXXZ(ptr) msvcirt.?close@ifstream@@QEAAXXZ @ stub -arch=win32 ?close@ofstream@@QAEXXZ @ stub -arch=win64 ?close@ofstream@@QEAAXXZ @ cdecl -arch=win32 ?clrlock@ios@@QAAXXZ(ptr) msvcirt.?clrlock@ios@@QAAXXZ @@ -460,8 +460,8 @@ @ cdecl -arch=win64 ?fd@filebuf@@QEBAHXZ(ptr) msvcirt.?fd@filebuf@@QEBAHXZ @ stub -arch=win32 ?fd@fstream@@QBEHXZ @ stub -arch=win64 ?fd@fstream@@QEBAHXZ -@ stub -arch=win32 ?fd@ifstream@@QBEHXZ -@ stub -arch=win64 ?fd@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?fd@ifstream@@QBEHXZ(ptr) msvcirt.?fd@ifstream@@QBEHXZ +@ cdecl -arch=win64 ?fd@ifstream@@QEBAHXZ(ptr) msvcirt.?fd@ifstream@@QEBAHXZ @ stub -arch=win32 ?fd@ofstream@@QBEHXZ @ stub -arch=win64 ?fd@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?fill@ios@@QAEDD@Z(ptr long) msvcirt.?fill@ios@@QAEDD@Z @@ -527,8 +527,8 @@ @ cdecl -arch=win64 ?is_open@filebuf@@QEBAHXZ(ptr) msvcirt.?is_open@filebuf@@QEBAHXZ @ stub -arch=win32 ?is_open@fstream@@QBEHXZ @ stub -arch=win64 ?is_open@fstream@@QEBAHXZ -@ stub -arch=win32 ?is_open@ifstream@@QBEHXZ -@ stub -arch=win64 ?is_open@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?is_open@ifstream@@QBEHXZ(ptr) msvcirt.?is_open@ifstream@@QBEHXZ +@ cdecl -arch=win64 ?is_open@ifstream@@QEBAHXZ(ptr) msvcirt.?is_open@ifstream@@QEBAHXZ @ stub -arch=win32 ?is_open@ofstream@@QBEHXZ @ stub -arch=win64 ?is_open@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?isfx@istream@@QAEXXZ(ptr) msvcirt.?isfx@istream@@QAEXXZ @@ -552,8 +552,8 @@ @ cdecl -arch=win64 ?open@filebuf@@QEAAPEAV1@PEBDHH@Z(ptr str long long) msvcirt.?open@filebuf@@QEAAPEAV1@PEBDHH@Z @ stub -arch=win32 ?open@fstream@@QAEXPBDHH@Z @ stub -arch=win64 ?open@fstream@@QEAAXPEBDHH@Z -@ stub -arch=win32 ?open@ifstream@@QAEXPBDHH@Z -@ stub -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z +@ thiscall -arch=win32 ?open@ifstream@@QAEXPBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QAEXPBDHH@Z +@ cdecl -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QEAAXPEBDHH@Z @ stub -arch=win32 ?open@ofstream@@QAEXPBDHH@Z @ stub -arch=win64 ?open@ofstream@@QEAAXPEBDHH@Z @ extern ?openprot@filebuf@@2HB msvcirt.?openprot@filebuf@@2HB @@ -601,8 +601,8 @@ @ cdecl -arch=win64 ?pword@ios@@QEBAAEAPEAXH@Z(ptr long) msvcirt.?pword@ios@@QEBAAEAPEAXH@Z @ stub -arch=win32 ?rdbuf@fstream@@QBEPAVfilebuf@@XZ @ stub -arch=win64 ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ -@ stub -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ -@ stub -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ +@ thiscall -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QBEPAVfilebuf@@XZ +@ cdecl -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ @ thiscall -arch=win32 ?rdbuf@ios@@QBEPAVstreambuf@@XZ(ptr) msvcirt.?rdbuf@ios@@QBEPAVstreambuf@@XZ @ cdecl -arch=win64 ?rdbuf@ios@@QEBAPEAVstreambuf@@XZ(ptr) msvcirt.?rdbuf@ios@@QEBAPEAVstreambuf@@XZ @ thiscall -arch=win32 ?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ(ptr) msvcirt.?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ @@ -651,8 +651,8 @@ @ cdecl -arch=win64 ?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) msvcirt.?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z @ stub -arch=win32 ?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z @ stub -arch=win64 ?setbuf@fstream@@QEAAPEAVstreambuf@@PEADH@Z -@ stub -arch=win32 ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z -@ stub -arch=win64 ?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z +@ thiscall -arch=win32 ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z(ptr ptr long) msvcirt.?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z +@ cdecl -arch=win64 ?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) msvcirt.?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z @ stub -arch=win32 ?setbuf@ofstream@@QAEPAVstreambuf@@PADH@Z @ stub -arch=win64 ?setbuf@ofstream@@QEAAPEAVstreambuf@@PEADH@Z @ thiscall -arch=win32 ?setbuf@streambuf@@UAEPAV1@PADH@Z(ptr ptr long) msvcirt.?setbuf@streambuf@@UAEPAV1@PADH@Z @@ -673,8 +673,8 @@ @ cdecl -arch=win64 ?setmode@filebuf@@QEAAHH@Z(ptr long) msvcirt.?setmode@filebuf@@QEAAHH@Z @ stub -arch=win32 ?setmode@fstream@@QAEHH@Z @ stub -arch=win64 ?setmode@fstream@@QEAAHH@Z -@ stub -arch=win32 ?setmode@ifstream@@QAEHH@Z -@ stub -arch=win64 ?setmode@ifstream@@QEAAHH@Z +@ thiscall -arch=win32 ?setmode@ifstream@@QAEHH@Z(ptr long) msvcirt.?setmode@ifstream@@QAEHH@Z +@ cdecl -arch=win64 ?setmode@ifstream@@QEAAHH@Z(ptr long) msvcirt.?setmode@ifstream@@QEAAHH@Z @ stub -arch=win32 ?setmode@ofstream@@QAEHH@Z @ stub -arch=win64 ?setmode@ofstream@@QEAAHH@Z @ thiscall -arch=win32 ?setp@streambuf@@IAEXPAD0@Z(ptr ptr ptr) msvcirt.?setp@streambuf@@IAEXPAD0@Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index f0d966acd7c..efa3e3251d6 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -38,16 +38,16 @@ @ stub -arch=win64 ??0fstream@@QEAA@PEBDHH@Z @ stub -arch=win32 ??0fstream@@QAE@XZ @ stub -arch=win64 ??0fstream@@QEAA@XZ -@ stub -arch=win32 ??0ifstream@@QAE@ABV0@@Z -@ stub -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z -@ stub -arch=win32 ??0ifstream@@QAE@H@Z -@ stub -arch=win64 ??0ifstream@@QEAA@H@Z -@ stub -arch=win32 ??0ifstream@@QAE@HPADH@Z -@ stub -arch=win64 ??0ifstream@@QEAA@HPEADH@Z -@ stub -arch=win32 ??0ifstream@@QAE@PBDHH@Z -@ stub -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z -@ stub -arch=win32 ??0ifstream@@QAE@XZ -@ stub -arch=win64 ??0ifstream@@QEAA@XZ +@ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QAE@ABV0@@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QEAA@AEBV0@@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@H@Z(ptr long long) msvcirt.??0ifstream@@QAE@H@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@H@Z(ptr long long) msvcirt.??0ifstream@@QEAA@H@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@HPADH@Z(ptr long ptr long long) msvcirt.??0ifstream@@QAE@HPADH@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@HPEADH@Z(ptr long ptr long long) msvcirt.??0ifstream@@QEAA@HPEADH@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@PBDHH@Z(ptr str long long long) msvcirt.??0ifstream@@QAE@PBDHH@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z(ptr str long long long) msvcirt.??0ifstream@@QEAA@PEBDHH@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@XZ(ptr long) msvcirt.??0ifstream@@QAE@XZ +@ cdecl -arch=win64 ??0ifstream@@QEAA@XZ(ptr long) msvcirt.??0ifstream@@QEAA@XZ @ thiscall -arch=win32 ??0ios@@IAE@ABV0@@Z(ptr ptr) msvcirt.??0ios@@IAE@ABV0@@Z @ cdecl -arch=win64 ??0ios@@IEAA@AEBV0@@Z(ptr ptr) msvcirt.??0ios@@IEAA@AEBV0@@Z @ thiscall -arch=win32 ??0ios@@IAE@XZ(ptr) msvcirt.??0ios@@IAE@XZ @@ -154,8 +154,8 @@ @ cdecl -arch=win64 ??1filebuf@@UEAA@XZ(ptr) msvcirt.??1filebuf@@UEAA@XZ @ stub -arch=win32 ??1fstream@@UAE@XZ @ stub -arch=win64 ??1fstream@@UEAA@XZ -@ stub -arch=win32 ??1ifstream@@UAE@XZ -@ stub -arch=win64 ??1ifstream@@UEAA@XZ +@ thiscall -arch=win32 ??1ifstream@@UAE@XZ(ptr) msvcirt.??1ifstream@@UAE@XZ +@ cdecl -arch=win64 ??1ifstream@@UEAA@XZ(ptr) msvcirt.??1ifstream@@UEAA@XZ @ thiscall -arch=win32 ??1ios@@UAE@XZ(ptr) msvcirt.??1ios@@UAE@XZ @ cdecl -arch=win64 ??1ios@@UEAA@XZ(ptr) msvcirt.??1ios@@UEAA@XZ @ thiscall -arch=win32 ??1iostream@@UAE@XZ(ptr) msvcirt.??1iostream@@UAE@XZ @@ -206,8 +206,8 @@ @ cdecl -arch=win64 ??4filebuf@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4filebuf@@QEAAAEAV0@AEBV0@@Z @ stub -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z @ stub -arch=win64 ??4fstream@@QEAAAEAV0@AEAV0@@Z -@ stub -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z -@ stub -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z +@ thiscall -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ifstream@@QAEAAV0@ABV0@@Z +@ cdecl -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ifstream@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4ios@@IAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ios@@IAEAAV0@ABV0@@Z @ cdecl -arch=win64 ??4ios@@IEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ios@@IEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4iostream@@IAEAAV0@AAV0@@Z(ptr ptr) msvcirt.??4iostream@@IAEAAV0@AAV0@@Z @@ -340,7 +340,7 @@ @ extern ??_7exception@@6B@ msvcrt.??_7exception@@6B@ @ extern ??_7filebuf@@6B@ msvcirt.??_7filebuf@@6B@ # @ extern ??_7fstream@@6B@ -# @ extern ??_7ifstream@@6B@ +@ extern ??_7ifstream@@6B@ msvcirt.??_7ifstream@@6B@ @ extern ??_7ios@@6B@ msvcirt.??_7ios@@6B@ @ extern ??_7iostream@@6B@ msvcirt.??_7iostream@@6B@ @ extern ??_7istream@@6B@ msvcirt.??_7istream@@6B@ @@ -358,7 +358,7 @@ @ extern ??_7strstreambuf@@6B@ msvcirt.??_7strstreambuf@@6B@ # @ extern ??_8fstream@@7Bistream@@@ # @ extern ??_8fstream@@7Bostream@@@ -# @ extern ??_8ifstream@@7B@ +@ extern ??_8ifstream@@7B@ msvcirt.??_8ifstream@@7B@ @ extern ??_8iostream@@7Bistream@@@ msvcirt.??_8iostream@@7Bistream@@@ @ extern ??_8iostream@@7Bostream@@@ msvcirt.??_8iostream@@7Bostream@@@ @ extern ??_8istream@@7B@ msvcirt.??_8istream@@7B@ @@ -374,8 +374,8 @@ @ extern ??_8strstream@@7Bostream@@@ msvcirt.??_8strstream@@7Bostream@@@ @ stub -arch=win32 ??_Dfstream@@QAEXXZ @ stub -arch=win64 ??_Dfstream@@QEAAXXZ -@ stub -arch=win32 ??_Difstream@@QAEXXZ -@ stub -arch=win64 ??_Difstream@@QEAAXXZ +@ thiscall -arch=win32 ??_Difstream@@QAEXXZ(ptr) msvcirt.??_Difstream@@QAEXXZ +@ cdecl -arch=win64 ??_Difstream@@QEAAXXZ(ptr) msvcirt.??_Difstream@@QEAAXXZ @ thiscall -arch=win32 ??_Diostream@@QAEXXZ(ptr) msvcirt.??_Diostream@@QAEXXZ @ cdecl -arch=win64 ??_Diostream@@QEAAXXZ(ptr) msvcirt.??_Diostream@@QEAAXXZ @ thiscall -arch=win32 ??_Distream@@QAEXXZ(ptr) msvcirt.??_Distream@@QAEXXZ @@ -403,7 +403,7 @@ @ thiscall -arch=win32 ??_Eexception@@UAEPAXI@Z(ptr long) msvcrt.??_Eexception@@UAEPAXI@Z @ thiscall -arch=win32 ??_Efilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Efilebuf@@UAEPAXI@Z @ stub -arch=win32 ??_Efstream@@UAEPAXI@Z -@ stub -arch=win32 ??_Eifstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Eifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Eifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eios@@UAEPAXI@Z(ptr long) msvcirt.??_Eios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eiostream@@UAEPAXI@Z(ptr long) msvcirt.??_Eiostream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eistream@@UAEPAXI@Z(ptr long) msvcirt.??_Eistream@@UAEPAXI@Z @@ -426,7 +426,7 @@ @ thiscall -arch=win32 ??_Gexception@@UAEPAXI@Z(ptr long) msvcrt.??_Gexception@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gfilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Gfilebuf@@UAEPAXI@Z @ stub -arch=win32 ??_Gfstream@@UAEPAXI@Z -@ stub -arch=win32 ??_Gifstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Gifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Gifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gios@@UAEPAXI@Z(ptr long) msvcirt.??_Gios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Giostream@@UAEPAXI@Z(ptr long) msvcirt.??_Giostream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gistream@@UAEPAXI@Z(ptr long) msvcirt.??_Gistream@@UAEPAXI@Z @@ -457,8 +457,8 @@ @ cdecl -arch=win64 ?attach@filebuf@@QEAAPEAV1@H@Z(ptr long) msvcirt.?attach@filebuf@@QEAAPEAV1@H@Z @ stub -arch=win32 ?attach@fstream@@QAEXH@Z @ stub -arch=win64 ?attach@fstream@@QEAAXH@Z -@ stub -arch=win32 ?attach@ifstream@@QAEXH@Z -@ stub -arch=win64 ?attach@ifstream@@QEAAXH@Z +@ thiscall -arch=win32 ?attach@ifstream@@QAEXH@Z(ptr long) msvcirt.?attach@ifstream@@QAEXH@Z +@ cdecl -arch=win64 ?attach@ifstream@@QEAAXH@Z(ptr long) msvcirt.?attach@ifstream@@QEAAXH@Z @ stub -arch=win32 ?attach@ofstream@@QAEXH@Z @ stub -arch=win64 ?attach@ofstream@@QEAAXH@Z @ thiscall -arch=win32 ?bad@ios@@QBEHXZ(ptr) msvcirt.?bad@ios@@QBEHXZ @@ -481,8 +481,8 @@ @ cdecl -arch=win64 ?close@filebuf@@QEAAPEAV1@XZ(ptr) msvcirt.?close@filebuf@@QEAAPEAV1@XZ @ stub -arch=win32 ?close@fstream@@QAEXXZ @ stub -arch=win64 ?close@fstream@@QEAAXXZ -@ stub -arch=win32 ?close@ifstream@@QAEXXZ -@ stub -arch=win64 ?close@ifstream@@QEAAXXZ +@ thiscall -arch=win32 ?close@ifstream@@QAEXXZ(ptr) msvcirt.?close@ifstream@@QAEXXZ +@ cdecl -arch=win64 ?close@ifstream@@QEAAXXZ(ptr) msvcirt.?close@ifstream@@QEAAXXZ @ stub -arch=win32 ?close@ofstream@@QAEXXZ @ stub -arch=win64 ?close@ofstream@@QEAAXXZ @ cdecl -arch=win32 ?clrlock@ios@@QAAXXZ(ptr) msvcirt.?clrlock@ios@@QAAXXZ @@ -525,8 +525,8 @@ @ cdecl -arch=win64 ?fd@filebuf@@QEBAHXZ(ptr) msvcirt.?fd@filebuf@@QEBAHXZ @ stub -arch=win32 ?fd@fstream@@QBEHXZ @ stub -arch=win64 ?fd@fstream@@QEBAHXZ -@ stub -arch=win32 ?fd@ifstream@@QBEHXZ -@ stub -arch=win64 ?fd@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?fd@ifstream@@QBEHXZ(ptr) msvcirt.?fd@ifstream@@QBEHXZ +@ cdecl -arch=win64 ?fd@ifstream@@QEBAHXZ(ptr) msvcirt.?fd@ifstream@@QEBAHXZ @ stub -arch=win32 ?fd@ofstream@@QBEHXZ @ stub -arch=win64 ?fd@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?fill@ios@@QAEDD@Z(ptr long) msvcirt.?fill@ios@@QAEDD@Z @@ -594,8 +594,8 @@ @ cdecl -arch=win64 ?is_open@filebuf@@QEBAHXZ(ptr) msvcirt.?is_open@filebuf@@QEBAHXZ @ stub -arch=win32 ?is_open@fstream@@QBEHXZ @ stub -arch=win64 ?is_open@fstream@@QEBAHXZ -@ stub -arch=win32 ?is_open@ifstream@@QBEHXZ -@ stub -arch=win64 ?is_open@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?is_open@ifstream@@QBEHXZ(ptr) msvcirt.?is_open@ifstream@@QBEHXZ +@ cdecl -arch=win64 ?is_open@ifstream@@QEBAHXZ(ptr) msvcirt.?is_open@ifstream@@QEBAHXZ @ stub -arch=win32 ?is_open@ofstream@@QBEHXZ @ stub -arch=win64 ?is_open@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?isfx@istream@@QAEXXZ(ptr) msvcirt.?isfx@istream@@QAEXXZ @@ -621,8 +621,8 @@ @ cdecl -arch=win64 ?open@filebuf@@QEAAPEAV1@PEBDHH@Z(ptr str long long) msvcirt.?open@filebuf@@QEAAPEAV1@PEBDHH@Z @ stub -arch=win32 ?open@fstream@@QAEXPBDHH@Z @ stub -arch=win64 ?open@fstream@@QEAAXPEBDHH@Z -@ stub -arch=win32 ?open@ifstream@@QAEXPBDHH@Z -@ stub -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z +@ thiscall -arch=win32 ?open@ifstream@@QAEXPBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QAEXPBDHH@Z +@ cdecl -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QEAAXPEBDHH@Z @ stub -arch=win32 ?open@ofstream@@QAEXPBDHH@Z @ stub -arch=win64 ?open@ofstream@@QEAAXPEBDHH@Z @ extern ?openprot@filebuf@@2HB msvcirt.?openprot@filebuf@@2HB @@ -672,8 +672,8 @@ @ cdecl -arch=win64 ?raw_name@type_info@@QEBAPEBDXZ(ptr) msvcrt.?raw_name@type_info@@QEBAPEBDXZ @ stub -arch=win32 ?rdbuf@fstream@@QBEPAVfilebuf@@XZ @ stub -arch=win64 ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ -@ stub -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ -@ stub -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ +@ thiscall -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QBEPAVfilebuf@@XZ +@ cdecl -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ @ thiscall -arch=win32 ?rdbuf@ios@@QBEPAVstreambuf@@XZ(ptr) msvcirt.?rdbuf@ios@@QBEPAVstreambuf@@XZ @ cdecl -arch=win64 ?rdbuf@ios@@QEBAPEAVstreambuf@@XZ(ptr) msvcirt.?rdbuf@ios@@QEBAPEAVstreambuf@@XZ @ thiscall -arch=win32 ?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ(ptr) msvcirt.?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ @@ -723,8 +723,8 @@ @ cdecl -arch=win64 ?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) msvcirt.?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z @ stub -arch=win32 ?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z @ stub -arch=win64 ?setbuf@fstream@@QEAAPEAVstreambuf@@PEADH@Z -@ stub -arch=win32 ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z -@ stub -arch=win64 ?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z +@ thiscall -arch=win32 ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z(ptr ptr long) msvcirt.?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z +@ cdecl -arch=win64 ?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) msvcirt.?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z @ stub -arch=win32 ?setbuf@ofstream@@QAEPAVstreambuf@@PADH@Z @ stub -arch=win64 ?setbuf@ofstream@@QEAAPEAVstreambuf@@PEADH@Z @ thiscall -arch=win32 ?setbuf@streambuf@@UAEPAV1@PADH@Z(ptr ptr long) msvcirt.?setbuf@streambuf@@UAEPAV1@PADH@Z @@ -745,8 +745,8 @@ @ cdecl -arch=win64 ?setmode@filebuf@@QEAAHH@Z(ptr long) msvcirt.?setmode@filebuf@@QEAAHH@Z @ stub -arch=win32 ?setmode@fstream@@QAEHH@Z @ stub -arch=win64 ?setmode@fstream@@QEAAHH@Z -@ stub -arch=win32 ?setmode@ifstream@@QAEHH@Z -@ stub -arch=win64 ?setmode@ifstream@@QEAAHH@Z +@ thiscall -arch=win32 ?setmode@ifstream@@QAEHH@Z(ptr long) msvcirt.?setmode@ifstream@@QAEHH@Z +@ cdecl -arch=win64 ?setmode@ifstream@@QEAAHH@Z(ptr long) msvcirt.?setmode@ifstream@@QEAAHH@Z @ stub -arch=win32 ?setmode@ofstream@@QAEHH@Z @ stub -arch=win64 ?setmode@ofstream@@QEAAHH@Z @ thiscall -arch=win32 ?setp@streambuf@@IAEXPAD0@Z(ptr ptr ptr) msvcirt.?setp@streambuf@@IAEXPAD0@Z -- 2.28.0

4 4

[PATCH v4 1/5] mfplat: Remove fallback media source.
by Derek Lesho 02 Sep '20

02 Sep '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mfplat/main.c | 207 +------------------------------------ dlls/mfplat/tests/mfplat.c | 106 +++++++++++-------- 2 files changed, 64 insertions(+), 249 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 6cd409d63b7..ea1b1770e15 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5679,188 +5679,6 @@ HRESULT WINAPI MFGetPluginControl(IMFPluginControl **ret) return S_OK; } -typedef struct _mfsource -{ - IMFMediaSource IMFMediaSource_iface; - LONG ref; -} mfsource; - -static inline mfsource *impl_from_IMFMediaSource(IMFMediaSource *iface) -{ - return CONTAINING_RECORD(iface, mfsource, IMFMediaSource_iface); -} - -static HRESULT WINAPI mfsource_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); - - if (IsEqualIID(riid, &IID_IMFMediaSource) || - IsEqualIID(riid, &IID_IMFMediaEventGenerator) || - IsEqualIID(riid, &IID_IUnknown)) - { - *out = &This->IMFMediaSource_iface; - } - else - { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); - *out = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*out); - return S_OK; -} - -static ULONG WINAPI mfsource_AddRef(IMFMediaSource *iface) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%u\n", This, ref); - - return ref; -} - -static ULONG WINAPI mfsource_Release(IMFMediaSource *iface) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%u\n", This, ref); - - if (!ref) - { - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - -static HRESULT WINAPI mfsource_GetEvent(IMFMediaSource *iface, DWORD flags, IMFMediaEvent **event) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p)->(%#x, %p)\n", This, flags, event); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_BeginGetEvent(IMFMediaSource *iface, IMFAsyncCallback *callback, IUnknown *state) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p)->(%p, %p)\n", This, callback, state); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_EndGetEvent(IMFMediaSource *iface, IMFAsyncResult *result, IMFMediaEvent **event) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p)->(%p, %p)\n", This, result, event); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_QueueEvent(IMFMediaSource *iface, MediaEventType event_type, REFGUID ext_type, - HRESULT hr, const PROPVARIANT *value) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p)->(%d, %s, %#x, %p)\n", This, event_type, debugstr_guid(ext_type), hr, value); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_GetCharacteristics(IMFMediaSource *iface, DWORD *characteristics) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p)->(%p): stub\n", This, characteristics); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **descriptor) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - IMFStreamDescriptor *sd; - IMFMediaType *mediatype; - HRESULT hr; - - FIXME("(%p)->(%p): stub\n", This, descriptor); - - if (FAILED(hr = MFCreateMediaType(&mediatype))) - return hr; - - hr = MFCreateStreamDescriptor(0, 1, &mediatype, &sd); - IMFMediaType_Release(mediatype); - if (FAILED(hr)) - return hr; - - hr = MFCreatePresentationDescriptor(1, &sd, descriptor); - IMFStreamDescriptor_Release(sd); - - return hr; -} - -static HRESULT WINAPI mfsource_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor, - const GUID *time_format, const PROPVARIANT *start_position) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p)->(%p, %p, %p): stub\n", This, descriptor, time_format, start_position); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_Stop(IMFMediaSource *iface) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p): stub\n", This); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_Pause(IMFMediaSource *iface) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p): stub\n", This); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_Shutdown(IMFMediaSource *iface) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p): stub\n", This); - - return S_OK; -} - -static const IMFMediaSourceVtbl mfsourcevtbl = -{ - mfsource_QueryInterface, - mfsource_AddRef, - mfsource_Release, - mfsource_GetEvent, - mfsource_BeginGetEvent, - mfsource_EndGetEvent, - mfsource_QueueEvent, - mfsource_GetCharacteristics, - mfsource_CreatePresentationDescriptor, - mfsource_Start, - mfsource_Stop, - mfsource_Pause, - mfsource_Shutdown, -}; - enum resolved_object_origin { OBJECT_FROM_BYTESTREAM, @@ -6505,7 +6323,7 @@ static HRESULT WINAPI source_resolver_CreateObjectFromByteStream(IMFSourceResolv return E_POINTER; if (FAILED(hr = resolver_get_bytestream_handler(stream, url, flags, &handler))) - goto fallback; + return MF_E_UNSUPPORTED_BYTESTREAM_TYPE; hr = RtwqCreateAsyncResult((IUnknown *)handler, NULL, NULL, &result); IMFByteStreamHandler_Release(handler); @@ -6528,28 +6346,7 @@ static HRESULT WINAPI source_resolver_CreateObjectFromByteStream(IMFSourceResolv hr = resolver_end_create_object(resolver, OBJECT_FROM_BYTESTREAM, result, obj_type, object); IRtwqAsyncResult_Release(result); - /* TODO: following stub is left intentionally until real source plugins are implemented. */ - if (SUCCEEDED(hr)) - return hr; - -fallback: - if (flags & MF_RESOLUTION_MEDIASOURCE) - { - mfsource *new_object; - - new_object = HeapAlloc( GetProcessHeap(), 0, sizeof(*new_object) ); - if (!new_object) - return E_OUTOFMEMORY; - - new_object->IMFMediaSource_iface.lpVtbl = &mfsourcevtbl; - new_object->ref = 1; - - *object = (IUnknown *)&new_object->IMFMediaSource_iface; - *obj_type = MF_OBJECT_MEDIASOURCE; - return S_OK; - } - - return E_NOTIMPL; + return hr; } static HRESULT WINAPI source_resolver_BeginCreateObjectFromURL(IMFSourceResolver *iface, const WCHAR *url, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 01749dd9ef8..fa90f1e4bac 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -382,12 +382,16 @@ static HRESULT WINAPI test_create_from_file_handler_callback_Invoke(IMFAsyncCall handler = (IMFSchemeHandler *)IMFAsyncResult_GetStateNoAddRef(result); hr = IMFSchemeHandler_EndCreateObject(handler, result, &obj_type, &object); +todo_wine ok(hr == S_OK, "Failed to create an object, hr %#x.\n", hr); - hr = IMFAsyncResult_GetObject(result, &object2); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IMFAsyncResult_GetObject(result, &object2); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); - IUnknown_Release(object); + IUnknown_Release(object); + } SetEvent(callback->event); @@ -502,13 +506,43 @@ static void test_source_resolver(void) hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, &obj_type, (IUnknown **)&mediasource); - todo_wine ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); + ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); if (hr == S_OK) IMFMediaSource_Release(mediasource); hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, (IUnknown **)&mediasource); - todo_wine ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); + ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); + + IMFByteStream_Release(stream); + + /* Create from URL. */ + callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); + + hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"nonexisting.mp4", MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, + (IUnknown **)&stream); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#x.\n", hr); + + hr = IMFSourceResolver_CreateObjectFromURL(resolver, filename, MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, + (IUnknown **)&stream); + ok(hr == S_OK, "Failed to resolve url, hr %#x.\n", hr); + IMFByteStream_Release(stream); + + hr = IMFSourceResolver_BeginCreateObjectFromURL(resolver, filename, MF_RESOLUTION_BYTESTREAM, NULL, + &cancel_cookie, &callback.IMFAsyncCallback_iface, (IUnknown *)resolver); + ok(hr == S_OK, "Create request failed, hr %#x.\n", hr); + ok(cancel_cookie != NULL, "Unexpected cancel object.\n"); + IUnknown_Release(cancel_cookie); + + if (SUCCEEDED(hr)) + WaitForSingleObject(callback.event, INFINITE); + + /* With explicit scheme. */ + lstrcpyW(pathW, fileschemeW); + lstrcatW(pathW, filename); + hr = IMFSourceResolver_CreateObjectFromURL(resolver, pathW, MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, + (IUnknown **)&stream); + ok(hr == S_OK, "Failed to resolve url, hr %#x.\n", hr); IMFByteStream_Release(stream); /* We have to create a new bytestream here, because all following @@ -522,14 +556,31 @@ static void test_source_resolver(void) ok(hr == S_OK, "Failed to set string value, hr %#x.\n", hr); IMFAttributes_Release(attributes); + /* Start of gstreamer dependent tests */ + hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, &obj_type, (IUnknown **)&mediasource); - ok(hr == S_OK, "got 0x%08x\n", hr); + if (strcmp(winetest_platform, "wine")) + ok(hr == S_OK, "got 0x%08x\n", hr); + if (FAILED(hr)) + { + IMFByteStream_Release(stream); + IMFSourceResolver_Release(resolver); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + DeleteFileW(filename); + return; + } ok(mediasource != NULL, "got %p\n", mediasource); ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor); +todo_wine ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); + if (FAILED(hr)) + goto skip_source_tests; ok(descriptor != NULL, "got %p\n", descriptor); hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(descriptor, 0, &selected, &sd); @@ -540,10 +591,7 @@ static void test_source_resolver(void) IMFStreamDescriptor_Release(sd); hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); -todo_wine ok(hr == S_OK, "Failed to get stream major type, hr %#x.\n", hr); - if (FAILED(hr)) - goto skip_source_tests; /* Check major/minor type for the test media. */ ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected major type %s.\n", debugstr_guid(&guid)); @@ -624,6 +672,7 @@ todo_wine get_event((IMFMediaEventGenerator *)mediasource, MEEndOfPresentation, NULL); IMFMediaTypeHandler_Release(handler); + IMFPresentationDescriptor_Release(descriptor); hr = IMFMediaSource_Shutdown(mediasource); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -633,42 +682,9 @@ todo_wine skip_source_tests: - IMFPresentationDescriptor_Release(descriptor); IMFMediaSource_Release(mediasource); IMFByteStream_Release(stream); - /* Create from URL. */ - callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); - - hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"nonexisting.mp4", MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, - (IUnknown **)&stream); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#x.\n", hr); - - hr = IMFSourceResolver_CreateObjectFromURL(resolver, filename, MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, - (IUnknown **)&stream); - ok(hr == S_OK, "Failed to resolve url, hr %#x.\n", hr); - IMFByteStream_Release(stream); - - hr = IMFSourceResolver_BeginCreateObjectFromURL(resolver, filename, MF_RESOLUTION_BYTESTREAM, NULL, - &cancel_cookie, &callback.IMFAsyncCallback_iface, (IUnknown *)resolver); - ok(hr == S_OK, "Create request failed, hr %#x.\n", hr); - ok(cancel_cookie != NULL, "Unexpected cancel object.\n"); - IUnknown_Release(cancel_cookie); - - if (SUCCEEDED(hr)) - WaitForSingleObject(callback.event, INFINITE); - - /* With explicit scheme. */ - lstrcpyW(pathW, fileschemeW); - lstrcatW(pathW, filename); - - hr = IMFSourceResolver_CreateObjectFromURL(resolver, pathW, MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, - (IUnknown **)&stream); - ok(hr == S_OK, "Failed to resolve url, hr %#x.\n", hr); - IMFByteStream_Release(stream); - - IMFSourceResolver_Release(resolver); - /* Create directly through scheme handler. */ hr = CoInitialize(NULL); ok(SUCCEEDED(hr), "Failed to initialize, hr %#x.\n", hr); @@ -693,12 +709,14 @@ skip_source_tests: if (do_uninit) CoUninitialize(); + CloseHandle(callback.event); + + IMFSourceResolver_Release(resolver); + hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); DeleteFileW(filename); - - CloseHandle(callback.event); } static void init_functions(void) -- 2.28.0

4 21

[PATCH] ntdll/exception: Change return type to CONTEXT* of RtlLocateLegacyContext.
by Biswapriyo Nath 02 Sep '20

02 Sep '20

3 5

[PATCH 1/5] d3d11/tests: Test specifying the multisample mask via OMSetBlendState().
by Zebediah Figura 02 Sep '20

02 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e107d522b20..4704dad1aa3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29012,6 +29012,13 @@ static void test_sample_mask(void) (ID3D11Resource *)texture, 0, texture_desc.Format); check_texture_color(test_context.backbuffer, 0x7f7f7f7f, 1); + ID3D11DeviceContext_OMSetBlendState(context, NULL, NULL, 0xb); + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, black); + draw_quad(&test_context); + ID3D11DeviceContext_ResolveSubresource(context, (ID3D11Resource *)test_context.backbuffer, 0, + (ID3D11Resource *)texture, 0, texture_desc.Format); + todo_wine check_texture_color(test_context.backbuffer, 0x3f3f3f3f, 1); + ID3D11RenderTargetView_Release(rtv); ID3D11Texture2D_Release(texture); ID3D11PixelShader_Release(ps); -- 2.28.0

3 11

[PATCH 2/2] advapi32: Read host credentials through mountmgr.
by Hans Leidekker 02 Sep '20

02 Sep '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/cred.c | 154 ++++++++++++++++++++++++------------------- 1 file changed, 88 insertions(+), 66 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 49a1c34d1cc..07f4b9b03a0 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -33,6 +33,9 @@ #include "winreg.h" #include "wincred.h" #include "winternl.h" +#include "winioctl.h" +#define WINE_MOUNTMGR_EXTENSIONS +#include "ddk/mountmgr.h" #include "crypt.h" @@ -1389,6 +1392,86 @@ BOOL WINAPI CredReadA(LPCSTR TargetName, DWORD Type, DWORD Flags, PCREDENTIALA * return TRUE; } +static DWORD host_read_credential( const WCHAR *targetname, CREDENTIALW **ret_credential ) +{ + struct mountmgr_credential *cred_in, *cred_out = NULL, *tmp; + DWORD err = ERROR_OUTOFMEMORY, size_in, size_out, size_name = (strlenW( targetname ) + 1) * sizeof(WCHAR); + HANDLE mgr; + WCHAR *ptr; + BOOL ret; + + mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + if (mgr == INVALID_HANDLE_VALUE) return GetLastError(); + + size_in = sizeof(*cred_in) + size_name; + if (!(cred_in = heap_alloc( size_in ))) + { + CloseHandle( mgr ); + return ERROR_OUTOFMEMORY; + } + cred_in->targetname_offset = sizeof(*cred_in); + cred_in->targetname_size = size_name; + ptr = (WCHAR *)(cred_in + 1); + strcpyW( ptr, targetname ); + + size_out = 256; + if (!(cred_out = heap_alloc( size_out ))) goto done; + + for (;;) + { + ret = DeviceIoControl( mgr, IOCTL_MOUNTMGR_READ_CREDENTIAL, cred_in, size_in, cred_out, size_out, NULL, NULL ); + if (ret || (err = GetLastError()) != ERROR_MORE_DATA) break; + size_out *= 2; + if (!(tmp = heap_realloc( cred_out, size_out ))) goto done; + cred_out = tmp; + } + + if (ret) + { + CREDENTIALW *credential; + DWORD size = sizeof(*credential) + cred_out->targetname_size + cred_out->username_size + cred_out->comment_size + + cred_out->blob_size; + + if (!(credential = heap_alloc_zero( size ))) + { + err = ERROR_OUTOFMEMORY; + goto done; + } + ptr = (WCHAR *)(credential + 1); + + credential->Type = CRED_TYPE_DOMAIN_PASSWORD; + memcpy( ptr, (char *)cred_out + cred_out->targetname_offset, cred_out->targetname_size ); + credential->TargetName = ptr; + ptr += strlenW( ptr ) + 1; + if (cred_out->comment_size) + { + memcpy( ptr, (char *)cred_out + cred_out->comment_offset, cred_out->comment_size ); + credential->Comment = ptr; + ptr += strlenW( ptr ) + 1; + } + credential->LastWritten = cred_out->last_written; + if ((credential->CredentialBlobSize = cred_out->blob_size)) + { + memcpy( ptr, (char *)cred_out + cred_out->blob_offset, cred_out->blob_size ); + credential->CredentialBlob = (BYTE *)ptr; + ptr += cred_out->blob_size / sizeof(WCHAR); + } + credential->Persist = CRED_PERSIST_LOCAL_MACHINE; + memcpy( ptr, (char *)cred_out + cred_out->username_offset, cred_out->username_size ); + credential->UserName = ptr; + + *ret_credential = credential; + err = ERROR_SUCCESS; + } + +done: + heap_free( cred_in ); + heap_free( cred_out ); + CloseHandle( mgr ); + return err; +} + /****************************************************************************** * CredReadW [ADVAPI32.@] */ @@ -1423,77 +1506,16 @@ BOOL WINAPI CredReadW(LPCWSTR TargetName, DWORD Type, DWORD Flags, PCREDENTIALW return FALSE; } -#ifdef __APPLE__ if (Type == CRED_TYPE_DOMAIN_PASSWORD) { - int status; - SecKeychainSearchRef search; - status = SecKeychainSearchCreateFromAttributes(NULL, kSecGenericPasswordItemClass, NULL, &search); - if (status == noErr) + ret = host_read_credential( TargetName, Credential ); + if (ret != ERROR_SUCCESS && ret != ERROR_NOT_SUPPORTED) { - SecKeychainItemRef item; - while (SecKeychainSearchCopyNext(search, &item) == noErr) - { - SecKeychainAttributeInfo info; - SecKeychainAttributeList *attr_list; - UInt32 info_tags[] = { kSecServiceItemAttr }; - LPWSTR target_name; - INT str_len; - info.count = ARRAY_SIZE(info_tags); - info.tag = info_tags; - info.format = NULL; - status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, NULL, NULL); - len = sizeof(**Credential); - if (status != noErr) - { - WARN("SecKeychainItemCopyAttributesAndData returned status %d\n", status); - continue; - } - if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServiceItemAttr) - { - CFRelease(item); - continue; - } - str_len = MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[0].data, attr_list->attr[0].length, NULL, 0); - target_name = heap_alloc((str_len + 1) * sizeof(WCHAR)); - MultiByteToWideChar(CP_UTF8, 0, attr_list->attr[0].data, attr_list->attr[0].length, target_name, str_len); - /* nul terminate */ - target_name[str_len] = '\0'; - if (strcmpiW(TargetName, target_name)) - { - CFRelease(item); - heap_free(target_name); - continue; - } - heap_free(target_name); - SecKeychainItemFreeAttributesAndData(attr_list, NULL); - ret = mac_read_credential_from_item(item, TRUE, NULL, NULL, &len); - if (ret == ERROR_SUCCESS) - { - *Credential = heap_alloc(len); - if (*Credential) - { - len = sizeof(**Credential); - ret = mac_read_credential_from_item(item, TRUE, *Credential, - (char *)(*Credential + 1), &len); - } - else - ret = ERROR_OUTOFMEMORY; - CFRelease(item); - CFRelease(search); - if (ret != ERROR_SUCCESS) - { - SetLastError(ret); - return FALSE; - } - return TRUE; - } - CFRelease(item); - } - CFRelease(search); + SetLastError(ret); + return FALSE; } + if (ret == ERROR_SUCCESS) return TRUE; } -#endif ret = open_cred_mgr_key(&hkeyMgr, FALSE); if (ret != ERROR_SUCCESS) -- 2.20.1

1 0

[PATCH 1/2] mountmgr: Add ioctl to read host credentials on macOS.
by Hans Leidekker 02 Sep '20

02 Sep '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mountmgr.sys/Makefile.in | 2 +- dlls/mountmgr.sys/mountmgr.c | 246 ++++++++++++++++++++++++++++++++++ include/ddk/mountmgr.h | 16 +++ 3 files changed, 263 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index e229164280f..83204e66504 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -3,7 +3,7 @@ IMPORTS = uuid advapi32 ntoskrnl DELAYIMPORTS = user32 iphlpapi EXTRADLLFLAGS = -Wl,--subsystem,native EXTRAINCL = $(DBUS_CFLAGS) $(HAL_CFLAGS) -EXTRALIBS = $(DISKARBITRATION_LIBS) $(SYSTEMCONFIGURATION_LIBS) $(CORESERVICES_LIBS) +EXTRALIBS = $(DISKARBITRATION_LIBS) $(SYSTEMCONFIGURATION_LIBS) $(CORESERVICES_LIBS) $(SECURITY_LIBS) C_SRCS = \ dbus.c \ diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 1961eab9836..d55ca643018 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -496,6 +496,241 @@ done: irp->IoStatus.u.Status = status; IoCompleteRequest( irp, IO_NO_INCREMENT ); } + +static inline BOOL check_credential_string( const void *buf, SIZE_T buflen, ULONG size, ULONG offset ) +{ + const WCHAR *ptr = buf; + if (!size || size % sizeof(WCHAR) || offset + size > buflen || ptr[(offset + size) / sizeof(WCHAR) - 1]) return FALSE; + return TRUE; +} + +static SecKeychainItemRef find_credential( const WCHAR *name ) +{ + int status; + SecKeychainSearchRef search; + SecKeychainItemRef item; + + status = SecKeychainSearchCreateFromAttributes( NULL, kSecGenericPasswordItemClass, NULL, &search ); + if (status != noErr) return NULL; + + while (SecKeychainSearchCopyNext( search, &item ) == noErr) + { + SecKeychainAttributeInfo info; + SecKeychainAttributeList *attr_list; + UInt32 info_tags[] = { kSecServiceItemAttr }; + WCHAR *itemname; + int len; + + info.count = ARRAY_SIZE(info_tags); + info.tag = info_tags; + info.format = NULL; + status = SecKeychainItemCopyAttributesAndData( item, &info, NULL, &attr_list, NULL, NULL ); + if (status != noErr) + { + WARN( "SecKeychainItemCopyAttributesAndData returned status %d\n", status ); + continue; + } + if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServiceItemAttr) + { + CFRelease( item ); + continue; + } + len = MultiByteToWideChar( CP_UTF8, 0, attr_list->attr[0].data, attr_list->attr[0].length, NULL, 0 ); + if (!(itemname = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) + { + CFRelease( item ); + CFRelease( search ); + return NULL; + } + MultiByteToWideChar( CP_UTF8, 0, attr_list->attr[0].data, attr_list->attr[0].length, itemname, len ); + itemname[len] = 0; + if (strcmpiW( itemname, name )) + { + CFRelease( item ); + RtlFreeHeap( GetProcessHeap(), 0, itemname ); + continue; + } + RtlFreeHeap( GetProcessHeap(), 0, itemname ); + SecKeychainItemFreeAttributesAndData( attr_list, NULL ); + CFRelease( search ); + return item; + } + + CFRelease( search ); + return NULL; +} + +static NTSTATUS fill_credential( SecKeychainItemRef item, BOOL require_password, void *buf, SIZE_T data_offset, + SIZE_T buflen, SIZE_T *retlen ) +{ + struct mountmgr_credential *cred = buf; + int status, len; + SIZE_T size; + UInt32 i, cred_blob_len = 0; + void *cred_blob; + WCHAR *ptr; + BOOL user_name_present = FALSE; + SecKeychainAttributeInfo info; + SecKeychainAttributeList *attr_list = NULL; + UInt32 info_tags[] = { kSecServiceItemAttr, kSecAccountItemAttr, kSecCommentItemAttr, kSecCreationDateItemAttr }; + + info.count = ARRAY_SIZE(info_tags); + info.tag = info_tags; + info.format = NULL; + status = SecKeychainItemCopyAttributesAndData( item, &info, NULL, &attr_list, &cred_blob_len, &cred_blob ); + if (status == errSecAuthFailed && !require_password) + { + cred_blob_len = 0; + cred_blob = NULL; + status = SecKeychainItemCopyAttributesAndData( item, &info, NULL, &attr_list, &cred_blob_len, NULL ); + } + if (status != noErr) + { + WARN( "SecKeychainItemCopyAttributesAndData returned status %d\n", status ); + return STATUS_NOT_FOUND; + } + for (i = 0; i < attr_list->count; i++) + { + if (attr_list->attr[i].tag == kSecAccountItemAttr && attr_list->attr[i].data) + { + user_name_present = TRUE; + break; + } + } + if (!user_name_present) + { + WARN( "no kSecAccountItemAttr for item\n" ); + SecKeychainItemFreeAttributesAndData( attr_list, cred_blob ); + return STATUS_NOT_FOUND; + } + + *retlen = sizeof(*cred); + for (i = 0; i < attr_list->count; i++) + { + switch (attr_list->attr[i].tag) + { + case kSecServiceItemAttr: + TRACE( "kSecServiceItemAttr: %.*s\n", (int)attr_list->attr[i].length, (char *)attr_list->attr[i].data ); + if (cred) cred->targetname_offset = cred->targetname_size = 0; + if (!attr_list->attr[i].data) continue; + + len = MultiByteToWideChar( CP_UTF8, 0, attr_list->attr[i].data, attr_list->attr[i].length, NULL, 0 ); + size = (len + 1) * sizeof(WCHAR); + if (cred && *retlen + size <= buflen) + { + cred->targetname_offset = data_offset; + cred->targetname_size = size; + ptr = (WCHAR *)((char *)cred + cred->targetname_offset); + MultiByteToWideChar( CP_UTF8, 0, attr_list->attr[i].data, attr_list->attr[i].length, ptr, len ); + ptr[len] = 0; + data_offset += size; + } + *retlen += size; + break; + case kSecAccountItemAttr: + { + TRACE( "kSecAccountItemAttr: %.*s\n", (int)attr_list->attr[i].length, (char *)attr_list->attr[i].data ); + if (cred) cred->username_offset = cred->username_size = 0; + if (!attr_list->attr[i].data) continue; + + len = MultiByteToWideChar( CP_UTF8, 0, attr_list->attr[i].data, attr_list->attr[i].length, NULL, 0 ); + size = (len + 1) * sizeof(WCHAR); + if (cred && *retlen + size <= buflen) + { + cred->username_offset = data_offset; + cred->username_size = size; + ptr = (WCHAR *)((char *)cred + cred->username_offset); + MultiByteToWideChar( CP_UTF8, 0, attr_list->attr[i].data, attr_list->attr[i].length, ptr, len ); + ptr[len] = 0; + data_offset += size; + } + *retlen += size; + break; + } + case kSecCommentItemAttr: + TRACE( "kSecCommentItemAttr: %.*s\n", (int)attr_list->attr[i].length, (char *)attr_list->attr[i].data ); + if (cred) cred->comment_offset = cred->comment_size = 0; + if (!attr_list->attr[i].data) continue; + + len = MultiByteToWideChar( CP_UTF8, 0, attr_list->attr[i].data, attr_list->attr[i].length, NULL, 0 ); + size = (len + 1) * sizeof(WCHAR); + if (cred && *retlen + size <= buflen) + { + cred->comment_offset = data_offset; + cred->comment_size = size; + ptr = (WCHAR *)((char *)cred + cred->comment_offset); + len = MultiByteToWideChar( CP_UTF8, 0, attr_list->attr[i].data, attr_list->attr[i].length, ptr, len ); + ptr[len] = 0; + data_offset += size; + } + *retlen += size; + break; + case kSecCreationDateItemAttr: + { + LARGE_INTEGER wintime; + struct tm tm; + time_t time; + + TRACE( "kSecCreationDateItemAttr: %.*s\n", (int)attr_list->attr[i].length, (char *)attr_list->attr[i].data ); + if (cred) cred->last_written.dwLowDateTime = cred->last_written.dwHighDateTime = 0; + if (!attr_list->attr[i].data) continue; + + if (cred) + { + memset( &tm, 0, sizeof(tm) ); + strptime( attr_list->attr[i].data, "%Y%m%d%H%M%SZ", &tm ); + time = mktime( &tm ); + RtlSecondsSince1970ToTime( time, &wintime ); + cred->last_written.dwLowDateTime = wintime.u.LowPart; + cred->last_written.dwHighDateTime = wintime.u.HighPart; + } + break; + } + default: + FIXME( "unhandled attribute %u\n", (unsigned)attr_list->attr[i].tag ); + break; + } + } + + if (cred) + { + if (*retlen + cred_blob_len <= buflen) + { + len = MultiByteToWideChar( CP_UTF8, 0, cred_blob, cred_blob_len, NULL, 0 ); + cred->blob_offset = data_offset; + cred->blob_size = len * sizeof(WCHAR); + ptr = (WCHAR *)((char *)cred + cred->blob_offset); + MultiByteToWideChar( CP_UTF8, 0, cred_blob, cred_blob_len, ptr, len ); + } + else cred->blob_offset = cred->blob_size = 0; + } + *retlen += cred_blob_len; + + if (attr_list) SecKeychainItemFreeAttributesAndData( attr_list, cred_blob ); + return STATUS_SUCCESS; +} + +static NTSTATUS read_credential( void *buff, SIZE_T insize, SIZE_T outsize, IO_STATUS_BLOCK *iosb ) +{ + struct mountmgr_credential *cred = buff; + const WCHAR *targetname; + SecKeychainItemRef item; + SIZE_T size; + NTSTATUS status; + + if (!check_credential_string( buff, insize, cred->targetname_size, cred->targetname_offset )) + return STATUS_INVALID_PARAMETER; + targetname = (const WCHAR *)((const char *)cred + cred->targetname_offset); + + if (!(item = find_credential( targetname ))) return STATUS_NOT_FOUND; + + status = fill_credential( item, TRUE, cred, sizeof(*cred), outsize, &size ); + CFRelease( item ); + if (status != STATUS_SUCCESS) return status; + + iosb->Information = size; + return (size > outsize) ? STATUS_BUFFER_OVERFLOW : STATUS_SUCCESS; +} #endif /* __APPLE__ */ /* handler for ioctls on the mount manager device */ @@ -564,6 +799,17 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) if (TrySubmitThreadpoolCallback( query_symbol_file, irp, NULL )) return STATUS_PENDING; irp->IoStatus.u.Status = STATUS_NO_MEMORY; break; + case IOCTL_MOUNTMGR_READ_CREDENTIAL: + if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_credential)) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + break; + } + irp->IoStatus.u.Status = read_credential( irp->AssociatedIrp.SystemBuffer, + irpsp->Parameters.DeviceIoControl.InputBufferLength, + irpsp->Parameters.DeviceIoControl.OutputBufferLength, + &irp->IoStatus ); + break; #endif default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); diff --git a/include/ddk/mountmgr.h b/include/ddk/mountmgr.h index 13829a53954..c3d94078197 100644 --- a/include/ddk/mountmgr.h +++ b/include/ddk/mountmgr.h @@ -74,6 +74,22 @@ struct mountmgr_unix_drive USHORT label_offset; }; +#define IOCTL_MOUNTMGR_READ_CREDENTIAL CTL_CODE(MOUNTMGRCONTROLTYPE, 48, METHOD_BUFFERED, FILE_READ_ACCESS) + +struct mountmgr_credential +{ + ULONG targetname_offset; + ULONG targetname_size; + ULONG username_offset; + ULONG username_size; + ULONG comment_offset; + ULONG comment_size; + ULONG blob_offset; + ULONG blob_size; + BOOL blob_preserve; + FILETIME last_written; +}; + #define IOCTL_MOUNTMGR_QUERY_DHCP_REQUEST_PARAMS CTL_CODE(MOUNTMGRCONTROLTYPE, 64, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) struct mountmgr_dhcp_request_param -- 2.20.1

1 0

[PATCH vkd3d v4] include: Add basic documentation for vkd3d_types.h.
by Zebediah Figura 02 Sep '20

02 Sep '20

This is built on Doxygen. I'm not personally attached to Doxygen, but it was easy enough to set up and write for, and I've found its compiled HTML to be reasonably legible. Note that Doxygen does allow for specifying documentation in external files, if keeping the documentation out of the header is desired. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v4: actually fix build system integration right, and test it first... .gitignore | 2 + Doxyfile.in | 17 ++ Makefile.am | 6 + configure.ac | 5 + include/vkd3d_types.h | 18 +- m4/ax_prog_doxygen.m4 | 586 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 633 insertions(+), 1 deletion(-) create mode 100644 Doxyfile.in create mode 100644 m4/ax_prog_doxygen.m4 diff --git a/.gitignore b/.gitignore index 72037ddb..51cba319 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ autom4te.cache config.log config.status configure +doc +Doxyfile libtool Makefile Makefile.in diff --git a/Doxyfile.in b/Doxyfile.in new file mode 100644 index 00000000..a20e6f02 --- /dev/null +++ b/Doxyfile.in @@ -0,0 +1,17 @@ +# Doxyfile 1.8.18 + +DOXYFILE_ENCODING = UTF-8 +PROJECT_NAME = @PACKAGE_NAME@ +PROJECT_NUMBER = @PACKAGE_VERSION@ +PROJECT_BRIEF = "The vkd3d 3D Graphics Library" +OUTPUT_DIRECTORY = doc +JAVADOC_AUTOBRIEF = YES +OPTIMIZE_OUTPUT_FOR_C = YES +EXTRACT_STATIC = YES + +INPUT = @srcdir@/include/vkd3d.h \ + @srcdir@/include/vkd3d_shader.h \ + @srcdir@/include/vkd3d_types.h \ + @srcdir@/include/vkd3d_utils.h + +EXCLUDE_SYMBOLS = VKD3D_FORCE_32_BIT_ENUM diff --git a/Makefile.am b/Makefile.am index 58b3174c..dd624856 100644 --- a/Makefile.am +++ b/Makefile.am @@ -282,3 +282,9 @@ endif .PHONY: crosstest crosstest32 crosstest64 crosstest: crosstest32 crosstest64 + +if BUILD_DOC +@DX_RULES@ +all: doxygen-doc +CLEANFILES += $(DX_CLEANFILES) +endif diff --git a/configure.ac b/configure.ac index ca9d7600..d5f6588f 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,10 @@ AC_PROG_MKDIR_P VKD3D_PROG_WIDL(3, 20) AS_IF([test "x$WIDL" = "xno"], [AC_MSG_WARN([widl is required to build header files.])]) +DX_PS_FEATURE([OFF]) +DX_INIT_DOXYGEN([vkd3d], [Doxyfile], [doc]) +AC_CONFIG_FILES([Doxyfile]) + AM_INIT_AUTOMAKE([1.11 foreign silent-rules subdir-objects no-dist-gzip dist-xz -Wall -Werror]) AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) @@ -129,6 +133,7 @@ dnl Makefiles AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], [AC_MSG_ERROR([libxcb is required for demos.])]) AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) +AM_CONDITIONAL([BUILD_DOC], [test $DX_FLAG_doc = 1]) AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" != "xno"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) diff --git a/include/vkd3d_types.h b/include/vkd3d_types.h index 34c66748..020eb240 100644 --- a/include/vkd3d_types.h +++ b/include/vkd3d_types.h @@ -23,15 +23,31 @@ extern "C" { #endif /* __cplusplus */ +/** + * \file vkd3d_types.h + * + * This file contains definitions for basic types used by vkd3d libraries. + */ + #define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff +/** + * Result codes returned by some vkd3d functions. Error codes always have + * negative values; non-error codes never do. + */ enum vkd3d_result { + /** Success. */ VKD3D_OK = 0, - VKD3D_ERROR = -1, /* unspecified failure */ + /** An unspecified failure occurred. */ + VKD3D_ERROR = -1, + /** There are not enough resources available to complete the operation. */ VKD3D_ERROR_OUT_OF_MEMORY = -2, + /** One or more parameters passed to a vkd3d function were invalid. */ VKD3D_ERROR_INVALID_ARGUMENT = -3, + /** A shader passed to a vkd3d function was invalid. */ VKD3D_ERROR_INVALID_SHADER = -4, + /** The operation is not implemented in this version of vkd3d. */ VKD3D_ERROR_NOT_IMPLEMENTED = -5, VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4 new file mode 100644 index 00000000..ed1dc83b --- /dev/null +++ b/m4/ax_prog_doxygen.m4 @@ -0,0 +1,586 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_doxygen.html +# =========================================================================== +# +# SYNOPSIS +# +# DX_INIT_DOXYGEN(PROJECT-NAME, [DOXYFILE-PATH], [OUTPUT-DIR], ...) +# DX_DOXYGEN_FEATURE(ON|OFF) +# DX_DOT_FEATURE(ON|OFF) +# DX_HTML_FEATURE(ON|OFF) +# DX_CHM_FEATURE(ON|OFF) +# DX_CHI_FEATURE(ON|OFF) +# DX_MAN_FEATURE(ON|OFF) +# DX_RTF_FEATURE(ON|OFF) +# DX_XML_FEATURE(ON|OFF) +# DX_PDF_FEATURE(ON|OFF) +# DX_PS_FEATURE(ON|OFF) +# +# DESCRIPTION +# +# The DX_*_FEATURE macros control the default setting for the given +# Doxygen feature. Supported features are 'DOXYGEN' itself, 'DOT' for +# generating graphics, 'HTML' for plain HTML, 'CHM' for compressed HTML +# help (for MS users), 'CHI' for generating a separate .chi file by the +# .chm file, and 'MAN', 'RTF', 'XML', 'PDF' and 'PS' for the appropriate +# output formats. The environment variable DOXYGEN_PAPER_SIZE may be +# specified to override the default 'a4wide' paper size. +# +# By default, HTML, PDF and PS documentation is generated as this seems to +# be the most popular and portable combination. MAN pages created by +# Doxygen are usually problematic, though by picking an appropriate subset +# and doing some massaging they might be better than nothing. CHM and RTF +# are specific for MS (note that you can't generate both HTML and CHM at +# the same time). The XML is rather useless unless you apply specialized +# post-processing to it. +# +# The macros mainly control the default state of the feature. The use can +# override the default by specifying --enable or --disable. The macros +# ensure that contradictory flags are not given (e.g., +# --enable-doxygen-html and --enable-doxygen-chm, +# --enable-doxygen-anything with --disable-doxygen, etc.) Finally, each +# feature will be automatically disabled (with a warning) if the required +# programs are missing. +# +# Once all the feature defaults have been specified, call DX_INIT_DOXYGEN +# with the following parameters: a one-word name for the project for use +# as a filename base etc., an optional configuration file name (the +# default is '$(srcdir)/Doxyfile', the same as Doxygen's default), and an +# optional output directory name (the default is 'doxygen-doc'). To run +# doxygen multiple times for different configuration files and output +# directories provide more parameters: the second, forth, sixth, etc +# parameter are configuration file names and the third, fifth, seventh, +# etc parameter are output directories. No checking is done to catch +# duplicates. +# +# Automake Support +# +# The DX_RULES substitution can be used to add all needed rules to the +# Makefile. Note that this is a substitution without being a variable: +# only the @DX_RULES@ syntax will work. +# +# The provided targets are: +# +# doxygen-doc: Generate all doxygen documentation. +# +# doxygen-run: Run doxygen, which will generate some of the +# documentation (HTML, CHM, CHI, MAN, RTF, XML) +# but will not do the post processing required +# for the rest of it (PS, PDF). +# +# doxygen-ps: Generate doxygen PostScript documentation. +# +# doxygen-pdf: Generate doxygen PDF documentation. +# +# Note that by default these are not integrated into the automake targets. +# If doxygen is used to generate man pages, you can achieve this +# integration by setting man3_MANS to the list of man pages generated and +# then adding the dependency: +# +# $(man3_MANS): doxygen-doc +# +# This will cause make to run doxygen and generate all the documentation. +# +# The following variable is intended for use in Makefile.am: +# +# DX_CLEANFILES = everything to clean. +# +# Then add this variable to MOSTLYCLEANFILES. +# +# LICENSE +# +# Copyright (c) 2009 Oren Ben-Kiki <oren(a)ben-kiki.org> +# Copyright (c) 2015 Olaf Mandel <olaf(a)mandel.name> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 24 + +## ----------## +## Defaults. ## +## ----------## + +DX_ENV="" +AC_DEFUN([DX_FEATURE_doc], ON) +AC_DEFUN([DX_FEATURE_dot], OFF) +AC_DEFUN([DX_FEATURE_man], OFF) +AC_DEFUN([DX_FEATURE_html], ON) +AC_DEFUN([DX_FEATURE_chm], OFF) +AC_DEFUN([DX_FEATURE_chi], OFF) +AC_DEFUN([DX_FEATURE_rtf], OFF) +AC_DEFUN([DX_FEATURE_xml], OFF) +AC_DEFUN([DX_FEATURE_pdf], ON) +AC_DEFUN([DX_FEATURE_ps], ON) + +## --------------- ## +## Private macros. ## +## --------------- ## + +# DX_ENV_APPEND(VARIABLE, VALUE) +# ------------------------------ +# Append VARIABLE="VALUE" to DX_ENV for invoking doxygen and add it +# as a substitution (but not a Makefile variable). The substitution +# is skipped if the variable name is VERSION. +AC_DEFUN([DX_ENV_APPEND], +[AC_SUBST([DX_ENV], ["$DX_ENV $1='$2'"])dnl +m4_if([$1], [VERSION], [], [AC_SUBST([$1], [$2])dnl +AM_SUBST_NOTMAKE([$1])])dnl +]) + +# DX_DIRNAME_EXPR +# --------------- +# Expand into a shell expression prints the directory part of a path. +AC_DEFUN([DX_DIRNAME_EXPR], + [[expr ".$1" : '$\.$[^/]*$' \| "x$1" : 'x$.*$/[^/]*$']]) + +# DX_IF_FEATURE(FEATURE, IF-ON, IF-OFF) +# ------------------------------------- +# Expands according to the M4 (static) status of the feature. +AC_DEFUN([DX_IF_FEATURE], [ifelse(DX_FEATURE_$1, ON, [$2], [$3])]) + +# DX_REQUIRE_PROG(VARIABLE, PROGRAM) +# ---------------------------------- +# Require the specified program to be found for the DX_CURRENT_FEATURE to work. +AC_DEFUN([DX_REQUIRE_PROG], [ +AC_PATH_TOOL([$1], [$2]) +if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then + AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION]) + AC_SUBST(DX_FLAG_[]DX_CURRENT_FEATURE, 0) +fi +]) + +# DX_TEST_FEATURE(FEATURE) +# ------------------------ +# Expand to a shell expression testing whether the feature is active. +AC_DEFUN([DX_TEST_FEATURE], [test "$DX_FLAG_$1" = 1]) + +# DX_CHECK_DEPEND(REQUIRED_FEATURE, REQUIRED_STATE) +# ------------------------------------------------- +# Verify that a required features has the right state before trying to turn on +# the DX_CURRENT_FEATURE. +AC_DEFUN([DX_CHECK_DEPEND], [ +test "$DX_FLAG_$1" = "$2" \ +|| AC_MSG_ERROR([doxygen-DX_CURRENT_FEATURE ifelse([$2], 1, + requires, contradicts) doxygen-$1]) +]) + +# DX_CLEAR_DEPEND(FEATURE, REQUIRED_FEATURE, REQUIRED_STATE) +# ---------------------------------------------------------- +# Turn off the DX_CURRENT_FEATURE if the required feature is off. +AC_DEFUN([DX_CLEAR_DEPEND], [ +test "$DX_FLAG_$1" = "$2" || AC_SUBST(DX_FLAG_[]DX_CURRENT_FEATURE, 0) +]) + +# DX_FEATURE_ARG(FEATURE, DESCRIPTION, +# CHECK_DEPEND, CLEAR_DEPEND, +# REQUIRE, DO-IF-ON, DO-IF-OFF) +# -------------------------------------------- +# Parse the command-line option controlling a feature. CHECK_DEPEND is called +# if the user explicitly turns the feature on (and invokes DX_CHECK_DEPEND), +# otherwise CLEAR_DEPEND is called to turn off the default state if a required +# feature is disabled (using DX_CLEAR_DEPEND). REQUIRE performs additional +# requirement tests (DX_REQUIRE_PROG). Finally, an automake flag is set and +# DO-IF-ON or DO-IF-OFF are called according to the final state of the feature. +AC_DEFUN([DX_ARG_ABLE], [ + AC_DEFUN([DX_CURRENT_FEATURE], [$1]) + AC_DEFUN([DX_CURRENT_DESCRIPTION], [$2]) + AC_ARG_ENABLE(doxygen-$1, + [AS_HELP_STRING(DX_IF_FEATURE([$1], [--disable-doxygen-$1], + [--enable-doxygen-$1]), + DX_IF_FEATURE([$1], [don't $2], [$2]))], + [ +case "$enableval" in +#( +y|Y|yes|Yes|YES) + AC_SUBST([DX_FLAG_$1], 1) + $3 +;; #( +n|N|no|No|NO) + AC_SUBST([DX_FLAG_$1], 0) +;; #( +*) + AC_MSG_ERROR([invalid value '$enableval' given to doxygen-$1]) +;; +esac +], [ +AC_SUBST([DX_FLAG_$1], [DX_IF_FEATURE([$1], 1, 0)]) +$4 +]) +if DX_TEST_FEATURE([$1]); then + $5 + : +fi +if DX_TEST_FEATURE([$1]); then + $6 + : +else + $7 + : +fi +]) + +## -------------- ## +## Public macros. ## +## -------------- ## + +# DX_XXX_FEATURE(DEFAULT_STATE) +# ----------------------------- +AC_DEFUN([DX_DOXYGEN_FEATURE], [AC_DEFUN([DX_FEATURE_doc], [$1])]) +AC_DEFUN([DX_DOT_FEATURE], [AC_DEFUN([DX_FEATURE_dot], [$1])]) +AC_DEFUN([DX_MAN_FEATURE], [AC_DEFUN([DX_FEATURE_man], [$1])]) +AC_DEFUN([DX_HTML_FEATURE], [AC_DEFUN([DX_FEATURE_html], [$1])]) +AC_DEFUN([DX_CHM_FEATURE], [AC_DEFUN([DX_FEATURE_chm], [$1])]) +AC_DEFUN([DX_CHI_FEATURE], [AC_DEFUN([DX_FEATURE_chi], [$1])]) +AC_DEFUN([DX_RTF_FEATURE], [AC_DEFUN([DX_FEATURE_rtf], [$1])]) +AC_DEFUN([DX_XML_FEATURE], [AC_DEFUN([DX_FEATURE_xml], [$1])]) +AC_DEFUN([DX_XML_FEATURE], [AC_DEFUN([DX_FEATURE_xml], [$1])]) +AC_DEFUN([DX_PDF_FEATURE], [AC_DEFUN([DX_FEATURE_pdf], [$1])]) +AC_DEFUN([DX_PS_FEATURE], [AC_DEFUN([DX_FEATURE_ps], [$1])]) + +# DX_INIT_DOXYGEN(PROJECT, [CONFIG-FILE], [OUTPUT-DOC-DIR], ...) +# -------------------------------------------------------------- +# PROJECT also serves as the base name for the documentation files. +# The default CONFIG-FILE is "$(srcdir)/Doxyfile" and OUTPUT-DOC-DIR is +# "doxygen-doc". +# More arguments are interpreted as interleaved CONFIG-FILE and +# OUTPUT-DOC-DIR values. +AC_DEFUN([DX_INIT_DOXYGEN], [ + +# Files: +AC_SUBST([DX_PROJECT], [$1]) +AC_SUBST([DX_CONFIG], ['ifelse([$2], [], [$(srcdir)/Doxyfile], [$2])']) +AC_SUBST([DX_DOCDIR], ['ifelse([$3], [], [doxygen-doc], [$3])']) +m4_if(m4_eval(3 < m4_count($@)), 1, [m4_for([DX_i], 4, m4_count($@), 2, + [AC_SUBST([DX_CONFIG]m4_eval(DX_i[/2]), + 'm4_default_nblank_quoted(m4_argn(DX_i, $@), + [$(srcdir)/Doxyfile])')])])dnl +m4_if(m4_eval(3 < m4_count($@)), 1, [m4_for([DX_i], 5, m4_count($@,), 2, + [AC_SUBST([DX_DOCDIR]m4_eval([(]DX_i[-1)/2]), + 'm4_default_nblank_quoted(m4_argn(DX_i, $@), + [doxygen-doc])')])])dnl +m4_define([DX_loop], m4_dquote(m4_if(m4_eval(3 < m4_count($@)), 1, + [m4_for([DX_i], 4, m4_count($@), 2, [, m4_eval(DX_i[/2])])], + [])))dnl + +# Environment variables used inside doxygen.cfg: +DX_ENV_APPEND(SRCDIR, $srcdir) +DX_ENV_APPEND(PROJECT, $DX_PROJECT) +DX_ENV_APPEND(VERSION, $PACKAGE_VERSION) + +# Doxygen itself: +DX_ARG_ABLE(doc, [generate any doxygen documentation], + [], + [], + [DX_REQUIRE_PROG([DX_DOXYGEN], doxygen) + DX_REQUIRE_PROG([DX_PERL], perl)], + [DX_ENV_APPEND(PERL_PATH, $DX_PERL)]) + +# Dot for graphics: +DX_ARG_ABLE(dot, [generate graphics for doxygen documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_DOT], dot)], + [DX_ENV_APPEND(HAVE_DOT, YES) + DX_ENV_APPEND(DOT_PATH, [`DX_DIRNAME_EXPR($DX_DOT)`])], + [DX_ENV_APPEND(HAVE_DOT, NO)]) + +# Man pages generation: +DX_ARG_ABLE(man, [generate doxygen manual pages], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [], + [DX_ENV_APPEND(GENERATE_MAN, YES)], + [DX_ENV_APPEND(GENERATE_MAN, NO)]) + +# RTF file generation: +DX_ARG_ABLE(rtf, [generate doxygen RTF documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [], + [DX_ENV_APPEND(GENERATE_RTF, YES)], + [DX_ENV_APPEND(GENERATE_RTF, NO)]) + +# XML file generation: +DX_ARG_ABLE(xml, [generate doxygen XML documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [], + [DX_ENV_APPEND(GENERATE_XML, YES)], + [DX_ENV_APPEND(GENERATE_XML, NO)]) + +# (Compressed) HTML help generation: +DX_ARG_ABLE(chm, [generate doxygen compressed HTML help documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_HHC], hhc)], + [DX_ENV_APPEND(HHC_PATH, $DX_HHC) + DX_ENV_APPEND(GENERATE_HTML, YES) + DX_ENV_APPEND(GENERATE_HTMLHELP, YES)], + [DX_ENV_APPEND(GENERATE_HTMLHELP, NO)]) + +# Separate CHI file generation. +DX_ARG_ABLE(chi, [generate doxygen separate compressed HTML help index file], + [DX_CHECK_DEPEND(chm, 1)], + [DX_CLEAR_DEPEND(chm, 1)], + [], + [DX_ENV_APPEND(GENERATE_CHI, YES)], + [DX_ENV_APPEND(GENERATE_CHI, NO)]) + +# Plain HTML pages generation: +DX_ARG_ABLE(html, [generate doxygen plain HTML documentation], + [DX_CHECK_DEPEND(doc, 1) DX_CHECK_DEPEND(chm, 0)], + [DX_CLEAR_DEPEND(doc, 1) DX_CLEAR_DEPEND(chm, 0)], + [], + [DX_ENV_APPEND(GENERATE_HTML, YES)], + [DX_TEST_FEATURE(chm) || DX_ENV_APPEND(GENERATE_HTML, NO)]) + +# PostScript file generation: +DX_ARG_ABLE(ps, [generate doxygen PostScript documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_LATEX], latex) + DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex) + DX_REQUIRE_PROG([DX_DVIPS], dvips) + DX_REQUIRE_PROG([DX_EGREP], egrep)]) + +# PDF file generation: +DX_ARG_ABLE(pdf, [generate doxygen PDF documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_PDFLATEX], pdflatex) + DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex) + DX_REQUIRE_PROG([DX_EGREP], egrep)]) + +# LaTeX generation for PS and/or PDF: +if DX_TEST_FEATURE(ps) || DX_TEST_FEATURE(pdf); then + DX_ENV_APPEND(GENERATE_LATEX, YES) +else + DX_ENV_APPEND(GENERATE_LATEX, NO) +fi + +# Paper size for PS and/or PDF: +AC_ARG_VAR(DOXYGEN_PAPER_SIZE, + [a4wide (default), a4, letter, legal or executive]) +case "$DOXYGEN_PAPER_SIZE" in +#( +"") + AC_SUBST(DOXYGEN_PAPER_SIZE, "") +;; #( +a4wide|a4|letter|legal|executive) + DX_ENV_APPEND(PAPER_SIZE, $DOXYGEN_PAPER_SIZE) +;; #( +*) + AC_MSG_ERROR([unknown DOXYGEN_PAPER_SIZE='$DOXYGEN_PAPER_SIZE']) +;; +esac + +# Rules: +AS_IF([[test $DX_FLAG_html -eq 1]], +[[DX_SNIPPET_html="## ------------------------------- ## +## Rules specific for HTML output. ## +## ------------------------------- ## + +DX_CLEAN_HTML = \$(DX_DOCDIR)/html]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/html]])[ + +"]], +[[DX_SNIPPET_html=""]]) +AS_IF([[test $DX_FLAG_chi -eq 1]], +[[DX_SNIPPET_chi=" +DX_CLEAN_CHI = \$(DX_DOCDIR)/\$(PACKAGE).chi]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).chi]])["]], +[[DX_SNIPPET_chi=""]]) +AS_IF([[test $DX_FLAG_chm -eq 1]], +[[DX_SNIPPET_chm="## ------------------------------ ## +## Rules specific for CHM output. ## +## ------------------------------ ## + +DX_CLEAN_CHM = \$(DX_DOCDIR)/chm]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/chm]])[\ +${DX_SNIPPET_chi} + +"]], +[[DX_SNIPPET_chm=""]]) +AS_IF([[test $DX_FLAG_man -eq 1]], +[[DX_SNIPPET_man="## ------------------------------ ## +## Rules specific for MAN output. ## +## ------------------------------ ## + +DX_CLEAN_MAN = \$(DX_DOCDIR)/man]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/man]])[ + +"]], +[[DX_SNIPPET_man=""]]) +AS_IF([[test $DX_FLAG_rtf -eq 1]], +[[DX_SNIPPET_rtf="## ------------------------------ ## +## Rules specific for RTF output. ## +## ------------------------------ ## + +DX_CLEAN_RTF = \$(DX_DOCDIR)/rtf]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/rtf]])[ + +"]], +[[DX_SNIPPET_rtf=""]]) +AS_IF([[test $DX_FLAG_xml -eq 1]], +[[DX_SNIPPET_xml="## ------------------------------ ## +## Rules specific for XML output. ## +## ------------------------------ ## + +DX_CLEAN_XML = \$(DX_DOCDIR)/xml]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/xml]])[ + +"]], +[[DX_SNIPPET_xml=""]]) +AS_IF([[test $DX_FLAG_ps -eq 1]], +[[DX_SNIPPET_ps="## ----------------------------- ## +## Rules specific for PS output. ## +## ----------------------------- ## + +DX_CLEAN_PS = \$(DX_DOCDIR)/\$(PACKAGE).ps]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).ps]])[ + +DX_PS_GOAL = doxygen-ps + +doxygen-ps: \$(DX_CLEAN_PS) + +]m4_foreach([DX_i], [DX_loop], +[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).ps: \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag + \$(DX_V_LATEX)cd \$(DX_DOCDIR]DX_i[)/latex; \\ + rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \\ + \$(DX_LATEX) refman.tex; \\ + \$(DX_MAKEINDEX) refman.idx; \\ + \$(DX_LATEX) refman.tex; \\ + countdown=5; \\ + while \$(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \\ + refman.log > /dev/null 2>&1 \\ + && test \$\$countdown -gt 0; do \\ + \$(DX_LATEX) refman.tex; \\ + countdown=\`expr \$\$countdown - 1\`; \\ + done; \\ + \$(DX_DVIPS) -o ../\$(PACKAGE).ps refman.dvi + +]])["]], +[[DX_SNIPPET_ps=""]]) +AS_IF([[test $DX_FLAG_pdf -eq 1]], +[[DX_SNIPPET_pdf="## ------------------------------ ## +## Rules specific for PDF output. ## +## ------------------------------ ## + +DX_CLEAN_PDF = \$(DX_DOCDIR)/\$(PACKAGE).pdf]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).pdf]])[ + +DX_PDF_GOAL = doxygen-pdf + +doxygen-pdf: \$(DX_CLEAN_PDF) + +]m4_foreach([DX_i], [DX_loop], +[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).pdf: \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag + \$(DX_V_LATEX)cd \$(DX_DOCDIR]DX_i[)/latex; \\ + rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \\ + \$(DX_PDFLATEX) refman.tex; \\ + \$(DX_MAKEINDEX) refman.idx; \\ + \$(DX_PDFLATEX) refman.tex; \\ + countdown=5; \\ + while \$(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \\ + refman.log > /dev/null 2>&1 \\ + && test \$\$countdown -gt 0; do \\ + \$(DX_PDFLATEX) refman.tex; \\ + countdown=\`expr \$\$countdown - 1\`; \\ + done; \\ + mv refman.pdf ../\$(PACKAGE).pdf + +]])["]], +[[DX_SNIPPET_pdf=""]]) +AS_IF([[test $DX_FLAG_ps -eq 1 -o $DX_FLAG_pdf -eq 1]], +[[DX_SNIPPET_latex="## ------------------------------------------------- ## +## Rules specific for LaTeX (shared for PS and PDF). ## +## ------------------------------------------------- ## + +DX_V_LATEX = \$(_DX_v_LATEX_\$(V)) +_DX_v_LATEX_ = \$(_DX_v_LATEX_\$(AM_DEFAULT_VERBOSITY)) +_DX_v_LATEX_0 = @echo \" LATEX \" \$][@; + +DX_CLEAN_LATEX = \$(DX_DOCDIR)/latex]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/latex]])[ + +"]], +[[DX_SNIPPET_latex=""]]) + +AS_IF([[test $DX_FLAG_doc -eq 1]], +[[DX_SNIPPET_doc="## --------------------------------- ## +## Format-independent Doxygen rules. ## +## --------------------------------- ## + +${DX_SNIPPET_html}\ +${DX_SNIPPET_chm}\ +${DX_SNIPPET_man}\ +${DX_SNIPPET_rtf}\ +${DX_SNIPPET_xml}\ +${DX_SNIPPET_ps}\ +${DX_SNIPPET_pdf}\ +${DX_SNIPPET_latex}\ +DX_V_DXGEN = \$(_DX_v_DXGEN_\$(V)) +_DX_v_DXGEN_ = \$(_DX_v_DXGEN_\$(AM_DEFAULT_VERBOSITY)) +_DX_v_DXGEN_0 = @echo \" DXGEN \" \$<; + +.PHONY: doxygen-run doxygen-doc \$(DX_PS_GOAL) \$(DX_PDF_GOAL) + +.INTERMEDIATE: doxygen-run \$(DX_PS_GOAL) \$(DX_PDF_GOAL) + +doxygen-run:]m4_foreach([DX_i], [DX_loop], + [[ \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag]])[ + +doxygen-doc: doxygen-run \$(DX_PS_GOAL) \$(DX_PDF_GOAL) + +]m4_foreach([DX_i], [DX_loop], +[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag: \$(DX_CONFIG]DX_i[) \$(pkginclude_HEADERS) + \$(A""M_V_at)rm -rf \$(DX_DOCDIR]DX_i[) + \$(DX_V_DXGEN)\$(DX_ENV) DOCDIR=\$(DX_DOCDIR]DX_i[) \$(DX_DOXYGEN) \$(DX_CONFIG]DX_i[) + \$(A""M_V_at)echo Timestamp >\$][@ + +]])dnl +[DX_CLEANFILES = \\] +m4_foreach([DX_i], [DX_loop], +[[ \$(DX_DOCDIR]DX_i[)/doxygen_sqlite3.db \\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag \\ +]])dnl +[ -r \\ + \$(DX_CLEAN_HTML) \\ + \$(DX_CLEAN_CHM) \\ + \$(DX_CLEAN_CHI) \\ + \$(DX_CLEAN_MAN) \\ + \$(DX_CLEAN_RTF) \\ + \$(DX_CLEAN_XML) \\ + \$(DX_CLEAN_PS) \\ + \$(DX_CLEAN_PDF) \\ + \$(DX_CLEAN_LATEX)"]], +[[DX_SNIPPET_doc=""]]) +AC_SUBST([DX_RULES], +["${DX_SNIPPET_doc}"])dnl +AM_SUBST_NOTMAKE([DX_RULES]) + +#For debugging: +#echo DX_FLAG_doc=$DX_FLAG_doc +#echo DX_FLAG_dot=$DX_FLAG_dot +#echo DX_FLAG_man=$DX_FLAG_man +#echo DX_FLAG_html=$DX_FLAG_html +#echo DX_FLAG_chm=$DX_FLAG_chm +#echo DX_FLAG_chi=$DX_FLAG_chi +#echo DX_FLAG_rtf=$DX_FLAG_rtf +#echo DX_FLAG_xml=$DX_FLAG_xml +#echo DX_FLAG_pdf=$DX_FLAG_pdf +#echo DX_FLAG_ps=$DX_FLAG_ps +#echo DX_ENV=$DX_ENV +]) -- 2.28.0

3 2

[PATCH vkd3d v3 1/5] include: Add basic documentation for vkd3d_types.h.
by Zebediah Figura 02 Sep '20

02 Sep '20

This is built on Doxygen. I'm not personally attached to Doxygen, but it was easy enough to set up and write for, and I've found its compiled HTML to be reasonably legible. Note that Doxygen does allow for specifying documentation in external files, if keeping the documentation out of the header is desired. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: Default PostScript to off; add "all" and "clean" rules. .gitignore | 2 + Doxyfile.in | 17 ++ Makefile.am | 4 + configure.ac | 4 + include/vkd3d_types.h | 18 +- m4/ax_prog_doxygen.m4 | 586 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 630 insertions(+), 1 deletion(-) create mode 100644 Doxyfile.in create mode 100644 m4/ax_prog_doxygen.m4 diff --git a/.gitignore b/.gitignore index 72037ddb..51cba319 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ autom4te.cache config.log config.status configure +doc +Doxyfile libtool Makefile Makefile.in diff --git a/Doxyfile.in b/Doxyfile.in new file mode 100644 index 00000000..a20e6f02 --- /dev/null +++ b/Doxyfile.in @@ -0,0 +1,17 @@ +# Doxyfile 1.8.18 + +DOXYFILE_ENCODING = UTF-8 +PROJECT_NAME = @PACKAGE_NAME@ +PROJECT_NUMBER = @PACKAGE_VERSION@ +PROJECT_BRIEF = "The vkd3d 3D Graphics Library" +OUTPUT_DIRECTORY = doc +JAVADOC_AUTOBRIEF = YES +OPTIMIZE_OUTPUT_FOR_C = YES +EXTRACT_STATIC = YES + +INPUT = @srcdir@/include/vkd3d.h \ + @srcdir@/include/vkd3d_shader.h \ + @srcdir@/include/vkd3d_types.h \ + @srcdir@/include/vkd3d_utils.h + +EXCLUDE_SYMBOLS = VKD3D_FORCE_32_BIT_ENUM diff --git a/Makefile.am b/Makefile.am index 58b3174c..460818c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -167,6 +167,10 @@ demos_triangle_CFLAGS = $(DEMOS_CFLAGS) demos_triangle_LDADD = $(DEMOS_LDADD) endif +@DX_RULES@ +all: doxygen-doc +CLEANFILES += DX_CLEANFILES + EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers) VKD3D_V_WIDL = $(vkd3d_v_widl_@AM_V@) diff --git a/configure.ac b/configure.ac index ca9d7600..e665c5cf 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,10 @@ AC_PROG_MKDIR_P VKD3D_PROG_WIDL(3, 20) AS_IF([test "x$WIDL" = "xno"], [AC_MSG_WARN([widl is required to build header files.])]) +DX_PS_FEATURE([OFF]) +DX_INIT_DOXYGEN([vkd3d], [Doxyfile], [doc]) +AC_CONFIG_FILES([Doxyfile]) + AM_INIT_AUTOMAKE([1.11 foreign silent-rules subdir-objects no-dist-gzip dist-xz -Wall -Werror]) AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) diff --git a/include/vkd3d_types.h b/include/vkd3d_types.h index 34c66748..020eb240 100644 --- a/include/vkd3d_types.h +++ b/include/vkd3d_types.h @@ -23,15 +23,31 @@ extern "C" { #endif /* __cplusplus */ +/** + * \file vkd3d_types.h + * + * This file contains definitions for basic types used by vkd3d libraries. + */ + #define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff +/** + * Result codes returned by some vkd3d functions. Error codes always have + * negative values; non-error codes never do. + */ enum vkd3d_result { + /** Success. */ VKD3D_OK = 0, - VKD3D_ERROR = -1, /* unspecified failure */ + /** An unspecified failure occurred. */ + VKD3D_ERROR = -1, + /** There are not enough resources available to complete the operation. */ VKD3D_ERROR_OUT_OF_MEMORY = -2, + /** One or more parameters passed to a vkd3d function were invalid. */ VKD3D_ERROR_INVALID_ARGUMENT = -3, + /** A shader passed to a vkd3d function was invalid. */ VKD3D_ERROR_INVALID_SHADER = -4, + /** The operation is not implemented in this version of vkd3d. */ VKD3D_ERROR_NOT_IMPLEMENTED = -5, VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4 new file mode 100644 index 00000000..ed1dc83b --- /dev/null +++ b/m4/ax_prog_doxygen.m4 @@ -0,0 +1,586 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_doxygen.html +# =========================================================================== +# +# SYNOPSIS +# +# DX_INIT_DOXYGEN(PROJECT-NAME, [DOXYFILE-PATH], [OUTPUT-DIR], ...) +# DX_DOXYGEN_FEATURE(ON|OFF) +# DX_DOT_FEATURE(ON|OFF) +# DX_HTML_FEATURE(ON|OFF) +# DX_CHM_FEATURE(ON|OFF) +# DX_CHI_FEATURE(ON|OFF) +# DX_MAN_FEATURE(ON|OFF) +# DX_RTF_FEATURE(ON|OFF) +# DX_XML_FEATURE(ON|OFF) +# DX_PDF_FEATURE(ON|OFF) +# DX_PS_FEATURE(ON|OFF) +# +# DESCRIPTION +# +# The DX_*_FEATURE macros control the default setting for the given +# Doxygen feature. Supported features are 'DOXYGEN' itself, 'DOT' for +# generating graphics, 'HTML' for plain HTML, 'CHM' for compressed HTML +# help (for MS users), 'CHI' for generating a separate .chi file by the +# .chm file, and 'MAN', 'RTF', 'XML', 'PDF' and 'PS' for the appropriate +# output formats. The environment variable DOXYGEN_PAPER_SIZE may be +# specified to override the default 'a4wide' paper size. +# +# By default, HTML, PDF and PS documentation is generated as this seems to +# be the most popular and portable combination. MAN pages created by +# Doxygen are usually problematic, though by picking an appropriate subset +# and doing some massaging they might be better than nothing. CHM and RTF +# are specific for MS (note that you can't generate both HTML and CHM at +# the same time). The XML is rather useless unless you apply specialized +# post-processing to it. +# +# The macros mainly control the default state of the feature. The use can +# override the default by specifying --enable or --disable. The macros +# ensure that contradictory flags are not given (e.g., +# --enable-doxygen-html and --enable-doxygen-chm, +# --enable-doxygen-anything with --disable-doxygen, etc.) Finally, each +# feature will be automatically disabled (with a warning) if the required +# programs are missing. +# +# Once all the feature defaults have been specified, call DX_INIT_DOXYGEN +# with the following parameters: a one-word name for the project for use +# as a filename base etc., an optional configuration file name (the +# default is '$(srcdir)/Doxyfile', the same as Doxygen's default), and an +# optional output directory name (the default is 'doxygen-doc'). To run +# doxygen multiple times for different configuration files and output +# directories provide more parameters: the second, forth, sixth, etc +# parameter are configuration file names and the third, fifth, seventh, +# etc parameter are output directories. No checking is done to catch +# duplicates. +# +# Automake Support +# +# The DX_RULES substitution can be used to add all needed rules to the +# Makefile. Note that this is a substitution without being a variable: +# only the @DX_RULES@ syntax will work. +# +# The provided targets are: +# +# doxygen-doc: Generate all doxygen documentation. +# +# doxygen-run: Run doxygen, which will generate some of the +# documentation (HTML, CHM, CHI, MAN, RTF, XML) +# but will not do the post processing required +# for the rest of it (PS, PDF). +# +# doxygen-ps: Generate doxygen PostScript documentation. +# +# doxygen-pdf: Generate doxygen PDF documentation. +# +# Note that by default these are not integrated into the automake targets. +# If doxygen is used to generate man pages, you can achieve this +# integration by setting man3_MANS to the list of man pages generated and +# then adding the dependency: +# +# $(man3_MANS): doxygen-doc +# +# This will cause make to run doxygen and generate all the documentation. +# +# The following variable is intended for use in Makefile.am: +# +# DX_CLEANFILES = everything to clean. +# +# Then add this variable to MOSTLYCLEANFILES. +# +# LICENSE +# +# Copyright (c) 2009 Oren Ben-Kiki <oren(a)ben-kiki.org> +# Copyright (c) 2015 Olaf Mandel <olaf(a)mandel.name> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 24 + +## ----------## +## Defaults. ## +## ----------## + +DX_ENV="" +AC_DEFUN([DX_FEATURE_doc], ON) +AC_DEFUN([DX_FEATURE_dot], OFF) +AC_DEFUN([DX_FEATURE_man], OFF) +AC_DEFUN([DX_FEATURE_html], ON) +AC_DEFUN([DX_FEATURE_chm], OFF) +AC_DEFUN([DX_FEATURE_chi], OFF) +AC_DEFUN([DX_FEATURE_rtf], OFF) +AC_DEFUN([DX_FEATURE_xml], OFF) +AC_DEFUN([DX_FEATURE_pdf], ON) +AC_DEFUN([DX_FEATURE_ps], ON) + +## --------------- ## +## Private macros. ## +## --------------- ## + +# DX_ENV_APPEND(VARIABLE, VALUE) +# ------------------------------ +# Append VARIABLE="VALUE" to DX_ENV for invoking doxygen and add it +# as a substitution (but not a Makefile variable). The substitution +# is skipped if the variable name is VERSION. +AC_DEFUN([DX_ENV_APPEND], +[AC_SUBST([DX_ENV], ["$DX_ENV $1='$2'"])dnl +m4_if([$1], [VERSION], [], [AC_SUBST([$1], [$2])dnl +AM_SUBST_NOTMAKE([$1])])dnl +]) + +# DX_DIRNAME_EXPR +# --------------- +# Expand into a shell expression prints the directory part of a path. +AC_DEFUN([DX_DIRNAME_EXPR], + [[expr ".$1" : '$\.$[^/]*$' \| "x$1" : 'x$.*$/[^/]*$']]) + +# DX_IF_FEATURE(FEATURE, IF-ON, IF-OFF) +# ------------------------------------- +# Expands according to the M4 (static) status of the feature. +AC_DEFUN([DX_IF_FEATURE], [ifelse(DX_FEATURE_$1, ON, [$2], [$3])]) + +# DX_REQUIRE_PROG(VARIABLE, PROGRAM) +# ---------------------------------- +# Require the specified program to be found for the DX_CURRENT_FEATURE to work. +AC_DEFUN([DX_REQUIRE_PROG], [ +AC_PATH_TOOL([$1], [$2]) +if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then + AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION]) + AC_SUBST(DX_FLAG_[]DX_CURRENT_FEATURE, 0) +fi +]) + +# DX_TEST_FEATURE(FEATURE) +# ------------------------ +# Expand to a shell expression testing whether the feature is active. +AC_DEFUN([DX_TEST_FEATURE], [test "$DX_FLAG_$1" = 1]) + +# DX_CHECK_DEPEND(REQUIRED_FEATURE, REQUIRED_STATE) +# ------------------------------------------------- +# Verify that a required features has the right state before trying to turn on +# the DX_CURRENT_FEATURE. +AC_DEFUN([DX_CHECK_DEPEND], [ +test "$DX_FLAG_$1" = "$2" \ +|| AC_MSG_ERROR([doxygen-DX_CURRENT_FEATURE ifelse([$2], 1, + requires, contradicts) doxygen-$1]) +]) + +# DX_CLEAR_DEPEND(FEATURE, REQUIRED_FEATURE, REQUIRED_STATE) +# ---------------------------------------------------------- +# Turn off the DX_CURRENT_FEATURE if the required feature is off. +AC_DEFUN([DX_CLEAR_DEPEND], [ +test "$DX_FLAG_$1" = "$2" || AC_SUBST(DX_FLAG_[]DX_CURRENT_FEATURE, 0) +]) + +# DX_FEATURE_ARG(FEATURE, DESCRIPTION, +# CHECK_DEPEND, CLEAR_DEPEND, +# REQUIRE, DO-IF-ON, DO-IF-OFF) +# -------------------------------------------- +# Parse the command-line option controlling a feature. CHECK_DEPEND is called +# if the user explicitly turns the feature on (and invokes DX_CHECK_DEPEND), +# otherwise CLEAR_DEPEND is called to turn off the default state if a required +# feature is disabled (using DX_CLEAR_DEPEND). REQUIRE performs additional +# requirement tests (DX_REQUIRE_PROG). Finally, an automake flag is set and +# DO-IF-ON or DO-IF-OFF are called according to the final state of the feature. +AC_DEFUN([DX_ARG_ABLE], [ + AC_DEFUN([DX_CURRENT_FEATURE], [$1]) + AC_DEFUN([DX_CURRENT_DESCRIPTION], [$2]) + AC_ARG_ENABLE(doxygen-$1, + [AS_HELP_STRING(DX_IF_FEATURE([$1], [--disable-doxygen-$1], + [--enable-doxygen-$1]), + DX_IF_FEATURE([$1], [don't $2], [$2]))], + [ +case "$enableval" in +#( +y|Y|yes|Yes|YES) + AC_SUBST([DX_FLAG_$1], 1) + $3 +;; #( +n|N|no|No|NO) + AC_SUBST([DX_FLAG_$1], 0) +;; #( +*) + AC_MSG_ERROR([invalid value '$enableval' given to doxygen-$1]) +;; +esac +], [ +AC_SUBST([DX_FLAG_$1], [DX_IF_FEATURE([$1], 1, 0)]) +$4 +]) +if DX_TEST_FEATURE([$1]); then + $5 + : +fi +if DX_TEST_FEATURE([$1]); then + $6 + : +else + $7 + : +fi +]) + +## -------------- ## +## Public macros. ## +## -------------- ## + +# DX_XXX_FEATURE(DEFAULT_STATE) +# ----------------------------- +AC_DEFUN([DX_DOXYGEN_FEATURE], [AC_DEFUN([DX_FEATURE_doc], [$1])]) +AC_DEFUN([DX_DOT_FEATURE], [AC_DEFUN([DX_FEATURE_dot], [$1])]) +AC_DEFUN([DX_MAN_FEATURE], [AC_DEFUN([DX_FEATURE_man], [$1])]) +AC_DEFUN([DX_HTML_FEATURE], [AC_DEFUN([DX_FEATURE_html], [$1])]) +AC_DEFUN([DX_CHM_FEATURE], [AC_DEFUN([DX_FEATURE_chm], [$1])]) +AC_DEFUN([DX_CHI_FEATURE], [AC_DEFUN([DX_FEATURE_chi], [$1])]) +AC_DEFUN([DX_RTF_FEATURE], [AC_DEFUN([DX_FEATURE_rtf], [$1])]) +AC_DEFUN([DX_XML_FEATURE], [AC_DEFUN([DX_FEATURE_xml], [$1])]) +AC_DEFUN([DX_XML_FEATURE], [AC_DEFUN([DX_FEATURE_xml], [$1])]) +AC_DEFUN([DX_PDF_FEATURE], [AC_DEFUN([DX_FEATURE_pdf], [$1])]) +AC_DEFUN([DX_PS_FEATURE], [AC_DEFUN([DX_FEATURE_ps], [$1])]) + +# DX_INIT_DOXYGEN(PROJECT, [CONFIG-FILE], [OUTPUT-DOC-DIR], ...) +# -------------------------------------------------------------- +# PROJECT also serves as the base name for the documentation files. +# The default CONFIG-FILE is "$(srcdir)/Doxyfile" and OUTPUT-DOC-DIR is +# "doxygen-doc". +# More arguments are interpreted as interleaved CONFIG-FILE and +# OUTPUT-DOC-DIR values. +AC_DEFUN([DX_INIT_DOXYGEN], [ + +# Files: +AC_SUBST([DX_PROJECT], [$1]) +AC_SUBST([DX_CONFIG], ['ifelse([$2], [], [$(srcdir)/Doxyfile], [$2])']) +AC_SUBST([DX_DOCDIR], ['ifelse([$3], [], [doxygen-doc], [$3])']) +m4_if(m4_eval(3 < m4_count($@)), 1, [m4_for([DX_i], 4, m4_count($@), 2, + [AC_SUBST([DX_CONFIG]m4_eval(DX_i[/2]), + 'm4_default_nblank_quoted(m4_argn(DX_i, $@), + [$(srcdir)/Doxyfile])')])])dnl +m4_if(m4_eval(3 < m4_count($@)), 1, [m4_for([DX_i], 5, m4_count($@,), 2, + [AC_SUBST([DX_DOCDIR]m4_eval([(]DX_i[-1)/2]), + 'm4_default_nblank_quoted(m4_argn(DX_i, $@), + [doxygen-doc])')])])dnl +m4_define([DX_loop], m4_dquote(m4_if(m4_eval(3 < m4_count($@)), 1, + [m4_for([DX_i], 4, m4_count($@), 2, [, m4_eval(DX_i[/2])])], + [])))dnl + +# Environment variables used inside doxygen.cfg: +DX_ENV_APPEND(SRCDIR, $srcdir) +DX_ENV_APPEND(PROJECT, $DX_PROJECT) +DX_ENV_APPEND(VERSION, $PACKAGE_VERSION) + +# Doxygen itself: +DX_ARG_ABLE(doc, [generate any doxygen documentation], + [], + [], + [DX_REQUIRE_PROG([DX_DOXYGEN], doxygen) + DX_REQUIRE_PROG([DX_PERL], perl)], + [DX_ENV_APPEND(PERL_PATH, $DX_PERL)]) + +# Dot for graphics: +DX_ARG_ABLE(dot, [generate graphics for doxygen documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_DOT], dot)], + [DX_ENV_APPEND(HAVE_DOT, YES) + DX_ENV_APPEND(DOT_PATH, [`DX_DIRNAME_EXPR($DX_DOT)`])], + [DX_ENV_APPEND(HAVE_DOT, NO)]) + +# Man pages generation: +DX_ARG_ABLE(man, [generate doxygen manual pages], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [], + [DX_ENV_APPEND(GENERATE_MAN, YES)], + [DX_ENV_APPEND(GENERATE_MAN, NO)]) + +# RTF file generation: +DX_ARG_ABLE(rtf, [generate doxygen RTF documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [], + [DX_ENV_APPEND(GENERATE_RTF, YES)], + [DX_ENV_APPEND(GENERATE_RTF, NO)]) + +# XML file generation: +DX_ARG_ABLE(xml, [generate doxygen XML documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [], + [DX_ENV_APPEND(GENERATE_XML, YES)], + [DX_ENV_APPEND(GENERATE_XML, NO)]) + +# (Compressed) HTML help generation: +DX_ARG_ABLE(chm, [generate doxygen compressed HTML help documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_HHC], hhc)], + [DX_ENV_APPEND(HHC_PATH, $DX_HHC) + DX_ENV_APPEND(GENERATE_HTML, YES) + DX_ENV_APPEND(GENERATE_HTMLHELP, YES)], + [DX_ENV_APPEND(GENERATE_HTMLHELP, NO)]) + +# Separate CHI file generation. +DX_ARG_ABLE(chi, [generate doxygen separate compressed HTML help index file], + [DX_CHECK_DEPEND(chm, 1)], + [DX_CLEAR_DEPEND(chm, 1)], + [], + [DX_ENV_APPEND(GENERATE_CHI, YES)], + [DX_ENV_APPEND(GENERATE_CHI, NO)]) + +# Plain HTML pages generation: +DX_ARG_ABLE(html, [generate doxygen plain HTML documentation], + [DX_CHECK_DEPEND(doc, 1) DX_CHECK_DEPEND(chm, 0)], + [DX_CLEAR_DEPEND(doc, 1) DX_CLEAR_DEPEND(chm, 0)], + [], + [DX_ENV_APPEND(GENERATE_HTML, YES)], + [DX_TEST_FEATURE(chm) || DX_ENV_APPEND(GENERATE_HTML, NO)]) + +# PostScript file generation: +DX_ARG_ABLE(ps, [generate doxygen PostScript documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_LATEX], latex) + DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex) + DX_REQUIRE_PROG([DX_DVIPS], dvips) + DX_REQUIRE_PROG([DX_EGREP], egrep)]) + +# PDF file generation: +DX_ARG_ABLE(pdf, [generate doxygen PDF documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_PDFLATEX], pdflatex) + DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex) + DX_REQUIRE_PROG([DX_EGREP], egrep)]) + +# LaTeX generation for PS and/or PDF: +if DX_TEST_FEATURE(ps) || DX_TEST_FEATURE(pdf); then + DX_ENV_APPEND(GENERATE_LATEX, YES) +else + DX_ENV_APPEND(GENERATE_LATEX, NO) +fi + +# Paper size for PS and/or PDF: +AC_ARG_VAR(DOXYGEN_PAPER_SIZE, + [a4wide (default), a4, letter, legal or executive]) +case "$DOXYGEN_PAPER_SIZE" in +#( +"") + AC_SUBST(DOXYGEN_PAPER_SIZE, "") +;; #( +a4wide|a4|letter|legal|executive) + DX_ENV_APPEND(PAPER_SIZE, $DOXYGEN_PAPER_SIZE) +;; #( +*) + AC_MSG_ERROR([unknown DOXYGEN_PAPER_SIZE='$DOXYGEN_PAPER_SIZE']) +;; +esac + +# Rules: +AS_IF([[test $DX_FLAG_html -eq 1]], +[[DX_SNIPPET_html="## ------------------------------- ## +## Rules specific for HTML output. ## +## ------------------------------- ## + +DX_CLEAN_HTML = \$(DX_DOCDIR)/html]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/html]])[ + +"]], +[[DX_SNIPPET_html=""]]) +AS_IF([[test $DX_FLAG_chi -eq 1]], +[[DX_SNIPPET_chi=" +DX_CLEAN_CHI = \$(DX_DOCDIR)/\$(PACKAGE).chi]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).chi]])["]], +[[DX_SNIPPET_chi=""]]) +AS_IF([[test $DX_FLAG_chm -eq 1]], +[[DX_SNIPPET_chm="## ------------------------------ ## +## Rules specific for CHM output. ## +## ------------------------------ ## + +DX_CLEAN_CHM = \$(DX_DOCDIR)/chm]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/chm]])[\ +${DX_SNIPPET_chi} + +"]], +[[DX_SNIPPET_chm=""]]) +AS_IF([[test $DX_FLAG_man -eq 1]], +[[DX_SNIPPET_man="## ------------------------------ ## +## Rules specific for MAN output. ## +## ------------------------------ ## + +DX_CLEAN_MAN = \$(DX_DOCDIR)/man]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/man]])[ + +"]], +[[DX_SNIPPET_man=""]]) +AS_IF([[test $DX_FLAG_rtf -eq 1]], +[[DX_SNIPPET_rtf="## ------------------------------ ## +## Rules specific for RTF output. ## +## ------------------------------ ## + +DX_CLEAN_RTF = \$(DX_DOCDIR)/rtf]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/rtf]])[ + +"]], +[[DX_SNIPPET_rtf=""]]) +AS_IF([[test $DX_FLAG_xml -eq 1]], +[[DX_SNIPPET_xml="## ------------------------------ ## +## Rules specific for XML output. ## +## ------------------------------ ## + +DX_CLEAN_XML = \$(DX_DOCDIR)/xml]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/xml]])[ + +"]], +[[DX_SNIPPET_xml=""]]) +AS_IF([[test $DX_FLAG_ps -eq 1]], +[[DX_SNIPPET_ps="## ----------------------------- ## +## Rules specific for PS output. ## +## ----------------------------- ## + +DX_CLEAN_PS = \$(DX_DOCDIR)/\$(PACKAGE).ps]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).ps]])[ + +DX_PS_GOAL = doxygen-ps + +doxygen-ps: \$(DX_CLEAN_PS) + +]m4_foreach([DX_i], [DX_loop], +[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).ps: \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag + \$(DX_V_LATEX)cd \$(DX_DOCDIR]DX_i[)/latex; \\ + rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \\ + \$(DX_LATEX) refman.tex; \\ + \$(DX_MAKEINDEX) refman.idx; \\ + \$(DX_LATEX) refman.tex; \\ + countdown=5; \\ + while \$(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \\ + refman.log > /dev/null 2>&1 \\ + && test \$\$countdown -gt 0; do \\ + \$(DX_LATEX) refman.tex; \\ + countdown=\`expr \$\$countdown - 1\`; \\ + done; \\ + \$(DX_DVIPS) -o ../\$(PACKAGE).ps refman.dvi + +]])["]], +[[DX_SNIPPET_ps=""]]) +AS_IF([[test $DX_FLAG_pdf -eq 1]], +[[DX_SNIPPET_pdf="## ------------------------------ ## +## Rules specific for PDF output. ## +## ------------------------------ ## + +DX_CLEAN_PDF = \$(DX_DOCDIR)/\$(PACKAGE).pdf]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).pdf]])[ + +DX_PDF_GOAL = doxygen-pdf + +doxygen-pdf: \$(DX_CLEAN_PDF) + +]m4_foreach([DX_i], [DX_loop], +[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).pdf: \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag + \$(DX_V_LATEX)cd \$(DX_DOCDIR]DX_i[)/latex; \\ + rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \\ + \$(DX_PDFLATEX) refman.tex; \\ + \$(DX_MAKEINDEX) refman.idx; \\ + \$(DX_PDFLATEX) refman.tex; \\ + countdown=5; \\ + while \$(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \\ + refman.log > /dev/null 2>&1 \\ + && test \$\$countdown -gt 0; do \\ + \$(DX_PDFLATEX) refman.tex; \\ + countdown=\`expr \$\$countdown - 1\`; \\ + done; \\ + mv refman.pdf ../\$(PACKAGE).pdf + +]])["]], +[[DX_SNIPPET_pdf=""]]) +AS_IF([[test $DX_FLAG_ps -eq 1 -o $DX_FLAG_pdf -eq 1]], +[[DX_SNIPPET_latex="## ------------------------------------------------- ## +## Rules specific for LaTeX (shared for PS and PDF). ## +## ------------------------------------------------- ## + +DX_V_LATEX = \$(_DX_v_LATEX_\$(V)) +_DX_v_LATEX_ = \$(_DX_v_LATEX_\$(AM_DEFAULT_VERBOSITY)) +_DX_v_LATEX_0 = @echo \" LATEX \" \$][@; + +DX_CLEAN_LATEX = \$(DX_DOCDIR)/latex]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/latex]])[ + +"]], +[[DX_SNIPPET_latex=""]]) + +AS_IF([[test $DX_FLAG_doc -eq 1]], +[[DX_SNIPPET_doc="## --------------------------------- ## +## Format-independent Doxygen rules. ## +## --------------------------------- ## + +${DX_SNIPPET_html}\ +${DX_SNIPPET_chm}\ +${DX_SNIPPET_man}\ +${DX_SNIPPET_rtf}\ +${DX_SNIPPET_xml}\ +${DX_SNIPPET_ps}\ +${DX_SNIPPET_pdf}\ +${DX_SNIPPET_latex}\ +DX_V_DXGEN = \$(_DX_v_DXGEN_\$(V)) +_DX_v_DXGEN_ = \$(_DX_v_DXGEN_\$(AM_DEFAULT_VERBOSITY)) +_DX_v_DXGEN_0 = @echo \" DXGEN \" \$<; + +.PHONY: doxygen-run doxygen-doc \$(DX_PS_GOAL) \$(DX_PDF_GOAL) + +.INTERMEDIATE: doxygen-run \$(DX_PS_GOAL) \$(DX_PDF_GOAL) + +doxygen-run:]m4_foreach([DX_i], [DX_loop], + [[ \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag]])[ + +doxygen-doc: doxygen-run \$(DX_PS_GOAL) \$(DX_PDF_GOAL) + +]m4_foreach([DX_i], [DX_loop], +[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag: \$(DX_CONFIG]DX_i[) \$(pkginclude_HEADERS) + \$(A""M_V_at)rm -rf \$(DX_DOCDIR]DX_i[) + \$(DX_V_DXGEN)\$(DX_ENV) DOCDIR=\$(DX_DOCDIR]DX_i[) \$(DX_DOXYGEN) \$(DX_CONFIG]DX_i[) + \$(A""M_V_at)echo Timestamp >\$][@ + +]])dnl +[DX_CLEANFILES = \\] +m4_foreach([DX_i], [DX_loop], +[[ \$(DX_DOCDIR]DX_i[)/doxygen_sqlite3.db \\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag \\ +]])dnl +[ -r \\ + \$(DX_CLEAN_HTML) \\ + \$(DX_CLEAN_CHM) \\ + \$(DX_CLEAN_CHI) \\ + \$(DX_CLEAN_MAN) \\ + \$(DX_CLEAN_RTF) \\ + \$(DX_CLEAN_XML) \\ + \$(DX_CLEAN_PS) \\ + \$(DX_CLEAN_PDF) \\ + \$(DX_CLEAN_LATEX)"]], +[[DX_SNIPPET_doc=""]]) +AC_SUBST([DX_RULES], +["${DX_SNIPPET_doc}"])dnl +AM_SUBST_NOTMAKE([DX_RULES]) + +#For debugging: +#echo DX_FLAG_doc=$DX_FLAG_doc +#echo DX_FLAG_dot=$DX_FLAG_dot +#echo DX_FLAG_man=$DX_FLAG_man +#echo DX_FLAG_html=$DX_FLAG_html +#echo DX_FLAG_chm=$DX_FLAG_chm +#echo DX_FLAG_chi=$DX_FLAG_chi +#echo DX_FLAG_rtf=$DX_FLAG_rtf +#echo DX_FLAG_xml=$DX_FLAG_xml +#echo DX_FLAG_pdf=$DX_FLAG_pdf +#echo DX_FLAG_ps=$DX_FLAG_ps +#echo DX_ENV=$DX_ENV +]) -- 2.28.0

4 10

[PATCH 1/4] combase: Move currently unimplemented COM API functions.
by Nikolay Sivov 02 Sep '20

02 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/combase.c | 89 +++++++++++++++++++++++++++++++ dlls/combase/combase.spec | 20 +++---- dlls/combase/rpc.c | 10 ++++ dlls/ole32/compobj.c | 108 -------------------------------------- dlls/ole32/ole2.c | 11 ---- dlls/ole32/ole32.spec | 20 +++---- 6 files changed, 119 insertions(+), 139 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index d959034b57f..99352712f78 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -2595,6 +2595,16 @@ static void unlock_init_spies(struct tlsdata *tlsdata) } } +/****************************************************************************** + * CoInitializeWOW (combase.@) + */ +HRESULT WINAPI CoInitializeWOW(DWORD arg1, DWORD arg2) +{ + FIXME("%#x, %#x\n", arg1, arg2); + + return S_OK; +} + /****************************************************************************** * CoInitializeEx (combase.@) */ @@ -3062,6 +3072,85 @@ HRESULT WINAPI CoRegisterChannelHook(REFGUID guidExtension, IChannelHook *channe return rpc_register_channel_hook(guidExtension, channel_hook); } +/*********************************************************************** + * CoDisableCallCancellation (combase.@) + */ +HRESULT WINAPI CoDisableCallCancellation(void *reserved) +{ + FIXME("%p stub\n", reserved); + + return E_NOTIMPL; +} + +/*********************************************************************** + * CoEnableCallCancellation (combase.@) + */ +HRESULT WINAPI CoEnableCallCancellation(void *reserved) +{ + FIXME("%p stub\n", reserved); + + return E_NOTIMPL; +} + +/*********************************************************************** + * CoGetCallerTID (combase.@) + */ +HRESULT WINAPI CoGetCallerTID(DWORD *tid) +{ + FIXME("stub!\n"); + return E_NOTIMPL; +} + +/*********************************************************************** + * CoIsHandlerConnected (combase.@) + */ +BOOL WINAPI CoIsHandlerConnected(IUnknown *object) +{ + FIXME("%p\n", object); + + return TRUE; +} + +/*********************************************************************** + * CoSuspendClassObjects (combase.@) + */ +HRESULT WINAPI CoSuspendClassObjects(void) +{ + FIXME("\n"); + + return S_OK; +} + +/*********************************************************************** + * CoResumeClassObjects (combase.@) + */ +HRESULT WINAPI CoResumeClassObjects(void) +{ + FIXME("stub\n"); + + return S_OK; +} + +/*********************************************************************** + * CoRegisterSurrogate (combase.@) + */ +HRESULT WINAPI CoRegisterSurrogate(ISurrogate *surrogate) +{ + FIXME("%p stub\n", surrogate); + + return E_NOTIMPL; +} + +/*********************************************************************** + * CoRegisterSurrogateEx (combase.@) + */ +HRESULT WINAPI CoRegisterSurrogateEx(REFGUID guid, void *reserved) +{ + FIXME("%s, %p stub\n", debugstr_guid(guid), reserved); + + return E_NOTIMPL; +} + /*********************************************************************** * DllMain (combase.@) */ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 3a09ce064b0..50b58419bc5 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -87,10 +87,10 @@ @ stub CoDeactivateObject @ stub CoDecodeProxy @ stdcall CoDecrementMTAUsage(ptr) -@ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation +@ stdcall CoDisableCallCancellation(ptr) @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) -@ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation +@ stdcall CoEnableCallCancellation(ptr) @ stdcall CoFileTimeNow(ptr) @ stdcall CoFreeUnusedLibraries() @ stdcall CoFreeUnusedLibrariesEx(long long) @@ -99,7 +99,7 @@ @ stdcall CoGetApartmentType(ptr ptr) @ stdcall CoGetCallContext(ptr ptr) @ stdcall CoGetCallState(long ptr) -@ stdcall CoGetCallerTID(ptr) ole32.CoGetCallerTID +@ stdcall CoGetCallerTID(ptr) @ stub CoGetCancelObject @ stdcall CoGetClassObject(ptr long ptr ptr ptr) @ stub CoGetClassVersion @@ -125,9 +125,9 @@ @ stdcall CoIncrementMTAUsage(ptr) @ stdcall CoInitializeEx(ptr long) @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) -@ stdcall CoInitializeWOW(long long) ole32.CoInitializeWOW +@ stdcall CoInitializeWOW(long long) @ stub CoInvalidateRemoteMachineBindings -@ stdcall CoIsHandlerConnected(ptr) ole32.CoIsHandlerConnected +@ stdcall CoIsHandlerConnected(ptr) @ stdcall CoLockObjectExternal(ptr long long) @ stdcall CoMarshalHresult(ptr long) @ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) @@ -145,11 +145,11 @@ @ stdcall CoRegisterMallocSpy(ptr) @ stdcall CoRegisterMessageFilter(ptr ptr) @ stdcall CoRegisterPSClsid(ptr ptr) -@ stdcall CoRegisterSurrogate(ptr) ole32.CoRegisterSurrogate -@ stdcall CoRegisterSurrogateEx(ptr ptr) ole32.CoRegisterSurrogateEx +@ stdcall CoRegisterSurrogate(ptr) +@ stdcall CoRegisterSurrogateEx(ptr ptr) @ stdcall CoReleaseMarshalData(ptr) @ stdcall CoReleaseServerProcess() -@ stdcall CoResumeClassObjects() ole32.CoResumeClassObjects +@ stdcall CoResumeClassObjects() @ stub CoRetireServer @ stdcall CoRevertToSelf() @ stdcall CoRevokeClassObject(long) @@ -158,7 +158,7 @@ @ stub CoSetCancelObject @ stdcall CoSetErrorInfo(long ptr) SetErrorInfo @ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) -@ stdcall CoSuspendClassObjects() ole32.CoSuspendClassObjects +@ stdcall CoSuspendClassObjects() @ stdcall CoSwitchCallContext(ptr ptr) @ stdcall CoTaskMemAlloc(long) @ stdcall CoTaskMemFree(ptr) @@ -176,7 +176,7 @@ @ stdcall CreateErrorInfo(ptr) @ stdcall CreateStreamOnHGlobal(ptr long ptr) ole32.CreateStreamOnHGlobal @ stub DcomChannelSetHResult -@ stdcall DllDebugObjectRPCHook(long ptr) ole32.DllDebugObjectRPCHook +@ stdcall DllDebugObjectRPCHook(long ptr) @ stdcall DllGetActivationFactory(ptr ptr) @ stdcall -private DllGetClassObject(ptr ptr ptr) ole32.DllGetClassObject @ stub EnableHookObject diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index ebfc19329d8..513c1e6c13a 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -2244,3 +2244,13 @@ void rpc_start_remoting(struct apartment *apt) } start_apartment_remote_unknown(apt); } + +/****************************************************************************** + * DllDebugObjectRPCHook (combase.@) + */ +BOOL WINAPI DllDebugObjectRPCHook(BOOL trace, /* ORPC_INIT_ARGS * */ void *args) +{ + FIXME("%d, %p: stub\n", trace, args); + + return TRUE; +} diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a9a9af53108..f4fe82de436 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -561,21 +561,6 @@ HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY return S_OK; } -/*********************************************************************** - * CoResumeClassObjects (OLE32.@) - * - * Resumes all class objects registered with REGCLS_SUSPENDED. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - */ -HRESULT WINAPI CoResumeClassObjects(void) -{ - FIXME("stub\n"); - return S_OK; -} - /*********************************************************************** * CoLoadLibrary (OLE32.@) * @@ -635,24 +620,6 @@ void WINAPI CoFreeAllLibraries(void) /* NOP */ } -/*********************************************************************** - * CoInitializeWOW (OLE32.@) - * - * WOW equivalent of CoInitialize? - * - * PARAMS - * x [I] Unknown. - * y [I] Unknown. - * - * RETURNS - * Unknown. - */ -HRESULT WINAPI CoInitializeWOW(DWORD x,DWORD y) -{ - FIXME("(0x%08x,0x%08x),stub!\n",x,y); - return 0; -} - /*********************************************************************** * CoGetState [OLE32.@] * @@ -834,41 +801,6 @@ BOOL WINAPI IsEqualGUID( return !memcmp(rguid1,rguid2,sizeof(GUID)); } -/*********************************************************************** - * CoSuspendClassObjects [OLE32.@] - * - * Suspends all registered class objects to prevent further requests coming in - * for those objects. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - */ -HRESULT WINAPI CoSuspendClassObjects(void) -{ - FIXME("\n"); - return S_OK; -} - -/*********************************************************************** - * CoIsHandlerConnected [OLE32.@] - * - * Determines whether a proxy is connected to a remote stub. - * - * PARAMS - * pUnk [I] Pointer to object that may or may not be connected. - * - * RETURNS - * TRUE if pUnk is not a proxy or if pUnk is connected to a remote stub, or - * FALSE otherwise. - */ -BOOL WINAPI CoIsHandlerConnected(IUnknown *pUnk) -{ - FIXME("%p\n", pUnk); - - return TRUE; -} - /*********************************************************************** * CoAllowSetForegroundWindow [OLE32.@] * @@ -1005,46 +937,6 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } -/*********************************************************************** - * CoDisableCallCancellation [OLE32.@] - */ -HRESULT WINAPI CoDisableCallCancellation(void *reserved) -{ - FIXME("(%p): stub\n", reserved); - - return E_NOTIMPL; -} - -/*********************************************************************** - * CoEnableCallCancellation [OLE32.@] - */ -HRESULT WINAPI CoEnableCallCancellation(void *reserved) -{ - FIXME("(%p): stub\n", reserved); - - return E_NOTIMPL; -} - -/*********************************************************************** - * CoRegisterSurrogate [OLE32.@] - */ -HRESULT WINAPI CoRegisterSurrogate(ISurrogate *surrogate) -{ - FIXME("(%p): stub\n", surrogate); - - return E_NOTIMPL; -} - -/*********************************************************************** - * CoRegisterSurrogateEx [OLE32.@] - */ -HRESULT WINAPI CoRegisterSurrogateEx(REFGUID guid, void *reserved) -{ - FIXME("(%s %p): stub\n", debugstr_guid(guid), reserved); - - return E_NOTIMPL; -} - typedef struct { IGlobalOptions IGlobalOptions_iface; LONG ref; diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 4f4a1378b1e..15c4f8234f3 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2729,14 +2729,3 @@ void WINAPI PropSysFreeString(LPOLESTR str) { SysFreeString(str); } - -/****************************************************************************** - * DllDebugObjectRPCHook (OLE32.@) - * turns on and off internal debugging, pointer is only used on macintosh - */ - -BOOL WINAPI DllDebugObjectRPCHook(BOOL b, void *dummy) -{ - FIXME("stub\n"); - return TRUE; -} diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index cf48d043b75..44c03b6628c 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -15,10 +15,10 @@ @ stdcall CoCreateInstance(ptr ptr long ptr ptr) combase.CoCreateInstance @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) combase.CoCreateInstanceEx @ stdcall CoDecrementMTAUsage(ptr) combase.CoDecrementMTAUsage -@ stdcall CoDisableCallCancellation(ptr) +@ stdcall CoDisableCallCancellation(ptr) combase.CoDisableCallCancellation @ stdcall CoDisconnectObject(ptr long) combase.CoDisconnectObject @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime -@ stdcall CoEnableCallCancellation(ptr) +@ stdcall CoEnableCallCancellation(ptr) combase.CoEnableCallCancellation @ stdcall CoFileTimeNow(ptr) combase.CoFileTimeNow @ stdcall CoFileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime @ stdcall CoFreeAllLibraries() @@ -29,7 +29,7 @@ @ stdcall CoGetApartmentType(ptr ptr) combase.CoGetApartmentType @ stdcall CoGetCallContext(ptr ptr) combase.CoGetCallContext @ stdcall CoGetCallState(long ptr) combase.CoGetCallState -@ stdcall CoGetCallerTID(ptr) +@ stdcall CoGetCallerTID(ptr) combase.CoGetCallerTID @ stdcall CoGetClassObject(ptr long ptr ptr ptr) combase.CoGetClassObject @ stdcall CoGetContextToken(ptr) combase.CoGetContextToken @ stdcall CoGetCurrentLogicalThreadId(ptr) combase.CoGetCurrentLogicalThreadId @@ -52,8 +52,8 @@ @ stdcall CoInitialize(ptr) @ stdcall CoInitializeEx(ptr long) combase.CoInitializeEx @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) combase.CoInitializeSecurity -@ stdcall CoInitializeWOW(long long) -@ stdcall CoIsHandlerConnected(ptr) +@ stdcall CoInitializeWOW(long long) combase.CoInitializeWOW +@ stdcall CoIsHandlerConnected(ptr) combase.CoIsHandlerConnected @ stdcall CoIsOle1Class (ptr) @ stdcall CoLoadLibrary(wstr long) @ stdcall CoLockObjectExternal(ptr long long) combase.CoLockObjectExternal @@ -70,18 +70,18 @@ @ stdcall CoRegisterMallocSpy(ptr) combase.CoRegisterMallocSpy @ stdcall CoRegisterMessageFilter(ptr ptr) combase.CoRegisterMessageFilter @ stdcall CoRegisterPSClsid(ptr ptr) combase.CoRegisterPSClsid -@ stdcall CoRegisterSurrogate(ptr) -@ stdcall CoRegisterSurrogateEx(ptr ptr) +@ stdcall CoRegisterSurrogate(ptr) combase.CoRegisterSurrogate +@ stdcall CoRegisterSurrogateEx(ptr ptr) combase.CoRegisterSurrogateEx @ stdcall CoReleaseMarshalData(ptr) combase.CoReleaseMarshalData @ stdcall CoReleaseServerProcess() combase.CoReleaseServerProcess -@ stdcall CoResumeClassObjects() +@ stdcall CoResumeClassObjects() combase.CoResumeClassObjects @ stdcall CoRevertToSelf() combase.CoRevertToSelf @ stdcall CoRevokeClassObject(long) combase.CoRevokeClassObject @ stdcall CoRevokeInitializeSpy(int64) combase.CoRevokeInitializeSpy @ stdcall CoRevokeMallocSpy() combase.CoRevokeMallocSpy @ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) combase.CoSetProxyBlanket @ stdcall CoSetState(ptr) -@ stdcall CoSuspendClassObjects() +@ stdcall CoSuspendClassObjects() combase.CoSuspendClassObjects @ stdcall CoSwitchCallContext(ptr ptr) combase.CoSwitchCallContext @ stdcall CoTaskMemAlloc(long) combase.CoTaskMemAlloc @ stdcall CoTaskMemFree(ptr) combase.CoTaskMemFree @@ -107,7 +107,7 @@ @ stdcall CreatePointerMoniker(ptr ptr) @ stdcall CreateStreamOnHGlobal(ptr long ptr) @ stdcall DestroyRunningObjectTable() -@ stdcall DllDebugObjectRPCHook(long ptr) +@ stdcall DllDebugObjectRPCHook(long ptr) combase.DllDebugObjectRPCHook @ stdcall -private DllGetClassObject (ptr ptr ptr) @ stub DllGetClassObjectWOW @ stdcall -private DllRegisterServer() -- 2.28.0

3 9

[PATCH 1/2] ntdll: Implement saving AVX registers in NtGetContextThread().
by Paul Gofman 02 Sep '20

02 Sep '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 58 ++++++++++++++++++++++++++++++-- dlls/ntdll/unix/signal_x86_64.c | 59 +++++++++++++++++++++++++++++++-- 2 files changed, 113 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 5d4d1469472..45482b819cc 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -683,6 +683,56 @@ static inline void save_fpux( CONTEXT *context ) } +/*********************************************************************** + * save_xstate + * + * Save the XState context + */ +static inline NTSTATUS save_xstate( CONTEXT *context ) +{ + CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); + DECLSPEC_ALIGN(64) struct + { + XSAVE_FORMAT xsave; + XSTATE xstate; + } + xsave_area; + XSTATE *xs; + + if (!(user_shared_data->XState.EnabledFeatures && (xs = xstate_from_context( context )))) + return STATUS_SUCCESS; + + if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) + || context_ex->XState.Length > sizeof(XSTATE)) + return STATUS_INVALID_PARAMETER; + + if (user_shared_data->XState.CompactionEnabled) + { + /* xsavec doesn't use anything from the save area. */ + __asm__ volatile( "xsavec %0" : "=m"(xsave_area) + : "a" ((unsigned int)(xs->CompactionMask & (1 << XSTATE_AVX))), "d" (0) ); + } + else + { + /* xsave preserves those bits in the mask which are not in EDX:EAX, so zero it. */ + xsave_area.xstate.Mask = xsave_area.xstate.CompactionMask = 0; + __asm__ volatile( "xsave %0" : "=m"(xsave_area) + : "a" ((unsigned int)(xs->Mask & (1 << XSTATE_AVX))), "d" (0) ); + } + + memcpy(xs, &xsave_area.xstate, offsetof(XSTATE, YmmContext)); + if (xs->Mask & (1 << XSTATE_AVX)) + { + if (context_ex->XState.Length < sizeof(XSTATE)) + return STATUS_BUFFER_OVERFLOW; + + memcpy(&xs->YmmContext, &xsave_area.xstate.YmmContext, sizeof(xs->YmmContext)); + } + + return STATUS_SUCCESS; +} + + /*********************************************************************** * restore_fpu * @@ -1189,11 +1239,15 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) */ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) { - NTSTATUS ret; + NTSTATUS ret, xsave_status; struct syscall_frame *frame = x86_thread_data()->syscall_frame; DWORD needed_flags = context->ContextFlags & ~CONTEXT_i386; BOOL self = (handle == GetCurrentThread()); + /* Save xstate before any calls which can potentially change volatile ymm registers. + * E. g., debug output will clobber ymm registers. */ + xsave_status = self ? save_xstate( context ) : STATUS_SUCCESS; /* FIXME: other thread. */ + /* debug registers require a server call */ if (needed_flags & CONTEXT_DEBUG_REGISTERS) self = FALSE; @@ -1265,7 +1319,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) TRACE( "%p: dr0=%08x dr1=%08x dr2=%08x dr3=%08x dr6=%08x dr7=%08x\n", handle, context->Dr0, context->Dr1, context->Dr2, context->Dr3, context->Dr6, context->Dr7 ); - return STATUS_SUCCESS; + return xsave_status; } diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index c77d65f8678..a0ad49815a4 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1481,6 +1481,56 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex } +/*********************************************************************** + * save_xstate + * + * Save the XState context + */ +static inline NTSTATUS save_xstate( CONTEXT *context ) +{ + CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); + DECLSPEC_ALIGN(64) struct + { + XSAVE_FORMAT xsave; + XSTATE xstate; + } + xsave_area; + XSTATE *xs; + + if (!(user_shared_data->XState.EnabledFeatures && (xs = xstate_from_context( context )))) + return STATUS_SUCCESS; + + if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) + || context_ex->XState.Length > sizeof(XSTATE)) + return STATUS_INVALID_PARAMETER; + + if (user_shared_data->XState.CompactionEnabled) + { + /* xsavec doesn't use anything from the save area. */ + __asm__ volatile( "xsavec %0" : "=m"(xsave_area) + : "a" ((unsigned int)(xs->CompactionMask & (1 << XSTATE_AVX))), "d" (0) ); + } + else + { + /* xsave preserves those bits in the mask which are not in EDX:EAX, so zero it. */ + xsave_area.xstate.Mask = xsave_area.xstate.CompactionMask = 0; + __asm__ volatile( "xsave %0" : "=m"(xsave_area) + : "a" ((unsigned int)(xs->Mask & (1 << XSTATE_AVX))), "d" (0) ); + } + + memcpy(xs, &xsave_area.xstate, offsetof(XSTATE, YmmContext)); + if (xs->Mask & (1 << XSTATE_AVX)) + { + if (context_ex->XState.Length < sizeof(XSTATE)) + return STATUS_BUFFER_OVERFLOW; + + memcpy(&xs->YmmContext, &xsave_area.xstate.YmmContext, sizeof(xs->YmmContext)); + } + + return STATUS_SUCCESS; +} + + /*********************************************************************** * restore_context * @@ -1780,13 +1830,17 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) */ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) { - NTSTATUS ret; + NTSTATUS ret, xsave_status; DWORD needed_flags; struct syscall_frame *frame = amd64_thread_data()->syscall_frame; BOOL self = (handle == GetCurrentThread()); if (!context) return STATUS_INVALID_PARAMETER; + /* Save xstate before any calls which can potentially change volatile ymm registers. + * E. g., debug output will clobber ymm registers. */ + xsave_status = self ? save_xstate( context ) : STATUS_SUCCESS; /* FIXME: other thread. */ + needed_flags = context->ContextFlags & ~CONTEXT_AMD64; /* debug registers require a server call */ @@ -1859,7 +1913,8 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) amd64_thread_data()->dr7 = context->Dr7; } } - return STATUS_SUCCESS; + + return xsave_status; } extern void CDECL raise_func_trampoline( void *dispatcher ); -- 2.26.2

1 1

[PATCH] kernelbase: Forward ConvertToAutoInheritPrivateObjectSecurity() to ntdll.
by Nikolay Sivov 02 Sep '20

02 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/security.c | 3 +-- include/winternl.h | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index d1736e61b80..72bb5892d3b 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -900,8 +900,7 @@ BOOL WINAPI ConvertToAutoInheritPrivateObjectSecurity( PSECURITY_DESCRIPTOR pare GUID *type, BOOL is_dir, PGENERIC_MAPPING mapping ) { - FIXME("%p %p %p %p %d %p - stub\n", parent, current, descr, type, is_dir, mapping ); - return FALSE; + return set_ntstatus( RtlConvertToAutoInheritSecurityObject( parent, current, descr, type, is_dir, mapping )); } /****************************************************************************** diff --git a/include/winternl.h b/include/winternl.h index 6c809193977..db79a050048 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3281,6 +3281,8 @@ NTSYSAPI LONG WINAPI RtlCompareUnicodeString(const UNICODE_STRING*,const UN NTSYSAPI LONG WINAPI RtlCompareUnicodeStrings(const WCHAR*,SIZE_T,const WCHAR*,SIZE_T,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlCompressBuffer(USHORT,PUCHAR,ULONG,PUCHAR,ULONG,ULONG,PULONG,PVOID); NTSYSAPI DWORD WINAPI RtlComputeCrc32(DWORD,const BYTE*,INT); +NTSYSAPI NTSTATUS WINAPI RtlConvertToAutoInheritSecurityObject(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR cdesc, + PSECURITY_DESCRIPTOR*, GUID*,BOOL,PGENERIC_MAPPING); NTSYSAPI NTSTATUS WINAPI RtlConvertSidToUnicodeString(PUNICODE_STRING,PSID,BOOLEAN); NTSYSAPI void WINAPI RtlCopyLuid(PLUID,const LUID*); NTSYSAPI void WINAPI RtlCopyLuidAndAttributesArray(ULONG,const LUID_AND_ATTRIBUTES*,PLUID_AND_ATTRIBUTES); -- 2.28.0

1 0

[PATCH v2 1/2] bcrypt: Return STATUS_INVALID_PARAMETER on ECC magic mismatch.
by Hans Leidekker 02 Sep '20

02 Sep '20

From: Rémi Bernon <rbernon(a)codeweavers.com> Flight Simulator XAL authentication hits this condition because of buggy bcrypt private key export (see next patch). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 4 ++-- dlls/bcrypt/tests/bcrypt.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b6bb73a715f..cd3b746e295 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1171,7 +1171,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_NOT_SUPPORTED; } - if (ecc_blob->dwMagic != magic) return STATUS_NOT_SUPPORTED; + if (ecc_blob->dwMagic != magic) return STATUS_INVALID_PARAMETER; if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 2) return STATUS_INVALID_PARAMETER; @@ -1211,7 +1211,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_NOT_SUPPORTED; } - if (ecc_blob->dwMagic != magic) return STATUS_NOT_SUPPORTED; + if (ecc_blob->dwMagic != magic) return STATUS_INVALID_PARAMETER; if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 3) return STATUS_INVALID_PARAMETER; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index e37a33e38a0..3e5d5cf17f8 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1730,6 +1730,12 @@ static void test_ECDSA(void) status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + ecckey->dwMagic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; + ecckey->cbKey = 32; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + ecckey->dwMagic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; ecckey->cbKey = 32; status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %08x\n", status); @@ -1749,6 +1755,12 @@ static void test_ECDSA(void) status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + ecckey->dwMagic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; + ecckey->cbKey = 32; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + ecckey->dwMagic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; ecckey->cbKey = 32; status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %08x\n", status); -- 2.20.1

2 1

[PATCH v2 2/2] bcrypt: Export ECDSA/ECDH blobs with the correct header magic.
by Hans Leidekker 02 Sep '20

02 Sep '20

From: Rémi Bernon <rbernon(a)codeweavers.com> This fixes Flight Simulator XAL authentication error message. v2: Apply the same fix to public keys. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 54 ++++++++++++++++++++++++++------------ dlls/bcrypt/tests/bcrypt.c | 8 ++++++ 2 files changed, 45 insertions(+), 17 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index a80bce47f95..7acf8198626 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -680,7 +680,8 @@ static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bit return STATUS_SUCCESS; } -static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, UCHAR **pubkey, ULONG *pubkey_len ) +static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_id alg_id, UCHAR **pubkey, + ULONG *pubkey_len ) { BCRYPT_ECCKEY_BLOB *ecc_blob; gnutls_ecc_curve_t curve; @@ -689,20 +690,29 @@ static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, UCHAR **p UCHAR *src, *dst; int ret; + switch (alg_id) + { + case ALG_ID_ECDH_P256: + magic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; + size = 32; + break; + case ALG_ID_ECDSA_P256: + magic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; + size = 32; + break; + default: + FIXME( "algorithm %u not supported\n", alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + if ((ret = pgnutls_privkey_export_ecc_raw( gnutls_key, &curve, &x, &y, NULL ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - switch (curve) + if (curve != GNUTLS_ECC_CURVE_SECP256R1) { - case GNUTLS_ECC_CURVE_SECP256R1: - magic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; - size = 32; - break; - - default: FIXME( "curve %u not supported\n", curve ); free( x.data ); free( y.data ); return STATUS_NOT_IMPLEMENTED; @@ -863,7 +873,7 @@ NTSTATUS key_asymmetric_generate( struct key *key ) break; case GNUTLS_PK_ECC: - status = export_gnutls_pubkey_ecc( handle, &key->u.a.pubkey, &key->u.a.pubkey_len ); + status = export_gnutls_pubkey_ecc( handle, key->alg_id, &key->u.a.pubkey, &key->u.a.pubkey_len ); break; case GNUTLS_PK_DSA: @@ -894,20 +904,30 @@ NTSTATUS key_export_ecc( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len UCHAR *src, *dst; int ret; + switch (key->alg_id) + { + case ALG_ID_ECDH_P256: + magic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; + size = 32; + break; + case ALG_ID_ECDSA_P256: + magic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; + size = 32; + break; + + default: + FIXME( "algorithm %u does not yet support exporting ecc blob\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + if ((ret = pgnutls_privkey_export_ecc_raw( key->u.a.handle, &curve, &x, &y, &d ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - switch (curve) + if (curve != GNUTLS_ECC_CURVE_SECP256R1) { - case GNUTLS_ECC_CURVE_SECP256R1: - magic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; - size = 32; - break; - - default: FIXME( "curve %u not supported\n", curve ); free( x.data ); free( y.data ); free( d.data ); return STATUS_NOT_IMPLEMENTED; @@ -982,7 +1002,7 @@ NTSTATUS key_import_ecc( struct key *key, UCHAR *buf, ULONG len ) return STATUS_INTERNAL_ERROR; } - if ((status = export_gnutls_pubkey_ecc( handle, &key->u.a.pubkey, &key->u.a.pubkey_len ))) + if ((status = export_gnutls_pubkey_ecc( handle, key->alg_id, &key->u.a.pubkey, &key->u.a.pubkey_len ))) { pgnutls_privkey_deinit( handle ); return status; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 3e5d5cf17f8..7fdc0ac7fb2 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1765,6 +1765,14 @@ static void test_ECDSA(void) status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %08x\n", status); + memset( buffer, 0, sizeof(buffer) ); + status = pBCryptExportKey(key, NULL, BCRYPT_ECCPRIVATE_BLOB, buffer, size, &size, 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + ecckey = (BCRYPT_ECCKEY_BLOB *)buffer; + ok(ecckey->dwMagic == BCRYPT_ECDSA_PRIVATE_P256_MAGIC, "got %08x\n", ecckey->dwMagic); + ok(ecckey->cbKey == 32, "got %u\n", ecckey->cbKey); + ok(size == sizeof(*ecckey) + ecckey->cbKey * 3, "got %u\n", size); + pBCryptDestroyKey(key); pBCryptCloseAlgorithmProvider(alg, 0); } -- 2.20.1

1 0

[PATCH] server: Avoid a potential NULL dereference in startup_info_dump().
by Zebediah Figura 01 Sep '20

01 Sep '20

From: Zebediah Figura <zfigura(a)codeweavers.com> info->data may be set to NULL by get_startup_info, without invalidating the object itself. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/process.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/server/process.c b/server/process.c index c1bdb591f60..fc3e8df2ef2 100644 --- a/server/process.c +++ b/server/process.c @@ -749,8 +749,13 @@ static void startup_info_dump( struct object *obj, int verbose ) struct startup_info *info = (struct startup_info *)obj; assert( obj->ops == &startup_info_ops ); - fprintf( stderr, "Startup info in=%04x out=%04x err=%04x\n", - info->data->hstdin, info->data->hstdout, info->data->hstderr ); + fputs( "Startup info", stderr ); + if (info->data) + { + fprintf( stderr, " in=%04x out=%04x err=%04x", + info->data->hstdin, info->data->hstdout, info->data->hstderr ); + } + fputc( '\n', stderr ); } static int startup_info_signaled( struct object *obj, struct wait_queue_entry *entry ) -- 2.28.0

1 0

[PATCH 1/2] bcrypt: Return STATUS_INVALID_PARAMETER on ECC magic mismatch.
by Rémi Bernon 01 Sep '20

01 Sep '20

Flight Simulator XAL authentication hits this condition because of buggy bcrypt private key export (see next patch). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 4 ++-- dlls/bcrypt/tests/bcrypt.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b6bb73a715f..cd3b746e295 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1171,7 +1171,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_NOT_SUPPORTED; } - if (ecc_blob->dwMagic != magic) return STATUS_NOT_SUPPORTED; + if (ecc_blob->dwMagic != magic) return STATUS_INVALID_PARAMETER; if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 2) return STATUS_INVALID_PARAMETER; @@ -1211,7 +1211,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_NOT_SUPPORTED; } - if (ecc_blob->dwMagic != magic) return STATUS_NOT_SUPPORTED; + if (ecc_blob->dwMagic != magic) return STATUS_INVALID_PARAMETER; if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 3) return STATUS_INVALID_PARAMETER; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index e37a33e38a0..3e5d5cf17f8 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1730,6 +1730,12 @@ static void test_ECDSA(void) status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + ecckey->dwMagic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; + ecckey->cbKey = 32; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + ecckey->dwMagic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; ecckey->cbKey = 32; status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %08x\n", status); @@ -1749,6 +1755,12 @@ static void test_ECDSA(void) status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + ecckey->dwMagic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; + ecckey->cbKey = 32; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + ecckey->dwMagic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; ecckey->cbKey = 32; status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %08x\n", status); -- 2.28.0

1 1

[PATCH v2] d3dcompiler: Unconditionally report special (pixel shader output) sysvals based on the semantic name.
by Zebediah Figura 01 Sep '20

01 Sep '20

From: Zebediah Figura <zfigura(a)codeweavers.com> That is, do not check that the shader is a pixel shader and that the signature is an output signature. These semantic names can only be generated in such conditions; using the name for any other stage is invalid. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/reflection.c | 39 +++---- dlls/d3dcompiler_43/tests/reflection.c | 155 ++++++++----------------- 2 files changed, 62 insertions(+), 132 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 729501dbddc..a081b20d68f 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1608,7 +1608,7 @@ err_out: return hr; } -static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, struct dxbc_section *section, DWORD target) +static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, struct dxbc_section *section) { D3D11_SIGNATURE_PARAMETER_DESC *d; unsigned int string_data_offset; @@ -1690,27 +1690,16 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * d[i].ReadWriteMask = (mask >> 8) & 0xff; d[i].Mask = mask & 0xff; - /* pixel shaders have a special handling for SystemValueType in the output signature */ - if (((target & D3DCOMPILER_SHADER_TARGET_SHADERTYPE_MASK) == 0xffff0000) && (section->tag == TAG_OSG5 || section->tag == TAG_OSGN)) - { - TRACE("Pixelshader output signature fixup.\n"); - - if (d[i].Register == 0xffffffff) - { - if (!stricmp(d[i].SemanticName, "sv_depth")) - d[i].SystemValueType = D3D_NAME_DEPTH; - else if (!stricmp(d[i].SemanticName, "sv_coverage")) - d[i].SystemValueType = D3D_NAME_COVERAGE; - else if (!stricmp(d[i].SemanticName, "sv_depthgreaterequal")) - d[i].SystemValueType = D3D_NAME_DEPTH_GREATER_EQUAL; - else if (!stricmp(d[i].SemanticName, "sv_depthlessequal")) - d[i].SystemValueType = D3D_NAME_DEPTH_LESS_EQUAL; - } - else - { - d[i].SystemValueType = D3D_NAME_TARGET; - } - } + if (!stricmp(d[i].SemanticName, "sv_depth")) + d[i].SystemValueType = D3D_NAME_DEPTH; + else if (!stricmp(d[i].SemanticName, "sv_coverage")) + d[i].SystemValueType = D3D_NAME_COVERAGE; + else if (!stricmp(d[i].SemanticName, "sv_depthgreaterequal")) + d[i].SystemValueType = D3D_NAME_DEPTH_GREATER_EQUAL; + else if (!stricmp(d[i].SemanticName, "sv_depthlessequal")) + d[i].SystemValueType = D3D_NAME_DEPTH_LESS_EQUAL; + else if (!stricmp(d[i].SemanticName, "sv_target")) + d[i].SystemValueType = D3D_NAME_TARGET; TRACE("semantic: %s, semantic idx: %u, sysval_semantic %#x, " "type %u, register idx: %u, use_mask %#x, input_mask %#x, stream %u\n", @@ -1777,7 +1766,7 @@ static HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_refl goto err_out; } - hr = d3dcompiler_parse_signature(reflection->isgn, section, reflection->target); + hr = d3dcompiler_parse_signature(reflection->isgn, section); if (FAILED(hr)) { WARN("Failed to parse section ISGN.\n"); @@ -1795,7 +1784,7 @@ static HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_refl goto err_out; } - hr = d3dcompiler_parse_signature(reflection->osgn, section, reflection->target); + hr = d3dcompiler_parse_signature(reflection->osgn, section); if (FAILED(hr)) { WARN("Failed to parse section OSGN.\n"); @@ -1812,7 +1801,7 @@ static HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_refl goto err_out; } - hr = d3dcompiler_parse_signature(reflection->pcsg, section, reflection->target); + hr = d3dcompiler_parse_signature(reflection->pcsg, section); if (FAILED(hr)) { WARN("Failed to parse section PCSG.\n"); diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 617003a97b7..dee88776fa3 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -794,9 +794,9 @@ static void test_reflection_desc_ps(void) ok(count == 0, "Release failed %u\n", count); } -/* - * fxc.exe /E PS /Tps_5_0 /Fx - */ +/* The following shaders are stripped, in order to show that the correct + * reporting of pixel shader output sysvals should not depend on the RDEF chunk + * being present. */ #if 0 float4 PS() : SV_Target3 { @@ -804,25 +804,16 @@ float4 PS() : SV_Target3 return a; } #endif -static const DWORD test_reflection_desc_ps_output_blob_0[] = { -0x43425844, 0x3e7b77e6, 0xe4e920b7, 0x9cad0533, 0x240117cc, 0x00000001, 0x0000018c, 0x00000005, -0x00000034, 0x0000008c, 0x0000009c, 0x000000d0, 0x00000110, 0x46454452, 0x00000050, 0x00000000, -0x00000000, 0x00000000, 0x0000001c, 0xffff0400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, -0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x39207265, 0x2e39322e, -0x2e323539, 0x31313133, 0xababab00, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, -0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000003, 0x00000000, 0x00000003, 0x00000003, -0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, -0x03000065, 0x001020f2, 0x00000003, 0x08000036, 0x001020f2, 0x00000003, 0x00004002, 0x3f99999a, -0x3f800000, 0x3e4ccccd, 0x00000000, 0x0100003e, 0x54415453, 0x00000074, 0x00000002, 0x00000000, -0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000 +static const DWORD test_reflection_desc_ps_output_blob_0[] = +{ + 0x43425844, 0xc3773602, 0x04f86bdc, 0x715f33b2, 0x9c063cae, 0x00000001, 0x000000b4, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000003, 0x00000000, 0x00000003, 0x00000003, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000003c, 0x00000050, 0x0000000f, + 0x0100086a, 0x03000065, 0x001020f2, 0x00000003, 0x08000036, 0x001020f2, 0x00000003, 0x00004002, + 0x3f99999a, 0x3f800000, 0x3e4ccccd, 0x00000000, 0x0100003e, }; -/* - * fxc.exe /E PS /Tps_5_0 /Fx - */ #if 0 float PS() : SV_DepthLessEqual { @@ -830,27 +821,16 @@ float PS() : SV_DepthLessEqual return a; } #endif -static const DWORD test_reflection_desc_ps_output_blob_1[] = { -0x43425844, 0xd8ead3ec, 0x61276ada, 0x70cdaa9e, 0x2cfd7f4c, 0x00000001, 0x000001c4, 0x00000005, -0x00000034, 0x000000ac, 0x000000bc, 0x000000f8, 0x00000128, 0x46454452, 0x00000070, 0x00000000, -0x00000000, 0x00000000, 0x0000003c, 0xffff0500, 0x00000100, 0x0000003c, 0x31314452, 0x0000003c, -0x00000018, 0x00000020, 0x00000028, 0x00000024, 0x0000000c, 0x00000000, 0x7263694d, 0x666f736f, -0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x39207265, 0x2e39322e, -0x2e323539, 0x31313133, 0xababab00, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, -0x00000034, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0xffffffff, -0x00000e01, 0x445f5653, 0x68747065, 0x7373654c, 0x61757145, 0xabab006c, 0x58454853, 0x00000028, -0x00000050, 0x0000000a, 0x0100086a, 0x02000065, 0x00027001, 0x04000036, 0x00027001, 0x00004001, -0x3f99999a, 0x0100003e, 0x54415453, 0x00000094, 0x00000002, 0x00000000, 0x00000000, 0x00000001, -0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, +static const DWORD test_reflection_desc_ps_output_blob_1[] = +{ + 0x43425844, 0xc45db587, 0xdb0601fb, 0x7370900b, 0x219464be, 0x00000001, 0x000000a8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000078, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000034, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0xffffffff, + 0x00000e01, 0x445f5653, 0x68747065, 0x7373654c, 0x61757145, 0xabab006c, 0x58454853, 0x00000028, + 0x00000050, 0x0000000a, 0x0100086a, 0x02000065, 0x00027001, 0x04000036, 0x00027001, 0x00004001, + 0x3f99999a, 0x0100003e, }; -/* - * fxc.exe /E PS /Tps_5_0 /Fx - */ #if 0 float PS() : SV_DepthGreaterEqual { @@ -858,27 +838,16 @@ float PS() : SV_DepthGreaterEqual return a; } #endif -static const DWORD test_reflection_desc_ps_output_blob_2[] = { -0x43425844, 0x9f61c8df, 0x612cbb1f, 0x9e1d039e, 0xf925a074, 0x00000001, 0x000001c8, 0x00000005, -0x00000034, 0x000000ac, 0x000000bc, 0x000000fc, 0x0000012c, 0x46454452, 0x00000070, 0x00000000, -0x00000000, 0x00000000, 0x0000003c, 0xffff0500, 0x00000100, 0x0000003c, 0x31314452, 0x0000003c, -0x00000018, 0x00000020, 0x00000028, 0x00000024, 0x0000000c, 0x00000000, 0x7263694d, 0x666f736f, -0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x39207265, 0x2e39322e, -0x2e323539, 0x31313133, 0xababab00, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, -0x00000038, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0xffffffff, -0x00000e01, 0x445f5653, 0x68747065, 0x61657247, 0x45726574, 0x6c617571, 0xababab00, 0x58454853, -0x00000028, 0x00000050, 0x0000000a, 0x0100086a, 0x02000065, 0x00026001, 0x04000036, 0x00026001, -0x00004001, 0x3f99999a, 0x0100003e, 0x54415453, 0x00000094, 0x00000002, 0x00000000, 0x00000000, -0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, +static const DWORD test_reflection_desc_ps_output_blob_2[] = +{ + 0x43425844, 0x13cce144, 0x3628f322, 0xa8ea9b7d, 0xbbf9f8d7, 0x00000001, 0x000000ac, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000007c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000038, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0xffffffff, + 0x00000e01, 0x445f5653, 0x68747065, 0x61657247, 0x45726574, 0x6c617571, 0xababab00, 0x58454853, + 0x00000028, 0x00000050, 0x0000000a, 0x0100086a, 0x02000065, 0x00026001, 0x04000036, 0x00026001, + 0x00004001, 0x3f99999a, 0x0100003e, }; -/* - * fxc.exe /E PS /Tps_5_0 /Fx - */ #if 0 float PS() : sV_DePtH { @@ -886,26 +855,15 @@ float PS() : sV_DePtH return a; } #endif -static const DWORD test_reflection_desc_ps_output_blob_3[] = { -0x43425844, 0x32cec0e6, 0x3873ed32, 0x2e86ffd0, 0x21bb00e8, 0x00000001, 0x000001bc, 0x00000005, -0x00000034, 0x000000ac, 0x000000bc, 0x000000f0, 0x00000120, 0x46454452, 0x00000070, 0x00000000, -0x00000000, 0x00000000, 0x0000003c, 0xffff0500, 0x00000100, 0x0000003c, 0x31314452, 0x0000003c, -0x00000018, 0x00000020, 0x00000028, 0x00000024, 0x0000000c, 0x00000000, 0x7263694d, 0x666f736f, -0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x39207265, 0x2e39322e, -0x2e323539, 0x31313133, 0xababab00, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, -0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0xffffffff, -0x00000e01, 0x445f5673, 0x48745065, 0xababab00, 0x58454853, 0x00000028, 0x00000050, 0x0000000a, -0x0100086a, 0x02000065, 0x0000c001, 0x04000036, 0x0000c001, 0x00004001, 0x3f99999a, 0x0100003e, -0x54415453, 0x00000094, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, -0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +static const DWORD test_reflection_desc_ps_output_blob_3[] = +{ + 0x43425844, 0x31c891d1, 0xcbb9d935, 0xa199e1d5, 0x70205254, 0x00000001, 0x000000a0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0xffffffff, + 0x00000e01, 0x445f5673, 0x48745065, 0xababab00, 0x58454853, 0x00000028, 0x00000050, 0x0000000a, + 0x0100086a, 0x02000065, 0x0000c001, 0x04000036, 0x0000c001, 0x00004001, 0x3f99999a, 0x0100003e, }; -/* - * fxc.exe /E PS /Tps_4_0 /Fx - */ #if 0 float PS() : SV_Depth { @@ -913,24 +871,15 @@ float PS() : SV_Depth return a; } #endif -static const DWORD test_reflection_desc_ps_output_blob_4[] = { -0x43425844, 0x7af34874, 0x975f09ad, 0xf6e50764, 0xdfb1255f, 0x00000001, 0x00000178, 0x00000005, -0x00000034, 0x0000008c, 0x0000009c, 0x000000d0, 0x000000fc, 0x46454452, 0x00000050, 0x00000000, -0x00000000, 0x00000000, 0x0000001c, 0xffff0400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, -0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x39207265, 0x2e39322e, -0x2e323539, 0x31313133, 0xababab00, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, -0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0xffffffff, -0x00000e01, 0x445f5653, 0x68747065, 0xababab00, 0x52444853, 0x00000024, 0x00000040, 0x00000009, -0x02000065, 0x0000c001, 0x04000036, 0x0000c001, 0x00004001, 0x3f99999a, 0x0100003e, 0x54415453, -0x00000074, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, -0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +static const DWORD test_reflection_desc_ps_output_blob_4[] = +{ + 0x43425844, 0x1d404736, 0x00e4a4aa, 0x5fcdad54, 0x5abd13f8, 0x00000001, 0x0000009c, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0xffffffff, + 0x00000e01, 0x445f5653, 0x68747065, 0xababab00, 0x52444853, 0x00000024, 0x00000040, 0x00000009, + 0x02000065, 0x0000c001, 0x04000036, 0x0000c001, 0x00004001, 0x3f99999a, 0x0100003e, }; -/* - * fxc.exe /E PS /Tps_4_0 /Fx - */ #if 0 bool PS() : SV_COVERAGE { @@ -938,21 +887,13 @@ bool PS() : SV_COVERAGE return a; } #endif -static const DWORD test_reflection_desc_ps_output_blob_5[] = { -0x43425844, 0x40ae32a7, 0xe944bb1c, 0x1a2b1923, 0xea25962d, 0x00000001, 0x000001bc, 0x00000005, -0x00000034, 0x000000ac, 0x000000bc, 0x000000f0, 0x00000120, 0x46454452, 0x00000070, 0x00000000, -0x00000000, 0x00000000, 0x0000003c, 0xffff0500, 0x00000100, 0x0000003c, 0x31314452, 0x0000003c, -0x00000018, 0x00000020, 0x00000028, 0x00000024, 0x0000000c, 0x00000000, 0x7263694d, 0x666f736f, -0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x39207265, 0x2e39322e, -0x2e323539, 0x31313133, 0xababab00, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, -0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0xffffffff, -0x00000e01, 0x435f5653, 0x5245564f, 0x00454741, 0x58454853, 0x00000028, 0x00000050, 0x0000000a, -0x0100086a, 0x02000065, 0x0000f000, 0x04000036, 0x0000f001, 0x00004001, 0xffffffff, 0x0100003e, -0x54415453, 0x00000094, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, -0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +static const DWORD test_reflection_desc_ps_output_blob_5[] = +{ + 0x43425844, 0x6127612d, 0x09e2bb9a, 0xbba3889a, 0x987dafc2, 0x00000001, 0x000000a0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0xffffffff, + 0x00000e01, 0x435f5653, 0x5245564f, 0x00454741, 0x52444853, 0x00000028, 0x00000041, 0x0000000a, + 0x0100086a, 0x02000065, 0x0000f000, 0x04000036, 0x0000f001, 0x00004001, 0xffffffff, 0x0100003e, }; static void test_reflection_desc_ps_output(void) -- 2.28.0

2 1

[PATCH v3 1/5] d3dcompiler: Rename ID3D11ShaderReflection functions to d3d11_... from d3dcompiler_...
by Paul Gofman 01 Sep '20

01 Sep '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2, v3: - no changes. dlls/d3dcompiler_43/reflection.c | 578 +++++++++++++++---------------- 1 file changed, 287 insertions(+), 291 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 729501dbddc..9a1e869f0a5 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -145,9 +145,9 @@ struct d3dcompiler_shader_reflection static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3dcompiler_shader_reflection *reflection, const char *data, DWORD offset); -static const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl; -static const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl; -static const struct ID3D11ShaderReflectionTypeVtbl d3dcompiler_shader_reflection_type_vtbl; +static const struct ID3D11ShaderReflectionConstantBufferVtbl d3d11_shader_reflection_constant_buffer_vtbl; +static const struct ID3D11ShaderReflectionVariableVtbl d3d11_shader_reflection_variable_vtbl; +static const struct ID3D11ShaderReflectionTypeVtbl d3d11_shader_reflection_type_vtbl; static const struct ID3D10ShaderReflectionConstantBufferVtbl d3d10_shader_reflection_constant_buffer_vtbl; static const struct ID3D10ShaderReflectionVariableVtbl d3d10_shader_reflection_variable_vtbl; @@ -156,17 +156,17 @@ static const struct ID3D10ShaderReflectionTypeVtbl d3d10_shader_reflection_type_ /* null objects - needed for invalid calls */ static struct d3dcompiler_shader_reflection_constant_buffer null_constant_buffer = { - {&d3dcompiler_shader_reflection_constant_buffer_vtbl}, + {&d3d11_shader_reflection_constant_buffer_vtbl}, {&d3d10_shader_reflection_constant_buffer_vtbl} }; static struct d3dcompiler_shader_reflection_type null_type = { - {&d3dcompiler_shader_reflection_type_vtbl}, + {&d3d11_shader_reflection_type_vtbl}, {&d3d10_shader_reflection_type_vtbl} }; static struct d3dcompiler_shader_reflection_variable null_variable = { - {&d3dcompiler_shader_reflection_variable_vtbl}, + {&d3d11_shader_reflection_variable_vtbl}, {&d3d10_shader_reflection_variable_vtbl}, &null_constant_buffer, &null_type @@ -327,9 +327,9 @@ static inline struct d3dcompiler_shader_reflection *impl_from_ID3D11ShaderReflec return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection, ID3D11ShaderReflection_iface); } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_QueryInterface(ID3D11ShaderReflection *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_QueryInterface(ID3D11ShaderReflection *iface, REFIID riid, void **object) { - TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_ID3D11ShaderReflection) || IsEqualGUID(riid, &IID_IUnknown)) @@ -339,33 +339,33 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_QueryInterface(ID return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); *object = NULL; return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_AddRef(ID3D11ShaderReflection *iface) +static ULONG STDMETHODCALLTYPE d3d11_shader_reflection_AddRef(ID3D11ShaderReflection *iface) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); + ULONG refcount = InterlockedIncrement(&reflection->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", reflection, refcount); return refcount; } -static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11ShaderReflection *iface) +static ULONG STDMETHODCALLTYPE d3d11_shader_reflection_Release(ID3D11ShaderReflection *iface) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); + ULONG refcount = InterlockedDecrement(&reflection->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", reflection, refcount); if (!refcount) { - reflection_cleanup(This); - HeapFree(GetProcessHeap(), 0, This); + reflection_cleanup(reflection); + HeapFree(GetProcessHeap(), 0, reflection); } return refcount; @@ -373,53 +373,53 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11Shade /* ID3D11ShaderReflection methods */ -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetDesc(ID3D11ShaderReflection *iface, D3D11_SHADER_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetDesc(ID3D11ShaderReflection *iface, D3D11_SHADER_DESC *desc) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - FIXME("iface %p, desc %p partial stub!\n", iface, desc); + FIXME("iface %p, desc %p partial stub.\n", iface, desc); if (!desc) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_FAIL; } - desc->Version = This->version; - desc->Creator = This->creator; - desc->Flags = This->flags; - desc->ConstantBuffers = This->constant_buffer_count; - desc->BoundResources = This->bound_resource_count; - desc->InputParameters = This->isgn ? This->isgn->element_count : 0; - desc->OutputParameters = This->osgn ? This->osgn->element_count : 0; - desc->InstructionCount = This->instruction_count; - desc->TempRegisterCount = This->temp_register_count; - desc->TempArrayCount = This->temp_array_count; + desc->Version = reflection->version; + desc->Creator = reflection->creator; + desc->Flags = reflection->flags; + desc->ConstantBuffers = reflection->constant_buffer_count; + desc->BoundResources = reflection->bound_resource_count; + desc->InputParameters = reflection->isgn ? reflection->isgn->element_count : 0; + desc->OutputParameters = reflection->osgn ? reflection->osgn->element_count : 0; + desc->InstructionCount = reflection->instruction_count; + desc->TempRegisterCount = reflection->temp_register_count; + desc->TempArrayCount = reflection->temp_array_count; desc->DefCount = 0; - desc->DclCount = This->dcl_count; - desc->TextureNormalInstructions = This->texture_normal_instructions; - desc->TextureLoadInstructions = This->texture_load_instructions; - desc->TextureCompInstructions = This->texture_comp_instructions; - desc->TextureBiasInstructions = This->texture_bias_instructions; - desc->TextureGradientInstructions = This->texture_gradient_instructions; - desc->FloatInstructionCount = This->float_instruction_count; - desc->IntInstructionCount = This->int_instruction_count; - desc->UintInstructionCount = This->uint_instruction_count; - desc->StaticFlowControlCount = This->static_flow_control_count; - desc->DynamicFlowControlCount = This->dynamic_flow_control_count; + desc->DclCount = reflection->dcl_count; + desc->TextureNormalInstructions = reflection->texture_normal_instructions; + desc->TextureLoadInstructions = reflection->texture_load_instructions; + desc->TextureCompInstructions = reflection->texture_comp_instructions; + desc->TextureBiasInstructions = reflection->texture_bias_instructions; + desc->TextureGradientInstructions = reflection->texture_gradient_instructions; + desc->FloatInstructionCount = reflection->float_instruction_count; + desc->IntInstructionCount = reflection->int_instruction_count; + desc->UintInstructionCount = reflection->uint_instruction_count; + desc->StaticFlowControlCount = reflection->static_flow_control_count; + desc->DynamicFlowControlCount = reflection->dynamic_flow_control_count; desc->MacroInstructionCount = 0; - desc->ArrayInstructionCount = This->array_instruction_count; - desc->CutInstructionCount = This->cut_instruction_count; - desc->EmitInstructionCount = This->emit_instruction_count; - desc->GSOutputTopology = This->gs_output_topology; - desc->GSMaxOutputVertexCount = This->gs_max_output_vertex_count; - desc->InputPrimitive = This->input_primitive; - desc->PatchConstantParameters = This->pcsg ? This->pcsg->element_count : 0; + desc->ArrayInstructionCount = reflection->array_instruction_count; + desc->CutInstructionCount = reflection->cut_instruction_count; + desc->EmitInstructionCount = reflection->emit_instruction_count; + desc->GSOutputTopology = reflection->gs_output_topology; + desc->GSMaxOutputVertexCount = reflection->gs_max_output_vertex_count; + desc->InputPrimitive = reflection->input_primitive; + desc->PatchConstantParameters = reflection->pcsg ? reflection->pcsg->element_count : 0; desc->cGSInstanceCount = 0; - desc->cControlPoints = This->c_control_points; - desc->HSOutputPrimitive = This->hs_output_primitive; - desc->HSPartitioning = This->hs_prtitioning; - desc->TessellatorDomain = This->tessellator_domain; + desc->cControlPoints = reflection->c_control_points; + desc->HSOutputPrimitive = reflection->hs_output_primitive; + desc->HSPartitioning = reflection->hs_prtitioning; + desc->TessellatorDomain = reflection->tessellator_domain; desc->cBarrierInstructions = 0; desc->cInterlockedInstructions = 0; desc->cTextureStoreInstructions = 0; @@ -427,39 +427,39 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetDesc(ID3D11Sha return S_OK; } -static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConstantBufferByIndex( - ID3D11ShaderReflection *iface, UINT index) +static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d11_shader_reflection_GetConstantBufferByIndex + (ID3D11ShaderReflection *iface, UINT index) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p, index %u\n", iface, index); + TRACE("iface %p, index %u.\n", iface, index); - if (index >= This->constant_buffer_count) + if (index >= reflection->constant_buffer_count) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return &null_constant_buffer.ID3D11ShaderReflectionConstantBuffer_iface; } - return &This->constant_buffers[index].ID3D11ShaderReflectionConstantBuffer_iface; + return &reflection->constant_buffers[index].ID3D11ShaderReflectionConstantBuffer_iface; } -static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConstantBufferByName( - ID3D11ShaderReflection *iface, const char *name) +static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d11_shader_reflection_GetConstantBufferByName + (ID3D11ShaderReflection *iface, const char *name) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); unsigned int i; - TRACE("iface %p, name %s\n", iface, debugstr_a(name)); + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); if (!name) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return &null_constant_buffer.ID3D11ShaderReflectionConstantBuffer_iface; } - for (i = 0; i < This->constant_buffer_count; ++i) + for (i = 0; i < reflection->constant_buffer_count; ++i) { - struct d3dcompiler_shader_reflection_constant_buffer *d = &This->constant_buffers[i]; + struct d3dcompiler_shader_reflection_constant_buffer *d = &reflection->constant_buffers[i]; if (!strcmp(d->name, name)) { @@ -468,21 +468,21 @@ static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompil } } - WARN("Invalid name specified\n"); + WARN("Invalid name specified.\n"); return &null_constant_buffer.ID3D11ShaderReflectionConstantBuffer_iface; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindingDesc( - ID3D11ShaderReflection *iface, UINT index, D3D11_SHADER_INPUT_BIND_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetResourceBindingDesc(ID3D11ShaderReflection *iface, + UINT index, D3D11_SHADER_INPUT_BIND_DESC *desc) { struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p, index %u, desc %p\n", iface, index, desc); + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); if (!desc || index >= reflection->bound_resource_count) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_INVALIDARG; } @@ -491,16 +491,16 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindin return S_OK; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetInputParameterDesc( - ID3D11ShaderReflection *iface, UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetInputParameterDesc(ID3D11ShaderReflection *iface, + UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) { struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p, index %u, desc %p\n", iface, index, desc); + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); if (!desc || !reflection->isgn || index >= reflection->isgn->element_count) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_INVALIDARG; } @@ -509,16 +509,16 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetInputParameter return S_OK; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetOutputParameterDesc( - ID3D11ShaderReflection *iface, UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetOutputParameterDesc(ID3D11ShaderReflection *iface, + UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) { struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p, index %u, desc %p\n", iface, index, desc); + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); if (!desc || !reflection->osgn || index >= reflection->osgn->element_count) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_INVALIDARG; } @@ -527,16 +527,16 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetOutputParamete return S_OK; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetPatchConstantParameterDesc( - ID3D11ShaderReflection *iface, UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetPatchConstantParameterDesc(ID3D11ShaderReflection *iface, + UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) { struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p, index %u, desc %p\n", iface, index, desc); + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); if (!desc || !reflection->pcsg || index >= reflection->pcsg->element_count) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_INVALIDARG; } @@ -545,23 +545,23 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetPatchConstantP return S_OK; } -static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetVariableByName( - ID3D11ShaderReflection *iface, const char *name) +static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3d11_shader_reflection_GetVariableByName + (ID3D11ShaderReflection *iface, const char *name) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); unsigned int i, k; - TRACE("iface %p, name %s\n", iface, debugstr_a(name)); + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); if (!name) { - WARN("Invalid name specified\n"); + WARN("Invalid name specified.\n"); return &null_variable.ID3D11ShaderReflectionVariable_iface; } - for (i = 0; i < This->constant_buffer_count; ++i) + for (i = 0; i < reflection->constant_buffer_count; ++i) { - struct d3dcompiler_shader_reflection_constant_buffer *cb = &This->constant_buffers[i]; + struct d3dcompiler_shader_reflection_constant_buffer *cb = &reflection->constant_buffers[i]; for (k = 0; k < cb->variable_count; ++k) { @@ -575,28 +575,28 @@ static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_sha } } - WARN("Invalid name specified\n"); + WARN("Invalid name specified.\n"); return &null_variable.ID3D11ShaderReflectionVariable_iface; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindingDescByName( - ID3D11ShaderReflection *iface, const char *name, D3D11_SHADER_INPUT_BIND_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetResourceBindingDescByName(ID3D11ShaderReflection *iface, + const char *name, D3D11_SHADER_INPUT_BIND_DESC *desc) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); unsigned int i; - TRACE("iface %p, name %s, desc %p\n", iface, debugstr_a(name), desc); + TRACE("iface %p, name %s, desc %p.\n", iface, debugstr_a(name), desc); if (!desc || !name) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_INVALIDARG; } - for (i = 0; i < This->bound_resource_count; ++i) + for (i = 0; i < reflection->bound_resource_count; ++i) { - D3D12_SHADER_INPUT_BIND_DESC *d = &This->bound_resources[i]; + D3D12_SHADER_INPUT_BIND_DESC *d = &reflection->bound_resources[i]; if (!strcmp(d->Name, name)) { @@ -606,191 +606,185 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindin } } - WARN("Invalid name specified\n"); + WARN("Invalid name specified.\n"); return E_INVALIDARG; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMovInstructionCount( - ID3D11ShaderReflection *iface) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetMovInstructionCount(ID3D11ShaderReflection *iface) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p\n", iface); + TRACE("iface %p.\n", iface); - return This->mov_instruction_count; + return reflection->mov_instruction_count; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMovcInstructionCount( - ID3D11ShaderReflection *iface) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetMovcInstructionCount(ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + FIXME("iface %p stub.\n", iface); return 0; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConversionInstructionCount( - ID3D11ShaderReflection *iface) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetConversionInstructionCount(ID3D11ShaderReflection *iface) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - TRACE("iface %p\n", iface); + TRACE("iface %p.\n", iface); - return This->conversion_instruction_count; + return reflection->conversion_instruction_count; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetBitwiseInstructionCount( - ID3D11ShaderReflection *iface) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetBitwiseInstructionCount(ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + FIXME("iface %p stub.\n", iface); return 0; } -static D3D_PRIMITIVE STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetGSInputPrimitive( - ID3D11ShaderReflection *iface) +static D3D_PRIMITIVE STDMETHODCALLTYPE d3d11_shader_reflection_GetGSInputPrimitive(ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + FIXME("iface %p stub.\n", iface); return 0; } -static BOOL STDMETHODCALLTYPE d3dcompiler_shader_reflection_IsSampleFrequencyShader( - ID3D11ShaderReflection *iface) +static BOOL STDMETHODCALLTYPE d3d11_shader_reflection_IsSampleFrequencyShader(ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + FIXME("iface %p stub.\n", iface); return FALSE; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetNumInterfaceSlots( - ID3D11ShaderReflection *iface) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetNumInterfaceSlots(ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + FIXME("iface %p stub.\n", iface); return 0; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMinFeatureLevel( - ID3D11ShaderReflection *iface, D3D_FEATURE_LEVEL *level) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetMinFeatureLevel(ID3D11ShaderReflection *iface, + D3D_FEATURE_LEVEL *level) { - FIXME("iface %p, level %p stub!\n", iface, level); + FIXME("iface %p, level %p stub.\n", iface, level); return E_NOTIMPL; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetThreadGroupSize( - ID3D11ShaderReflection *iface, UINT *sizex, UINT *sizey, UINT *sizez) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetThreadGroupSize(ID3D11ShaderReflection *iface, + UINT *sizex, UINT *sizey, UINT *sizez) { - FIXME("iface %p, sizex %p, sizey %p, sizez %p stub!\n", iface, sizex, sizey, sizez); + FIXME("iface %p, sizex %p, sizey %p, sizez %p stub.\n", iface, sizex, sizey, sizez); return 0; } -static UINT64 STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetRequiresFlags( - ID3D11ShaderReflection *iface) +static UINT64 STDMETHODCALLTYPE d3d11_shader_reflection_GetRequiresFlags(ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + FIXME("iface %p stub.\n", iface); return 0; } -static const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtbl = +static const struct ID3D11ShaderReflectionVtbl d3d11_shader_reflection_vtbl = { /* IUnknown methods */ - d3dcompiler_shader_reflection_QueryInterface, - d3dcompiler_shader_reflection_AddRef, - d3dcompiler_shader_reflection_Release, + d3d11_shader_reflection_QueryInterface, + d3d11_shader_reflection_AddRef, + d3d11_shader_reflection_Release, /* ID3D11ShaderReflection methods */ - d3dcompiler_shader_reflection_GetDesc, - d3dcompiler_shader_reflection_GetConstantBufferByIndex, - d3dcompiler_shader_reflection_GetConstantBufferByName, - d3dcompiler_shader_reflection_GetResourceBindingDesc, - d3dcompiler_shader_reflection_GetInputParameterDesc, - d3dcompiler_shader_reflection_GetOutputParameterDesc, - d3dcompiler_shader_reflection_GetPatchConstantParameterDesc, - d3dcompiler_shader_reflection_GetVariableByName, - d3dcompiler_shader_reflection_GetResourceBindingDescByName, - d3dcompiler_shader_reflection_GetMovInstructionCount, - d3dcompiler_shader_reflection_GetMovcInstructionCount, - d3dcompiler_shader_reflection_GetConversionInstructionCount, - d3dcompiler_shader_reflection_GetBitwiseInstructionCount, - d3dcompiler_shader_reflection_GetGSInputPrimitive, - d3dcompiler_shader_reflection_IsSampleFrequencyShader, - d3dcompiler_shader_reflection_GetNumInterfaceSlots, - d3dcompiler_shader_reflection_GetMinFeatureLevel, - d3dcompiler_shader_reflection_GetThreadGroupSize, - d3dcompiler_shader_reflection_GetRequiresFlags, + d3d11_shader_reflection_GetDesc, + d3d11_shader_reflection_GetConstantBufferByIndex, + d3d11_shader_reflection_GetConstantBufferByName, + d3d11_shader_reflection_GetResourceBindingDesc, + d3d11_shader_reflection_GetInputParameterDesc, + d3d11_shader_reflection_GetOutputParameterDesc, + d3d11_shader_reflection_GetPatchConstantParameterDesc, + d3d11_shader_reflection_GetVariableByName, + d3d11_shader_reflection_GetResourceBindingDescByName, + d3d11_shader_reflection_GetMovInstructionCount, + d3d11_shader_reflection_GetMovcInstructionCount, + d3d11_shader_reflection_GetConversionInstructionCount, + d3d11_shader_reflection_GetBitwiseInstructionCount, + d3d11_shader_reflection_GetGSInputPrimitive, + d3d11_shader_reflection_IsSampleFrequencyShader, + d3d11_shader_reflection_GetNumInterfaceSlots, + d3d11_shader_reflection_GetMinFeatureLevel, + d3d11_shader_reflection_GetThreadGroupSize, + d3d11_shader_reflection_GetRequiresFlags, }; /* ID3D11ShaderReflectionConstantBuffer methods */ -static inline struct d3dcompiler_shader_reflection_constant_buffer *impl_from_ID3D11ShaderReflectionConstantBuffer(ID3D11ShaderReflectionConstantBuffer *iface) +static inline struct d3dcompiler_shader_reflection_constant_buffer *impl_from_ID3D11ShaderReflectionConstantBuffer + (ID3D11ShaderReflectionConstantBuffer *iface) { - return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_constant_buffer, ID3D11ShaderReflectionConstantBuffer_iface); + return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_constant_buffer, + ID3D11ShaderReflectionConstantBuffer_iface); } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetDesc( - ID3D11ShaderReflectionConstantBuffer *iface, D3D11_SHADER_BUFFER_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_constant_buffer_GetDesc + (ID3D11ShaderReflectionConstantBuffer *iface, D3D11_SHADER_BUFFER_DESC *desc) { - struct d3dcompiler_shader_reflection_constant_buffer *This = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); + struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); - TRACE("iface %p, desc %p\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); - if (This == &null_constant_buffer) + if (cb == &null_constant_buffer) { - WARN("Null constant buffer specified\n"); + WARN("Null constant buffer specified.\n"); return E_FAIL; } if (!desc) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_FAIL; } - desc->Name = This->name; - desc->Type = This->type; - desc->Variables = This->variable_count; - desc->Size = This->size; - desc->uFlags = This->flags; + desc->Name = cb->name; + desc->Type = cb->type; + desc->Variables = cb->variable_count; + desc->Size = cb->size; + desc->uFlags = cb->flags; return S_OK; } -static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByIndex( - ID3D11ShaderReflectionConstantBuffer *iface, UINT index) +static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3d11_shader_reflection_constant_buffer_GetVariableByIndex + (ID3D11ShaderReflectionConstantBuffer *iface, UINT index) { - struct d3dcompiler_shader_reflection_constant_buffer *This = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); + struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); - TRACE("iface %p, index %u\n", iface, index); + TRACE("iface %p, index %u.\n", iface, index); - if (index >= This->variable_count) + if (index >= cb->variable_count) { - WARN("Invalid index specified\n"); + WARN("Invalid index specified.\n"); return &null_variable.ID3D11ShaderReflectionVariable_iface; } - return &This->variables[index].ID3D11ShaderReflectionVariable_iface; + return &cb->variables[index].ID3D11ShaderReflectionVariable_iface; } -static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByName( - ID3D11ShaderReflectionConstantBuffer *iface, const char *name) +static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3d11_shader_reflection_constant_buffer_GetVariableByName + (ID3D11ShaderReflectionConstantBuffer *iface, const char *name) { - struct d3dcompiler_shader_reflection_constant_buffer *This = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); + struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); unsigned int i; - TRACE("iface %p, name %s\n", iface, debugstr_a(name)); + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); if (!name) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return &null_variable.ID3D11ShaderReflectionVariable_iface; } - for (i = 0; i < This->variable_count; ++i) + for (i = 0; i < cb->variable_count; ++i) { - struct d3dcompiler_shader_reflection_variable *v = &This->variables[i]; + struct d3dcompiler_shader_reflection_variable *v = &cb->variables[i]; if (!strcmp(v->name, name)) { @@ -799,155 +793,158 @@ static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_ref } } - WARN("Invalid name specified\n"); + WARN("Invalid name specified.\n"); return &null_variable.ID3D11ShaderReflectionVariable_iface; } -static const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl = +static const struct ID3D11ShaderReflectionConstantBufferVtbl d3d11_shader_reflection_constant_buffer_vtbl = { /* ID3D11ShaderReflectionConstantBuffer methods */ - d3dcompiler_shader_reflection_constant_buffer_GetDesc, - d3dcompiler_shader_reflection_constant_buffer_GetVariableByIndex, - d3dcompiler_shader_reflection_constant_buffer_GetVariableByName, + d3d11_shader_reflection_constant_buffer_GetDesc, + d3d11_shader_reflection_constant_buffer_GetVariableByIndex, + d3d11_shader_reflection_constant_buffer_GetVariableByName, }; /* ID3D11ShaderReflectionVariable methods */ -static inline struct d3dcompiler_shader_reflection_variable *impl_from_ID3D11ShaderReflectionVariable(ID3D11ShaderReflectionVariable *iface) +static inline struct d3dcompiler_shader_reflection_variable *impl_from_ID3D11ShaderReflectionVariable + (ID3D11ShaderReflectionVariable *iface) { - return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_variable, ID3D11ShaderReflectionVariable_iface); + return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_variable, + ID3D11ShaderReflectionVariable_iface); } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetDesc( - ID3D11ShaderReflectionVariable *iface, D3D11_SHADER_VARIABLE_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_variable_GetDesc + (ID3D11ShaderReflectionVariable *iface, D3D11_SHADER_VARIABLE_DESC *desc) { - struct d3dcompiler_shader_reflection_variable *This = impl_from_ID3D11ShaderReflectionVariable(iface); + struct d3dcompiler_shader_reflection_variable *cb = impl_from_ID3D11ShaderReflectionVariable(iface); - TRACE("iface %p, desc %p\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); - if (This == &null_variable) + if (cb == &null_variable) { - WARN("Null variable specified\n"); + WARN("Null variable specified.\n"); return E_FAIL; } if (!desc) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_FAIL; } - desc->Name = This->name; - desc->StartOffset = This->start_offset; - desc->Size = This->size; - desc->uFlags = This->flags; - desc->DefaultValue = This->default_value; + desc->Name = cb->name; + desc->StartOffset = cb->start_offset; + desc->Size = cb->size; + desc->uFlags = cb->flags; + desc->DefaultValue = cb->default_value; return S_OK; } -static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetType( - ID3D11ShaderReflectionVariable *iface) +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_variable_GetType + (ID3D11ShaderReflectionVariable *iface) { - struct d3dcompiler_shader_reflection_variable *This = impl_from_ID3D11ShaderReflectionVariable(iface); + struct d3dcompiler_shader_reflection_variable *cb = impl_from_ID3D11ShaderReflectionVariable(iface); - TRACE("iface %p\n", iface); + TRACE("iface %p.\n", iface); - return &This->type->ID3D11ShaderReflectionType_iface; + return &cb->type->ID3D11ShaderReflectionType_iface; } -static ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetBuffer( - ID3D11ShaderReflectionVariable *iface) +static ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d11_shader_reflection_variable_GetBuffer + (ID3D11ShaderReflectionVariable *iface) { - struct d3dcompiler_shader_reflection_variable *This = impl_from_ID3D11ShaderReflectionVariable(iface); + struct d3dcompiler_shader_reflection_variable *cb = impl_from_ID3D11ShaderReflectionVariable(iface); - TRACE("iface %p\n", iface); + TRACE("iface %p.\n", iface); - return &This->constant_buffer->ID3D11ShaderReflectionConstantBuffer_iface; + return &cb->constant_buffer->ID3D11ShaderReflectionConstantBuffer_iface; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetInterfaceSlot( - ID3D11ShaderReflectionVariable *iface, UINT index) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_variable_GetInterfaceSlot + (ID3D11ShaderReflectionVariable *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + FIXME("iface %p, index %u stub.\n", iface, index); return 0; } -static const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl = +static const struct ID3D11ShaderReflectionVariableVtbl d3d11_shader_reflection_variable_vtbl = { /* ID3D11ShaderReflectionVariable methods */ - d3dcompiler_shader_reflection_variable_GetDesc, - d3dcompiler_shader_reflection_variable_GetType, - d3dcompiler_shader_reflection_variable_GetBuffer, - d3dcompiler_shader_reflection_variable_GetInterfaceSlot, + d3d11_shader_reflection_variable_GetDesc, + d3d11_shader_reflection_variable_GetType, + d3d11_shader_reflection_variable_GetBuffer, + d3d11_shader_reflection_variable_GetInterfaceSlot, }; /* ID3D11ShaderReflectionType methods */ -static inline struct d3dcompiler_shader_reflection_type *impl_from_ID3D11ShaderReflectionType(ID3D11ShaderReflectionType *iface) +static inline struct d3dcompiler_shader_reflection_type *impl_from_ID3D11ShaderReflectionType + (ID3D11ShaderReflectionType *iface) { return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_type, ID3D11ShaderReflectionType_iface); } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetDesc( - ID3D11ShaderReflectionType *iface, D3D11_SHADER_TYPE_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_type_GetDesc + (ID3D11ShaderReflectionType *iface, D3D11_SHADER_TYPE_DESC *desc) { - struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D11ShaderReflectionType(iface); - TRACE("iface %p, desc %p\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); - if (This == &null_type) + if (type == &null_type) { - WARN("Null type specified\n"); + WARN("Null type specified.\n"); return E_FAIL; } if (!desc) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_FAIL; } - *desc = This->desc; + *desc = type->desc; return S_OK; } -static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByIndex( - ID3D11ShaderReflectionType *iface, UINT index) +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetMemberTypeByIndex + (ID3D11ShaderReflectionType *iface, UINT index) { - struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D11ShaderReflectionType(iface); - TRACE("iface %p, index %u\n", iface, index); + TRACE("iface %p, index %u.\n", iface, index); - if (index >= This->desc.Members) + if (index >= type->desc.Members) { - WARN("Invalid index specified\n"); + WARN("Invalid index specified.\n"); return &null_type.ID3D11ShaderReflectionType_iface; } - return &This->members[index].type->ID3D11ShaderReflectionType_iface; + return &type->members[index].type->ID3D11ShaderReflectionType_iface; } -static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByName( - ID3D11ShaderReflectionType *iface, const char *name) +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetMemberTypeByName + (ID3D11ShaderReflectionType *iface, const char *name) { - struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D11ShaderReflectionType(iface); unsigned int i; - TRACE("iface %p, name %s\n", iface, debugstr_a(name)); + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); if (!name) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return &null_type.ID3D11ShaderReflectionType_iface; } - for (i = 0; i < This->desc.Members; ++i) + for (i = 0; i < type->desc.Members; ++i) { - struct d3dcompiler_shader_reflection_type_member *member = &This->members[i]; + struct d3dcompiler_shader_reflection_type_member *member = &type->members[i]; if (!strcmp(member->name, name)) { @@ -956,43 +953,43 @@ static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflect } } - WARN("Invalid name specified\n"); + WARN("Invalid name specified.\n"); return &null_type.ID3D11ShaderReflectionType_iface; } -static const char * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeName( - ID3D11ShaderReflectionType *iface, UINT index) +static const char * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetMemberTypeName + (ID3D11ShaderReflectionType *iface, UINT index) { - struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D11ShaderReflectionType(iface); - TRACE("iface %p, index %u\n", iface, index); + TRACE("iface %p, index %u.\n", iface, index); - if (This == &null_type) + if (type == &null_type) { - WARN("Null type specified\n"); + WARN("Null type specified.\n"); return "$Invalid"; } - if (index >= This->desc.Members) + if (index >= type->desc.Members) { - WARN("Invalid index specified\n"); + WARN("Invalid index specified.\n"); return NULL; } - return This->members[index].name; + return type->members[index].name; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_IsEqual( - ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *type) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_type_IsEqual + (ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *type) { - struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); + struct d3dcompiler_shader_reflection_type *reflection_type = impl_from_ID3D11ShaderReflectionType(iface); - TRACE("iface %p, type %p\n", iface, type); + TRACE("iface %p, type %p.\n", iface, type); - if (This == &null_type) + if (reflection_type == &null_type) { - WARN("Null type specified\n"); + WARN("Null type specified.\n"); return E_FAIL; } @@ -1002,68 +999,67 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_IsEqual( return S_FALSE; } -static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetSubType( - ID3D11ShaderReflectionType *iface) +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetSubType + (ID3D11ShaderReflectionType *iface) { FIXME("iface %p stub!\n", iface); return NULL; } -static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetBaseClass( - ID3D11ShaderReflectionType *iface) +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetBaseClass + (ID3D11ShaderReflectionType *iface) { FIXME("iface %p stub!\n", iface); return NULL; } -static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetNumInterfaces( - ID3D11ShaderReflectionType *iface) +static UINT STDMETHODCALLTYPE d3d11_shader_reflection_type_GetNumInterfaces(ID3D11ShaderReflectionType *iface) { FIXME("iface %p stub!\n", iface); return 0; } -static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetInterfaceByIndex( - ID3D11ShaderReflectionType *iface, UINT index) +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetInterfaceByIndex + (ID3D11ShaderReflectionType *iface, UINT index) { FIXME("iface %p, index %u stub!\n", iface, index); return NULL; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_IsOfType( - ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *type) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_type_IsOfType + (ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *type) { FIXME("iface %p, type %p stub!\n", iface, type); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_ImplementsInterface( - ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *base) +static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_type_ImplementsInterface + (ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *base) { FIXME("iface %p, base %p stub!\n", iface, base); return E_NOTIMPL; } -static const struct ID3D11ShaderReflectionTypeVtbl d3dcompiler_shader_reflection_type_vtbl = +static const struct ID3D11ShaderReflectionTypeVtbl d3d11_shader_reflection_type_vtbl = { /* ID3D11ShaderReflectionType methods */ - d3dcompiler_shader_reflection_type_GetDesc, - d3dcompiler_shader_reflection_type_GetMemberTypeByIndex, - d3dcompiler_shader_reflection_type_GetMemberTypeByName, - d3dcompiler_shader_reflection_type_GetMemberTypeName, - d3dcompiler_shader_reflection_type_IsEqual, - d3dcompiler_shader_reflection_type_GetSubType, - d3dcompiler_shader_reflection_type_GetBaseClass, - d3dcompiler_shader_reflection_type_GetNumInterfaces, - d3dcompiler_shader_reflection_type_GetInterfaceByIndex, - d3dcompiler_shader_reflection_type_IsOfType, - d3dcompiler_shader_reflection_type_ImplementsInterface, + d3d11_shader_reflection_type_GetDesc, + d3d11_shader_reflection_type_GetMemberTypeByIndex, + d3d11_shader_reflection_type_GetMemberTypeByName, + d3d11_shader_reflection_type_GetMemberTypeName, + d3d11_shader_reflection_type_IsEqual, + d3d11_shader_reflection_type_GetSubType, + d3d11_shader_reflection_type_GetBaseClass, + d3d11_shader_reflection_type_GetNumInterfaces, + d3d11_shader_reflection_type_GetInterfaceByIndex, + d3d11_shader_reflection_type_IsOfType, + d3d11_shader_reflection_type_ImplementsInterface, }; static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, const char *data, DWORD data_size) @@ -1310,7 +1306,7 @@ static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3d if (!type) return NULL; - type->ID3D11ShaderReflectionType_iface.lpVtbl = &d3dcompiler_shader_reflection_type_vtbl; + type->ID3D11ShaderReflectionType_iface.lpVtbl = &d3d11_shader_reflection_type_vtbl; type->ID3D10ShaderReflectionType_iface.lpVtbl = &d3d10_shader_reflection_type_vtbl; type->id = offset; type->reflection = reflection; @@ -1352,7 +1348,7 @@ static HRESULT d3dcompiler_parse_variables(struct d3dcompiler_shader_reflection_ struct d3dcompiler_shader_reflection_variable *v = &variables[i]; DWORD offset; - v->ID3D11ShaderReflectionVariable_iface.lpVtbl = &d3dcompiler_shader_reflection_variable_vtbl; + v->ID3D11ShaderReflectionVariable_iface.lpVtbl = &d3d11_shader_reflection_variable_vtbl; v->ID3D10ShaderReflectionVariable_iface.lpVtbl = &d3d10_shader_reflection_variable_vtbl; v->constant_buffer = cb; @@ -1551,7 +1547,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c { struct d3dcompiler_shader_reflection_constant_buffer *cb = &constant_buffers[i]; - cb->ID3D11ShaderReflectionConstantBuffer_iface.lpVtbl = &d3dcompiler_shader_reflection_constant_buffer_vtbl; + cb->ID3D11ShaderReflectionConstantBuffer_iface.lpVtbl = &d3d11_shader_reflection_constant_buffer_vtbl; cb->ID3D10ShaderReflectionConstantBuffer_iface.lpVtbl = &d3d10_shader_reflection_constant_buffer_vtbl; cb->reflection = r; @@ -2375,7 +2371,7 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void if (!object) return E_OUTOFMEMORY; - object->ID3D11ShaderReflection_iface.lpVtbl = &d3dcompiler_shader_reflection_vtbl; + object->ID3D11ShaderReflection_iface.lpVtbl = &d3d11_shader_reflection_vtbl; object->refcount = 1; hr = d3dcompiler_shader_reflection_init(object, data, data_size); -- 2.26.2

2 14

[PATCH 3/3] include/d3d11.idl: Add names in D3D11_FILTER enum.
by Biswapriyo Nath 01 Sep '20

01 Sep '20

2 1

[PATCH 2/3] include/d3d11.idl: Add flags in D3D11_RESOURCE_MISC_FLAG enum.
by Biswapriyo Nath 01 Sep '20

01 Sep '20

2 1

[PATCH 1/3] include/d3d10.idl: Add flags in D3D10_CREATE_DEVICE_FLAG enum.
by Biswapriyo Nath 01 Sep '20

01 Sep '20

2 1

[PATCH 1/5] d3dcompiler/tests: Add more tests for SM4 constant packing.
by Zebediah Figura 01 Sep '20

01 Sep '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 36 +++++++++++++++++--------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c index 72b64eb81d7..cdffc806685 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c @@ -564,6 +564,7 @@ static void test_reflection(void) " float b;\n" " float c;\n" " } s;\n" + /* In direct contradiction to the documentation, this does not align. */ " bool g;\n" " float h[2];\n" " int i;\n" @@ -572,6 +573,10 @@ static void test_reflection(void) " row_major float3x1 l;\n" "#pragma pack_matrix(row_major)\n" " float3x1 o;\n" + " float4 p;\n" + " float q;\n" + " struct r_name {float a;} r;\n" + " column_major float3x1 t;\n" "};\n" "\n" "float m;\n" @@ -585,15 +590,21 @@ static void test_reflection(void) { D3D11_SHADER_VARIABLE_DESC var_desc; D3D11_SHADER_TYPE_DESC type_desc; + const D3D11_SHADER_TYPE_DESC *field_types; }; - static const D3D11_SHADER_TYPE_DESC field_types[] = + static const D3D11_SHADER_TYPE_DESC s_field_types[] = { {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 16, "float"}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 20, "float"}, }; + static const D3D11_SHADER_TYPE_DESC r_field_types[] = + { + {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}, + }; + static const struct shader_variable globals_vars = {{"m", 0, 4, D3D_SVF_USED}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}}; static const struct shader_variable params_vars = @@ -604,7 +615,7 @@ static void test_reflection(void) {{"b", 4, 8}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 2, 0, 0, 0, "float2"}}, {{"c", 16, 16}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}}, {{"d", 32, 4}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}}, - {{"s", 48, 24}, {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 6, 0, 3, 0, "<unnamed>"}}, + {{"s", 48, 24}, {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 6, 0, ARRAY_SIZE(s_field_types), 0, "<unnamed>"}, s_field_types}, {{"g", 72, 4}, {D3D_SVC_SCALAR, D3D_SVT_BOOL, 1, 1, 0, 0, 0, "bool"}}, {{"h", 80, 20}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 2, 0, 0, "float"}}, {{"i", 100, 4}, {D3D_SVC_SCALAR, D3D_SVT_INT, 1, 1, 0, 0, 0, "int"}}, @@ -612,6 +623,10 @@ static void test_reflection(void) {{"k", 112, 12}, {D3D_SVC_MATRIX_COLUMNS, D3D_SVT_FLOAT, 3, 1, 0, 0, 0, "float3x1"}}, {{"l", 128, 36}, {D3D_SVC_MATRIX_ROWS, D3D_SVT_FLOAT, 3, 1, 0, 0, 0, "float3x1"}}, {{"o", 176, 36, D3D_SVF_USED}, {D3D_SVC_MATRIX_ROWS, D3D_SVT_FLOAT, 3, 1, 0, 0, 0, "float3x1"}}, + {{"p", 224, 16}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}}, + {{"q", 240, 4}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}}, + {{"r", 256, 4}, {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 1, 0, ARRAY_SIZE(r_field_types), 0, "r_name"}, r_field_types}, + {{"t", 260, 12}, {D3D_SVC_MATRIX_COLUMNS, D3D_SVT_FLOAT, 3, 1, 0, 0, 0, "float3x1"}}, }; static const struct @@ -623,7 +638,7 @@ static void test_reflection(void) { {{"$Globals", D3D_CT_CBUFFER, 1, 16}, &globals_vars}, {{"$Params", D3D_CT_CBUFFER, 1, 16}, &params_vars}, - {{"b1", D3D_CT_CBUFFER, ARRAY_SIZE(buffer_vars), 224}, buffer_vars}, + {{"b1", D3D_CT_CBUFFER, ARRAY_SIZE(buffer_vars), 272}, buffer_vars}, }; todo_wine vs_code = compile_shader(vs_source, "vs_5_0"); @@ -669,16 +684,13 @@ static void test_reflection(void) sprintf(prefix, "Test %u, %u", i, j); check_type_desc(prefix, &type_desc, &expect->type_desc); - if (!strcmp(type_desc.Name, "<unnamed>")) + for (k = 0; k < type_desc.Members; ++k) { - for (k = 0; k < ARRAY_SIZE(field_types); ++k) - { - field = type->lpVtbl->GetMemberTypeByIndex(type, k); - hr = field->lpVtbl->GetDesc(field, &type_desc); - ok(hr == S_OK, "Test %u, %u, %u: got hr %#x.\n", i, j, k, hr); - sprintf(prefix, "Test %u, %u, %u", i, j, k); - check_type_desc(prefix, &type_desc, &field_types[k]); - } + field = type->lpVtbl->GetMemberTypeByIndex(type, k); + hr = field->lpVtbl->GetDesc(field, &type_desc); + ok(hr == S_OK, "Test %u, %u, %u: got hr %#x.\n", i, j, k, hr); + sprintf(prefix, "Test %u, %u, %u", i, j, k); + check_type_desc(prefix, &type_desc, &vs_buffers[i].vars[j].field_types[k]); } } } -- 2.27.0

3 9

[PATCH 3/5] kernelbase: Use IOCTL_CONDRV_CTRL_EVENT in GenerateConsoleCtrlEvent.
by Jacek Caban 01 Sep '20

01 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 4 ++++ dlls/kernelbase/console.c | 14 +++++--------- server/console.c | 13 ------------- server/protocol.def | 7 ------- 4 files changed, 9 insertions(+), 29 deletions(-)

2 1

[PATCH v3] d3dx10: Introduce get_d3dx10_dds_format().
by Ziqing Hui 01 Sep '20

01 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v3: Correct the variable name. dlls/d3dx10_43/d3dx10_43_main.c | 26 +++++++++++++++++++++++++- dlls/d3dx10_43/tests/d3dx10.c | 2 -- 2 files changed, 25 insertions(+), 3 deletions(-)

2 1

[PATCH v2 4/5] combase: Move remaining marshalling code.
by Huw Davies 01 Sep '20

01 Sep '20

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/combase/apartment.c | 8 +- dlls/combase/combase.spec | 15 +- dlls/combase/combase_private.h | 22 +- dlls/combase/marshal.c | 1493 +++++++++++++++++++++++++++- dlls/combase/stubmanager.c | 18 +- dlls/ole32/compobj_private.h | 23 +- dlls/ole32/marshal.c | 1661 +------------------------------- dlls/ole32/ole32.spec | 9 +- dlls/ole32/rpc.c | 8 +- 9 files changed, 1533 insertions(+), 1724 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 6aa053bdd52..bb9e9f44032 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -443,8 +443,6 @@ void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) LeaveCriticalSection(&apt->cs); } -extern HRESULT WINAPI Internal_apartment_disconnectproxies(struct apartment *apt); - void WINAPI apartment_release(struct apartment *apt) { DWORD refcount; @@ -499,7 +497,7 @@ void WINAPI apartment_release(struct apartment *apt) /* no locking is needed for this apartment, because no other thread * can access it at this point */ - Internal_apartment_disconnectproxies(apt); + apartment_disconnectproxies(apt); if (apt->win) DestroyWindow(apt->win); if (apt->host_apt_tid) PostThreadMessageW(apt->host_apt_tid, WM_QUIT, 0, 0); @@ -629,7 +627,7 @@ struct apartment * WINAPI apartment_get_current_or_mta(void) } /* The given OXID must be local to this process */ -struct apartment * WINAPI apartment_findfromoxid(OXID oxid) +struct apartment * apartment_findfromoxid(OXID oxid) { struct apartment *result = NULL; struct list *cursor; @@ -1236,7 +1234,7 @@ static BOOL WINAPI register_class( INIT_ONCE *once, void *param, void **context /* create a window for the apartment or return the current one if one has * already been created */ -HRESULT WINAPI apartment_createwindowifneeded(struct apartment *apt) +HRESULT apartment_createwindowifneeded(struct apartment *apt) { static INIT_ONCE class_init_once = INIT_ONCE_STATIC_INIT; diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 7b165b131ce..f0429343f66 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -117,7 +117,7 @@ @ stdcall CoGetObjectContext(ptr ptr) @ stdcall CoGetPSClsid(ptr ptr) @ stub CoGetProcessIdentifier -@ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr) ole32.CoGetStandardMarshal +@ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr) @ stub CoGetStdMarshalEx @ stub CoGetSystemSecurityPermissions @ stdcall CoGetTreatAsClass(ptr ptr) @@ -246,7 +246,7 @@ @ stub InternalCoIsSurrogateProcess @ stub InternalCoRegisterDisconnectCallback @ stub InternalCoRegisterSurrogatedObject -@ stub InternalCoStdMarshalObject +@ stdcall InternalCoStdMarshalObject(ptr long ptr ptr) @ stub InternalCoUnregisterDisconnectCallback @ stub InternalCompleteObjRef @ stub InternalCreateCAggId @@ -355,18 +355,7 @@ @ stdcall apartment_release(ptr) @ stdcall enter_apartment(ptr long) @ stdcall leave_apartment(ptr) -@ stdcall apartment_findfromoxid(int64) @ stdcall apartment_getwindow(ptr) -@ stdcall apartment_createwindowifneeded(ptr) @ stdcall stub_manager_int_release(ptr) -@ stdcall get_stub_manager(ptr int64) -@ stdcall stub_manager_is_table_marshaled(ptr ptr) -@ stdcall stub_manager_notify_unmarshal(ptr ptr) -@ stdcall stub_manager_ext_release(ptr long long long) -@ stdcall stub_manager_release_marshal_data(ptr long ptr long) -@ stdcall get_stub_manager_from_object(ptr ptr long) -@ stdcall stub_manager_find_ifstub(ptr ptr long) -@ stdcall stub_manager_ext_addref(ptr long long) -@ stdcall stub_manager_new_ifstub(ptr ptr ptr long ptr long) @ stdcall ipid_get_dispatch_params(ptr ptr ptr ptr ptr ptr ptr) @ stdcall start_apartment_remote_unknown(ptr) diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 210844805bb..bcf0ad46102 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -103,10 +103,11 @@ static inline struct apartment* com_get_current_apt(void) } HWND WINAPI apartment_getwindow(const struct apartment *apt) DECLSPEC_HIDDEN; -HRESULT WINAPI apartment_createwindowifneeded(struct apartment *apt) DECLSPEC_HIDDEN; +HRESULT apartment_createwindowifneeded(struct apartment *apt) DECLSPEC_HIDDEN; void apartment_freeunusedlibraries(struct apartment *apt, DWORD unload_delay) DECLSPEC_HIDDEN; void apartment_global_cleanup(void) DECLSPEC_HIDDEN; OXID apartment_getoxid(const struct apartment *apt) DECLSPEC_HIDDEN; +HRESULT apartment_disconnectproxies(struct apartment *apt) DECLSPEC_HIDDEN; /* RpcSs interface */ HRESULT rpcss_get_next_seqid(DWORD *id) DECLSPEC_HIDDEN; @@ -148,7 +149,7 @@ HRESULT apartment_get_local_server_stream(struct apartment *apt, IStream **ret) IUnknown *com_get_registered_class_object(const struct apartment *apartment, REFCLSID rclsid, DWORD clscontext) DECLSPEC_HIDDEN; void apartment_revoke_all_classes(const struct apartment *apt) DECLSPEC_HIDDEN; -struct apartment * WINAPI apartment_findfromoxid(OXID oxid); +struct apartment * apartment_findfromoxid(OXID oxid) DECLSPEC_HIDDEN; struct apartment * apartment_findfromtid(DWORD tid) DECLSPEC_HIDDEN; /* Stub Manager */ @@ -219,11 +220,14 @@ struct stub_manager }; ULONG WINAPI stub_manager_int_release(struct stub_manager *stub_manager) DECLSPEC_HIDDEN; -struct stub_manager * WINAPI get_stub_manager_from_object(struct apartment *apt, IUnknown *object, BOOL alloc); +struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnknown *object, BOOL alloc) DECLSPEC_HIDDEN; void stub_manager_disconnect(struct stub_manager *m) DECLSPEC_HIDDEN; -ULONG WINAPI stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) DECLSPEC_HIDDEN; -ULONG WINAPI stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) DECLSPEC_HIDDEN; -struct stub_manager * WINAPI get_stub_manager(struct apartment *apt, OID oid); -void WINAPI stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak); -BOOL WINAPI stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid); -BOOL WINAPI stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid); +ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) DECLSPEC_HIDDEN; +ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) DECLSPEC_HIDDEN; +struct stub_manager * get_stub_manager(struct apartment *apt, OID oid) DECLSPEC_HIDDEN; +void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak) DECLSPEC_HIDDEN; +BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN; +BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN; +struct ifstub * stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags) DECLSPEC_HIDDEN; +struct ifstub * stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, REFIID iid, DWORD dest_context, + void *dest_context_data, MSHLFLAGS flags) DECLSPEC_HIDDEN; diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index 37ec0ca2207..977945cd013 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -19,9 +19,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> + #define COBJMACROS #include "objbase.h" +#include "dcom.h" #include "combase_private.h" #include "wine/debug.h" @@ -29,13 +32,76 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -HRESULT WINAPI unmarshal_object(const STDOBJREF *stdobjref, struct apartment *apt, +HRESULT WINAPI RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, + const OXID_INFO *oxid_info, const IID *iid, + DWORD dest_context, void *dest_context_data, + IRpcChannelBuffer **chan, struct apartment *apt); +HRESULT WINAPI RPC_RegisterInterface(REFIID riid); +HRESULT WINAPI RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info); +void WINAPI RPC_StartRemoting(struct apartment *apt); + +static HRESULT unmarshal_object(const STDOBJREF *stdobjref, struct apartment *apt, MSHCTX dest_context, void *dest_context_data, REFIID riid, const OXID_INFO *oxid_info, void **object); +/* number of refs given out for normal marshaling */ +#define NORMALEXTREFS 5 + /* private flag indicating that the object was marshaled as table-weak */ #define SORFP_TABLEWEAK SORF_OXRES1 +/* private flag indicating that the caller does not want to notify the stub + * when the proxy disconnects or is destroyed */ +#define SORFP_NOLIFETIMEMGMT SORF_OXRES2 + +/* imported interface proxy */ +struct ifproxy +{ + struct list entry; /* entry in proxy_manager list (CS parent->cs) */ + struct proxy_manager *parent; /* owning proxy_manager (RO) */ + void *iface; /* interface pointer (RO) */ + STDOBJREF stdobjref; /* marshal data that represents this object (RO) */ + IID iid; /* interface ID (RO) */ + IRpcProxyBuffer *proxy; /* interface proxy (RO) */ + ULONG refs; /* imported (public) references (LOCK) */ + IRpcChannelBuffer *chan; /* channel to object (CS parent->cs) */ +}; + +/* imported object / proxy manager */ +struct proxy_manager +{ + IMultiQI IMultiQI_iface; + IMarshal IMarshal_iface; + IClientSecurity IClientSecurity_iface; + struct apartment *parent; /* owning apartment (RO) */ + struct list entry; /* entry in apartment (CS parent->cs) */ + OXID oxid; /* object exported ID (RO) */ + OXID_INFO oxid_info; /* string binding, ipid of rem unknown and other information (RO) */ + OID oid; /* object ID (RO) */ + struct list interfaces; /* imported interfaces (CS cs) */ + LONG refs; /* proxy reference count (LOCK) */ + CRITICAL_SECTION cs; /* thread safety for this object and children */ + ULONG sorflags; /* STDOBJREF flags (RO) */ + IRemUnknown *remunk; /* proxy to IRemUnknown used for lifecycle management (CS cs) */ + HANDLE remoting_mutex; /* mutex used for synchronizing access to IRemUnknown */ + MSHCTX dest_context; /* context used for activating optimisations (LOCK) */ + void *dest_context_data; /* reserved context value (LOCK) */ +}; + +static inline struct proxy_manager *impl_from_IMultiQI(IMultiQI *iface) +{ + return CONTAINING_RECORD(iface, struct proxy_manager, IMultiQI_iface); +} + +static inline struct proxy_manager *impl_from_IMarshal(IMarshal *iface) +{ + return CONTAINING_RECORD(iface, struct proxy_manager, IMarshal_iface); +} + +static inline struct proxy_manager *impl_from_IClientSecurity(IClientSecurity *iface) +{ + return CONTAINING_RECORD(iface, struct proxy_manager, IClientSecurity_iface); +} struct ftmarshaler { @@ -794,3 +860,1428 @@ HRESULT WINAPI CoUnmarshalInterface(IStream *stream, REFIID riid, void **ppv) return hr; } + +/* Marshalling just passes a unique identifier to the remote client, + * that makes it possible to find the passed interface again. + * + * So basically we need a set of values that make it unique. + * + * Note that the IUnknown_QI(ob,xiid,&ppv) always returns the SAME ppv value! + * + * A triple is used: OXID (apt id), OID (stub manager id), + * IPID (interface ptr/stub id). + * + * OXIDs identify an apartment and are network scoped + * OIDs identify a stub manager and are apartment scoped + * IPIDs identify an interface stub and are apartment scoped + */ + +static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf) +{ + HRESULT hr; + CLSID clsid; + + hr = CoGetPSClsid(riid, &clsid); + if (hr != S_OK) + return hr; + return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER | WINE_CLSCTX_DONT_HOST, + NULL, &IID_IPSFactoryBuffer, (LPVOID*)facbuf); +} + +/* marshals an object into a STDOBJREF structure */ +HRESULT WINAPI marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object, + DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags) +{ + struct stub_manager *manager; + struct ifstub *ifstub; + BOOL tablemarshal; + HRESULT hr; + + stdobjref->oxid = apartment_getoxid(apt); + + hr = apartment_createwindowifneeded(apt); + if (hr != S_OK) + return hr; + + if (!(manager = get_stub_manager_from_object(apt, object, TRUE))) + return E_OUTOFMEMORY; + + stdobjref->flags = SORF_NULL; + if (mshlflags & MSHLFLAGS_TABLEWEAK) + stdobjref->flags |= SORFP_TABLEWEAK; + if (mshlflags & MSHLFLAGS_NOPING) + stdobjref->flags |= SORF_NOPING; + stdobjref->oid = manager->oid; + + tablemarshal = ((mshlflags & MSHLFLAGS_TABLESTRONG) || (mshlflags & MSHLFLAGS_TABLEWEAK)); + + /* make sure ifstub that we are creating is unique */ + ifstub = stub_manager_find_ifstub(manager, riid, mshlflags); + if (!ifstub) { + IRpcStubBuffer *stub = NULL; + + /* IUnknown doesn't require a stub buffer, because it never goes out on + * the wire */ + if (!IsEqualIID(riid, &IID_IUnknown)) + { + IPSFactoryBuffer *psfb; + + hr = get_facbuf_for_iid(riid, &psfb); + if (hr == S_OK) { + hr = IPSFactoryBuffer_CreateStub(psfb, riid, manager->object, &stub); + IPSFactoryBuffer_Release(psfb); + if (hr != S_OK) + ERR("Failed to create an IRpcStubBuffer from IPSFactory for %s with error 0x%08x\n", + debugstr_guid(riid), hr); + }else { + WARN("couldn't get IPSFactory buffer for interface %s\n", debugstr_guid(riid)); + hr = E_NOINTERFACE; + } + + } + + if (hr == S_OK) { + ifstub = stub_manager_new_ifstub(manager, stub, riid, dest_context, dest_context_data, mshlflags); + if (!ifstub) + hr = E_OUTOFMEMORY; + } + if (stub) IRpcStubBuffer_Release(stub); + + if (hr != S_OK) { + stub_manager_int_release(manager); + /* destroy the stub manager if it has no ifstubs by releasing + * zero external references */ + stub_manager_ext_release(manager, 0, FALSE, TRUE); + return hr; + } + } + + if (!tablemarshal) + { + stdobjref->cPublicRefs = NORMALEXTREFS; + stub_manager_ext_addref(manager, stdobjref->cPublicRefs, FALSE); + } + else + { + stdobjref->cPublicRefs = 0; + if (mshlflags & MSHLFLAGS_TABLESTRONG) + stub_manager_ext_addref(manager, 1, FALSE); + else + stub_manager_ext_addref(manager, 0, TRUE); + } + + /* FIXME: check return value */ + RPC_RegisterInterface(riid); + + stdobjref->ipid = ifstub->ipid; + + stub_manager_int_release(manager); + return S_OK; +} + + + +/* Client-side identity of the server object */ + +static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnknown **remunk); +static void proxy_manager_destroy(struct proxy_manager * This); +static HRESULT proxy_manager_find_ifproxy(struct proxy_manager * This, REFIID riid, struct ifproxy ** ifproxy_found); +static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, REFIID riid, void ** ppv); + +static HRESULT WINAPI ClientIdentity_QueryInterface(IMultiQI * iface, REFIID riid, void ** ppv) +{ + HRESULT hr; + MULTI_QI mqi; + + TRACE("%s\n", debugstr_guid(riid)); + + mqi.pIID = riid; + hr = IMultiQI_QueryMultipleInterfaces(iface, 1, &mqi); + *ppv = mqi.pItf; + + return hr; +} + +static ULONG WINAPI ClientIdentity_AddRef(IMultiQI *iface) +{ + struct proxy_manager *This = impl_from_IMultiQI(iface); + TRACE("%p - before %d\n", iface, This->refs); + return InterlockedIncrement(&This->refs); +} + +static ULONG WINAPI ClientIdentity_Release(IMultiQI *iface) +{ + struct proxy_manager *This = impl_from_IMultiQI(iface); + ULONG refs = InterlockedDecrement(&This->refs); + TRACE("%p - after %d\n", iface, refs); + if (!refs) + proxy_manager_destroy(This); + return refs; +} + +static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, ULONG cMQIs, MULTI_QI *pMQIs) +{ + struct proxy_manager *This = impl_from_IMultiQI(iface); + REMQIRESULT *qiresults = NULL; + ULONG nonlocal_mqis = 0; + ULONG i; + ULONG successful_mqis = 0; + IID *iids = HeapAlloc(GetProcessHeap(), 0, cMQIs * sizeof(*iids)); + /* mapping of RemQueryInterface index to QueryMultipleInterfaces index */ + ULONG *mapping = HeapAlloc(GetProcessHeap(), 0, cMQIs * sizeof(*mapping)); + + TRACE("cMQIs: %d\n", cMQIs); + + /* try to get a local interface - this includes already active proxy + * interfaces and also interfaces exposed by the proxy manager */ + for (i = 0; i < cMQIs; i++) + { + TRACE("iid[%d] = %s\n", i, debugstr_guid(pMQIs[i].pIID)); + pMQIs[i].hr = proxy_manager_query_local_interface(This, pMQIs[i].pIID, (void **)&pMQIs[i].pItf); + if (pMQIs[i].hr == S_OK) + successful_mqis++; + else + { + iids[nonlocal_mqis] = *pMQIs[i].pIID; + mapping[nonlocal_mqis] = i; + nonlocal_mqis++; + } + } + + TRACE("%d interfaces not found locally\n", nonlocal_mqis); + + /* if we have more than one interface not found locally then we must try + * to query the remote object for it */ + if (nonlocal_mqis != 0) + { + IRemUnknown *remunk; + HRESULT hr; + IPID *ipid; + + /* get the ipid of the first entry */ + /* FIXME: should we implement ClientIdentity on the ifproxies instead + * of the proxy_manager so we use the correct ipid here? */ + ipid = &LIST_ENTRY(list_head(&This->interfaces), struct ifproxy, entry)->stdobjref.ipid; + + /* get IRemUnknown proxy so we can communicate with the remote object */ + hr = proxy_manager_get_remunknown(This, &remunk); + + if (SUCCEEDED(hr)) + { + hr = IRemUnknown_RemQueryInterface(remunk, ipid, NORMALEXTREFS, + nonlocal_mqis, iids, &qiresults); + IRemUnknown_Release(remunk); + if (FAILED(hr)) + WARN("IRemUnknown_RemQueryInterface failed with error 0x%08x\n", hr); + } + + /* IRemUnknown_RemQueryInterface can return S_FALSE if only some of + * the interfaces were returned */ + if (SUCCEEDED(hr)) + { + struct apartment *apt = apartment_get_current_or_mta(); + + /* try to unmarshal each object returned to us */ + for (i = 0; i < nonlocal_mqis; i++) + { + ULONG index = mapping[i]; + HRESULT hrobj = qiresults[i].hResult; + if (hrobj == S_OK) + hrobj = unmarshal_object(&qiresults[i].std, apt, + This->dest_context, + This->dest_context_data, + pMQIs[index].pIID, &This->oxid_info, + (void **)&pMQIs[index].pItf); + + if (hrobj == S_OK) + successful_mqis++; + else + ERR("Failed to get pointer to interface %s\n", debugstr_guid(pMQIs[index].pIID)); + pMQIs[index].hr = hrobj; + } + + apartment_release(apt); + } + + /* free the memory allocated by the proxy */ + CoTaskMemFree(qiresults); + } + + TRACE("%d/%d successfully queried\n", successful_mqis, cMQIs); + + HeapFree(GetProcessHeap(), 0, iids); + HeapFree(GetProcessHeap(), 0, mapping); + + if (successful_mqis == cMQIs) + return S_OK; /* we got all requested interfaces */ + else if (successful_mqis == 0) + return E_NOINTERFACE; /* we didn't get any interfaces */ + else + return S_FALSE; /* we got some interfaces */ +} + +static const IMultiQIVtbl ClientIdentity_Vtbl = +{ + ClientIdentity_QueryInterface, + ClientIdentity_AddRef, + ClientIdentity_Release, + ClientIdentity_QueryMultipleInterfaces +}; + +static HRESULT StdMarshalImpl_Construct(REFIID, DWORD, void*, void**); + +static HRESULT WINAPI Proxy_QueryInterface(IMarshal *iface, REFIID riid, void **ppvObject) +{ + struct proxy_manager *This = impl_from_IMarshal( iface ); + return IMultiQI_QueryInterface(&This->IMultiQI_iface, riid, ppvObject); +} + +static ULONG WINAPI Proxy_AddRef(IMarshal *iface) +{ + struct proxy_manager *This = impl_from_IMarshal( iface ); + return IMultiQI_AddRef(&This->IMultiQI_iface); +} + +static ULONG WINAPI Proxy_Release(IMarshal *iface) +{ + struct proxy_manager *This = impl_from_IMarshal( iface ); + return IMultiQI_Release(&This->IMultiQI_iface); +} + +static HRESULT WINAPI Proxy_GetUnmarshalClass( + IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext, + void* pvDestContext, DWORD mshlflags, CLSID* pCid) +{ + *pCid = CLSID_StdMarshal; + return S_OK; +} + +static HRESULT WINAPI Proxy_GetMarshalSizeMax( + IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext, + void* pvDestContext, DWORD mshlflags, DWORD* pSize) +{ + *pSize = FIELD_OFFSET(OBJREF, u_objref.u_standard.saResAddr.aStringArray); + return S_OK; +} + +static void fill_std_objref(OBJREF *objref, const GUID *iid, STDOBJREF *std) +{ + objref->signature = OBJREF_SIGNATURE; + objref->flags = OBJREF_STANDARD; + objref->iid = *iid; + if(std) + objref->u_objref.u_standard.std = *std; + memset(&objref->u_objref.u_standard.saResAddr, 0, + sizeof(objref->u_objref.u_standard.saResAddr)); +} + +static HRESULT WINAPI Proxy_MarshalInterface( + LPMARSHAL iface, IStream *pStm, REFIID riid, void* pv, DWORD dwDestContext, + void* pvDestContext, DWORD mshlflags) +{ + struct proxy_manager *This = impl_from_IMarshal( iface ); + HRESULT hr; + struct ifproxy *ifproxy; + + TRACE("(...,%s,...)\n", debugstr_guid(riid)); + + hr = proxy_manager_find_ifproxy(This, riid, &ifproxy); + if (SUCCEEDED(hr)) + { + STDOBJREF stdobjref = ifproxy->stdobjref; + + stdobjref.cPublicRefs = 0; + + if ((mshlflags != MSHLFLAGS_TABLEWEAK) && + (mshlflags != MSHLFLAGS_TABLESTRONG)) + { + ULONG cPublicRefs = ifproxy->refs; + ULONG cPublicRefsOld; + /* optimization - share out proxy's public references if possible + * instead of making new proxy do a roundtrip through the server */ + do + { + ULONG cPublicRefsNew; + cPublicRefsOld = cPublicRefs; + stdobjref.cPublicRefs = cPublicRefs / 2; + cPublicRefsNew = cPublicRefs - stdobjref.cPublicRefs; + cPublicRefs = InterlockedCompareExchange( + (LONG *)&ifproxy->refs, cPublicRefsNew, cPublicRefsOld); + } while (cPublicRefs != cPublicRefsOld); + } + + /* normal and table-strong marshaling need at least one reference */ + if (!stdobjref.cPublicRefs && (mshlflags != MSHLFLAGS_TABLEWEAK)) + { + IRemUnknown *remunk; + hr = proxy_manager_get_remunknown(This, &remunk); + if (hr == S_OK) + { + HRESULT hrref = S_OK; + REMINTERFACEREF rif; + rif.ipid = ifproxy->stdobjref.ipid; + rif.cPublicRefs = (mshlflags == MSHLFLAGS_TABLESTRONG) ? 1 : NORMALEXTREFS; + rif.cPrivateRefs = 0; + hr = IRemUnknown_RemAddRef(remunk, 1, &rif, &hrref); + IRemUnknown_Release(remunk); + if (hr == S_OK && hrref == S_OK) + { + /* table-strong marshaling doesn't give the refs to the + * client that unmarshals the STDOBJREF */ + if (mshlflags != MSHLFLAGS_TABLESTRONG) + stdobjref.cPublicRefs = rif.cPublicRefs; + } + else + ERR("IRemUnknown_RemAddRef returned with 0x%08x, hrref = 0x%08x\n", hr, hrref); + } + } + + if (SUCCEEDED(hr)) + { + OBJREF objref; + + TRACE("writing stdobjref: flags = %04x cPublicRefs = %d oxid = %s oid = %s ipid = %s\n", + stdobjref.flags, stdobjref.cPublicRefs, + wine_dbgstr_longlong(stdobjref.oxid), + wine_dbgstr_longlong(stdobjref.oid), + debugstr_guid(&stdobjref.ipid)); + fill_std_objref(&objref, riid, &stdobjref); + hr = IStream_Write(pStm, &objref, FIELD_OFFSET(OBJREF, + u_objref.u_standard.saResAddr.aStringArray), NULL); + } + } + else + { + /* we don't have the interface already unmarshaled so we have to + * request the object from the server */ + IRemUnknown *remunk; + IPID *ipid; + REMQIRESULT *qiresults = NULL; + IID iid = *riid; + + /* get the ipid of the first entry */ + /* FIXME: should we implement ClientIdentity on the ifproxies instead + * of the proxy_manager so we use the correct ipid here? */ + ipid = &LIST_ENTRY(list_head(&This->interfaces), struct ifproxy, entry)->stdobjref.ipid; + + /* get IRemUnknown proxy so we can communicate with the remote object */ + hr = proxy_manager_get_remunknown(This, &remunk); + + if (hr == S_OK) + { + hr = IRemUnknown_RemQueryInterface(remunk, ipid, NORMALEXTREFS, + 1, &iid, &qiresults); + if (SUCCEEDED(hr)) + { + OBJREF objref; + + fill_std_objref(&objref, riid, &qiresults->std); + hr = IStream_Write(pStm, &objref, FIELD_OFFSET(OBJREF, + u_objref.u_standard.saResAddr.aStringArray), NULL); + if (FAILED(hr)) + { + REMINTERFACEREF rif; + rif.ipid = qiresults->std.ipid; + rif.cPublicRefs = qiresults->std.cPublicRefs; + rif.cPrivateRefs = 0; + IRemUnknown_RemRelease(remunk, 1, &rif); + } + CoTaskMemFree(qiresults); + } + else + ERR("IRemUnknown_RemQueryInterface failed with error 0x%08x\n", hr); + IRemUnknown_Release(remunk); + } + } + + return hr; +} + +static HRESULT WINAPI Proxy_UnmarshalInterface( + IMarshal *iface, IStream *pStm, REFIID riid, void **ppv) +{ + struct proxy_manager *This = impl_from_IMarshal( iface ); + IMarshal *marshal; + HRESULT hr; + + TRACE("(%p, %p, %s, %p)\n", This, pStm, wine_dbgstr_guid(riid), ppv); + + hr = StdMarshalImpl_Construct(&IID_IMarshal, This->dest_context, + This->dest_context_data, (void**)&marshal); + if(FAILED(hr)) + return hr; + + hr = IMarshal_UnmarshalInterface(marshal, pStm, riid, ppv); + IMarshal_Release(marshal); + return hr; +} + +static HRESULT WINAPI Proxy_ReleaseMarshalData(IMarshal *iface, IStream *pStm) +{ + struct proxy_manager *This = impl_from_IMarshal( iface ); + IMarshal *marshal; + HRESULT hr; + + TRACE("(%p, %p)\n", This, pStm); + + hr = StdMarshalImpl_Construct(&IID_IMarshal, This->dest_context, + This->dest_context_data, (void**)&marshal); + if(FAILED(hr)) + return hr; + + hr = IMarshal_ReleaseMarshalData(marshal, pStm); + IMarshal_Release(marshal); + return hr; +} + +static HRESULT WINAPI Proxy_DisconnectObject(IMarshal *iface, DWORD dwReserved) +{ + struct proxy_manager *This = impl_from_IMarshal( iface ); + IMarshal *marshal; + HRESULT hr; + + TRACE("(%p, %x)\n", This, dwReserved); + + hr = StdMarshalImpl_Construct(&IID_IMarshal, This->dest_context, + This->dest_context_data, (void**)&marshal); + if(FAILED(hr)) + return hr; + + hr = IMarshal_DisconnectObject(marshal, dwReserved); + IMarshal_Release(marshal); + return hr; +} + +static const IMarshalVtbl ProxyMarshal_Vtbl = +{ + Proxy_QueryInterface, + Proxy_AddRef, + Proxy_Release, + Proxy_GetUnmarshalClass, + Proxy_GetMarshalSizeMax, + Proxy_MarshalInterface, + Proxy_UnmarshalInterface, + Proxy_ReleaseMarshalData, + Proxy_DisconnectObject +}; + +static HRESULT WINAPI ProxyCliSec_QueryInterface(IClientSecurity *iface, REFIID riid, void **ppvObject) +{ + struct proxy_manager *This = impl_from_IClientSecurity( iface ); + return IMultiQI_QueryInterface(&This->IMultiQI_iface, riid, ppvObject); +} + +static ULONG WINAPI ProxyCliSec_AddRef(IClientSecurity *iface) +{ + struct proxy_manager *This = impl_from_IClientSecurity( iface ); + return IMultiQI_AddRef(&This->IMultiQI_iface); +} + +static ULONG WINAPI ProxyCliSec_Release(IClientSecurity *iface) +{ + struct proxy_manager *This = impl_from_IClientSecurity( iface ); + return IMultiQI_Release(&This->IMultiQI_iface); +} + +static HRESULT WINAPI ProxyCliSec_QueryBlanket(IClientSecurity *iface, + IUnknown *pProxy, + DWORD *pAuthnSvc, + DWORD *pAuthzSvc, + OLECHAR **ppServerPrincName, + DWORD *pAuthnLevel, + DWORD *pImpLevel, + void **pAuthInfo, + DWORD *pCapabilities) +{ + FIXME("(%p, %p, %p, %p, %p, %p, %p, %p): stub\n", pProxy, pAuthnSvc, + pAuthzSvc, ppServerPrincName, pAuthnLevel, pImpLevel, pAuthInfo, + pCapabilities); + + if (pAuthnSvc) + *pAuthnSvc = 0; + if (pAuthzSvc) + *pAuthzSvc = 0; + if (ppServerPrincName) + *ppServerPrincName = NULL; + if (pAuthnLevel) + *pAuthnLevel = RPC_C_AUTHN_LEVEL_DEFAULT; + if (pImpLevel) + *pImpLevel = RPC_C_IMP_LEVEL_DEFAULT; + if (pAuthInfo) + *pAuthInfo = NULL; + if (pCapabilities) + *pCapabilities = EOAC_NONE; + + return E_NOTIMPL; +} + +static HRESULT WINAPI ProxyCliSec_SetBlanket(IClientSecurity *iface, + IUnknown *pProxy, DWORD AuthnSvc, + DWORD AuthzSvc, + OLECHAR *pServerPrincName, + DWORD AuthnLevel, DWORD ImpLevel, + void *pAuthInfo, + DWORD Capabilities) +{ + FIXME("(%p, %d, %d, %s, %d, %d, %p, 0x%x): stub\n", pProxy, AuthnSvc, AuthzSvc, + pServerPrincName == COLE_DEFAULT_PRINCIPAL ? "<default principal>" : debugstr_w(pServerPrincName), + AuthnLevel, ImpLevel, pAuthInfo, Capabilities); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProxyCliSec_CopyProxy(IClientSecurity *iface, + IUnknown *pProxy, IUnknown **ppCopy) +{ + FIXME("(%p, %p): stub\n", pProxy, ppCopy); + *ppCopy = NULL; + return E_NOTIMPL; +} + +static const IClientSecurityVtbl ProxyCliSec_Vtbl = +{ + ProxyCliSec_QueryInterface, + ProxyCliSec_AddRef, + ProxyCliSec_Release, + ProxyCliSec_QueryBlanket, + ProxyCliSec_SetBlanket, + ProxyCliSec_CopyProxy +}; + +static HRESULT ifproxy_get_public_ref(struct ifproxy * This) +{ + HRESULT hr = S_OK; + + if (WAIT_OBJECT_0 != WaitForSingleObject(This->parent->remoting_mutex, INFINITE)) + { + ERR("Wait failed for ifproxy %p\n", This); + return E_UNEXPECTED; + } + + if (This->refs == 0) + { + IRemUnknown *remunk = NULL; + + TRACE("getting public ref for ifproxy %p\n", This); + + hr = proxy_manager_get_remunknown(This->parent, &remunk); + if (hr == S_OK) + { + HRESULT hrref = S_OK; + REMINTERFACEREF rif; + rif.ipid = This->stdobjref.ipid; + rif.cPublicRefs = NORMALEXTREFS; + rif.cPrivateRefs = 0; + hr = IRemUnknown_RemAddRef(remunk, 1, &rif, &hrref); + IRemUnknown_Release(remunk); + if (hr == S_OK && hrref == S_OK) + InterlockedExchangeAdd((LONG *)&This->refs, NORMALEXTREFS); + else + ERR("IRemUnknown_RemAddRef returned with 0x%08x, hrref = 0x%08x\n", hr, hrref); + } + } + ReleaseMutex(This->parent->remoting_mutex); + + return hr; +} + +static HRESULT ifproxy_release_public_refs(struct ifproxy * This) +{ + HRESULT hr = S_OK; + LONG public_refs; + + if (WAIT_OBJECT_0 != WaitForSingleObject(This->parent->remoting_mutex, INFINITE)) + { + ERR("Wait failed for ifproxy %p\n", This); + return E_UNEXPECTED; + } + + public_refs = This->refs; + if (public_refs > 0) + { + IRemUnknown *remunk = NULL; + + TRACE("releasing %d refs\n", public_refs); + + hr = proxy_manager_get_remunknown(This->parent, &remunk); + if (hr == S_OK) + { + REMINTERFACEREF rif; + rif.ipid = This->stdobjref.ipid; + rif.cPublicRefs = public_refs; + rif.cPrivateRefs = 0; + hr = IRemUnknown_RemRelease(remunk, 1, &rif); + IRemUnknown_Release(remunk); + if (hr == S_OK) + InterlockedExchangeAdd((LONG *)&This->refs, -public_refs); + else if (hr == RPC_E_DISCONNECTED) + WARN("couldn't release references because object was " + "disconnected: oxid = %s, oid = %s\n", + wine_dbgstr_longlong(This->parent->oxid), + wine_dbgstr_longlong(This->parent->oid)); + else + ERR("IRemUnknown_RemRelease failed with error 0x%08x\n", hr); + } + } + ReleaseMutex(This->parent->remoting_mutex); + + return hr; +} + +/* should be called inside This->parent->cs critical section */ +static void ifproxy_disconnect(struct ifproxy * This) +{ + ifproxy_release_public_refs(This); + if (This->proxy) IRpcProxyBuffer_Disconnect(This->proxy); + + IRpcChannelBuffer_Release(This->chan); + This->chan = NULL; +} + +/* should be called in This->parent->cs critical section if it is an entry in parent's list */ +static void ifproxy_destroy(struct ifproxy * This) +{ + TRACE("%p\n", This); + + /* release public references to this object so that the stub can know + * when to destroy itself */ + ifproxy_release_public_refs(This); + + list_remove(&This->entry); + + if (This->chan) + { + IRpcChannelBuffer_Release(This->chan); + This->chan = NULL; + } + + if (This->proxy) IRpcProxyBuffer_Release(This->proxy); + + HeapFree(GetProcessHeap(), 0, This); +} + +static HRESULT proxy_manager_construct( + struct apartment * apt, ULONG sorflags, OXID oxid, OID oid, + const OXID_INFO *oxid_info, struct proxy_manager ** proxy_manager) +{ + struct proxy_manager * This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + + This->remoting_mutex = CreateMutexW(NULL, FALSE, NULL); + if (!This->remoting_mutex) + { + HeapFree(GetProcessHeap(), 0, This); + return HRESULT_FROM_WIN32(GetLastError()); + } + + if (oxid_info) + { + This->oxid_info.dwPid = oxid_info->dwPid; + This->oxid_info.dwTid = oxid_info->dwTid; + This->oxid_info.ipidRemUnknown = oxid_info->ipidRemUnknown; + This->oxid_info.dwAuthnHint = oxid_info->dwAuthnHint; + This->oxid_info.psa = NULL /* FIXME: copy from oxid_info */; + } + else + { + HRESULT hr = RPC_ResolveOxid(oxid, &This->oxid_info); + if (FAILED(hr)) + { + CloseHandle(This->remoting_mutex); + HeapFree(GetProcessHeap(), 0, This); + return hr; + } + } + + This->IMultiQI_iface.lpVtbl = &ClientIdentity_Vtbl; + This->IMarshal_iface.lpVtbl = &ProxyMarshal_Vtbl; + This->IClientSecurity_iface.lpVtbl = &ProxyCliSec_Vtbl; + + list_init(&This->entry); + list_init(&This->interfaces); + + InitializeCriticalSection(&This->cs); + This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": proxy_manager"); + + /* the apartment the object was unmarshaled into */ + This->parent = apt; + + /* the source apartment and id of the object */ + This->oxid = oxid; + This->oid = oid; + + This->refs = 1; + + /* the DCOM draft specification states that the SORF_NOPING flag is + * proxy manager specific, not ifproxy specific, so this implies that we + * should store the STDOBJREF flags here in the proxy manager. */ + This->sorflags = sorflags; + + /* we create the IRemUnknown proxy on demand */ + This->remunk = NULL; + + /* initialise these values to the weakest values and they will be + * overwritten in proxy_manager_set_context */ + This->dest_context = MSHCTX_INPROC; + This->dest_context_data = NULL; + + EnterCriticalSection(&apt->cs); + /* FIXME: we are dependent on the ordering in here to make sure a proxy's + * IRemUnknown proxy doesn't get destroyed before the regular proxy does + * because we need the IRemUnknown proxy during the destruction of the + * regular proxy. Ideally, we should maintain a separate list for the + * IRemUnknown proxies that need late destruction */ + list_add_tail(&apt->proxies, &This->entry); + LeaveCriticalSection(&apt->cs); + + TRACE("%p created for OXID %s, OID %s\n", This, + wine_dbgstr_longlong(oxid), wine_dbgstr_longlong(oid)); + + *proxy_manager = This; + return S_OK; +} + +static inline void proxy_manager_set_context(struct proxy_manager *This, MSHCTX dest_context, void *dest_context_data) +{ + MSHCTX old_dest_context; + MSHCTX new_dest_context; + + do + { + old_dest_context = This->dest_context; + new_dest_context = old_dest_context; + /* "stronger" values overwrite "weaker" values. stronger values are + * ones that disable more optimisations */ + switch (old_dest_context) + { + case MSHCTX_INPROC: + new_dest_context = dest_context; + break; + case MSHCTX_CROSSCTX: + switch (dest_context) + { + case MSHCTX_INPROC: + break; + default: + new_dest_context = dest_context; + } + break; + case MSHCTX_LOCAL: + switch (dest_context) + { + case MSHCTX_INPROC: + case MSHCTX_CROSSCTX: + break; + default: + new_dest_context = dest_context; + } + break; + case MSHCTX_NOSHAREDMEM: + switch (dest_context) + { + case MSHCTX_DIFFERENTMACHINE: + new_dest_context = dest_context; + break; + default: + break; + } + break; + default: + break; + } + + if (old_dest_context == new_dest_context) break; + + new_dest_context = InterlockedCompareExchange((PLONG)&This->dest_context, new_dest_context, old_dest_context); + } while (new_dest_context != old_dest_context); + + if (dest_context_data) + InterlockedExchangePointer(&This->dest_context_data, dest_context_data); +} + +static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, REFIID riid, void ** ppv) +{ + HRESULT hr; + struct ifproxy * ifproxy; + + TRACE("%s\n", debugstr_guid(riid)); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IMultiQI)) + { + *ppv = &This->IMultiQI_iface; + IMultiQI_AddRef(&This->IMultiQI_iface); + return S_OK; + } + if (IsEqualIID(riid, &IID_IMarshal)) + { + *ppv = &This->IMarshal_iface; + IMarshal_AddRef(&This->IMarshal_iface); + return S_OK; + } + if (IsEqualIID(riid, &IID_IClientSecurity)) + { + *ppv = &This->IClientSecurity_iface; + IClientSecurity_AddRef(&This->IClientSecurity_iface); + return S_OK; + } + + hr = proxy_manager_find_ifproxy(This, riid, &ifproxy); + if (hr == S_OK) + { + *ppv = ifproxy->iface; + IUnknown_AddRef((IUnknown *)*ppv); + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static HRESULT proxy_manager_create_ifproxy( + struct proxy_manager * This, const STDOBJREF *stdobjref, REFIID riid, + IRpcChannelBuffer * channel, struct ifproxy ** iif_out) +{ + HRESULT hr; + IPSFactoryBuffer * psfb; + struct ifproxy * ifproxy = HeapAlloc(GetProcessHeap(), 0, sizeof(*ifproxy)); + if (!ifproxy) return E_OUTOFMEMORY; + + list_init(&ifproxy->entry); + + ifproxy->parent = This; + ifproxy->stdobjref = *stdobjref; + ifproxy->iid = *riid; + ifproxy->refs = 0; + ifproxy->proxy = NULL; + + assert(channel); + ifproxy->chan = channel; /* FIXME: we should take the binding strings and construct the channel in this function */ + + /* the IUnknown interface is special because it does not have a + * proxy associated with the ifproxy as we handle IUnknown ourselves */ + if (IsEqualIID(riid, &IID_IUnknown)) + { + ifproxy->iface = &This->IMultiQI_iface; + IMultiQI_AddRef(&This->IMultiQI_iface); + hr = S_OK; + } + else + { + hr = get_facbuf_for_iid(riid, &psfb); + if (hr == S_OK) + { + /* important note: the outer unknown is set to the proxy manager. + * This ensures the COM identity rules are not violated, by having a + * one-to-one mapping of objects on the proxy side to objects on the + * stub side, no matter which interface you view the object through */ + hr = IPSFactoryBuffer_CreateProxy(psfb, (IUnknown*)&This->IMultiQI_iface, riid, + &ifproxy->proxy, &ifproxy->iface); + IPSFactoryBuffer_Release(psfb); + if (hr != S_OK) + ERR("Could not create proxy for interface %s, error 0x%08x\n", + debugstr_guid(riid), hr); + } + else + ERR("Could not get IPSFactoryBuffer for interface %s, error 0x%08x\n", + debugstr_guid(riid), hr); + + if (hr == S_OK) + hr = IRpcProxyBuffer_Connect(ifproxy->proxy, ifproxy->chan); + } + + if (hr == S_OK) + { + EnterCriticalSection(&This->cs); + list_add_tail(&This->interfaces, &ifproxy->entry); + LeaveCriticalSection(&This->cs); + + *iif_out = ifproxy; + TRACE("ifproxy %p created for IPID %s, interface %s with %u public refs\n", + ifproxy, debugstr_guid(&stdobjref->ipid), debugstr_guid(riid), stdobjref->cPublicRefs); + } + else + ifproxy_destroy(ifproxy); + + return hr; +} + +static HRESULT proxy_manager_find_ifproxy(struct proxy_manager * This, REFIID riid, struct ifproxy ** ifproxy_found) +{ + HRESULT hr = E_NOINTERFACE; /* assume not found */ + struct list * cursor; + + EnterCriticalSection(&This->cs); + LIST_FOR_EACH(cursor, &This->interfaces) + { + struct ifproxy * ifproxy = LIST_ENTRY(cursor, struct ifproxy, entry); + if (IsEqualIID(riid, &ifproxy->iid)) + { + *ifproxy_found = ifproxy; + hr = S_OK; + break; + } + } + LeaveCriticalSection(&This->cs); + + return hr; +} + +static void proxy_manager_disconnect(struct proxy_manager * This) +{ + struct list * cursor; + + TRACE("oxid = %s, oid = %s\n", wine_dbgstr_longlong(This->oxid), + wine_dbgstr_longlong(This->oid)); + + EnterCriticalSection(&This->cs); + + /* SORFP_NOLIFTIMEMGMT proxies (for IRemUnknown) shouldn't be + * disconnected - it won't do anything anyway, except cause + * problems for other objects that depend on this proxy always + * working */ + if (!(This->sorflags & SORFP_NOLIFETIMEMGMT)) + { + LIST_FOR_EACH(cursor, &This->interfaces) + { + struct ifproxy * ifproxy = LIST_ENTRY(cursor, struct ifproxy, entry); + ifproxy_disconnect(ifproxy); + } + } + + /* apartment is being destroyed so don't keep a pointer around to it */ + This->parent = NULL; + + LeaveCriticalSection(&This->cs); +} + +static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnknown **remunk) +{ + HRESULT hr = S_OK; + struct apartment *apt; + BOOL called_in_original_apt; + + /* we don't want to try and unmarshal or use IRemUnknown if we don't want + * lifetime management */ + if (This->sorflags & SORFP_NOLIFETIMEMGMT) + return S_FALSE; + + if (!(apt = apartment_get_current_or_mta())) + return CO_E_NOTINITIALIZED; + + called_in_original_apt = This->parent && (This->parent->oxid == apt->oxid); + + EnterCriticalSection(&This->cs); + /* only return the cached object if called from the original apartment. + * in future, we might want to make the IRemUnknown proxy callable from any + * apartment to avoid these checks */ + if (This->remunk && called_in_original_apt) + { + /* already created - return existing object */ + *remunk = This->remunk; + IRemUnknown_AddRef(*remunk); + } + else if (!This->parent) + { + /* disconnected - we can't create IRemUnknown */ + *remunk = NULL; + hr = S_FALSE; + } + else + { + STDOBJREF stdobjref; + /* Don't want IRemUnknown lifetime management as this is IRemUnknown! + * We also don't care about whether or not the stub is still alive */ + stdobjref.flags = SORFP_NOLIFETIMEMGMT | SORF_NOPING; + stdobjref.cPublicRefs = 1; + /* oxid of destination object */ + stdobjref.oxid = This->oxid; + /* FIXME: what should be used for the oid? The DCOM draft doesn't say */ + stdobjref.oid = (OID)-1; + stdobjref.ipid = This->oxid_info.ipidRemUnknown; + + /* do the unmarshal */ + hr = unmarshal_object(&stdobjref, apt, This->dest_context, + This->dest_context_data, &IID_IRemUnknown, + &This->oxid_info, (void**)remunk); + if (hr == S_OK && called_in_original_apt) + { + This->remunk = *remunk; + IRemUnknown_AddRef(This->remunk); + } + } + LeaveCriticalSection(&This->cs); + apartment_release(apt); + + TRACE("got IRemUnknown* pointer %p, hr = 0x%08x\n", *remunk, hr); + + return hr; +} + +/* destroys a proxy manager, freeing the memory it used. + * Note: this function should not be called from a list iteration in the + * apartment, due to the fact that it removes itself from the apartment and + * it could add a proxy to IRemUnknown into the apartment. */ +static void proxy_manager_destroy(struct proxy_manager * This) +{ + struct list * cursor; + + TRACE("oxid = %s, oid = %s\n", wine_dbgstr_longlong(This->oxid), + wine_dbgstr_longlong(This->oid)); + + if (This->parent) + { + EnterCriticalSection(&This->parent->cs); + + /* remove ourself from the list of proxy objects in the apartment */ + LIST_FOR_EACH(cursor, &This->parent->proxies) + { + if (cursor == &This->entry) + { + list_remove(&This->entry); + break; + } + } + + LeaveCriticalSection(&This->parent->cs); + } + + /* destroy all of the interface proxies */ + while ((cursor = list_head(&This->interfaces))) + { + struct ifproxy * ifproxy = LIST_ENTRY(cursor, struct ifproxy, entry); + ifproxy_destroy(ifproxy); + } + + if (This->remunk) IRemUnknown_Release(This->remunk); + CoTaskMemFree(This->oxid_info.psa); + + This->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->cs); + + CloseHandle(This->remoting_mutex); + + HeapFree(GetProcessHeap(), 0, This); +} + +/* finds the proxy manager corresponding to a given OXID and OID that has + * been unmarshaled in the specified apartment. The caller must release the + * reference to the proxy_manager when the object is no longer used. */ +static BOOL find_proxy_manager(struct apartment * apt, OXID oxid, OID oid, struct proxy_manager ** proxy_found) +{ + BOOL found = FALSE; + struct list * cursor; + + EnterCriticalSection(&apt->cs); + LIST_FOR_EACH(cursor, &apt->proxies) + { + struct proxy_manager * proxy = LIST_ENTRY(cursor, struct proxy_manager, entry); + if ((oxid == proxy->oxid) && (oid == proxy->oid)) + { + /* be careful of a race with ClientIdentity_Release, which would + * cause us to return a proxy which is in the process of being + * destroyed */ + if (IMultiQI_AddRef(&proxy->IMultiQI_iface) != 0) + { + *proxy_found = proxy; + found = TRUE; + break; + } + } + } + LeaveCriticalSection(&apt->cs); + return found; +} + +HRESULT apartment_disconnectproxies(struct apartment *apt) +{ + struct list * cursor; + + LIST_FOR_EACH(cursor, &apt->proxies) + { + struct proxy_manager * proxy = LIST_ENTRY(cursor, struct proxy_manager, entry); + proxy_manager_disconnect(proxy); + } + + return S_OK; +} + +/********************** StdMarshal implementation ****************************/ + +struct stdmarshal +{ + IMarshal IMarshal_iface; + LONG refcount; + DWORD dest_context; + void *dest_context_data; +}; + +static inline struct stdmarshal *impl_from_StdMarshal(IMarshal *iface) +{ + return CONTAINING_RECORD(iface, struct stdmarshal, IMarshal_iface); +} + +static HRESULT WINAPI StdMarshalImpl_QueryInterface(IMarshal *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IMarshal, riid)) + { + *ppv = iface; + IMarshal_AddRef(iface); + return S_OK; + } + FIXME("No interface for %s.\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI StdMarshalImpl_AddRef(IMarshal *iface) +{ + struct stdmarshal *marshal = impl_from_StdMarshal(iface); + return InterlockedIncrement(&marshal->refcount); +} + +static ULONG WINAPI StdMarshalImpl_Release(IMarshal *iface) +{ + struct stdmarshal *marshal = impl_from_StdMarshal(iface); + ULONG refcount = InterlockedDecrement(&marshal->refcount); + + if (!refcount) + heap_free(marshal); + + return refcount; +} + +static HRESULT WINAPI StdMarshalImpl_GetUnmarshalClass(IMarshal *iface, REFIID riid, void *pv, + DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *pCid) +{ + *pCid = CLSID_StdMarshal; + return S_OK; +} + +static HRESULT WINAPI StdMarshalImpl_GetMarshalSizeMax(IMarshal *iface, REFIID riid, void *pv, + DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, DWORD *pSize) +{ + *pSize = FIELD_OFFSET(OBJREF, u_objref.u_standard.saResAddr.aStringArray); + return S_OK; +} + +static HRESULT WINAPI StdMarshalImpl_MarshalInterface(IMarshal *iface, IStream *stream, REFIID riid, void *pv, + DWORD dest_context, void *dest_context_data, DWORD mshlflags) +{ + ULONG res; + HRESULT hr; + OBJREF objref; + struct apartment *apt; + + TRACE("(...,%s,...)\n", debugstr_guid(riid)); + + if (!(apt = apartment_get_current_or_mta())) + { + ERR("Apartment not initialized\n"); + return CO_E_NOTINITIALIZED; + } + + /* make sure this apartment can be reached from other threads / processes */ + RPC_StartRemoting(apt); + + fill_std_objref(&objref, riid, NULL); + hr = marshal_object(apt, &objref.u_objref.u_standard.std, riid, pv, dest_context, + dest_context_data, mshlflags); + apartment_release(apt); + if (hr != S_OK) + { + ERR("Failed to create ifstub, hr %#x\n", hr); + return hr; + } + + return IStream_Write(stream, &objref, FIELD_OFFSET(OBJREF, u_objref.u_standard.saResAddr.aStringArray), &res); +} + +/* helper for StdMarshalImpl_UnmarshalInterface - does the unmarshaling with + * no questions asked about the rules surrounding same-apartment unmarshals + * and table marshaling */ +static HRESULT unmarshal_object(const STDOBJREF *stdobjref, struct apartment *apt, MSHCTX dest_context, + void *dest_context_data, REFIID riid, const OXID_INFO *oxid_info, void **object) +{ + struct proxy_manager *proxy_manager = NULL; + HRESULT hr = S_OK; + + assert(apt); + + TRACE("stdobjref: flags = %04x cPublicRefs = %d oxid = %s oid = %s ipid = %s\n", + stdobjref->flags, stdobjref->cPublicRefs, + wine_dbgstr_longlong(stdobjref->oxid), + wine_dbgstr_longlong(stdobjref->oid), + debugstr_guid(&stdobjref->ipid)); + + /* create a new proxy manager if one doesn't already exist for the + * object */ + if (!find_proxy_manager(apt, stdobjref->oxid, stdobjref->oid, &proxy_manager)) + { + hr = proxy_manager_construct(apt, stdobjref->flags, + stdobjref->oxid, stdobjref->oid, oxid_info, + &proxy_manager); + } + else + TRACE("proxy manager already created, using\n"); + + if (hr == S_OK) + { + struct ifproxy * ifproxy; + + proxy_manager_set_context(proxy_manager, dest_context, dest_context_data); + + hr = proxy_manager_find_ifproxy(proxy_manager, riid, &ifproxy); + if (hr == E_NOINTERFACE) + { + IRpcChannelBuffer *chanbuf; + hr = RPC_CreateClientChannel(&stdobjref->oxid, &stdobjref->ipid, + &proxy_manager->oxid_info, riid, + proxy_manager->dest_context, + proxy_manager->dest_context_data, + &chanbuf, apt); + if (hr == S_OK) + hr = proxy_manager_create_ifproxy(proxy_manager, stdobjref, + riid, chanbuf, &ifproxy); + } + else + IUnknown_AddRef((IUnknown *)ifproxy->iface); + + if (hr == S_OK) + { + InterlockedExchangeAdd((LONG *)&ifproxy->refs, stdobjref->cPublicRefs); + /* get at least one external reference to the object to keep it alive */ + hr = ifproxy_get_public_ref(ifproxy); + if (FAILED(hr)) + ifproxy_destroy(ifproxy); + } + + if (hr == S_OK) + *object = ifproxy->iface; + } + + /* release our reference to the proxy manager - the client/apartment + * will hold on to the remaining reference for us */ + if (proxy_manager) IMultiQI_Release(&proxy_manager->IMultiQI_iface); + + return hr; +} + +static HRESULT WINAPI StdMarshalImpl_UnmarshalInterface(IMarshal *iface, IStream *stream, REFIID riid, void **ppv) +{ + struct stdmarshal *marshal = impl_from_StdMarshal(iface); + OBJREF objref; + HRESULT hr; + ULONG res; + + hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res); + if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref))) + { + ERR("Failed to read common OBJREF header, 0x%08x\n", hr); + return STG_E_READFAULT; + } + + if (objref.signature != OBJREF_SIGNATURE) + { + ERR("Bad OBJREF signature 0x%08x\n", objref.signature); + return RPC_E_INVALID_OBJREF; + } + + if (!(objref.flags & OBJREF_STANDARD)) + { + FIXME("unsupported objref.flags = %x\n", objref.flags); + return E_NOTIMPL; + } + + return std_unmarshal_interface(marshal->dest_context, marshal->dest_context_data, stream, riid, ppv); +} + +static HRESULT WINAPI StdMarshalImpl_ReleaseMarshalData(IMarshal *iface, IStream *stream) +{ + OBJREF objref; + HRESULT hr; + ULONG res; + + TRACE("%p, %p\n", iface, stream); + + hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res); + if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref))) + { + ERR("Failed to read common OBJREF header, 0x%08x\n", hr); + return STG_E_READFAULT; + } + + if (objref.signature != OBJREF_SIGNATURE) + { + ERR("Bad OBJREF signature 0x%08x\n", objref.signature); + return RPC_E_INVALID_OBJREF; + } + + if (!(objref.flags & OBJREF_STANDARD)) + { + FIXME("unsupported objref.flags = %x\n", objref.flags); + return E_NOTIMPL; + } + + return std_release_marshal_data(stream); +} + +static HRESULT WINAPI StdMarshalImpl_DisconnectObject(IMarshal *iface, DWORD reserved) +{ + FIXME("(), stub!\n"); + return S_OK; +} + +static const IMarshalVtbl StdMarshalVtbl = +{ + StdMarshalImpl_QueryInterface, + StdMarshalImpl_AddRef, + StdMarshalImpl_Release, + StdMarshalImpl_GetUnmarshalClass, + StdMarshalImpl_GetMarshalSizeMax, + StdMarshalImpl_MarshalInterface, + StdMarshalImpl_UnmarshalInterface, + StdMarshalImpl_ReleaseMarshalData, + StdMarshalImpl_DisconnectObject +}; + +static HRESULT StdMarshalImpl_Construct(REFIID riid, DWORD dest_context, void *dest_context_data, void **ppvObject) +{ + struct stdmarshal *object; + HRESULT hr; + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMarshal_iface.lpVtbl = &StdMarshalVtbl; + object->refcount = 1; + object->dest_context = dest_context; + object->dest_context_data = dest_context_data; + + hr = IMarshal_QueryInterface(&object->IMarshal_iface, riid, ppvObject); + IMarshal_Release(&object->IMarshal_iface); + + return hr; +} + +HRESULT WINAPI InternalCoStdMarshalObject(REFIID riid, DWORD dest_context, void *dest_context_data, void **ppvObject) +{ + return StdMarshalImpl_Construct(riid, dest_context, dest_context_data, ppvObject); +} + +/*********************************************************************** + * CoGetStandardMarshal (combase.@) + */ +HRESULT WINAPI CoGetStandardMarshal(REFIID riid, IUnknown *pUnk, DWORD dwDestContext, + void *dest_context, DWORD flags, IMarshal **marshal) +{ + if (pUnk == NULL) + { + FIXME("(%s,NULL,%x,%p,%x,%p), unimplemented yet.\n", debugstr_guid(riid), dwDestContext, + dest_context, flags, marshal); + return E_NOTIMPL; + } + TRACE("%s, %p, %x, %p, %x, %p\n", debugstr_guid(riid), pUnk, dwDestContext, dest_context, flags, marshal); + + return StdMarshalImpl_Construct(&IID_IMarshal, dwDestContext, dest_context, (void **)marshal); +} diff --git a/dlls/combase/stubmanager.c b/dlls/combase/stubmanager.c index b1070c5683e..a800c0b4844 100644 --- a/dlls/combase/stubmanager.c +++ b/dlls/combase/stubmanager.c @@ -73,7 +73,7 @@ static inline HRESULT generate_ipid(struct stub_manager *m, IPID *ipid) } /* registers a new interface stub COM object with the stub manager and returns registration record */ -struct ifstub * WINAPI stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, REFIID iid, DWORD dest_context, +struct ifstub * stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, REFIID iid, DWORD dest_context, void *dest_context_data, MSHLFLAGS flags) { struct ifstub *stub; @@ -161,7 +161,7 @@ static struct ifstub *stub_manager_ipid_to_ifstub(struct stub_manager *m, const return result; } -struct ifstub * WINAPI stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags) +struct ifstub * stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags) { struct ifstub *result = NULL; struct ifstub *ifstub; @@ -340,7 +340,7 @@ ULONG WINAPI stub_manager_int_release(struct stub_manager *m) /* gets the stub manager associated with an object - caller must have * a reference to the apartment while a reference to the stub manager is held. * it must also call release on the stub manager when it is no longer needed */ -struct stub_manager * WINAPI get_stub_manager_from_object(struct apartment *apt, IUnknown *obj, BOOL alloc) +struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnknown *obj, BOOL alloc) { struct stub_manager *result = NULL; struct list *cursor; @@ -389,7 +389,7 @@ struct stub_manager * WINAPI get_stub_manager_from_object(struct apartment *apt, /* gets the stub manager associated with an object id - caller must have * a reference to the apartment while a reference to the stub manager is held. * it must also call release on the stub manager when it is no longer needed */ -struct stub_manager * WINAPI get_stub_manager(struct apartment *apt, OID oid) +struct stub_manager * get_stub_manager(struct apartment *apt, OID oid) { struct stub_manager *result = NULL; struct list *cursor; @@ -417,7 +417,7 @@ struct stub_manager * WINAPI get_stub_manager(struct apartment *apt, OID oid) } /* add some external references (ie from a client that unmarshaled an ifptr) */ -ULONG WINAPI stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) +ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) { BOOL first_extern_ref; ULONG rc; @@ -448,7 +448,7 @@ ULONG WINAPI stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL ta } /* remove some external references */ -ULONG WINAPI stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) +ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) { BOOL last_extern_ref; ULONG rc; @@ -571,7 +571,7 @@ HRESULT WINAPI ipid_get_dispatch_params(const IPID *ipid, struct apartment **stu } /* returns TRUE if it is possible to unmarshal, FALSE otherwise. */ -BOOL WINAPI stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) +BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) { BOOL ret = TRUE; struct ifstub *ifstub; @@ -602,7 +602,7 @@ BOOL WINAPI stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ip } /* handles refcounting for CoReleaseMarshalData */ -void WINAPI stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak) +void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak) { struct ifstub *ifstub; @@ -618,7 +618,7 @@ void WINAPI stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs } /* is an ifstub table marshaled? */ -BOOL WINAPI stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid) +BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid) { struct ifstub *ifstub = stub_manager_ipid_to_ifstub(m, ipid); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 6f1cf7243e3..12acfc0a9e5 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -109,19 +109,6 @@ struct stub_manager BOOL disconnected; /* CoDisconnectObject has been called (CS lock) */ }; -/* imported interface proxy */ -struct ifproxy -{ - struct list entry; /* entry in proxy_manager list (CS parent->cs) */ - struct proxy_manager *parent; /* owning proxy_manager (RO) */ - LPVOID iface; /* interface pointer (RO) */ - STDOBJREF stdobjref; /* marshal data that represents this object (RO) */ - IID iid; /* interface ID (RO) */ - LPRPCPROXYBUFFER proxy; /* interface proxy (RO) */ - ULONG refs; /* imported (public) references (LOCK) */ - IRpcChannelBuffer *chan; /* channel to object (CS parent->cs) */ -}; - struct apartment { struct list entry; @@ -195,35 +182,31 @@ HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; /* Stub Manager */ extern ULONG WINAPI stub_manager_int_release(struct stub_manager *This) DECLSPEC_HIDDEN; -extern struct stub_manager * WINAPI get_stub_manager(struct apartment *apt, OID oid) DECLSPEC_HIDDEN; /* RPC Backend */ struct dispatch_params; -void RPC_StartRemoting(struct apartment *apt) DECLSPEC_HIDDEN; -HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, +HRESULT WINAPI RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, const OXID_INFO *oxid_info, const IID *iid, DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan, struct apartment *apt) DECLSPEC_HIDDEN; -HRESULT RPC_RegisterInterface(REFIID riid) DECLSPEC_HIDDEN; +HRESULT WINAPI RPC_RegisterInterface(REFIID riid) DECLSPEC_HIDDEN; HRESULT RPC_RegisterChannelHook(REFGUID rguid, IChannelHook *hook) DECLSPEC_HIDDEN; void RPC_UnregisterAllChannelHooks(void) DECLSPEC_HIDDEN; -HRESULT RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info) DECLSPEC_HIDDEN; +HRESULT WINAPI RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info) DECLSPEC_HIDDEN; /* Drag and drop */ void OLEDD_UnInitialize(void) DECLSPEC_HIDDEN; /* Apartment Functions */ -extern struct apartment * WINAPI apartment_findfromoxid(OXID oxid) DECLSPEC_HIDDEN; extern void WINAPI apartment_release(struct apartment *apt) DECLSPEC_HIDDEN; static inline HRESULT apartment_getoxid(const struct apartment *apt, OXID *oxid) { *oxid = apt->oxid; return S_OK; } -extern HRESULT WINAPI apartment_createwindowifneeded(struct apartment *apt) DECLSPEC_HIDDEN; extern HWND WINAPI apartment_getwindow(const struct apartment *apt) DECLSPEC_HIDDEN; extern HRESULT WINAPI enter_apartment(struct oletls *info, DWORD model) DECLSPEC_HIDDEN; void WINAPI leave_apartment(struct oletls *info) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index f8b4aecc544..823aea6f721 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -39,1664 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -extern BOOL WINAPI stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid); -extern BOOL WINAPI stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid); -extern ULONG WINAPI stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases); -extern void WINAPI stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak); -extern struct stub_manager * WINAPI get_stub_manager_from_object(struct apartment *apt, IUnknown *object, BOOL alloc); -extern struct ifstub * WINAPI stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags); -extern ULONG WINAPI stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak); -extern struct ifstub * WINAPI stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, REFIID iid, - DWORD dest_context, void *dest_context_data, MSHLFLAGS flags); - -/* number of refs given out for normal marshaling */ -#define NORMALEXTREFS 5 - - -/* private flag indicating that the object was marshaled as table-weak */ -#define SORFP_TABLEWEAK SORF_OXRES1 -/* private flag indicating that the caller does not want to notify the stub - * when the proxy disconnects or is destroyed */ -#define SORFP_NOLIFETIMEMGMT SORF_OXRES2 - -/* imported object / proxy manager */ -struct proxy_manager -{ - IMultiQI IMultiQI_iface; - IMarshal IMarshal_iface; - IClientSecurity IClientSecurity_iface; - struct apartment *parent; /* owning apartment (RO) */ - struct list entry; /* entry in apartment (CS parent->cs) */ - OXID oxid; /* object exported ID (RO) */ - OXID_INFO oxid_info; /* string binding, ipid of rem unknown and other information (RO) */ - OID oid; /* object ID (RO) */ - struct list interfaces; /* imported interfaces (CS cs) */ - LONG refs; /* proxy reference count (LOCK) */ - CRITICAL_SECTION cs; /* thread safety for this object and children */ - ULONG sorflags; /* STDOBJREF flags (RO) */ - IRemUnknown *remunk; /* proxy to IRemUnknown used for lifecycle management (CS cs) */ - HANDLE remoting_mutex; /* mutex used for synchronizing access to IRemUnknown */ - MSHCTX dest_context; /* context used for activating optimisations (LOCK) */ - void *dest_context_data; /* reserved context value (LOCK) */ -}; - -static inline struct proxy_manager *impl_from_IMultiQI( IMultiQI *iface ) -{ - return CONTAINING_RECORD(iface, struct proxy_manager, IMultiQI_iface); -} - -static inline struct proxy_manager *impl_from_IMarshal( IMarshal *iface ) -{ - return CONTAINING_RECORD(iface, struct proxy_manager, IMarshal_iface); -} - -static inline struct proxy_manager *impl_from_IClientSecurity( IClientSecurity *iface ) -{ - return CONTAINING_RECORD(iface, struct proxy_manager, IClientSecurity_iface); -} - -HRESULT WINAPI unmarshal_object(const STDOBJREF *stdobjref, struct apartment *apt, - MSHCTX dest_context, void *dest_context_data, - REFIID riid, const OXID_INFO *oxid_info, - void **object); - -/* Marshalling just passes a unique identifier to the remote client, - * that makes it possible to find the passed interface again. - * - * So basically we need a set of values that make it unique. - * - * Note that the IUnknown_QI(ob,xiid,&ppv) always returns the SAME ppv value! - * - * A triple is used: OXID (apt id), OID (stub manager id), - * IPID (interface ptr/stub id). - * - * OXIDs identify an apartment and are network scoped - * OIDs identify a stub manager and are apartment scoped - * IPIDs identify an interface stub and are apartment scoped - */ - -static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf) -{ - HRESULT hr; - CLSID clsid; - - hr = CoGetPSClsid(riid, &clsid); - if (hr != S_OK) - return hr; - return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER | WINE_CLSCTX_DONT_HOST, - NULL, &IID_IPSFactoryBuffer, (LPVOID*)facbuf); -} - -/* marshals an object into a STDOBJREF structure */ -HRESULT WINAPI marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object, - DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags) -{ - struct stub_manager *manager; - struct ifstub *ifstub; - BOOL tablemarshal; - HRESULT hr; - - hr = apartment_getoxid(apt, &stdobjref->oxid); - if (hr != S_OK) - return hr; - - hr = apartment_createwindowifneeded(apt); - if (hr != S_OK) - return hr; - - if (!(manager = get_stub_manager_from_object(apt, object, TRUE))) - return E_OUTOFMEMORY; - - stdobjref->flags = SORF_NULL; - if (mshlflags & MSHLFLAGS_TABLEWEAK) - stdobjref->flags |= SORFP_TABLEWEAK; - if (mshlflags & MSHLFLAGS_NOPING) - stdobjref->flags |= SORF_NOPING; - stdobjref->oid = manager->oid; - - tablemarshal = ((mshlflags & MSHLFLAGS_TABLESTRONG) || (mshlflags & MSHLFLAGS_TABLEWEAK)); - - /* make sure ifstub that we are creating is unique */ - ifstub = stub_manager_find_ifstub(manager, riid, mshlflags); - if (!ifstub) { - IRpcStubBuffer *stub = NULL; - - /* IUnknown doesn't require a stub buffer, because it never goes out on - * the wire */ - if (!IsEqualIID(riid, &IID_IUnknown)) - { - IPSFactoryBuffer *psfb; - - hr = get_facbuf_for_iid(riid, &psfb); - if (hr == S_OK) { - hr = IPSFactoryBuffer_CreateStub(psfb, riid, manager->object, &stub); - IPSFactoryBuffer_Release(psfb); - if (hr != S_OK) - ERR("Failed to create an IRpcStubBuffer from IPSFactory for %s with error 0x%08x\n", - debugstr_guid(riid), hr); - }else { - WARN("couldn't get IPSFactory buffer for interface %s\n", debugstr_guid(riid)); - hr = E_NOINTERFACE; - } - - } - - if (hr == S_OK) { - ifstub = stub_manager_new_ifstub(manager, stub, riid, dest_context, dest_context_data, mshlflags); - if (!ifstub) - hr = E_OUTOFMEMORY; - } - if (stub) IRpcStubBuffer_Release(stub); - - if (hr != S_OK) { - stub_manager_int_release(manager); - /* destroy the stub manager if it has no ifstubs by releasing - * zero external references */ - stub_manager_ext_release(manager, 0, FALSE, TRUE); - return hr; - } - } - - if (!tablemarshal) - { - stdobjref->cPublicRefs = NORMALEXTREFS; - stub_manager_ext_addref(manager, stdobjref->cPublicRefs, FALSE); - } - else - { - stdobjref->cPublicRefs = 0; - if (mshlflags & MSHLFLAGS_TABLESTRONG) - stub_manager_ext_addref(manager, 1, FALSE); - else - stub_manager_ext_addref(manager, 0, TRUE); - } - - /* FIXME: check return value */ - RPC_RegisterInterface(riid); - - stdobjref->ipid = ifstub->ipid; - - stub_manager_int_release(manager); - return S_OK; -} - - - -/* Client-side identity of the server object */ - -static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnknown **remunk); -static void proxy_manager_destroy(struct proxy_manager * This); -static HRESULT proxy_manager_find_ifproxy(struct proxy_manager * This, REFIID riid, struct ifproxy ** ifproxy_found); -static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, REFIID riid, void ** ppv); - -static HRESULT WINAPI ClientIdentity_QueryInterface(IMultiQI * iface, REFIID riid, void ** ppv) -{ - HRESULT hr; - MULTI_QI mqi; - - TRACE("%s\n", debugstr_guid(riid)); - - mqi.pIID = riid; - hr = IMultiQI_QueryMultipleInterfaces(iface, 1, &mqi); - *ppv = mqi.pItf; - - return hr; -} - -static ULONG WINAPI ClientIdentity_AddRef(IMultiQI *iface) -{ - struct proxy_manager *This = impl_from_IMultiQI(iface); - TRACE("%p - before %d\n", iface, This->refs); - return InterlockedIncrement(&This->refs); -} - -static ULONG WINAPI ClientIdentity_Release(IMultiQI *iface) -{ - struct proxy_manager *This = impl_from_IMultiQI(iface); - ULONG refs = InterlockedDecrement(&This->refs); - TRACE("%p - after %d\n", iface, refs); - if (!refs) - proxy_manager_destroy(This); - return refs; -} - -static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, ULONG cMQIs, MULTI_QI *pMQIs) -{ - struct proxy_manager *This = impl_from_IMultiQI(iface); - REMQIRESULT *qiresults = NULL; - ULONG nonlocal_mqis = 0; - ULONG i; - ULONG successful_mqis = 0; - IID *iids = HeapAlloc(GetProcessHeap(), 0, cMQIs * sizeof(*iids)); - /* mapping of RemQueryInterface index to QueryMultipleInterfaces index */ - ULONG *mapping = HeapAlloc(GetProcessHeap(), 0, cMQIs * sizeof(*mapping)); - - TRACE("cMQIs: %d\n", cMQIs); - - /* try to get a local interface - this includes already active proxy - * interfaces and also interfaces exposed by the proxy manager */ - for (i = 0; i < cMQIs; i++) - { - TRACE("iid[%d] = %s\n", i, debugstr_guid(pMQIs[i].pIID)); - pMQIs[i].hr = proxy_manager_query_local_interface(This, pMQIs[i].pIID, (void **)&pMQIs[i].pItf); - if (pMQIs[i].hr == S_OK) - successful_mqis++; - else - { - iids[nonlocal_mqis] = *pMQIs[i].pIID; - mapping[nonlocal_mqis] = i; - nonlocal_mqis++; - } - } - - TRACE("%d interfaces not found locally\n", nonlocal_mqis); - - /* if we have more than one interface not found locally then we must try - * to query the remote object for it */ - if (nonlocal_mqis != 0) - { - IRemUnknown *remunk; - HRESULT hr; - IPID *ipid; - - /* get the ipid of the first entry */ - /* FIXME: should we implement ClientIdentity on the ifproxies instead - * of the proxy_manager so we use the correct ipid here? */ - ipid = &LIST_ENTRY(list_head(&This->interfaces), struct ifproxy, entry)->stdobjref.ipid; - - /* get IRemUnknown proxy so we can communicate with the remote object */ - hr = proxy_manager_get_remunknown(This, &remunk); - - if (SUCCEEDED(hr)) - { - hr = IRemUnknown_RemQueryInterface(remunk, ipid, NORMALEXTREFS, - nonlocal_mqis, iids, &qiresults); - IRemUnknown_Release(remunk); - if (FAILED(hr)) - WARN("IRemUnknown_RemQueryInterface failed with error 0x%08x\n", hr); - } - - /* IRemUnknown_RemQueryInterface can return S_FALSE if only some of - * the interfaces were returned */ - if (SUCCEEDED(hr)) - { - struct apartment *apt = apartment_get_current_or_mta(); - - /* try to unmarshal each object returned to us */ - for (i = 0; i < nonlocal_mqis; i++) - { - ULONG index = mapping[i]; - HRESULT hrobj = qiresults[i].hResult; - if (hrobj == S_OK) - hrobj = unmarshal_object(&qiresults[i].std, apt, - This->dest_context, - This->dest_context_data, - pMQIs[index].pIID, &This->oxid_info, - (void **)&pMQIs[index].pItf); - - if (hrobj == S_OK) - successful_mqis++; - else - ERR("Failed to get pointer to interface %s\n", debugstr_guid(pMQIs[index].pIID)); - pMQIs[index].hr = hrobj; - } - - apartment_release(apt); - } - - /* free the memory allocated by the proxy */ - CoTaskMemFree(qiresults); - } - - TRACE("%d/%d successfully queried\n", successful_mqis, cMQIs); - - HeapFree(GetProcessHeap(), 0, iids); - HeapFree(GetProcessHeap(), 0, mapping); - - if (successful_mqis == cMQIs) - return S_OK; /* we got all requested interfaces */ - else if (successful_mqis == 0) - return E_NOINTERFACE; /* we didn't get any interfaces */ - else - return S_FALSE; /* we got some interfaces */ -} - -static const IMultiQIVtbl ClientIdentity_Vtbl = -{ - ClientIdentity_QueryInterface, - ClientIdentity_AddRef, - ClientIdentity_Release, - ClientIdentity_QueryMultipleInterfaces -}; - -static HRESULT StdMarshalImpl_Construct(REFIID, DWORD, void*, void**); - -static HRESULT WINAPI Proxy_QueryInterface(IMarshal *iface, REFIID riid, void **ppvObject) -{ - struct proxy_manager *This = impl_from_IMarshal( iface ); - return IMultiQI_QueryInterface(&This->IMultiQI_iface, riid, ppvObject); -} - -static ULONG WINAPI Proxy_AddRef(IMarshal *iface) -{ - struct proxy_manager *This = impl_from_IMarshal( iface ); - return IMultiQI_AddRef(&This->IMultiQI_iface); -} - -static ULONG WINAPI Proxy_Release(IMarshal *iface) -{ - struct proxy_manager *This = impl_from_IMarshal( iface ); - return IMultiQI_Release(&This->IMultiQI_iface); -} - -static HRESULT WINAPI Proxy_GetUnmarshalClass( - IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext, - void* pvDestContext, DWORD mshlflags, CLSID* pCid) -{ - *pCid = CLSID_StdMarshal; - return S_OK; -} - -static HRESULT WINAPI Proxy_GetMarshalSizeMax( - IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext, - void* pvDestContext, DWORD mshlflags, DWORD* pSize) -{ - *pSize = FIELD_OFFSET(OBJREF, u_objref.u_standard.saResAddr.aStringArray); - return S_OK; -} - -static void fill_std_objref(OBJREF *objref, const GUID *iid, STDOBJREF *std) -{ - objref->signature = OBJREF_SIGNATURE; - objref->flags = OBJREF_STANDARD; - objref->iid = *iid; - if(std) - objref->u_objref.u_standard.std = *std; - memset(&objref->u_objref.u_standard.saResAddr, 0, - sizeof(objref->u_objref.u_standard.saResAddr)); -} - -static HRESULT WINAPI Proxy_MarshalInterface( - LPMARSHAL iface, IStream *pStm, REFIID riid, void* pv, DWORD dwDestContext, - void* pvDestContext, DWORD mshlflags) -{ - struct proxy_manager *This = impl_from_IMarshal( iface ); - HRESULT hr; - struct ifproxy *ifproxy; - - TRACE("(...,%s,...)\n", debugstr_guid(riid)); - - hr = proxy_manager_find_ifproxy(This, riid, &ifproxy); - if (SUCCEEDED(hr)) - { - STDOBJREF stdobjref = ifproxy->stdobjref; - - stdobjref.cPublicRefs = 0; - - if ((mshlflags != MSHLFLAGS_TABLEWEAK) && - (mshlflags != MSHLFLAGS_TABLESTRONG)) - { - ULONG cPublicRefs = ifproxy->refs; - ULONG cPublicRefsOld; - /* optimization - share out proxy's public references if possible - * instead of making new proxy do a roundtrip through the server */ - do - { - ULONG cPublicRefsNew; - cPublicRefsOld = cPublicRefs; - stdobjref.cPublicRefs = cPublicRefs / 2; - cPublicRefsNew = cPublicRefs - stdobjref.cPublicRefs; - cPublicRefs = InterlockedCompareExchange( - (LONG *)&ifproxy->refs, cPublicRefsNew, cPublicRefsOld); - } while (cPublicRefs != cPublicRefsOld); - } - - /* normal and table-strong marshaling need at least one reference */ - if (!stdobjref.cPublicRefs && (mshlflags != MSHLFLAGS_TABLEWEAK)) - { - IRemUnknown *remunk; - hr = proxy_manager_get_remunknown(This, &remunk); - if (hr == S_OK) - { - HRESULT hrref = S_OK; - REMINTERFACEREF rif; - rif.ipid = ifproxy->stdobjref.ipid; - rif.cPublicRefs = (mshlflags == MSHLFLAGS_TABLESTRONG) ? 1 : NORMALEXTREFS; - rif.cPrivateRefs = 0; - hr = IRemUnknown_RemAddRef(remunk, 1, &rif, &hrref); - IRemUnknown_Release(remunk); - if (hr == S_OK && hrref == S_OK) - { - /* table-strong marshaling doesn't give the refs to the - * client that unmarshals the STDOBJREF */ - if (mshlflags != MSHLFLAGS_TABLESTRONG) - stdobjref.cPublicRefs = rif.cPublicRefs; - } - else - ERR("IRemUnknown_RemAddRef returned with 0x%08x, hrref = 0x%08x\n", hr, hrref); - } - } - - if (SUCCEEDED(hr)) - { - OBJREF objref; - - TRACE("writing stdobjref: flags = %04x cPublicRefs = %d oxid = %s oid = %s ipid = %s\n", - stdobjref.flags, stdobjref.cPublicRefs, - wine_dbgstr_longlong(stdobjref.oxid), - wine_dbgstr_longlong(stdobjref.oid), - debugstr_guid(&stdobjref.ipid)); - fill_std_objref(&objref, riid, &stdobjref); - hr = IStream_Write(pStm, &objref, FIELD_OFFSET(OBJREF, - u_objref.u_standard.saResAddr.aStringArray), NULL); - } - } - else - { - /* we don't have the interface already unmarshaled so we have to - * request the object from the server */ - IRemUnknown *remunk; - IPID *ipid; - REMQIRESULT *qiresults = NULL; - IID iid = *riid; - - /* get the ipid of the first entry */ - /* FIXME: should we implement ClientIdentity on the ifproxies instead - * of the proxy_manager so we use the correct ipid here? */ - ipid = &LIST_ENTRY(list_head(&This->interfaces), struct ifproxy, entry)->stdobjref.ipid; - - /* get IRemUnknown proxy so we can communicate with the remote object */ - hr = proxy_manager_get_remunknown(This, &remunk); - - if (hr == S_OK) - { - hr = IRemUnknown_RemQueryInterface(remunk, ipid, NORMALEXTREFS, - 1, &iid, &qiresults); - if (SUCCEEDED(hr)) - { - OBJREF objref; - - fill_std_objref(&objref, riid, &qiresults->std); - hr = IStream_Write(pStm, &objref, FIELD_OFFSET(OBJREF, - u_objref.u_standard.saResAddr.aStringArray), NULL); - if (FAILED(hr)) - { - REMINTERFACEREF rif; - rif.ipid = qiresults->std.ipid; - rif.cPublicRefs = qiresults->std.cPublicRefs; - rif.cPrivateRefs = 0; - IRemUnknown_RemRelease(remunk, 1, &rif); - } - CoTaskMemFree(qiresults); - } - else - ERR("IRemUnknown_RemQueryInterface failed with error 0x%08x\n", hr); - IRemUnknown_Release(remunk); - } - } - - return hr; -} - -static HRESULT WINAPI Proxy_UnmarshalInterface( - IMarshal *iface, IStream *pStm, REFIID riid, void **ppv) -{ - struct proxy_manager *This = impl_from_IMarshal( iface ); - IMarshal *marshal; - HRESULT hr; - - TRACE("(%p, %p, %s, %p)\n", This, pStm, wine_dbgstr_guid(riid), ppv); - - hr = StdMarshalImpl_Construct(&IID_IMarshal, This->dest_context, - This->dest_context_data, (void**)&marshal); - if(FAILED(hr)) - return hr; - - hr = IMarshal_UnmarshalInterface(marshal, pStm, riid, ppv); - IMarshal_Release(marshal); - return hr; -} - -static HRESULT WINAPI Proxy_ReleaseMarshalData(IMarshal *iface, IStream *pStm) -{ - struct proxy_manager *This = impl_from_IMarshal( iface ); - IMarshal *marshal; - HRESULT hr; - - TRACE("(%p, %p)\n", This, pStm); - - hr = StdMarshalImpl_Construct(&IID_IMarshal, This->dest_context, - This->dest_context_data, (void**)&marshal); - if(FAILED(hr)) - return hr; - - hr = IMarshal_ReleaseMarshalData(marshal, pStm); - IMarshal_Release(marshal); - return hr; -} - -static HRESULT WINAPI Proxy_DisconnectObject(IMarshal *iface, DWORD dwReserved) -{ - struct proxy_manager *This = impl_from_IMarshal( iface ); - IMarshal *marshal; - HRESULT hr; - - TRACE("(%p, %x)\n", This, dwReserved); - - hr = StdMarshalImpl_Construct(&IID_IMarshal, This->dest_context, - This->dest_context_data, (void**)&marshal); - if(FAILED(hr)) - return hr; - - hr = IMarshal_DisconnectObject(marshal, dwReserved); - IMarshal_Release(marshal); - return hr; -} - -static const IMarshalVtbl ProxyMarshal_Vtbl = -{ - Proxy_QueryInterface, - Proxy_AddRef, - Proxy_Release, - Proxy_GetUnmarshalClass, - Proxy_GetMarshalSizeMax, - Proxy_MarshalInterface, - Proxy_UnmarshalInterface, - Proxy_ReleaseMarshalData, - Proxy_DisconnectObject -}; - -static HRESULT WINAPI ProxyCliSec_QueryInterface(IClientSecurity *iface, REFIID riid, void **ppvObject) -{ - struct proxy_manager *This = impl_from_IClientSecurity( iface ); - return IMultiQI_QueryInterface(&This->IMultiQI_iface, riid, ppvObject); -} - -static ULONG WINAPI ProxyCliSec_AddRef(IClientSecurity *iface) -{ - struct proxy_manager *This = impl_from_IClientSecurity( iface ); - return IMultiQI_AddRef(&This->IMultiQI_iface); -} - -static ULONG WINAPI ProxyCliSec_Release(IClientSecurity *iface) -{ - struct proxy_manager *This = impl_from_IClientSecurity( iface ); - return IMultiQI_Release(&This->IMultiQI_iface); -} - -static HRESULT WINAPI ProxyCliSec_QueryBlanket(IClientSecurity *iface, - IUnknown *pProxy, - DWORD *pAuthnSvc, - DWORD *pAuthzSvc, - OLECHAR **ppServerPrincName, - DWORD *pAuthnLevel, - DWORD *pImpLevel, - void **pAuthInfo, - DWORD *pCapabilities) -{ - FIXME("(%p, %p, %p, %p, %p, %p, %p, %p): stub\n", pProxy, pAuthnSvc, - pAuthzSvc, ppServerPrincName, pAuthnLevel, pImpLevel, pAuthInfo, - pCapabilities); - - if (pAuthnSvc) - *pAuthnSvc = 0; - if (pAuthzSvc) - *pAuthzSvc = 0; - if (ppServerPrincName) - *ppServerPrincName = NULL; - if (pAuthnLevel) - *pAuthnLevel = RPC_C_AUTHN_LEVEL_DEFAULT; - if (pImpLevel) - *pImpLevel = RPC_C_IMP_LEVEL_DEFAULT; - if (pAuthInfo) - *pAuthInfo = NULL; - if (pCapabilities) - *pCapabilities = EOAC_NONE; - - return E_NOTIMPL; -} - -static HRESULT WINAPI ProxyCliSec_SetBlanket(IClientSecurity *iface, - IUnknown *pProxy, DWORD AuthnSvc, - DWORD AuthzSvc, - OLECHAR *pServerPrincName, - DWORD AuthnLevel, DWORD ImpLevel, - void *pAuthInfo, - DWORD Capabilities) -{ - FIXME("(%p, %d, %d, %s, %d, %d, %p, 0x%x): stub\n", pProxy, AuthnSvc, AuthzSvc, - pServerPrincName == COLE_DEFAULT_PRINCIPAL ? "<default principal>" : debugstr_w(pServerPrincName), - AuthnLevel, ImpLevel, pAuthInfo, Capabilities); - return E_NOTIMPL; -} - -static HRESULT WINAPI ProxyCliSec_CopyProxy(IClientSecurity *iface, - IUnknown *pProxy, IUnknown **ppCopy) -{ - FIXME("(%p, %p): stub\n", pProxy, ppCopy); - *ppCopy = NULL; - return E_NOTIMPL; -} - -static const IClientSecurityVtbl ProxyCliSec_Vtbl = -{ - ProxyCliSec_QueryInterface, - ProxyCliSec_AddRef, - ProxyCliSec_Release, - ProxyCliSec_QueryBlanket, - ProxyCliSec_SetBlanket, - ProxyCliSec_CopyProxy -}; - -static HRESULT ifproxy_get_public_ref(struct ifproxy * This) -{ - HRESULT hr = S_OK; - - if (WAIT_OBJECT_0 != WaitForSingleObject(This->parent->remoting_mutex, INFINITE)) - { - ERR("Wait failed for ifproxy %p\n", This); - return E_UNEXPECTED; - } - - if (This->refs == 0) - { - IRemUnknown *remunk = NULL; - - TRACE("getting public ref for ifproxy %p\n", This); - - hr = proxy_manager_get_remunknown(This->parent, &remunk); - if (hr == S_OK) - { - HRESULT hrref = S_OK; - REMINTERFACEREF rif; - rif.ipid = This->stdobjref.ipid; - rif.cPublicRefs = NORMALEXTREFS; - rif.cPrivateRefs = 0; - hr = IRemUnknown_RemAddRef(remunk, 1, &rif, &hrref); - IRemUnknown_Release(remunk); - if (hr == S_OK && hrref == S_OK) - InterlockedExchangeAdd((LONG *)&This->refs, NORMALEXTREFS); - else - ERR("IRemUnknown_RemAddRef returned with 0x%08x, hrref = 0x%08x\n", hr, hrref); - } - } - ReleaseMutex(This->parent->remoting_mutex); - - return hr; -} - -static HRESULT ifproxy_release_public_refs(struct ifproxy * This) -{ - HRESULT hr = S_OK; - LONG public_refs; - - if (WAIT_OBJECT_0 != WaitForSingleObject(This->parent->remoting_mutex, INFINITE)) - { - ERR("Wait failed for ifproxy %p\n", This); - return E_UNEXPECTED; - } - - public_refs = This->refs; - if (public_refs > 0) - { - IRemUnknown *remunk = NULL; - - TRACE("releasing %d refs\n", public_refs); - - hr = proxy_manager_get_remunknown(This->parent, &remunk); - if (hr == S_OK) - { - REMINTERFACEREF rif; - rif.ipid = This->stdobjref.ipid; - rif.cPublicRefs = public_refs; - rif.cPrivateRefs = 0; - hr = IRemUnknown_RemRelease(remunk, 1, &rif); - IRemUnknown_Release(remunk); - if (hr == S_OK) - InterlockedExchangeAdd((LONG *)&This->refs, -public_refs); - else if (hr == RPC_E_DISCONNECTED) - WARN("couldn't release references because object was " - "disconnected: oxid = %s, oid = %s\n", - wine_dbgstr_longlong(This->parent->oxid), - wine_dbgstr_longlong(This->parent->oid)); - else - ERR("IRemUnknown_RemRelease failed with error 0x%08x\n", hr); - } - } - ReleaseMutex(This->parent->remoting_mutex); - - return hr; -} - -/* should be called inside This->parent->cs critical section */ -static void ifproxy_disconnect(struct ifproxy * This) -{ - ifproxy_release_public_refs(This); - if (This->proxy) IRpcProxyBuffer_Disconnect(This->proxy); - - IRpcChannelBuffer_Release(This->chan); - This->chan = NULL; -} - -/* should be called in This->parent->cs critical section if it is an entry in parent's list */ -static void ifproxy_destroy(struct ifproxy * This) -{ - TRACE("%p\n", This); - - /* release public references to this object so that the stub can know - * when to destroy itself */ - ifproxy_release_public_refs(This); - - list_remove(&This->entry); - - if (This->chan) - { - IRpcChannelBuffer_Release(This->chan); - This->chan = NULL; - } - - if (This->proxy) IRpcProxyBuffer_Release(This->proxy); - - HeapFree(GetProcessHeap(), 0, This); -} - -static HRESULT proxy_manager_construct( - struct apartment * apt, ULONG sorflags, OXID oxid, OID oid, - const OXID_INFO *oxid_info, struct proxy_manager ** proxy_manager) -{ - struct proxy_manager * This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - if (!This) return E_OUTOFMEMORY; - - This->remoting_mutex = CreateMutexW(NULL, FALSE, NULL); - if (!This->remoting_mutex) - { - HeapFree(GetProcessHeap(), 0, This); - return HRESULT_FROM_WIN32(GetLastError()); - } - - if (oxid_info) - { - This->oxid_info.dwPid = oxid_info->dwPid; - This->oxid_info.dwTid = oxid_info->dwTid; - This->oxid_info.ipidRemUnknown = oxid_info->ipidRemUnknown; - This->oxid_info.dwAuthnHint = oxid_info->dwAuthnHint; - This->oxid_info.psa = NULL /* FIXME: copy from oxid_info */; - } - else - { - HRESULT hr = RPC_ResolveOxid(oxid, &This->oxid_info); - if (FAILED(hr)) - { - CloseHandle(This->remoting_mutex); - HeapFree(GetProcessHeap(), 0, This); - return hr; - } - } - - This->IMultiQI_iface.lpVtbl = &ClientIdentity_Vtbl; - This->IMarshal_iface.lpVtbl = &ProxyMarshal_Vtbl; - This->IClientSecurity_iface.lpVtbl = &ProxyCliSec_Vtbl; - - list_init(&This->entry); - list_init(&This->interfaces); - - InitializeCriticalSection(&This->cs); - DEBUG_SET_CRITSEC_NAME(&This->cs, "proxy_manager"); - - /* the apartment the object was unmarshaled into */ - This->parent = apt; - - /* the source apartment and id of the object */ - This->oxid = oxid; - This->oid = oid; - - This->refs = 1; - - /* the DCOM draft specification states that the SORF_NOPING flag is - * proxy manager specific, not ifproxy specific, so this implies that we - * should store the STDOBJREF flags here in the proxy manager. */ - This->sorflags = sorflags; - - /* we create the IRemUnknown proxy on demand */ - This->remunk = NULL; - - /* initialise these values to the weakest values and they will be - * overwritten in proxy_manager_set_context */ - This->dest_context = MSHCTX_INPROC; - This->dest_context_data = NULL; - - EnterCriticalSection(&apt->cs); - /* FIXME: we are dependent on the ordering in here to make sure a proxy's - * IRemUnknown proxy doesn't get destroyed before the regular proxy does - * because we need the IRemUnknown proxy during the destruction of the - * regular proxy. Ideally, we should maintain a separate list for the - * IRemUnknown proxies that need late destruction */ - list_add_tail(&apt->proxies, &This->entry); - LeaveCriticalSection(&apt->cs); - - TRACE("%p created for OXID %s, OID %s\n", This, - wine_dbgstr_longlong(oxid), wine_dbgstr_longlong(oid)); - - *proxy_manager = This; - return S_OK; -} - -static inline void proxy_manager_set_context(struct proxy_manager *This, MSHCTX dest_context, void *dest_context_data) -{ - MSHCTX old_dest_context; - MSHCTX new_dest_context; - - do - { - old_dest_context = This->dest_context; - new_dest_context = old_dest_context; - /* "stronger" values overwrite "weaker" values. stronger values are - * ones that disable more optimisations */ - switch (old_dest_context) - { - case MSHCTX_INPROC: - new_dest_context = dest_context; - break; - case MSHCTX_CROSSCTX: - switch (dest_context) - { - case MSHCTX_INPROC: - break; - default: - new_dest_context = dest_context; - } - break; - case MSHCTX_LOCAL: - switch (dest_context) - { - case MSHCTX_INPROC: - case MSHCTX_CROSSCTX: - break; - default: - new_dest_context = dest_context; - } - break; - case MSHCTX_NOSHAREDMEM: - switch (dest_context) - { - case MSHCTX_DIFFERENTMACHINE: - new_dest_context = dest_context; - break; - default: - break; - } - break; - default: - break; - } - - if (old_dest_context == new_dest_context) break; - - new_dest_context = InterlockedCompareExchange((PLONG)&This->dest_context, new_dest_context, old_dest_context); - } while (new_dest_context != old_dest_context); - - if (dest_context_data) - InterlockedExchangePointer(&This->dest_context_data, dest_context_data); -} - -static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, REFIID riid, void ** ppv) -{ - HRESULT hr; - struct ifproxy * ifproxy; - - TRACE("%s\n", debugstr_guid(riid)); - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IMultiQI)) - { - *ppv = &This->IMultiQI_iface; - IMultiQI_AddRef(&This->IMultiQI_iface); - return S_OK; - } - if (IsEqualIID(riid, &IID_IMarshal)) - { - *ppv = &This->IMarshal_iface; - IMarshal_AddRef(&This->IMarshal_iface); - return S_OK; - } - if (IsEqualIID(riid, &IID_IClientSecurity)) - { - *ppv = &This->IClientSecurity_iface; - IClientSecurity_AddRef(&This->IClientSecurity_iface); - return S_OK; - } - - hr = proxy_manager_find_ifproxy(This, riid, &ifproxy); - if (hr == S_OK) - { - *ppv = ifproxy->iface; - IUnknown_AddRef((IUnknown *)*ppv); - return S_OK; - } - - *ppv = NULL; - return E_NOINTERFACE; -} - -static HRESULT proxy_manager_create_ifproxy( - struct proxy_manager * This, const STDOBJREF *stdobjref, REFIID riid, - IRpcChannelBuffer * channel, struct ifproxy ** iif_out) -{ - HRESULT hr; - IPSFactoryBuffer * psfb; - struct ifproxy * ifproxy = HeapAlloc(GetProcessHeap(), 0, sizeof(*ifproxy)); - if (!ifproxy) return E_OUTOFMEMORY; - - list_init(&ifproxy->entry); - - ifproxy->parent = This; - ifproxy->stdobjref = *stdobjref; - ifproxy->iid = *riid; - ifproxy->refs = 0; - ifproxy->proxy = NULL; - - assert(channel); - ifproxy->chan = channel; /* FIXME: we should take the binding strings and construct the channel in this function */ - - /* the IUnknown interface is special because it does not have a - * proxy associated with the ifproxy as we handle IUnknown ourselves */ - if (IsEqualIID(riid, &IID_IUnknown)) - { - ifproxy->iface = &This->IMultiQI_iface; - IMultiQI_AddRef(&This->IMultiQI_iface); - hr = S_OK; - } - else - { - hr = get_facbuf_for_iid(riid, &psfb); - if (hr == S_OK) - { - /* important note: the outer unknown is set to the proxy manager. - * This ensures the COM identity rules are not violated, by having a - * one-to-one mapping of objects on the proxy side to objects on the - * stub side, no matter which interface you view the object through */ - hr = IPSFactoryBuffer_CreateProxy(psfb, (IUnknown*)&This->IMultiQI_iface, riid, - &ifproxy->proxy, &ifproxy->iface); - IPSFactoryBuffer_Release(psfb); - if (hr != S_OK) - ERR("Could not create proxy for interface %s, error 0x%08x\n", - debugstr_guid(riid), hr); - } - else - ERR("Could not get IPSFactoryBuffer for interface %s, error 0x%08x\n", - debugstr_guid(riid), hr); - - if (hr == S_OK) - hr = IRpcProxyBuffer_Connect(ifproxy->proxy, ifproxy->chan); - } - - if (hr == S_OK) - { - EnterCriticalSection(&This->cs); - list_add_tail(&This->interfaces, &ifproxy->entry); - LeaveCriticalSection(&This->cs); - - *iif_out = ifproxy; - TRACE("ifproxy %p created for IPID %s, interface %s with %u public refs\n", - ifproxy, debugstr_guid(&stdobjref->ipid), debugstr_guid(riid), stdobjref->cPublicRefs); - } - else - ifproxy_destroy(ifproxy); - - return hr; -} - -static HRESULT proxy_manager_find_ifproxy(struct proxy_manager * This, REFIID riid, struct ifproxy ** ifproxy_found) -{ - HRESULT hr = E_NOINTERFACE; /* assume not found */ - struct list * cursor; - - EnterCriticalSection(&This->cs); - LIST_FOR_EACH(cursor, &This->interfaces) - { - struct ifproxy * ifproxy = LIST_ENTRY(cursor, struct ifproxy, entry); - if (IsEqualIID(riid, &ifproxy->iid)) - { - *ifproxy_found = ifproxy; - hr = S_OK; - break; - } - } - LeaveCriticalSection(&This->cs); - - return hr; -} - -static void proxy_manager_disconnect(struct proxy_manager * This) -{ - struct list * cursor; - - TRACE("oxid = %s, oid = %s\n", wine_dbgstr_longlong(This->oxid), - wine_dbgstr_longlong(This->oid)); - - EnterCriticalSection(&This->cs); - - /* SORFP_NOLIFTIMEMGMT proxies (for IRemUnknown) shouldn't be - * disconnected - it won't do anything anyway, except cause - * problems for other objects that depend on this proxy always - * working */ - if (!(This->sorflags & SORFP_NOLIFETIMEMGMT)) - { - LIST_FOR_EACH(cursor, &This->interfaces) - { - struct ifproxy * ifproxy = LIST_ENTRY(cursor, struct ifproxy, entry); - ifproxy_disconnect(ifproxy); - } - } - - /* apartment is being destroyed so don't keep a pointer around to it */ - This->parent = NULL; - - LeaveCriticalSection(&This->cs); -} - -static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnknown **remunk) -{ - HRESULT hr = S_OK; - struct apartment *apt; - BOOL called_in_original_apt; - - /* we don't want to try and unmarshal or use IRemUnknown if we don't want - * lifetime management */ - if (This->sorflags & SORFP_NOLIFETIMEMGMT) - return S_FALSE; - - if (!(apt = apartment_get_current_or_mta())) - return CO_E_NOTINITIALIZED; - - called_in_original_apt = This->parent && (This->parent->oxid == apt->oxid); - - EnterCriticalSection(&This->cs); - /* only return the cached object if called from the original apartment. - * in future, we might want to make the IRemUnknown proxy callable from any - * apartment to avoid these checks */ - if (This->remunk && called_in_original_apt) - { - /* already created - return existing object */ - *remunk = This->remunk; - IRemUnknown_AddRef(*remunk); - } - else if (!This->parent) - { - /* disconnected - we can't create IRemUnknown */ - *remunk = NULL; - hr = S_FALSE; - } - else - { - STDOBJREF stdobjref; - /* Don't want IRemUnknown lifetime management as this is IRemUnknown! - * We also don't care about whether or not the stub is still alive */ - stdobjref.flags = SORFP_NOLIFETIMEMGMT | SORF_NOPING; - stdobjref.cPublicRefs = 1; - /* oxid of destination object */ - stdobjref.oxid = This->oxid; - /* FIXME: what should be used for the oid? The DCOM draft doesn't say */ - stdobjref.oid = (OID)-1; - stdobjref.ipid = This->oxid_info.ipidRemUnknown; - - /* do the unmarshal */ - hr = unmarshal_object(&stdobjref, apt, This->dest_context, - This->dest_context_data, &IID_IRemUnknown, - &This->oxid_info, (void**)remunk); - if (hr == S_OK && called_in_original_apt) - { - This->remunk = *remunk; - IRemUnknown_AddRef(This->remunk); - } - } - LeaveCriticalSection(&This->cs); - apartment_release(apt); - - TRACE("got IRemUnknown* pointer %p, hr = 0x%08x\n", *remunk, hr); - - return hr; -} - -/* destroys a proxy manager, freeing the memory it used. - * Note: this function should not be called from a list iteration in the - * apartment, due to the fact that it removes itself from the apartment and - * it could add a proxy to IRemUnknown into the apartment. */ -static void proxy_manager_destroy(struct proxy_manager * This) -{ - struct list * cursor; - - TRACE("oxid = %s, oid = %s\n", wine_dbgstr_longlong(This->oxid), - wine_dbgstr_longlong(This->oid)); - - if (This->parent) - { - EnterCriticalSection(&This->parent->cs); - - /* remove ourself from the list of proxy objects in the apartment */ - LIST_FOR_EACH(cursor, &This->parent->proxies) - { - if (cursor == &This->entry) - { - list_remove(&This->entry); - break; - } - } - - LeaveCriticalSection(&This->parent->cs); - } - - /* destroy all of the interface proxies */ - while ((cursor = list_head(&This->interfaces))) - { - struct ifproxy * ifproxy = LIST_ENTRY(cursor, struct ifproxy, entry); - ifproxy_destroy(ifproxy); - } - - if (This->remunk) IRemUnknown_Release(This->remunk); - CoTaskMemFree(This->oxid_info.psa); - - DEBUG_CLEAR_CRITSEC_NAME(&This->cs); - DeleteCriticalSection(&This->cs); - - CloseHandle(This->remoting_mutex); - - HeapFree(GetProcessHeap(), 0, This); -} - -/* finds the proxy manager corresponding to a given OXID and OID that has - * been unmarshaled in the specified apartment. The caller must release the - * reference to the proxy_manager when the object is no longer used. */ -static BOOL find_proxy_manager(struct apartment * apt, OXID oxid, OID oid, struct proxy_manager ** proxy_found) -{ - BOOL found = FALSE; - struct list * cursor; - - EnterCriticalSection(&apt->cs); - LIST_FOR_EACH(cursor, &apt->proxies) - { - struct proxy_manager * proxy = LIST_ENTRY(cursor, struct proxy_manager, entry); - if ((oxid == proxy->oxid) && (oid == proxy->oid)) - { - /* be careful of a race with ClientIdentity_Release, which would - * cause us to return a proxy which is in the process of being - * destroyed */ - if (IMultiQI_AddRef(&proxy->IMultiQI_iface) != 0) - { - *proxy_found = proxy; - found = TRUE; - break; - } - } - } - LeaveCriticalSection(&apt->cs); - return found; -} - -HRESULT WINAPI Internal_apartment_disconnectproxies(struct apartment *apt) -{ - struct list * cursor; - - LIST_FOR_EACH(cursor, &apt->proxies) - { - struct proxy_manager * proxy = LIST_ENTRY(cursor, struct proxy_manager, entry); - proxy_manager_disconnect(proxy); - } - - return S_OK; -} - -/********************** StdMarshal implementation ****************************/ -typedef struct _StdMarshalImpl -{ - IMarshal IMarshal_iface; - LONG ref; - DWORD dest_context; - void *dest_context_data; -} StdMarshalImpl; - -static inline StdMarshalImpl *impl_from_StdMarshal(IMarshal *iface) -{ - return CONTAINING_RECORD(iface, StdMarshalImpl, IMarshal_iface); -} - -static HRESULT WINAPI -StdMarshalImpl_QueryInterface(IMarshal *iface, REFIID riid, void **ppv) -{ - *ppv = NULL; - if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IMarshal, riid)) - { - *ppv = iface; - IMarshal_AddRef(iface); - return S_OK; - } - FIXME("No interface for %s.\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI -StdMarshalImpl_AddRef(IMarshal *iface) -{ - StdMarshalImpl *This = impl_from_StdMarshal(iface); - return InterlockedIncrement(&This->ref); -} - -static ULONG WINAPI -StdMarshalImpl_Release(IMarshal *iface) -{ - StdMarshalImpl *This = impl_from_StdMarshal(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - if (!ref) HeapFree(GetProcessHeap(),0,This); - return ref; -} - -static HRESULT WINAPI -StdMarshalImpl_GetUnmarshalClass( - IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext, - void* pvDestContext, DWORD mshlflags, CLSID* pCid) -{ - *pCid = CLSID_StdMarshal; - return S_OK; -} - -static HRESULT WINAPI -StdMarshalImpl_GetMarshalSizeMax( - IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext, - void* pvDestContext, DWORD mshlflags, DWORD* pSize) -{ - *pSize = FIELD_OFFSET(OBJREF, u_objref.u_standard.saResAddr.aStringArray); - return S_OK; -} - -static HRESULT WINAPI -StdMarshalImpl_MarshalInterface( - IMarshal *iface, IStream *pStm,REFIID riid, void* pv, DWORD dest_context, - void* dest_context_data, DWORD mshlflags) -{ - ULONG res; - HRESULT hres; - struct apartment *apt; - OBJREF objref; - - TRACE("(...,%s,...)\n", debugstr_guid(riid)); - - if (!(apt = apartment_get_current_or_mta())) - { - ERR("Apartment not initialized\n"); - return CO_E_NOTINITIALIZED; - } - - /* make sure this apartment can be reached from other threads / processes */ - RPC_StartRemoting(apt); - - fill_std_objref(&objref, riid, NULL); - hres = marshal_object(apt, &objref.u_objref.u_standard.std, riid, - pv, dest_context, dest_context_data, mshlflags); - apartment_release(apt); - if (hres != S_OK) - { - ERR("Failed to create ifstub, hres=0x%x\n", hres); - return hres; - } - - return IStream_Write(pStm, &objref, - FIELD_OFFSET(OBJREF, u_objref.u_standard.saResAddr.aStringArray), &res); -} - -/* helper for StdMarshalImpl_UnmarshalInterface - does the unmarshaling with - * no questions asked about the rules surrounding same-apartment unmarshals - * and table marshaling */ -HRESULT WINAPI unmarshal_object(const STDOBJREF *stdobjref, struct apartment *apt, - MSHCTX dest_context, void *dest_context_data, - REFIID riid, const OXID_INFO *oxid_info, - void **object) -{ - struct proxy_manager *proxy_manager = NULL; - HRESULT hr = S_OK; - - assert(apt); - - TRACE("stdobjref: flags = %04x cPublicRefs = %d oxid = %s oid = %s ipid = %s\n", - stdobjref->flags, stdobjref->cPublicRefs, - wine_dbgstr_longlong(stdobjref->oxid), - wine_dbgstr_longlong(stdobjref->oid), - debugstr_guid(&stdobjref->ipid)); - - /* create a new proxy manager if one doesn't already exist for the - * object */ - if (!find_proxy_manager(apt, stdobjref->oxid, stdobjref->oid, &proxy_manager)) - { - hr = proxy_manager_construct(apt, stdobjref->flags, - stdobjref->oxid, stdobjref->oid, oxid_info, - &proxy_manager); - } - else - TRACE("proxy manager already created, using\n"); - - if (hr == S_OK) - { - struct ifproxy * ifproxy; - - proxy_manager_set_context(proxy_manager, dest_context, dest_context_data); - - hr = proxy_manager_find_ifproxy(proxy_manager, riid, &ifproxy); - if (hr == E_NOINTERFACE) - { - IRpcChannelBuffer *chanbuf; - hr = RPC_CreateClientChannel(&stdobjref->oxid, &stdobjref->ipid, - &proxy_manager->oxid_info, riid, - proxy_manager->dest_context, - proxy_manager->dest_context_data, - &chanbuf, apt); - if (hr == S_OK) - hr = proxy_manager_create_ifproxy(proxy_manager, stdobjref, - riid, chanbuf, &ifproxy); - } - else - IUnknown_AddRef((IUnknown *)ifproxy->iface); - - if (hr == S_OK) - { - InterlockedExchangeAdd((LONG *)&ifproxy->refs, stdobjref->cPublicRefs); - /* get at least one external reference to the object to keep it alive */ - hr = ifproxy_get_public_ref(ifproxy); - if (FAILED(hr)) - ifproxy_destroy(ifproxy); - } - - if (hr == S_OK) - *object = ifproxy->iface; - } - - /* release our reference to the proxy manager - the client/apartment - * will hold on to the remaining reference for us */ - if (proxy_manager) IMultiQI_Release(&proxy_manager->IMultiQI_iface); - - return hr; -} - -static HRESULT std_unmarshal_interface(MSHCTX dest_context, void *dest_context_data, - IStream *pStm, REFIID riid, void **ppv) -{ - struct stub_manager *stubmgr = NULL; - struct OR_STANDARD obj; - ULONG res; - HRESULT hres; - struct apartment *apt, *stub_apt; - OXID oxid; - - TRACE("(...,%s,....)\n", debugstr_guid(riid)); - - /* we need an apartment to unmarshal into */ - if (!(apt = apartment_get_current_or_mta())) - { - ERR("Apartment not initialized\n"); - return CO_E_NOTINITIALIZED; - } - - /* read STDOBJREF from wire */ - hres = IStream_Read(pStm, &obj, FIELD_OFFSET(struct OR_STANDARD, saResAddr.aStringArray), &res); - if (hres != S_OK) - { - apartment_release(apt); - return STG_E_READFAULT; - } - - hres = apartment_getoxid(apt, &oxid); - if (hres != S_OK) - { - apartment_release(apt); - return hres; - } - - if (obj.saResAddr.wNumEntries) - { - ERR("unsupported size of DUALSTRINGARRAY\n"); - return E_NOTIMPL; - } - - /* check if we're marshalling back to ourselves */ - if ((oxid == obj.std.oxid) && (stubmgr = get_stub_manager(apt, obj.std.oid))) - { - TRACE("Unmarshalling object marshalled in same apartment for iid %s, " - "returning original object %p\n", debugstr_guid(riid), stubmgr->object); - - hres = IUnknown_QueryInterface(stubmgr->object, riid, ppv); - - /* unref the ifstub. FIXME: only do this on success? */ - if (!stub_manager_is_table_marshaled(stubmgr, &obj.std.ipid)) - stub_manager_ext_release(stubmgr, obj.std.cPublicRefs, obj.std.flags & SORFP_TABLEWEAK, FALSE); - - stub_manager_int_release(stubmgr); - apartment_release(apt); - return hres; - } - - /* notify stub manager about unmarshal if process-local object. - * note: if the oxid is not found then we and native will quite happily - * ignore table marshaling and normal marshaling rules regarding number of - * unmarshals, etc, but if you abuse these rules then your proxy could end - * up returning RPC_E_DISCONNECTED. */ - if ((stub_apt = apartment_findfromoxid(obj.std.oxid))) - { - if ((stubmgr = get_stub_manager(stub_apt, obj.std.oid))) - { - if (!stub_manager_notify_unmarshal(stubmgr, &obj.std.ipid)) - hres = CO_E_OBJNOTCONNECTED; - } - else - { - WARN("Couldn't find object for OXID %s, OID %s, assuming disconnected\n", - wine_dbgstr_longlong(obj.std.oxid), - wine_dbgstr_longlong(obj.std.oid)); - hres = CO_E_OBJNOTCONNECTED; - } - } - else - TRACE("Treating unmarshal from OXID %s as inter-process\n", - wine_dbgstr_longlong(obj.std.oxid)); - - if (hres == S_OK) - hres = unmarshal_object(&obj.std, apt, dest_context, - dest_context_data, riid, - stubmgr ? &stubmgr->oxid_info : NULL, ppv); - - if (stubmgr) stub_manager_int_release(stubmgr); - if (stub_apt) apartment_release(stub_apt); - - if (hres != S_OK) WARN("Failed with error 0x%08x\n", hres); - else TRACE("Successfully created proxy %p\n", *ppv); - - apartment_release(apt); - return hres; -} - -static HRESULT WINAPI -StdMarshalImpl_UnmarshalInterface(IMarshal *iface, IStream *pStm, REFIID riid, void **ppv) -{ - StdMarshalImpl *This = impl_from_StdMarshal(iface); - OBJREF objref; - HRESULT hr; - ULONG res; - - hr = IStream_Read(pStm, &objref, FIELD_OFFSET(OBJREF, u_objref), &res); - if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref))) - { - ERR("Failed to read common OBJREF header, 0x%08x\n", hr); - return STG_E_READFAULT; - } - - if (objref.signature != OBJREF_SIGNATURE) - { - ERR("Bad OBJREF signature 0x%08x\n", objref.signature); - return RPC_E_INVALID_OBJREF; - } - - if (!(objref.flags & OBJREF_STANDARD)) - { - FIXME("unsupported objref.flags = %x\n", objref.flags); - return E_NOTIMPL; - } - - return std_unmarshal_interface(This->dest_context, - This->dest_context_data, pStm, riid, ppv); -} - -static HRESULT std_release_marshal_data(IStream *pStm) -{ - struct OR_STANDARD obj; - ULONG res; - HRESULT hres; - struct stub_manager *stubmgr; - struct apartment *apt; - - hres = IStream_Read(pStm, &obj, FIELD_OFFSET(struct OR_STANDARD, saResAddr.aStringArray), &res); - if (hres != S_OK) return STG_E_READFAULT; - - if (obj.saResAddr.wNumEntries) - { - ERR("unsupported size of DUALSTRINGARRAY\n"); - return E_NOTIMPL; - } - - TRACE("oxid = %s, oid = %s, ipid = %s\n", - wine_dbgstr_longlong(obj.std.oxid), - wine_dbgstr_longlong(obj.std.oid), - wine_dbgstr_guid(&obj.std.ipid)); - - if (!(apt = apartment_findfromoxid(obj.std.oxid))) - { - WARN("Could not map OXID %s to apartment object\n", - wine_dbgstr_longlong(obj.std.oxid)); - return RPC_E_INVALID_OBJREF; - } - - if (!(stubmgr = get_stub_manager(apt, obj.std.oid))) - { - apartment_release(apt); - ERR("could not map object ID to stub manager, oxid=%s, oid=%s\n", - wine_dbgstr_longlong(obj.std.oxid), wine_dbgstr_longlong(obj.std.oid)); - return RPC_E_INVALID_OBJREF; - } - - stub_manager_release_marshal_data(stubmgr, obj.std.cPublicRefs, &obj.std.ipid, obj.std.flags & SORFP_TABLEWEAK); - - stub_manager_int_release(stubmgr); - apartment_release(apt); - - return S_OK; -} - -static HRESULT WINAPI -StdMarshalImpl_ReleaseMarshalData(IMarshal *iface, IStream *pStm) -{ - OBJREF objref; - HRESULT hr; - ULONG res; - - TRACE("iface=%p, pStm=%p\n", iface, pStm); - - hr = IStream_Read(pStm, &objref, FIELD_OFFSET(OBJREF, u_objref), &res); - if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref))) - { - ERR("Failed to read common OBJREF header, 0x%08x\n", hr); - return STG_E_READFAULT; - } - - if (objref.signature != OBJREF_SIGNATURE) - { - ERR("Bad OBJREF signature 0x%08x\n", objref.signature); - return RPC_E_INVALID_OBJREF; - } - - if (!(objref.flags & OBJREF_STANDARD)) - { - FIXME("unsupported objref.flags = %x\n", objref.flags); - return E_NOTIMPL; - } - - return std_release_marshal_data(pStm); -} - -static HRESULT WINAPI -StdMarshalImpl_DisconnectObject(IMarshal *iface, DWORD dwReserved) -{ - FIXME("(), stub!\n"); - return S_OK; -} - -static const IMarshalVtbl StdMarshalVtbl = -{ - StdMarshalImpl_QueryInterface, - StdMarshalImpl_AddRef, - StdMarshalImpl_Release, - StdMarshalImpl_GetUnmarshalClass, - StdMarshalImpl_GetMarshalSizeMax, - StdMarshalImpl_MarshalInterface, - StdMarshalImpl_UnmarshalInterface, - StdMarshalImpl_ReleaseMarshalData, - StdMarshalImpl_DisconnectObject -}; - -static HRESULT StdMarshalImpl_Construct(REFIID riid, DWORD dest_context, void *dest_context_data, void** ppvObject) -{ - HRESULT hr; - - StdMarshalImpl *pStdMarshal = HeapAlloc(GetProcessHeap(), 0, sizeof(StdMarshalImpl)); - if (!pStdMarshal) - return E_OUTOFMEMORY; - - pStdMarshal->IMarshal_iface.lpVtbl = &StdMarshalVtbl; - pStdMarshal->ref = 0; - pStdMarshal->dest_context = dest_context; - pStdMarshal->dest_context_data = dest_context_data; - - hr = IMarshal_QueryInterface(&pStdMarshal->IMarshal_iface, riid, ppvObject); - if (FAILED(hr)) - HeapFree(GetProcessHeap(), 0, pStdMarshal); - - return hr; -} - -/*********************************************************************** - * CoGetStandardMarshal [OLE32.@] - * - * Gets or creates a standard marshal object. - * - * PARAMS - * riid [I] Interface identifier of the pUnk object. - * pUnk [I] Optional. Object to get the marshal object for. - * dwDestContext [I] Destination. Used to enable or disable optimizations. - * pvDestContext [I] Reserved. Must be NULL. - * mshlflags [I] Flags affecting the marshaling process. - * ppMarshal [O] Address where marshal object will be stored. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * NOTES - * - * The function retrieves the IMarshal object associated with an object if - * that object is currently an active stub, otherwise a new marshal object is - * created. - */ -HRESULT WINAPI CoGetStandardMarshal(REFIID riid, IUnknown *pUnk, - DWORD dwDestContext, LPVOID pvDestContext, - DWORD mshlflags, LPMARSHAL *ppMarshal) -{ - if (pUnk == NULL) - { - FIXME("(%s,NULL,%x,%p,%x,%p), unimplemented yet.\n", - debugstr_guid(riid),dwDestContext,pvDestContext,mshlflags,ppMarshal); - return E_NOTIMPL; - } - TRACE("(%s,%p,%x,%p,%x,%p)\n", - debugstr_guid(riid),pUnk,dwDestContext,pvDestContext,mshlflags,ppMarshal); - - return StdMarshalImpl_Construct(&IID_IMarshal, dwDestContext, pvDestContext, (void**)ppMarshal); -} +HRESULT WINAPI InternalCoStdMarshalObject(REFIID riid, DWORD dest_context, void *dest_context_data, void **ppvObject); static HRESULT WINAPI StdMarshalCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppv) @@ -1724,7 +67,7 @@ static HRESULT WINAPI StdMarshalCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) { if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMarshal)) - return StdMarshalImpl_Construct(riid, 0, NULL, ppv); + return InternalCoStdMarshalObject(riid, 0, NULL, ppv); FIXME("(%s), not supported.\n",debugstr_guid(riid)); return E_NOINTERFACE; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index ee478c73d2b..1ea57416176 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -43,7 +43,7 @@ @ stdcall CoGetObject(wstr ptr ptr ptr) @ stdcall CoGetObjectContext(ptr ptr) combase.CoGetObjectContext @ stdcall CoGetPSClsid(ptr ptr) combase.CoGetPSClsid -@ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr) +@ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr) combase.CoGetStandardMarshal @ stdcall CoGetState(ptr) @ stub CoGetTIDFromIPID @ stdcall CoGetTreatAsClass(ptr ptr) combase.CoGetTreatAsClass @@ -299,9 +299,10 @@ @ stub WriteOleStg @ stub WriteStringStream -@ stdcall Internal_apartment_disconnectproxies(ptr) @ stdcall Internal_RPC_ExecuteCall(ptr) -@ stdcall marshal_object(ptr ptr ptr ptr long ptr long) -@ stdcall unmarshal_object(ptr ptr long ptr ptr ptr ptr) @ stdcall RPC_CreateServerChannel(long ptr ptr) @ stdcall RPC_UnregisterInterface(ptr long) +@ stdcall RPC_RegisterInterface(ptr) +@ stdcall RPC_ResolveOxid(int64 ptr) +@ stdcall RPC_StartRemoting(ptr) +@ stdcall RPC_CreateClientChannel(ptr ptr ptr ptr long ptr ptr ptr) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 0aa2ebb41fe..a6783c45eae 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1096,7 +1096,7 @@ static const IRpcChannelBufferVtbl ServerRpcChannelBufferVtbl = }; /* returns a channel buffer for proxies */ -HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, +HRESULT WINAPI RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, const OXID_INFO *oxid_info, const IID *iid, DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan, struct apartment *apt) @@ -1531,7 +1531,7 @@ static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) } /* stub registration */ -HRESULT RPC_RegisterInterface(REFIID riid) +HRESULT WINAPI RPC_RegisterInterface(REFIID riid) { struct registered_if *rif; BOOL found = FALSE; @@ -1610,7 +1610,7 @@ void WINAPI RPC_UnregisterInterface(REFIID riid, BOOL wait) /* get the info for an OXID, including the IPID for the rem unknown interface * and the string binding */ -HRESULT RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info) +HRESULT WINAPI RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info) { TRACE("%s\n", wine_dbgstr_longlong(oxid)); @@ -1631,7 +1631,7 @@ HRESULT RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info) /* make the apartment reachable by other threads and processes and create the * IRemUnknown object */ -void RPC_StartRemoting(struct apartment *apt) +void WINAPI RPC_StartRemoting(struct apartment *apt) { if (!InterlockedExchange(&apt->remoting_started, TRUE)) { -- 2.23.0

2 1

[PATCH v2 1/5] combase: Move stub manager.
by Huw Davies 01 Sep '20

01 Sep '20

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/combase/Makefile.in | 2 + dlls/combase/apartment.c | 5 +- dlls/combase/combase.c | 84 +++++++++++++++++ dlls/combase/combase.spec | 17 +++- dlls/combase/combase_private.h | 101 ++++++++++++++------ dlls/combase/dcom.idl | 62 ++++++++++++ dlls/{ole32 => combase}/stubmanager.c | 131 ++++++++++++++------------ dlls/ole32/Makefile.in | 1 - dlls/ole32/compobj.c | 121 ------------------------ dlls/ole32/compobj_private.h | 23 +---- dlls/ole32/marshal.c | 12 ++- dlls/ole32/ole32.spec | 9 +- dlls/ole32/rpc.c | 8 +- 13 files changed, 330 insertions(+), 246 deletions(-) create mode 100644 dlls/combase/dcom.idl rename dlls/{ole32 => combase}/stubmanager.c (86%) diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index 45e1ff189cb..ebf86708bbc 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -14,7 +14,9 @@ C_SRCS = \ roapi.c \ rpc.c \ string.c \ + stubmanager.c \ usrmarshal.c IDL_SRCS = \ + dcom.idl \ irpcss.idl diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 12637c8acdb..1637d674222 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -444,7 +444,6 @@ void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) } extern HRESULT WINAPI Internal_apartment_disconnectproxies(struct apartment *apt); -extern ULONG WINAPI Internal_stub_manager_int_release(struct stub_manager *stubmgr); void WINAPI apartment_release(struct apartment *apt) { @@ -513,7 +512,7 @@ void WINAPI apartment_release(struct apartment *apt) * stub manager list in the apartment and all non-apartment users * must have a ref on the apartment and so it cannot be destroyed). */ - Internal_stub_manager_int_release(stubmgr); + stub_manager_int_release(stubmgr); } /* if this assert fires, then another thread took a reference to a @@ -654,7 +653,7 @@ struct apartment * WINAPI apartment_findfromoxid(OXID oxid) /* gets the apartment which has a given creator thread ID. The caller must * release the reference from the apartment as soon as the apartment pointer * is no longer required. */ -struct apartment * WINAPI apartment_findfromtid(DWORD tid) +struct apartment * apartment_findfromtid(DWORD tid) { struct apartment *result = NULL; struct list *cursor; diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index da91d66cc53..b3e3844a4db 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -2968,6 +2968,90 @@ ULONG WINAPI CoReleaseServerProcess(void) return refs; } +/****************************************************************************** + * CoDisconnectObject (combase.@) + */ +HRESULT WINAPI CoDisconnectObject(IUnknown *object, DWORD reserved) +{ + struct stub_manager *manager; + struct apartment *apt; + IMarshal *marshal; + HRESULT hr; + + TRACE("%p, %#x\n", object, reserved); + + if (!object) + return E_INVALIDARG; + + hr = IUnknown_QueryInterface(object, &IID_IMarshal, (void **)&marshal); + if (hr == S_OK) + { + hr = IMarshal_DisconnectObject(marshal, reserved); + IMarshal_Release(marshal); + return hr; + } + + if (!(apt = apartment_get_current_or_mta())) + { + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; + } + + manager = get_stub_manager_from_object(apt, object, FALSE); + if (manager) + { + stub_manager_disconnect(manager); + /* Release stub manager twice, to remove the apartment reference. */ + stub_manager_int_release(manager); + stub_manager_int_release(manager); + } + + /* Note: native is pretty broken here because it just silently + * fails, without returning an appropriate error code if the object was + * not found, making apps think that the object was disconnected, when + * it actually wasn't */ + + apartment_release(apt); + return S_OK; +} + +/****************************************************************************** + * CoLockObjectExternal (combase.@) + */ +HRESULT WINAPI CoLockObjectExternal(IUnknown *object, BOOL lock, BOOL last_unlock_releases) +{ + struct stub_manager *stubmgr; + struct apartment *apt; + + TRACE("%p, %d, %d\n", object, lock, last_unlock_releases); + + if (!(apt = apartment_get_current_or_mta())) + { + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; + } + + stubmgr = get_stub_manager_from_object(apt, object, lock); + if (!stubmgr) + { + WARN("stub object not found %p\n", object); + /* Note: native is pretty broken here because it just silently + * fails, without returning an appropriate error code, making apps + * think that the object was disconnected, when it actually wasn't */ + apartment_release(apt); + return S_OK; + } + + if (lock) + stub_manager_ext_addref(stubmgr, 1, FALSE); + else + stub_manager_ext_release(stubmgr, 1, FALSE, last_unlock_releases); + + stub_manager_int_release(stubmgr); + apartment_release(apt); + return S_OK; +} + /*********************************************************************** * DllMain (combase.@) */ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index a888e6deeea..4ac93ff545d 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -89,7 +89,7 @@ @ stdcall CoDecrementMTAUsage(ptr) @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext -@ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject +@ stdcall CoDisconnectObject(ptr long) @ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation @ stdcall CoFileTimeNow(ptr) @ stdcall CoFreeUnusedLibraries() @@ -128,7 +128,7 @@ @ stdcall CoInitializeWOW(long long) ole32.CoInitializeWOW @ stub CoInvalidateRemoteMachineBindings @ stdcall CoIsHandlerConnected(ptr) ole32.CoIsHandlerConnected -@ stdcall CoLockObjectExternal(ptr long long) ole32.CoLockObjectExternal +@ stdcall CoLockObjectExternal(ptr long long) @ stdcall CoMarshalHresult(ptr long) @ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) @ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) @@ -358,4 +358,15 @@ @ stdcall apartment_findfromoxid(int64) @ stdcall apartment_getwindow(ptr) @ stdcall apartment_createwindowifneeded(ptr) -@ stdcall apartment_findfromtid(long) +@ stdcall stub_manager_int_release(ptr) +@ stdcall get_stub_manager(ptr int64) +@ stdcall stub_manager_is_table_marshaled(ptr ptr) +@ stdcall stub_manager_notify_unmarshal(ptr ptr) +@ stdcall stub_manager_ext_release(ptr long long long) +@ stdcall stub_manager_release_marshal_data(ptr long ptr long) +@ stdcall get_stub_manager_from_object(ptr ptr long) +@ stdcall stub_manager_find_ifstub(ptr ptr long) +@ stdcall stub_manager_ext_addref(ptr long long) +@ stdcall stub_manager_new_ifstub(ptr ptr ptr long ptr long) +@ stdcall ipid_get_dispatch_params(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall start_apartment_remote_unknown(ptr) diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index e62204d289c..898d42b3c7b 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -113,34 +113,6 @@ HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj) DEC HRESULT rpc_start_local_server(REFCLSID clsid, IStream *stream, BOOL multi_use, void **registration) DECLSPEC_HIDDEN; void rpc_stop_local_server(void *registration) DECLSPEC_HIDDEN; -/* stub managers hold refs on the object and each interface stub */ -struct stub_manager -{ - struct list entry; /* entry in apartment stubmgr list (CS apt->cs) */ - struct list ifstubs; /* list of active ifstubs for the object (CS lock) */ - CRITICAL_SECTION lock; - struct apartment *apt; /* owning apt (RO) */ - - ULONG extrefs; /* number of 'external' references (CS lock) */ - ULONG refs; /* internal reference count (CS apt->cs) */ - ULONG weakrefs; /* number of weak references (CS lock) */ - OID oid; /* apartment-scoped unique identifier (RO) */ - IUnknown *object; /* the object we are managing the stub for (RO) */ - ULONG next_ipid; /* currently unused (LOCK) */ - OXID_INFO oxid_info; /* string binding, ipid of rem unknown and other information (RO) */ - - IExternalConnection *extern_conn; - - /* We need to keep a count of the outstanding marshals, so we can enforce the - * marshalling rules (ie, you can only unmarshal normal marshals once). Note - * that these counts do NOT include unmarshalled interfaces, once a stream is - * unmarshalled and a proxy set up, this count is decremented. - */ - - ULONG norm_refs; /* refcount of normal marshals (CS lock) */ - BOOL disconnected; /* CoDisconnectObject has been called (CS lock) */ -}; - enum class_reg_data_origin { CLASS_REG_ACTCTX, @@ -175,7 +147,78 @@ HRESULT apartment_get_local_server_stream(struct apartment *apt, IStream **ret) IUnknown *com_get_registered_class_object(const struct apartment *apartment, REFCLSID rclsid, DWORD clscontext) DECLSPEC_HIDDEN; void apartment_revoke_all_classes(const struct apartment *apt) DECLSPEC_HIDDEN; +struct apartment * WINAPI apartment_findfromoxid(OXID oxid); +struct apartment * apartment_findfromtid(DWORD tid) DECLSPEC_HIDDEN; /* Stub Manager */ -ULONG stub_manager_int_release(struct stub_manager *This) DECLSPEC_HIDDEN; +/* signal to stub manager that this is a rem unknown object */ +#define MSHLFLAGSP_REMUNKNOWN 0x80000000 + +/* Thread-safety Annotation Legend: + * + * RO - The value is read only. It never changes after creation, so no + * locking is required. + * LOCK - The value is written to only using Interlocked* functions. + * CS - The value is read or written to inside a critical section. + * The identifier following "CS" is the specific critical section that + * must be used. + * MUTEX - The value is read or written to with a mutex held. + * The identifier following "MUTEX" is the specific mutex that + * must be used. + */ + +typedef enum ifstub_state +{ + STUBSTATE_NORMAL_MARSHALED, + STUBSTATE_NORMAL_UNMARSHALED, + STUBSTATE_TABLE_WEAK_MARSHALED, + STUBSTATE_TABLE_WEAK_UNMARSHALED, + STUBSTATE_TABLE_STRONG, +} STUB_STATE; + +/* an interface stub */ +struct ifstub +{ + struct list entry; /* entry in stub_manager->ifstubs list (CS stub_manager->lock) */ + IRpcStubBuffer *stubbuffer; /* RO */ + IID iid; /* RO */ + IPID ipid; /* RO */ + IUnknown *iface; /* RO */ + MSHLFLAGS flags; /* so we can enforce process-local marshalling rules (RO) */ + IRpcChannelBuffer*chan; /* channel passed to IRpcStubBuffer::Invoke (RO) */ +}; + +/* stub managers hold refs on the object and each interface stub */ +struct stub_manager +{ + struct list entry; /* entry in apartment stubmgr list (CS apt->cs) */ + struct list ifstubs; /* list of active ifstubs for the object (CS lock) */ + CRITICAL_SECTION lock; + struct apartment *apt; /* owning apt (RO) */ + + ULONG extrefs; /* number of 'external' references (CS lock) */ + ULONG refs; /* internal reference count (CS apt->cs) */ + ULONG weakrefs; /* number of weak references (CS lock) */ + OID oid; /* apartment-scoped unique identifier (RO) */ + IUnknown *object; /* the object we are managing the stub for (RO) */ + ULONG next_ipid; /* currently unused (LOCK) */ + OXID_INFO oxid_info; /* string binding, ipid of rem unknown and other information (RO) */ + + IExternalConnection *extern_conn; + + /* We need to keep a count of the outstanding marshals, so we can enforce the + * marshalling rules (ie, you can only unmarshal normal marshals once). Note + * that these counts do NOT include unmarshalled interfaces, once a stream is + * unmarshalled and a proxy set up, this count is decremented. + */ + + ULONG norm_refs; /* refcount of normal marshals (CS lock) */ + BOOL disconnected; /* CoDisconnectObject has been called (CS lock) */ +}; + +ULONG WINAPI stub_manager_int_release(struct stub_manager *stub_manager) DECLSPEC_HIDDEN; +struct stub_manager * WINAPI get_stub_manager_from_object(struct apartment *apt, IUnknown *object, BOOL alloc); +void stub_manager_disconnect(struct stub_manager *m) DECLSPEC_HIDDEN; +ULONG WINAPI stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) DECLSPEC_HIDDEN; +ULONG WINAPI stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) DECLSPEC_HIDDEN; diff --git a/dlls/combase/dcom.idl b/dlls/combase/dcom.idl new file mode 100644 index 00000000000..56e3152456c --- /dev/null +++ b/dlls/combase/dcom.idl @@ -0,0 +1,62 @@ +/* + * Copyright 2003 Ove Kåven, TransGaming Technologies + * + * 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 + */ + +/* see the official DCOM specification + * (there's a copy at http://www.grimes.demon.co.uk/DCOM/DCOMSpec.htm) */ + +#pragma makedep header + +#include "wine/orpc.idl" + +[ + object, + uuid(00000131-0000-0000-c000-000000000046) +] +interface IRemUnknown : IUnknown +{ + typedef [unique] IRemUnknown *LPREMUNKNOWN; + + typedef struct tagREMQIRESULT + { + HRESULT hResult; + STDOBJREF std; + } REMQIRESULT; + + typedef struct tagREMINTERFACEREF + { + IPID ipid; + unsigned long cPublicRefs; + unsigned long cPrivateRefs; + } REMINTERFACEREF; + + HRESULT RemQueryInterface( + [in] REFIPID ripid, + [in] ULONG cRefs, + [in] unsigned short cIids, + [in, size_is(cIids)] IID *iids, + [out, size_is(,cIids)] REMQIRESULT **ppQIResults); + + HRESULT RemAddRef( + [in] unsigned short cInterfaceRefs, + [in, size_is(cInterfaceRefs)] REMINTERFACEREF *InterfaceRefs, + [out, size_is(cInterfaceRefs)] HRESULT *pResults); + + HRESULT RemRelease( + [in] unsigned short cInterfaceRefs, + [in, size_is(cInterfaceRefs)] REMINTERFACEREF *InterfaceRefs); +} diff --git a/dlls/ole32/stubmanager.c b/dlls/combase/stubmanager.c similarity index 86% rename from dlls/ole32/stubmanager.c rename to dlls/combase/stubmanager.c index d38e22adb47..b1070c5683e 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/combase/stubmanager.c @@ -38,10 +38,16 @@ #include "wine/debug.h" #include "wine/exception.h" -#include "compobj_private.h" +#include "initguid.h" +#include "dcom.h" +#include "combase_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); +extern HRESULT WINAPI marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object, + DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags); +extern HRESULT WINAPI RPC_CreateServerChannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan); +extern void WINAPI RPC_UnregisterInterface(REFIID riid, BOOL wait); /* generates an ipid in the following format (similar to native version): * Data1 = apartment-local ipid counter @@ -67,7 +73,7 @@ static inline HRESULT generate_ipid(struct stub_manager *m, IPID *ipid) } /* registers a new interface stub COM object with the stub manager and returns registration record */ -struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, REFIID iid, DWORD dest_context, +struct ifstub * WINAPI stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, REFIID iid, DWORD dest_context, void *dest_context_data, MSHLFLAGS flags) { struct ifstub *stub; @@ -155,7 +161,7 @@ static struct ifstub *stub_manager_ipid_to_ifstub(struct stub_manager *m, const return result; } -struct ifstub *stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags) +struct ifstub * WINAPI stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags) { struct ifstub *result = NULL; struct ifstub *ifstub; @@ -182,15 +188,15 @@ static struct stub_manager *new_stub_manager(struct apartment *apt, IUnknown *ob struct stub_manager *sm; HRESULT hres; - assert( apt ); - + assert(apt); + sm = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct stub_manager)); if (!sm) return NULL; list_init(&sm->ifstubs); InitializeCriticalSection(&sm->lock); - DEBUG_SET_CRITSEC_NAME(&sm->lock, "stub_manager"); + sm->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": stub_manager"); IUnknown_AddRef(object); sm->object = object; @@ -287,51 +293,46 @@ static void stub_manager_delete(struct stub_manager *m) } __ENDTRY - DEBUG_CLEAR_CRITSEC_NAME(&m->lock); + m->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&m->lock); HeapFree(GetProcessHeap(), 0, m); } /* increments the internal refcount */ -static ULONG stub_manager_int_addref(struct stub_manager *This) +static ULONG stub_manager_int_addref(struct stub_manager *m) { ULONG refs; - EnterCriticalSection(&This->apt->cs); - refs = ++This->refs; - LeaveCriticalSection(&This->apt->cs); + EnterCriticalSection(&m->apt->cs); + refs = ++m->refs; + LeaveCriticalSection(&m->apt->cs); TRACE("before %d\n", refs - 1); return refs; } -ULONG WINAPI Internal_stub_manager_int_release(struct stub_manager *m) -{ - return stub_manager_int_release(m); -} - /* decrements the internal refcount */ -ULONG stub_manager_int_release(struct stub_manager *This) +ULONG WINAPI stub_manager_int_release(struct stub_manager *m) { ULONG refs; - struct apartment *apt = This->apt; + struct apartment *apt = m->apt; EnterCriticalSection(&apt->cs); - refs = --This->refs; + refs = --m->refs; TRACE("after %d\n", refs); /* remove from apartment so no other thread can access it... */ if (!refs) - list_remove(&This->entry); + list_remove(&m->entry); LeaveCriticalSection(&apt->cs); /* ... so now we can delete it without being inside the apartment critsec */ if (!refs) - stub_manager_delete(This); + stub_manager_delete(m); return refs; } @@ -339,7 +340,7 @@ ULONG stub_manager_int_release(struct stub_manager *This) /* gets the stub manager associated with an object - caller must have * a reference to the apartment while a reference to the stub manager is held. * it must also call release on the stub manager when it is no longer needed */ -struct stub_manager *get_stub_manager_from_object(struct apartment *apt, IUnknown *obj, BOOL alloc) +struct stub_manager * WINAPI get_stub_manager_from_object(struct apartment *apt, IUnknown *obj, BOOL alloc) { struct stub_manager *result = NULL; struct list *cursor; @@ -347,13 +348,14 @@ struct stub_manager *get_stub_manager_from_object(struct apartment *apt, IUnknow HRESULT hres; hres = IUnknown_QueryInterface(obj, &IID_IUnknown, (void**)&object); - if (FAILED(hres)) { + if (FAILED(hres)) + { ERR("QueryInterface(IID_IUnknown failed): %08x\n", hres); return NULL; } EnterCriticalSection(&apt->cs); - LIST_FOR_EACH( cursor, &apt->stubmgrs ) + LIST_FOR_EACH(cursor, &apt->stubmgrs) { struct stub_manager *m = LIST_ENTRY( cursor, struct stub_manager, entry ); @@ -366,12 +368,17 @@ struct stub_manager *get_stub_manager_from_object(struct apartment *apt, IUnknow } LeaveCriticalSection(&apt->cs); - if (result) { + if (result) + { TRACE("found %p for object %p\n", result, object); - }else if (alloc) { + } + else if (alloc) + { TRACE("not found, creating new stub manager...\n"); result = new_stub_manager(apt, object); - }else { + } + else + { TRACE("not found for object %p\n", object); } @@ -382,15 +389,15 @@ struct stub_manager *get_stub_manager_from_object(struct apartment *apt, IUnknow /* gets the stub manager associated with an object id - caller must have * a reference to the apartment while a reference to the stub manager is held. * it must also call release on the stub manager when it is no longer needed */ -struct stub_manager *get_stub_manager(struct apartment *apt, OID oid) +struct stub_manager * WINAPI get_stub_manager(struct apartment *apt, OID oid) { struct stub_manager *result = NULL; struct list *cursor; EnterCriticalSection(&apt->cs); - LIST_FOR_EACH( cursor, &apt->stubmgrs ) + LIST_FOR_EACH(cursor, &apt->stubmgrs) { - struct stub_manager *m = LIST_ENTRY( cursor, struct stub_manager, entry ); + struct stub_manager *m = LIST_ENTRY(cursor, struct stub_manager, entry); if (m->oid == oid) { @@ -410,7 +417,7 @@ struct stub_manager *get_stub_manager(struct apartment *apt, OID oid) } /* add some external references (ie from a client that unmarshaled an ifptr) */ -ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) +ULONG WINAPI stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) { BOOL first_extern_ref; ULONG rc; @@ -427,7 +434,7 @@ ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak rc += ++m->weakrefs; LeaveCriticalSection(&m->lock); - + TRACE("added %u refs to %p (oid %s), rc is now %u\n", refs, m, wine_dbgstr_longlong(m->oid), rc); /* @@ -441,7 +448,7 @@ ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak } /* remove some external references */ -ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) +ULONG WINAPI stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) { BOOL last_extern_ref; ULONG rc; @@ -460,7 +467,7 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea last_extern_ref = refs && !m->extrefs; LeaveCriticalSection(&m->lock); - + TRACE("removed %u refs from %p (oid %s), rc is now %u\n", refs, m, wine_dbgstr_longlong(m->oid), rc); if (last_extern_ref && m->extern_conn) @@ -482,9 +489,9 @@ static struct stub_manager *get_stub_manager_from_ipid(struct apartment *apt, co struct list *cursor; EnterCriticalSection(&apt->cs); - LIST_FOR_EACH( cursor, &apt->stubmgrs ) + LIST_FOR_EACH(cursor, &apt->stubmgrs) { - struct stub_manager *m = LIST_ENTRY( cursor, struct stub_manager, entry ); + struct stub_manager *m = LIST_ENTRY(cursor, struct stub_manager, entry); if ((*ifstub = stub_manager_ipid_to_ifstub(m, ipid))) { @@ -535,7 +542,7 @@ static HRESULT ipid_to_stub_manager(const IPID *ipid, struct apartment **stub_ap /* gets the apartment, stub and channel of an object. the caller must * release the references to all objects (except iface) if the function * returned success, otherwise no references are returned. */ -HRESULT ipid_get_dispatch_params(const IPID *ipid, struct apartment **stub_apt, +HRESULT WINAPI ipid_get_dispatch_params(const IPID *ipid, struct apartment **stub_apt, struct stub_manager **manager, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) @@ -564,7 +571,7 @@ HRESULT ipid_get_dispatch_params(const IPID *ipid, struct apartment **stub_apt, } /* returns TRUE if it is possible to unmarshal, FALSE otherwise. */ -BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) +BOOL WINAPI stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) { BOOL ret = TRUE; struct ifstub *ifstub; @@ -595,13 +602,13 @@ BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) } /* handles refcounting for CoReleaseMarshalData */ -void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak) +void WINAPI stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak) { struct ifstub *ifstub; - + if (!(ifstub = stub_manager_ipid_to_ifstub(m, ipid))) return; - + if (ifstub->flags & MSHLFLAGS_TABLEWEAK) refs = 0; else if (ifstub->flags & MSHLFLAGS_TABLESTRONG) @@ -611,16 +618,15 @@ void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const } /* is an ifstub table marshaled? */ -BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid) +BOOL WINAPI stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid) { struct ifstub *ifstub = stub_manager_ipid_to_ifstub(m, ipid); - assert( ifstub ); - + assert(ifstub); + return ifstub->flags & (MSHLFLAGS_TABLESTRONG | MSHLFLAGS_TABLEWEAK); } - /***************************************************************************** * * IRemUnknown implementation @@ -643,24 +649,24 @@ static inline RemUnknown *impl_from_IRemUnknown(IRemUnknown *iface) return CONTAINING_RECORD(iface, RemUnknown, IRemUnknown_iface); } - /* construct an IRemUnknown object with one outstanding reference */ static HRESULT RemUnknown_Construct(IRemUnknown **ppRemUnknown) { - RemUnknown *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + RemUnknown *object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); - if (!This) return E_OUTOFMEMORY; + if (!object) + return E_OUTOFMEMORY; - This->IRemUnknown_iface.lpVtbl = &RemUnknown_Vtbl; - This->refs = 1; + object->IRemUnknown_iface.lpVtbl = &RemUnknown_Vtbl; + object->refs = 1; - *ppRemUnknown = &This->IRemUnknown_iface; + *ppRemUnknown = &object->IRemUnknown_iface; return S_OK; } static HRESULT WINAPI RemUnknown_QueryInterface(IRemUnknown *iface, REFIID riid, void **ppv) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + TRACE("%p, %s, %p\n", iface, debugstr_guid(riid), ppv); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IRemUnknown)) @@ -680,9 +686,9 @@ static HRESULT WINAPI RemUnknown_QueryInterface(IRemUnknown *iface, REFIID riid, static ULONG WINAPI RemUnknown_AddRef(IRemUnknown *iface) { ULONG refs; - RemUnknown *This = impl_from_IRemUnknown(iface); + RemUnknown *remunk = impl_from_IRemUnknown(iface); - refs = InterlockedIncrement(&This->refs); + refs = InterlockedIncrement(&remunk->refs); TRACE("%p before: %d\n", iface, refs-1); return refs; @@ -691,11 +697,11 @@ static ULONG WINAPI RemUnknown_AddRef(IRemUnknown *iface) static ULONG WINAPI RemUnknown_Release(IRemUnknown *iface) { ULONG refs; - RemUnknown *This = impl_from_IRemUnknown(iface); + RemUnknown *remunk = impl_from_IRemUnknown(iface); - refs = InterlockedDecrement(&This->refs); + refs = InterlockedDecrement(&remunk->refs); if (!refs) - HeapFree(GetProcessHeap(), 0, This); + HeapFree(GetProcessHeap(), 0, remunk); TRACE("%p after: %d\n", iface, refs); return refs; @@ -714,7 +720,7 @@ static HRESULT WINAPI RemUnknown_RemQueryInterface(IRemUnknown *iface, DWORD dest_context; void *dest_context_data; - TRACE("(%p)->(%s, %d, %d, %p, %p)\n", iface, debugstr_guid(ripid), cRefs, cIids, iids, ppQIResults); + TRACE("%p, %s, %d, %d, %p, %p\n", iface, debugstr_guid(ripid), cRefs, cIids, iids, ppQIResults); hr = ipid_to_ifstub(ripid, &apt, &stubmgr, &ifstub); if (hr != S_OK) return hr; @@ -751,7 +757,7 @@ static HRESULT WINAPI RemUnknown_RemAddRef(IRemUnknown *iface, HRESULT hr = S_OK; USHORT i; - TRACE("(%p)->(%d, %p, %p)\n", iface, cInterfaceRefs, InterfaceRefs, pResults); + TRACE("%p, %d, %p, %p\n", iface, cInterfaceRefs, InterfaceRefs, pResults); for (i = 0; i < cInterfaceRefs; i++) { @@ -783,7 +789,7 @@ static HRESULT WINAPI RemUnknown_RemRelease(IRemUnknown *iface, HRESULT hr = S_OK; USHORT i; - TRACE("(%p)->(%d, %p)\n", iface, cInterfaceRefs, InterfaceRefs); + TRACE("%p, %d, %p\n", iface, cInterfaceRefs, InterfaceRefs); for (i = 0; i < cInterfaceRefs; i++) { @@ -820,7 +826,7 @@ static const IRemUnknownVtbl RemUnknown_Vtbl = }; /* starts the IRemUnknown listener for the current apartment */ -HRESULT start_apartment_remote_unknown(struct apartment *apt) +HRESULT WINAPI start_apartment_remote_unknown(struct apartment *apt) { IRemUnknown *pRemUnknown; HRESULT hr = S_OK; @@ -834,7 +840,8 @@ HRESULT start_apartment_remote_unknown(struct apartment *apt) { STDOBJREF stdobjref; /* dummy - not used */ /* register it with the stub manager */ - hr = marshal_object(apt, &stdobjref, &IID_IRemUnknown, (IUnknown *)pRemUnknown, MSHCTX_DIFFERENTMACHINE, NULL, MSHLFLAGS_NORMAL|MSHLFLAGSP_REMUNKNOWN); + hr = marshal_object(apt, &stdobjref, &IID_IRemUnknown, (IUnknown *)pRemUnknown, + MSHCTX_DIFFERENTMACHINE, NULL, MSHLFLAGS_NORMAL|MSHLFLAGSP_REMUNKNOWN); /* release our reference to the object as the stub manager will manage the life cycle for us */ IRemUnknown_Release(pRemUnknown); if (hr == S_OK) diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 1c1e28fa4c5..ddbdfab30de 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -37,7 +37,6 @@ C_SRCS = \ stg_prop.c \ stg_stream.c \ storage32.c \ - stubmanager.c \ usrmarshal.c RC_SRCS = ole32res.rc diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 39ccc86b352..b92dfd87267 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -529,69 +529,6 @@ HRESULT WINAPI CoInitialize(LPVOID lpReserved) return CoInitializeEx(lpReserved, COINIT_APARTMENTTHREADED); } -/****************************************************************************** - * CoDisconnectObject [OLE32.@] - * - * Disconnects all connections to this object from remote processes. Dispatches - * pending RPCs while blocking new RPCs from occurring, and then calls - * IMarshal::DisconnectObject on the given object. - * - * Typically called when the object server is forced to shut down, for instance by - * the user. - * - * PARAMS - * lpUnk [I] The object whose stub should be disconnected. - * reserved [I] Reserved. Should be set to 0. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * SEE ALSO - * CoMarshalInterface, CoReleaseMarshalData, CoLockObjectExternal - */ -HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) -{ - struct stub_manager *manager; - HRESULT hr; - IMarshal *marshal; - struct apartment *apt; - - TRACE("(%p, 0x%08x)\n", lpUnk, reserved); - - if (!lpUnk) return E_INVALIDARG; - - hr = IUnknown_QueryInterface(lpUnk, &IID_IMarshal, (void **)&marshal); - if (hr == S_OK) - { - hr = IMarshal_DisconnectObject(marshal, reserved); - IMarshal_Release(marshal); - return hr; - } - - if (!(apt = apartment_get_current_or_mta())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } - - manager = get_stub_manager_from_object(apt, lpUnk, FALSE); - if (manager) { - stub_manager_disconnect(manager); - /* Release stub manager twice, to remove the apartment reference. */ - stub_manager_int_release(manager); - stub_manager_int_release(manager); - } - - /* Note: native is pretty broken here because it just silently - * fails, without returning an appropriate error code if the object was - * not found, making apps think that the object was disconnected, when - * it actually wasn't */ - - apartment_release(apt); - return S_OK; -} - /* open HKCR\\CLSID\\{string form of clsid}\\{keyname} key */ HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *subkey) { @@ -698,64 +635,6 @@ void WINAPI CoFreeAllLibraries(void) /* NOP */ } -/****************************************************************************** - * CoLockObjectExternal [OLE32.@] - * - * Increments or decrements the external reference count of a stub object. - * - * PARAMS - * pUnk [I] Stub object. - * fLock [I] If TRUE then increments the external ref-count, - * otherwise decrements. - * fLastUnlockReleases [I] If TRUE then the last unlock has the effect of - * calling CoDisconnectObject. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * NOTES - * If fLock is TRUE and an object is passed in that doesn't have a stub - * manager then a new stub manager is created for the object. - */ -HRESULT WINAPI CoLockObjectExternal( - LPUNKNOWN pUnk, - BOOL fLock, - BOOL fLastUnlockReleases) -{ - struct stub_manager *stubmgr; - struct apartment *apt; - - TRACE("pUnk=%p, fLock=%s, fLastUnlockReleases=%s\n", - pUnk, fLock ? "TRUE" : "FALSE", fLastUnlockReleases ? "TRUE" : "FALSE"); - - if (!(apt = apartment_get_current_or_mta())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } - - stubmgr = get_stub_manager_from_object(apt, pUnk, fLock); - if (!stubmgr) - { - WARN("stub object not found %p\n", pUnk); - /* Note: native is pretty broken here because it just silently - * fails, without returning an appropriate error code, making apps - * think that the object was disconnected, when it actually wasn't */ - apartment_release(apt); - return S_OK; - } - - if (fLock) - stub_manager_ext_addref(stubmgr, 1, FALSE); - else - stub_manager_ext_release(stubmgr, 1, FALSE, fLastUnlockReleases); - - stub_manager_int_release(stubmgr); - apartment_release(apt); - return S_OK; -} - /*********************************************************************** * CoInitializeWOW (OLE32.@) * diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 953574423aa..6f1cf7243e3 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -194,24 +194,8 @@ HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; /* Stub Manager */ -ULONG stub_manager_int_release(struct stub_manager *This) DECLSPEC_HIDDEN; -ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) DECLSPEC_HIDDEN; -ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) DECLSPEC_HIDDEN; -struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, REFIID iid, - DWORD dest_context, void *dest_context_data, MSHLFLAGS flags) DECLSPEC_HIDDEN; -struct ifstub *stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags) DECLSPEC_HIDDEN; -struct stub_manager *get_stub_manager(struct apartment *apt, OID oid) DECLSPEC_HIDDEN; -struct stub_manager *get_stub_manager_from_object(struct apartment *apt, IUnknown *object, BOOL alloc) DECLSPEC_HIDDEN; -BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN; -BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN; -void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak) DECLSPEC_HIDDEN; -void stub_manager_disconnect(struct stub_manager *m) DECLSPEC_HIDDEN; -HRESULT ipid_get_dispatch_params(const IPID *ipid, struct apartment **stub_apt, struct stub_manager **manager, IRpcStubBuffer **stub, - IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) DECLSPEC_HIDDEN; -HRESULT start_apartment_remote_unknown(struct apartment *apt) DECLSPEC_HIDDEN; - -HRESULT marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *obj, DWORD dest_context, - void *dest_context_data, MSHLFLAGS mshlflags) DECLSPEC_HIDDEN; +extern ULONG WINAPI stub_manager_int_release(struct stub_manager *This) DECLSPEC_HIDDEN; +extern struct stub_manager * WINAPI get_stub_manager(struct apartment *apt, OID oid) DECLSPEC_HIDDEN; /* RPC Backend */ @@ -222,9 +206,7 @@ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, const OXID_INFO *oxid_info, const IID *iid, DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan, struct apartment *apt) DECLSPEC_HIDDEN; -HRESULT RPC_CreateServerChannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) DECLSPEC_HIDDEN; HRESULT RPC_RegisterInterface(REFIID riid) DECLSPEC_HIDDEN; -void RPC_UnregisterInterface(REFIID riid, BOOL wait) DECLSPEC_HIDDEN; HRESULT RPC_RegisterChannelHook(REFGUID rguid, IChannelHook *hook) DECLSPEC_HIDDEN; void RPC_UnregisterAllChannelHooks(void) DECLSPEC_HIDDEN; HRESULT RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info) DECLSPEC_HIDDEN; @@ -235,7 +217,6 @@ void OLEDD_UnInitialize(void) DECLSPEC_HIDDEN; /* Apartment Functions */ extern struct apartment * WINAPI apartment_findfromoxid(OXID oxid) DECLSPEC_HIDDEN; -extern struct apartment * WINAPI apartment_findfromtid(DWORD tid) DECLSPEC_HIDDEN; extern void WINAPI apartment_release(struct apartment *apt) DECLSPEC_HIDDEN; static inline HRESULT apartment_getoxid(const struct apartment *apt, OXID *oxid) { diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index d08144f619a..87017dbc922 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -39,6 +39,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +extern BOOL WINAPI stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid); +extern BOOL WINAPI stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid); +extern ULONG WINAPI stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases); +extern void WINAPI stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak); +extern struct stub_manager * WINAPI get_stub_manager_from_object(struct apartment *apt, IUnknown *object, BOOL alloc); +extern struct ifstub * WINAPI stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags); +extern ULONG WINAPI stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak); +extern struct ifstub * WINAPI stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, REFIID iid, + DWORD dest_context, void *dest_context_data, MSHLFLAGS flags); + /* number of refs given out for normal marshaling */ #define NORMALEXTREFS 5 @@ -118,7 +128,7 @@ static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf) } /* marshals an object into a STDOBJREF structure */ -HRESULT marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object, +HRESULT WINAPI marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object, DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags) { struct stub_manager *manager; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index ca22e4c8f1a..972629ecb70 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -16,7 +16,7 @@ @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) combase.CoCreateInstanceEx @ stdcall CoDecrementMTAUsage(ptr) combase.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) -@ stdcall CoDisconnectObject(ptr long) +@ stdcall CoDisconnectObject(ptr long) combase.CoDisconnectObject @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime @ stdcall CoEnableCallCancellation(ptr) @ stdcall CoFileTimeNow(ptr) combase.CoFileTimeNow @@ -56,7 +56,7 @@ @ stdcall CoIsHandlerConnected(ptr) @ stdcall CoIsOle1Class (ptr) @ stdcall CoLoadLibrary(wstr long) -@ stdcall CoLockObjectExternal(ptr long long) +@ stdcall CoLockObjectExternal(ptr long long) combase.CoLockObjectExternal @ stdcall CoMarshalHresult(ptr long) combase.CoMarshalHresult @ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) combase.CoMarshalInterThreadInterfaceInStream @ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) combase.CoMarshalInterface @@ -298,6 +298,9 @@ @ stdcall WriteFmtUserTypeStg(ptr long ptr) @ stub WriteOleStg @ stub WriteStringStream + @ stdcall Internal_apartment_disconnectproxies(ptr) @ stdcall Internal_RPC_ExecuteCall(ptr) -@ stdcall Internal_stub_manager_int_release(ptr) +@ stdcall marshal_object(ptr ptr ptr ptr long ptr long) +@ stdcall RPC_CreateServerChannel(long ptr ptr) +@ stdcall RPC_UnregisterInterface(ptr long) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 84d26c70c6c..0aa2ebb41fe 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -43,6 +43,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +extern HRESULT WINAPI ipid_get_dispatch_params(const IPID *ipid, struct apartment **stub_apt, + struct stub_manager **manager, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, IID *iid, IUnknown **iface); +extern HRESULT WINAPI start_apartment_remote_unknown(struct apartment *apt); + static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg); /* we only use one function to dispatch calls for all methods - we use the @@ -1159,7 +1163,7 @@ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, return S_OK; } -HRESULT RPC_CreateServerChannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) +HRESULT WINAPI RPC_CreateServerChannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) { RpcChannelBuffer *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) @@ -1584,7 +1588,7 @@ HRESULT RPC_RegisterInterface(REFIID riid) } /* stub unregistration */ -void RPC_UnregisterInterface(REFIID riid, BOOL wait) +void WINAPI RPC_UnregisterInterface(REFIID riid, BOOL wait) { struct registered_if *rif; EnterCriticalSection(&csRegIf); -- 2.23.0

2 1

[PATCH 1/5] combase: Move stub manager.
by Nikolay Sivov 01 Sep '20

01 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/Makefile.in | 2 + dlls/combase/apartment.c | 5 +- dlls/combase/combase.c | 84 +++++++++++++++++ dlls/combase/combase.spec | 17 +++- dlls/combase/combase_private.h | 101 ++++++++++++++------ dlls/combase/dcom.idl | 62 +++++++++++++ dlls/{ole32 => combase}/stubmanager.c | 127 ++++++++++++++------------ dlls/ole32/Makefile.in | 1 - dlls/ole32/compobj.c | 121 ------------------------ dlls/ole32/compobj_private.h | 23 +---- dlls/ole32/marshal.c | 12 ++- dlls/ole32/ole32.spec | 9 +- dlls/ole32/rpc.c | 8 +- 13 files changed, 328 insertions(+), 244 deletions(-) create mode 100644 dlls/combase/dcom.idl rename dlls/{ole32 => combase}/stubmanager.c (86%) diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index 45e1ff189cb..ebf86708bbc 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -14,7 +14,9 @@ C_SRCS = \ roapi.c \ rpc.c \ string.c \ + stubmanager.c \ usrmarshal.c IDL_SRCS = \ + dcom.idl \ irpcss.idl diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 12637c8acdb..1637d674222 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -444,7 +444,6 @@ void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) } extern HRESULT WINAPI Internal_apartment_disconnectproxies(struct apartment *apt); -extern ULONG WINAPI Internal_stub_manager_int_release(struct stub_manager *stubmgr); void WINAPI apartment_release(struct apartment *apt) { @@ -513,7 +512,7 @@ void WINAPI apartment_release(struct apartment *apt) * stub manager list in the apartment and all non-apartment users * must have a ref on the apartment and so it cannot be destroyed). */ - Internal_stub_manager_int_release(stubmgr); + stub_manager_int_release(stubmgr); } /* if this assert fires, then another thread took a reference to a @@ -654,7 +653,7 @@ struct apartment * WINAPI apartment_findfromoxid(OXID oxid) /* gets the apartment which has a given creator thread ID. The caller must * release the reference from the apartment as soon as the apartment pointer * is no longer required. */ -struct apartment * WINAPI apartment_findfromtid(DWORD tid) +struct apartment * apartment_findfromtid(DWORD tid) { struct apartment *result = NULL; struct list *cursor; diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index da91d66cc53..b3e3844a4db 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -2968,6 +2968,90 @@ ULONG WINAPI CoReleaseServerProcess(void) return refs; } +/****************************************************************************** + * CoDisconnectObject (combase.@) + */ +HRESULT WINAPI CoDisconnectObject(IUnknown *object, DWORD reserved) +{ + struct stub_manager *manager; + struct apartment *apt; + IMarshal *marshal; + HRESULT hr; + + TRACE("%p, %#x\n", object, reserved); + + if (!object) + return E_INVALIDARG; + + hr = IUnknown_QueryInterface(object, &IID_IMarshal, (void **)&marshal); + if (hr == S_OK) + { + hr = IMarshal_DisconnectObject(marshal, reserved); + IMarshal_Release(marshal); + return hr; + } + + if (!(apt = apartment_get_current_or_mta())) + { + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; + } + + manager = get_stub_manager_from_object(apt, object, FALSE); + if (manager) + { + stub_manager_disconnect(manager); + /* Release stub manager twice, to remove the apartment reference. */ + stub_manager_int_release(manager); + stub_manager_int_release(manager); + } + + /* Note: native is pretty broken here because it just silently + * fails, without returning an appropriate error code if the object was + * not found, making apps think that the object was disconnected, when + * it actually wasn't */ + + apartment_release(apt); + return S_OK; +} + +/****************************************************************************** + * CoLockObjectExternal (combase.@) + */ +HRESULT WINAPI CoLockObjectExternal(IUnknown *object, BOOL lock, BOOL last_unlock_releases) +{ + struct stub_manager *stubmgr; + struct apartment *apt; + + TRACE("%p, %d, %d\n", object, lock, last_unlock_releases); + + if (!(apt = apartment_get_current_or_mta())) + { + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; + } + + stubmgr = get_stub_manager_from_object(apt, object, lock); + if (!stubmgr) + { + WARN("stub object not found %p\n", object); + /* Note: native is pretty broken here because it just silently + * fails, without returning an appropriate error code, making apps + * think that the object was disconnected, when it actually wasn't */ + apartment_release(apt); + return S_OK; + } + + if (lock) + stub_manager_ext_addref(stubmgr, 1, FALSE); + else + stub_manager_ext_release(stubmgr, 1, FALSE, last_unlock_releases); + + stub_manager_int_release(stubmgr); + apartment_release(apt); + return S_OK; +} + /*********************************************************************** * DllMain (combase.@) */ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index a888e6deeea..4ac93ff545d 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -89,7 +89,7 @@ @ stdcall CoDecrementMTAUsage(ptr) @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext -@ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject +@ stdcall CoDisconnectObject(ptr long) @ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation @ stdcall CoFileTimeNow(ptr) @ stdcall CoFreeUnusedLibraries() @@ -128,7 +128,7 @@ @ stdcall CoInitializeWOW(long long) ole32.CoInitializeWOW @ stub CoInvalidateRemoteMachineBindings @ stdcall CoIsHandlerConnected(ptr) ole32.CoIsHandlerConnected -@ stdcall CoLockObjectExternal(ptr long long) ole32.CoLockObjectExternal +@ stdcall CoLockObjectExternal(ptr long long) @ stdcall CoMarshalHresult(ptr long) @ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) @ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) @@ -358,4 +358,15 @@ @ stdcall apartment_findfromoxid(int64) @ stdcall apartment_getwindow(ptr) @ stdcall apartment_createwindowifneeded(ptr) -@ stdcall apartment_findfromtid(long) +@ stdcall stub_manager_int_release(ptr) +@ stdcall get_stub_manager(ptr int64) +@ stdcall stub_manager_is_table_marshaled(ptr ptr) +@ stdcall stub_manager_notify_unmarshal(ptr ptr) +@ stdcall stub_manager_ext_release(ptr long long long) +@ stdcall stub_manager_release_marshal_data(ptr long ptr long) +@ stdcall get_stub_manager_from_object(ptr ptr long) +@ stdcall stub_manager_find_ifstub(ptr ptr long) +@ stdcall stub_manager_ext_addref(ptr long long) +@ stdcall stub_manager_new_ifstub(ptr ptr ptr long ptr long) +@ stdcall ipid_get_dispatch_params(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall start_apartment_remote_unknown(ptr) diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index e62204d289c..c6f7e6f071b 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -113,34 +113,6 @@ HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj) DEC HRESULT rpc_start_local_server(REFCLSID clsid, IStream *stream, BOOL multi_use, void **registration) DECLSPEC_HIDDEN; void rpc_stop_local_server(void *registration) DECLSPEC_HIDDEN; -/* stub managers hold refs on the object and each interface stub */ -struct stub_manager -{ - struct list entry; /* entry in apartment stubmgr list (CS apt->cs) */ - struct list ifstubs; /* list of active ifstubs for the object (CS lock) */ - CRITICAL_SECTION lock; - struct apartment *apt; /* owning apt (RO) */ - - ULONG extrefs; /* number of 'external' references (CS lock) */ - ULONG refs; /* internal reference count (CS apt->cs) */ - ULONG weakrefs; /* number of weak references (CS lock) */ - OID oid; /* apartment-scoped unique identifier (RO) */ - IUnknown *object; /* the object we are managing the stub for (RO) */ - ULONG next_ipid; /* currently unused (LOCK) */ - OXID_INFO oxid_info; /* string binding, ipid of rem unknown and other information (RO) */ - - IExternalConnection *extern_conn; - - /* We need to keep a count of the outstanding marshals, so we can enforce the - * marshalling rules (ie, you can only unmarshal normal marshals once). Note - * that these counts do NOT include unmarshalled interfaces, once a stream is - * unmarshalled and a proxy set up, this count is decremented. - */ - - ULONG norm_refs; /* refcount of normal marshals (CS lock) */ - BOOL disconnected; /* CoDisconnectObject has been called (CS lock) */ -}; - enum class_reg_data_origin { CLASS_REG_ACTCTX, @@ -175,7 +147,78 @@ HRESULT apartment_get_local_server_stream(struct apartment *apt, IStream **ret) IUnknown *com_get_registered_class_object(const struct apartment *apartment, REFCLSID rclsid, DWORD clscontext) DECLSPEC_HIDDEN; void apartment_revoke_all_classes(const struct apartment *apt) DECLSPEC_HIDDEN; +struct apartment * WINAPI apartment_findfromoxid(OXID oxid); +struct apartment * apartment_findfromtid(DWORD tid) DECLSPEC_HIDDEN; /* Stub Manager */ -ULONG stub_manager_int_release(struct stub_manager *This) DECLSPEC_HIDDEN; +/* signal to stub manager that this is a rem unknown object */ +#define MSHLFLAGSP_REMUNKNOWN 0x80000000 + +/* Thread-safety Annotation Legend: + * + * RO - The value is read only. It never changes after creation, so no + * locking is required. + * LOCK - The value is written to only using Interlocked* functions. + * CS - The value is read or written to inside a critical section. + * The identifier following "CS" is the specific critical section that + * must be used. + * MUTEX - The value is read or written to with a mutex held. + * The identifier following "MUTEX" is the specific mutex that + * must be used. + */ + +typedef enum ifstub_state +{ + STUBSTATE_NORMAL_MARSHALED, + STUBSTATE_NORMAL_UNMARSHALED, + STUBSTATE_TABLE_WEAK_MARSHALED, + STUBSTATE_TABLE_WEAK_UNMARSHALED, + STUBSTATE_TABLE_STRONG, +} STUB_STATE; + +/* an interface stub */ +struct ifstub +{ + struct list entry; /* entry in stub_manager->ifstubs list (CS stub_manager->lock) */ + IRpcStubBuffer *stubbuffer; /* RO */ + IID iid; /* RO */ + IPID ipid; /* RO */ + IUnknown *iface; /* RO */ + MSHLFLAGS flags; /* so we can enforce process-local marshalling rules (RO) */ + IRpcChannelBuffer*chan; /* channel passed to IRpcStubBuffer::Invoke (RO) */ +}; + +/* stub managers hold refs on the object and each interface stub */ +struct stub_manager +{ + struct list entry; /* entry in apartment stubmgr list (CS apt->cs) */ + struct list ifstubs; /* list of active ifstubs for the object (CS lock) */ + CRITICAL_SECTION lock; + struct apartment *apt; /* owning apt (RO) */ + + ULONG extrefs; /* number of 'external' references (CS lock) */ + ULONG refs; /* internal reference count (CS apt->cs) */ + ULONG weakrefs; /* number of weak references (CS lock) */ + OID oid; /* apartment-scoped unique identifier (RO) */ + IUnknown *object; /* the object we are managing the stub for (RO) */ + ULONG next_ipid; /* currently unused (LOCK) */ + OXID_INFO oxid_info; /* string binding, ipid of rem unknown and other information (RO) */ + + IExternalConnection *extern_conn; + + /* We need to keep a count of the outstanding marshals, so we can enforce the + * marshalling rules (ie, you can only unmarshal normal marshals once). Note + * that these counts do NOT include unmarshalled interfaces, once a stream is + * unmarshalled and a proxy set up, this count is decremented. + */ + + ULONG norm_refs; /* refcount of normal marshals (CS lock) */ + BOOL disconnected; /* CoDisconnectObject has been called (CS lock) */ +}; + +ULONG WINAPI stub_manager_int_release(struct stub_manager *stub_manager) DECLSPEC_HIDDEN; +struct stub_manager * WINAPI get_stub_manager_from_object(struct apartment *apt, IUnknown *object, BOOL alloc); +void stub_manager_disconnect(struct stub_manager *m) DECLSPEC_HIDDEN; +ULONG WINAPI stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) DECLSPEC_HIDDEN; +ULONG WINAPI stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) DECLSPEC_HIDDEN; diff --git a/dlls/combase/dcom.idl b/dlls/combase/dcom.idl new file mode 100644 index 00000000000..56e3152456c --- /dev/null +++ b/dlls/combase/dcom.idl @@ -0,0 +1,62 @@ +/* + * Copyright 2003 Ove Kåven, TransGaming Technologies + * + * 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 + */ + +/* see the official DCOM specification + * (there's a copy at http://www.grimes.demon.co.uk/DCOM/DCOMSpec.htm) */ + +#pragma makedep header + +#include "wine/orpc.idl" + +[ + object, + uuid(00000131-0000-0000-c000-000000000046) +] +interface IRemUnknown : IUnknown +{ + typedef [unique] IRemUnknown *LPREMUNKNOWN; + + typedef struct tagREMQIRESULT + { + HRESULT hResult; + STDOBJREF std; + } REMQIRESULT; + + typedef struct tagREMINTERFACEREF + { + IPID ipid; + unsigned long cPublicRefs; + unsigned long cPrivateRefs; + } REMINTERFACEREF; + + HRESULT RemQueryInterface( + [in] REFIPID ripid, + [in] ULONG cRefs, + [in] unsigned short cIids, + [in, size_is(cIids)] IID *iids, + [out, size_is(,cIids)] REMQIRESULT **ppQIResults); + + HRESULT RemAddRef( + [in] unsigned short cInterfaceRefs, + [in, size_is(cInterfaceRefs)] REMINTERFACEREF *InterfaceRefs, + [out, size_is(cInterfaceRefs)] HRESULT *pResults); + + HRESULT RemRelease( + [in] unsigned short cInterfaceRefs, + [in, size_is(cInterfaceRefs)] REMINTERFACEREF *InterfaceRefs); +} diff --git a/dlls/ole32/stubmanager.c b/dlls/combase/stubmanager.c similarity index 86% rename from dlls/ole32/stubmanager.c rename to dlls/combase/stubmanager.c index d38e22adb47..f5e6497ec6a 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/combase/stubmanager.c @@ -38,10 +38,16 @@ #include "wine/debug.h" #include "wine/exception.h" -#include "compobj_private.h" +#include "initguid.h" +#include "dcom.h" +#include "combase_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); +extern HRESULT WINAPI marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object, + DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags); +extern HRESULT WINAPI RPC_CreateServerChannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan); +extern void WINAPI RPC_UnregisterInterface(REFIID riid, BOOL wait); /* generates an ipid in the following format (similar to native version): * Data1 = apartment-local ipid counter @@ -67,7 +73,7 @@ static inline HRESULT generate_ipid(struct stub_manager *m, IPID *ipid) } /* registers a new interface stub COM object with the stub manager and returns registration record */ -struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, REFIID iid, DWORD dest_context, +struct ifstub * WINAPI stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, REFIID iid, DWORD dest_context, void *dest_context_data, MSHLFLAGS flags) { struct ifstub *stub; @@ -155,7 +161,7 @@ static struct ifstub *stub_manager_ipid_to_ifstub(struct stub_manager *m, const return result; } -struct ifstub *stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags) +struct ifstub * WINAPI stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags) { struct ifstub *result = NULL; struct ifstub *ifstub; @@ -182,15 +188,15 @@ static struct stub_manager *new_stub_manager(struct apartment *apt, IUnknown *ob struct stub_manager *sm; HRESULT hres; - assert( apt ); - + assert(apt); + sm = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct stub_manager)); if (!sm) return NULL; list_init(&sm->ifstubs); InitializeCriticalSection(&sm->lock); - DEBUG_SET_CRITSEC_NAME(&sm->lock, "stub_manager"); + sm->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": stub_manager"); IUnknown_AddRef(object); sm->object = object; @@ -287,51 +293,46 @@ static void stub_manager_delete(struct stub_manager *m) } __ENDTRY - DEBUG_CLEAR_CRITSEC_NAME(&m->lock); + m->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&m->lock); HeapFree(GetProcessHeap(), 0, m); } /* increments the internal refcount */ -static ULONG stub_manager_int_addref(struct stub_manager *This) +static ULONG stub_manager_int_addref(struct stub_manager *m) { ULONG refs; - EnterCriticalSection(&This->apt->cs); - refs = ++This->refs; - LeaveCriticalSection(&This->apt->cs); + EnterCriticalSection(&m->apt->cs); + refs = ++m->refs; + LeaveCriticalSection(&m->apt->cs); TRACE("before %d\n", refs - 1); return refs; } -ULONG WINAPI Internal_stub_manager_int_release(struct stub_manager *m) -{ - return stub_manager_int_release(m); -} - /* decrements the internal refcount */ -ULONG stub_manager_int_release(struct stub_manager *This) +ULONG WINAPI stub_manager_int_release(struct stub_manager *m) { ULONG refs; - struct apartment *apt = This->apt; + struct apartment *apt = m->apt; EnterCriticalSection(&apt->cs); - refs = --This->refs; + refs = --m->refs; TRACE("after %d\n", refs); /* remove from apartment so no other thread can access it... */ if (!refs) - list_remove(&This->entry); + list_remove(&m->entry); LeaveCriticalSection(&apt->cs); /* ... so now we can delete it without being inside the apartment critsec */ if (!refs) - stub_manager_delete(This); + stub_manager_delete(m); return refs; } @@ -339,7 +340,7 @@ ULONG stub_manager_int_release(struct stub_manager *This) /* gets the stub manager associated with an object - caller must have * a reference to the apartment while a reference to the stub manager is held. * it must also call release on the stub manager when it is no longer needed */ -struct stub_manager *get_stub_manager_from_object(struct apartment *apt, IUnknown *obj, BOOL alloc) +struct stub_manager * WINAPI get_stub_manager_from_object(struct apartment *apt, IUnknown *obj, BOOL alloc) { struct stub_manager *result = NULL; struct list *cursor; @@ -347,13 +348,14 @@ struct stub_manager *get_stub_manager_from_object(struct apartment *apt, IUnknow HRESULT hres; hres = IUnknown_QueryInterface(obj, &IID_IUnknown, (void**)&object); - if (FAILED(hres)) { + if (FAILED(hres)) + { ERR("QueryInterface(IID_IUnknown failed): %08x\n", hres); return NULL; } EnterCriticalSection(&apt->cs); - LIST_FOR_EACH( cursor, &apt->stubmgrs ) + LIST_FOR_EACH(cursor, &apt->stubmgrs) { struct stub_manager *m = LIST_ENTRY( cursor, struct stub_manager, entry ); @@ -366,12 +368,17 @@ struct stub_manager *get_stub_manager_from_object(struct apartment *apt, IUnknow } LeaveCriticalSection(&apt->cs); - if (result) { + if (result) + { TRACE("found %p for object %p\n", result, object); - }else if (alloc) { + } + else if (alloc) + { TRACE("not found, creating new stub manager...\n"); result = new_stub_manager(apt, object); - }else { + } + else + { TRACE("not found for object %p\n", object); } @@ -382,15 +389,15 @@ struct stub_manager *get_stub_manager_from_object(struct apartment *apt, IUnknow /* gets the stub manager associated with an object id - caller must have * a reference to the apartment while a reference to the stub manager is held. * it must also call release on the stub manager when it is no longer needed */ -struct stub_manager *get_stub_manager(struct apartment *apt, OID oid) +struct stub_manager * WINAPI get_stub_manager(struct apartment *apt, OID oid) { struct stub_manager *result = NULL; struct list *cursor; EnterCriticalSection(&apt->cs); - LIST_FOR_EACH( cursor, &apt->stubmgrs ) + LIST_FOR_EACH(cursor, &apt->stubmgrs) { - struct stub_manager *m = LIST_ENTRY( cursor, struct stub_manager, entry ); + struct stub_manager *m = LIST_ENTRY(cursor, struct stub_manager, entry); if (m->oid == oid) { @@ -410,7 +417,7 @@ struct stub_manager *get_stub_manager(struct apartment *apt, OID oid) } /* add some external references (ie from a client that unmarshaled an ifptr) */ -ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) +ULONG WINAPI stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) { BOOL first_extern_ref; ULONG rc; @@ -427,7 +434,7 @@ ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak rc += ++m->weakrefs; LeaveCriticalSection(&m->lock); - + TRACE("added %u refs to %p (oid %s), rc is now %u\n", refs, m, wine_dbgstr_longlong(m->oid), rc); /* @@ -441,7 +448,7 @@ ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak } /* remove some external references */ -ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) +ULONG WINAPI stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) { BOOL last_extern_ref; ULONG rc; @@ -460,7 +467,7 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea last_extern_ref = refs && !m->extrefs; LeaveCriticalSection(&m->lock); - + TRACE("removed %u refs from %p (oid %s), rc is now %u\n", refs, m, wine_dbgstr_longlong(m->oid), rc); if (last_extern_ref && m->extern_conn) @@ -482,9 +489,9 @@ static struct stub_manager *get_stub_manager_from_ipid(struct apartment *apt, co struct list *cursor; EnterCriticalSection(&apt->cs); - LIST_FOR_EACH( cursor, &apt->stubmgrs ) + LIST_FOR_EACH(cursor, &apt->stubmgrs) { - struct stub_manager *m = LIST_ENTRY( cursor, struct stub_manager, entry ); + struct stub_manager *m = LIST_ENTRY(cursor, struct stub_manager, entry); if ((*ifstub = stub_manager_ipid_to_ifstub(m, ipid))) { @@ -535,7 +542,7 @@ static HRESULT ipid_to_stub_manager(const IPID *ipid, struct apartment **stub_ap /* gets the apartment, stub and channel of an object. the caller must * release the references to all objects (except iface) if the function * returned success, otherwise no references are returned. */ -HRESULT ipid_get_dispatch_params(const IPID *ipid, struct apartment **stub_apt, +HRESULT WINAPI ipid_get_dispatch_params(const IPID *ipid, struct apartment **stub_apt, struct stub_manager **manager, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) @@ -564,7 +571,7 @@ HRESULT ipid_get_dispatch_params(const IPID *ipid, struct apartment **stub_apt, } /* returns TRUE if it is possible to unmarshal, FALSE otherwise. */ -BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) +BOOL WINAPI stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) { BOOL ret = TRUE; struct ifstub *ifstub; @@ -595,7 +602,7 @@ BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) } /* handles refcounting for CoReleaseMarshalData */ -void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak) +void WINAPI stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak) { struct ifstub *ifstub; @@ -611,16 +618,15 @@ void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const } /* is an ifstub table marshaled? */ -BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid) +BOOL WINAPI stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid) { struct ifstub *ifstub = stub_manager_ipid_to_ifstub(m, ipid); - assert( ifstub ); - + assert(ifstub); + return ifstub->flags & (MSHLFLAGS_TABLESTRONG | MSHLFLAGS_TABLEWEAK); } - /***************************************************************************** * * IRemUnknown implementation @@ -643,24 +649,24 @@ static inline RemUnknown *impl_from_IRemUnknown(IRemUnknown *iface) return CONTAINING_RECORD(iface, RemUnknown, IRemUnknown_iface); } - /* construct an IRemUnknown object with one outstanding reference */ static HRESULT RemUnknown_Construct(IRemUnknown **ppRemUnknown) { - RemUnknown *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + RemUnknown *object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); - if (!This) return E_OUTOFMEMORY; + if (!object) + return E_OUTOFMEMORY; - This->IRemUnknown_iface.lpVtbl = &RemUnknown_Vtbl; - This->refs = 1; + object->IRemUnknown_iface.lpVtbl = &RemUnknown_Vtbl; + object->refs = 1; - *ppRemUnknown = &This->IRemUnknown_iface; + *ppRemUnknown = &object->IRemUnknown_iface; return S_OK; } static HRESULT WINAPI RemUnknown_QueryInterface(IRemUnknown *iface, REFIID riid, void **ppv) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + TRACE("%p, %s, %p\n", iface, debugstr_guid(riid), ppv); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IRemUnknown)) @@ -680,9 +686,9 @@ static HRESULT WINAPI RemUnknown_QueryInterface(IRemUnknown *iface, REFIID riid, static ULONG WINAPI RemUnknown_AddRef(IRemUnknown *iface) { ULONG refs; - RemUnknown *This = impl_from_IRemUnknown(iface); + RemUnknown *remunk = impl_from_IRemUnknown(iface); - refs = InterlockedIncrement(&This->refs); + refs = InterlockedIncrement(&remunk->refs); TRACE("%p before: %d\n", iface, refs-1); return refs; @@ -691,11 +697,11 @@ static ULONG WINAPI RemUnknown_AddRef(IRemUnknown *iface) static ULONG WINAPI RemUnknown_Release(IRemUnknown *iface) { ULONG refs; - RemUnknown *This = impl_from_IRemUnknown(iface); + RemUnknown *remunk = impl_from_IRemUnknown(iface); - refs = InterlockedDecrement(&This->refs); + refs = InterlockedDecrement(&remunk->refs); if (!refs) - HeapFree(GetProcessHeap(), 0, This); + HeapFree(GetProcessHeap(), 0, remunk); TRACE("%p after: %d\n", iface, refs); return refs; @@ -714,7 +720,7 @@ static HRESULT WINAPI RemUnknown_RemQueryInterface(IRemUnknown *iface, DWORD dest_context; void *dest_context_data; - TRACE("(%p)->(%s, %d, %d, %p, %p)\n", iface, debugstr_guid(ripid), cRefs, cIids, iids, ppQIResults); + TRACE("%p, %s, %d, %d, %p, %p\n", iface, debugstr_guid(ripid), cRefs, cIids, iids, ppQIResults); hr = ipid_to_ifstub(ripid, &apt, &stubmgr, &ifstub); if (hr != S_OK) return hr; @@ -751,7 +757,7 @@ static HRESULT WINAPI RemUnknown_RemAddRef(IRemUnknown *iface, HRESULT hr = S_OK; USHORT i; - TRACE("(%p)->(%d, %p, %p)\n", iface, cInterfaceRefs, InterfaceRefs, pResults); + TRACE("%p, %d, %p, %p\n", iface, cInterfaceRefs, InterfaceRefs, pResults); for (i = 0; i < cInterfaceRefs; i++) { @@ -783,7 +789,7 @@ static HRESULT WINAPI RemUnknown_RemRelease(IRemUnknown *iface, HRESULT hr = S_OK; USHORT i; - TRACE("(%p)->(%d, %p)\n", iface, cInterfaceRefs, InterfaceRefs); + TRACE("%p, %d, %p\n", iface, cInterfaceRefs, InterfaceRefs); for (i = 0; i < cInterfaceRefs; i++) { @@ -820,7 +826,7 @@ static const IRemUnknownVtbl RemUnknown_Vtbl = }; /* starts the IRemUnknown listener for the current apartment */ -HRESULT start_apartment_remote_unknown(struct apartment *apt) +HRESULT WINAPI start_apartment_remote_unknown(struct apartment *apt) { IRemUnknown *pRemUnknown; HRESULT hr = S_OK; @@ -834,7 +840,8 @@ HRESULT start_apartment_remote_unknown(struct apartment *apt) { STDOBJREF stdobjref; /* dummy - not used */ /* register it with the stub manager */ - hr = marshal_object(apt, &stdobjref, &IID_IRemUnknown, (IUnknown *)pRemUnknown, MSHCTX_DIFFERENTMACHINE, NULL, MSHLFLAGS_NORMAL|MSHLFLAGSP_REMUNKNOWN); + hr = marshal_object(apt, &stdobjref, &IID_IRemUnknown, (IUnknown *)pRemUnknown, + MSHCTX_DIFFERENTMACHINE, NULL, MSHLFLAGS_NORMAL|MSHLFLAGSP_REMUNKNOWN); /* release our reference to the object as the stub manager will manage the life cycle for us */ IRemUnknown_Release(pRemUnknown); if (hr == S_OK) diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 1c1e28fa4c5..ddbdfab30de 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -37,7 +37,6 @@ C_SRCS = \ stg_prop.c \ stg_stream.c \ storage32.c \ - stubmanager.c \ usrmarshal.c RC_SRCS = ole32res.rc diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 39ccc86b352..b92dfd87267 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -529,69 +529,6 @@ HRESULT WINAPI CoInitialize(LPVOID lpReserved) return CoInitializeEx(lpReserved, COINIT_APARTMENTTHREADED); } -/****************************************************************************** - * CoDisconnectObject [OLE32.@] - * - * Disconnects all connections to this object from remote processes. Dispatches - * pending RPCs while blocking new RPCs from occurring, and then calls - * IMarshal::DisconnectObject on the given object. - * - * Typically called when the object server is forced to shut down, for instance by - * the user. - * - * PARAMS - * lpUnk [I] The object whose stub should be disconnected. - * reserved [I] Reserved. Should be set to 0. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * SEE ALSO - * CoMarshalInterface, CoReleaseMarshalData, CoLockObjectExternal - */ -HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) -{ - struct stub_manager *manager; - HRESULT hr; - IMarshal *marshal; - struct apartment *apt; - - TRACE("(%p, 0x%08x)\n", lpUnk, reserved); - - if (!lpUnk) return E_INVALIDARG; - - hr = IUnknown_QueryInterface(lpUnk, &IID_IMarshal, (void **)&marshal); - if (hr == S_OK) - { - hr = IMarshal_DisconnectObject(marshal, reserved); - IMarshal_Release(marshal); - return hr; - } - - if (!(apt = apartment_get_current_or_mta())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } - - manager = get_stub_manager_from_object(apt, lpUnk, FALSE); - if (manager) { - stub_manager_disconnect(manager); - /* Release stub manager twice, to remove the apartment reference. */ - stub_manager_int_release(manager); - stub_manager_int_release(manager); - } - - /* Note: native is pretty broken here because it just silently - * fails, without returning an appropriate error code if the object was - * not found, making apps think that the object was disconnected, when - * it actually wasn't */ - - apartment_release(apt); - return S_OK; -} - /* open HKCR\\CLSID\\{string form of clsid}\\{keyname} key */ HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *subkey) { @@ -698,64 +635,6 @@ void WINAPI CoFreeAllLibraries(void) /* NOP */ } -/****************************************************************************** - * CoLockObjectExternal [OLE32.@] - * - * Increments or decrements the external reference count of a stub object. - * - * PARAMS - * pUnk [I] Stub object. - * fLock [I] If TRUE then increments the external ref-count, - * otherwise decrements. - * fLastUnlockReleases [I] If TRUE then the last unlock has the effect of - * calling CoDisconnectObject. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * NOTES - * If fLock is TRUE and an object is passed in that doesn't have a stub - * manager then a new stub manager is created for the object. - */ -HRESULT WINAPI CoLockObjectExternal( - LPUNKNOWN pUnk, - BOOL fLock, - BOOL fLastUnlockReleases) -{ - struct stub_manager *stubmgr; - struct apartment *apt; - - TRACE("pUnk=%p, fLock=%s, fLastUnlockReleases=%s\n", - pUnk, fLock ? "TRUE" : "FALSE", fLastUnlockReleases ? "TRUE" : "FALSE"); - - if (!(apt = apartment_get_current_or_mta())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } - - stubmgr = get_stub_manager_from_object(apt, pUnk, fLock); - if (!stubmgr) - { - WARN("stub object not found %p\n", pUnk); - /* Note: native is pretty broken here because it just silently - * fails, without returning an appropriate error code, making apps - * think that the object was disconnected, when it actually wasn't */ - apartment_release(apt); - return S_OK; - } - - if (fLock) - stub_manager_ext_addref(stubmgr, 1, FALSE); - else - stub_manager_ext_release(stubmgr, 1, FALSE, fLastUnlockReleases); - - stub_manager_int_release(stubmgr); - apartment_release(apt); - return S_OK; -} - /*********************************************************************** * CoInitializeWOW (OLE32.@) * diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 953574423aa..6f1cf7243e3 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -194,24 +194,8 @@ HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; /* Stub Manager */ -ULONG stub_manager_int_release(struct stub_manager *This) DECLSPEC_HIDDEN; -ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) DECLSPEC_HIDDEN; -ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) DECLSPEC_HIDDEN; -struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, REFIID iid, - DWORD dest_context, void *dest_context_data, MSHLFLAGS flags) DECLSPEC_HIDDEN; -struct ifstub *stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags) DECLSPEC_HIDDEN; -struct stub_manager *get_stub_manager(struct apartment *apt, OID oid) DECLSPEC_HIDDEN; -struct stub_manager *get_stub_manager_from_object(struct apartment *apt, IUnknown *object, BOOL alloc) DECLSPEC_HIDDEN; -BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN; -BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN; -void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak) DECLSPEC_HIDDEN; -void stub_manager_disconnect(struct stub_manager *m) DECLSPEC_HIDDEN; -HRESULT ipid_get_dispatch_params(const IPID *ipid, struct apartment **stub_apt, struct stub_manager **manager, IRpcStubBuffer **stub, - IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) DECLSPEC_HIDDEN; -HRESULT start_apartment_remote_unknown(struct apartment *apt) DECLSPEC_HIDDEN; - -HRESULT marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *obj, DWORD dest_context, - void *dest_context_data, MSHLFLAGS mshlflags) DECLSPEC_HIDDEN; +extern ULONG WINAPI stub_manager_int_release(struct stub_manager *This) DECLSPEC_HIDDEN; +extern struct stub_manager * WINAPI get_stub_manager(struct apartment *apt, OID oid) DECLSPEC_HIDDEN; /* RPC Backend */ @@ -222,9 +206,7 @@ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, const OXID_INFO *oxid_info, const IID *iid, DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan, struct apartment *apt) DECLSPEC_HIDDEN; -HRESULT RPC_CreateServerChannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) DECLSPEC_HIDDEN; HRESULT RPC_RegisterInterface(REFIID riid) DECLSPEC_HIDDEN; -void RPC_UnregisterInterface(REFIID riid, BOOL wait) DECLSPEC_HIDDEN; HRESULT RPC_RegisterChannelHook(REFGUID rguid, IChannelHook *hook) DECLSPEC_HIDDEN; void RPC_UnregisterAllChannelHooks(void) DECLSPEC_HIDDEN; HRESULT RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info) DECLSPEC_HIDDEN; @@ -235,7 +217,6 @@ void OLEDD_UnInitialize(void) DECLSPEC_HIDDEN; /* Apartment Functions */ extern struct apartment * WINAPI apartment_findfromoxid(OXID oxid) DECLSPEC_HIDDEN; -extern struct apartment * WINAPI apartment_findfromtid(DWORD tid) DECLSPEC_HIDDEN; extern void WINAPI apartment_release(struct apartment *apt) DECLSPEC_HIDDEN; static inline HRESULT apartment_getoxid(const struct apartment *apt, OXID *oxid) { diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index d08144f619a..87017dbc922 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -39,6 +39,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +extern BOOL WINAPI stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid); +extern BOOL WINAPI stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid); +extern ULONG WINAPI stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases); +extern void WINAPI stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak); +extern struct stub_manager * WINAPI get_stub_manager_from_object(struct apartment *apt, IUnknown *object, BOOL alloc); +extern struct ifstub * WINAPI stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags); +extern ULONG WINAPI stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak); +extern struct ifstub * WINAPI stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, REFIID iid, + DWORD dest_context, void *dest_context_data, MSHLFLAGS flags); + /* number of refs given out for normal marshaling */ #define NORMALEXTREFS 5 @@ -118,7 +128,7 @@ static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf) } /* marshals an object into a STDOBJREF structure */ -HRESULT marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object, +HRESULT WINAPI marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object, DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags) { struct stub_manager *manager; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index ca22e4c8f1a..972629ecb70 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -16,7 +16,7 @@ @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) combase.CoCreateInstanceEx @ stdcall CoDecrementMTAUsage(ptr) combase.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) -@ stdcall CoDisconnectObject(ptr long) +@ stdcall CoDisconnectObject(ptr long) combase.CoDisconnectObject @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime @ stdcall CoEnableCallCancellation(ptr) @ stdcall CoFileTimeNow(ptr) combase.CoFileTimeNow @@ -56,7 +56,7 @@ @ stdcall CoIsHandlerConnected(ptr) @ stdcall CoIsOle1Class (ptr) @ stdcall CoLoadLibrary(wstr long) -@ stdcall CoLockObjectExternal(ptr long long) +@ stdcall CoLockObjectExternal(ptr long long) combase.CoLockObjectExternal @ stdcall CoMarshalHresult(ptr long) combase.CoMarshalHresult @ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) combase.CoMarshalInterThreadInterfaceInStream @ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) combase.CoMarshalInterface @@ -298,6 +298,9 @@ @ stdcall WriteFmtUserTypeStg(ptr long ptr) @ stub WriteOleStg @ stub WriteStringStream + @ stdcall Internal_apartment_disconnectproxies(ptr) @ stdcall Internal_RPC_ExecuteCall(ptr) -@ stdcall Internal_stub_manager_int_release(ptr) +@ stdcall marshal_object(ptr ptr ptr ptr long ptr long) +@ stdcall RPC_CreateServerChannel(long ptr ptr) +@ stdcall RPC_UnregisterInterface(ptr long) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 84d26c70c6c..0aa2ebb41fe 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -43,6 +43,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +extern HRESULT WINAPI ipid_get_dispatch_params(const IPID *ipid, struct apartment **stub_apt, + struct stub_manager **manager, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, IID *iid, IUnknown **iface); +extern HRESULT WINAPI start_apartment_remote_unknown(struct apartment *apt); + static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg); /* we only use one function to dispatch calls for all methods - we use the @@ -1159,7 +1163,7 @@ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, return S_OK; } -HRESULT RPC_CreateServerChannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) +HRESULT WINAPI RPC_CreateServerChannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) { RpcChannelBuffer *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) @@ -1584,7 +1588,7 @@ HRESULT RPC_RegisterInterface(REFIID riid) } /* stub unregistration */ -void RPC_UnregisterInterface(REFIID riid, BOOL wait) +void WINAPI RPC_UnregisterInterface(REFIID riid, BOOL wait) { struct registered_if *rif; EnterCriticalSection(&csRegIf); -- 2.28.0

3 7

[PATCH v2 5/5] combase: Move ORPC functionality.
by Huw Davies 01 Sep '20

01 Sep '20

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/combase/apartment.c | 13 +- dlls/combase/combase.c | 11 + dlls/combase/combase.spec | 10 +- dlls/combase/combase_private.h | 31 +- dlls/combase/marshal.c | 24 +- dlls/combase/rpc.c | 1615 +++++++++++++++++++++++++++++++ dlls/combase/stubmanager.c | 22 +- dlls/ole32/Makefile.in | 1 - dlls/ole32/compobj.c | 21 - dlls/ole32/compobj_private.h | 146 +-- dlls/ole32/ole32.spec | 10 +- dlls/ole32/rpc.c | 1654 -------------------------------- 12 files changed, 1676 insertions(+), 1882 deletions(-) delete mode 100644 dlls/ole32/rpc.c diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index bb9e9f44032..125eaff1429 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -443,7 +443,7 @@ void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) LeaveCriticalSection(&apt->cs); } -void WINAPI apartment_release(struct apartment *apt) +void apartment_release(struct apartment *apt) { DWORD refcount; @@ -615,7 +615,7 @@ struct apartment * apartment_get_mta(void) /* Return the current apartment if it exists, or, failing that, the MTA. Caller * must free the returned apartment in either case. */ -struct apartment * WINAPI apartment_get_current_or_mta(void) +struct apartment * apartment_get_current_or_mta(void) { struct apartment *apt = com_get_current_apt(); if (apt) @@ -1098,14 +1098,13 @@ static HRESULT apartment_hostobject(struct apartment *apt, const struct host_obj } struct dispatch_params; -extern void WINAPI Internal_RPC_ExecuteCall(struct dispatch_params *params); static LRESULT CALLBACK apartment_wndproc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { case DM_EXECUTERPC: - Internal_RPC_ExecuteCall((struct dispatch_params *)lParam); + rpc_execute_call((struct dispatch_params *)lParam); return 0; case DM_HOSTOBJECT: return apartment_hostobject(com_get_current_apt(), (const struct host_object_params *)lParam); @@ -1119,7 +1118,7 @@ static BOOL apartment_is_model(const struct apartment *apt, DWORD model) return (apt->multi_threaded == !(model & COINIT_APARTMENTTHREADED)); } -HRESULT WINAPI enter_apartment(struct tlsdata *data, DWORD model) +HRESULT enter_apartment(struct tlsdata *data, DWORD model) { HRESULT hr = S_OK; @@ -1143,7 +1142,7 @@ HRESULT WINAPI enter_apartment(struct tlsdata *data, DWORD model) return hr; } -void WINAPI leave_apartment(struct tlsdata *data) +void leave_apartment(struct tlsdata *data) { if (!--data->inits) { @@ -1262,7 +1261,7 @@ HRESULT apartment_createwindowifneeded(struct apartment *apt) } /* retrieves the window for the main- or apartment-threaded apartment */ -HWND WINAPI apartment_getwindow(const struct apartment *apt) +HWND apartment_getwindow(const struct apartment *apt) { assert(!apt->multi_threaded); return apt->win; diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index b3e3844a4db..d959034b57f 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -3052,6 +3052,16 @@ HRESULT WINAPI CoLockObjectExternal(IUnknown *object, BOOL lock, BOOL last_unloc return S_OK; } +/*********************************************************************** + * CoRegisterChannelHook (combase.@) + */ +HRESULT WINAPI CoRegisterChannelHook(REFGUID guidExtension, IChannelHook *channel_hook) +{ + TRACE("%s, %p\n", debugstr_guid(guidExtension), channel_hook); + + return rpc_register_channel_hook(guidExtension, channel_hook); +} + /*********************************************************************** * DllMain (combase.@) */ @@ -3068,6 +3078,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) if (reserved) break; apartment_global_cleanup(); DeleteCriticalSection(&registered_classes_cs); + rpc_unregister_channel_hooks(); break; case DLL_THREAD_DETACH: com_cleanup_tlsdata(); diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index f0429343f66..3a09ce064b0 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -139,6 +139,7 @@ @ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr) @ stub CoReactivateObject @ stub CoRegisterActivationFilter +@ stdcall CoRegisterChannelHook(ptr ptr) @ stdcall CoRegisterClassObject(ptr ptr long long ptr) @ stdcall CoRegisterInitializeSpy(ptr ptr) @ stdcall CoRegisterMallocSpy(ptr) @@ -350,12 +351,3 @@ @ stdcall WindowsSubstringWithSpecifiedLength(ptr long long ptr) @ stdcall WindowsTrimStringEnd(ptr ptr ptr) @ stdcall WindowsTrimStringStart(ptr ptr ptr) - -@ stdcall apartment_get_current_or_mta() -@ stdcall apartment_release(ptr) -@ stdcall enter_apartment(ptr long) -@ stdcall leave_apartment(ptr) -@ stdcall apartment_getwindow(ptr) -@ stdcall stub_manager_int_release(ptr) -@ stdcall ipid_get_dispatch_params(ptr ptr ptr ptr ptr ptr ptr) -@ stdcall start_apartment_remote_unknown(ptr) diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index bcf0ad46102..703c1a26c20 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -102,7 +102,7 @@ static inline struct apartment* com_get_current_apt(void) return tlsdata->apt; } -HWND WINAPI apartment_getwindow(const struct apartment *apt) DECLSPEC_HIDDEN; +HWND apartment_getwindow(const struct apartment *apt) DECLSPEC_HIDDEN; HRESULT apartment_createwindowifneeded(struct apartment *apt) DECLSPEC_HIDDEN; void apartment_freeunusedlibraries(struct apartment *apt, DWORD unload_delay) DECLSPEC_HIDDEN; void apartment_global_cleanup(void) DECLSPEC_HIDDEN; @@ -114,6 +114,18 @@ HRESULT rpcss_get_next_seqid(DWORD *id) DECLSPEC_HIDDEN; HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; HRESULT rpc_start_local_server(REFCLSID clsid, IStream *stream, BOOL multi_use, void **registration) DECLSPEC_HIDDEN; void rpc_stop_local_server(void *registration) DECLSPEC_HIDDEN; +HRESULT rpc_create_clientchannel(const OXID *oxid, const IPID *ipid, const OXID_INFO *oxid_info, const IID *iid, + DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan, struct apartment *apt) DECLSPEC_HIDDEN; +HRESULT rpc_create_serverchannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) DECLSPEC_HIDDEN; +HRESULT rpc_register_interface(REFIID riid) DECLSPEC_HIDDEN; +void rpc_unregister_interface(REFIID riid, BOOL wait) DECLSPEC_HIDDEN; +HRESULT rpc_resolve_oxid(OXID oxid, OXID_INFO *oxid_info) DECLSPEC_HIDDEN; +void rpc_start_remoting(struct apartment *apt) DECLSPEC_HIDDEN; +HRESULT rpc_register_channel_hook(REFGUID rguid, IChannelHook *hook) DECLSPEC_HIDDEN; +void rpc_unregister_channel_hooks(void) DECLSPEC_HIDDEN; + +struct dispatch_params; +void rpc_execute_call(struct dispatch_params *params); enum class_reg_data_origin { @@ -136,10 +148,10 @@ struct class_reg_data } u; }; -HRESULT WINAPI enter_apartment(struct tlsdata *data, DWORD model); -void WINAPI leave_apartment(struct tlsdata *data); -void WINAPI apartment_release(struct apartment *apt); -struct apartment * WINAPI apartment_get_current_or_mta(void); +HRESULT enter_apartment(struct tlsdata *data, DWORD model) DECLSPEC_HIDDEN; +void leave_apartment(struct tlsdata *data) DECLSPEC_HIDDEN; +void apartment_release(struct apartment *apt) DECLSPEC_HIDDEN; +struct apartment * apartment_get_current_or_mta(void) DECLSPEC_HIDDEN; HRESULT apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) DECLSPEC_HIDDEN; void apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie) DECLSPEC_HIDDEN; struct apartment * apartment_get_mta(void) DECLSPEC_HIDDEN; @@ -152,6 +164,9 @@ void apartment_revoke_all_classes(const struct apartment *apt) DECLSPEC_HIDDEN; struct apartment * apartment_findfromoxid(OXID oxid) DECLSPEC_HIDDEN; struct apartment * apartment_findfromtid(DWORD tid) DECLSPEC_HIDDEN; +HRESULT marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object, + DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags) DECLSPEC_HIDDEN; + /* Stub Manager */ /* signal to stub manager that this is a rem unknown object */ @@ -219,7 +234,7 @@ struct stub_manager BOOL disconnected; /* CoDisconnectObject has been called (CS lock) */ }; -ULONG WINAPI stub_manager_int_release(struct stub_manager *stub_manager) DECLSPEC_HIDDEN; +ULONG stub_manager_int_release(struct stub_manager *stub_manager) DECLSPEC_HIDDEN; struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnknown *object, BOOL alloc) DECLSPEC_HIDDEN; void stub_manager_disconnect(struct stub_manager *m) DECLSPEC_HIDDEN; ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) DECLSPEC_HIDDEN; @@ -231,3 +246,7 @@ BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) DEC struct ifstub * stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags) DECLSPEC_HIDDEN; struct ifstub * stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, REFIID iid, DWORD dest_context, void *dest_context_data, MSHLFLAGS flags) DECLSPEC_HIDDEN; +HRESULT ipid_get_dispatch_params(const IPID *ipid, struct apartment **stub_apt, + struct stub_manager **manager, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, + IID *iid, IUnknown **iface) DECLSPEC_HIDDEN; +HRESULT start_apartment_remote_unknown(struct apartment *apt) DECLSPEC_HIDDEN; diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index 977945cd013..bcc78132651 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -36,9 +36,6 @@ HRESULT WINAPI RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, const OXID_INFO *oxid_info, const IID *iid, DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan, struct apartment *apt); -HRESULT WINAPI RPC_RegisterInterface(REFIID riid); -HRESULT WINAPI RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info); -void WINAPI RPC_StartRemoting(struct apartment *apt); static HRESULT unmarshal_object(const STDOBJREF *stdobjref, struct apartment *apt, MSHCTX dest_context, void *dest_context_data, @@ -889,7 +886,7 @@ static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf) } /* marshals an object into a STDOBJREF structure */ -HRESULT WINAPI marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object, +HRESULT marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object, DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags) { struct stub_manager *manager; @@ -971,7 +968,7 @@ HRESULT WINAPI marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFII } /* FIXME: check return value */ - RPC_RegisterInterface(riid); + rpc_register_interface(riid); stdobjref->ipid = ifstub->ipid; @@ -979,8 +976,6 @@ HRESULT WINAPI marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFII return S_OK; } - - /* Client-side identity of the server object */ static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnknown **remunk); @@ -1583,7 +1578,7 @@ static HRESULT proxy_manager_construct( } else { - HRESULT hr = RPC_ResolveOxid(oxid, &This->oxid_info); + HRESULT hr = rpc_resolve_oxid(oxid, &This->oxid_info); if (FAILED(hr)) { CloseHandle(This->remoting_mutex); @@ -2081,7 +2076,7 @@ static HRESULT WINAPI StdMarshalImpl_MarshalInterface(IMarshal *iface, IStream * } /* make sure this apartment can be reached from other threads / processes */ - RPC_StartRemoting(apt); + rpc_start_remoting(apt); fill_std_objref(&objref, riid, NULL); hr = marshal_object(apt, &objref.u_objref.u_standard.std, riid, pv, dest_context, @@ -2134,14 +2129,11 @@ static HRESULT unmarshal_object(const STDOBJREF *stdobjref, struct apartment *ap if (hr == E_NOINTERFACE) { IRpcChannelBuffer *chanbuf; - hr = RPC_CreateClientChannel(&stdobjref->oxid, &stdobjref->ipid, - &proxy_manager->oxid_info, riid, - proxy_manager->dest_context, - proxy_manager->dest_context_data, - &chanbuf, apt); + hr = rpc_create_clientchannel(&stdobjref->oxid, &stdobjref->ipid, + &proxy_manager->oxid_info, riid, proxy_manager->dest_context, + proxy_manager->dest_context_data, &chanbuf, apt); if (hr == S_OK) - hr = proxy_manager_create_ifproxy(proxy_manager, stdobjref, - riid, chanbuf, &ifproxy); + hr = proxy_manager_create_ifproxy(proxy_manager, stdobjref, riid, chanbuf, &ifproxy); } else IUnknown_AddRef((IUnknown *)ifproxy->iface); diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index cb503e9ae7c..ebfc19329d8 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -1,4 +1,8 @@ /* + * Copyright 2001 Ove Kåven, TransGaming Technologies + * Copyright 2002 Marcus Meissner + * Copyright 2005 Mike Hearn, Rob Shearman for CodeWeavers + * * 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 @@ -33,6 +37,138 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg); + +/* we only use one function to dispatch calls for all methods - we use the + * RPC_IF_OLE flag to tell the RPC runtime that this is the case */ +static RPC_DISPATCH_FUNCTION rpc_dispatch_table[1] = { dispatch_rpc }; /* (RO) */ +static RPC_DISPATCH_TABLE rpc_dispatch = { 1, rpc_dispatch_table }; /* (RO) */ + +static struct list registered_interfaces = LIST_INIT(registered_interfaces); /* (CS csRegIf) */ +static CRITICAL_SECTION csRegIf; +static CRITICAL_SECTION_DEBUG csRegIf_debug = +{ + 0, 0, &csRegIf, + { &csRegIf_debug.ProcessLocksList, &csRegIf_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": dcom registered server interfaces") } +}; +static CRITICAL_SECTION csRegIf = { &csRegIf_debug, -1, 0, 0, 0, 0 }; + +static struct list channel_hooks = LIST_INIT(channel_hooks); /* (CS csChannelHook) */ +static CRITICAL_SECTION csChannelHook; +static CRITICAL_SECTION_DEBUG csChannelHook_debug = +{ + 0, 0, &csChannelHook, + { &csChannelHook_debug.ProcessLocksList, &csChannelHook_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": channel hooks") } +}; +static CRITICAL_SECTION csChannelHook = { &csChannelHook_debug, -1, 0, 0, 0, 0 }; + +static WCHAR rpctransportW[] = L"ncalrpc"; + +struct registered_if +{ + struct list entry; + DWORD refs; /* ref count */ + RPC_SERVER_INTERFACE If; /* interface registered with the RPC runtime */ +}; + +/* get the pipe endpoint specified of the specified apartment */ +static inline void get_rpc_endpoint(LPWSTR endpoint, const OXID *oxid) +{ + /* FIXME: should get endpoint from rpcss */ + static const WCHAR wszEndpointFormat[] = {'\\','p','i','p','e','\\','O','L','E','_','%','0','8','l','x','%','0','8','l','x',0}; + wsprintfW(endpoint, wszEndpointFormat, (DWORD)(*oxid >> 32),(DWORD)*oxid); +} + +typedef struct +{ + IRpcChannelBuffer IRpcChannelBuffer_iface; + LONG refs; + + DWORD dest_context; /* returned from GetDestCtx */ + void *dest_context_data; /* returned from GetDestCtx */ +} RpcChannelBuffer; + +typedef struct +{ + RpcChannelBuffer super; /* superclass */ + + RPC_BINDING_HANDLE bind; /* handle to the remote server */ + OXID oxid; /* apartment in which the channel is valid */ + DWORD server_pid; /* id of server process */ + HANDLE event; /* cached event handle */ + IID iid; /* IID of the proxy this belongs to */ +} ClientRpcChannelBuffer; + +struct dispatch_params +{ + RPCOLEMESSAGE *msg; /* message */ + IRpcStubBuffer *stub; /* stub buffer, if applicable */ + IRpcChannelBuffer *chan; /* server channel buffer, if applicable */ + IID iid; /* ID of interface being called */ + IUnknown *iface; /* interface being called */ + HANDLE handle; /* handle that will become signaled when call finishes */ + BOOL bypass_rpcrt; /* bypass RPC runtime? */ + RPC_STATUS status; /* status (out) */ + HRESULT hr; /* hresult (out) */ +}; + +struct message_state +{ + RPC_BINDING_HANDLE binding_handle; + ULONG prefix_data_len; + SChannelHookCallInfo channel_hook_info; + BOOL bypass_rpcrt; + + /* client only */ + HWND target_hwnd; + DWORD target_tid; + struct dispatch_params params; +}; + +typedef struct +{ + ULONG conformance; /* NDR */ + GUID id; + ULONG size; + /* [size_is((size+7)&~7)] */ unsigned char data[1]; +} WIRE_ORPC_EXTENT; + +typedef struct +{ + ULONG size; + ULONG reserved; + unsigned char extent[1]; +} WIRE_ORPC_EXTENT_ARRAY; + +typedef struct +{ + ULONG version; + ULONG flags; + ULONG reserved1; + GUID cid; + unsigned char extensions[1]; +} WIRE_ORPCTHIS; + +typedef struct +{ + ULONG flags; + unsigned char extensions[1]; +} WIRE_ORPCTHAT; + +struct channel_hook_entry +{ + struct list entry; + GUID id; + IChannelHook *hook; +}; + +struct channel_hook_buffer_data +{ + GUID id; + ULONG extension_size; +}; void * __RPC_USER MIDL_user_allocate(SIZE_T size) { return heap_alloc(size); @@ -629,3 +765,1482 @@ void rpc_stop_local_server(void *registration) CloseHandle(lsp->thread); HeapFree(GetProcessHeap(), 0, lsp); } + +static HRESULT unmarshal_ORPCTHAT(RPC_MESSAGE *msg, ORPCTHAT *orpcthat, ORPC_EXTENT_ARRAY *orpc_ext_array, + WIRE_ORPC_EXTENT **first_wire_orpc_extent); + +/* Channel Hook Functions */ + +static ULONG ChannelHooks_ClientGetSize(SChannelHookCallInfo *info, struct channel_hook_buffer_data **data, + unsigned int *hook_count, ULONG *extension_count) +{ + struct channel_hook_entry *entry; + ULONG total_size = 0; + unsigned int hook_index = 0; + + *hook_count = 0; + *extension_count = 0; + + EnterCriticalSection(&csChannelHook); + + LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry) + (*hook_count)++; + + if (*hook_count) + *data = HeapAlloc(GetProcessHeap(), 0, *hook_count * sizeof(struct channel_hook_buffer_data)); + else + *data = NULL; + + LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry) + { + ULONG extension_size = 0; + + IChannelHook_ClientGetSize(entry->hook, &entry->id, &info->iid, &extension_size); + + TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size); + + extension_size = (extension_size+7)&~7; + (*data)[hook_index].id = entry->id; + (*data)[hook_index].extension_size = extension_size; + + /* an extension is only put onto the wire if it has data to write */ + if (extension_size) + { + total_size += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[extension_size]); + (*extension_count)++; + } + + hook_index++; + } + + LeaveCriticalSection(&csChannelHook); + + return total_size; +} + +static unsigned char * ChannelHooks_ClientFillBuffer(SChannelHookCallInfo *info, + unsigned char *buffer, struct channel_hook_buffer_data *data, + unsigned int hook_count) +{ + struct channel_hook_entry *entry; + + EnterCriticalSection(&csChannelHook); + + LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry) + { + unsigned int i; + ULONG extension_size = 0; + WIRE_ORPC_EXTENT *wire_orpc_extent = (WIRE_ORPC_EXTENT *)buffer; + + for (i = 0; i < hook_count; i++) + if (IsEqualGUID(&entry->id, &data[i].id)) + extension_size = data[i].extension_size; + + /* an extension is only put onto the wire if it has data to write */ + if (!extension_size) + continue; + + IChannelHook_ClientFillBuffer(entry->hook, &entry->id, &info->iid, + &extension_size, buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0])); + + TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size); + + /* FIXME: set unused portion of wire_orpc_extent->data to 0? */ + + wire_orpc_extent->conformance = (extension_size+7)&~7; + wire_orpc_extent->size = extension_size; + wire_orpc_extent->id = entry->id; + buffer += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[wire_orpc_extent->conformance]); + } + + LeaveCriticalSection(&csChannelHook); + + return buffer; +} + +static void ChannelHooks_ServerNotify(SChannelHookCallInfo *info, + DWORD lDataRep, WIRE_ORPC_EXTENT *first_wire_orpc_extent, + ULONG extension_count) +{ + struct channel_hook_entry *entry; + ULONG i; + + EnterCriticalSection(&csChannelHook); + + LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry) + { + WIRE_ORPC_EXTENT *wire_orpc_extent; + for (i = 0, wire_orpc_extent = first_wire_orpc_extent; + i < extension_count; + i++, wire_orpc_extent = (WIRE_ORPC_EXTENT *)&wire_orpc_extent->data[wire_orpc_extent->conformance]) + { + if (IsEqualGUID(&entry->id, &wire_orpc_extent->id)) + break; + } + if (i == extension_count) wire_orpc_extent = NULL; + + IChannelHook_ServerNotify(entry->hook, &entry->id, &info->iid, + wire_orpc_extent ? wire_orpc_extent->size : 0, + wire_orpc_extent ? wire_orpc_extent->data : NULL, + lDataRep); + } + + LeaveCriticalSection(&csChannelHook); +} + +static ULONG ChannelHooks_ServerGetSize(SChannelHookCallInfo *info, + struct channel_hook_buffer_data **data, unsigned int *hook_count, + ULONG *extension_count) +{ + struct channel_hook_entry *entry; + ULONG total_size = 0; + unsigned int hook_index = 0; + + *hook_count = 0; + *extension_count = 0; + + EnterCriticalSection(&csChannelHook); + + LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry) + (*hook_count)++; + + if (*hook_count) + *data = HeapAlloc(GetProcessHeap(), 0, *hook_count * sizeof(struct channel_hook_buffer_data)); + else + *data = NULL; + + LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry) + { + ULONG extension_size = 0; + + IChannelHook_ServerGetSize(entry->hook, &entry->id, &info->iid, S_OK, + &extension_size); + + TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size); + + extension_size = (extension_size+7)&~7; + (*data)[hook_index].id = entry->id; + (*data)[hook_index].extension_size = extension_size; + + /* an extension is only put onto the wire if it has data to write */ + if (extension_size) + { + total_size += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[extension_size]); + (*extension_count)++; + } + + hook_index++; + } + + LeaveCriticalSection(&csChannelHook); + + return total_size; +} + +static unsigned char * ChannelHooks_ServerFillBuffer(SChannelHookCallInfo *info, + unsigned char *buffer, struct channel_hook_buffer_data *data, + unsigned int hook_count) +{ + struct channel_hook_entry *entry; + + EnterCriticalSection(&csChannelHook); + + LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry) + { + unsigned int i; + ULONG extension_size = 0; + WIRE_ORPC_EXTENT *wire_orpc_extent = (WIRE_ORPC_EXTENT *)buffer; + + for (i = 0; i < hook_count; i++) + if (IsEqualGUID(&entry->id, &data[i].id)) + extension_size = data[i].extension_size; + + /* an extension is only put onto the wire if it has data to write */ + if (!extension_size) + continue; + + IChannelHook_ServerFillBuffer(entry->hook, &entry->id, &info->iid, + &extension_size, buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]), + S_OK); + + TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size); + + /* FIXME: set unused portion of wire_orpc_extent->data to 0? */ + + wire_orpc_extent->conformance = (extension_size+7)&~7; + wire_orpc_extent->size = extension_size; + wire_orpc_extent->id = entry->id; + buffer += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[wire_orpc_extent->conformance]); + } + + LeaveCriticalSection(&csChannelHook); + + return buffer; +} + +static void ChannelHooks_ClientNotify(SChannelHookCallInfo *info, + DWORD lDataRep, WIRE_ORPC_EXTENT *first_wire_orpc_extent, + ULONG extension_count, HRESULT hrFault) +{ + struct channel_hook_entry *entry; + ULONG i; + + EnterCriticalSection(&csChannelHook); + + LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry) + { + WIRE_ORPC_EXTENT *wire_orpc_extent; + for (i = 0, wire_orpc_extent = first_wire_orpc_extent; + i < extension_count; + i++, wire_orpc_extent = (WIRE_ORPC_EXTENT *)&wire_orpc_extent->data[wire_orpc_extent->conformance]) + { + if (IsEqualGUID(&entry->id, &wire_orpc_extent->id)) + break; + } + if (i == extension_count) wire_orpc_extent = NULL; + + IChannelHook_ClientNotify(entry->hook, &entry->id, &info->iid, + wire_orpc_extent ? wire_orpc_extent->size : 0, + wire_orpc_extent ? wire_orpc_extent->data : NULL, + lDataRep, hrFault); + } + + LeaveCriticalSection(&csChannelHook); +} + +HRESULT rpc_register_channel_hook(REFGUID rguid, IChannelHook *hook) +{ + struct channel_hook_entry *entry; + + entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); + if (!entry) + return E_OUTOFMEMORY; + + entry->id = *rguid; + entry->hook = hook; + IChannelHook_AddRef(hook); + + EnterCriticalSection(&csChannelHook); + list_add_tail(&channel_hooks, &entry->entry); + LeaveCriticalSection(&csChannelHook); + + return S_OK; +} + +void rpc_unregister_channel_hooks(void) +{ + struct channel_hook_entry *cursor; + struct channel_hook_entry *cursor2; + + EnterCriticalSection(&csChannelHook); + LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &channel_hooks, struct channel_hook_entry, entry) + HeapFree(GetProcessHeap(), 0, cursor); + LeaveCriticalSection(&csChannelHook); + DeleteCriticalSection(&csChannelHook); + DeleteCriticalSection(&csRegIf); +} + +/* RPC Channel Buffer Functions */ + +static HRESULT WINAPI RpcChannelBuffer_QueryInterface(IRpcChannelBuffer *iface, REFIID riid, LPVOID *ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid,&IID_IRpcChannelBuffer) || IsEqualIID(riid,&IID_IUnknown)) + { + *ppv = iface; + IRpcChannelBuffer_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI RpcChannelBuffer_AddRef(LPRPCCHANNELBUFFER iface) +{ + RpcChannelBuffer *This = (RpcChannelBuffer *)iface; + return InterlockedIncrement(&This->refs); +} + +static ULONG WINAPI ServerRpcChannelBuffer_Release(LPRPCCHANNELBUFFER iface) +{ + RpcChannelBuffer *This = (RpcChannelBuffer *)iface; + ULONG ref; + + ref = InterlockedDecrement(&This->refs); + if (ref) + return ref; + + HeapFree(GetProcessHeap(), 0, This); + return 0; +} + +static ULONG WINAPI ClientRpcChannelBuffer_Release(LPRPCCHANNELBUFFER iface) +{ + ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface; + ULONG ref; + + ref = InterlockedDecrement(&This->super.refs); + if (ref) + return ref; + + if (This->event) CloseHandle(This->event); + RpcBindingFree(&This->bind); + HeapFree(GetProcessHeap(), 0, This); + return 0; +} + +static HRESULT WINAPI ServerRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg, REFIID riid) +{ + RpcChannelBuffer *This = (RpcChannelBuffer *)iface; + RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg; + RPC_STATUS status; + ORPCTHAT *orpcthat; + struct message_state *message_state; + ULONG extensions_size; + struct channel_hook_buffer_data *channel_hook_data; + unsigned int channel_hook_count; + ULONG extension_count; + + TRACE("(%p)->(%p,%s)\n", This, olemsg, debugstr_guid(riid)); + + message_state = msg->Handle; + /* restore the binding handle and the real start of data */ + msg->Handle = message_state->binding_handle; + msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len; + + extensions_size = ChannelHooks_ServerGetSize(&message_state->channel_hook_info, + &channel_hook_data, &channel_hook_count, &extension_count); + + msg->BufferLength += FIELD_OFFSET(WIRE_ORPCTHAT, extensions) + sizeof(DWORD); + if (extensions_size) + { + msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent[2*sizeof(DWORD) + extensions_size]); + if (extension_count & 1) + msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]); + } + + if (message_state->bypass_rpcrt) + { + msg->Buffer = HeapAlloc(GetProcessHeap(), 0, msg->BufferLength); + if (msg->Buffer) + status = RPC_S_OK; + else + { + HeapFree(GetProcessHeap(), 0, channel_hook_data); + return E_OUTOFMEMORY; + } + } + else + status = I_RpcGetBuffer(msg); + + orpcthat = msg->Buffer; + msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHAT, extensions); + + orpcthat->flags = ORPCF_NULL /* FIXME? */; + + /* NDR representation of orpcthat->extensions */ + *(DWORD *)msg->Buffer = extensions_size ? 1 : 0; + msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); + + if (extensions_size) + { + WIRE_ORPC_EXTENT_ARRAY *orpc_extent_array = msg->Buffer; + orpc_extent_array->size = extension_count; + orpc_extent_array->reserved = 0; + msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent); + /* NDR representation of orpc_extent_array->extent */ + *(DWORD *)msg->Buffer = 1; + msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); + /* NDR representation of [size_is] attribute of orpc_extent_array->extent */ + *(DWORD *)msg->Buffer = (extension_count + 1) & ~1; + msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); + + msg->Buffer = ChannelHooks_ServerFillBuffer(&message_state->channel_hook_info, + msg->Buffer, channel_hook_data, channel_hook_count); + + /* we must add a dummy extension if there is an odd extension + * count to meet the contract specified by the size_is attribute */ + if (extension_count & 1) + { + WIRE_ORPC_EXTENT *wire_orpc_extent = msg->Buffer; + wire_orpc_extent->conformance = 0; + wire_orpc_extent->id = GUID_NULL; + wire_orpc_extent->size = 0; + msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]); + } + } + + HeapFree(GetProcessHeap(), 0, channel_hook_data); + + /* store the prefixed data length so that we can restore the real buffer + * later */ + message_state->prefix_data_len = (char *)msg->Buffer - (char *)orpcthat; + msg->BufferLength -= message_state->prefix_data_len; + /* save away the message state again */ + msg->Handle = message_state; + + TRACE("-- %d\n", status); + + return HRESULT_FROM_WIN32(status); +} + +static HANDLE ClientRpcChannelBuffer_GetEventHandle(ClientRpcChannelBuffer *This) +{ + HANDLE event = InterlockedExchangePointer(&This->event, NULL); + + /* Note: must be auto-reset event so we can reuse it without a call + * to ResetEvent */ + if (!event) event = CreateEventW(NULL, FALSE, FALSE, NULL); + + return event; +} + +static void ClientRpcChannelBuffer_ReleaseEventHandle(ClientRpcChannelBuffer *This, HANDLE event) +{ + if (InterlockedCompareExchangePointer(&This->event, event, NULL)) + /* already a handle cached in This */ + CloseHandle(event); +} + +static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg, REFIID riid) +{ + ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface; + RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg; + RPC_CLIENT_INTERFACE *cif; + RPC_STATUS status; + ORPCTHIS *orpcthis; + struct message_state *message_state; + ULONG extensions_size; + struct channel_hook_buffer_data *channel_hook_data; + unsigned int channel_hook_count; + ULONG extension_count; + IPID ipid; + HRESULT hr; + struct apartment *apt = NULL; + + TRACE("(%p)->(%p,%s)\n", This, olemsg, debugstr_guid(riid)); + + cif = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RPC_CLIENT_INTERFACE)); + if (!cif) + return E_OUTOFMEMORY; + + message_state = HeapAlloc(GetProcessHeap(), 0, sizeof(*message_state)); + if (!message_state) + { + HeapFree(GetProcessHeap(), 0, cif); + return E_OUTOFMEMORY; + } + + cif->Length = sizeof(RPC_CLIENT_INTERFACE); + /* RPC interface ID = COM interface ID */ + cif->InterfaceId.SyntaxGUID = This->iid; + /* COM objects always have a version of 0.0 */ + cif->InterfaceId.SyntaxVersion.MajorVersion = 0; + cif->InterfaceId.SyntaxVersion.MinorVersion = 0; + msg->Handle = This->bind; + msg->RpcInterfaceInformation = cif; + + message_state->prefix_data_len = 0; + message_state->binding_handle = This->bind; + + message_state->channel_hook_info.iid = *riid; + message_state->channel_hook_info.cbSize = sizeof(message_state->channel_hook_info); + CoGetCurrentLogicalThreadId(&message_state->channel_hook_info.uCausality); + message_state->channel_hook_info.dwServerPid = This->server_pid; + message_state->channel_hook_info.iMethod = msg->ProcNum & ~RPC_FLAGS_VALID_BIT; + message_state->channel_hook_info.pObject = NULL; /* only present on server-side */ + message_state->target_hwnd = NULL; + message_state->target_tid = 0; + memset(&message_state->params, 0, sizeof(message_state->params)); + + extensions_size = ChannelHooks_ClientGetSize(&message_state->channel_hook_info, + &channel_hook_data, &channel_hook_count, &extension_count); + + msg->BufferLength += FIELD_OFFSET(WIRE_ORPCTHIS, extensions) + sizeof(DWORD); + if (extensions_size) + { + msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent[2*sizeof(DWORD) + extensions_size]); + if (extension_count & 1) + msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]); + } + + RpcBindingInqObject(message_state->binding_handle, &ipid); + hr = ipid_get_dispatch_params(&ipid, &apt, NULL, &message_state->params.stub, + &message_state->params.chan, + &message_state->params.iid, + &message_state->params.iface); + if (hr == S_OK) + { + /* stub, chan, iface and iid are unneeded in multi-threaded case as we go + * via the RPC runtime */ + if (apt->multi_threaded) + { + IRpcStubBuffer_Release(message_state->params.stub); + message_state->params.stub = NULL; + IRpcChannelBuffer_Release(message_state->params.chan); + message_state->params.chan = NULL; + message_state->params.iface = NULL; + } + else + { + message_state->params.bypass_rpcrt = TRUE; + message_state->target_hwnd = apartment_getwindow(apt); + message_state->target_tid = apt->tid; + /* we assume later on that this being non-NULL is the indicator that + * means call directly instead of going through RPC runtime */ + if (!message_state->target_hwnd) + ERR("window for apartment %s is NULL\n", wine_dbgstr_longlong(apt->oxid)); + } + } + if (apt) apartment_release(apt); + message_state->params.handle = ClientRpcChannelBuffer_GetEventHandle(This); + /* Note: message_state->params.msg is initialised in + * ClientRpcChannelBuffer_SendReceive */ + + /* shortcut the RPC runtime */ + if (message_state->target_hwnd) + { + msg->Buffer = HeapAlloc(GetProcessHeap(), 0, msg->BufferLength); + if (msg->Buffer) + status = RPC_S_OK; + else + status = ERROR_OUTOFMEMORY; + } + else + status = I_RpcGetBuffer(msg); + + msg->Handle = message_state; + + if (status == RPC_S_OK) + { + orpcthis = msg->Buffer; + msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHIS, extensions); + + orpcthis->version.MajorVersion = COM_MAJOR_VERSION; + orpcthis->version.MinorVersion = COM_MINOR_VERSION; + orpcthis->flags = message_state->channel_hook_info.dwServerPid ? ORPCF_LOCAL : ORPCF_NULL; + orpcthis->reserved1 = 0; + orpcthis->cid = message_state->channel_hook_info.uCausality; + + /* NDR representation of orpcthis->extensions */ + *(DWORD *)msg->Buffer = extensions_size ? 1 : 0; + msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); + + if (extensions_size) + { + ORPC_EXTENT_ARRAY *orpc_extent_array = msg->Buffer; + orpc_extent_array->size = extension_count; + orpc_extent_array->reserved = 0; + msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent); + /* NDR representation of orpc_extent_array->extent */ + *(DWORD *)msg->Buffer = 1; + msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); + /* NDR representation of [size_is] attribute of orpc_extent_array->extent */ + *(DWORD *)msg->Buffer = (extension_count + 1) & ~1; + msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); + + msg->Buffer = ChannelHooks_ClientFillBuffer(&message_state->channel_hook_info, + msg->Buffer, channel_hook_data, channel_hook_count); + + /* we must add a dummy extension if there is an odd extension + * count to meet the contract specified by the size_is attribute */ + if (extension_count & 1) + { + WIRE_ORPC_EXTENT *wire_orpc_extent = msg->Buffer; + wire_orpc_extent->conformance = 0; + wire_orpc_extent->id = GUID_NULL; + wire_orpc_extent->size = 0; + msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]); + } + } + + /* store the prefixed data length so that we can restore the real buffer + * pointer in ClientRpcChannelBuffer_SendReceive. */ + message_state->prefix_data_len = (char *)msg->Buffer - (char *)orpcthis; + msg->BufferLength -= message_state->prefix_data_len; + } + + HeapFree(GetProcessHeap(), 0, channel_hook_data); + + TRACE("-- %d\n", status); + + return HRESULT_FROM_WIN32(status); +} + +static HRESULT WINAPI ServerRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE *olemsg, ULONG *pstatus) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +/* this thread runs an outgoing RPC */ +static DWORD WINAPI rpc_sendreceive_thread(LPVOID param) +{ + struct dispatch_params *data = param; + + /* Note: I_RpcSendReceive doesn't raise exceptions like the higher-level + * RPC functions do */ + data->status = I_RpcSendReceive((RPC_MESSAGE *)data->msg); + + TRACE("completed with status 0x%x\n", data->status); + + SetEvent(data->handle); + + return 0; +} + +static inline HRESULT ClientRpcChannelBuffer_IsCorrectApartment(ClientRpcChannelBuffer *This, const struct apartment *apt) +{ + if (!apt) + return S_FALSE; + if (This->oxid != apartment_getoxid(apt)) + return S_FALSE; + return S_OK; +} + +static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE *olemsg, ULONG *pstatus) +{ + ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface; + HRESULT hr; + RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg; + RPC_STATUS status; + DWORD index; + struct message_state *message_state; + ORPCTHAT orpcthat; + ORPC_EXTENT_ARRAY orpc_ext_array; + WIRE_ORPC_EXTENT *first_wire_orpc_extent = NULL; + HRESULT hrFault = S_OK; + struct apartment *apt = apartment_get_current_or_mta(); + struct tlsdata *tlsdata; + + TRACE("(%p) iMethod=%d\n", olemsg, olemsg->iMethod); + + hr = ClientRpcChannelBuffer_IsCorrectApartment(This, apt); + if (hr != S_OK) + { + ERR("called from wrong apartment, should have been 0x%s\n", + wine_dbgstr_longlong(This->oxid)); + if (apt) apartment_release(apt); + return RPC_E_WRONG_THREAD; + } + + if (FAILED(hr = com_get_tlsdata(&tlsdata))) + return hr; + + /* This situation should be impossible in multi-threaded apartments, + * because the calling thread isn't re-enterable. + * Note: doing a COM call during the processing of a sent message is + * only disallowed if a client call is already being waited for + * completion */ + if (!apt->multi_threaded && + tlsdata->pending_call_count_client && + InSendMessage()) + { + ERR("can't make an outgoing COM call in response to a sent message\n"); + apartment_release(apt); + return RPC_E_CANTCALLOUT_ININPUTSYNCCALL; + } + + message_state = msg->Handle; + /* restore the binding handle and the real start of data */ + msg->Handle = message_state->binding_handle; + msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len; + msg->BufferLength += message_state->prefix_data_len; + + /* Note: this is an optimization in the Microsoft OLE runtime that we need + * to copy, as shown by the test_no_couninitialize_client test. without + * short-circuiting the RPC runtime in the case below, the test will + * deadlock on the loader lock due to the RPC runtime needing to create + * a thread to process the RPC when this function is called indirectly + * from DllMain */ + + message_state->params.msg = olemsg; + if (message_state->params.bypass_rpcrt) + { + TRACE("Calling apartment thread 0x%08x...\n", message_state->target_tid); + + msg->ProcNum &= ~RPC_FLAGS_VALID_BIT; + + if (!PostMessageW(message_state->target_hwnd, DM_EXECUTERPC, 0, + (LPARAM)&message_state->params)) + { + ERR("PostMessage failed with error %u\n", GetLastError()); + + /* Note: message_state->params.iface doesn't have a reference and + * so doesn't need to be released */ + + hr = HRESULT_FROM_WIN32(GetLastError()); + } + } + else + { + /* we use a separate thread here because we need to be able to + * pump the message loop in the application thread: if we do not, + * any windows created by this thread will hang and RPCs that try + * and re-enter this STA from an incoming server thread will + * deadlock. InstallShield is an example of that. + */ + if (!QueueUserWorkItem(rpc_sendreceive_thread, &message_state->params, WT_EXECUTEDEFAULT)) + { + ERR("QueueUserWorkItem failed with error %u\n", GetLastError()); + hr = E_UNEXPECTED; + } + else + hr = S_OK; + } + + if (hr == S_OK) + { + if (WaitForSingleObject(message_state->params.handle, 0)) + { + tlsdata->pending_call_count_client++; + hr = CoWaitForMultipleHandles(0, INFINITE, 1, &message_state->params.handle, &index); + tlsdata->pending_call_count_client--; + } + } + ClientRpcChannelBuffer_ReleaseEventHandle(This, message_state->params.handle); + + /* for WM shortcut, faults are returned in params->hr */ + if (hr == S_OK) + hrFault = message_state->params.hr; + + status = message_state->params.status; + + orpcthat.flags = ORPCF_NULL; + orpcthat.extensions = NULL; + + TRACE("RPC call status: 0x%x\n", status); + if (status != RPC_S_OK) + hr = HRESULT_FROM_WIN32(status); + + TRACE("hrFault = 0x%08x\n", hrFault); + + /* FIXME: this condition should be + * "hr == S_OK && (!hrFault || msg->BufferLength > FIELD_OFFSET(ORPCTHAT, extensions) + 4)" + * but we don't currently reset the message length for PostMessage + * dispatched calls */ + if (hr == S_OK && hrFault == S_OK) + { + HRESULT hr2; + char *original_buffer = msg->Buffer; + + /* handle ORPCTHAT and client extensions */ + + hr2 = unmarshal_ORPCTHAT(msg, &orpcthat, &orpc_ext_array, &first_wire_orpc_extent); + if (FAILED(hr2)) + hr = hr2; + + message_state->prefix_data_len = (char *)msg->Buffer - original_buffer; + msg->BufferLength -= message_state->prefix_data_len; + } + else + message_state->prefix_data_len = 0; + + if (hr == S_OK) + { + ChannelHooks_ClientNotify(&message_state->channel_hook_info, + msg->DataRepresentation, + first_wire_orpc_extent, + orpcthat.extensions && first_wire_orpc_extent ? orpcthat.extensions->size : 0, + hrFault); + } + + /* save away the message state again */ + msg->Handle = message_state; + + if (pstatus) *pstatus = status; + + if (hr == S_OK) + hr = hrFault; + + TRACE("-- 0x%08x\n", hr); + + apartment_release(apt); + return hr; +} + +static HRESULT WINAPI ServerRpcChannelBuffer_FreeBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg) +{ + RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg; + RPC_STATUS status; + struct message_state *message_state; + + TRACE("(%p)\n", msg); + + message_state = msg->Handle; + /* restore the binding handle and the real start of data */ + msg->Handle = message_state->binding_handle; + msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len; + msg->BufferLength += message_state->prefix_data_len; + message_state->prefix_data_len = 0; + + if (message_state->bypass_rpcrt) + { + HeapFree(GetProcessHeap(), 0, msg->Buffer); + status = RPC_S_OK; + } + else + status = I_RpcFreeBuffer(msg); + + msg->Handle = message_state; + + TRACE("-- %d\n", status); + + return HRESULT_FROM_WIN32(status); +} + +static HRESULT WINAPI ClientRpcChannelBuffer_FreeBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg) +{ + RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg; + RPC_STATUS status; + struct message_state *message_state; + + TRACE("(%p)\n", msg); + + message_state = msg->Handle; + /* restore the binding handle and the real start of data */ + msg->Handle = message_state->binding_handle; + msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len; + msg->BufferLength += message_state->prefix_data_len; + + if (message_state->params.bypass_rpcrt) + { + HeapFree(GetProcessHeap(), 0, msg->Buffer); + status = RPC_S_OK; + } + else + status = I_RpcFreeBuffer(msg); + + HeapFree(GetProcessHeap(), 0, msg->RpcInterfaceInformation); + msg->RpcInterfaceInformation = NULL; + + if (message_state->params.stub) + IRpcStubBuffer_Release(message_state->params.stub); + if (message_state->params.chan) + IRpcChannelBuffer_Release(message_state->params.chan); + HeapFree(GetProcessHeap(), 0, message_state); + + TRACE("-- %d\n", status); + + return HRESULT_FROM_WIN32(status); +} + +static HRESULT WINAPI ClientRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext) +{ + ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface; + + TRACE("(%p,%p)\n", pdwDestContext, ppvDestContext); + + *pdwDestContext = This->super.dest_context; + *ppvDestContext = This->super.dest_context_data; + + return S_OK; +} + +static HRESULT WINAPI ServerRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* dest_context, void** dest_context_data) +{ + RpcChannelBuffer *This = (RpcChannelBuffer *)iface; + + TRACE("(%p,%p)\n", dest_context, dest_context_data); + + *dest_context = This->dest_context; + *dest_context_data = This->dest_context_data; + return S_OK; +} + +static HRESULT WINAPI RpcChannelBuffer_IsConnected(LPRPCCHANNELBUFFER iface) +{ + TRACE("()\n"); + /* native does nothing too */ + return S_OK; +} + +static const IRpcChannelBufferVtbl ClientRpcChannelBufferVtbl = +{ + RpcChannelBuffer_QueryInterface, + RpcChannelBuffer_AddRef, + ClientRpcChannelBuffer_Release, + ClientRpcChannelBuffer_GetBuffer, + ClientRpcChannelBuffer_SendReceive, + ClientRpcChannelBuffer_FreeBuffer, + ClientRpcChannelBuffer_GetDestCtx, + RpcChannelBuffer_IsConnected +}; + +static const IRpcChannelBufferVtbl ServerRpcChannelBufferVtbl = +{ + RpcChannelBuffer_QueryInterface, + RpcChannelBuffer_AddRef, + ServerRpcChannelBuffer_Release, + ServerRpcChannelBuffer_GetBuffer, + ServerRpcChannelBuffer_SendReceive, + ServerRpcChannelBuffer_FreeBuffer, + ServerRpcChannelBuffer_GetDestCtx, + RpcChannelBuffer_IsConnected +}; + +/* returns a channel buffer for proxies */ +HRESULT rpc_create_clientchannel(const OXID *oxid, const IPID *ipid, + const OXID_INFO *oxid_info, const IID *iid, + DWORD dest_context, void *dest_context_data, + IRpcChannelBuffer **chan, struct apartment *apt) +{ + ClientRpcChannelBuffer *This; + WCHAR endpoint[200]; + RPC_BINDING_HANDLE bind; + RPC_STATUS status; + LPWSTR string_binding; + + /* FIXME: get the endpoint from oxid_info->psa instead */ + get_rpc_endpoint(endpoint, oxid); + + TRACE("proxy pipe: connecting to endpoint: %s\n", debugstr_w(endpoint)); + + status = RpcStringBindingComposeW( + NULL, + rpctransportW, + NULL, + endpoint, + NULL, + &string_binding); + + if (status == RPC_S_OK) + { + status = RpcBindingFromStringBindingW(string_binding, &bind); + + if (status == RPC_S_OK) + { + IPID ipid2 = *ipid; /* why can't RpcBindingSetObject take a const? */ + status = RpcBindingSetObject(bind, &ipid2); + if (status != RPC_S_OK) + RpcBindingFree(&bind); + } + + RpcStringFreeW(&string_binding); + } + + if (status != RPC_S_OK) + { + ERR("Couldn't get binding for endpoint %s, status = %d\n", debugstr_w(endpoint), status); + return HRESULT_FROM_WIN32(status); + } + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + { + RpcBindingFree(&bind); + return E_OUTOFMEMORY; + } + + This->super.IRpcChannelBuffer_iface.lpVtbl = &ClientRpcChannelBufferVtbl; + This->super.refs = 1; + This->super.dest_context = dest_context; + This->super.dest_context_data = dest_context_data; + This->bind = bind; + This->oxid = apartment_getoxid(apt); + This->server_pid = oxid_info->dwPid; + This->event = NULL; + This->iid = *iid; + + *chan = &This->super.IRpcChannelBuffer_iface; + + return S_OK; +} + +HRESULT rpc_create_serverchannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) +{ + RpcChannelBuffer *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + + This->IRpcChannelBuffer_iface.lpVtbl = &ServerRpcChannelBufferVtbl; + This->refs = 1; + This->dest_context = dest_context; + This->dest_context_data = dest_context_data; + + *chan = &This->IRpcChannelBuffer_iface; + + return S_OK; +} + +/* unmarshals ORPC_EXTENT_ARRAY according to NDR rules, but doesn't allocate + * any memory */ +static HRESULT unmarshal_ORPC_EXTENT_ARRAY(RPC_MESSAGE *msg, const char *end, + ORPC_EXTENT_ARRAY *extensions, + WIRE_ORPC_EXTENT **first_wire_orpc_extent) +{ + DWORD pointer_id; + DWORD i; + + memcpy(extensions, msg->Buffer, FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent)); + msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent); + + if ((const char *)msg->Buffer + 2 * sizeof(DWORD) > end) + return RPC_E_INVALID_HEADER; + + pointer_id = *(DWORD *)msg->Buffer; + msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); + extensions->extent = NULL; + + if (pointer_id) + { + WIRE_ORPC_EXTENT *wire_orpc_extent; + + /* conformance */ + if (*(DWORD *)msg->Buffer != ((extensions->size+1)&~1)) + return RPC_S_INVALID_BOUND; + + msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); + + /* arbitrary limit for security (don't know what native does) */ + if (extensions->size > 256) + { + ERR("too many extensions: %d\n", extensions->size); + return RPC_S_INVALID_BOUND; + } + + *first_wire_orpc_extent = wire_orpc_extent = msg->Buffer; + for (i = 0; i < ((extensions->size+1)&~1); i++) + { + if ((const char *)&wire_orpc_extent->data[0] > end) + return RPC_S_INVALID_BOUND; + if (wire_orpc_extent->conformance != ((wire_orpc_extent->size+7)&~7)) + return RPC_S_INVALID_BOUND; + if ((const char *)&wire_orpc_extent->data[wire_orpc_extent->conformance] > end) + return RPC_S_INVALID_BOUND; + TRACE("size %u, guid %s\n", wire_orpc_extent->size, debugstr_guid(&wire_orpc_extent->id)); + wire_orpc_extent = (WIRE_ORPC_EXTENT *)&wire_orpc_extent->data[wire_orpc_extent->conformance]; + } + msg->Buffer = wire_orpc_extent; + } + + return S_OK; +} + +/* unmarshals ORPCTHIS according to NDR rules, but doesn't allocate any memory */ +static HRESULT unmarshal_ORPCTHIS(RPC_MESSAGE *msg, ORPCTHIS *orpcthis, + ORPC_EXTENT_ARRAY *orpc_ext_array, WIRE_ORPC_EXTENT **first_wire_orpc_extent) +{ + const char *end = (char *)msg->Buffer + msg->BufferLength; + + *first_wire_orpc_extent = NULL; + + if (msg->BufferLength < FIELD_OFFSET(WIRE_ORPCTHIS, extensions) + sizeof(DWORD)) + { + ERR("invalid buffer length\n"); + return RPC_E_INVALID_HEADER; + } + + memcpy(orpcthis, msg->Buffer, FIELD_OFFSET(WIRE_ORPCTHIS, extensions)); + msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHIS, extensions); + + if ((const char *)msg->Buffer + sizeof(DWORD) > end) + return RPC_E_INVALID_HEADER; + + if (*(DWORD *)msg->Buffer) + orpcthis->extensions = orpc_ext_array; + else + orpcthis->extensions = NULL; + + msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); + + if (orpcthis->extensions) + { + HRESULT hr = unmarshal_ORPC_EXTENT_ARRAY(msg, end, orpc_ext_array, + first_wire_orpc_extent); + if (FAILED(hr)) + return hr; + } + + if ((orpcthis->version.MajorVersion != COM_MAJOR_VERSION) || + (orpcthis->version.MinorVersion > COM_MINOR_VERSION)) + { + ERR("COM version {%d, %d} not supported\n", + orpcthis->version.MajorVersion, orpcthis->version.MinorVersion); + return RPC_E_VERSION_MISMATCH; + } + + if (orpcthis->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)) + { + ERR("invalid flags 0x%x\n", orpcthis->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)); + return RPC_E_INVALID_HEADER; + } + + return S_OK; +} + +static HRESULT unmarshal_ORPCTHAT(RPC_MESSAGE *msg, ORPCTHAT *orpcthat, + ORPC_EXTENT_ARRAY *orpc_ext_array, WIRE_ORPC_EXTENT **first_wire_orpc_extent) +{ + const char *end = (char *)msg->Buffer + msg->BufferLength; + + *first_wire_orpc_extent = NULL; + + if (msg->BufferLength < FIELD_OFFSET(WIRE_ORPCTHAT, extensions) + sizeof(DWORD)) + { + ERR("invalid buffer length\n"); + return RPC_E_INVALID_HEADER; + } + + memcpy(orpcthat, msg->Buffer, FIELD_OFFSET(WIRE_ORPCTHAT, extensions)); + msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHAT, extensions); + + if ((const char *)msg->Buffer + sizeof(DWORD) > end) + return RPC_E_INVALID_HEADER; + + if (*(DWORD *)msg->Buffer) + orpcthat->extensions = orpc_ext_array; + else + orpcthat->extensions = NULL; + + msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); + + if (orpcthat->extensions) + { + HRESULT hr = unmarshal_ORPC_EXTENT_ARRAY(msg, end, orpc_ext_array, + first_wire_orpc_extent); + if (FAILED(hr)) + return hr; + } + + if (orpcthat->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)) + { + ERR("invalid flags 0x%x\n", orpcthat->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)); + return RPC_E_INVALID_HEADER; + } + + return S_OK; +} + +void rpc_execute_call(struct dispatch_params *params) +{ + struct message_state *message_state = NULL; + RPC_MESSAGE *msg = (RPC_MESSAGE *)params->msg; + char *original_buffer = msg->Buffer; + ORPCTHIS orpcthis; + ORPC_EXTENT_ARRAY orpc_ext_array; + WIRE_ORPC_EXTENT *first_wire_orpc_extent; + GUID old_causality_id; + struct tlsdata *tlsdata; + struct apartment *apt; + + if (FAILED(com_get_tlsdata(&tlsdata))) + return; + + apt = com_get_current_apt(); + + /* handle ORPCTHIS and server extensions */ + + params->hr = unmarshal_ORPCTHIS(msg, &orpcthis, &orpc_ext_array, &first_wire_orpc_extent); + if (params->hr != S_OK) + { + msg->Buffer = original_buffer; + goto exit; + } + + message_state = HeapAlloc(GetProcessHeap(), 0, sizeof(*message_state)); + if (!message_state) + { + params->hr = E_OUTOFMEMORY; + msg->Buffer = original_buffer; + goto exit; + } + + message_state->prefix_data_len = (char *)msg->Buffer - original_buffer; + message_state->binding_handle = msg->Handle; + message_state->bypass_rpcrt = params->bypass_rpcrt; + + message_state->channel_hook_info.iid = params->iid; + message_state->channel_hook_info.cbSize = sizeof(message_state->channel_hook_info); + message_state->channel_hook_info.uCausality = orpcthis.cid; + message_state->channel_hook_info.dwServerPid = GetCurrentProcessId(); + message_state->channel_hook_info.iMethod = msg->ProcNum; + message_state->channel_hook_info.pObject = params->iface; + + if (orpcthis.extensions && first_wire_orpc_extent && + orpcthis.extensions->size) + ChannelHooks_ServerNotify(&message_state->channel_hook_info, msg->DataRepresentation, first_wire_orpc_extent, orpcthis.extensions->size); + + msg->Handle = message_state; + msg->BufferLength -= message_state->prefix_data_len; + + /* call message filter */ + + if (apt->filter) + { + DWORD handlecall; + INTERFACEINFO interface_info; + CALLTYPE calltype; + + interface_info.pUnk = params->iface; + interface_info.iid = params->iid; + interface_info.wMethod = msg->ProcNum; + + if (IsEqualGUID(&orpcthis.cid, &tlsdata->causality_id)) + calltype = CALLTYPE_NESTED; + else if (tlsdata->pending_call_count_server == 0) + calltype = CALLTYPE_TOPLEVEL; + else + calltype = CALLTYPE_TOPLEVEL_CALLPENDING; + + handlecall = IMessageFilter_HandleInComingCall(apt->filter, + calltype, + UlongToHandle(GetCurrentProcessId()), + 0 /* FIXME */, + &interface_info); + TRACE("IMessageFilter_HandleInComingCall returned %d\n", handlecall); + switch (handlecall) + { + case SERVERCALL_REJECTED: + params->hr = RPC_E_CALL_REJECTED; + goto exit_reset_state; + case SERVERCALL_RETRYLATER: +#if 0 /* FIXME: handle retries on the client side before enabling this code */ + params->hr = RPC_E_RETRY; + goto exit_reset_state; +#else + FIXME("retry call later not implemented\n"); + break; +#endif + case SERVERCALL_ISHANDLED: + default: + break; + } + } + + /* invoke the method */ + + /* save the old causality ID - note: any calls executed while processing + * messages received during the SendReceive will appear to originate from + * this call - this should be checked with what Windows does */ + old_causality_id = tlsdata->causality_id; + tlsdata->causality_id = orpcthis.cid; + tlsdata->pending_call_count_server++; + params->hr = IRpcStubBuffer_Invoke(params->stub, params->msg, params->chan); + tlsdata->pending_call_count_server--; + tlsdata->causality_id = old_causality_id; + + /* the invoke allocated a new buffer, so free the old one */ + if (message_state->bypass_rpcrt && original_buffer != msg->Buffer) + HeapFree(GetProcessHeap(), 0, original_buffer); + +exit_reset_state: + message_state = msg->Handle; + msg->Handle = message_state->binding_handle; + msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len; + msg->BufferLength += message_state->prefix_data_len; + +exit: + HeapFree(GetProcessHeap(), 0, message_state); + if (params->handle) SetEvent(params->handle); +} + +static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) +{ + struct dispatch_params *params; + struct stub_manager *stub_manager; + struct apartment *apt; + IPID ipid; + HRESULT hr; + + RpcBindingInqObject(msg->Handle, &ipid); + + TRACE("ipid = %s, iMethod = %d\n", debugstr_guid(&ipid), msg->ProcNum); + + params = HeapAlloc(GetProcessHeap(), 0, sizeof(*params)); + if (!params) + { + RpcRaiseException(E_OUTOFMEMORY); + return; + } + + hr = ipid_get_dispatch_params(&ipid, &apt, &stub_manager, &params->stub, &params->chan, + &params->iid, &params->iface); + if (hr != S_OK) + { + ERR("no apartment found for ipid %s\n", debugstr_guid(&ipid)); + HeapFree(GetProcessHeap(), 0, params); + RpcRaiseException(hr); + return; + } + + params->msg = (RPCOLEMESSAGE *)msg; + params->status = RPC_S_OK; + params->hr = S_OK; + params->handle = NULL; + params->bypass_rpcrt = FALSE; + + /* Note: this is the important difference between STAs and MTAs - we + * always execute RPCs to STAs in the thread that originally created the + * apartment (i.e. the one that pumps messages to the window) */ + if (!apt->multi_threaded) + { + params->handle = CreateEventW(NULL, FALSE, FALSE, NULL); + + TRACE("Calling apartment thread 0x%08x...\n", apt->tid); + + if (PostMessageW(apartment_getwindow(apt), DM_EXECUTERPC, 0, (LPARAM)params)) + WaitForSingleObject(params->handle, INFINITE); + else + { + ERR("PostMessage failed with error %u\n", GetLastError()); + IRpcChannelBuffer_Release(params->chan); + IRpcStubBuffer_Release(params->stub); + } + CloseHandle(params->handle); + } + else + { + BOOL joined = FALSE; + struct tlsdata *tlsdata; + + com_get_tlsdata(&tlsdata); + + if (!tlsdata->apt) + { + enter_apartment(tlsdata, COINIT_MULTITHREADED); + joined = TRUE; + } + rpc_execute_call(params); + if (joined) + { + leave_apartment(tlsdata); + } + } + + hr = params->hr; + if (params->chan) + IRpcChannelBuffer_Release(params->chan); + if (params->stub) + IRpcStubBuffer_Release(params->stub); + HeapFree(GetProcessHeap(), 0, params); + + stub_manager_int_release(stub_manager); + apartment_release(apt); + + /* if IRpcStubBuffer_Invoke fails, we should raise an exception to tell + * the RPC runtime that the call failed */ + if (hr != S_OK) RpcRaiseException(hr); +} + +/* stub registration */ +HRESULT rpc_register_interface(REFIID riid) +{ + struct registered_if *rif; + BOOL found = FALSE; + HRESULT hr = S_OK; + + TRACE("(%s)\n", debugstr_guid(riid)); + + EnterCriticalSection(&csRegIf); + LIST_FOR_EACH_ENTRY(rif, &registered_interfaces, struct registered_if, entry) + { + if (IsEqualGUID(&rif->If.InterfaceId.SyntaxGUID, riid)) + { + rif->refs++; + found = TRUE; + break; + } + } + if (!found) + { + TRACE("Creating new interface\n"); + + rif = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*rif)); + if (rif) + { + RPC_STATUS status; + + rif->refs = 1; + rif->If.Length = sizeof(RPC_SERVER_INTERFACE); + /* RPC interface ID = COM interface ID */ + rif->If.InterfaceId.SyntaxGUID = *riid; + rif->If.DispatchTable = &rpc_dispatch; + /* all other fields are 0, including the version asCOM objects + * always have a version of 0.0 */ + status = RpcServerRegisterIfEx( + (RPC_IF_HANDLE)&rif->If, + NULL, NULL, + RPC_IF_OLE | RPC_IF_AUTOLISTEN, + RPC_C_LISTEN_MAX_CALLS_DEFAULT, + NULL); + if (status == RPC_S_OK) + list_add_tail(&registered_interfaces, &rif->entry); + else + { + ERR("RpcServerRegisterIfEx failed with error %d\n", status); + HeapFree(GetProcessHeap(), 0, rif); + hr = HRESULT_FROM_WIN32(status); + } + } + else + hr = E_OUTOFMEMORY; + } + LeaveCriticalSection(&csRegIf); + return hr; +} + +/* stub unregistration */ +void rpc_unregister_interface(REFIID riid, BOOL wait) +{ + struct registered_if *rif; + EnterCriticalSection(&csRegIf); + LIST_FOR_EACH_ENTRY(rif, &registered_interfaces, struct registered_if, entry) + { + if (IsEqualGUID(&rif->If.InterfaceId.SyntaxGUID, riid)) + { + if (!--rif->refs) + { + RpcServerUnregisterIf((RPC_IF_HANDLE)&rif->If, NULL, wait); + list_remove(&rif->entry); + HeapFree(GetProcessHeap(), 0, rif); + } + break; + } + } + LeaveCriticalSection(&csRegIf); +} + +/* get the info for an OXID, including the IPID for the rem unknown interface + * and the string binding */ +HRESULT rpc_resolve_oxid(OXID oxid, OXID_INFO *oxid_info) +{ + TRACE("%s\n", wine_dbgstr_longlong(oxid)); + + oxid_info->dwTid = 0; + oxid_info->dwPid = 0; + oxid_info->dwAuthnHint = RPC_C_AUTHN_LEVEL_NONE; + /* FIXME: this is a hack around not having an OXID resolver yet - + * this function should contact the machine's OXID resolver and then it + * should give us the IPID of the IRemUnknown interface */ + oxid_info->ipidRemUnknown.Data1 = 0xffffffff; + oxid_info->ipidRemUnknown.Data2 = 0xffff; + oxid_info->ipidRemUnknown.Data3 = 0xffff; + memcpy(oxid_info->ipidRemUnknown.Data4, &oxid, sizeof(OXID)); + oxid_info->psa = NULL /* FIXME */; + + return S_OK; +} + +/* make the apartment reachable by other threads and processes and create the + * IRemUnknown object */ +void rpc_start_remoting(struct apartment *apt) +{ + if (!InterlockedExchange(&apt->remoting_started, TRUE)) + { + WCHAR endpoint[200]; + RPC_STATUS status; + + get_rpc_endpoint(endpoint, &apt->oxid); + + status = RpcServerUseProtseqEpW( + rpctransportW, + RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + endpoint, + NULL); + if (status != RPC_S_OK) + ERR("Couldn't register endpoint %s\n", debugstr_w(endpoint)); + + /* FIXME: move remote unknown exporting into this function */ + } + start_apartment_remote_unknown(apt); +} diff --git a/dlls/combase/stubmanager.c b/dlls/combase/stubmanager.c index a800c0b4844..16b8bb35d00 100644 --- a/dlls/combase/stubmanager.c +++ b/dlls/combase/stubmanager.c @@ -44,11 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -extern HRESULT WINAPI marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object, - DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags); -extern HRESULT WINAPI RPC_CreateServerChannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan); -extern void WINAPI RPC_UnregisterInterface(REFIID riid, BOOL wait); - /* generates an ipid in the following format (similar to native version): * Data1 = apartment-local ipid counter * Data2 = apartment creator thread ID @@ -92,7 +87,7 @@ struct ifstub * stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer * return NULL; } - hr = RPC_CreateServerChannel(dest_context, dest_context_data, &stub->chan); + hr = rpc_create_serverchannel(dest_context, dest_context_data, &stub->chan); if (hr != S_OK) { IUnknown_Release(stub->iface); @@ -131,7 +126,7 @@ static void stub_manager_delete_ifstub(struct stub_manager *m, struct ifstub *if list_remove(&ifstub->entry); if (!m->disconnected) - RPC_UnregisterInterface(&ifstub->iid, TRUE); + rpc_unregister_interface(&ifstub->iid, TRUE); if (ifstub->stubbuffer) IRpcStubBuffer_Release(ifstub->stubbuffer); IUnknown_Release(ifstub->iface); @@ -255,7 +250,7 @@ void stub_manager_disconnect(struct stub_manager *m) if (!m->disconnected) { LIST_FOR_EACH_ENTRY(ifstub, &m->ifstubs, struct ifstub, entry) - RPC_UnregisterInterface(&ifstub->iid, FALSE); + rpc_unregister_interface(&ifstub->iid, FALSE); m->disconnected = TRUE; } @@ -314,7 +309,7 @@ static ULONG stub_manager_int_addref(struct stub_manager *m) } /* decrements the internal refcount */ -ULONG WINAPI stub_manager_int_release(struct stub_manager *m) +ULONG stub_manager_int_release(struct stub_manager *m) { ULONG refs; struct apartment *apt = m->apt; @@ -542,10 +537,9 @@ static HRESULT ipid_to_stub_manager(const IPID *ipid, struct apartment **stub_ap /* gets the apartment, stub and channel of an object. the caller must * release the references to all objects (except iface) if the function * returned success, otherwise no references are returned. */ -HRESULT WINAPI ipid_get_dispatch_params(const IPID *ipid, struct apartment **stub_apt, - struct stub_manager **manager, - IRpcStubBuffer **stub, IRpcChannelBuffer **chan, - IID *iid, IUnknown **iface) +HRESULT ipid_get_dispatch_params(const IPID *ipid, struct apartment **stub_apt, + struct stub_manager **manager, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, + IID *iid, IUnknown **iface) { struct stub_manager *stubmgr; struct ifstub *ifstub; @@ -826,7 +820,7 @@ static const IRemUnknownVtbl RemUnknown_Vtbl = }; /* starts the IRemUnknown listener for the current apartment */ -HRESULT WINAPI start_apartment_remote_unknown(struct apartment *apt) +HRESULT start_apartment_remote_unknown(struct apartment *apt) { IRemUnknown *pRemUnknown; HRESULT hr = S_OK; diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index ddbdfab30de..89807b94ef0 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -33,7 +33,6 @@ C_SRCS = \ oleobj.c \ oleproxy.c \ pointermoniker.c \ - rpc.c \ stg_prop.c \ stg_stream.c \ storage32.c \ diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index b92dfd87267..a9a9af53108 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -930,26 +930,6 @@ HRESULT WINAPI CoGetObject(LPCWSTR pszName, BIND_OPTS *pBindOptions, return hr; } -/*********************************************************************** - * CoRegisterChannelHook [OLE32.@] - * - * Registers a process-wide hook that is called during ORPC calls. - * - * PARAMS - * guidExtension [I] GUID of the channel hook to register. - * pChannelHook [I] Channel hook object to register. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - */ -HRESULT WINAPI CoRegisterChannelHook(REFGUID guidExtension, IChannelHook *pChannelHook) -{ - TRACE("(%s, %p)\n", debugstr_guid(guidExtension), pChannelHook); - - return RPC_RegisterChannelHook(guidExtension, pChannelHook); -} - /* Returns expanded dll path from the registry or activation context. */ static BOOL get_object_dll_path(const struct class_reg_data *regdata, WCHAR *dst, DWORD dstlen) { @@ -1176,7 +1156,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID reserved) case DLL_PROCESS_DETACH: if (reserved) break; release_std_git(); - RPC_UnregisterAllChannelHooks(); break; } return TRUE; diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 12acfc0a9e5..18b39d655f0 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -39,113 +39,9 @@ #include "winreg.h" #include "winternl.h" -struct apartment; - DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 ); -/* signal to stub manager that this is a rem unknown object */ -#define MSHLFLAGSP_REMUNKNOWN 0x80000000 - -/* Thread-safety Annotation Legend: - * - * RO - The value is read only. It never changes after creation, so no - * locking is required. - * LOCK - The value is written to only using Interlocked* functions. - * CS - The value is read or written to inside a critical section. - * The identifier following "CS" is the specific critical section that - * must be used. - * MUTEX - The value is read or written to with a mutex held. - * The identifier following "MUTEX" is the specific mutex that - * must be used. - */ - -typedef enum ifstub_state -{ - STUBSTATE_NORMAL_MARSHALED, - STUBSTATE_NORMAL_UNMARSHALED, - STUBSTATE_TABLE_WEAK_MARSHALED, - STUBSTATE_TABLE_WEAK_UNMARSHALED, - STUBSTATE_TABLE_STRONG, -} STUB_STATE; - -/* an interface stub */ -struct ifstub -{ - struct list entry; /* entry in stub_manager->ifstubs list (CS stub_manager->lock) */ - IRpcStubBuffer *stubbuffer; /* RO */ - IID iid; /* RO */ - IPID ipid; /* RO */ - IUnknown *iface; /* RO */ - MSHLFLAGS flags; /* so we can enforce process-local marshalling rules (RO) */ - IRpcChannelBuffer*chan; /* channel passed to IRpcStubBuffer::Invoke (RO) */ -}; - - -/* stub managers hold refs on the object and each interface stub */ -struct stub_manager -{ - struct list entry; /* entry in apartment stubmgr list (CS apt->cs) */ - struct list ifstubs; /* list of active ifstubs for the object (CS lock) */ - CRITICAL_SECTION lock; - struct apartment *apt; /* owning apt (RO) */ - - ULONG extrefs; /* number of 'external' references (CS lock) */ - ULONG refs; /* internal reference count (CS apt->cs) */ - ULONG weakrefs; /* number of weak references (CS lock) */ - OID oid; /* apartment-scoped unique identifier (RO) */ - IUnknown *object; /* the object we are managing the stub for (RO) */ - ULONG next_ipid; /* currently unused (LOCK) */ - OXID_INFO oxid_info; /* string binding, ipid of rem unknown and other information (RO) */ - - IExternalConnection *extern_conn; - - /* We need to keep a count of the outstanding marshals, so we can enforce the - * marshalling rules (ie, you can only unmarshal normal marshals once). Note - * that these counts do NOT include unmarshalled interfaces, once a stream is - * unmarshalled and a proxy set up, this count is decremented. - */ - - ULONG norm_refs; /* refcount of normal marshals (CS lock) */ - BOOL disconnected; /* CoDisconnectObject has been called (CS lock) */ -}; - -struct apartment -{ - struct list entry; - - LONG refs; /* refcount of the apartment (LOCK) */ - BOOL multi_threaded; /* multi-threaded or single-threaded apartment? (RO) */ - DWORD tid; /* thread id (RO) */ - OXID oxid; /* object exporter ID (RO) */ - LONG ipidc; /* interface pointer ID counter, starts at 1 (LOCK) */ - CRITICAL_SECTION cs; /* thread safety */ - struct list proxies; /* imported objects (CS cs) */ - struct list stubmgrs; /* stub managers for exported objects (CS cs) */ - BOOL remunk_exported; /* has the IRemUnknown interface for this apartment been created yet? (CS cs) */ - LONG remoting_started; /* has the RPC system been started for this apartment? (LOCK) */ - struct list loaded_dlls; /* list of dlls loaded by this apartment (CS cs) */ - DWORD host_apt_tid; /* thread ID of apartment hosting objects of differing threading model (CS cs) */ - HWND host_apt_hwnd; /* handle to apartment window of host apartment (CS cs) */ - struct local_server *local_server; /* A marshallable object exposing local servers (CS cs) */ - BOOL being_destroyed; /* is currently being destroyed */ - - /* FIXME: OIDs should be given out by RPCSS */ - OID oidc; /* object ID counter, starts at 1, zero is invalid OID (CS cs) */ - - /* STA-only fields */ - HWND win; /* message window (LOCK) */ - LPMESSAGEFILTER filter; /* message filter (CS cs) */ - BOOL main; /* is this a main-threaded-apartment? (RO) */ - /* MTA-only */ - struct list usage_cookies; /* Used for refcount control with CoIncrementMTAUsage()/CoDecrementMTAUsage(). */ -}; - -struct init_spy -{ - struct list entry; - IInitializeSpy *spy; - unsigned int id; -}; +struct apartment; /* this is what is stored in TEB->ReservedForOle */ struct oletls @@ -170,7 +66,6 @@ struct oletls DWORD spies_lock; }; - /* Global Interface Table Functions */ extern void release_std_git(void) DECLSPEC_HIDDEN; extern HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv) DECLSPEC_HIDDEN; @@ -179,48 +74,9 @@ HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; -/* Stub Manager */ - -extern ULONG WINAPI stub_manager_int_release(struct stub_manager *This) DECLSPEC_HIDDEN; - -/* RPC Backend */ - -struct dispatch_params; - -HRESULT WINAPI RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, - const OXID_INFO *oxid_info, const IID *iid, - DWORD dest_context, void *dest_context_data, - IRpcChannelBuffer **chan, struct apartment *apt) DECLSPEC_HIDDEN; -HRESULT WINAPI RPC_RegisterInterface(REFIID riid) DECLSPEC_HIDDEN; -HRESULT RPC_RegisterChannelHook(REFGUID rguid, IChannelHook *hook) DECLSPEC_HIDDEN; -void RPC_UnregisterAllChannelHooks(void) DECLSPEC_HIDDEN; -HRESULT WINAPI RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info) DECLSPEC_HIDDEN; - /* Drag and drop */ void OLEDD_UnInitialize(void) DECLSPEC_HIDDEN; -/* Apartment Functions */ - -extern void WINAPI apartment_release(struct apartment *apt) DECLSPEC_HIDDEN; -static inline HRESULT apartment_getoxid(const struct apartment *apt, OXID *oxid) -{ - *oxid = apt->oxid; - return S_OK; -} -extern HWND WINAPI apartment_getwindow(const struct apartment *apt) DECLSPEC_HIDDEN; -extern HRESULT WINAPI enter_apartment(struct oletls *info, DWORD model) DECLSPEC_HIDDEN; -void WINAPI leave_apartment(struct oletls *info) DECLSPEC_HIDDEN; -extern struct apartment * WINAPI apartment_get_current_or_mta(void) DECLSPEC_HIDDEN; -extern HRESULT WINAPI apartment_get_local_server_stream(struct apartment *apt, IStream **ret) DECLSPEC_HIDDEN; - -/* DCOM messages used by the apartment window (not compatible with native) */ -#define DM_EXECUTERPC (WM_USER + 0) /* WPARAM = 0, LPARAM = (struct dispatch_params *) */ -#define DM_HOSTOBJECT (WM_USER + 1) /* WPARAM = 0, LPARAM = (struct host_object_params *) */ - -/* - * Per-thread values are stored in the TEB on offset 0xF80 - */ - extern HRESULT WINAPI InternalTlsAllocData(struct oletls **tlsdata); /* will create if necessary */ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 1ea57416176..cf48d043b75 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -64,7 +64,7 @@ @ stdcall CoQueryClientBlanket(ptr ptr ptr ptr ptr ptr ptr) combase.CoQueryClientBlanket @ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr) combase.CoQueryProxyBlanket @ stub CoQueryReleaseObject -@ stdcall CoRegisterChannelHook(ptr ptr) +@ stdcall CoRegisterChannelHook(ptr ptr) combase.CoRegisterChannelHook @ stdcall CoRegisterClassObject(ptr ptr long long ptr) combase.CoRegisterClassObject @ stdcall CoRegisterInitializeSpy(ptr ptr) combase.CoRegisterInitializeSpy @ stdcall CoRegisterMallocSpy(ptr) combase.CoRegisterMallocSpy @@ -298,11 +298,3 @@ @ stdcall WriteFmtUserTypeStg(ptr long ptr) @ stub WriteOleStg @ stub WriteStringStream - -@ stdcall Internal_RPC_ExecuteCall(ptr) -@ stdcall RPC_CreateServerChannel(long ptr ptr) -@ stdcall RPC_UnregisterInterface(ptr long) -@ stdcall RPC_RegisterInterface(ptr) -@ stdcall RPC_ResolveOxid(int64 ptr) -@ stdcall RPC_StartRemoting(ptr) -@ stdcall RPC_CreateClientChannel(ptr ptr ptr ptr long ptr ptr ptr) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c deleted file mode 100644 index a6783c45eae..00000000000 --- a/dlls/ole32/rpc.c +++ /dev/null @@ -1,1654 +0,0 @@ -/* - * RPC Manager - * - * Copyright 2001 Ove Kåven, TransGaming Technologies - * Copyright 2002 Marcus Meissner - * Copyright 2005 Mike Hearn, Rob Shearman for CodeWeavers - * - * 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 - */ - -#include <stdarg.h> -#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winsvc.h" -#include "objbase.h" -#include "ole2.h" -#include "rpc.h" -#include "winerror.h" -#include "winreg.h" -#include "servprov.h" - -#include "compobj_private.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ole); - -extern HRESULT WINAPI ipid_get_dispatch_params(const IPID *ipid, struct apartment **stub_apt, - struct stub_manager **manager, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, IID *iid, IUnknown **iface); -extern HRESULT WINAPI start_apartment_remote_unknown(struct apartment *apt); - -static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg); - -/* we only use one function to dispatch calls for all methods - we use the - * RPC_IF_OLE flag to tell the RPC runtime that this is the case */ -static RPC_DISPATCH_FUNCTION rpc_dispatch_table[1] = { dispatch_rpc }; /* (RO) */ -static RPC_DISPATCH_TABLE rpc_dispatch = { 1, rpc_dispatch_table }; /* (RO) */ - -static struct list registered_interfaces = LIST_INIT(registered_interfaces); /* (CS csRegIf) */ -static CRITICAL_SECTION csRegIf; -static CRITICAL_SECTION_DEBUG csRegIf_debug = -{ - 0, 0, &csRegIf, - { &csRegIf_debug.ProcessLocksList, &csRegIf_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": dcom registered server interfaces") } -}; -static CRITICAL_SECTION csRegIf = { &csRegIf_debug, -1, 0, 0, 0, 0 }; - -static struct list channel_hooks = LIST_INIT(channel_hooks); /* (CS csChannelHook) */ -static CRITICAL_SECTION csChannelHook; -static CRITICAL_SECTION_DEBUG csChannelHook_debug = -{ - 0, 0, &csChannelHook, - { &csChannelHook_debug.ProcessLocksList, &csChannelHook_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": channel hooks") } -}; -static CRITICAL_SECTION csChannelHook = { &csChannelHook_debug, -1, 0, 0, 0, 0 }; - -static WCHAR wszRpcTransport[] = {'n','c','a','l','r','p','c',0}; - - -struct registered_if -{ - struct list entry; - DWORD refs; /* ref count */ - RPC_SERVER_INTERFACE If; /* interface registered with the RPC runtime */ -}; - -/* get the pipe endpoint specified of the specified apartment */ -static inline void get_rpc_endpoint(LPWSTR endpoint, const OXID *oxid) -{ - /* FIXME: should get endpoint from rpcss */ - static const WCHAR wszEndpointFormat[] = {'\\','p','i','p','e','\\','O','L','E','_','%','0','8','l','x','%','0','8','l','x',0}; - wsprintfW(endpoint, wszEndpointFormat, (DWORD)(*oxid >> 32),(DWORD)*oxid); -} - -typedef struct -{ - IRpcChannelBuffer IRpcChannelBuffer_iface; - LONG refs; - - DWORD dest_context; /* returned from GetDestCtx */ - void *dest_context_data; /* returned from GetDestCtx */ -} RpcChannelBuffer; - -typedef struct -{ - RpcChannelBuffer super; /* superclass */ - - RPC_BINDING_HANDLE bind; /* handle to the remote server */ - OXID oxid; /* apartment in which the channel is valid */ - DWORD server_pid; /* id of server process */ - HANDLE event; /* cached event handle */ - IID iid; /* IID of the proxy this belongs to */ -} ClientRpcChannelBuffer; - -struct dispatch_params -{ - RPCOLEMESSAGE *msg; /* message */ - IRpcStubBuffer *stub; /* stub buffer, if applicable */ - IRpcChannelBuffer *chan; /* server channel buffer, if applicable */ - IID iid; /* ID of interface being called */ - IUnknown *iface; /* interface being called */ - HANDLE handle; /* handle that will become signaled when call finishes */ - BOOL bypass_rpcrt; /* bypass RPC runtime? */ - RPC_STATUS status; /* status (out) */ - HRESULT hr; /* hresult (out) */ -}; - -struct message_state -{ - RPC_BINDING_HANDLE binding_handle; - ULONG prefix_data_len; - SChannelHookCallInfo channel_hook_info; - BOOL bypass_rpcrt; - - /* client only */ - HWND target_hwnd; - DWORD target_tid; - struct dispatch_params params; -}; - -typedef struct -{ - ULONG conformance; /* NDR */ - GUID id; - ULONG size; - /* [size_is((size+7)&~7)] */ unsigned char data[1]; -} WIRE_ORPC_EXTENT; - -typedef struct -{ - ULONG size; - ULONG reserved; - unsigned char extent[1]; -} WIRE_ORPC_EXTENT_ARRAY; - -typedef struct -{ - ULONG version; - ULONG flags; - ULONG reserved1; - GUID cid; - unsigned char extensions[1]; -} WIRE_ORPCTHIS; - -typedef struct -{ - ULONG flags; - unsigned char extensions[1]; -} WIRE_ORPCTHAT; - -struct channel_hook_entry -{ - struct list entry; - GUID id; - IChannelHook *hook; -}; - -struct channel_hook_buffer_data -{ - GUID id; - ULONG extension_size; -}; - - -static HRESULT unmarshal_ORPCTHAT(RPC_MESSAGE *msg, ORPCTHAT *orpcthat, - ORPC_EXTENT_ARRAY *orpc_ext_array, WIRE_ORPC_EXTENT **first_wire_orpc_extent); - -/* Channel Hook Functions */ - -static ULONG ChannelHooks_ClientGetSize(SChannelHookCallInfo *info, - struct channel_hook_buffer_data **data, unsigned int *hook_count, - ULONG *extension_count) -{ - struct channel_hook_entry *entry; - ULONG total_size = 0; - unsigned int hook_index = 0; - - *hook_count = 0; - *extension_count = 0; - - EnterCriticalSection(&csChannelHook); - - LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry) - (*hook_count)++; - - if (*hook_count) - *data = HeapAlloc(GetProcessHeap(), 0, *hook_count * sizeof(struct channel_hook_buffer_data)); - else - *data = NULL; - - LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry) - { - ULONG extension_size = 0; - - IChannelHook_ClientGetSize(entry->hook, &entry->id, &info->iid, &extension_size); - - TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size); - - extension_size = (extension_size+7)&~7; - (*data)[hook_index].id = entry->id; - (*data)[hook_index].extension_size = extension_size; - - /* an extension is only put onto the wire if it has data to write */ - if (extension_size) - { - total_size += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[extension_size]); - (*extension_count)++; - } - - hook_index++; - } - - LeaveCriticalSection(&csChannelHook); - - return total_size; -} - -static unsigned char * ChannelHooks_ClientFillBuffer(SChannelHookCallInfo *info, - unsigned char *buffer, struct channel_hook_buffer_data *data, - unsigned int hook_count) -{ - struct channel_hook_entry *entry; - - EnterCriticalSection(&csChannelHook); - - LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry) - { - unsigned int i; - ULONG extension_size = 0; - WIRE_ORPC_EXTENT *wire_orpc_extent = (WIRE_ORPC_EXTENT *)buffer; - - for (i = 0; i < hook_count; i++) - if (IsEqualGUID(&entry->id, &data[i].id)) - extension_size = data[i].extension_size; - - /* an extension is only put onto the wire if it has data to write */ - if (!extension_size) - continue; - - IChannelHook_ClientFillBuffer(entry->hook, &entry->id, &info->iid, - &extension_size, buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0])); - - TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size); - - /* FIXME: set unused portion of wire_orpc_extent->data to 0? */ - - wire_orpc_extent->conformance = (extension_size+7)&~7; - wire_orpc_extent->size = extension_size; - wire_orpc_extent->id = entry->id; - buffer += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[wire_orpc_extent->conformance]); - } - - LeaveCriticalSection(&csChannelHook); - - return buffer; -} - -static void ChannelHooks_ServerNotify(SChannelHookCallInfo *info, - DWORD lDataRep, WIRE_ORPC_EXTENT *first_wire_orpc_extent, - ULONG extension_count) -{ - struct channel_hook_entry *entry; - ULONG i; - - EnterCriticalSection(&csChannelHook); - - LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry) - { - WIRE_ORPC_EXTENT *wire_orpc_extent; - for (i = 0, wire_orpc_extent = first_wire_orpc_extent; - i < extension_count; - i++, wire_orpc_extent = (WIRE_ORPC_EXTENT *)&wire_orpc_extent->data[wire_orpc_extent->conformance]) - { - if (IsEqualGUID(&entry->id, &wire_orpc_extent->id)) - break; - } - if (i == extension_count) wire_orpc_extent = NULL; - - IChannelHook_ServerNotify(entry->hook, &entry->id, &info->iid, - wire_orpc_extent ? wire_orpc_extent->size : 0, - wire_orpc_extent ? wire_orpc_extent->data : NULL, - lDataRep); - } - - LeaveCriticalSection(&csChannelHook); -} - -static ULONG ChannelHooks_ServerGetSize(SChannelHookCallInfo *info, - struct channel_hook_buffer_data **data, unsigned int *hook_count, - ULONG *extension_count) -{ - struct channel_hook_entry *entry; - ULONG total_size = 0; - unsigned int hook_index = 0; - - *hook_count = 0; - *extension_count = 0; - - EnterCriticalSection(&csChannelHook); - - LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry) - (*hook_count)++; - - if (*hook_count) - *data = HeapAlloc(GetProcessHeap(), 0, *hook_count * sizeof(struct channel_hook_buffer_data)); - else - *data = NULL; - - LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry) - { - ULONG extension_size = 0; - - IChannelHook_ServerGetSize(entry->hook, &entry->id, &info->iid, S_OK, - &extension_size); - - TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size); - - extension_size = (extension_size+7)&~7; - (*data)[hook_index].id = entry->id; - (*data)[hook_index].extension_size = extension_size; - - /* an extension is only put onto the wire if it has data to write */ - if (extension_size) - { - total_size += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[extension_size]); - (*extension_count)++; - } - - hook_index++; - } - - LeaveCriticalSection(&csChannelHook); - - return total_size; -} - -static unsigned char * ChannelHooks_ServerFillBuffer(SChannelHookCallInfo *info, - unsigned char *buffer, struct channel_hook_buffer_data *data, - unsigned int hook_count) -{ - struct channel_hook_entry *entry; - - EnterCriticalSection(&csChannelHook); - - LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry) - { - unsigned int i; - ULONG extension_size = 0; - WIRE_ORPC_EXTENT *wire_orpc_extent = (WIRE_ORPC_EXTENT *)buffer; - - for (i = 0; i < hook_count; i++) - if (IsEqualGUID(&entry->id, &data[i].id)) - extension_size = data[i].extension_size; - - /* an extension is only put onto the wire if it has data to write */ - if (!extension_size) - continue; - - IChannelHook_ServerFillBuffer(entry->hook, &entry->id, &info->iid, - &extension_size, buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]), - S_OK); - - TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size); - - /* FIXME: set unused portion of wire_orpc_extent->data to 0? */ - - wire_orpc_extent->conformance = (extension_size+7)&~7; - wire_orpc_extent->size = extension_size; - wire_orpc_extent->id = entry->id; - buffer += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[wire_orpc_extent->conformance]); - } - - LeaveCriticalSection(&csChannelHook); - - return buffer; -} - -static void ChannelHooks_ClientNotify(SChannelHookCallInfo *info, - DWORD lDataRep, WIRE_ORPC_EXTENT *first_wire_orpc_extent, - ULONG extension_count, HRESULT hrFault) -{ - struct channel_hook_entry *entry; - ULONG i; - - EnterCriticalSection(&csChannelHook); - - LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry) - { - WIRE_ORPC_EXTENT *wire_orpc_extent; - for (i = 0, wire_orpc_extent = first_wire_orpc_extent; - i < extension_count; - i++, wire_orpc_extent = (WIRE_ORPC_EXTENT *)&wire_orpc_extent->data[wire_orpc_extent->conformance]) - { - if (IsEqualGUID(&entry->id, &wire_orpc_extent->id)) - break; - } - if (i == extension_count) wire_orpc_extent = NULL; - - IChannelHook_ClientNotify(entry->hook, &entry->id, &info->iid, - wire_orpc_extent ? wire_orpc_extent->size : 0, - wire_orpc_extent ? wire_orpc_extent->data : NULL, - lDataRep, hrFault); - } - - LeaveCriticalSection(&csChannelHook); -} - -HRESULT RPC_RegisterChannelHook(REFGUID rguid, IChannelHook *hook) -{ - struct channel_hook_entry *entry; - - TRACE("(%s, %p)\n", debugstr_guid(rguid), hook); - - entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); - if (!entry) - return E_OUTOFMEMORY; - - entry->id = *rguid; - entry->hook = hook; - IChannelHook_AddRef(hook); - - EnterCriticalSection(&csChannelHook); - list_add_tail(&channel_hooks, &entry->entry); - LeaveCriticalSection(&csChannelHook); - - return S_OK; -} - -void RPC_UnregisterAllChannelHooks(void) -{ - struct channel_hook_entry *cursor; - struct channel_hook_entry *cursor2; - - EnterCriticalSection(&csChannelHook); - LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &channel_hooks, struct channel_hook_entry, entry) - HeapFree(GetProcessHeap(), 0, cursor); - LeaveCriticalSection(&csChannelHook); - DeleteCriticalSection(&csChannelHook); - DeleteCriticalSection(&csRegIf); -} - -/* RPC Channel Buffer Functions */ - -static HRESULT WINAPI RpcChannelBuffer_QueryInterface(IRpcChannelBuffer *iface, REFIID riid, LPVOID *ppv) -{ - *ppv = NULL; - if (IsEqualIID(riid,&IID_IRpcChannelBuffer) || IsEqualIID(riid,&IID_IUnknown)) - { - *ppv = iface; - IRpcChannelBuffer_AddRef(iface); - return S_OK; - } - return E_NOINTERFACE; -} - -static ULONG WINAPI RpcChannelBuffer_AddRef(LPRPCCHANNELBUFFER iface) -{ - RpcChannelBuffer *This = (RpcChannelBuffer *)iface; - return InterlockedIncrement(&This->refs); -} - -static ULONG WINAPI ServerRpcChannelBuffer_Release(LPRPCCHANNELBUFFER iface) -{ - RpcChannelBuffer *This = (RpcChannelBuffer *)iface; - ULONG ref; - - ref = InterlockedDecrement(&This->refs); - if (ref) - return ref; - - HeapFree(GetProcessHeap(), 0, This); - return 0; -} - -static ULONG WINAPI ClientRpcChannelBuffer_Release(LPRPCCHANNELBUFFER iface) -{ - ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface; - ULONG ref; - - ref = InterlockedDecrement(&This->super.refs); - if (ref) - return ref; - - if (This->event) CloseHandle(This->event); - RpcBindingFree(&This->bind); - HeapFree(GetProcessHeap(), 0, This); - return 0; -} - -static HRESULT WINAPI ServerRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg, REFIID riid) -{ - RpcChannelBuffer *This = (RpcChannelBuffer *)iface; - RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg; - RPC_STATUS status; - ORPCTHAT *orpcthat; - struct message_state *message_state; - ULONG extensions_size; - struct channel_hook_buffer_data *channel_hook_data; - unsigned int channel_hook_count; - ULONG extension_count; - - TRACE("(%p)->(%p,%s)\n", This, olemsg, debugstr_guid(riid)); - - message_state = msg->Handle; - /* restore the binding handle and the real start of data */ - msg->Handle = message_state->binding_handle; - msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len; - - extensions_size = ChannelHooks_ServerGetSize(&message_state->channel_hook_info, - &channel_hook_data, &channel_hook_count, &extension_count); - - msg->BufferLength += FIELD_OFFSET(WIRE_ORPCTHAT, extensions) + sizeof(DWORD); - if (extensions_size) - { - msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent[2*sizeof(DWORD) + extensions_size]); - if (extension_count & 1) - msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]); - } - - if (message_state->bypass_rpcrt) - { - msg->Buffer = HeapAlloc(GetProcessHeap(), 0, msg->BufferLength); - if (msg->Buffer) - status = RPC_S_OK; - else - { - HeapFree(GetProcessHeap(), 0, channel_hook_data); - return E_OUTOFMEMORY; - } - } - else - status = I_RpcGetBuffer(msg); - - orpcthat = msg->Buffer; - msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHAT, extensions); - - orpcthat->flags = ORPCF_NULL /* FIXME? */; - - /* NDR representation of orpcthat->extensions */ - *(DWORD *)msg->Buffer = extensions_size ? 1 : 0; - msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); - - if (extensions_size) - { - WIRE_ORPC_EXTENT_ARRAY *orpc_extent_array = msg->Buffer; - orpc_extent_array->size = extension_count; - orpc_extent_array->reserved = 0; - msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent); - /* NDR representation of orpc_extent_array->extent */ - *(DWORD *)msg->Buffer = 1; - msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); - /* NDR representation of [size_is] attribute of orpc_extent_array->extent */ - *(DWORD *)msg->Buffer = (extension_count + 1) & ~1; - msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); - - msg->Buffer = ChannelHooks_ServerFillBuffer(&message_state->channel_hook_info, - msg->Buffer, channel_hook_data, channel_hook_count); - - /* we must add a dummy extension if there is an odd extension - * count to meet the contract specified by the size_is attribute */ - if (extension_count & 1) - { - WIRE_ORPC_EXTENT *wire_orpc_extent = msg->Buffer; - wire_orpc_extent->conformance = 0; - wire_orpc_extent->id = GUID_NULL; - wire_orpc_extent->size = 0; - msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]); - } - } - - HeapFree(GetProcessHeap(), 0, channel_hook_data); - - /* store the prefixed data length so that we can restore the real buffer - * later */ - message_state->prefix_data_len = (char *)msg->Buffer - (char *)orpcthat; - msg->BufferLength -= message_state->prefix_data_len; - /* save away the message state again */ - msg->Handle = message_state; - - TRACE("-- %d\n", status); - - return HRESULT_FROM_WIN32(status); -} - -static HANDLE ClientRpcChannelBuffer_GetEventHandle(ClientRpcChannelBuffer *This) -{ - HANDLE event = InterlockedExchangePointer(&This->event, NULL); - - /* Note: must be auto-reset event so we can reuse it without a call - * to ResetEvent */ - if (!event) event = CreateEventW(NULL, FALSE, FALSE, NULL); - - return event; -} - -static void ClientRpcChannelBuffer_ReleaseEventHandle(ClientRpcChannelBuffer *This, HANDLE event) -{ - if (InterlockedCompareExchangePointer(&This->event, event, NULL)) - /* already a handle cached in This */ - CloseHandle(event); -} - -static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg, REFIID riid) -{ - ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface; - RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg; - RPC_CLIENT_INTERFACE *cif; - RPC_STATUS status; - ORPCTHIS *orpcthis; - struct message_state *message_state; - ULONG extensions_size; - struct channel_hook_buffer_data *channel_hook_data; - unsigned int channel_hook_count; - ULONG extension_count; - IPID ipid; - HRESULT hr; - struct apartment *apt = NULL; - - TRACE("(%p)->(%p,%s)\n", This, olemsg, debugstr_guid(riid)); - - cif = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RPC_CLIENT_INTERFACE)); - if (!cif) - return E_OUTOFMEMORY; - - message_state = HeapAlloc(GetProcessHeap(), 0, sizeof(*message_state)); - if (!message_state) - { - HeapFree(GetProcessHeap(), 0, cif); - return E_OUTOFMEMORY; - } - - cif->Length = sizeof(RPC_CLIENT_INTERFACE); - /* RPC interface ID = COM interface ID */ - cif->InterfaceId.SyntaxGUID = This->iid; - /* COM objects always have a version of 0.0 */ - cif->InterfaceId.SyntaxVersion.MajorVersion = 0; - cif->InterfaceId.SyntaxVersion.MinorVersion = 0; - msg->Handle = This->bind; - msg->RpcInterfaceInformation = cif; - - message_state->prefix_data_len = 0; - message_state->binding_handle = This->bind; - - message_state->channel_hook_info.iid = *riid; - message_state->channel_hook_info.cbSize = sizeof(message_state->channel_hook_info); - CoGetCurrentLogicalThreadId(&message_state->channel_hook_info.uCausality); - message_state->channel_hook_info.dwServerPid = This->server_pid; - message_state->channel_hook_info.iMethod = msg->ProcNum & ~RPC_FLAGS_VALID_BIT; - message_state->channel_hook_info.pObject = NULL; /* only present on server-side */ - message_state->target_hwnd = NULL; - message_state->target_tid = 0; - memset(&message_state->params, 0, sizeof(message_state->params)); - - extensions_size = ChannelHooks_ClientGetSize(&message_state->channel_hook_info, - &channel_hook_data, &channel_hook_count, &extension_count); - - msg->BufferLength += FIELD_OFFSET(WIRE_ORPCTHIS, extensions) + sizeof(DWORD); - if (extensions_size) - { - msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent[2*sizeof(DWORD) + extensions_size]); - if (extension_count & 1) - msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]); - } - - RpcBindingInqObject(message_state->binding_handle, &ipid); - hr = ipid_get_dispatch_params(&ipid, &apt, NULL, &message_state->params.stub, - &message_state->params.chan, - &message_state->params.iid, - &message_state->params.iface); - if (hr == S_OK) - { - /* stub, chan, iface and iid are unneeded in multi-threaded case as we go - * via the RPC runtime */ - if (apt->multi_threaded) - { - IRpcStubBuffer_Release(message_state->params.stub); - message_state->params.stub = NULL; - IRpcChannelBuffer_Release(message_state->params.chan); - message_state->params.chan = NULL; - message_state->params.iface = NULL; - } - else - { - message_state->params.bypass_rpcrt = TRUE; - message_state->target_hwnd = apartment_getwindow(apt); - message_state->target_tid = apt->tid; - /* we assume later on that this being non-NULL is the indicator that - * means call directly instead of going through RPC runtime */ - if (!message_state->target_hwnd) - ERR("window for apartment %s is NULL\n", wine_dbgstr_longlong(apt->oxid)); - } - } - if (apt) apartment_release(apt); - message_state->params.handle = ClientRpcChannelBuffer_GetEventHandle(This); - /* Note: message_state->params.msg is initialised in - * ClientRpcChannelBuffer_SendReceive */ - - /* shortcut the RPC runtime */ - if (message_state->target_hwnd) - { - msg->Buffer = HeapAlloc(GetProcessHeap(), 0, msg->BufferLength); - if (msg->Buffer) - status = RPC_S_OK; - else - status = ERROR_OUTOFMEMORY; - } - else - status = I_RpcGetBuffer(msg); - - msg->Handle = message_state; - - if (status == RPC_S_OK) - { - orpcthis = msg->Buffer; - msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHIS, extensions); - - orpcthis->version.MajorVersion = COM_MAJOR_VERSION; - orpcthis->version.MinorVersion = COM_MINOR_VERSION; - orpcthis->flags = message_state->channel_hook_info.dwServerPid ? ORPCF_LOCAL : ORPCF_NULL; - orpcthis->reserved1 = 0; - orpcthis->cid = message_state->channel_hook_info.uCausality; - - /* NDR representation of orpcthis->extensions */ - *(DWORD *)msg->Buffer = extensions_size ? 1 : 0; - msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); - - if (extensions_size) - { - ORPC_EXTENT_ARRAY *orpc_extent_array = msg->Buffer; - orpc_extent_array->size = extension_count; - orpc_extent_array->reserved = 0; - msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent); - /* NDR representation of orpc_extent_array->extent */ - *(DWORD *)msg->Buffer = 1; - msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); - /* NDR representation of [size_is] attribute of orpc_extent_array->extent */ - *(DWORD *)msg->Buffer = (extension_count + 1) & ~1; - msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); - - msg->Buffer = ChannelHooks_ClientFillBuffer(&message_state->channel_hook_info, - msg->Buffer, channel_hook_data, channel_hook_count); - - /* we must add a dummy extension if there is an odd extension - * count to meet the contract specified by the size_is attribute */ - if (extension_count & 1) - { - WIRE_ORPC_EXTENT *wire_orpc_extent = msg->Buffer; - wire_orpc_extent->conformance = 0; - wire_orpc_extent->id = GUID_NULL; - wire_orpc_extent->size = 0; - msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]); - } - } - - /* store the prefixed data length so that we can restore the real buffer - * pointer in ClientRpcChannelBuffer_SendReceive. */ - message_state->prefix_data_len = (char *)msg->Buffer - (char *)orpcthis; - msg->BufferLength -= message_state->prefix_data_len; - } - - HeapFree(GetProcessHeap(), 0, channel_hook_data); - - TRACE("-- %d\n", status); - - return HRESULT_FROM_WIN32(status); -} - -static HRESULT WINAPI ServerRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE *olemsg, ULONG *pstatus) -{ - FIXME("stub\n"); - return E_NOTIMPL; -} - -/* this thread runs an outgoing RPC */ -static DWORD WINAPI rpc_sendreceive_thread(LPVOID param) -{ - struct dispatch_params *data = param; - - /* Note: I_RpcSendReceive doesn't raise exceptions like the higher-level - * RPC functions do */ - data->status = I_RpcSendReceive((RPC_MESSAGE *)data->msg); - - TRACE("completed with status 0x%x\n", data->status); - - SetEvent(data->handle); - - return 0; -} - -static inline HRESULT ClientRpcChannelBuffer_IsCorrectApartment(ClientRpcChannelBuffer *This, struct apartment *apt) -{ - OXID oxid; - if (!apt) - return S_FALSE; - if (apartment_getoxid(apt, &oxid) != S_OK) - return S_FALSE; - if (This->oxid != oxid) - return S_FALSE; - return S_OK; -} - -static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE *olemsg, ULONG *pstatus) -{ - ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface; - HRESULT hr; - RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg; - RPC_STATUS status; - DWORD index; - struct message_state *message_state; - ORPCTHAT orpcthat; - ORPC_EXTENT_ARRAY orpc_ext_array; - WIRE_ORPC_EXTENT *first_wire_orpc_extent = NULL; - HRESULT hrFault = S_OK; - struct apartment *apt = apartment_get_current_or_mta(); - - TRACE("(%p) iMethod=%d\n", olemsg, olemsg->iMethod); - - hr = ClientRpcChannelBuffer_IsCorrectApartment(This, apt); - if (hr != S_OK) - { - ERR("called from wrong apartment, should have been 0x%s\n", - wine_dbgstr_longlong(This->oxid)); - if (apt) apartment_release(apt); - return RPC_E_WRONG_THREAD; - } - /* This situation should be impossible in multi-threaded apartments, - * because the calling thread isn't re-enterable. - * Note: doing a COM call during the processing of a sent message is - * only disallowed if a client call is already being waited for - * completion */ - if (!apt->multi_threaded && - COM_CurrentInfo()->pending_call_count_client && - InSendMessage()) - { - ERR("can't make an outgoing COM call in response to a sent message\n"); - apartment_release(apt); - return RPC_E_CANTCALLOUT_ININPUTSYNCCALL; - } - - message_state = msg->Handle; - /* restore the binding handle and the real start of data */ - msg->Handle = message_state->binding_handle; - msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len; - msg->BufferLength += message_state->prefix_data_len; - - /* Note: this is an optimization in the Microsoft OLE runtime that we need - * to copy, as shown by the test_no_couninitialize_client test. without - * short-circuiting the RPC runtime in the case below, the test will - * deadlock on the loader lock due to the RPC runtime needing to create - * a thread to process the RPC when this function is called indirectly - * from DllMain */ - - message_state->params.msg = olemsg; - if (message_state->params.bypass_rpcrt) - { - TRACE("Calling apartment thread 0x%08x...\n", message_state->target_tid); - - msg->ProcNum &= ~RPC_FLAGS_VALID_BIT; - - if (!PostMessageW(message_state->target_hwnd, DM_EXECUTERPC, 0, - (LPARAM)&message_state->params)) - { - ERR("PostMessage failed with error %u\n", GetLastError()); - - /* Note: message_state->params.iface doesn't have a reference and - * so doesn't need to be released */ - - hr = HRESULT_FROM_WIN32(GetLastError()); - } - } - else - { - /* we use a separate thread here because we need to be able to - * pump the message loop in the application thread: if we do not, - * any windows created by this thread will hang and RPCs that try - * and re-enter this STA from an incoming server thread will - * deadlock. InstallShield is an example of that. - */ - if (!QueueUserWorkItem(rpc_sendreceive_thread, &message_state->params, WT_EXECUTEDEFAULT)) - { - ERR("QueueUserWorkItem failed with error %u\n", GetLastError()); - hr = E_UNEXPECTED; - } - else - hr = S_OK; - } - - if (hr == S_OK) - { - if (WaitForSingleObject(message_state->params.handle, 0)) - { - COM_CurrentInfo()->pending_call_count_client++; - hr = CoWaitForMultipleHandles(0, INFINITE, 1, &message_state->params.handle, &index); - COM_CurrentInfo()->pending_call_count_client--; - } - } - ClientRpcChannelBuffer_ReleaseEventHandle(This, message_state->params.handle); - - /* for WM shortcut, faults are returned in params->hr */ - if (hr == S_OK) - hrFault = message_state->params.hr; - - status = message_state->params.status; - - orpcthat.flags = ORPCF_NULL; - orpcthat.extensions = NULL; - - TRACE("RPC call status: 0x%x\n", status); - if (status != RPC_S_OK) - hr = HRESULT_FROM_WIN32(status); - - TRACE("hrFault = 0x%08x\n", hrFault); - - /* FIXME: this condition should be - * "hr == S_OK && (!hrFault || msg->BufferLength > FIELD_OFFSET(ORPCTHAT, extensions) + 4)" - * but we don't currently reset the message length for PostMessage - * dispatched calls */ - if (hr == S_OK && hrFault == S_OK) - { - HRESULT hr2; - char *original_buffer = msg->Buffer; - - /* handle ORPCTHAT and client extensions */ - - hr2 = unmarshal_ORPCTHAT(msg, &orpcthat, &orpc_ext_array, &first_wire_orpc_extent); - if (FAILED(hr2)) - hr = hr2; - - message_state->prefix_data_len = (char *)msg->Buffer - original_buffer; - msg->BufferLength -= message_state->prefix_data_len; - } - else - message_state->prefix_data_len = 0; - - if (hr == S_OK) - { - ChannelHooks_ClientNotify(&message_state->channel_hook_info, - msg->DataRepresentation, - first_wire_orpc_extent, - orpcthat.extensions && first_wire_orpc_extent ? orpcthat.extensions->size : 0, - hrFault); - } - - /* save away the message state again */ - msg->Handle = message_state; - - if (pstatus) *pstatus = status; - - if (hr == S_OK) - hr = hrFault; - - TRACE("-- 0x%08x\n", hr); - - apartment_release(apt); - return hr; -} - -static HRESULT WINAPI ServerRpcChannelBuffer_FreeBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg) -{ - RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg; - RPC_STATUS status; - struct message_state *message_state; - - TRACE("(%p)\n", msg); - - message_state = msg->Handle; - /* restore the binding handle and the real start of data */ - msg->Handle = message_state->binding_handle; - msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len; - msg->BufferLength += message_state->prefix_data_len; - message_state->prefix_data_len = 0; - - if (message_state->bypass_rpcrt) - { - HeapFree(GetProcessHeap(), 0, msg->Buffer); - status = RPC_S_OK; - } - else - status = I_RpcFreeBuffer(msg); - - msg->Handle = message_state; - - TRACE("-- %d\n", status); - - return HRESULT_FROM_WIN32(status); -} - -static HRESULT WINAPI ClientRpcChannelBuffer_FreeBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg) -{ - RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg; - RPC_STATUS status; - struct message_state *message_state; - - TRACE("(%p)\n", msg); - - message_state = msg->Handle; - /* restore the binding handle and the real start of data */ - msg->Handle = message_state->binding_handle; - msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len; - msg->BufferLength += message_state->prefix_data_len; - - if (message_state->params.bypass_rpcrt) - { - HeapFree(GetProcessHeap(), 0, msg->Buffer); - status = RPC_S_OK; - } - else - status = I_RpcFreeBuffer(msg); - - HeapFree(GetProcessHeap(), 0, msg->RpcInterfaceInformation); - msg->RpcInterfaceInformation = NULL; - - if (message_state->params.stub) - IRpcStubBuffer_Release(message_state->params.stub); - if (message_state->params.chan) - IRpcChannelBuffer_Release(message_state->params.chan); - HeapFree(GetProcessHeap(), 0, message_state); - - TRACE("-- %d\n", status); - - return HRESULT_FROM_WIN32(status); -} - -static HRESULT WINAPI ClientRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext) -{ - ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface; - - TRACE("(%p,%p)\n", pdwDestContext, ppvDestContext); - - *pdwDestContext = This->super.dest_context; - *ppvDestContext = This->super.dest_context_data; - - return S_OK; -} - -static HRESULT WINAPI ServerRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* dest_context, void** dest_context_data) -{ - RpcChannelBuffer *This = (RpcChannelBuffer *)iface; - - TRACE("(%p,%p)\n", dest_context, dest_context_data); - - *dest_context = This->dest_context; - *dest_context_data = This->dest_context_data; - return S_OK; -} - -static HRESULT WINAPI RpcChannelBuffer_IsConnected(LPRPCCHANNELBUFFER iface) -{ - TRACE("()\n"); - /* native does nothing too */ - return S_OK; -} - -static const IRpcChannelBufferVtbl ClientRpcChannelBufferVtbl = -{ - RpcChannelBuffer_QueryInterface, - RpcChannelBuffer_AddRef, - ClientRpcChannelBuffer_Release, - ClientRpcChannelBuffer_GetBuffer, - ClientRpcChannelBuffer_SendReceive, - ClientRpcChannelBuffer_FreeBuffer, - ClientRpcChannelBuffer_GetDestCtx, - RpcChannelBuffer_IsConnected -}; - -static const IRpcChannelBufferVtbl ServerRpcChannelBufferVtbl = -{ - RpcChannelBuffer_QueryInterface, - RpcChannelBuffer_AddRef, - ServerRpcChannelBuffer_Release, - ServerRpcChannelBuffer_GetBuffer, - ServerRpcChannelBuffer_SendReceive, - ServerRpcChannelBuffer_FreeBuffer, - ServerRpcChannelBuffer_GetDestCtx, - RpcChannelBuffer_IsConnected -}; - -/* returns a channel buffer for proxies */ -HRESULT WINAPI RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, - const OXID_INFO *oxid_info, const IID *iid, - DWORD dest_context, void *dest_context_data, - IRpcChannelBuffer **chan, struct apartment *apt) -{ - ClientRpcChannelBuffer *This; - WCHAR endpoint[200]; - RPC_BINDING_HANDLE bind; - RPC_STATUS status; - LPWSTR string_binding; - - /* FIXME: get the endpoint from oxid_info->psa instead */ - get_rpc_endpoint(endpoint, oxid); - - TRACE("proxy pipe: connecting to endpoint: %s\n", debugstr_w(endpoint)); - - status = RpcStringBindingComposeW( - NULL, - wszRpcTransport, - NULL, - endpoint, - NULL, - &string_binding); - - if (status == RPC_S_OK) - { - status = RpcBindingFromStringBindingW(string_binding, &bind); - - if (status == RPC_S_OK) - { - IPID ipid2 = *ipid; /* why can't RpcBindingSetObject take a const? */ - status = RpcBindingSetObject(bind, &ipid2); - if (status != RPC_S_OK) - RpcBindingFree(&bind); - } - - RpcStringFreeW(&string_binding); - } - - if (status != RPC_S_OK) - { - ERR("Couldn't get binding for endpoint %s, status = %d\n", debugstr_w(endpoint), status); - return HRESULT_FROM_WIN32(status); - } - - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - if (!This) - { - RpcBindingFree(&bind); - return E_OUTOFMEMORY; - } - - This->super.IRpcChannelBuffer_iface.lpVtbl = &ClientRpcChannelBufferVtbl; - This->super.refs = 1; - This->super.dest_context = dest_context; - This->super.dest_context_data = dest_context_data; - This->bind = bind; - apartment_getoxid(apt, &This->oxid); - This->server_pid = oxid_info->dwPid; - This->event = NULL; - This->iid = *iid; - - *chan = &This->super.IRpcChannelBuffer_iface; - - return S_OK; -} - -HRESULT WINAPI RPC_CreateServerChannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) -{ - RpcChannelBuffer *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - if (!This) - return E_OUTOFMEMORY; - - This->IRpcChannelBuffer_iface.lpVtbl = &ServerRpcChannelBufferVtbl; - This->refs = 1; - This->dest_context = dest_context; - This->dest_context_data = dest_context_data; - - *chan = &This->IRpcChannelBuffer_iface; - - return S_OK; -} - -/* unmarshals ORPC_EXTENT_ARRAY according to NDR rules, but doesn't allocate - * any memory */ -static HRESULT unmarshal_ORPC_EXTENT_ARRAY(RPC_MESSAGE *msg, const char *end, - ORPC_EXTENT_ARRAY *extensions, - WIRE_ORPC_EXTENT **first_wire_orpc_extent) -{ - DWORD pointer_id; - DWORD i; - - memcpy(extensions, msg->Buffer, FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent)); - msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent); - - if ((const char *)msg->Buffer + 2 * sizeof(DWORD) > end) - return RPC_E_INVALID_HEADER; - - pointer_id = *(DWORD *)msg->Buffer; - msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); - extensions->extent = NULL; - - if (pointer_id) - { - WIRE_ORPC_EXTENT *wire_orpc_extent; - - /* conformance */ - if (*(DWORD *)msg->Buffer != ((extensions->size+1)&~1)) - return RPC_S_INVALID_BOUND; - - msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); - - /* arbitrary limit for security (don't know what native does) */ - if (extensions->size > 256) - { - ERR("too many extensions: %d\n", extensions->size); - return RPC_S_INVALID_BOUND; - } - - *first_wire_orpc_extent = wire_orpc_extent = msg->Buffer; - for (i = 0; i < ((extensions->size+1)&~1); i++) - { - if ((const char *)&wire_orpc_extent->data[0] > end) - return RPC_S_INVALID_BOUND; - if (wire_orpc_extent->conformance != ((wire_orpc_extent->size+7)&~7)) - return RPC_S_INVALID_BOUND; - if ((const char *)&wire_orpc_extent->data[wire_orpc_extent->conformance] > end) - return RPC_S_INVALID_BOUND; - TRACE("size %u, guid %s\n", wire_orpc_extent->size, debugstr_guid(&wire_orpc_extent->id)); - wire_orpc_extent = (WIRE_ORPC_EXTENT *)&wire_orpc_extent->data[wire_orpc_extent->conformance]; - } - msg->Buffer = wire_orpc_extent; - } - - return S_OK; -} - -/* unmarshals ORPCTHIS according to NDR rules, but doesn't allocate any memory */ -static HRESULT unmarshal_ORPCTHIS(RPC_MESSAGE *msg, ORPCTHIS *orpcthis, - ORPC_EXTENT_ARRAY *orpc_ext_array, WIRE_ORPC_EXTENT **first_wire_orpc_extent) -{ - const char *end = (char *)msg->Buffer + msg->BufferLength; - - *first_wire_orpc_extent = NULL; - - if (msg->BufferLength < FIELD_OFFSET(WIRE_ORPCTHIS, extensions) + sizeof(DWORD)) - { - ERR("invalid buffer length\n"); - return RPC_E_INVALID_HEADER; - } - - memcpy(orpcthis, msg->Buffer, FIELD_OFFSET(WIRE_ORPCTHIS, extensions)); - msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHIS, extensions); - - if ((const char *)msg->Buffer + sizeof(DWORD) > end) - return RPC_E_INVALID_HEADER; - - if (*(DWORD *)msg->Buffer) - orpcthis->extensions = orpc_ext_array; - else - orpcthis->extensions = NULL; - - msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); - - if (orpcthis->extensions) - { - HRESULT hr = unmarshal_ORPC_EXTENT_ARRAY(msg, end, orpc_ext_array, - first_wire_orpc_extent); - if (FAILED(hr)) - return hr; - } - - if ((orpcthis->version.MajorVersion != COM_MAJOR_VERSION) || - (orpcthis->version.MinorVersion > COM_MINOR_VERSION)) - { - ERR("COM version {%d, %d} not supported\n", - orpcthis->version.MajorVersion, orpcthis->version.MinorVersion); - return RPC_E_VERSION_MISMATCH; - } - - if (orpcthis->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)) - { - ERR("invalid flags 0x%x\n", orpcthis->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)); - return RPC_E_INVALID_HEADER; - } - - return S_OK; -} - -static HRESULT unmarshal_ORPCTHAT(RPC_MESSAGE *msg, ORPCTHAT *orpcthat, - ORPC_EXTENT_ARRAY *orpc_ext_array, WIRE_ORPC_EXTENT **first_wire_orpc_extent) -{ - const char *end = (char *)msg->Buffer + msg->BufferLength; - - *first_wire_orpc_extent = NULL; - - if (msg->BufferLength < FIELD_OFFSET(WIRE_ORPCTHAT, extensions) + sizeof(DWORD)) - { - ERR("invalid buffer length\n"); - return RPC_E_INVALID_HEADER; - } - - memcpy(orpcthat, msg->Buffer, FIELD_OFFSET(WIRE_ORPCTHAT, extensions)); - msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHAT, extensions); - - if ((const char *)msg->Buffer + sizeof(DWORD) > end) - return RPC_E_INVALID_HEADER; - - if (*(DWORD *)msg->Buffer) - orpcthat->extensions = orpc_ext_array; - else - orpcthat->extensions = NULL; - - msg->Buffer = (char *)msg->Buffer + sizeof(DWORD); - - if (orpcthat->extensions) - { - HRESULT hr = unmarshal_ORPC_EXTENT_ARRAY(msg, end, orpc_ext_array, - first_wire_orpc_extent); - if (FAILED(hr)) - return hr; - } - - if (orpcthat->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)) - { - ERR("invalid flags 0x%x\n", orpcthat->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)); - return RPC_E_INVALID_HEADER; - } - - return S_OK; -} - -void WINAPI Internal_RPC_ExecuteCall(struct dispatch_params *params) -{ - struct message_state *message_state = NULL; - RPC_MESSAGE *msg = (RPC_MESSAGE *)params->msg; - char *original_buffer = msg->Buffer; - ORPCTHIS orpcthis; - ORPC_EXTENT_ARRAY orpc_ext_array; - WIRE_ORPC_EXTENT *first_wire_orpc_extent; - GUID old_causality_id; - - /* handle ORPCTHIS and server extensions */ - - params->hr = unmarshal_ORPCTHIS(msg, &orpcthis, &orpc_ext_array, &first_wire_orpc_extent); - if (params->hr != S_OK) - { - msg->Buffer = original_buffer; - goto exit; - } - - message_state = HeapAlloc(GetProcessHeap(), 0, sizeof(*message_state)); - if (!message_state) - { - params->hr = E_OUTOFMEMORY; - msg->Buffer = original_buffer; - goto exit; - } - - message_state->prefix_data_len = (char *)msg->Buffer - original_buffer; - message_state->binding_handle = msg->Handle; - message_state->bypass_rpcrt = params->bypass_rpcrt; - - message_state->channel_hook_info.iid = params->iid; - message_state->channel_hook_info.cbSize = sizeof(message_state->channel_hook_info); - message_state->channel_hook_info.uCausality = orpcthis.cid; - message_state->channel_hook_info.dwServerPid = GetCurrentProcessId(); - message_state->channel_hook_info.iMethod = msg->ProcNum; - message_state->channel_hook_info.pObject = params->iface; - - if (orpcthis.extensions && first_wire_orpc_extent && - orpcthis.extensions->size) - ChannelHooks_ServerNotify(&message_state->channel_hook_info, msg->DataRepresentation, first_wire_orpc_extent, orpcthis.extensions->size); - - msg->Handle = message_state; - msg->BufferLength -= message_state->prefix_data_len; - - /* call message filter */ - - if (COM_CurrentApt()->filter) - { - DWORD handlecall; - INTERFACEINFO interface_info; - CALLTYPE calltype; - - interface_info.pUnk = params->iface; - interface_info.iid = params->iid; - interface_info.wMethod = msg->ProcNum; - - if (IsEqualGUID(&orpcthis.cid, &COM_CurrentInfo()->causality_id)) - calltype = CALLTYPE_NESTED; - else if (COM_CurrentInfo()->pending_call_count_server == 0) - calltype = CALLTYPE_TOPLEVEL; - else - calltype = CALLTYPE_TOPLEVEL_CALLPENDING; - - handlecall = IMessageFilter_HandleInComingCall(COM_CurrentApt()->filter, - calltype, - UlongToHandle(GetCurrentProcessId()), - 0 /* FIXME */, - &interface_info); - TRACE("IMessageFilter_HandleInComingCall returned %d\n", handlecall); - switch (handlecall) - { - case SERVERCALL_REJECTED: - params->hr = RPC_E_CALL_REJECTED; - goto exit_reset_state; - case SERVERCALL_RETRYLATER: -#if 0 /* FIXME: handle retries on the client side before enabling this code */ - params->hr = RPC_E_RETRY; - goto exit_reset_state; -#else - FIXME("retry call later not implemented\n"); - break; -#endif - case SERVERCALL_ISHANDLED: - default: - break; - } - } - - /* invoke the method */ - - /* save the old causality ID - note: any calls executed while processing - * messages received during the SendReceive will appear to originate from - * this call - this should be checked with what Windows does */ - old_causality_id = COM_CurrentInfo()->causality_id; - COM_CurrentInfo()->causality_id = orpcthis.cid; - COM_CurrentInfo()->pending_call_count_server++; - params->hr = IRpcStubBuffer_Invoke(params->stub, params->msg, params->chan); - COM_CurrentInfo()->pending_call_count_server--; - COM_CurrentInfo()->causality_id = old_causality_id; - - /* the invoke allocated a new buffer, so free the old one */ - if (message_state->bypass_rpcrt && original_buffer != msg->Buffer) - HeapFree(GetProcessHeap(), 0, original_buffer); - -exit_reset_state: - message_state = msg->Handle; - msg->Handle = message_state->binding_handle; - msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len; - msg->BufferLength += message_state->prefix_data_len; - -exit: - HeapFree(GetProcessHeap(), 0, message_state); - if (params->handle) SetEvent(params->handle); -} - -static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) -{ - struct dispatch_params *params; - struct stub_manager *stub_manager; - struct apartment *apt; - IPID ipid; - HRESULT hr; - - RpcBindingInqObject(msg->Handle, &ipid); - - TRACE("ipid = %s, iMethod = %d\n", debugstr_guid(&ipid), msg->ProcNum); - - params = HeapAlloc(GetProcessHeap(), 0, sizeof(*params)); - if (!params) - { - RpcRaiseException(E_OUTOFMEMORY); - return; - } - - hr = ipid_get_dispatch_params(&ipid, &apt, &stub_manager, &params->stub, &params->chan, - &params->iid, &params->iface); - if (hr != S_OK) - { - ERR("no apartment found for ipid %s\n", debugstr_guid(&ipid)); - HeapFree(GetProcessHeap(), 0, params); - RpcRaiseException(hr); - return; - } - - params->msg = (RPCOLEMESSAGE *)msg; - params->status = RPC_S_OK; - params->hr = S_OK; - params->handle = NULL; - params->bypass_rpcrt = FALSE; - - /* Note: this is the important difference between STAs and MTAs - we - * always execute RPCs to STAs in the thread that originally created the - * apartment (i.e. the one that pumps messages to the window) */ - if (!apt->multi_threaded) - { - params->handle = CreateEventW(NULL, FALSE, FALSE, NULL); - - TRACE("Calling apartment thread 0x%08x...\n", apt->tid); - - if (PostMessageW(apartment_getwindow(apt), DM_EXECUTERPC, 0, (LPARAM)params)) - WaitForSingleObject(params->handle, INFINITE); - else - { - ERR("PostMessage failed with error %u\n", GetLastError()); - IRpcChannelBuffer_Release(params->chan); - IRpcStubBuffer_Release(params->stub); - } - CloseHandle(params->handle); - } - else - { - BOOL joined = FALSE; - struct oletls *info = COM_CurrentInfo(); - - if (!info->apt) - { - enter_apartment(info, COINIT_MULTITHREADED); - joined = TRUE; - } - Internal_RPC_ExecuteCall(params); - if (joined) - { - leave_apartment(info); - } - } - - hr = params->hr; - if (params->chan) - IRpcChannelBuffer_Release(params->chan); - if (params->stub) - IRpcStubBuffer_Release(params->stub); - HeapFree(GetProcessHeap(), 0, params); - - stub_manager_int_release(stub_manager); - apartment_release(apt); - - /* if IRpcStubBuffer_Invoke fails, we should raise an exception to tell - * the RPC runtime that the call failed */ - if (hr != S_OK) RpcRaiseException(hr); -} - -/* stub registration */ -HRESULT WINAPI RPC_RegisterInterface(REFIID riid) -{ - struct registered_if *rif; - BOOL found = FALSE; - HRESULT hr = S_OK; - - TRACE("(%s)\n", debugstr_guid(riid)); - - EnterCriticalSection(&csRegIf); - LIST_FOR_EACH_ENTRY(rif, &registered_interfaces, struct registered_if, entry) - { - if (IsEqualGUID(&rif->If.InterfaceId.SyntaxGUID, riid)) - { - rif->refs++; - found = TRUE; - break; - } - } - if (!found) - { - TRACE("Creating new interface\n"); - - rif = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*rif)); - if (rif) - { - RPC_STATUS status; - - rif->refs = 1; - rif->If.Length = sizeof(RPC_SERVER_INTERFACE); - /* RPC interface ID = COM interface ID */ - rif->If.InterfaceId.SyntaxGUID = *riid; - rif->If.DispatchTable = &rpc_dispatch; - /* all other fields are 0, including the version asCOM objects - * always have a version of 0.0 */ - status = RpcServerRegisterIfEx( - (RPC_IF_HANDLE)&rif->If, - NULL, NULL, - RPC_IF_OLE | RPC_IF_AUTOLISTEN, - RPC_C_LISTEN_MAX_CALLS_DEFAULT, - NULL); - if (status == RPC_S_OK) - list_add_tail(&registered_interfaces, &rif->entry); - else - { - ERR("RpcServerRegisterIfEx failed with error %d\n", status); - HeapFree(GetProcessHeap(), 0, rif); - hr = HRESULT_FROM_WIN32(status); - } - } - else - hr = E_OUTOFMEMORY; - } - LeaveCriticalSection(&csRegIf); - return hr; -} - -/* stub unregistration */ -void WINAPI RPC_UnregisterInterface(REFIID riid, BOOL wait) -{ - struct registered_if *rif; - EnterCriticalSection(&csRegIf); - LIST_FOR_EACH_ENTRY(rif, &registered_interfaces, struct registered_if, entry) - { - if (IsEqualGUID(&rif->If.InterfaceId.SyntaxGUID, riid)) - { - if (!--rif->refs) - { - RpcServerUnregisterIf((RPC_IF_HANDLE)&rif->If, NULL, wait); - list_remove(&rif->entry); - HeapFree(GetProcessHeap(), 0, rif); - } - break; - } - } - LeaveCriticalSection(&csRegIf); -} - -/* get the info for an OXID, including the IPID for the rem unknown interface - * and the string binding */ -HRESULT WINAPI RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info) -{ - TRACE("%s\n", wine_dbgstr_longlong(oxid)); - - oxid_info->dwTid = 0; - oxid_info->dwPid = 0; - oxid_info->dwAuthnHint = RPC_C_AUTHN_LEVEL_NONE; - /* FIXME: this is a hack around not having an OXID resolver yet - - * this function should contact the machine's OXID resolver and then it - * should give us the IPID of the IRemUnknown interface */ - oxid_info->ipidRemUnknown.Data1 = 0xffffffff; - oxid_info->ipidRemUnknown.Data2 = 0xffff; - oxid_info->ipidRemUnknown.Data3 = 0xffff; - memcpy(oxid_info->ipidRemUnknown.Data4, &oxid, sizeof(OXID)); - oxid_info->psa = NULL /* FIXME */; - - return S_OK; -} - -/* make the apartment reachable by other threads and processes and create the - * IRemUnknown object */ -void WINAPI RPC_StartRemoting(struct apartment *apt) -{ - if (!InterlockedExchange(&apt->remoting_started, TRUE)) - { - WCHAR endpoint[200]; - RPC_STATUS status; - - get_rpc_endpoint(endpoint, &apt->oxid); - - status = RpcServerUseProtseqEpW( - wszRpcTransport, - RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - endpoint, - NULL); - if (status != RPC_S_OK) - ERR("Couldn't register endpoint %s\n", debugstr_w(endpoint)); - - /* FIXME: move remote unknown exporting into this function */ - } - start_apartment_remote_unknown(apt); -} -- 2.23.0

1 0

[PATCH v2 3/5] combase: Move CoUnmarshalInterface().
by Huw Davies 01 Sep '20

01 Sep '20

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/combase/apartment.c | 5 ++ dlls/combase/combase.spec | 2 +- dlls/combase/combase_private.h | 3 + dlls/combase/marshal.c | 146 +++++++++++++++++++++++++++++++++ dlls/ole32/marshal.c | 143 +------------------------------- dlls/ole32/ole32.spec | 3 +- 6 files changed, 159 insertions(+), 143 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 1637d674222..6aa053bdd52 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -1270,6 +1270,11 @@ HWND WINAPI apartment_getwindow(const struct apartment *apt) return apt->win; } +OXID apartment_getoxid(const struct apartment *apt) +{ + return apt->oxid; +} + void apartment_global_cleanup(void) { if (apt_win_class) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index e1ffdc82539..7b165b131ce 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -166,7 +166,7 @@ @ stdcall CoUninitialize() @ stub CoUnloadingWOW @ stdcall CoUnmarshalHresult(ptr ptr) -@ stdcall CoUnmarshalInterface(ptr ptr ptr) ole32.CoUnmarshalInterface +@ stdcall CoUnmarshalInterface(ptr ptr ptr) @ stub CoVrfCheckThreadState @ stub CoVrfGetThreadState @ stub CoVrfReleaseThreadState diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index cc1c3d34388..210844805bb 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -106,6 +106,7 @@ HWND WINAPI apartment_getwindow(const struct apartment *apt) DECLSPEC_HIDDEN; HRESULT WINAPI apartment_createwindowifneeded(struct apartment *apt) DECLSPEC_HIDDEN; void apartment_freeunusedlibraries(struct apartment *apt, DWORD unload_delay) DECLSPEC_HIDDEN; void apartment_global_cleanup(void) DECLSPEC_HIDDEN; +OXID apartment_getoxid(const struct apartment *apt) DECLSPEC_HIDDEN; /* RpcSs interface */ HRESULT rpcss_get_next_seqid(DWORD *id) DECLSPEC_HIDDEN; @@ -224,3 +225,5 @@ ULONG WINAPI stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL ta ULONG WINAPI stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) DECLSPEC_HIDDEN; struct stub_manager * WINAPI get_stub_manager(struct apartment *apt, OID oid); void WINAPI stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak); +BOOL WINAPI stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid); +BOOL WINAPI stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid); diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index bfe31ff17dd..37ec0ca2207 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -29,6 +29,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +HRESULT WINAPI unmarshal_object(const STDOBJREF *stdobjref, struct apartment *apt, + MSHCTX dest_context, void *dest_context_data, + REFIID riid, const OXID_INFO *oxid_info, + void **object); + /* private flag indicating that the object was marshaled as table-weak */ #define SORFP_TABLEWEAK SORF_OXRES1 @@ -648,3 +653,144 @@ HRESULT WINAPI CoReleaseMarshalData(IStream *stream) IMarshal_Release(marshal); return hr; } + +static HRESULT std_unmarshal_interface(MSHCTX dest_context, void *dest_context_data, + IStream *stream, REFIID riid, void **ppv) +{ + struct stub_manager *stubmgr = NULL; + struct OR_STANDARD obj; + ULONG res; + HRESULT hres; + struct apartment *apt, *stub_apt; + + TRACE("(...,%s,....)\n", debugstr_guid(riid)); + + /* we need an apartment to unmarshal into */ + if (!(apt = apartment_get_current_or_mta())) + { + ERR("Apartment not initialized\n"); + return CO_E_NOTINITIALIZED; + } + + /* read STDOBJREF from wire */ + hres = IStream_Read(stream, &obj, FIELD_OFFSET(struct OR_STANDARD, saResAddr.aStringArray), &res); + if (hres != S_OK) + { + apartment_release(apt); + return STG_E_READFAULT; + } + + if (obj.saResAddr.wNumEntries) + { + ERR("unsupported size of DUALSTRINGARRAY\n"); + return E_NOTIMPL; + } + + /* check if we're marshalling back to ourselves */ + if ((apartment_getoxid(apt) == obj.std.oxid) && (stubmgr = get_stub_manager(apt, obj.std.oid))) + { + TRACE("Unmarshalling object marshalled in same apartment for iid %s, " + "returning original object %p\n", debugstr_guid(riid), stubmgr->object); + + hres = IUnknown_QueryInterface(stubmgr->object, riid, ppv); + + /* unref the ifstub. FIXME: only do this on success? */ + if (!stub_manager_is_table_marshaled(stubmgr, &obj.std.ipid)) + stub_manager_ext_release(stubmgr, obj.std.cPublicRefs, obj.std.flags & SORFP_TABLEWEAK, FALSE); + + stub_manager_int_release(stubmgr); + apartment_release(apt); + return hres; + } + + /* notify stub manager about unmarshal if process-local object. + * note: if the oxid is not found then we and native will quite happily + * ignore table marshaling and normal marshaling rules regarding number of + * unmarshals, etc, but if you abuse these rules then your proxy could end + * up returning RPC_E_DISCONNECTED. */ + if ((stub_apt = apartment_findfromoxid(obj.std.oxid))) + { + if ((stubmgr = get_stub_manager(stub_apt, obj.std.oid))) + { + if (!stub_manager_notify_unmarshal(stubmgr, &obj.std.ipid)) + hres = CO_E_OBJNOTCONNECTED; + } + else + { + WARN("Couldn't find object for OXID %s, OID %s, assuming disconnected\n", + wine_dbgstr_longlong(obj.std.oxid), + wine_dbgstr_longlong(obj.std.oid)); + hres = CO_E_OBJNOTCONNECTED; + } + } + else + TRACE("Treating unmarshal from OXID %s as inter-process\n", + wine_dbgstr_longlong(obj.std.oxid)); + + if (hres == S_OK) + hres = unmarshal_object(&obj.std, apt, dest_context, + dest_context_data, riid, + stubmgr ? &stubmgr->oxid_info : NULL, ppv); + + if (stubmgr) stub_manager_int_release(stubmgr); + if (stub_apt) apartment_release(stub_apt); + + if (hres != S_OK) WARN("Failed with error 0x%08x\n", hres); + else TRACE("Successfully created proxy %p\n", *ppv); + + apartment_release(apt); + return hres; +} + +/*********************************************************************** + * CoUnmarshalInterface (combase.@) + */ +HRESULT WINAPI CoUnmarshalInterface(IStream *stream, REFIID riid, void **ppv) +{ + IMarshal *marshal; + IUnknown *object; + HRESULT hr; + IID iid; + + TRACE("%p, %s, %p\n", stream, debugstr_guid(riid), ppv); + + if (!stream || !ppv) + return E_INVALIDARG; + + hr = get_unmarshaler_from_stream(stream, &marshal, &iid); + if (hr == S_FALSE) + { + hr = std_unmarshal_interface(0, NULL, stream, &iid, (void **)&object); + if (hr != S_OK) + ERR("StdMarshal UnmarshalInterface failed, hr %#x\n", hr); + } + else if (hr == S_OK) + { + /* call the helper object to do the actual unmarshaling */ + hr = IMarshal_UnmarshalInterface(marshal, stream, &iid, (void **)&object); + IMarshal_Release(marshal); + if (hr != S_OK) + ERR("IMarshal::UnmarshalInterface failed, hr %#x\n", hr); + } + + if (hr == S_OK) + { + /* IID_NULL means use the interface ID of the marshaled object */ + if (!IsEqualIID(riid, &IID_NULL) && !IsEqualIID(riid, &iid)) + { + TRACE("requested interface != marshalled interface, additional QI needed\n"); + hr = IUnknown_QueryInterface(object, riid, ppv); + if (hr != S_OK) + ERR("Couldn't query for interface %s, hr %#x\n", debugstr_guid(riid), hr); + IUnknown_Release(object); + } + else + { + *ppv = object; + } + } + + TRACE("completed with hr 0x%x\n", hr); + + return hr; +} diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index e462c9ffd48..f8b4aecc544 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -95,7 +95,7 @@ static inline struct proxy_manager *impl_from_IClientSecurity( IClientSecurity * return CONTAINING_RECORD(iface, struct proxy_manager, IClientSecurity_iface); } -static HRESULT unmarshal_object(const STDOBJREF *stdobjref, struct apartment *apt, +HRESULT WINAPI unmarshal_object(const STDOBJREF *stdobjref, struct apartment *apt, MSHCTX dest_context, void *dest_context_data, REFIID riid, const OXID_INFO *oxid_info, void **object); @@ -1347,7 +1347,7 @@ StdMarshalImpl_MarshalInterface( /* helper for StdMarshalImpl_UnmarshalInterface - does the unmarshaling with * no questions asked about the rules surrounding same-apartment unmarshals * and table marshaling */ -static HRESULT unmarshal_object(const STDOBJREF *stdobjref, struct apartment *apt, +HRESULT WINAPI unmarshal_object(const STDOBJREF *stdobjref, struct apartment *apt, MSHCTX dest_context, void *dest_context_data, REFIID riid, const OXID_INFO *oxid_info, void **object) @@ -1698,145 +1698,6 @@ HRESULT WINAPI CoGetStandardMarshal(REFIID riid, IUnknown *pUnk, return StdMarshalImpl_Construct(&IID_IMarshal, dwDestContext, pvDestContext, (void**)ppMarshal); } -/*********************************************************************** - * get_unmarshaler_from_stream [internal] - * - * Creates an IMarshal* object according to the data marshaled to the stream. - * The function leaves the stream pointer at the start of the data written - * to the stream by the IMarshal* object. - */ -static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, IID *iid) -{ - HRESULT hr; - ULONG res; - OBJREF objref; - - /* read common OBJREF header */ - hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res); - if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref))) - { - ERR("Failed to read common OBJREF header, 0x%08x\n", hr); - return STG_E_READFAULT; - } - - /* sanity check on header */ - if (objref.signature != OBJREF_SIGNATURE) - { - ERR("Bad OBJREF signature 0x%08x\n", objref.signature); - return RPC_E_INVALID_OBJREF; - } - - if (iid) *iid = objref.iid; - - /* FIXME: handler marshaling */ - if (objref.flags & OBJREF_STANDARD) - { - TRACE("Using standard unmarshaling\n"); - *marshal = NULL; - return S_FALSE; - } - else if (objref.flags & OBJREF_CUSTOM) - { - ULONG custom_header_size = FIELD_OFFSET(OBJREF, u_objref.u_custom.pData) - - FIELD_OFFSET(OBJREF, u_objref.u_custom); - TRACE("Using custom unmarshaling\n"); - /* read constant sized OR_CUSTOM data from stream */ - hr = IStream_Read(stream, &objref.u_objref.u_custom, - custom_header_size, &res); - if (hr != S_OK || (res != custom_header_size)) - { - ERR("Failed to read OR_CUSTOM header, 0x%08x\n", hr); - return STG_E_READFAULT; - } - /* now create the marshaler specified in the stream */ - hr = CoCreateInstance(&objref.u_objref.u_custom.clsid, NULL, - CLSCTX_INPROC_SERVER, &IID_IMarshal, - (LPVOID*)marshal); - } - else - { - FIXME("Invalid or unimplemented marshaling type specified: %x\n", - objref.flags); - return RPC_E_INVALID_OBJREF; - } - - if (hr != S_OK) - ERR("Failed to create marshal, 0x%08x\n", hr); - - return hr; -} - -/*********************************************************************** - * CoUnmarshalInterface [OLE32.@] - * - * Unmarshals an object from a stream by creating a proxy to the remote - * object, if necessary. - * - * PARAMS - * - * pStream [I] Stream containing the marshaled object. - * riid [I] Interface identifier of the object to create a proxy to. - * ppv [O] Address where proxy will be stored. - * - * RETURNS - * - * Success: S_OK. - * Failure: HRESULT code. - * - * SEE ALSO - * CoMarshalInterface(). - */ -HRESULT WINAPI CoUnmarshalInterface(IStream *pStream, REFIID riid, LPVOID *ppv) -{ - HRESULT hr; - LPMARSHAL pMarshal; - IID iid; - IUnknown *object; - - TRACE("(%p, %s, %p)\n", pStream, debugstr_guid(riid), ppv); - - if (!pStream || !ppv) - return E_INVALIDARG; - - hr = get_unmarshaler_from_stream(pStream, &pMarshal, &iid); - if (hr == S_FALSE) - { - hr = std_unmarshal_interface(0, NULL, pStream, &iid, (void**)&object); - if (hr != S_OK) - ERR("StdMarshal UnmarshalInterface failed, 0x%08x\n", hr); - } - else if (hr == S_OK) - { - /* call the helper object to do the actual unmarshaling */ - hr = IMarshal_UnmarshalInterface(pMarshal, pStream, &iid, (LPVOID*)&object); - IMarshal_Release(pMarshal); - if (hr != S_OK) - ERR("IMarshal::UnmarshalInterface failed, 0x%08x\n", hr); - } - - if (hr == S_OK) - { - /* IID_NULL means use the interface ID of the marshaled object */ - if (!IsEqualIID(riid, &IID_NULL) && !IsEqualIID(riid, &iid)) - { - TRACE("requested interface != marshalled interface, additional QI needed\n"); - hr = IUnknown_QueryInterface(object, riid, ppv); - if (hr != S_OK) - ERR("Couldn't query for interface %s, hr = 0x%08x\n", - debugstr_guid(riid), hr); - IUnknown_Release(object); - } - else - { - *ppv = object; - } - } - - TRACE("completed with hr 0x%x\n", hr); - - return hr; -} - static HRESULT WINAPI StdMarshalCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppv) { diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 2ecfcf6b510..ee478c73d2b 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -90,7 +90,7 @@ @ stdcall CoUninitialize() combase.CoUninitialize @ stub CoUnloadingWOW @ stdcall CoUnmarshalHresult(ptr ptr) combase.CoUnmarshalHresult -@ stdcall CoUnmarshalInterface(ptr ptr ptr) +@ stdcall CoUnmarshalInterface(ptr ptr ptr) combase.CoUnmarshalInterface @ stdcall CoWaitForMultipleHandles(long long long ptr ptr) combase.CoWaitForMultipleHandles @ stdcall CreateAntiMoniker(ptr) @ stdcall CreateBindCtx(long ptr) @@ -302,5 +302,6 @@ @ stdcall Internal_apartment_disconnectproxies(ptr) @ stdcall Internal_RPC_ExecuteCall(ptr) @ stdcall marshal_object(ptr ptr ptr ptr long ptr long) +@ stdcall unmarshal_object(ptr ptr long ptr ptr ptr ptr) @ stdcall RPC_CreateServerChannel(long ptr ptr) @ stdcall RPC_UnregisterInterface(ptr long) -- 2.23.0

1 0

[PATCH v2 2/5] combase: Move CoReleaseMarshalData().
by Huw Davies 01 Sep '20

01 Sep '20

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/combase/combase.spec | 2 +- dlls/combase/combase_private.h | 2 + dlls/combase/marshal.c | 141 +++++++++++++++++++++++++++++++++ dlls/ole32/marshal.c | 50 ------------ dlls/ole32/ole32.spec | 2 +- 5 files changed, 145 insertions(+), 52 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 4ac93ff545d..e1ffdc82539 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -146,7 +146,7 @@ @ stdcall CoRegisterPSClsid(ptr ptr) @ stdcall CoRegisterSurrogate(ptr) ole32.CoRegisterSurrogate @ stdcall CoRegisterSurrogateEx(ptr ptr) ole32.CoRegisterSurrogateEx -@ stdcall CoReleaseMarshalData(ptr) ole32.CoReleaseMarshalData +@ stdcall CoReleaseMarshalData(ptr) @ stdcall CoReleaseServerProcess() @ stdcall CoResumeClassObjects() ole32.CoResumeClassObjects @ stub CoRetireServer diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 898d42b3c7b..cc1c3d34388 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -222,3 +222,5 @@ struct stub_manager * WINAPI get_stub_manager_from_object(struct apartment *apt, void stub_manager_disconnect(struct stub_manager *m) DECLSPEC_HIDDEN; ULONG WINAPI stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) DECLSPEC_HIDDEN; ULONG WINAPI stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) DECLSPEC_HIDDEN; +struct stub_manager * WINAPI get_stub_manager(struct apartment *apt, OID oid); +void WINAPI stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak); diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index db5089f013e..bfe31ff17dd 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -29,6 +29,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +/* private flag indicating that the object was marshaled as table-weak */ +#define SORFP_TABLEWEAK SORF_OXRES1 + struct ftmarshaler { IUnknown IUnknown_inner; @@ -507,3 +510,141 @@ cleanup: return hr; } + +/* Creates an IMarshal* object according to the data marshaled to the stream. + * The function leaves the stream pointer at the start of the data written + * to the stream by the IMarshal* object. + */ +static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, IID *iid) +{ + OBJREF objref; + HRESULT hr; + ULONG res; + + /* read common OBJREF header */ + hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res); + if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref))) + { + ERR("Failed to read common OBJREF header, 0x%08x\n", hr); + return STG_E_READFAULT; + } + + /* sanity check on header */ + if (objref.signature != OBJREF_SIGNATURE) + { + ERR("Bad OBJREF signature 0x%08x\n", objref.signature); + return RPC_E_INVALID_OBJREF; + } + + if (iid) *iid = objref.iid; + + /* FIXME: handler marshaling */ + if (objref.flags & OBJREF_STANDARD) + { + TRACE("Using standard unmarshaling\n"); + *marshal = NULL; + return S_FALSE; + } + else if (objref.flags & OBJREF_CUSTOM) + { + ULONG custom_header_size = FIELD_OFFSET(OBJREF, u_objref.u_custom.pData) - + FIELD_OFFSET(OBJREF, u_objref.u_custom); + TRACE("Using custom unmarshaling\n"); + /* read constant sized OR_CUSTOM data from stream */ + hr = IStream_Read(stream, &objref.u_objref.u_custom, + custom_header_size, &res); + if (hr != S_OK || (res != custom_header_size)) + { + ERR("Failed to read OR_CUSTOM header, 0x%08x\n", hr); + return STG_E_READFAULT; + } + /* now create the marshaler specified in the stream */ + hr = CoCreateInstance(&objref.u_objref.u_custom.clsid, NULL, + CLSCTX_INPROC_SERVER, &IID_IMarshal, + (LPVOID*)marshal); + } + else + { + FIXME("Invalid or unimplemented marshaling type specified: %x\n", + objref.flags); + return RPC_E_INVALID_OBJREF; + } + + if (hr != S_OK) + ERR("Failed to create marshal, 0x%08x\n", hr); + + return hr; +} + +static HRESULT std_release_marshal_data(IStream *stream) +{ + struct stub_manager *stubmgr; + struct OR_STANDARD obj; + struct apartment *apt; + ULONG res; + HRESULT hr; + + hr = IStream_Read(stream, &obj, FIELD_OFFSET(struct OR_STANDARD, saResAddr.aStringArray), &res); + if (hr != S_OK) return STG_E_READFAULT; + + if (obj.saResAddr.wNumEntries) + { + ERR("unsupported size of DUALSTRINGARRAY\n"); + return E_NOTIMPL; + } + + TRACE("oxid = %s, oid = %s, ipid = %s\n", wine_dbgstr_longlong(obj.std.oxid), + wine_dbgstr_longlong(obj.std.oid), wine_dbgstr_guid(&obj.std.ipid)); + + if (!(apt = apartment_findfromoxid(obj.std.oxid))) + { + WARN("Could not map OXID %s to apartment object\n", + wine_dbgstr_longlong(obj.std.oxid)); + return RPC_E_INVALID_OBJREF; + } + + if (!(stubmgr = get_stub_manager(apt, obj.std.oid))) + { + apartment_release(apt); + ERR("could not map object ID to stub manager, oxid=%s, oid=%s\n", + wine_dbgstr_longlong(obj.std.oxid), wine_dbgstr_longlong(obj.std.oid)); + return RPC_E_INVALID_OBJREF; + } + + stub_manager_release_marshal_data(stubmgr, obj.std.cPublicRefs, &obj.std.ipid, obj.std.flags & SORFP_TABLEWEAK); + + stub_manager_int_release(stubmgr); + apartment_release(apt); + + return S_OK; +} + +/*********************************************************************** + * CoReleaseMarshalData (combase.@) + */ +HRESULT WINAPI CoReleaseMarshalData(IStream *stream) +{ + IMarshal *marshal; + HRESULT hr; + + TRACE("%p\n", stream); + + hr = get_unmarshaler_from_stream(stream, &marshal, NULL); + if (hr == S_FALSE) + { + hr = std_release_marshal_data(stream); + if (hr != S_OK) + ERR("StdMarshal ReleaseMarshalData failed with error %#x\n", hr); + return hr; + } + if (hr != S_OK) + return hr; + + /* call the helper object to do the releasing of marshal data */ + hr = IMarshal_ReleaseMarshalData(marshal, stream); + if (hr != S_OK) + ERR("IMarshal::ReleaseMarshalData failed with error %#x\n", hr); + + IMarshal_Release(marshal); + return hr; +} diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 87017dbc922..e462c9ffd48 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1837,56 +1837,6 @@ HRESULT WINAPI CoUnmarshalInterface(IStream *pStream, REFIID riid, LPVOID *ppv) return hr; } -/*********************************************************************** - * CoReleaseMarshalData [OLE32.@] - * - * Releases resources associated with an object that has been marshaled into - * a stream. - * - * PARAMS - * - * pStream [I] The stream that the object has been marshaled into. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT error code. - * - * NOTES - * - * Call this function to release resources associated with a normal or - * table-weak marshal that will not be unmarshaled, and all table-strong - * marshals when they are no longer needed. - * - * SEE ALSO - * CoMarshalInterface(), CoUnmarshalInterface(). - */ -HRESULT WINAPI CoReleaseMarshalData(IStream *pStream) -{ - HRESULT hr; - LPMARSHAL pMarshal; - - TRACE("(%p)\n", pStream); - - hr = get_unmarshaler_from_stream(pStream, &pMarshal, NULL); - if (hr == S_FALSE) - { - hr = std_release_marshal_data(pStream); - if (hr != S_OK) - ERR("StdMarshal ReleaseMarshalData failed with error 0x%08x\n", hr); - return hr; - } - if (hr != S_OK) - return hr; - - /* call the helper object to do the releasing of marshal data */ - hr = IMarshal_ReleaseMarshalData(pMarshal, pStream); - if (hr != S_OK) - ERR("IMarshal::ReleaseMarshalData failed with error 0x%08x\n", hr); - - IMarshal_Release(pMarshal); - return hr; -} - static HRESULT WINAPI StdMarshalCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppv) { diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 972629ecb70..2ecfcf6b510 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -72,7 +72,7 @@ @ stdcall CoRegisterPSClsid(ptr ptr) combase.CoRegisterPSClsid @ stdcall CoRegisterSurrogate(ptr) @ stdcall CoRegisterSurrogateEx(ptr ptr) -@ stdcall CoReleaseMarshalData(ptr) +@ stdcall CoReleaseMarshalData(ptr) combase.CoReleaseMarshalData @ stdcall CoReleaseServerProcess() combase.CoReleaseServerProcess @ stdcall CoResumeClassObjects() @ stdcall CoRevertToSelf() combase.CoRevertToSelf -- 2.23.0

1 0

[PATCH] msvcirt: Implement ifstream.
by Arkadiusz Hiler 01 Sep '20

01 Sep '20

Based on the semi-stubs by Gijs Vermeulen. We need to check that calls to different methods translate correctly to modifications done on the internal filebuf - not all methods call their filebuf counterparts directly (see setbuf). Tested with Power Tab Editor and GraphCalc - the crashes are gone and loading saved files seems to work correctly. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22616 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30014 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/msvcirt/msvcirt.c | 185 ++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 72 +++++------ dlls/msvcirt/tests/msvcirt.c | 243 +++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 72 +++++------ dlls/msvcrt40/msvcrt40.spec | 72 +++++------ 5 files changed, 536 insertions(+), 108 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index f76eaf6d7ac..a54d86f7350 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -192,6 +192,8 @@ extern const vtable_ptr MSVCP_istream_vtable; extern const vtable_ptr MSVCP_istream_withassign_vtable; /* ??_7istrstream@@6B@ */ extern const vtable_ptr MSVCP_istrstream_vtable; +/* ??_7ifstream@@6B@ */ +extern const vtable_ptr MSVCP_ifstream_vtable; /* ??_7iostream@@6B@ */ extern const vtable_ptr MSVCP_iostream_vtable; /* ??_7strstream@@6B@ */ @@ -262,6 +264,8 @@ __ASM_BLOCK_BEGIN(vtables) VTABLE_ADD_FUNC(istream_vector_dtor)); __ASM_VTABLE(istrstream, VTABLE_ADD_FUNC(istream_vector_dtor)); + __ASM_VTABLE(ifstream, + VTABLE_ADD_FUNC(istream_vector_dtor)); __ASM_VTABLE(iostream, VTABLE_ADD_FUNC(iostream_vector_dtor)); __ASM_VTABLE(strstream, @@ -280,6 +284,7 @@ const int ostream_vbtable[] = {0, VBTABLE_ENTRY(ostream, FIELD_OFFSET(ostream, v /* ??_8istream@@7B@ */ /* ??_8istream_withassign@@7B@ */ /* ??_8istrstream@@7B@ */ +/* ??_8ifstream@@7B@ */ const int istream_vbtable[] = {0, VBTABLE_ENTRY(istream, FIELD_OFFSET(istream, vbtable), ios)}; /* ??_8iostream@@7Bistream@@@ */ /* ??_8stdiostream@@7Bistream@@@ */ @@ -305,6 +310,8 @@ DEFINE_RTTI_DATA2(istream_withassign, sizeof(istream), &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVistream_withassign@@") DEFINE_RTTI_DATA2(istrstream, sizeof(istream), &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVistrstream@@") +DEFINE_RTTI_DATA2(ifstream, sizeof(istream), + &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVifstream@@") DEFINE_RTTI_DATA4(iostream, sizeof(iostream), &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, &ostream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AViostream@@") @@ -3113,6 +3120,8 @@ istream* __thiscall istream_copy_ctor(istream *this, const istream *copy, BOOL v /* ??1istream_withassign@@UEAA@XZ */ /* ??1istrstream@@UAE@XZ */ /* ??1istrstream@@UEAA@XZ */ +/* ??1ifstream@@UAE@XZ */ +/* ??1ifstream@@UEAA@XZ */ DEFINE_THISCALL_WRAPPER(istream_dtor, 4) void __thiscall istream_dtor(ios *base) { @@ -3152,6 +3161,8 @@ istream* __thiscall istream_assign_sb(istream *this, streambuf *sb) /* ??4istream_withassign@@QEAAAEAVistream@@AEBV1@@Z */ /* ??4istrstream@@QAEAAV0@ABV0@@Z */ /* ??4istrstream@@QEAAAEAV0@AEBV0@@Z */ +/* ??4ifstream@@QAEAAV0@ABV0@@Z */ +/* ??4ifstream@@QEAAAEAV0@AEBV0@@Z */ DEFINE_THISCALL_WRAPPER(istream_assign, 8) istream* __thiscall istream_assign(istream *this, const istream *rhs) { @@ -3164,6 +3175,8 @@ istream* __thiscall istream_assign(istream *this, const istream *rhs) /* ??_Distream_withassign@@QEAAXXZ */ /* ??_Distrstream@@QAEXXZ */ /* ??_Distrstream@@QEAAXXZ */ +/* ??_Difstream@@QAEXXZ */ +/* ??_Difstream@@QEAAXXZ */ DEFINE_THISCALL_WRAPPER(istream_vbase_dtor, 4) void __thiscall istream_vbase_dtor(istream *this) { @@ -3178,6 +3191,7 @@ void __thiscall istream_vbase_dtor(istream *this) /* ??_Eistream@@UAEPAXI@Z */ /* ??_Eistream_withassign@@UAEPAXI@Z */ /* ??_Eistrstream@@UAEPAXI@Z */ +/* ??_Eifstream@@UAEPAXI@Z */ DEFINE_THISCALL_WRAPPER(istream_vector_dtor, 8) istream* __thiscall istream_vector_dtor(ios *base, unsigned int flags) { @@ -3203,6 +3217,7 @@ istream* __thiscall istream_vector_dtor(ios *base, unsigned int flags) /* ??_Gistream@@UAEPAXI@Z */ /* ??_Gistream_withassign@@UAEPAXI@Z */ /* ??_Gistrstream@@UAEPAXI@Z */ +/* ??_Gifstream@@UAEPAXI@Z */ DEFINE_THISCALL_WRAPPER(istream_scalar_dtor, 8) istream* __thiscall istream_scalar_dtor(ios *base, unsigned int flags) { @@ -4089,6 +4104,175 @@ char* __thiscall istrstream_str(istream *this) return strstreambuf_str(istrstream_rdbuf(this)); } +/* ??0ifstream@@QAE@ABV0@@Z */ +/* ??0ifstream@@QEAA@AEBV0@@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_copy_ctor, 12) +istream* __thiscall ifstream_copy_ctor(istream *this, const istream *copy, BOOL virt_init) +{ + TRACE("(%p %p %d)\n", this, copy, virt_init); + + istream_withassign_copy_ctor(this, copy, virt_init); + istream_get_ios(this)->vtable = &MSVCP_ifstream_vtable; + + return this; +} + +/* ??0ifstream@@QAE@HPADH@Z */ +/* ??0ifstream@@QEAA@HPEADH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_buffer_ctor, 20) +istream* __thiscall ifstream_buffer_ctor(istream *this, filedesc fd, char *buffer, int length, BOOL virt_init) +{ + ios *base; + filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); + + TRACE("(%p %d %p %d %d)\n", this, fd, buffer, length, virt_init); + + if (fb) + { + filebuf_fd_reserve_ctor(fb, fd, buffer, length); + istream_sb_ctor(this, &fb->base, virt_init); + } + else + istream_ctor(this, virt_init); + + base = istream_get_ios(this); + base->vtable = &MSVCP_ifstream_vtable; + base->delbuf = 1; + + return this; +} + +/* ??0ifstream@@QAE@H@Z */ +/* ??0ifstream@@QEAA@H@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_fd_ctor, 12) +istream* __thiscall ifstream_fd_ctor(istream *this, filedesc fd, BOOL virt_init) +{ + ios *base; + filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); + + TRACE("(%p %d %d)\n", this, fd, virt_init); + + if (fb) + { + filebuf_fd_ctor(fb, fd); + istream_sb_ctor(this, &fb->base, virt_init); + } + else + istream_ctor(this, virt_init); + + base = istream_get_ios(this); + base->vtable = &MSVCP_ifstream_vtable; + base->delbuf = 1; + + return this; +} + +/* ??0ifstream@@QAE@PBDHH@Z */ +/* ??0ifstream@@QEAA@PEBDHH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_open_ctor, 20) +istream* __thiscall ifstream_open_ctor(istream *this, const char *name, ios_open_mode mode, int protection, BOOL virt_init) +{ + ios *base; + filebuf *fb = MSVCRT_operator_new(sizeof(filebuf)); + + TRACE("(%p %s %d %d %d)\n", this, name, mode, protection, virt_init); + + if (fb) + { + filebuf_ctor(fb); + istream_sb_ctor(this, &fb->base, virt_init); + filebuf_open(fb, name, mode, protection); + } + else + istream_ctor(this, virt_init); + + base = istream_get_ios(this); + base->vtable = &MSVCP_ifstream_vtable; + base->delbuf = 1; + + return this; +} + +/* ??0ifstream@@QAE@XZ */ +/* ??0ifstream@@QEAA@XZ */ +DEFINE_THISCALL_WRAPPER(ifstream_ctor, 8) +istream* __thiscall ifstream_ctor(istream *this, BOOL virt_init) +{ + return ifstream_fd_ctor(this, -1, virt_init); +} + +/* ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ */ +/* ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ */ +DEFINE_THISCALL_WRAPPER(ifstream_rdbuf, 4) +filebuf* __thiscall ifstream_rdbuf(const istream *this) +{ + TRACE("(%p)\n", this); + return (filebuf*) istream_get_ios(this)->sb; +} + +/* ?fd@ifstream@@QBEHXZ */ +/* ?fd@ifstream@@QEBAHXZ */ +DEFINE_THISCALL_WRAPPER(ifstream_fd, 4) +filedesc __thiscall ifstream_fd(istream *this) +{ + TRACE("(%p)\n", this); + return filebuf_fd(ifstream_rdbuf(this)); +} + +/* ?attach@ifstream@@QAEXH@Z */ +/* ?attach@ifstream@@QEAAXH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_attach, 8) +void __thiscall ifstream_attach(istream *this, filedesc fd) +{ + TRACE("(%p %d)\n", this, fd); + filebuf_attach(ifstream_rdbuf(this), fd); +} + +/* ?close@ifstream@@QAEXXZ */ +/* ?close@ifstream@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(ifstream_close, 4) +void __thiscall ifstream_close(istream *this) +{ + TRACE("(%p)\n", this); + filebuf_close(ifstream_rdbuf(this)); +} + +/* ?is_open@ifstream@@QBEHXZ */ +/* ?is_open@ifstream@@QEBAHXZ */ +DEFINE_THISCALL_WRAPPER(ifstream_is_open, 4) +int __thiscall ifstream_is_open(const istream *this) +{ + TRACE("(%p)\n", this); + return filebuf_is_open(ifstream_rdbuf(this)); +} + +/* ?open@ifstream@@QAEXPBDHH@Z */ +/* ?open@ifstream@@QEAAXPEBDHH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_open, 16) +void __thiscall ifstream_open(istream *this, const char *name, ios_open_mode mode, int protection) +{ + TRACE("(%p %s %d %d)\n", this, name, mode, protection); + filebuf_open(ifstream_rdbuf(this), name, mode, protection); +} + +/* ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z */ +/* ?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_setbuf, 12) +streambuf* __thiscall ifstream_setbuf(istream *this, char *buffer, int length) +{ + TRACE("(%p %p %d)\n", this, buffer, length); + return NULL; +} + +/* ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z */ +/* ?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z */ +DEFINE_THISCALL_WRAPPER(ifstream_setmode, 8) +int __thiscall ifstream_setmode(istream *this, int mode) +{ + TRACE("(%p %d)\n", this, mode); + return filebuf_setmode(ifstream_rdbuf(this), mode); +} + static inline ios* iostream_to_ios(const iostream *this) { return (ios*)((char*)this + iostream_vbtable_istream[1]); @@ -4522,6 +4706,7 @@ static void init_io(void *base) init_istream_rtti(base); init_istream_withassign_rtti(base); init_istrstream_rtti(base); + init_ifstream_rtti(base); init_iostream_rtti(base); init_strstream_rtti(base); init_stdiostream_rtti(base); diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index f2e875695ef..c2b4b9d30eb 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -26,16 +26,16 @@ @ stub -arch=win64 ??0fstream@@QEAA@PEBDHH@Z @ stub -arch=win32 ??0fstream@@QAE@XZ # __thiscall fstream::fstream(void) @ stub -arch=win64 ??0fstream@@QEAA@XZ -@ stub -arch=win32 ??0ifstream@@QAE@ABV0@@Z # __thiscall ifstream::ifstream(class ifstream const &) -@ stub -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z -@ stub -arch=win32 ??0ifstream@@QAE@H@Z # __thiscall ifstream::ifstream(int) -@ stub -arch=win64 ??0ifstream@@QEAA@H@Z -@ stub -arch=win32 ??0ifstream@@QAE@HPADH@Z # __thiscall ifstream::ifstream(int,char *,int) -@ stub -arch=win64 ??0ifstream@@QEAA@HPEADH@Z -@ stub -arch=win32 ??0ifstream@@QAE@PBDHH@Z # __thiscall ifstream::ifstream(char const *,int,int) -@ stub -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z -@ stub -arch=win32 ??0ifstream@@QAE@XZ # __thiscall ifstream::ifstream(void) -@ stub -arch=win64 ??0ifstream@@QEAA@XZ +@ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) ifstream_copy_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z(ptr ptr long) ifstream_copy_ctor +@ thiscall -arch=win32 ??0ifstream@@QAE@H@Z(ptr long long) ifstream_fd_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@H@Z(ptr long long) ifstream_fd_ctor +@ thiscall -arch=win32 ??0ifstream@@QAE@HPADH@Z(ptr long ptr long long) ifstream_buffer_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@HPEADH@Z(ptr long ptr long long) ifstream_buffer_ctor +@ thiscall -arch=win32 ??0ifstream@@QAE@PBDHH@Z(ptr str long long long) ifstream_open_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z(ptr str long long long) ifstream_open_ctor +@ thiscall -arch=win32 ??0ifstream@@QAE@XZ(ptr long) ifstream_ctor +@ cdecl -arch=win64 ??0ifstream@@QEAA@XZ(ptr long) ifstream_ctor @ thiscall -arch=win32 ??0ios@@IAE@ABV0@@Z(ptr ptr) ios_copy_ctor @ cdecl -arch=win64 ??0ios@@IEAA@AEBV0@@Z(ptr ptr) ios_copy_ctor @ thiscall -arch=win32 ??0ios@@IAE@XZ(ptr) ios_ctor @@ -138,8 +138,8 @@ @ cdecl -arch=win64 ??1filebuf@@UEAA@XZ(ptr) filebuf_dtor @ stub -arch=win32 ??1fstream@@UAE@XZ # virtual __thiscall fstream::~fstream(void) @ stub -arch=win64 ??1fstream@@UEAA@XZ -@ stub -arch=win32 ??1ifstream@@UAE@XZ # virtual __thiscall ifstream::~ifstream(void) -@ stub -arch=win64 ??1ifstream@@UEAA@XZ +@ thiscall -arch=win32 ??1ifstream@@UAE@XZ(ptr) istream_dtor +@ cdecl -arch=win64 ??1ifstream@@UEAA@XZ(ptr) istream_dtor @ thiscall -arch=win32 ??1ios@@UAE@XZ(ptr) ios_dtor @ cdecl -arch=win64 ??1ios@@UEAA@XZ(ptr) ios_dtor @ thiscall -arch=win32 ??1iostream@@UAE@XZ(ptr) iostream_dtor @@ -178,8 +178,8 @@ @ cdecl -arch=win64 ??4filebuf@@QEAAAEAV0@AEBV0@@Z(ptr ptr) filebuf_assign @ stub -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z # class fstream & __thiscall fstream::operator=(class fstream &) @ stub -arch=win64 ??4fstream@@QEAAAEAV0@AEAV0@@Z -@ stub -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z # class ifstream & __thiscall ifstream::operator=(class ifstream const &) -@ stub -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z +@ thiscall -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z(ptr ptr) istream_assign +@ cdecl -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z(ptr ptr) istream_assign @ thiscall -arch=win32 ??4ios@@IAEAAV0@ABV0@@Z(ptr ptr) ios_assign @ cdecl -arch=win64 ??4ios@@IEAAAEAV0@AEBV0@@Z(ptr ptr) ios_assign @ thiscall -arch=win32 ??4iostream@@IAEAAV0@AAV0@@Z(ptr ptr) iostream_assign @@ -305,7 +305,7 @@ @ extern ??_7exception@@6B@ MSVCP_exception_vtable @ extern ??_7filebuf@@6B@ MSVCP_filebuf_vtable # @ extern ??_7fstream@@6B@ # const fstream::`vftable' -# @ extern ??_7ifstream@@6B@ # const ifstream::`vftable' +@ extern ??_7ifstream@@6B@ MSVCP_ifstream_vtable @ extern ??_7ios@@6B@ MSVCP_ios_vtable @ extern ??_7iostream@@6B@ MSVCP_iostream_vtable @ extern ??_7istream@@6B@ MSVCP_istream_vtable @@ -323,7 +323,7 @@ @ extern ??_7strstreambuf@@6B@ MSVCP_strstreambuf_vtable # @ extern ??_8fstream@@7Bistream@@@ # const fstream::`vbtable'{for `istream'} # @ extern ??_8fstream@@7Bostream@@@ # const fstream::`vbtable'{for `ostream'} -# @ extern ??_8ifstream@@7B@ # const ifstream::`vbtable' +@ extern ??_8ifstream@@7B@ istream_vbtable @ extern ??_8iostream@@7Bistream@@@ iostream_vbtable_istream @ extern ??_8iostream@@7Bostream@@@ iostream_vbtable_ostream @ extern ??_8istream@@7B@ istream_vbtable @@ -339,8 +339,8 @@ @ extern ??_8strstream@@7Bostream@@@ iostream_vbtable_ostream @ stub -arch=win32 ??_Dfstream@@QAEXXZ # void __thiscall fstream::`vbase destructor'(void) @ stub -arch=win64 ??_Dfstream@@QEAAXXZ -@ stub -arch=win32 ??_Difstream@@QAEXXZ # void __thiscall ifstream::`vbase destructor'(void) -@ stub -arch=win64 ??_Difstream@@QEAAXXZ +@ thiscall -arch=win32 ??_Difstream@@QAEXXZ(ptr) istream_vbase_dtor +@ cdecl -arch=win64 ??_Difstream@@QEAAXXZ(ptr) istream_vbase_dtor @ thiscall -arch=win32 ??_Diostream@@QAEXXZ(ptr) iostream_vbase_dtor @ cdecl -arch=win64 ??_Diostream@@QEAAXXZ(ptr) iostream_vbase_dtor @ thiscall -arch=win32 ??_Distream@@QAEXXZ(ptr) istream_vbase_dtor @@ -364,7 +364,7 @@ @ thiscall -arch=win32 ??_Eexception@@UAEPAXI@Z(ptr long) MSVCP_exception_vector_dtor @ thiscall -arch=win32 ??_Efilebuf@@UAEPAXI@Z(ptr long) filebuf_vector_dtor @ stub -arch=win32 ??_Efstream@@UAEPAXI@Z # virtual void * __thiscall fstream::`vector deleting destructor'(unsigned int) -@ stub -arch=win32 ??_Eifstream@@UAEPAXI@Z # virtual void * __thiscall ifstream::`vector deleting destructor'(unsigned int) +@ thiscall -arch=win32 ??_Eifstream@@UAEPAXI@Z(ptr long) istream_vector_dtor @ thiscall -arch=win32 ??_Eios@@UAEPAXI@Z(ptr long) ios_vector_dtor @ thiscall -arch=win32 ??_Eiostream@@UAEPAXI@Z(ptr long) iostream_vector_dtor @ thiscall -arch=win32 ??_Eistream@@UAEPAXI@Z(ptr long) istream_vector_dtor @@ -383,7 +383,7 @@ @ thiscall -arch=win32 ??_Gexception@@UAEPAXI@Z(ptr long) MSVCP_exception_scalar_dtor @ thiscall -arch=win32 ??_Gfilebuf@@UAEPAXI@Z(ptr long) filebuf_scalar_dtor @ stub -arch=win32 ??_Gfstream@@UAEPAXI@Z # virtual void * __thiscall fstream::`scalar deleting destructor'(unsigned int) -@ stub -arch=win32 ??_Gifstream@@UAEPAXI@Z # virtual void * __thiscall ifstream::`scalar deleting destructor'(unsigned int) +@ thiscall -arch=win32 ??_Gifstream@@UAEPAXI@Z(ptr long) istream_scalar_dtor @ thiscall -arch=win32 ??_Gios@@UAEPAXI@Z(ptr long) ios_scalar_dtor @ thiscall -arch=win32 ??_Giostream@@UAEPAXI@Z(ptr long) iostream_scalar_dtor @ thiscall -arch=win32 ??_Gistream@@UAEPAXI@Z(ptr long) istream_scalar_dtor @@ -406,8 +406,8 @@ @ cdecl -arch=win64 ?attach@filebuf@@QEAAPEAV1@H@Z(ptr long) filebuf_attach @ stub -arch=win32 ?attach@fstream@@QAEXH@Z # void __thiscall fstream::attach(int) @ stub -arch=win64 ?attach@fstream@@QEAAXH@Z -@ stub -arch=win32 ?attach@ifstream@@QAEXH@Z # void __thiscall ifstream::attach(int) -@ stub -arch=win64 ?attach@ifstream@@QEAAXH@Z +@ thiscall -arch=win32 ?attach@ifstream@@QAEXH@Z(ptr long) ifstream_attach +@ cdecl -arch=win64 ?attach@ifstream@@QEAAXH@Z(ptr long) ifstream_attach @ stub -arch=win32 ?attach@ofstream@@QAEXH@Z # void __thiscall ofstream::attach(int) @ stub -arch=win64 ?attach@ofstream@@QEAAXH@Z @ thiscall -arch=win32 ?bad@ios@@QBEHXZ(ptr) ios_bad @@ -428,8 +428,8 @@ @ cdecl -arch=win64 ?close@filebuf@@QEAAPEAV1@XZ(ptr) filebuf_close @ stub -arch=win32 ?close@fstream@@QAEXXZ # void __thiscall fstream::close(void) @ stub -arch=win64 ?close@fstream@@QEAAXXZ -@ stub -arch=win32 ?close@ifstream@@QAEXXZ # void __thiscall ifstream::close(void) -@ stub -arch=win64 ?close@ifstream@@QEAAXXZ +@ thiscall -arch=win32 ?close@ifstream@@QAEXXZ(ptr) ifstream_close +@ cdecl -arch=win64 ?close@ifstream@@QEAAXXZ(ptr) ifstream_close @ stub -arch=win32 ?close@ofstream@@QAEXXZ # void __thiscall ofstream::close(void) @ stub -arch=win64 ?close@ofstream@@QEAAXXZ @ cdecl -arch=win32 ?clrlock@ios@@QAAXXZ(ptr) ios_clrlock @@ -472,8 +472,8 @@ @ cdecl -arch=win64 ?fd@filebuf@@QEBAHXZ(ptr) filebuf_fd @ stub -arch=win32 ?fd@fstream@@QBEHXZ # int __thiscall fstream::fd(void)const @ stub -arch=win64 ?fd@fstream@@QEBAHXZ -@ stub -arch=win32 ?fd@ifstream@@QBEHXZ # int __thiscall ifstream::fd(void)const -@ stub -arch=win64 ?fd@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?fd@ifstream@@QBEHXZ(ptr) ifstream_fd +@ cdecl -arch=win64 ?fd@ifstream@@QEBAHXZ(ptr) ifstream_fd @ stub -arch=win32 ?fd@ofstream@@QBEHXZ # int __thiscall ofstream::fd(void)const @ stub -arch=win64 ?fd@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?fill@ios@@QAEDD@Z(ptr long) ios_fill_set @@ -541,8 +541,8 @@ @ cdecl -arch=win64 ?is_open@filebuf@@QEBAHXZ(ptr) filebuf_is_open @ stub -arch=win32 ?is_open@fstream@@QBEHXZ # int __thiscall fstream::is_open(void)const @ stub -arch=win64 ?is_open@fstream@@QEBAHXZ -@ stub -arch=win32 ?is_open@ifstream@@QBEHXZ # int __thiscall ifstream::is_open(void)const -@ stub -arch=win64 ?is_open@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?is_open@ifstream@@QBEHXZ(ptr) ifstream_is_open +@ cdecl -arch=win64 ?is_open@ifstream@@QEBAHXZ(ptr) ifstream_is_open @ stub -arch=win32 ?is_open@ofstream@@QBEHXZ # int __thiscall ofstream::is_open(void)const @ stub -arch=win64 ?is_open@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?isfx@istream@@QAEXXZ(ptr) istream_isfx @@ -566,8 +566,8 @@ @ cdecl -arch=win64 ?open@filebuf@@QEAAPEAV1@PEBDHH@Z(ptr str long long) filebuf_open @ stub -arch=win32 ?open@fstream@@QAEXPBDHH@Z # void __thiscall fstream::open(char const *,int,int) @ stub -arch=win64 ?open@fstream@@QEAAXPEBDHH@Z -@ stub -arch=win32 ?open@ifstream@@QAEXPBDHH@Z # void __thiscall ifstream::open(char const *,int,int) -@ stub -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z +@ thiscall -arch=win32 ?open@ifstream@@QAEXPBDHH@Z(ptr str long long) ifstream_open +@ cdecl -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z(ptr str long long) ifstream_open @ stub -arch=win32 ?open@ofstream@@QAEXPBDHH@Z # void __thiscall ofstream::open(char const *,int,int) @ stub -arch=win64 ?open@ofstream@@QEAAXPEBDHH@Z @ extern ?openprot@filebuf@@2HB filebuf_openprot @@ -615,8 +615,8 @@ @ cdecl -arch=win64 ?pword@ios@@QEBAAEAPEAXH@Z(ptr long) ios_pword @ stub -arch=win32 ?rdbuf@fstream@@QBEPAVfilebuf@@XZ # class filebuf * __thiscall fstream::rdbuf(void)const @ stub -arch=win64 ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ -@ stub -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ # class filebuf * __thiscall ifstream::rdbuf(void)const -@ stub -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ +@ thiscall -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ(ptr) ifstream_rdbuf +@ cdecl -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ(ptr) ifstream_rdbuf @ thiscall -arch=win32 ?rdbuf@ios@@QBEPAVstreambuf@@XZ(ptr) ios_rdbuf @ cdecl -arch=win64 ?rdbuf@ios@@QEBAPEAVstreambuf@@XZ(ptr) ios_rdbuf @ thiscall -arch=win32 ?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ(ptr) istrstream_rdbuf @@ -663,8 +663,8 @@ @ cdecl -arch=win64 ?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) filebuf_setbuf @ stub -arch=win32 ?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z # class streambuf * __thiscall fstream::setbuf(char *,int) @ stub -arch=win64 ?setbuf@fstream@@QEAAPEAVstreambuf@@PEADH@Z -@ stub -arch=win32 ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z # class streambuf * __thiscall ifstream::setbuf(char *,int) -@ stub -arch=win64 ?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z +@ thiscall -arch=win32 ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z(ptr ptr long) ifstream_setbuf +@ cdecl -arch=win64 ?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) ifstream_setbuf @ stub -arch=win32 ?setbuf@ofstream@@QAEPAVstreambuf@@PADH@Z # class streambuf * __thiscall ofstream::setbuf(char *,int) @ stub -arch=win64 ?setbuf@ofstream@@QEAAPEAVstreambuf@@PEADH@Z @ thiscall -arch=win32 ?setbuf@streambuf@@UAEPAV1@PADH@Z(ptr ptr long) streambuf_setbuf @@ -685,8 +685,8 @@ @ cdecl -arch=win64 ?setmode@filebuf@@QEAAHH@Z(ptr long) filebuf_setmode @ stub -arch=win32 ?setmode@fstream@@QAEHH@Z # int __thiscall fstream::setmode(int) @ stub -arch=win64 ?setmode@fstream@@QEAAHH@Z -@ stub -arch=win32 ?setmode@ifstream@@QAEHH@Z # int __thiscall ifstream::setmode(int) -@ stub -arch=win64 ?setmode@ifstream@@QEAAHH@Z +@ thiscall -arch=win32 ?setmode@ifstream@@QAEHH@Z(ptr long) ifstream_setmode +@ cdecl -arch=win64 ?setmode@ifstream@@QEAAHH@Z(ptr long) ifstream_setmode @ stub -arch=win32 ?setmode@ofstream@@QAEHH@Z # int __thiscall ofstream::setmode(int) @ stub -arch=win64 ?setmode@ofstream@@QEAAHH@Z @ thiscall -arch=win32 ?setp@streambuf@@IAEXPAD0@Z(ptr ptr ptr) streambuf_setp diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 6440bc0dab7..06688a91c06 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <windef.h> #include <winbase.h> +#include <sys/stat.h> #include "wine/test.h" typedef void (*vtable_ptr)(void); @@ -403,6 +404,23 @@ static void (*__thiscall p_iostream_vbase_dtor)(iostream*); static iostream* (*__thiscall p_iostream_assign_sb)(iostream*, streambuf*); static iostream* (*__thiscall p_iostream_assign)(iostream*, const iostream*); +/* ifstream */ +static istream* (*__thiscall p_ifstream_copy_ctor)(istream*, const istream*, BOOL); +static istream* (*__thiscall p_ifstream_buffer_ctor)(istream*, filedesc, char*, int, BOOL); +static istream* (*__thiscall p_ifstream_fd_ctor)(istream*, filedesc fd, BOOL virt_init); +static istream* (*__thiscall p_ifstream_open_ctor)(istream*, const char *name, ios_open_mode, int, BOOL); +static istream* (*__thiscall p_ifstream_ctor)(istream*, BOOL); +static void (*__thiscall p_ifstream_dtor)(ios*); +static void (*__thiscall p_ifstream_vbase_dtor)(istream*); +static void (*__thiscall p_ifstream_attach)(istream*, filedesc); +static void (*__thiscall p_ifstream_close)(istream*); +static filedesc (*__thiscall p_ifstream_fd)(istream*); +static int (*__thiscall p_ifstream_is_open)(const istream*); +static void (*__thiscall p_ifstream_open)(istream*, const char*, ios_open_mode, int); +static filebuf* (*__thiscall p_ifstream_rdbuf)(const istream*); +static streambuf* (*__thiscall p_ifstream_setbuf)(istream*, char*, int); +static int (*__thiscall p_ifstream_setmode)(istream*, int); + /* strstream */ static iostream* (*__thiscall p_strstream_copy_ctor)(iostream*, const iostream*, BOOL); static iostream* (*__thiscall p_strstream_buffer_ctor)(iostream*, char*, int, int, BOOL); @@ -703,6 +721,22 @@ static BOOL init(void) SET(p_iostream_assign_sb, "??4iostream@@IEAAAEAV0@PEAVstreambuf@@@Z"); SET(p_iostream_assign, "??4iostream@@IEAAAEAV0@AEAV0@@Z"); + SET(p_ifstream_copy_ctor, "??0ifstream@@QEAA@AEBV0@@Z"); + SET(p_ifstream_buffer_ctor, "??0ifstream@@QEAA@HPEADH@Z"); + SET(p_ifstream_fd_ctor, "??0ifstream@@QEAA@H@Z"); + SET(p_ifstream_open_ctor, "??0ifstream@@QEAA@PEBDHH@Z"); + SET(p_ifstream_ctor, "??0ifstream@@QEAA@XZ"); + SET(p_ifstream_dtor, "??1ifstream@@UEAA@XZ"); + SET(p_ifstream_vbase_dtor, "??_Difstream@@QEAAXXZ"); + SET(p_ifstream_attach, "?attach@ifstream@@QEAAXH@Z"); + SET(p_ifstream_close, "?close@ifstream@@QEAAXXZ"); + SET(p_ifstream_fd, "?fd@ifstream@@QEBAHXZ"); + SET(p_ifstream_is_open, "?is_open@ifstream@@QEBAHXZ"); + SET(p_ifstream_open, "?open@ifstream@@QEAAXPEBDHH@Z"); + SET(p_ifstream_rdbuf, "?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ"); + SET(p_ifstream_setbuf, "?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z"); + SET(p_ifstream_setmode, "?setmode@ifstream@@QEAAHH@Z"); + SET(p_strstream_copy_ctor, "??0strstream@@QEAA@AEBV0@@Z"); SET(p_strstream_buffer_ctor, "??0strstream@@QEAA@PEADHH@Z"); SET(p_strstream_ctor, "??0strstream@@QEAA@XZ"); @@ -917,6 +951,22 @@ static BOOL init(void) SET(p_iostream_assign_sb, "??4iostream@@IAEAAV0@PAVstreambuf@@@Z"); SET(p_iostream_assign, "??4iostream@@IAEAAV0@AAV0@@Z"); + SET(p_ifstream_copy_ctor, "??0ifstream@@QAE@ABV0@@Z"); + SET(p_ifstream_fd_ctor, "??0ifstream@@QAE@H@Z"); + SET(p_ifstream_buffer_ctor, "??0ifstream@@QAE@HPADH@Z"); + SET(p_ifstream_open_ctor, "??0ifstream@@QAE@PBDHH@Z"); + SET(p_ifstream_ctor, "??0ifstream@@QAE@XZ"); + SET(p_istrstream_dtor, "??1ifstream@@UAE@XZ"); + SET(p_istrstream_vbase_dtor, "??_Difstream@@QAEXXZ"); + SET(p_ifstream_attach, "?attach@ifstream@@QAEXH@Z"); + SET(p_ifstream_close, "?close@ifstream@@QAEXXZ"); + SET(p_ifstream_fd, "?fd@ifstream@@QBEHXZ"); + SET(p_ifstream_is_open, "?is_open@ifstream@@QBEHXZ"); + SET(p_ifstream_open, "?open@ifstream@@QAEXPBDHH@Z"); + SET(p_ifstream_rdbuf, "?rdbuf@ifstream@@QBEPAVfilebuf@@XZ"); + SET(p_ifstream_setbuf, "?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z"); + SET(p_ifstream_setmode, "?setmode@ifstream@@QAEHH@Z"); + SET(p_strstream_copy_ctor, "??0strstream@@QAE@ABV0@@Z"); SET(p_strstream_buffer_ctor, "??0strstream@@QAE@PADHH@Z"); SET(p_strstream_ctor, "??0strstream@@QAE@XZ"); @@ -6720,6 +6770,198 @@ static void test_iostream(void) ok(ios2.base_ios.do_lock == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base_ios.do_lock); } +static void test_ifstream(void) +{ + const char *filename = "ifstream_test"; + istream ifs, ifs_copy, *pifs; + streambuf *psb; + filebuf *pfb; + char buffer[64]; + char st[8]; + int fd, ret, i; + + memset(&ifs, 0xab, sizeof(istream)); + + /* constructors/destructors */ + pifs = call_func2(p_ifstream_ctor, &ifs, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(ifs.extract_delim == 0, "expected 0 got %d\n", ifs.extract_delim); + ok(ifs.count == 0, "expected 0 got %d\n", ifs.count); + ok(ifs.base_ios.sb != NULL, "expected not %p got %p\n", NULL, ifs.base_ios.sb); + ok(ifs.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ifs.base_ios.state); + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(ifs.base_ios.tie == NULL, "expected %p got %p\n", NULL, ifs.base_ios.tie); + ok(ifs.base_ios.flags == FLAGS_skipws, "expected %x got %x\n", FLAGS_skipws, ifs.base_ios.flags); + ok(ifs.base_ios.precision == 6, "expected 6 got %d\n", ifs.base_ios.precision); + ok(ifs.base_ios.fill == ' ', "expected 32 got %d\n", ifs.base_ios.fill); + ok(ifs.base_ios.width == 0, "expected 0 got %d\n", ifs.base_ios.width); + ok(ifs.base_ios.do_lock == -1, "expected -1 got %d\n", ifs.base_ios.do_lock); + ok(pfb->fd == -1, "wrong fd, expected -1 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == NULL, "wrong buffer, expected %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf == NULL, "wrong ebuf, expected %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd == -1, "wrong fd, expected 0 got %d\n", pfb->fd); + call_func1(p_ifstream_vbase_dtor, &ifs); + + pifs = call_func3(p_ifstream_fd_ctor, &ifs, 42, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == NULL, "wrong buffer, expected %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf == NULL, "wrong ebuf, expected %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd == 42, "wrong fd, expected 42 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + + pifs = call_func3(p_ifstream_copy_ctor, &ifs_copy, &ifs, TRUE); + pfb = (filebuf*) ifs_copy.base_ios.sb; + ok(pifs == &ifs_copy, "wrong return, expected %p got %p\n", &ifs_copy, pifs); + ok(ifs_copy.base_ios.sb == ifs.base_ios.sb, "expected shared streambuf\n"); + + call_func1(p_ifstream_vbase_dtor, &ifs_copy); + call_func1(p_ifstream_dtor, &ifs.base_ios); + + pifs = call_func5(p_ifstream_buffer_ctor, &ifs, 53, buffer, ARRAY_SIZE(buffer), TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, pfb->base.base); + ok(pfb->base.ebuf == buffer + ARRAY_SIZE(buffer), "wrong ebuf, expected %p got %p\n", buffer + ARRAY_SIZE(buffer), pfb->base.ebuf); + ok(pfb->fd == 53, "wrong fd, expected 53 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + call_func1(p_ifstream_dtor, &ifs.base_ios); + + pifs = call_func5(p_ifstream_buffer_ctor, &ifs, 64, NULL, 0, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(pfb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base == NULL, "wrong buffer, expected %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf == NULL, "wrong ebuf, expected %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd == 64, "wrong fd, expected 64 got %d\n", pfb->fd); + ok(pfb->close == 0, "wrong value, expected 0 got %d\n", pfb->close); + call_func1(p_ifstream_vbase_dtor, &ifs); + + pifs = call_func5(p_ifstream_open_ctor, &ifs, filename, OPENMODE_in, filebuf_openprot, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(ifs.base_ios.delbuf == 1, "expected 1 got %d\n", ifs.base_ios.delbuf); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(pfb->base.allocated == 1, "wrong allocate value, expected 1 got %d\n", pfb->base.allocated); + ok(pfb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pfb->base.unbuffered); + ok(pfb->base.base != NULL, "wrong buffer, expected not %p got %p\n", NULL, pfb->base.base); + ok(pfb->base.ebuf != NULL, "wrong ebuf, expected not %p got %p\n", NULL, pfb->base.ebuf); + ok(pfb->fd != -1, "wrong fd, expected not -1 got %d\n", pfb->fd); + fd = pfb->fd; + ok(pfb->close == 1, "wrong value, expected 1 got %d\n", pfb->close); + call_func1(p_ifstream_vbase_dtor, &ifs); + ok(_close(fd) == -1, "expected ifstream to close opened file\n"); + + /* setbuf - seems to be a nop and always return NULL */ + pifs = call_func5(p_ifstream_buffer_ctor, &ifs, 64, NULL, 0, TRUE); + ok(ifs.base_ios.sb->base == NULL, "wrong base value, expected NULL got %p\n", ifs.base_ios.sb->base); + ok(ifs.base_ios.sb->ebuf == NULL, "wrong ebuf value, expected NULL got %p\n", ifs.base_ios.sb->ebuf); + ok(ifs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", pfb->base.unbuffered); + ok(ifs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got %d\n", ifs.base_ios.sb->allocated); + + psb = call_func3(p_ifstream_setbuf, &ifs, buffer, ARRAY_SIZE(buffer)); + ok(psb == NULL, "wrong return, expected NULL got %p\n", pfb); + ok(ifs.base_ios.sb->base == NULL, "wrong base value, expected NULL got %p\n", ifs.base_ios.sb->base); + ok(ifs.base_ios.sb->ebuf == NULL, "wrong ebuf value, expected NULL got %p\n", ifs.base_ios.sb->ebuf); + ok(ifs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", ifs.base_ios.sb->unbuffered); + ok(ifs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got %d\n", ifs.base_ios.sb->allocated); + + psb = call_func3(p_ifstream_setbuf, &ifs, NULL, 0); + ok(psb == NULL, "wrong return, expected NULL got %p\n", pfb); + ok(ifs.base_ios.sb->base == NULL, "wrong base value, expected NULL got %p\n", ifs.base_ios.sb->base); + ok(ifs.base_ios.sb->ebuf == NULL, "wrong ebuf value, expected NULL got %p\n", ifs.base_ios.sb->ebuf); + ok(ifs.base_ios.sb->unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", ifs.base_ios.sb->unbuffered); + ok(ifs.base_ios.sb->allocated == 0, "wrong allocated value, expected 0 got \n", ifs.base_ios.sb->allocated); + call_func1(p_ifstream_vbase_dtor, &ifs); + + pifs = call_func5(p_ifstream_open_ctor, &ifs, filename, OPENMODE_in, filebuf_openprot, TRUE); + psb = call_func3(p_ifstream_setbuf, &ifs, NULL, 0); + ok(psb == NULL, "wrong return, expected NULL got %p\n", pfb); + ok(ifs.base_ios.sb->base != NULL, "wrong base value, expected NULL got %p\n", ifs.base_ios.sb->base); + ok(ifs.base_ios.sb->ebuf != NULL, "wrong ebuf value, expected NULL got %p\n", ifs.base_ios.sb->ebuf); + ok(ifs.base_ios.sb->unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", ifs.base_ios.sb->unbuffered); + ok(ifs.base_ios.sb->allocated == 1, "wrong allocated value, expected 1 got %d\n", ifs.base_ios.sb->allocated); + + psb = call_func3(p_ifstream_setbuf, &ifs, buffer, ARRAY_SIZE(buffer)); + ok(psb == NULL, "wrong return, expected NULL got %p\n", pfb); + ok(ifs.base_ios.sb->base != NULL, "wrong base value, expected NULL got %p\n", ifs.base_ios.sb->base); + ok(ifs.base_ios.sb->base != buffer, "wrong base value, expected not %p got %p\n", buffer, ifs.base_ios.sb->base); + ok(ifs.base_ios.sb->unbuffered == 0, "wrong unbuffered value, expected 1 got %d\n", ifs.base_ios.sb->unbuffered); + ok(ifs.base_ios.sb->allocated == 1, "wrong allocated value, expected 0 got %d\n", ifs.base_ios.sb->allocated); + call_func1(p_ifstream_vbase_dtor, &ifs); + + /* attach */ + pifs = call_func2(p_ifstream_ctor, &ifs, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + call_func2(p_ifstream_attach, &ifs, 42); + fd = call_func1(p_ifstream_fd, &ifs); + ok(fd == 42, "wrong fd, expected 42 got %d\n", fd); + ok(pfb->close == 0, "wrong close value, expected 0 got %d\n", pfb->close); + call_func2(p_ifstream_attach, &ifs, 53); + ok(fd == 42, "wrong fd, expected 42 got %d\n", fd); + call_func1(p_ifstream_vbase_dtor, &ifs); + + /* fd */ + pifs = call_func5(p_ifstream_open_ctor, &ifs, filename, OPENMODE_in, filebuf_openprot, TRUE); + pfb = (filebuf*) ifs.base_ios.sb; + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + fd = call_func1(p_ifstream_fd, &ifs); + ok(fd == pfb->fd, "wrong fd, expected %d but got %d\n", pfb->fd, fd); + + /* rdbuf */ + pfb = (filebuf*) call_func1(p_ifstream_rdbuf, &ifs); + ok((streambuf*) pfb == ifs.base_ios.sb, "wrong return, expected %p got %p\n", ifs.base_ios.sb, pfb); + + /* setmode */ + ret = call_func2(p_ifstream_setmode, &ifs, filebuf_binary); + ok(ret == filebuf_text, "wrong return, expected %d got %d\n", filebuf_text, ret); + ret = call_func2(p_ifstream_setmode, &ifs, filebuf_binary); + ok(ret == filebuf_binary, "wrong return, expected %d got %d\n", filebuf_binary, ret); + ret = call_func2(p_ifstream_setmode, &ifs, filebuf_text); + ok(ret == filebuf_binary, "wrong return, expected %d got %d\n", filebuf_binary, ret); + ret = call_func2(p_ifstream_setmode, &ifs, 0x9000); + ok(ret == -1, "wrong return, expected -1 got %d\n", ret); + + /* close && is_open */ + ok(call_func1(p_ifstream_is_open, &ifs) == 1, "expected ifstream to be open\n"); + call_func1(p_ifstream_close, &ifs); + ok(call_func1(p_ifstream_is_open, &ifs) == 0, "expected ifstream to not be open\n"); + ok(_close(fd) == -1, "expected close to close the opened file\n"); + + /* integration with parent istream - reading */ + fd = _open(filename, _O_TRUNC|_O_CREAT|_O_RDWR, _S_IWRITE); + ok(fd != -1, "_open failed\n"); + ok(_write(fd, "test 12", 7) == 7, "_write failed\n"); + ok(_close(fd) == 0, "_close failed\n"); + + call_func4(p_ifstream_open, &ifs, filename, OPENMODE_in, filebuf_openprot); + memset(st, 'A', sizeof(st)); + st[7] = 0; + pifs = call_func2(p_istream_read_str, &ifs, st); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(!strcmp(st, "test"), "expected 'test' got '%s'\n", st); + + i = 12345; + pifs = call_func2(p_istream_read_int, pifs, &i); + ok(pifs == &ifs, "wrong return, expected %p got %p\n", &ifs, pifs); + ok(i == 12, "expected 12 got %d\n", i); + + call_func1(p_ifstream_vbase_dtor, &ifs); + ok(_unlink(filename) == 0, "Couldn't unlink file named '%s'\n", filename); +} + static void test_strstream(void) { iostream ios1, ios2, *pios; @@ -7538,6 +7780,7 @@ START_TEST(msvcirt) test_istream_withassign(); test_istrstream(); test_iostream(); + test_ifstream(); test_strstream(); test_stdiostream(); test_Iostream_init(); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index f06a53cc601..2ce72c6b13c 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -20,16 +20,16 @@ @ stub -arch=win64 ??0fstream@@QEAA@PEBDHH@Z @ stub -arch=win32 ??0fstream@@QAE@XZ @ stub -arch=win64 ??0fstream@@QEAA@XZ -@ stub -arch=win32 ??0ifstream@@QAE@ABV0@@Z -@ stub -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z -@ stub -arch=win32 ??0ifstream@@QAE@H@Z -@ stub -arch=win64 ??0ifstream@@QEAA@H@Z -@ stub -arch=win32 ??0ifstream@@QAE@HPADH@Z -@ stub -arch=win64 ??0ifstream@@QEAA@HPEADH@Z -@ stub -arch=win32 ??0ifstream@@QAE@PBDHH@Z -@ stub -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z -@ stub -arch=win32 ??0ifstream@@QAE@XZ -@ stub -arch=win64 ??0ifstream@@QEAA@XZ +@ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QAE@ABV0@@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QEAA@AEBV0@@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@H@Z(ptr long long) msvcirt.??0ifstream@@QAE@H@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@H@Z(ptr long long) msvcirt.??0ifstream@@QEAA@H@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@HPADH@Z(ptr long ptr long long) msvcirt.??0ifstream@@QAE@HPADH@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@HPEADH@Z(ptr long ptr long long) msvcirt.??0ifstream@@QEAA@HPEADH@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@PBDHH@Z(ptr str long long long) msvcirt.??0ifstream@@QAE@PBDHH@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z(ptr str long long long) msvcirt.??0ifstream@@QEAA@PEBDHH@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@XZ(ptr long) msvcirt.??0ifstream@@QAE@XZ +@ cdecl -arch=win64 ??0ifstream@@QEAA@XZ(ptr long) msvcirt.??0ifstream@@QEAA@XZ @ thiscall -arch=win32 ??0ios@@IAE@ABV0@@Z(ptr ptr) msvcirt.??0ios@@IAE@ABV0@@Z @ cdecl -arch=win64 ??0ios@@IEAA@AEBV0@@Z(ptr ptr) msvcirt.??0ios@@IEAA@AEBV0@@Z @ thiscall -arch=win32 ??0ios@@IAE@XZ(ptr) msvcirt.??0ios@@IAE@XZ @@ -124,8 +124,8 @@ @ cdecl -arch=win64 ??1filebuf@@UEAA@XZ(ptr) msvcirt.??1filebuf@@UEAA@XZ @ stub -arch=win32 ??1fstream@@UAE@XZ @ stub -arch=win64 ??1fstream@@UEAA@XZ -@ stub -arch=win32 ??1ifstream@@UAE@XZ -@ stub -arch=win64 ??1ifstream@@UEAA@XZ +@ thiscall -arch=win32 ??1ifstream@@UAE@XZ(ptr) msvcirt.??1ifstream@@UAE@XZ +@ cdecl -arch=win64 ??1ifstream@@UEAA@XZ(ptr) msvcirt.??1ifstream@@UEAA@XZ @ thiscall -arch=win32 ??1ios@@UAE@XZ(ptr) msvcirt.??1ios@@UAE@XZ @ cdecl -arch=win64 ??1ios@@UEAA@XZ(ptr) msvcirt.??1ios@@UEAA@XZ @ thiscall -arch=win32 ??1iostream@@UAE@XZ(ptr) msvcirt.??1iostream@@UAE@XZ @@ -164,8 +164,8 @@ @ cdecl -arch=win64 ??4filebuf@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4filebuf@@QEAAAEAV0@AEBV0@@Z @ stub -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z @ stub -arch=win64 ??4fstream@@QEAAAEAV0@AEAV0@@Z -@ stub -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z -@ stub -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z +@ thiscall -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ifstream@@QAEAAV0@ABV0@@Z +@ cdecl -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ifstream@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4ios@@IAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ios@@IAEAAV0@ABV0@@Z @ cdecl -arch=win64 ??4ios@@IEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ios@@IEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4iostream@@IAEAAV0@AAV0@@Z(ptr ptr) msvcirt.??4iostream@@IAEAAV0@AAV0@@Z @@ -288,7 +288,7 @@ @ cdecl -arch=win64 ??Bios@@QEBAPEAXXZ(ptr) msvcirt.??Bios@@QEBAPEAXXZ @ extern ??_7filebuf@@6B@ msvcirt.??_7filebuf@@6B@ # @ extern ??_7fstream@@6B@ -# @ extern ??_7ifstream@@6B@ +@ extern ??_7ifstream@@6B@ msvcirt.??_7ifstream@@6B@ @ extern ??_7ios@@6B@ msvcirt.??_7ios@@6B@ @ extern ??_7iostream@@6B@ msvcirt.??_7iostream@@6B@ @ extern ??_7istream@@6B@ msvcirt.??_7istream@@6B@ @@ -305,7 +305,7 @@ @ extern ??_7strstreambuf@@6B@ msvcirt.??_7strstreambuf@@6B@ # @ extern ??_8fstream@@7Bistream@@@ # @ extern ??_8fstream@@7Bostream@@@ -# @ extern ??_8ifstream@@7B@ +@ extern ??_8ifstream@@7B@ msvcirt.??_8ifstream@@7B@ @ extern ??_8iostream@@7Bistream@@@ msvcirt.??_8iostream@@7Bistream@@@ @ extern ??_8iostream@@7Bostream@@@ msvcirt.??_8iostream@@7Bostream@@@ @ extern ??_8istream@@7B@ msvcirt.??_8istream@@7B@ @@ -321,8 +321,8 @@ @ extern ??_8strstream@@7Bostream@@@ msvcirt.??_8strstream@@7Bostream@@@ @ stub -arch=win32 ??_Dfstream@@QAEXXZ @ stub -arch=win64 ??_Dfstream@@QEAAXXZ -@ stub -arch=win32 ??_Difstream@@QAEXXZ -@ stub -arch=win64 ??_Difstream@@QEAAXXZ +@ thiscall -arch=win32 ??_Difstream@@QAEXXZ(ptr) msvcirt.??_Difstream@@QAEXXZ +@ cdecl -arch=win64 ??_Difstream@@QEAAXXZ(ptr) msvcirt.??_Difstream@@QEAAXXZ @ thiscall -arch=win32 ??_Diostream@@QAEXXZ(ptr) msvcirt.??_Diostream@@QAEXXZ @ cdecl -arch=win64 ??_Diostream@@QEAAXXZ(ptr) msvcirt.??_Diostream@@QEAAXXZ @ thiscall -arch=win32 ??_Distream@@QAEXXZ(ptr) msvcirt.??_Distream@@QAEXXZ @@ -346,7 +346,7 @@ @ stub -arch=win32 ??_EIostream_init@@QAEPAXI@Z @ thiscall -arch=win32 ??_Efilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Efilebuf@@UAEPAXI@Z @ stub -arch=win32 ??_Efstream@@UAEPAXI@Z -@ stub -arch=win32 ??_Eifstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Eifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Eifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eios@@UAEPAXI@Z(ptr long) msvcirt.??_Eios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eiostream@@UAEPAXI@Z(ptr long) msvcirt.??_Eiostream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eistream@@UAEPAXI@Z(ptr long) msvcirt.??_Eistream@@UAEPAXI@Z @@ -364,7 +364,7 @@ @ stub -arch=win32 ??_GIostream_init@@QAEPAXI@Z @ thiscall -arch=win32 ??_Gfilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Gfilebuf@@UAEPAXI@Z @ stub -arch=win32 ??_Gfstream@@UAEPAXI@Z -@ stub -arch=win32 ??_Gifstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Gifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Gifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gios@@UAEPAXI@Z(ptr long) msvcirt.??_Gios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Giostream@@UAEPAXI@Z(ptr long) msvcirt.??_Giostream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gistream@@UAEPAXI@Z(ptr long) msvcirt.??_Gistream@@UAEPAXI@Z @@ -394,8 +394,8 @@ @ cdecl -arch=win64 ?attach@filebuf@@QEAAPEAV1@H@Z(ptr long) msvcirt.?attach@filebuf@@QEAAPEAV1@H@Z @ stub -arch=win32 ?attach@fstream@@QAEXH@Z @ stub -arch=win64 ?attach@fstream@@QEAAXH@Z -@ stub -arch=win32 ?attach@ifstream@@QAEXH@Z -@ stub -arch=win64 ?attach@ifstream@@QEAAXH@Z +@ thiscall -arch=win32 ?attach@ifstream@@QAEXH@Z(ptr long) msvcirt.?attach@ifstream@@QAEXH@Z +@ cdecl -arch=win64 ?attach@ifstream@@QEAAXH@Z(ptr long) msvcirt.?attach@ifstream@@QEAAXH@Z @ stub -arch=win32 ?attach@ofstream@@QAEXH@Z @ stub -arch=win64 ?attach@ofstream@@QEAAXH@Z @ thiscall -arch=win32 ?bad@ios@@QBEHXZ(ptr) msvcirt.?bad@ios@@QBEHXZ @@ -416,8 +416,8 @@ @ cdecl -arch=win64 ?close@filebuf@@QEAAPEAV1@XZ(ptr) msvcirt.?close@filebuf@@QEAAPEAV1@XZ @ stub -arch=win32 ?close@fstream@@QAEXXZ @ stub -arch=win64 ?close@fstream@@QEAAXXZ -@ stub -arch=win32 ?close@ifstream@@QAEXXZ -@ stub -arch=win64 ?close@ifstream@@QEAAXXZ +@ thiscall -arch=win32 ?close@ifstream@@QAEXXZ(ptr) msvcirt.?close@ifstream@@QAEXXZ +@ cdecl -arch=win64 ?close@ifstream@@QEAAXXZ(ptr) msvcirt.?close@ifstream@@QEAAXXZ @ stub -arch=win32 ?close@ofstream@@QAEXXZ @ stub -arch=win64 ?close@ofstream@@QEAAXXZ @ cdecl -arch=win32 ?clrlock@ios@@QAAXXZ(ptr) msvcirt.?clrlock@ios@@QAAXXZ @@ -460,8 +460,8 @@ @ cdecl -arch=win64 ?fd@filebuf@@QEBAHXZ(ptr) msvcirt.?fd@filebuf@@QEBAHXZ @ stub -arch=win32 ?fd@fstream@@QBEHXZ @ stub -arch=win64 ?fd@fstream@@QEBAHXZ -@ stub -arch=win32 ?fd@ifstream@@QBEHXZ -@ stub -arch=win64 ?fd@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?fd@ifstream@@QBEHXZ(ptr) msvcirt.?fd@ifstream@@QBEHXZ +@ cdecl -arch=win64 ?fd@ifstream@@QEBAHXZ(ptr) msvcirt.?fd@ifstream@@QEBAHXZ @ stub -arch=win32 ?fd@ofstream@@QBEHXZ @ stub -arch=win64 ?fd@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?fill@ios@@QAEDD@Z(ptr long) msvcirt.?fill@ios@@QAEDD@Z @@ -527,8 +527,8 @@ @ cdecl -arch=win64 ?is_open@filebuf@@QEBAHXZ(ptr) msvcirt.?is_open@filebuf@@QEBAHXZ @ stub -arch=win32 ?is_open@fstream@@QBEHXZ @ stub -arch=win64 ?is_open@fstream@@QEBAHXZ -@ stub -arch=win32 ?is_open@ifstream@@QBEHXZ -@ stub -arch=win64 ?is_open@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?is_open@ifstream@@QBEHXZ(ptr) msvcirt.?is_open@ifstream@@QBEHXZ +@ cdecl -arch=win64 ?is_open@ifstream@@QEBAHXZ(ptr) msvcirt.?is_open@ifstream@@QEBAHXZ @ stub -arch=win32 ?is_open@ofstream@@QBEHXZ @ stub -arch=win64 ?is_open@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?isfx@istream@@QAEXXZ(ptr) msvcirt.?isfx@istream@@QAEXXZ @@ -552,8 +552,8 @@ @ cdecl -arch=win64 ?open@filebuf@@QEAAPEAV1@PEBDHH@Z(ptr str long long) msvcirt.?open@filebuf@@QEAAPEAV1@PEBDHH@Z @ stub -arch=win32 ?open@fstream@@QAEXPBDHH@Z @ stub -arch=win64 ?open@fstream@@QEAAXPEBDHH@Z -@ stub -arch=win32 ?open@ifstream@@QAEXPBDHH@Z -@ stub -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z +@ thiscall -arch=win32 ?open@ifstream@@QAEXPBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QAEXPBDHH@Z +@ cdecl -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QEAAXPEBDHH@Z @ stub -arch=win32 ?open@ofstream@@QAEXPBDHH@Z @ stub -arch=win64 ?open@ofstream@@QEAAXPEBDHH@Z @ extern ?openprot@filebuf@@2HB msvcirt.?openprot@filebuf@@2HB @@ -601,8 +601,8 @@ @ cdecl -arch=win64 ?pword@ios@@QEBAAEAPEAXH@Z(ptr long) msvcirt.?pword@ios@@QEBAAEAPEAXH@Z @ stub -arch=win32 ?rdbuf@fstream@@QBEPAVfilebuf@@XZ @ stub -arch=win64 ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ -@ stub -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ -@ stub -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ +@ thiscall -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QBEPAVfilebuf@@XZ +@ cdecl -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ @ thiscall -arch=win32 ?rdbuf@ios@@QBEPAVstreambuf@@XZ(ptr) msvcirt.?rdbuf@ios@@QBEPAVstreambuf@@XZ @ cdecl -arch=win64 ?rdbuf@ios@@QEBAPEAVstreambuf@@XZ(ptr) msvcirt.?rdbuf@ios@@QEBAPEAVstreambuf@@XZ @ thiscall -arch=win32 ?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ(ptr) msvcirt.?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ @@ -651,8 +651,8 @@ @ cdecl -arch=win64 ?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) msvcirt.?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z @ stub -arch=win32 ?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z @ stub -arch=win64 ?setbuf@fstream@@QEAAPEAVstreambuf@@PEADH@Z -@ stub -arch=win32 ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z -@ stub -arch=win64 ?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z +@ thiscall -arch=win32 ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z(ptr ptr long) msvcirt.?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z +@ cdecl -arch=win64 ?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) msvcirt.?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z @ stub -arch=win32 ?setbuf@ofstream@@QAEPAVstreambuf@@PADH@Z @ stub -arch=win64 ?setbuf@ofstream@@QEAAPEAVstreambuf@@PEADH@Z @ thiscall -arch=win32 ?setbuf@streambuf@@UAEPAV1@PADH@Z(ptr ptr long) msvcirt.?setbuf@streambuf@@UAEPAV1@PADH@Z @@ -673,8 +673,8 @@ @ cdecl -arch=win64 ?setmode@filebuf@@QEAAHH@Z(ptr long) msvcirt.?setmode@filebuf@@QEAAHH@Z @ stub -arch=win32 ?setmode@fstream@@QAEHH@Z @ stub -arch=win64 ?setmode@fstream@@QEAAHH@Z -@ stub -arch=win32 ?setmode@ifstream@@QAEHH@Z -@ stub -arch=win64 ?setmode@ifstream@@QEAAHH@Z +@ thiscall -arch=win32 ?setmode@ifstream@@QAEHH@Z(ptr long) msvcirt.?setmode@ifstream@@QAEHH@Z +@ cdecl -arch=win64 ?setmode@ifstream@@QEAAHH@Z(ptr long) msvcirt.?setmode@ifstream@@QEAAHH@Z @ stub -arch=win32 ?setmode@ofstream@@QAEHH@Z @ stub -arch=win64 ?setmode@ofstream@@QEAAHH@Z @ thiscall -arch=win32 ?setp@streambuf@@IAEXPAD0@Z(ptr ptr ptr) msvcirt.?setp@streambuf@@IAEXPAD0@Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index f0d966acd7c..efa3e3251d6 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -38,16 +38,16 @@ @ stub -arch=win64 ??0fstream@@QEAA@PEBDHH@Z @ stub -arch=win32 ??0fstream@@QAE@XZ @ stub -arch=win64 ??0fstream@@QEAA@XZ -@ stub -arch=win32 ??0ifstream@@QAE@ABV0@@Z -@ stub -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z -@ stub -arch=win32 ??0ifstream@@QAE@H@Z -@ stub -arch=win64 ??0ifstream@@QEAA@H@Z -@ stub -arch=win32 ??0ifstream@@QAE@HPADH@Z -@ stub -arch=win64 ??0ifstream@@QEAA@HPEADH@Z -@ stub -arch=win32 ??0ifstream@@QAE@PBDHH@Z -@ stub -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z -@ stub -arch=win32 ??0ifstream@@QAE@XZ -@ stub -arch=win64 ??0ifstream@@QEAA@XZ +@ thiscall -arch=win32 ??0ifstream@@QAE@ABV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QAE@ABV0@@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@AEBV0@@Z(ptr ptr long) msvcirt.??0ifstream@@QEAA@AEBV0@@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@H@Z(ptr long long) msvcirt.??0ifstream@@QAE@H@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@H@Z(ptr long long) msvcirt.??0ifstream@@QEAA@H@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@HPADH@Z(ptr long ptr long long) msvcirt.??0ifstream@@QAE@HPADH@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@HPEADH@Z(ptr long ptr long long) msvcirt.??0ifstream@@QEAA@HPEADH@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@PBDHH@Z(ptr str long long long) msvcirt.??0ifstream@@QAE@PBDHH@Z +@ cdecl -arch=win64 ??0ifstream@@QEAA@PEBDHH@Z(ptr str long long long) msvcirt.??0ifstream@@QEAA@PEBDHH@Z +@ thiscall -arch=win32 ??0ifstream@@QAE@XZ(ptr long) msvcirt.??0ifstream@@QAE@XZ +@ cdecl -arch=win64 ??0ifstream@@QEAA@XZ(ptr long) msvcirt.??0ifstream@@QEAA@XZ @ thiscall -arch=win32 ??0ios@@IAE@ABV0@@Z(ptr ptr) msvcirt.??0ios@@IAE@ABV0@@Z @ cdecl -arch=win64 ??0ios@@IEAA@AEBV0@@Z(ptr ptr) msvcirt.??0ios@@IEAA@AEBV0@@Z @ thiscall -arch=win32 ??0ios@@IAE@XZ(ptr) msvcirt.??0ios@@IAE@XZ @@ -154,8 +154,8 @@ @ cdecl -arch=win64 ??1filebuf@@UEAA@XZ(ptr) msvcirt.??1filebuf@@UEAA@XZ @ stub -arch=win32 ??1fstream@@UAE@XZ @ stub -arch=win64 ??1fstream@@UEAA@XZ -@ stub -arch=win32 ??1ifstream@@UAE@XZ -@ stub -arch=win64 ??1ifstream@@UEAA@XZ +@ thiscall -arch=win32 ??1ifstream@@UAE@XZ(ptr) msvcirt.??1ifstream@@UAE@XZ +@ cdecl -arch=win64 ??1ifstream@@UEAA@XZ(ptr) msvcirt.??1ifstream@@UEAA@XZ @ thiscall -arch=win32 ??1ios@@UAE@XZ(ptr) msvcirt.??1ios@@UAE@XZ @ cdecl -arch=win64 ??1ios@@UEAA@XZ(ptr) msvcirt.??1ios@@UEAA@XZ @ thiscall -arch=win32 ??1iostream@@UAE@XZ(ptr) msvcirt.??1iostream@@UAE@XZ @@ -206,8 +206,8 @@ @ cdecl -arch=win64 ??4filebuf@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4filebuf@@QEAAAEAV0@AEBV0@@Z @ stub -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z @ stub -arch=win64 ??4fstream@@QEAAAEAV0@AEAV0@@Z -@ stub -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z -@ stub -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z +@ thiscall -arch=win32 ??4ifstream@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ifstream@@QAEAAV0@ABV0@@Z +@ cdecl -arch=win64 ??4ifstream@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ifstream@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4ios@@IAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ios@@IAEAAV0@ABV0@@Z @ cdecl -arch=win64 ??4ios@@IEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ios@@IEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4iostream@@IAEAAV0@AAV0@@Z(ptr ptr) msvcirt.??4iostream@@IAEAAV0@AAV0@@Z @@ -340,7 +340,7 @@ @ extern ??_7exception@@6B@ msvcrt.??_7exception@@6B@ @ extern ??_7filebuf@@6B@ msvcirt.??_7filebuf@@6B@ # @ extern ??_7fstream@@6B@ -# @ extern ??_7ifstream@@6B@ +@ extern ??_7ifstream@@6B@ msvcirt.??_7ifstream@@6B@ @ extern ??_7ios@@6B@ msvcirt.??_7ios@@6B@ @ extern ??_7iostream@@6B@ msvcirt.??_7iostream@@6B@ @ extern ??_7istream@@6B@ msvcirt.??_7istream@@6B@ @@ -358,7 +358,7 @@ @ extern ??_7strstreambuf@@6B@ msvcirt.??_7strstreambuf@@6B@ # @ extern ??_8fstream@@7Bistream@@@ # @ extern ??_8fstream@@7Bostream@@@ -# @ extern ??_8ifstream@@7B@ +@ extern ??_8ifstream@@7B@ msvcirt.??_8ifstream@@7B@ @ extern ??_8iostream@@7Bistream@@@ msvcirt.??_8iostream@@7Bistream@@@ @ extern ??_8iostream@@7Bostream@@@ msvcirt.??_8iostream@@7Bostream@@@ @ extern ??_8istream@@7B@ msvcirt.??_8istream@@7B@ @@ -374,8 +374,8 @@ @ extern ??_8strstream@@7Bostream@@@ msvcirt.??_8strstream@@7Bostream@@@ @ stub -arch=win32 ??_Dfstream@@QAEXXZ @ stub -arch=win64 ??_Dfstream@@QEAAXXZ -@ stub -arch=win32 ??_Difstream@@QAEXXZ -@ stub -arch=win64 ??_Difstream@@QEAAXXZ +@ thiscall -arch=win32 ??_Difstream@@QAEXXZ(ptr) msvcirt.??_Difstream@@QAEXXZ +@ cdecl -arch=win64 ??_Difstream@@QEAAXXZ(ptr) msvcirt.??_Difstream@@QEAAXXZ @ thiscall -arch=win32 ??_Diostream@@QAEXXZ(ptr) msvcirt.??_Diostream@@QAEXXZ @ cdecl -arch=win64 ??_Diostream@@QEAAXXZ(ptr) msvcirt.??_Diostream@@QEAAXXZ @ thiscall -arch=win32 ??_Distream@@QAEXXZ(ptr) msvcirt.??_Distream@@QAEXXZ @@ -403,7 +403,7 @@ @ thiscall -arch=win32 ??_Eexception@@UAEPAXI@Z(ptr long) msvcrt.??_Eexception@@UAEPAXI@Z @ thiscall -arch=win32 ??_Efilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Efilebuf@@UAEPAXI@Z @ stub -arch=win32 ??_Efstream@@UAEPAXI@Z -@ stub -arch=win32 ??_Eifstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Eifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Eifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eios@@UAEPAXI@Z(ptr long) msvcirt.??_Eios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eiostream@@UAEPAXI@Z(ptr long) msvcirt.??_Eiostream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eistream@@UAEPAXI@Z(ptr long) msvcirt.??_Eistream@@UAEPAXI@Z @@ -426,7 +426,7 @@ @ thiscall -arch=win32 ??_Gexception@@UAEPAXI@Z(ptr long) msvcrt.??_Gexception@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gfilebuf@@UAEPAXI@Z(ptr long) msvcirt.??_Gfilebuf@@UAEPAXI@Z @ stub -arch=win32 ??_Gfstream@@UAEPAXI@Z -@ stub -arch=win32 ??_Gifstream@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Gifstream@@UAEPAXI@Z(ptr long) msvcirt.??_Gifstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gios@@UAEPAXI@Z(ptr long) msvcirt.??_Gios@@UAEPAXI@Z @ thiscall -arch=win32 ??_Giostream@@UAEPAXI@Z(ptr long) msvcirt.??_Giostream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gistream@@UAEPAXI@Z(ptr long) msvcirt.??_Gistream@@UAEPAXI@Z @@ -457,8 +457,8 @@ @ cdecl -arch=win64 ?attach@filebuf@@QEAAPEAV1@H@Z(ptr long) msvcirt.?attach@filebuf@@QEAAPEAV1@H@Z @ stub -arch=win32 ?attach@fstream@@QAEXH@Z @ stub -arch=win64 ?attach@fstream@@QEAAXH@Z -@ stub -arch=win32 ?attach@ifstream@@QAEXH@Z -@ stub -arch=win64 ?attach@ifstream@@QEAAXH@Z +@ thiscall -arch=win32 ?attach@ifstream@@QAEXH@Z(ptr long) msvcirt.?attach@ifstream@@QAEXH@Z +@ cdecl -arch=win64 ?attach@ifstream@@QEAAXH@Z(ptr long) msvcirt.?attach@ifstream@@QEAAXH@Z @ stub -arch=win32 ?attach@ofstream@@QAEXH@Z @ stub -arch=win64 ?attach@ofstream@@QEAAXH@Z @ thiscall -arch=win32 ?bad@ios@@QBEHXZ(ptr) msvcirt.?bad@ios@@QBEHXZ @@ -481,8 +481,8 @@ @ cdecl -arch=win64 ?close@filebuf@@QEAAPEAV1@XZ(ptr) msvcirt.?close@filebuf@@QEAAPEAV1@XZ @ stub -arch=win32 ?close@fstream@@QAEXXZ @ stub -arch=win64 ?close@fstream@@QEAAXXZ -@ stub -arch=win32 ?close@ifstream@@QAEXXZ -@ stub -arch=win64 ?close@ifstream@@QEAAXXZ +@ thiscall -arch=win32 ?close@ifstream@@QAEXXZ(ptr) msvcirt.?close@ifstream@@QAEXXZ +@ cdecl -arch=win64 ?close@ifstream@@QEAAXXZ(ptr) msvcirt.?close@ifstream@@QEAAXXZ @ stub -arch=win32 ?close@ofstream@@QAEXXZ @ stub -arch=win64 ?close@ofstream@@QEAAXXZ @ cdecl -arch=win32 ?clrlock@ios@@QAAXXZ(ptr) msvcirt.?clrlock@ios@@QAAXXZ @@ -525,8 +525,8 @@ @ cdecl -arch=win64 ?fd@filebuf@@QEBAHXZ(ptr) msvcirt.?fd@filebuf@@QEBAHXZ @ stub -arch=win32 ?fd@fstream@@QBEHXZ @ stub -arch=win64 ?fd@fstream@@QEBAHXZ -@ stub -arch=win32 ?fd@ifstream@@QBEHXZ -@ stub -arch=win64 ?fd@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?fd@ifstream@@QBEHXZ(ptr) msvcirt.?fd@ifstream@@QBEHXZ +@ cdecl -arch=win64 ?fd@ifstream@@QEBAHXZ(ptr) msvcirt.?fd@ifstream@@QEBAHXZ @ stub -arch=win32 ?fd@ofstream@@QBEHXZ @ stub -arch=win64 ?fd@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?fill@ios@@QAEDD@Z(ptr long) msvcirt.?fill@ios@@QAEDD@Z @@ -594,8 +594,8 @@ @ cdecl -arch=win64 ?is_open@filebuf@@QEBAHXZ(ptr) msvcirt.?is_open@filebuf@@QEBAHXZ @ stub -arch=win32 ?is_open@fstream@@QBEHXZ @ stub -arch=win64 ?is_open@fstream@@QEBAHXZ -@ stub -arch=win32 ?is_open@ifstream@@QBEHXZ -@ stub -arch=win64 ?is_open@ifstream@@QEBAHXZ +@ thiscall -arch=win32 ?is_open@ifstream@@QBEHXZ(ptr) msvcirt.?is_open@ifstream@@QBEHXZ +@ cdecl -arch=win64 ?is_open@ifstream@@QEBAHXZ(ptr) msvcirt.?is_open@ifstream@@QEBAHXZ @ stub -arch=win32 ?is_open@ofstream@@QBEHXZ @ stub -arch=win64 ?is_open@ofstream@@QEBAHXZ @ thiscall -arch=win32 ?isfx@istream@@QAEXXZ(ptr) msvcirt.?isfx@istream@@QAEXXZ @@ -621,8 +621,8 @@ @ cdecl -arch=win64 ?open@filebuf@@QEAAPEAV1@PEBDHH@Z(ptr str long long) msvcirt.?open@filebuf@@QEAAPEAV1@PEBDHH@Z @ stub -arch=win32 ?open@fstream@@QAEXPBDHH@Z @ stub -arch=win64 ?open@fstream@@QEAAXPEBDHH@Z -@ stub -arch=win32 ?open@ifstream@@QAEXPBDHH@Z -@ stub -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z +@ thiscall -arch=win32 ?open@ifstream@@QAEXPBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QAEXPBDHH@Z +@ cdecl -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z(ptr str long long) msvcirt.?open@ifstream@@QEAAXPEBDHH@Z @ stub -arch=win32 ?open@ofstream@@QAEXPBDHH@Z @ stub -arch=win64 ?open@ofstream@@QEAAXPEBDHH@Z @ extern ?openprot@filebuf@@2HB msvcirt.?openprot@filebuf@@2HB @@ -672,8 +672,8 @@ @ cdecl -arch=win64 ?raw_name@type_info@@QEBAPEBDXZ(ptr) msvcrt.?raw_name@type_info@@QEBAPEBDXZ @ stub -arch=win32 ?rdbuf@fstream@@QBEPAVfilebuf@@XZ @ stub -arch=win64 ?rdbuf@fstream@@QEBAPEAVfilebuf@@XZ -@ stub -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ -@ stub -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ +@ thiscall -arch=win32 ?rdbuf@ifstream@@QBEPAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QBEPAVfilebuf@@XZ +@ cdecl -arch=win64 ?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ(ptr) msvcirt.?rdbuf@ifstream@@QEBAPEAVfilebuf@@XZ @ thiscall -arch=win32 ?rdbuf@ios@@QBEPAVstreambuf@@XZ(ptr) msvcirt.?rdbuf@ios@@QBEPAVstreambuf@@XZ @ cdecl -arch=win64 ?rdbuf@ios@@QEBAPEAVstreambuf@@XZ(ptr) msvcirt.?rdbuf@ios@@QEBAPEAVstreambuf@@XZ @ thiscall -arch=win32 ?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ(ptr) msvcirt.?rdbuf@istrstream@@QBEPAVstrstreambuf@@XZ @@ -723,8 +723,8 @@ @ cdecl -arch=win64 ?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) msvcirt.?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z @ stub -arch=win32 ?setbuf@fstream@@QAEPAVstreambuf@@PADH@Z @ stub -arch=win64 ?setbuf@fstream@@QEAAPEAVstreambuf@@PEADH@Z -@ stub -arch=win32 ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z -@ stub -arch=win64 ?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z +@ thiscall -arch=win32 ?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z(ptr ptr long) msvcirt.?setbuf@ifstream@@QAEPAVstreambuf@@PADH@Z +@ cdecl -arch=win64 ?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z(ptr ptr long) msvcirt.?setbuf@ifstream@@QEAAPEAVstreambuf@@PEADH@Z @ stub -arch=win32 ?setbuf@ofstream@@QAEPAVstreambuf@@PADH@Z @ stub -arch=win64 ?setbuf@ofstream@@QEAAPEAVstreambuf@@PEADH@Z @ thiscall -arch=win32 ?setbuf@streambuf@@UAEPAV1@PADH@Z(ptr ptr long) msvcirt.?setbuf@streambuf@@UAEPAV1@PADH@Z @@ -745,8 +745,8 @@ @ cdecl -arch=win64 ?setmode@filebuf@@QEAAHH@Z(ptr long) msvcirt.?setmode@filebuf@@QEAAHH@Z @ stub -arch=win32 ?setmode@fstream@@QAEHH@Z @ stub -arch=win64 ?setmode@fstream@@QEAAHH@Z -@ stub -arch=win32 ?setmode@ifstream@@QAEHH@Z -@ stub -arch=win64 ?setmode@ifstream@@QEAAHH@Z +@ thiscall -arch=win32 ?setmode@ifstream@@QAEHH@Z(ptr long) msvcirt.?setmode@ifstream@@QAEHH@Z +@ cdecl -arch=win64 ?setmode@ifstream@@QEAAHH@Z(ptr long) msvcirt.?setmode@ifstream@@QEAAHH@Z @ stub -arch=win32 ?setmode@ofstream@@QAEHH@Z @ stub -arch=win64 ?setmode@ofstream@@QEAAHH@Z @ thiscall -arch=win32 ?setp@streambuf@@IAEXPAD0@Z(ptr ptr ptr) msvcirt.?setp@streambuf@@IAEXPAD0@Z -- 2.28.0

2 1

[PATCH 1/4] kernel32: Implement SetXStateFeaturesMask().
by Paul Gofman 01 Sep '20

01 Sep '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- .../api-ms-win-core-xstate-l1-1-0.spec | 2 +- .../api-ms-win-core-xstate-l2-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/memory.c | 41 +++++++++- dlls/ntdll/exception.c | 10 +++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/exception.c | 77 ++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + include/winbase.h | 1 + 11 files changed, 131 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec b/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec index b933eca226f..0a29d660112 100644 --- a/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec +++ b/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec @@ -5,4 +5,4 @@ @ stdcall RtlInitializeExtendedContext(ptr long ptr) ntdll.RtlInitializeExtendedContext @ stdcall RtlLocateExtendedFeature(ptr long ptr) ntdll.RtlLocateExtendedFeature @ stdcall RtlLocateLegacyContext(ptr ptr) ntdll.RtlLocateLegacyContext -@ stub RtlSetExtendedFeaturesMask +@ stdcall RtlSetExtendedFeaturesMask(ptr int64) ntdll.RtlSetExtendedFeaturesMask diff --git a/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec b/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec index 5ad2df2b405..74aafa4db1c 100644 --- a/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec +++ b/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec @@ -3,4 +3,4 @@ @ stub GetXStateFeaturesMask @ stdcall -arch=i386,x86_64 InitializeContext(ptr long ptr ptr) kernel32.InitializeContext @ stdcall -arch=i386,x86_64 LocateXStateFeature(ptr long ptr) kernel32.LocateXStateFeature -@ stub SetXStateFeaturesMask +@ stdcall -arch=i386,x86_64 SetXStateFeaturesMask(ptr int64) kernel32.SetXStateFeaturesMask diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c22f3000bf0..4bcda92bf7f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -895,7 +895,7 @@ @ stdcall -import GetWindowsDirectoryA(ptr long) @ stdcall -import GetWindowsDirectoryW(ptr long) @ stdcall -import GetWriteWatch(long ptr long ptr ptr ptr) -# @ stub GetXStateFeaturesMask +@ stdcall -import -arch=i386,x86_64 SetXStateFeaturesMask(ptr int64) @ stdcall GlobalAddAtomA(str) @ stdcall GlobalAddAtomW(wstr) @ stdcall -import GlobalAlloc(long long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index ef862c57a4f..d2832600091 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1510,7 +1510,7 @@ @ stdcall SetUserGeoID(long) @ stdcall SetWaitableTimer(long ptr long ptr ptr long) @ stdcall SetWaitableTimerEx(long ptr long ptr ptr ptr long) -# @ stub SetXStateFeaturesMask +@ stdcall -arch=i386,x86_64 SetXStateFeaturesMask(ptr int64) @ stdcall SetupComm(long long long) # @ stub SharedLocalIsEnabled @ stdcall SignalObjectAndWait(long long long long) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index ea958e1e232..f99b908494b 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -1236,10 +1236,10 @@ BOOL WINAPI InitializeContext( void *buffer, DWORD context_flags, CONTEXT **cont #endif +#if defined(__x86_64__) /*********************************************************************** * LocateXStateFeature (kernelbase.@) */ -#if defined(__x86_64__) void * WINAPI LocateXStateFeature( CONTEXT *context, DWORD feature_id, DWORD *length ) { if (!(context->ContextFlags & CONTEXT_AMD64)) @@ -1262,7 +1262,28 @@ void * WINAPI LocateXStateFeature( CONTEXT *context, DWORD feature_id, DWORD *le return &context->u.FltSave; } + +/*********************************************************************** + * SetXStateFeaturesMask (kernelbase.@) + */ +BOOL WINAPI SetXStateFeaturesMask( CONTEXT *context, DWORD64 feature_mask ) +{ + if (!(context->ContextFlags & CONTEXT_AMD64)) + return FALSE; + + if (feature_mask & 0x3) + context->ContextFlags |= CONTEXT_FLOATING_POINT; + + if ((context->ContextFlags & CONTEXT_XSTATE) != CONTEXT_XSTATE) + return !(feature_mask & ~(DWORD64)3); + + RtlSetExtendedFeaturesMask( (CONTEXT_EX *)(context + 1), feature_mask ); + return TRUE; +} #elif defined(__i386__) +/*********************************************************************** + * LocateXStateFeature (kernelbase.@) + */ void * WINAPI LocateXStateFeature( CONTEXT *context, DWORD feature_id, DWORD *length ) { if (!(context->ContextFlags & CONTEXT_X86)) @@ -1285,6 +1306,24 @@ void * WINAPI LocateXStateFeature( CONTEXT *context, DWORD feature_id, DWORD *le return &context->ExtendedRegisters; } + +/*********************************************************************** + * SetXStateFeaturesMask (kernelbase.@) + */ +BOOL WINAPI SetXStateFeaturesMask( CONTEXT *context, DWORD64 feature_mask ) +{ + if (!(context->ContextFlags & CONTEXT_X86)) + return FALSE; + + if (feature_mask & 0x3) + context->ContextFlags |= CONTEXT_EXTENDED_REGISTERS; + + if ((context->ContextFlags & CONTEXT_XSTATE) != CONTEXT_XSTATE) + return !(feature_mask & ~(DWORD64)3); + + RtlSetExtendedFeaturesMask( (CONTEXT_EX *)(context + 1), feature_mask ); + return TRUE; +} #endif /*********************************************************************** diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 0e7e3b959e4..6ca22d6660f 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -861,3 +861,13 @@ void * WINAPI RtlLocateLegacyContext( CONTEXT_EX *context_ex, ULONG *length ) return (BYTE *)context_ex + context_ex->Legacy.Offset; } + +/********************************************************************** + * RtlSetExtendedFeaturesMask (NTDLL.@) + */ +void WINAPI RtlSetExtendedFeaturesMask( CONTEXT_EX *context_ex, ULONG64 feature_mask ) +{ + XSTATE *xs = (XSTATE *)((BYTE *)context_ex + context_ex->XState.Offset); + + xs->Mask = RtlGetEnabledExtendedFeatures( feature_mask ) & ~(ULONG64)3; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index cc75aad06d1..0e17d29ed1b 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -946,6 +946,7 @@ @ stdcall RtlSetCurrentTransaction(ptr) @ stdcall RtlSetDaclSecurityDescriptor(ptr long ptr long) @ stdcall RtlSetEnvironmentVariable(ptr ptr ptr) +@ stdcall RtlSetExtendedFeaturesMask(ptr int64) @ stdcall RtlSetGroupSecurityDescriptor(ptr ptr long) @ stdcall RtlSetHeapInformation(long long ptr long) @ stub RtlSetInformationAcl diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 4b714e4739e..7b6c65f8572 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -53,6 +53,7 @@ static NTSTATUS (WINAPI *pRtlInitializeExtendedContext2)(void *context, ULONG c ULONG64 compaction_mask); static void * (WINAPI *pRtlLocateExtendedFeature)(CONTEXT_EX *context_ex, ULONG feature_id, ULONG *length); static void * (WINAPI *pRtlLocateLegacyContext)(CONTEXT_EX *context_ex, ULONG *length); +static void (WINAPI *pRtlSetExtendedFeaturesMask)(CONTEXT_EX *context_ex, ULONG64 feature_mask); static NTSTATUS (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -67,6 +68,7 @@ static BOOL (WINAPI *pInitializeContext)(void *buffer, DWORD context_flags, static BOOL (WINAPI *pInitializeContext2)(void *buffer, DWORD context_flags, CONTEXT **context, DWORD *length, ULONG64 compaction_mask); static void * (WINAPI *pLocateXStateFeature)(CONTEXT *context, DWORD feature_id, DWORD *length); +static BOOL (WINAPI *pSetXStateFeaturesMask)(CONTEXT *context, DWORD64 feature_mask); #define RTL_UNLOAD_EVENT_TRACE_NUMBER 64 @@ -6224,15 +6226,15 @@ static void test_extended_context(void) }, }; ULONG expected_length, expected_length_xstate, context_flags, expected_offset; + ULONG64 enabled_features, expected_compaction; DECLSPEC_ALIGN(64) BYTE context_buffer2[2048]; DECLSPEC_ALIGN(64) BYTE context_buffer[2048]; unsigned int i, j, address_offset, test; ULONG ret, ret2, length, length2, align; - ULONG64 enabled_features; CONTEXT_EX *context_ex; + ULONG flags, flags_fpx; CONTEXT *context; unsigned data[8]; - ULONG flags; XSTATE *xs; BOOL bret; void *p; @@ -6359,6 +6361,36 @@ static void test_extended_context(void) "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); length2 = expected_length; + if (0) + { + /* Crashes on Windows. */ + pRtlSetExtendedFeaturesMask(context_ex, 0); + } + bret = pSetXStateFeaturesMask(context, 0); + ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x, flags %#x.\n", bret, flags); + context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); + ok(context_flags == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags); + + flags_fpx = flags & 0x10000 ? flags | 0x20 : flags | 0x8; + bret = pSetXStateFeaturesMask(context, 1); + ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x, flags %#x.\n", bret, flags); + context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); + ok(context_flags == (bret ? flags_fpx : flags), + "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags); + + bret = pSetXStateFeaturesMask(context, 2); + ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x, flags %#x.\n", bret, flags); + context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); + ok(context_flags == (bret ? flags_fpx : flags), + "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags); + + bret = pSetXStateFeaturesMask(context, 4); + ok(!bret, "Got unexpected bret %#x.\n", bret); + context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); + ok(context_flags == (flags & CONTEXT_NATIVE ? flags_fpx : flags), + "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags); + *(DWORD *)(context_buffer + context_arch[test].flags_offset) = flags; + for (j = 0; j < context_arch[test].flags_offset; ++j) { if (context_buffer[j] != 0xcc) @@ -6469,6 +6501,7 @@ static void test_extended_context(void) } flags = context_arch[test].flag | 0x40; + flags_fpx = flags & 0x10000 ? flags | 0x20 : flags | 0x8; length = 0xdeadbeef; ret = pRtlGetExtendedContextLength(flags, &length); @@ -6629,11 +6662,40 @@ static void test_extended_context(void) else ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + expected_compaction = compaction_enabled ? ((ULONG64)1 << 63) | enabled_features : 0; ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); - ok(xs->CompactionMask == (compaction_enabled ? ((ULONG64)1 << 63) | enabled_features : 0), + ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); ok(!xs->Reserved[0], "Got unexpected Reserved[0] %s.\n", wine_dbgstr_longlong(xs->Reserved[0])); + xs->Mask = 0xdeadbeef; + xs->CompactionMask = 0xdeadbeef; + pRtlSetExtendedFeaturesMask(context_ex, 0); + ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(xs->CompactionMask == 0xdeadbeef, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); + context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); + ok(context_flags == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", context->ContextFlags, flags); + + xs->Mask = 0xdeadbeef; + xs->CompactionMask = 0; + pRtlSetExtendedFeaturesMask(context_ex, ~(ULONG64)0); + ok(xs->Mask == (enabled_features & ~(ULONG64)3), "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(!xs->CompactionMask, "Got unexpected CompactionMask %s.\n", + wine_dbgstr_longlong(xs->CompactionMask)); + context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); + ok(context_flags == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", context->ContextFlags, flags); + + xs->Mask = 0xdeadbeef; + xs->CompactionMask = 0xdeadbeef; + bret = pSetXStateFeaturesMask(context, 7); + ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x.\n", bret); + context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); + ok(context_flags == (bret ? flags_fpx : flags), + "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags); + ok(xs->Mask == bret ? 4 : 0xdeadbeef, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(xs->CompactionMask == bret ? expected_compaction : 0xdeadbeef, "Got unexpected CompactionMask %s.\n", + wine_dbgstr_longlong(xs->CompactionMask)); + if (pRtlGetExtendedContextLength2) { memset(context_buffer, 0xcc, sizeof(context_buffer)); @@ -6690,11 +6752,16 @@ static void test_extended_context(void) + context_ex->XState.Offset + context_ex->XState.Length, "Got unexpected Length %#x, flags %#x.\n", context_ex->All.Length, flags); + expected_compaction = compaction_enabled ? (ULONG64)1 << 63 : 0; xs = (XSTATE *)((BYTE *)context_ex + context_ex->XState.Offset); ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); - ok(xs->CompactionMask == (compaction_enabled ? (ULONG64)1 << 63 : 0), + ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); ok(!xs->Reserved[0], "Got unexpected Reserved[0] %s.\n", wine_dbgstr_longlong(xs->Reserved[0])); + + pRtlSetExtendedFeaturesMask(context_ex, ~(ULONG64)0); + ok(xs->Mask == (enabled_features & ~(ULONG64)3), "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); } } @@ -6790,6 +6857,7 @@ START_TEST(exception) X(RtlInitializeExtendedContext2); X(RtlLocateExtendedFeature); X(RtlLocateLegacyContext); + X(RtlSetExtendedFeaturesMask); #undef X #define X(f) p##f = (void*)GetProcAddress(hkernel32, #f) @@ -6799,6 +6867,7 @@ START_TEST(exception) X(InitializeContext); X(InitializeContext2); X(LocateXStateFeature); + X(SetXStateFeaturesMask); #undef X if (pRtlAddVectoredExceptionHandler && pRtlRemoveVectoredExceptionHandler) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a900796359c..ffd8f7dcd4c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1235,6 +1235,7 @@ @ stdcall RtlSetBits(ptr long long) @ stdcall RtlSetControlSecurityDescriptor(ptr long long) @ stdcall RtlSetDaclSecurityDescriptor(ptr long ptr long) +@ stdcall RtlSetExtendedFeaturesMask(ptr int64) @ stdcall RtlSetGroupSecurityDescriptor(ptr ptr long) @ stdcall RtlSetOwnerSecurityDescriptor(ptr ptr long) @ stdcall RtlSetSaclSecurityDescriptor(ptr long ptr long) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 2115627d3a6..3938645da94 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1845,6 +1845,7 @@ NTSTATUS WINAPI RtlGetExtendedContextLength2(ULONG,ULONG*,ULONG64); void * WINAPI RtlLocateLegacyContext(CONTEXT_EX*,ULONG*); void * WINAPI RtlLocateExtendedFeature(CONTEXT_EX*,ULONG,ULONG*); void * WINAPI RtlLocateExtendedFeature2(CONTEXT_EX*,ULONG,XSTATE_CONFIGURATION*,ULONG*); +void WINAPI RtlSetExtendedFeaturesMask(CONTEXT_EX*,ULONG64); #endif #ifdef __x86_64__ diff --git a/include/winbase.h b/include/winbase.h index d5ed5db8d7b..f741f0a09dc 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2700,6 +2700,7 @@ WINBASEAPI BOOL WINAPI SetVolumeMountPointW(LPCWSTR,LPCWSTR); WINBASEAPI BOOL WINAPI SetWaitableTimer(HANDLE,const LARGE_INTEGER*,LONG,PTIMERAPCROUTINE,LPVOID,BOOL); WINBASEAPI BOOL WINAPI SetWaitableTimerEx(HANDLE,const LARGE_INTEGER*,LONG,PTIMERAPCROUTINE,LPVOID,REASON_CONTEXT*,ULONG); WINBASEAPI BOOL WINAPI SetUmsThreadInformation(PUMS_CONTEXT,UMS_THREAD_INFO_CLASS,void *,ULONG); +WINBASEAPI BOOL WINAPI SetXStateFeaturesMask(CONTEXT*, DWORD64); WINBASEAPI BOOL WINAPI SetupComm(HANDLE,DWORD,DWORD); WINBASEAPI DWORD WINAPI SignalObjectAndWait(HANDLE,HANDLE,DWORD,BOOL); WINBASEAPI DWORD WINAPI SizeofResource(HMODULE,HRSRC); -- 2.26.2

2 8

[PATCH 1/5] kernel32/tests: Skip more FreeConsole tests on win7.
by Jacek Caban 01 Sep '20

01 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)

2 1

[PATCH 5/5] conhost: Support CTRL_C_EVENT in write_console_input.
by Jacek Caban 01 Sep '20

01 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)

1 0

[PATCH 4/5] server: Support IOCTL_CONDRV_CTRL_EVENT on console server handles.
by Jacek Caban 01 Sep '20

01 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-)

1 0

[PATCH 2/5] server: Introduce IOCTL_CONDRV_CTRL_EVENT ioctl.
by Jacek Caban 01 Sep '20

01 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 8 ++++++++ server/console.c | 19 +++++++++++++++++++ server/trace.c | 1 + 3 files changed, 28 insertions(+)

1 0

[PATCH v2 0/7] NDIS patchset
by Isabella Bosia 01 Sep '20

01 Sep '20

I think I've addressed all the issues that were mentioned. I've moved the test from iphlpapi to ndis.sys. I think I'm using the LoadOrderGroup correctly and it doesn't create any extra processes. I also removed the creation of the symlink with DefineDosDevice. It was inspired by some code I reversed in a third party dll, which the patches are trying to address. v1: https://www.winehq.org/pipermail/wine-devel/2020-August/172383.html Isabella Bosia (7): iphlpapi: Unify conversions to interface guid. iphlpapi: Make the interface guids more unique. wine.inf: Create NDIS service. ndis.sys: Create network card registry keys. ndis.sys: Create network card devices. ndis.sys: Implement IOCTL_NDIS_QUERY_GLOBAL_STATS on network cards. ndis.sys/tests: Add tests for ndis ioctls. configure.ac | 1 + dlls/iphlpapi/iphlpapi_main.c | 12 ++- dlls/ndis.sys/Makefile.in | 1 + dlls/ndis.sys/main.c | 159 ++++++++++++++++++++++++++++++++ dlls/ndis.sys/tests/Makefile.in | 5 + dlls/ndis.sys/tests/ndis.c | 146 +++++++++++++++++++++++++++++ loader/wine.inf.in | 14 +++ 7 files changed, 336 insertions(+), 2 deletions(-) create mode 100644 dlls/ndis.sys/tests/Makefile.in create mode 100644 dlls/ndis.sys/tests/ndis.c -- 2.25.1

1 7

[PATCH] kernel32/tests: Change file name to avoid collision with other tests.
by Carlos Rivera 01 Sep '20

01 Sep '20

Entries in IniFileMapping are persisted in Windows until the next reboot, even if removed from the registry. This made the function test_registry_mapping to cause other tests that accessed the actual winetest.ini file to fail if the profile test was run more than once on Windows without rebooting. Signed-off-by: Carlos Rivera <carlos(a)superkaos.org> --- dlls/kernel32/tests/profile.c | 182 +++++++++++++++++----------------- 1 file changed, 91 insertions(+), 91 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 5f1f4f0fe7..f981558548 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -1203,7 +1203,7 @@ static void test_registry_mapping(void) ok(ret, "got error %u\n", GetLastError()); ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows NT\\CurrentVersion\\IniFileMapping\\winetest.ini", + "Software\\Microsoft\\Windows NT\\CurrentVersion\\IniFileMapping\\winetest_map.ini", 0, NULL, 0, KEY_READ | KEY_WRITE | KEY_WOW64_64KEY, NULL, &mapping_key, NULL); if (ret == ERROR_ACCESS_DENIED) { @@ -1214,16 +1214,16 @@ static void test_registry_mapping(void) ret = RegSetValueExA(mapping_key, "section1", 0, REG_SZ, (BYTE *)"USR:winetest_map", sizeof("USR:winetest_map")); ok(!ret, "got error %u\n", ret); - ret = WritePrivateProfileStringA(NULL, NULL, NULL, "winetest.ini"); + ret = WritePrivateProfileStringA(NULL, NULL, NULL, "winetest_map.ini"); todo_wine ok(ret, "got error %u\n", GetLastError()); - check_profile_string("section1", "name1", "winetest.ini", "default"); + check_profile_string("section1", "name1", "winetest_map.ini", "default"); - ret = WritePrivateProfileStringA("section1", "name1", "value1", "winetest.ini"); + ret = WritePrivateProfileStringA("section1", "name1", "value1", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - check_profile_string("section1", "name1", "winetest.ini", "value1"); - check_profile_string("section1", "name1", "C:/fake/path/winetest.ini", "value1"); + check_profile_string("section1", "name1", "winetest_map.ini", "value1"); + check_profile_string("section1", "name1", "C:/fake/path/winetest_map.ini", "value1"); ret = RegOpenKeyExA(HKEY_CURRENT_USER, "winetest_map", 0, KEY_READ | KEY_WRITE, &mapped_key); ok(!ret, "got error %u\n", ret); @@ -1232,12 +1232,12 @@ static void test_registry_mapping(void) ret = RegSetValueExA(mapped_key, "name2", 0, REG_SZ, (BYTE *)"value2", sizeof("value2")); ok(!ret, "got error %u\n", ret); - check_profile_string("section1", "name2", "winetest.ini", "value2"); + check_profile_string("section1", "name2", "winetest_map.ini", "value2"); - ret = GetFileAttributesA("C:/windows/winetest.ini"); - ok(ret == INVALID_FILE_ATTRIBUTES, "winetest.ini should not exist.\n"); + ret = GetFileAttributesA("C:/windows/winetest_map.ini"); + ok(ret == INVALID_FILE_ATTRIBUTES, "winetest_map.ini should not exist.\n"); - ret = WritePrivateProfileStringA("section1", "name2", NULL, "winetest.ini"); + ret = WritePrivateProfileStringA("section1", "name2", NULL, "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); ret = RegQueryValueExA(mapped_key, "name2", 0, NULL, NULL, NULL); ok(ret == ERROR_FILE_NOT_FOUND, "got error %u\n", ret); @@ -1246,35 +1246,35 @@ static void test_registry_mapping(void) ret = RegSetValueExA(mapped_key, "name3", 0, REG_DWORD, (BYTE *)&ivalue, sizeof(ivalue)); ok(!ret, "got error %u\n", ret); - check_profile_string("section1", "name3", "winetest.ini", "default"); + check_profile_string("section1", "name3", "winetest_map.ini", "default"); - ret = GetPrivateProfileIntA("section1", "name3", 0, "winetest.ini"); + ret = GetPrivateProfileIntA("section1", "name3", 0, "winetest_map.ini"); ok(ret == 0, "got %#x\n", ret); ret = RegSetValueExA(mapped_key, "name3", 0, REG_BINARY, (BYTE *)"value3", sizeof("value3")); ok(!ret, "got error %u\n", ret); - check_profile_string("section1", "name3", "winetest.ini", "default"); + check_profile_string("section1", "name3", "winetest_map.ini", "default"); ret = RegSetValueExA(mapped_key, "name3", 0, REG_MULTI_SZ, (BYTE *)"one\0two\0", sizeof("one\0two\0")); ok(!ret, "got error %u\n", ret); - check_profile_string("section1", "name3", "winetest.ini", "default"); + check_profile_string("section1", "name3", "winetest_map.ini", "default"); ret = RegSetValueExA(mapped_key, "name3", 0, REG_EXPAND_SZ, (BYTE *)"x%SystemRoot%", sizeof("x%SystemRoot%")); ok(!ret, "got error %u\n", ret); - check_profile_string("section1", "name3", "winetest.ini", "default"); + check_profile_string("section1", "name3", "winetest_map.ini", "default"); /* Test WritePrivateProfileSection(). Unlike with .ini files, it doesn't * remove existing entries. */ - ret = WritePrivateProfileStringA("section1", "name4", "value4", "winetest.ini"); + ret = WritePrivateProfileStringA("section1", "name4", "value4", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - ret = WritePrivateProfileStringA("section1", "name5", "value5", "winetest.ini"); + ret = WritePrivateProfileStringA("section1", "name5", "value5", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - ret = WritePrivateProfileSectionA("section1", "name4=four\0name6=six\0", "winetest.ini"); + ret = WritePrivateProfileSectionA("section1", "name4=four\0name6=six\0", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - check_profile_string("section1", "name4", "winetest.ini", "four"); - check_profile_string("section1", "name5", "winetest.ini", "value5"); - check_profile_string("section1", "name6", "winetest.ini", "six"); + check_profile_string("section1", "name4", "winetest_map.ini", "four"); + check_profile_string("section1", "name5", "winetest_map.ini", "value5"); + check_profile_string("section1", "name6", "winetest_map.ini", "six"); /* Test deleting the section. */ @@ -1284,17 +1284,17 @@ static void test_registry_mapping(void) ok(!ret, "got error %u\n", ret); RegCloseKey(mapped_key); - ret = WritePrivateProfileStringA("section1", "name1", "value1", "winetest.ini"); + ret = WritePrivateProfileStringA("section1", "name1", "value1", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - ret = WritePrivateProfileStringA("section1", NULL, NULL, "winetest.ini"); + ret = WritePrivateProfileStringA("section1", NULL, NULL, "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - check_profile_string("section1", "name1", "winetest.ini", "default"); + check_profile_string("section1", "name1", "winetest_map.ini", "default"); - ret = WritePrivateProfileStringA("section1", "name1", "value1", "winetest.ini"); + ret = WritePrivateProfileStringA("section1", "name1", "value1", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - ret = WritePrivateProfileSectionA("section1", NULL, "winetest.ini"); + ret = WritePrivateProfileSectionA("section1", NULL, "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - check_profile_string("section1", "name1", "winetest.ini", "default"); + check_profile_string("section1", "name1", "winetest_map.ini", "default"); ret = RegDeleteKeyA(HKEY_CURRENT_USER, "winetest_map\\subkey"); ok(!ret, "got error %u\n", ret); @@ -1304,44 +1304,44 @@ static void test_registry_mapping(void) /* Test GetPrivateProfileSectionNames(). */ memset(buffer, 0xcc, sizeof(buffer)); - ret = GetPrivateProfileSectionNamesA(buffer, 5, "winetest.ini"); + ret = GetPrivateProfileSectionNamesA(buffer, 5, "winetest_map.ini"); ok(ret == 3, "got %u\n", ret); ok(!memcmp(buffer, "sec\0", 5), "got %s\n", debugstr_an(buffer, ret)); memset(buffer, 0xcc, sizeof(buffer)); - ret = GetPrivateProfileSectionNamesA(buffer, sizeof(buffer), "winetest.ini"); + ret = GetPrivateProfileSectionNamesA(buffer, sizeof(buffer), "winetest_map.ini"); ok(ret == 9, "got %u\n", ret); ok(!memcmp(buffer, "section1\0", 10), "got %s\n", debugstr_an(buffer, ret)); - ret = WritePrivateProfileStringA("file_section", "name1", "value1", "winetest.ini"); + ret = WritePrivateProfileStringA("file_section", "name1", "value1", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); memset(buffer, 0xcc, sizeof(buffer)); - ret = GetPrivateProfileSectionNamesA(buffer, 5, "winetest.ini"); + ret = GetPrivateProfileSectionNamesA(buffer, 5, "winetest_map.ini"); ok(ret == 3, "got %u\n", ret); ok(!memcmp(buffer, "sec\0", 5), "got %s\n", debugstr_an(buffer, ret)); memset(buffer, 0xcc, sizeof(buffer)); - ret = GetPrivateProfileSectionNamesA(buffer, sizeof(buffer), "winetest.ini"); + ret = GetPrivateProfileSectionNamesA(buffer, sizeof(buffer), "winetest_map.ini"); ok(ret == 22, "got %u\n", ret); ok(!memcmp(buffer, "section1\0file_section\0", 23), "got %s\n", debugstr_an(buffer, ret)); - ret = DeleteFileA("C:/windows/winetest.ini"); + ret = DeleteFileA("C:/windows/winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); /* Test the SYS: prefix. */ ret = RegSetValueExA(mapping_key, "section2", 0, REG_SZ, (BYTE *)"SYS:winetest_map", sizeof("SYS:winetest_map")); ok(!ret, "got error %u\n", ret); - ret = WritePrivateProfileStringA(NULL, NULL, NULL, "winetest.ini"); + ret = WritePrivateProfileStringA(NULL, NULL, NULL, "winetest_map.ini"); todo_wine ok(ret, "got error %u\n", GetLastError()); - check_profile_string("section2", "name1", "winetest.ini", "default"); + check_profile_string("section2", "name1", "winetest_map.ini", "default"); - ret = WritePrivateProfileStringA("section2", "name1", "value1", "winetest.ini"); + ret = WritePrivateProfileStringA("section2", "name1", "value1", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - check_profile_string("section2", "name1", "winetest.ini", "value1"); + check_profile_string("section2", "name1", "winetest_map.ini", "value1"); ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\winetest_map", 0, KEY_READ | KEY_WRITE, &mapped_key); ok(!ret, "got error %u\n", ret); @@ -1350,10 +1350,10 @@ static void test_registry_mapping(void) ret = RegSetValueExA(mapped_key, "name2", 0, REG_SZ, (BYTE *)"value2", sizeof("value2")); ok(!ret, "got error %u\n", ret); - check_profile_string("section2", "name2", "winetest.ini", "value2"); + check_profile_string("section2", "name2", "winetest_map.ini", "value2"); - ret = GetFileAttributesA("C:/windows/winetest.ini"); - ok(ret == INVALID_FILE_ATTRIBUTES, "winetest.ini should not exist.\n"); + ret = GetFileAttributesA("C:/windows/winetest_map.ini"); + ok(ret == INVALID_FILE_ATTRIBUTES, "winetest_map.ini should not exist.\n"); ret = RegDeleteKeyA(mapped_key, ""); ok(!ret, "got error %u\n", ret); @@ -1361,24 +1361,24 @@ static void test_registry_mapping(void) /* Try writing directly to the .ini file on disk instead. */ - ret = WritePrivateProfileStringA("section3", "name1", "value1", "winetest.ini"); + ret = WritePrivateProfileStringA("section3", "name1", "value1", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - check_profile_string("section3", "name1", "winetest.ini", "value1"); + check_profile_string("section3", "name1", "winetest_map.ini", "value1"); ret = RegSetValueExA(mapping_key, "section3", 0, REG_SZ, (BYTE *)"USR:winetest_map", sizeof("USR:winetest_map")); ok(!ret, "got error %u\n", ret); - ret = WritePrivateProfileStringA(NULL, NULL, NULL, "winetest.ini"); + ret = WritePrivateProfileStringA(NULL, NULL, NULL, "winetest_map.ini"); todo_wine ok(ret, "got error %u\n", GetLastError()); - check_profile_string("section3", "name1", "winetest.ini", "default"); + check_profile_string("section3", "name1", "winetest_map.ini", "default"); ret = RegOpenKeyExA(HKEY_CURRENT_USER, "winetest_section3", 0, KEY_READ | KEY_WRITE, &mapped_key); ok(ret == ERROR_FILE_NOT_FOUND, "got error %u\n", ret); - ret = WritePrivateProfileStringA("section3", "name1", "value2", "winetest.ini"); + ret = WritePrivateProfileStringA("section3", "name1", "value2", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - check_profile_string("section3", "name1", "winetest.ini", "value2"); + check_profile_string("section3", "name1", "winetest_map.ini", "value2"); ret = RegOpenKeyExA(HKEY_CURRENT_USER, "winetest_map", 0, KEY_READ | KEY_WRITE, &mapped_key); ok(!ret, "got error %u\n", ret); @@ -1389,30 +1389,30 @@ static void test_registry_mapping(void) ret = RegDeleteValueA(mapping_key, "section3"); ok(!ret, "got error %u\n", ret); - ret = WritePrivateProfileStringA(NULL, NULL, NULL, "winetest.ini"); + ret = WritePrivateProfileStringA(NULL, NULL, NULL, "winetest_map.ini"); todo_wine ok(ret, "got error %u\n", GetLastError()); - check_profile_string("section3", "name1", "winetest.ini", "value1"); + check_profile_string("section3", "name1", "winetest_map.ini", "value1"); - ret = DeleteFileA("C:/windows/winetest.ini"); + ret = DeleteFileA("C:/windows/winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); /* Test default keys. */ - ret = WritePrivateProfileStringA("section4", "name1", "value1", "winetest.ini"); + ret = WritePrivateProfileStringA("section4", "name1", "value1", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - check_profile_string("section4", "name1", "winetest.ini", "value1"); + check_profile_string("section4", "name1", "winetest_map.ini", "value1"); - ret = DeleteFileA("C:/windows/winetest.ini"); + ret = DeleteFileA("C:/windows/winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); ret = RegSetValueExA(mapping_key, NULL, 0, REG_SZ, (BYTE *)"SYS:winetest_default", sizeof("SYS:winetest_default")); ok(!ret, "got error %u\n", ret); - ret = WritePrivateProfileStringA(NULL, NULL, NULL, "winetest.ini"); + ret = WritePrivateProfileStringA(NULL, NULL, NULL, "winetest_map.ini"); todo_wine ok(ret, "got error %u\n", GetLastError()); - ret = WritePrivateProfileStringA("section4", "name1", "value1", "winetest.ini"); + ret = WritePrivateProfileStringA("section4", "name1", "value1", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\winetest_default\\section4", 0, KEY_READ, &mapped_key); @@ -1427,10 +1427,10 @@ static void test_registry_mapping(void) ok(!ret, "got error %u\n", ret); RegCloseKey(mapped_key); - check_profile_string("section5", "name2", "winetest.ini", "value2"); + check_profile_string("section5", "name2", "winetest_map.ini", "value2"); - ret = GetFileAttributesA("C:/windows/winetest.ini"); - ok(ret == INVALID_FILE_ATTRIBUTES, "winetest.ini should not exist.\n"); + ret = GetFileAttributesA("C:/windows/winetest_map.ini"); + ok(ret == INVALID_FILE_ATTRIBUTES, "winetest_map.ini should not exist.\n"); ret = RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\winetest_default\\Section4"); ret = RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\winetest_default\\Section5"); @@ -1447,12 +1447,12 @@ static void test_registry_mapping(void) ok(!ret, "got error %u\n", ret); ret = RegSetValueExA(mapping_subkey, "name2", 0, REG_SZ, (BYTE *)"SYS:winetest_name2", sizeof("SYS:winetest_name2")); ok(!ret, "got error %u\n", ret); - ret = WritePrivateProfileStringA(NULL, NULL, NULL, "winetest.ini"); + ret = WritePrivateProfileStringA(NULL, NULL, NULL, "winetest_map.ini"); todo_wine ok(ret, "got error %u\n", GetLastError()); - ret = WritePrivateProfileStringA("section6", "name1", "value1", "winetest.ini"); + ret = WritePrivateProfileStringA("section6", "name1", "value1", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - check_profile_string("section6", "name1", "winetest.ini", "value1"); + check_profile_string("section6", "name1", "winetest_map.ini", "value1"); ret = RegOpenKeyExA(HKEY_CURRENT_USER, "winetest_name1", 0, KEY_READ | KEY_WRITE, &mapped_key); ok(!ret, "got error %u\n", ret); @@ -1460,13 +1460,13 @@ static void test_registry_mapping(void) ret = RegSetValueExA(mapped_key, "name1", 0, REG_SZ, (BYTE *)"one", sizeof("one")); ok(!ret, "got error %u\n", ret); - check_profile_string("section6", "name1", "winetest.ini", "one"); + check_profile_string("section6", "name1", "winetest_map.ini", "one"); ret = RegDeleteKeyA(mapped_key, ""); ok(!ret, "got error %u\n", ret); RegCloseKey(mapped_key); - ret = WritePrivateProfileStringA("section6", "name2", "value2", "winetest.ini"); + ret = WritePrivateProfileStringA("section6", "name2", "value2", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\winetest_name2", 0, KEY_READ | KEY_WRITE, &mapped_key); @@ -1475,31 +1475,31 @@ static void test_registry_mapping(void) ret = RegSetValueExA(mapped_key, "name2", 0, REG_SZ, (BYTE *)"two", sizeof("two")); ok(!ret, "got error %u\n", ret); - check_profile_string("section6", "name2", "winetest.ini", "two"); + check_profile_string("section6", "name2", "winetest_map.ini", "two"); ret = RegDeleteKeyA(mapped_key, ""); ok(!ret, "got error %u\n", ret); RegCloseKey(mapped_key); - ret = WritePrivateProfileStringA("section6", "name3", "value3", "winetest.ini"); + ret = WritePrivateProfileStringA("section6", "name3", "value3", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - check_profile_string("section6", "name3", "winetest.ini", "value3"); - ret = DeleteFileA("C:/windows/winetest.ini"); + check_profile_string("section6", "name3", "winetest_map.ini", "value3"); + ret = DeleteFileA("C:/windows/winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); /* Test name-specific mapping with Get/WritePrivateProfileSection(). */ - ret = WritePrivateProfileStringA("section6", "name2", "value2", "winetest.ini"); + ret = WritePrivateProfileStringA("section6", "name2", "value2", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - ret = WritePrivateProfileStringA("section6", "name3", "value3", "winetest.ini"); + ret = WritePrivateProfileStringA("section6", "name3", "value3", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - ret = WritePrivateProfileSectionA("section6", "name1=one\0name3=three\0", "winetest.ini"); + ret = WritePrivateProfileSectionA("section6", "name1=one\0name3=three\0", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - check_profile_string("section6", "name1", "winetest.ini", "one"); - check_profile_string("section6", "name2", "winetest.ini", "value2"); - check_profile_string("section6", "name3", "winetest.ini", "value3"); + check_profile_string("section6", "name1", "winetest_map.ini", "one"); + check_profile_string("section6", "name2", "winetest_map.ini", "value2"); + check_profile_string("section6", "name3", "winetest_map.ini", "value3"); ret = RegOpenKeyExA(HKEY_CURRENT_USER, "winetest_name1", 0, KEY_READ | KEY_WRITE, &mapped_key); ok(!ret, "got error %u\n", ret); @@ -1508,38 +1508,38 @@ static void test_registry_mapping(void) RegCloseKey(mapped_key); memset(buffer, 0xcc, sizeof(buffer)); - ret = GetPrivateProfileSectionA("section6", buffer, 5, "winetest.ini"); + ret = GetPrivateProfileSectionA("section6", buffer, 5, "winetest_map.ini"); ok(ret == 3, "got %u\n", ret); ok(!memcmp(buffer, "nam\0", 5), "got %s\n", debugstr_an(buffer, ret)); memset(buffer, 0xcc, sizeof(buffer)); - ret = GetPrivateProfileSectionA("section6", buffer, sizeof(buffer), "winetest.ini"); + ret = GetPrivateProfileSectionA("section6", buffer, sizeof(buffer), "winetest_map.ini"); ok(ret == 26, "got %u\n", ret); ok(!memcmp(buffer, "name2=value2\0name3=value3\0", 27), "got %s\n", debugstr_an(buffer, ret)); - ret = WritePrivateProfileStringA("section6", NULL, NULL, "winetest.ini"); + ret = WritePrivateProfileStringA("section6", NULL, NULL, "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - check_profile_string("section6", "name1", "winetest.ini", "default"); - check_profile_string("section6", "name2", "winetest.ini", "default"); - check_profile_string("section6", "name3", "winetest.ini", "default"); + check_profile_string("section6", "name1", "winetest_map.ini", "default"); + check_profile_string("section6", "name2", "winetest_map.ini", "default"); + check_profile_string("section6", "name3", "winetest_map.ini", "default"); ret = RegDeleteKeyA(HKEY_CURRENT_USER, "winetest_name1"); ok(!ret, "got error %u\n", ret); ret = RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\winetest_name2"); ok(!ret, "got error %u\n", ret); - ret = DeleteFileA("C:/windows/winetest.ini"); + ret = DeleteFileA("C:/windows/winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); /* Test name-specific mapping with a default value. */ ret = RegSetValueExA(mapping_subkey, NULL, 0, REG_SZ, (BYTE *)"USR:winetest_default", sizeof("USR:winetest_default")); ok(!ret, "got error %u\n", ret); - ret = WritePrivateProfileStringA(NULL, NULL, NULL, "winetest.ini"); + ret = WritePrivateProfileStringA(NULL, NULL, NULL, "winetest_map.ini"); todo_wine ok(ret, "got error %u\n", GetLastError()); - ret = WritePrivateProfileStringA("section6", "name2", "value2", "winetest.ini"); + ret = WritePrivateProfileStringA("section6", "name2", "value2", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - ret = WritePrivateProfileStringA("section6", "name3", "value3", "winetest.ini"); + ret = WritePrivateProfileStringA("section6", "name3", "value3", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); ret = RegOpenKeyExA(HKEY_CURRENT_USER, "winetest_default", 0, KEY_READ | KEY_WRITE, &mapped_key); @@ -1548,22 +1548,22 @@ static void test_registry_mapping(void) ret = RegSetValueExA(mapped_key, "name3", 0, REG_SZ, (BYTE *)"three", sizeof("three")); ok(!ret, "got error %u\n", ret); - check_profile_string("section6", "name3", "winetest.ini", "three"); + check_profile_string("section6", "name3", "winetest_map.ini", "three"); memset(buffer, 0xcc, sizeof(buffer)); - ret = GetPrivateProfileSectionA("section6", buffer, sizeof(buffer), "winetest.ini"); + ret = GetPrivateProfileSectionA("section6", buffer, sizeof(buffer), "winetest_map.ini"); ok(ret == 25, "got %u\n", ret); todo_wine ok(!memcmp(buffer, "name2=value2\0name3=three\0", 26), "got %s\n", debugstr_an(buffer, ret)); - ret = WritePrivateProfileSectionA("section6", "name2=duo\0name3=treis\0", "winetest.ini"); + ret = WritePrivateProfileSectionA("section6", "name2=duo\0name3=treis\0", "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - check_profile_string("section6", "name2", "winetest.ini", "duo"); - check_profile_string("section6", "name3", "winetest.ini", "treis"); + check_profile_string("section6", "name2", "winetest_map.ini", "duo"); + check_profile_string("section6", "name3", "winetest_map.ini", "treis"); - ret = WritePrivateProfileStringA("section6", NULL, NULL, "winetest.ini"); + ret = WritePrivateProfileStringA("section6", NULL, NULL, "winetest_map.ini"); ok(ret, "got error %u\n", GetLastError()); - check_profile_string("section6", "name2", "winetest.ini", "default"); - check_profile_string("section6", "name3", "winetest.ini", "default"); + check_profile_string("section6", "name2", "winetest_map.ini", "default"); + check_profile_string("section6", "name3", "winetest_map.ini", "default"); ret = RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\winetest_name2"); ok(!ret, "got error %u\n", ret); @@ -1581,7 +1581,7 @@ static void test_registry_mapping(void) ok(!ret, "got error %u\n", ret); RegCloseKey(mapping_key); - ret = DeleteFileA("C:/windows/winetest.ini"); + ret = DeleteFileA("C:/windows/winetest_map.ini"); ok(!ret, "expected failure\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); ret = RevertToSelf(); -- 2.28.0

2 1

[PATCH] wbemprox: Provide semi-stub implementation for client_security_QueryBlanket().
by Paul Gofman 01 Sep '20

01 Sep '20

Horizon Zero Dawn fails to query system memory size if CoQueryProxyBlanket() fails for wbem services. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/wbemprox/services.c | 20 ++++++++++++++++++-- dlls/wbemprox/tests/query.c | 7 +++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 3a0963e1f6c..ab7146db2d8 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -88,8 +88,24 @@ static HRESULT WINAPI client_security_QueryBlanket( void **pAuthInfo, DWORD *pCapabilities ) { - FIXME("\n"); - return WBEM_E_FAILED; + FIXME("semi-stub.\n"); + + if (pAuthnSvc) + *pAuthnSvc = RPC_C_AUTHN_NONE; + if (pAuthzSvc) + *pAuthzSvc = RPC_C_AUTHZ_NONE; + if (pServerPrincName) + *pServerPrincName = NULL; + if (pAuthnLevel) + *pAuthnLevel = RPC_C_AUTHN_LEVEL_NONE; + if (pImpLevel) + *pImpLevel = RPC_C_IMP_LEVEL_DEFAULT; + if (pAuthInfo) + *pAuthInfo = NULL; + if (pCapabilities) + *pCapabilities = 0; + + return WBEM_NO_ERROR; } static HRESULT WINAPI client_security_SetBlanket( diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 17942cd89ae..74fdfaa9bc8 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1713,6 +1713,7 @@ START_TEST(query) BSTR path = SysAllocString( L"ROOT\\CIMV2" ); IWbemLocator *locator; IWbemServices *services; + DWORD authn_svc; HRESULT hr; CoInitialize( NULL ); @@ -1728,6 +1729,12 @@ START_TEST(query) hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + hr = CoQueryProxyBlanket( (IUnknown *)services, NULL, NULL, NULL, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "failed to query proxy blanket %08x\n", hr ); + + hr = CoQueryProxyBlanket( (IUnknown *)services, &authn_svc, NULL, NULL, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "failed to query proxy blanket %08x\n", hr ); + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); -- 2.26.2

2 1

[PATCH] user32: Always wait for the desktop process to be ready in load_desktop_driver().
by Zhiyi Zhang 01 Sep '20

01 Sep '20

Having a __wine_display_device_guid property in the desktop window only guarantees that the window is created. Explorer.exe still has to finish setting up virtual desktop, display settings etc. load_desktop_driver() needs to make sure that the desktop initialization is done before allowing applications to call user32 driver functions. Otherwise, they might get incorrect data. This race condition became apparent after aadae4d1ea173dfa30e09d6cc816bb174e35f90d, which adds ~100ms to the initialization process. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49762 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/driver.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 6d916c7d65d..abd8a34cceb 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -59,17 +59,14 @@ static BOOL load_desktop_driver( HWND hwnd, HMODULE *module ) DWORD size; WCHAR path[MAX_PATH]; WCHAR key[ARRAY_SIZE(key_pathW) + ARRAY_SIZE(displayW) + 40]; - UINT guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); + UINT guid_atom; USER_CheckNotLock(); strcpy( driver_load_error, "The explorer process failed to start." ); /* default error */ + SendMessageW( hwnd, WM_NULL, 0, 0 ); /* wait for the desktop process to be ready */ - if (!guid_atom) - { - SendMessageW( hwnd, WM_NULL, 0, 0 ); /* wait for the desktop process to be ready */ - guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); - } + guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); memcpy( key, key_pathW, sizeof(key_pathW) ); if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; strcatW( key, displayW ); -- 2.25.1

2 1

[PATCH vkd3d v2 1/5] include: Add basic documentation for vkd3d_types.h.
by Zebediah Figura 01 Sep '20

01 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- .gitignore | 2 + Doxyfile.in | 17 ++ Makefile.am | 2 + configure.ac | 3 + include/vkd3d_types.h | 18 +- m4/ax_prog_doxygen.m4 | 586 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 627 insertions(+), 1 deletion(-) create mode 100644 Doxyfile.in create mode 100644 m4/ax_prog_doxygen.m4 diff --git a/.gitignore b/.gitignore index 72037ddb..51cba319 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ autom4te.cache config.log config.status configure +doc +Doxyfile libtool Makefile Makefile.in diff --git a/Doxyfile.in b/Doxyfile.in new file mode 100644 index 00000000..a20e6f02 --- /dev/null +++ b/Doxyfile.in @@ -0,0 +1,17 @@ +# Doxyfile 1.8.18 + +DOXYFILE_ENCODING = UTF-8 +PROJECT_NAME = @PACKAGE_NAME@ +PROJECT_NUMBER = @PACKAGE_VERSION@ +PROJECT_BRIEF = "The vkd3d 3D Graphics Library" +OUTPUT_DIRECTORY = doc +JAVADOC_AUTOBRIEF = YES +OPTIMIZE_OUTPUT_FOR_C = YES +EXTRACT_STATIC = YES + +INPUT = @srcdir@/include/vkd3d.h \ + @srcdir@/include/vkd3d_shader.h \ + @srcdir@/include/vkd3d_types.h \ + @srcdir@/include/vkd3d_utils.h + +EXCLUDE_SYMBOLS = VKD3D_FORCE_32_BIT_ENUM diff --git a/Makefile.am b/Makefile.am index 58b3174c..b3d3eb63 100644 --- a/Makefile.am +++ b/Makefile.am @@ -167,6 +167,8 @@ demos_triangle_CFLAGS = $(DEMOS_CFLAGS) demos_triangle_LDADD = $(DEMOS_LDADD) endif +@DX_RULES@ + EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers) VKD3D_V_WIDL = $(vkd3d_v_widl_@AM_V@) diff --git a/configure.ac b/configure.ac index ca9d7600..3810fc5d 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,9 @@ AC_PROG_MKDIR_P VKD3D_PROG_WIDL(3, 20) AS_IF([test "x$WIDL" = "xno"], [AC_MSG_WARN([widl is required to build header files.])]) +DX_INIT_DOXYGEN([vkd3d], [Doxyfile], [doc]) +AC_CONFIG_FILES([Doxyfile]) + AM_INIT_AUTOMAKE([1.11 foreign silent-rules subdir-objects no-dist-gzip dist-xz -Wall -Werror]) AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) diff --git a/include/vkd3d_types.h b/include/vkd3d_types.h index 34c66748..020eb240 100644 --- a/include/vkd3d_types.h +++ b/include/vkd3d_types.h @@ -23,15 +23,31 @@ extern "C" { #endif /* __cplusplus */ +/** + * \file vkd3d_types.h + * + * This file contains definitions for basic types used by vkd3d libraries. + */ + #define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff +/** + * Result codes returned by some vkd3d functions. Error codes always have + * negative values; non-error codes never do. + */ enum vkd3d_result { + /** Success. */ VKD3D_OK = 0, - VKD3D_ERROR = -1, /* unspecified failure */ + /** An unspecified failure occurred. */ + VKD3D_ERROR = -1, + /** There are not enough resources available to complete the operation. */ VKD3D_ERROR_OUT_OF_MEMORY = -2, + /** One or more parameters passed to a vkd3d function were invalid. */ VKD3D_ERROR_INVALID_ARGUMENT = -3, + /** A shader passed to a vkd3d function was invalid. */ VKD3D_ERROR_INVALID_SHADER = -4, + /** The operation is not implemented in this version of vkd3d. */ VKD3D_ERROR_NOT_IMPLEMENTED = -5, VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4 new file mode 100644 index 00000000..ed1dc83b --- /dev/null +++ b/m4/ax_prog_doxygen.m4 @@ -0,0 +1,586 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_doxygen.html +# =========================================================================== +# +# SYNOPSIS +# +# DX_INIT_DOXYGEN(PROJECT-NAME, [DOXYFILE-PATH], [OUTPUT-DIR], ...) +# DX_DOXYGEN_FEATURE(ON|OFF) +# DX_DOT_FEATURE(ON|OFF) +# DX_HTML_FEATURE(ON|OFF) +# DX_CHM_FEATURE(ON|OFF) +# DX_CHI_FEATURE(ON|OFF) +# DX_MAN_FEATURE(ON|OFF) +# DX_RTF_FEATURE(ON|OFF) +# DX_XML_FEATURE(ON|OFF) +# DX_PDF_FEATURE(ON|OFF) +# DX_PS_FEATURE(ON|OFF) +# +# DESCRIPTION +# +# The DX_*_FEATURE macros control the default setting for the given +# Doxygen feature. Supported features are 'DOXYGEN' itself, 'DOT' for +# generating graphics, 'HTML' for plain HTML, 'CHM' for compressed HTML +# help (for MS users), 'CHI' for generating a separate .chi file by the +# .chm file, and 'MAN', 'RTF', 'XML', 'PDF' and 'PS' for the appropriate +# output formats. The environment variable DOXYGEN_PAPER_SIZE may be +# specified to override the default 'a4wide' paper size. +# +# By default, HTML, PDF and PS documentation is generated as this seems to +# be the most popular and portable combination. MAN pages created by +# Doxygen are usually problematic, though by picking an appropriate subset +# and doing some massaging they might be better than nothing. CHM and RTF +# are specific for MS (note that you can't generate both HTML and CHM at +# the same time). The XML is rather useless unless you apply specialized +# post-processing to it. +# +# The macros mainly control the default state of the feature. The use can +# override the default by specifying --enable or --disable. The macros +# ensure that contradictory flags are not given (e.g., +# --enable-doxygen-html and --enable-doxygen-chm, +# --enable-doxygen-anything with --disable-doxygen, etc.) Finally, each +# feature will be automatically disabled (with a warning) if the required +# programs are missing. +# +# Once all the feature defaults have been specified, call DX_INIT_DOXYGEN +# with the following parameters: a one-word name for the project for use +# as a filename base etc., an optional configuration file name (the +# default is '$(srcdir)/Doxyfile', the same as Doxygen's default), and an +# optional output directory name (the default is 'doxygen-doc'). To run +# doxygen multiple times for different configuration files and output +# directories provide more parameters: the second, forth, sixth, etc +# parameter are configuration file names and the third, fifth, seventh, +# etc parameter are output directories. No checking is done to catch +# duplicates. +# +# Automake Support +# +# The DX_RULES substitution can be used to add all needed rules to the +# Makefile. Note that this is a substitution without being a variable: +# only the @DX_RULES@ syntax will work. +# +# The provided targets are: +# +# doxygen-doc: Generate all doxygen documentation. +# +# doxygen-run: Run doxygen, which will generate some of the +# documentation (HTML, CHM, CHI, MAN, RTF, XML) +# but will not do the post processing required +# for the rest of it (PS, PDF). +# +# doxygen-ps: Generate doxygen PostScript documentation. +# +# doxygen-pdf: Generate doxygen PDF documentation. +# +# Note that by default these are not integrated into the automake targets. +# If doxygen is used to generate man pages, you can achieve this +# integration by setting man3_MANS to the list of man pages generated and +# then adding the dependency: +# +# $(man3_MANS): doxygen-doc +# +# This will cause make to run doxygen and generate all the documentation. +# +# The following variable is intended for use in Makefile.am: +# +# DX_CLEANFILES = everything to clean. +# +# Then add this variable to MOSTLYCLEANFILES. +# +# LICENSE +# +# Copyright (c) 2009 Oren Ben-Kiki <oren(a)ben-kiki.org> +# Copyright (c) 2015 Olaf Mandel <olaf(a)mandel.name> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 24 + +## ----------## +## Defaults. ## +## ----------## + +DX_ENV="" +AC_DEFUN([DX_FEATURE_doc], ON) +AC_DEFUN([DX_FEATURE_dot], OFF) +AC_DEFUN([DX_FEATURE_man], OFF) +AC_DEFUN([DX_FEATURE_html], ON) +AC_DEFUN([DX_FEATURE_chm], OFF) +AC_DEFUN([DX_FEATURE_chi], OFF) +AC_DEFUN([DX_FEATURE_rtf], OFF) +AC_DEFUN([DX_FEATURE_xml], OFF) +AC_DEFUN([DX_FEATURE_pdf], ON) +AC_DEFUN([DX_FEATURE_ps], ON) + +## --------------- ## +## Private macros. ## +## --------------- ## + +# DX_ENV_APPEND(VARIABLE, VALUE) +# ------------------------------ +# Append VARIABLE="VALUE" to DX_ENV for invoking doxygen and add it +# as a substitution (but not a Makefile variable). The substitution +# is skipped if the variable name is VERSION. +AC_DEFUN([DX_ENV_APPEND], +[AC_SUBST([DX_ENV], ["$DX_ENV $1='$2'"])dnl +m4_if([$1], [VERSION], [], [AC_SUBST([$1], [$2])dnl +AM_SUBST_NOTMAKE([$1])])dnl +]) + +# DX_DIRNAME_EXPR +# --------------- +# Expand into a shell expression prints the directory part of a path. +AC_DEFUN([DX_DIRNAME_EXPR], + [[expr ".$1" : '$\.$[^/]*$' \| "x$1" : 'x$.*$/[^/]*$']]) + +# DX_IF_FEATURE(FEATURE, IF-ON, IF-OFF) +# ------------------------------------- +# Expands according to the M4 (static) status of the feature. +AC_DEFUN([DX_IF_FEATURE], [ifelse(DX_FEATURE_$1, ON, [$2], [$3])]) + +# DX_REQUIRE_PROG(VARIABLE, PROGRAM) +# ---------------------------------- +# Require the specified program to be found for the DX_CURRENT_FEATURE to work. +AC_DEFUN([DX_REQUIRE_PROG], [ +AC_PATH_TOOL([$1], [$2]) +if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then + AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION]) + AC_SUBST(DX_FLAG_[]DX_CURRENT_FEATURE, 0) +fi +]) + +# DX_TEST_FEATURE(FEATURE) +# ------------------------ +# Expand to a shell expression testing whether the feature is active. +AC_DEFUN([DX_TEST_FEATURE], [test "$DX_FLAG_$1" = 1]) + +# DX_CHECK_DEPEND(REQUIRED_FEATURE, REQUIRED_STATE) +# ------------------------------------------------- +# Verify that a required features has the right state before trying to turn on +# the DX_CURRENT_FEATURE. +AC_DEFUN([DX_CHECK_DEPEND], [ +test "$DX_FLAG_$1" = "$2" \ +|| AC_MSG_ERROR([doxygen-DX_CURRENT_FEATURE ifelse([$2], 1, + requires, contradicts) doxygen-$1]) +]) + +# DX_CLEAR_DEPEND(FEATURE, REQUIRED_FEATURE, REQUIRED_STATE) +# ---------------------------------------------------------- +# Turn off the DX_CURRENT_FEATURE if the required feature is off. +AC_DEFUN([DX_CLEAR_DEPEND], [ +test "$DX_FLAG_$1" = "$2" || AC_SUBST(DX_FLAG_[]DX_CURRENT_FEATURE, 0) +]) + +# DX_FEATURE_ARG(FEATURE, DESCRIPTION, +# CHECK_DEPEND, CLEAR_DEPEND, +# REQUIRE, DO-IF-ON, DO-IF-OFF) +# -------------------------------------------- +# Parse the command-line option controlling a feature. CHECK_DEPEND is called +# if the user explicitly turns the feature on (and invokes DX_CHECK_DEPEND), +# otherwise CLEAR_DEPEND is called to turn off the default state if a required +# feature is disabled (using DX_CLEAR_DEPEND). REQUIRE performs additional +# requirement tests (DX_REQUIRE_PROG). Finally, an automake flag is set and +# DO-IF-ON or DO-IF-OFF are called according to the final state of the feature. +AC_DEFUN([DX_ARG_ABLE], [ + AC_DEFUN([DX_CURRENT_FEATURE], [$1]) + AC_DEFUN([DX_CURRENT_DESCRIPTION], [$2]) + AC_ARG_ENABLE(doxygen-$1, + [AS_HELP_STRING(DX_IF_FEATURE([$1], [--disable-doxygen-$1], + [--enable-doxygen-$1]), + DX_IF_FEATURE([$1], [don't $2], [$2]))], + [ +case "$enableval" in +#( +y|Y|yes|Yes|YES) + AC_SUBST([DX_FLAG_$1], 1) + $3 +;; #( +n|N|no|No|NO) + AC_SUBST([DX_FLAG_$1], 0) +;; #( +*) + AC_MSG_ERROR([invalid value '$enableval' given to doxygen-$1]) +;; +esac +], [ +AC_SUBST([DX_FLAG_$1], [DX_IF_FEATURE([$1], 1, 0)]) +$4 +]) +if DX_TEST_FEATURE([$1]); then + $5 + : +fi +if DX_TEST_FEATURE([$1]); then + $6 + : +else + $7 + : +fi +]) + +## -------------- ## +## Public macros. ## +## -------------- ## + +# DX_XXX_FEATURE(DEFAULT_STATE) +# ----------------------------- +AC_DEFUN([DX_DOXYGEN_FEATURE], [AC_DEFUN([DX_FEATURE_doc], [$1])]) +AC_DEFUN([DX_DOT_FEATURE], [AC_DEFUN([DX_FEATURE_dot], [$1])]) +AC_DEFUN([DX_MAN_FEATURE], [AC_DEFUN([DX_FEATURE_man], [$1])]) +AC_DEFUN([DX_HTML_FEATURE], [AC_DEFUN([DX_FEATURE_html], [$1])]) +AC_DEFUN([DX_CHM_FEATURE], [AC_DEFUN([DX_FEATURE_chm], [$1])]) +AC_DEFUN([DX_CHI_FEATURE], [AC_DEFUN([DX_FEATURE_chi], [$1])]) +AC_DEFUN([DX_RTF_FEATURE], [AC_DEFUN([DX_FEATURE_rtf], [$1])]) +AC_DEFUN([DX_XML_FEATURE], [AC_DEFUN([DX_FEATURE_xml], [$1])]) +AC_DEFUN([DX_XML_FEATURE], [AC_DEFUN([DX_FEATURE_xml], [$1])]) +AC_DEFUN([DX_PDF_FEATURE], [AC_DEFUN([DX_FEATURE_pdf], [$1])]) +AC_DEFUN([DX_PS_FEATURE], [AC_DEFUN([DX_FEATURE_ps], [$1])]) + +# DX_INIT_DOXYGEN(PROJECT, [CONFIG-FILE], [OUTPUT-DOC-DIR], ...) +# -------------------------------------------------------------- +# PROJECT also serves as the base name for the documentation files. +# The default CONFIG-FILE is "$(srcdir)/Doxyfile" and OUTPUT-DOC-DIR is +# "doxygen-doc". +# More arguments are interpreted as interleaved CONFIG-FILE and +# OUTPUT-DOC-DIR values. +AC_DEFUN([DX_INIT_DOXYGEN], [ + +# Files: +AC_SUBST([DX_PROJECT], [$1]) +AC_SUBST([DX_CONFIG], ['ifelse([$2], [], [$(srcdir)/Doxyfile], [$2])']) +AC_SUBST([DX_DOCDIR], ['ifelse([$3], [], [doxygen-doc], [$3])']) +m4_if(m4_eval(3 < m4_count($@)), 1, [m4_for([DX_i], 4, m4_count($@), 2, + [AC_SUBST([DX_CONFIG]m4_eval(DX_i[/2]), + 'm4_default_nblank_quoted(m4_argn(DX_i, $@), + [$(srcdir)/Doxyfile])')])])dnl +m4_if(m4_eval(3 < m4_count($@)), 1, [m4_for([DX_i], 5, m4_count($@,), 2, + [AC_SUBST([DX_DOCDIR]m4_eval([(]DX_i[-1)/2]), + 'm4_default_nblank_quoted(m4_argn(DX_i, $@), + [doxygen-doc])')])])dnl +m4_define([DX_loop], m4_dquote(m4_if(m4_eval(3 < m4_count($@)), 1, + [m4_for([DX_i], 4, m4_count($@), 2, [, m4_eval(DX_i[/2])])], + [])))dnl + +# Environment variables used inside doxygen.cfg: +DX_ENV_APPEND(SRCDIR, $srcdir) +DX_ENV_APPEND(PROJECT, $DX_PROJECT) +DX_ENV_APPEND(VERSION, $PACKAGE_VERSION) + +# Doxygen itself: +DX_ARG_ABLE(doc, [generate any doxygen documentation], + [], + [], + [DX_REQUIRE_PROG([DX_DOXYGEN], doxygen) + DX_REQUIRE_PROG([DX_PERL], perl)], + [DX_ENV_APPEND(PERL_PATH, $DX_PERL)]) + +# Dot for graphics: +DX_ARG_ABLE(dot, [generate graphics for doxygen documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_DOT], dot)], + [DX_ENV_APPEND(HAVE_DOT, YES) + DX_ENV_APPEND(DOT_PATH, [`DX_DIRNAME_EXPR($DX_DOT)`])], + [DX_ENV_APPEND(HAVE_DOT, NO)]) + +# Man pages generation: +DX_ARG_ABLE(man, [generate doxygen manual pages], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [], + [DX_ENV_APPEND(GENERATE_MAN, YES)], + [DX_ENV_APPEND(GENERATE_MAN, NO)]) + +# RTF file generation: +DX_ARG_ABLE(rtf, [generate doxygen RTF documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [], + [DX_ENV_APPEND(GENERATE_RTF, YES)], + [DX_ENV_APPEND(GENERATE_RTF, NO)]) + +# XML file generation: +DX_ARG_ABLE(xml, [generate doxygen XML documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [], + [DX_ENV_APPEND(GENERATE_XML, YES)], + [DX_ENV_APPEND(GENERATE_XML, NO)]) + +# (Compressed) HTML help generation: +DX_ARG_ABLE(chm, [generate doxygen compressed HTML help documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_HHC], hhc)], + [DX_ENV_APPEND(HHC_PATH, $DX_HHC) + DX_ENV_APPEND(GENERATE_HTML, YES) + DX_ENV_APPEND(GENERATE_HTMLHELP, YES)], + [DX_ENV_APPEND(GENERATE_HTMLHELP, NO)]) + +# Separate CHI file generation. +DX_ARG_ABLE(chi, [generate doxygen separate compressed HTML help index file], + [DX_CHECK_DEPEND(chm, 1)], + [DX_CLEAR_DEPEND(chm, 1)], + [], + [DX_ENV_APPEND(GENERATE_CHI, YES)], + [DX_ENV_APPEND(GENERATE_CHI, NO)]) + +# Plain HTML pages generation: +DX_ARG_ABLE(html, [generate doxygen plain HTML documentation], + [DX_CHECK_DEPEND(doc, 1) DX_CHECK_DEPEND(chm, 0)], + [DX_CLEAR_DEPEND(doc, 1) DX_CLEAR_DEPEND(chm, 0)], + [], + [DX_ENV_APPEND(GENERATE_HTML, YES)], + [DX_TEST_FEATURE(chm) || DX_ENV_APPEND(GENERATE_HTML, NO)]) + +# PostScript file generation: +DX_ARG_ABLE(ps, [generate doxygen PostScript documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_LATEX], latex) + DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex) + DX_REQUIRE_PROG([DX_DVIPS], dvips) + DX_REQUIRE_PROG([DX_EGREP], egrep)]) + +# PDF file generation: +DX_ARG_ABLE(pdf, [generate doxygen PDF documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_PDFLATEX], pdflatex) + DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex) + DX_REQUIRE_PROG([DX_EGREP], egrep)]) + +# LaTeX generation for PS and/or PDF: +if DX_TEST_FEATURE(ps) || DX_TEST_FEATURE(pdf); then + DX_ENV_APPEND(GENERATE_LATEX, YES) +else + DX_ENV_APPEND(GENERATE_LATEX, NO) +fi + +# Paper size for PS and/or PDF: +AC_ARG_VAR(DOXYGEN_PAPER_SIZE, + [a4wide (default), a4, letter, legal or executive]) +case "$DOXYGEN_PAPER_SIZE" in +#( +"") + AC_SUBST(DOXYGEN_PAPER_SIZE, "") +;; #( +a4wide|a4|letter|legal|executive) + DX_ENV_APPEND(PAPER_SIZE, $DOXYGEN_PAPER_SIZE) +;; #( +*) + AC_MSG_ERROR([unknown DOXYGEN_PAPER_SIZE='$DOXYGEN_PAPER_SIZE']) +;; +esac + +# Rules: +AS_IF([[test $DX_FLAG_html -eq 1]], +[[DX_SNIPPET_html="## ------------------------------- ## +## Rules specific for HTML output. ## +## ------------------------------- ## + +DX_CLEAN_HTML = \$(DX_DOCDIR)/html]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/html]])[ + +"]], +[[DX_SNIPPET_html=""]]) +AS_IF([[test $DX_FLAG_chi -eq 1]], +[[DX_SNIPPET_chi=" +DX_CLEAN_CHI = \$(DX_DOCDIR)/\$(PACKAGE).chi]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).chi]])["]], +[[DX_SNIPPET_chi=""]]) +AS_IF([[test $DX_FLAG_chm -eq 1]], +[[DX_SNIPPET_chm="## ------------------------------ ## +## Rules specific for CHM output. ## +## ------------------------------ ## + +DX_CLEAN_CHM = \$(DX_DOCDIR)/chm]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/chm]])[\ +${DX_SNIPPET_chi} + +"]], +[[DX_SNIPPET_chm=""]]) +AS_IF([[test $DX_FLAG_man -eq 1]], +[[DX_SNIPPET_man="## ------------------------------ ## +## Rules specific for MAN output. ## +## ------------------------------ ## + +DX_CLEAN_MAN = \$(DX_DOCDIR)/man]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/man]])[ + +"]], +[[DX_SNIPPET_man=""]]) +AS_IF([[test $DX_FLAG_rtf -eq 1]], +[[DX_SNIPPET_rtf="## ------------------------------ ## +## Rules specific for RTF output. ## +## ------------------------------ ## + +DX_CLEAN_RTF = \$(DX_DOCDIR)/rtf]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/rtf]])[ + +"]], +[[DX_SNIPPET_rtf=""]]) +AS_IF([[test $DX_FLAG_xml -eq 1]], +[[DX_SNIPPET_xml="## ------------------------------ ## +## Rules specific for XML output. ## +## ------------------------------ ## + +DX_CLEAN_XML = \$(DX_DOCDIR)/xml]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/xml]])[ + +"]], +[[DX_SNIPPET_xml=""]]) +AS_IF([[test $DX_FLAG_ps -eq 1]], +[[DX_SNIPPET_ps="## ----------------------------- ## +## Rules specific for PS output. ## +## ----------------------------- ## + +DX_CLEAN_PS = \$(DX_DOCDIR)/\$(PACKAGE).ps]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).ps]])[ + +DX_PS_GOAL = doxygen-ps + +doxygen-ps: \$(DX_CLEAN_PS) + +]m4_foreach([DX_i], [DX_loop], +[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).ps: \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag + \$(DX_V_LATEX)cd \$(DX_DOCDIR]DX_i[)/latex; \\ + rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \\ + \$(DX_LATEX) refman.tex; \\ + \$(DX_MAKEINDEX) refman.idx; \\ + \$(DX_LATEX) refman.tex; \\ + countdown=5; \\ + while \$(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \\ + refman.log > /dev/null 2>&1 \\ + && test \$\$countdown -gt 0; do \\ + \$(DX_LATEX) refman.tex; \\ + countdown=\`expr \$\$countdown - 1\`; \\ + done; \\ + \$(DX_DVIPS) -o ../\$(PACKAGE).ps refman.dvi + +]])["]], +[[DX_SNIPPET_ps=""]]) +AS_IF([[test $DX_FLAG_pdf -eq 1]], +[[DX_SNIPPET_pdf="## ------------------------------ ## +## Rules specific for PDF output. ## +## ------------------------------ ## + +DX_CLEAN_PDF = \$(DX_DOCDIR)/\$(PACKAGE).pdf]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).pdf]])[ + +DX_PDF_GOAL = doxygen-pdf + +doxygen-pdf: \$(DX_CLEAN_PDF) + +]m4_foreach([DX_i], [DX_loop], +[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).pdf: \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag + \$(DX_V_LATEX)cd \$(DX_DOCDIR]DX_i[)/latex; \\ + rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \\ + \$(DX_PDFLATEX) refman.tex; \\ + \$(DX_MAKEINDEX) refman.idx; \\ + \$(DX_PDFLATEX) refman.tex; \\ + countdown=5; \\ + while \$(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \\ + refman.log > /dev/null 2>&1 \\ + && test \$\$countdown -gt 0; do \\ + \$(DX_PDFLATEX) refman.tex; \\ + countdown=\`expr \$\$countdown - 1\`; \\ + done; \\ + mv refman.pdf ../\$(PACKAGE).pdf + +]])["]], +[[DX_SNIPPET_pdf=""]]) +AS_IF([[test $DX_FLAG_ps -eq 1 -o $DX_FLAG_pdf -eq 1]], +[[DX_SNIPPET_latex="## ------------------------------------------------- ## +## Rules specific for LaTeX (shared for PS and PDF). ## +## ------------------------------------------------- ## + +DX_V_LATEX = \$(_DX_v_LATEX_\$(V)) +_DX_v_LATEX_ = \$(_DX_v_LATEX_\$(AM_DEFAULT_VERBOSITY)) +_DX_v_LATEX_0 = @echo \" LATEX \" \$][@; + +DX_CLEAN_LATEX = \$(DX_DOCDIR)/latex]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/latex]])[ + +"]], +[[DX_SNIPPET_latex=""]]) + +AS_IF([[test $DX_FLAG_doc -eq 1]], +[[DX_SNIPPET_doc="## --------------------------------- ## +## Format-independent Doxygen rules. ## +## --------------------------------- ## + +${DX_SNIPPET_html}\ +${DX_SNIPPET_chm}\ +${DX_SNIPPET_man}\ +${DX_SNIPPET_rtf}\ +${DX_SNIPPET_xml}\ +${DX_SNIPPET_ps}\ +${DX_SNIPPET_pdf}\ +${DX_SNIPPET_latex}\ +DX_V_DXGEN = \$(_DX_v_DXGEN_\$(V)) +_DX_v_DXGEN_ = \$(_DX_v_DXGEN_\$(AM_DEFAULT_VERBOSITY)) +_DX_v_DXGEN_0 = @echo \" DXGEN \" \$<; + +.PHONY: doxygen-run doxygen-doc \$(DX_PS_GOAL) \$(DX_PDF_GOAL) + +.INTERMEDIATE: doxygen-run \$(DX_PS_GOAL) \$(DX_PDF_GOAL) + +doxygen-run:]m4_foreach([DX_i], [DX_loop], + [[ \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag]])[ + +doxygen-doc: doxygen-run \$(DX_PS_GOAL) \$(DX_PDF_GOAL) + +]m4_foreach([DX_i], [DX_loop], +[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag: \$(DX_CONFIG]DX_i[) \$(pkginclude_HEADERS) + \$(A""M_V_at)rm -rf \$(DX_DOCDIR]DX_i[) + \$(DX_V_DXGEN)\$(DX_ENV) DOCDIR=\$(DX_DOCDIR]DX_i[) \$(DX_DOXYGEN) \$(DX_CONFIG]DX_i[) + \$(A""M_V_at)echo Timestamp >\$][@ + +]])dnl +[DX_CLEANFILES = \\] +m4_foreach([DX_i], [DX_loop], +[[ \$(DX_DOCDIR]DX_i[)/doxygen_sqlite3.db \\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag \\ +]])dnl +[ -r \\ + \$(DX_CLEAN_HTML) \\ + \$(DX_CLEAN_CHM) \\ + \$(DX_CLEAN_CHI) \\ + \$(DX_CLEAN_MAN) \\ + \$(DX_CLEAN_RTF) \\ + \$(DX_CLEAN_XML) \\ + \$(DX_CLEAN_PS) \\ + \$(DX_CLEAN_PDF) \\ + \$(DX_CLEAN_LATEX)"]], +[[DX_SNIPPET_doc=""]]) +AC_SUBST([DX_RULES], +["${DX_SNIPPET_doc}"])dnl +AM_SUBST_NOTMAKE([DX_RULES]) + +#For debugging: +#echo DX_FLAG_doc=$DX_FLAG_doc +#echo DX_FLAG_dot=$DX_FLAG_dot +#echo DX_FLAG_man=$DX_FLAG_man +#echo DX_FLAG_html=$DX_FLAG_html +#echo DX_FLAG_chm=$DX_FLAG_chm +#echo DX_FLAG_chi=$DX_FLAG_chi +#echo DX_FLAG_rtf=$DX_FLAG_rtf +#echo DX_FLAG_xml=$DX_FLAG_xml +#echo DX_FLAG_pdf=$DX_FLAG_pdf +#echo DX_FLAG_ps=$DX_FLAG_ps +#echo DX_ENV=$DX_ENV +]) -- 2.28.0

3 7

[PATCH] kernel32/tests: Pass the correct size for PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE.
by Zebediah Figura 31 Aug '20

31 Aug '20

Fixes test failures on 64-bit Wine and Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b794c8f0c09..b2441019e34 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3887,7 +3887,7 @@ static void test_ProcThreadAttributeList(void) expect_list.count++; } - ret = pUpdateProcThreadAttribute(&list, 0, PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE, handles, sizeof(PROCESSOR_NUMBER), NULL, NULL); + ret = pUpdateProcThreadAttribute(&list, 0, PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE, handles, sizeof(handles[0]), NULL, NULL); ok(ret || broken(GetLastError() == ERROR_NOT_SUPPORTED), "got %d gle %d\n", ret, GetLastError()); if (ret) -- 2.28.0

1 0

[PATCH 2/2] winecfg: Add /v parameter to display current Windows version.
by Owen Rudge 31 Aug '20

31 Aug '20

This patch allows winecfg to be called with the "/v" parameter to display the current Windows version. "/v winver" will continue to allow the Windows version to be updated. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49242 Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- programs/winecfg/appdefaults.c | 24 +++++++++++++++++++++++- programs/winecfg/main.c | 9 +++++++-- programs/winecfg/winecfg.h | 1 + 3 files changed, 31 insertions(+), 3 deletions(-)

1 0

[PATCH 1/2] winecfg: Ensure registry key is initialised before updating Windows version.
by Owen Rudge 31 Aug '20

31 Aug '20

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- programs/winecfg/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH] ntdll: Clear CONTEXT_XSTATE flag in RtlUnwindEx().
by Paul Gofman 31 Aug '20

31 Aug '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49749 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The unwind handler which is called from Windows clr.dll which after processing ACCESS_VIOLATION exception sets the CONTEXT_XSTATE flag in unwind context (probably just copis the original exception context at some moment which has this flag since 16ed88a95234d844fee9fc19053c5c7f618f92ba). Meanwhile the CONTEXT_EX structure is garbage. The consequet NtSetContextThread() is crashing trying to restore xstate from invalid location. dlls/ntdll/signal_x86_64.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ba91cc13dfe..6fbb612825b 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1244,7 +1244,9 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec { ULONG64 frame; - *context = new_context = *dispatch.ContextRecord; + new_context = *dispatch.ContextRecord; + new_context.ContextFlags &= ~0x40; + *context = new_context; dispatch.ContextRecord = context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, @@ -1267,7 +1269,9 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec teb_frame = __wine_pop_frame( teb_frame ); - *context = new_context = *dispatch.ContextRecord; + new_context = *dispatch.ContextRecord; + new_context.ContextFlags &= ~0x40; + *context = new_context; dispatch.ContextRecord = context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, -- 2.26.2

2 1

ReactOS regression inrpcrt4
by Fabian Maurer 31 Aug '20

31 Aug '20

Hello Zebediah, starting with commit https://github.com/wine-mirror/wine/commit/9271efc0c746 there's a lot of log spam in ReactOS: "RpcBindingFree returned 0x6a6" So far I couldn't reproduce the error in Wine though. I'm attaching a proposed patch that fixes the issue. Could you please take a look on whether the attached patch would be suitable for inclusion into Wine, or whether that problem points to another underlying issue? Regards, Fabian Maurer

2 1

[PATCH 2/2] kernel32/tests: Remove registry entry left out during test.
by Carlos Rivera 31 Aug '20

31 Aug '20

At least in some Windows the previous invokation to WritePrivateProfileStringA("section6", NULL, NULL, "winetest.ini") creates the entry HKEY_CURRENT_USER/winetest_name1. It seems that the IniFileMapping is cached somewhere, even if it has been removed from the registry. Signed-off-by: Carlos Rivera <carlos(a)superkaos.org> --- dlls/kernel32/tests/profile.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index c077f8b35b..5f1f4f0fe7 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -1567,6 +1567,8 @@ static void test_registry_mapping(void) ret = RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\winetest_name2"); ok(!ret, "got error %u\n", ret); + ret = RegDeleteKeyA(HKEY_CURRENT_USER, "winetest_name1"); + ok(!ret, "got error %u\n", ret); ret = RegDeleteKeyA(mapped_key, ""); ok(!ret, "got error %u\n", ret); RegCloseKey(mapped_key); -- 2.28.0

3 2

[PATCH 1/2] kernel32/tests: Use debugstr_an to show contents of buffer.
by Carlos Rivera 31 Aug '20

31 Aug '20

In the tests modified the buffer to show is expected to contain strings separated by \0. So that passing the buffer to the ok macro will only print the first string. Showing the whole returned buffer gives more information when the test fails. Signed-off-by: Carlos Rivera <carlos(a)superkaos.org> --- dlls/kernel32/tests/profile.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 2fba26542f..c077f8b35b 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -591,8 +591,10 @@ static void test_GetPrivateProfileString(const char *content, const char *descri buf, MAX_PATH, filename); ok(ret == 18, "Expected 18, got %d\n", ret); len = lstrlenA("section1") + sizeof(CHAR) + lstrlenA("section2") + 2 * sizeof(CHAR); - ok(!memcmp(buf, "section1\0section2\0\0", len), - "Expected \"section1\\0section2\\0\\0\", got \"%s\"\n", buf); + + ok(!memcmp(buf, "section1\0section2\0", len), + "Expected \"section1\\x00section2\\x00\\x00\", got %s\n", + debugstr_an(buf, (ret + 2 >= MAX_PATH ? MAX_PATH : ret + 1))); /* lpAppName is empty */ memset(buf, 0xc, sizeof(buf)); @@ -667,7 +669,8 @@ static void test_GetPrivateProfileString(const char *content, const char *descri buf, MAX_PATH, filename); ok(ret == 18, "Expected 18, got %d\n", ret); ok(!memcmp(buf, "name1\0name2\0name4\0", ret + 1), - "Expected \"name1\\0name2\\0name4\\0\", got \"%s\"\n", buf); + "Expected \"name1\\x00name2\\x00name4\\x00\\x00\", got %s\n", + debugstr_an(buf, (ret + 2 >= MAX_PATH ? MAX_PATH : ret + 1))); /* lpKeyName is empty */ memset(buf, 0xc,sizeof(buf)); @@ -794,8 +797,9 @@ static void test_GetPrivateProfileString(const char *content, const char *descri ok(ret == 14, "Expected 14, got %d\n", ret); len = lstrlenA("section1") + 2 * sizeof(CHAR); todo_wine - ok(!memcmp(buf, "section1\0secti\0\0", ret + 2), - "Expected \"section1\\0secti\\0\\0\", got \"%s\"\n", buf); + ok(!memcmp(buf, "section1\0secti\0", ret + 2), + "Expected \"section1\\x00secti\\x00\\x00\", got %s\n", + debugstr_an(buf, (ret + 2 >= 16 ? 16 : ret + 1))); /* lpKeyName is NULL, not enough room for final key name */ memset(buf, 0xc,sizeof(buf)); @@ -804,8 +808,9 @@ static void test_GetPrivateProfileString(const char *content, const char *descri buf, 16, filename); ok(ret == 14, "Expected 14, got %d\n", ret); todo_wine - ok(!memcmp(buf, "name1\0name2\0na\0\0", ret + 2), - "Expected \"name1\\0name2\\0na\\0\\0\", got \"%s\"\n", buf); + ok(!memcmp(buf, "name1\0name2\0na\0", ret + 2), + "Expected \"name1\\x00name2\\x00na\\x00\\x00\", got %s\n", + debugstr_an(buf, (ret + 2 >= 16 ? 16 : ret + 1))); /* key value has quotation marks which are stripped */ memset(buf, 0xc,sizeof(buf)); -- 2.28.0

3 2

[PATCH v2] winmm: Pass a fullpath to CreateFileA
by Alistair Leslie-Hughes 31 Aug '20

31 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winmm/mmio.c | 18 +++++++++++++++++- dlls/winmm/tests/mmio.c | 9 +++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 48bbd3ed48..a3e2650f50 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -52,6 +52,9 @@ static WINE_MMIO *MMIOList; static HANDLE create_file_OF( LPCSTR path, INT mode ) { DWORD access, sharing, creation; + HANDLE ret; + char *fullpath = NULL; + DWORD len; if (mode & OF_CREATE) { @@ -79,7 +82,20 @@ static HANDLE create_file_OF( LPCSTR path, INT mode ) case OF_SHARE_COMPAT: default: sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; } - return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + len = SearchPathA( NULL, path, NULL, 0, fullpath, NULL ); + if (!len) + return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + fullpath = HeapAlloc(GetProcessHeap(), 0, len); + if (!fullpath) + return INVALID_HANDLE_VALUE; + + SearchPathA( NULL, path, NULL, len, fullpath, NULL ); + ret = CreateFileA( fullpath, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + HeapFree(GetProcessHeap(), 0, fullpath); + return ret; } /************************************************************************** diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index e3984fbaf3..0de51a2562 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -478,6 +478,7 @@ static void test_mmioOpen_create(void) WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; /* According to docs, filename must be no more than 128 bytes, but it will * actually allow longer than that. */ + WCHAR relpath[] = L"local\\examplefile"; WCHAR filename[] = L"very_long_filename_" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" @@ -520,6 +521,14 @@ static void test_mmioOpen_create(void) DeleteFileW(filename); + CreateDirectoryA("local", NULL); + hmmio = mmioOpenW(relpath, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); + ok(hmmio != NULL, "mmioOpen failed\n"); + mmioClose(hmmio, 0); + + DeleteFileW(relpath); + RemoveDirectoryA("local"); + SetCurrentDirectoryW(cwd); } -- 2.28.0

3 2

[v2 PATCH] server: Implement inherited handles list.
by Nikolay Sivov 31 Aug '20

31 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Version 2 does not abuse startup info structure to pass handles, adds tracing for new request data, along with other minor improvements. dlls/ntdll/unix/process.c | 39 ++++++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 5 +++-- server/handle.c | 38 +++++++++++++++++++++++++-------- server/handle.h | 3 ++- server/process.c | 27 +++++++++++++++++------ server/process.h | 3 ++- server/protocol.def | 2 ++ server/request.c | 2 +- server/request.h | 1 + server/trace.c | 2 ++ 10 files changed, 102 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 6b41080ceeb..f31a10459ea 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -774,6 +774,28 @@ done: return status; } +static NTSTATUS alloc_handle_list( const PS_ATTRIBUTE *handles_attr, obj_handle_t **handles, data_size_t *handles_len ) +{ + SIZE_T count, i; + HANDLE *src; + + *handles = NULL; + *handles_len = 0; + + if (!handles_attr) return STATUS_SUCCESS; + + count = handles_attr->Size / sizeof(HANDLE); + + if (!(*handles = calloc( sizeof(**handles), count ))) return STATUS_NO_MEMORY; + + src = handles_attr->ValuePtr; + for (i = 0; i < count; ++i) + (*handles)[i] = wine_server_obj_handle( src[i] ); + + *handles_len = count * sizeof(**handles); + + return STATUS_SUCCESS; +} /********************************************************************** * NtCreateUserProcess (NTDLL.@) @@ -799,6 +821,9 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ HANDLE parent = 0, debug = 0, token = 0; UNICODE_STRING path = {0}; SIZE_T i, attr_count = (attr->TotalLength - sizeof(attr->TotalLength)) / sizeof(PS_ATTRIBUTE); + const PS_ATTRIBUTE *handles_attr = NULL; + data_size_t handles_size; + obj_handle_t *handles; for (i = 0; i < attr_count; i++) { @@ -817,6 +842,10 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ case PS_ATTRIBUTE_TOKEN: token = attr->Attributes[i].ValuePtr; break; + case PS_ATTRIBUTE_HANDLE_LIST: + if (process_flags & PROCESS_CREATE_FLAGS_INHERIT_HANDLES) + handles_attr = &attr->Attributes[i]; + break; default: if (attr->Attributes[i].Attribute & PS_ATTRIBUTE_INPUT) FIXME( "unhandled input attribute %lx\n", attr->Attributes[i].Attribute ); @@ -845,12 +874,19 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ if ((status = alloc_object_attributes( process_attr, &objattr, &attr_len ))) goto done; + if ((status = alloc_handle_list( handles_attr, &handles, &handles_size ))) + { + free( objattr ); + goto done; + } + /* create the socket for the new process */ if (socketpair( PF_UNIX, SOCK_STREAM, 0, socketfd ) == -1) { status = STATUS_TOO_MANY_OPENED_FILES; free( objattr ); + free( handles ); goto done; } #ifdef SO_PASSCRED @@ -876,7 +912,9 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ req->access = process_access; req->cpu = pe_info.cpu; req->info_size = startup_info_size; + req->handles_size = handles_size; wine_server_add_data( req, objattr, attr_len ); + wine_server_add_data( req, handles, handles_size ); wine_server_add_data( req, startup_info, startup_info_size ); wine_server_add_data( req, params->Environment, env_size ); if (!(status = wine_server_call( req ))) @@ -888,6 +926,7 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ } SERVER_END_REQ; free( objattr ); + free( handles ); if (status) { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 98e4825439e..8058860a436 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -781,10 +781,11 @@ struct new_process_request unsigned int access; client_cpu_t cpu; data_size_t info_size; + data_size_t handles_size; /* VARARG(objattr,object_attributes); */ + /* VARARG(handles,uints,handles_size); */ /* VARARG(info,startup_info,info_size); */ /* VARARG(env,unicode_str); */ - char __pad_44[4]; }; struct new_process_reply { @@ -6337,7 +6338,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 640 +#define SERVER_PROTOCOL_VERSION 641 /* ### protocol_version end ### */ diff --git a/server/handle.c b/server/handle.c index 9ae99cd0c63..3ef7fb1bdb9 100644 --- a/server/handle.c +++ b/server/handle.c @@ -355,7 +355,8 @@ static void shrink_handle_table( struct handle_table *table ) /* copy the handle table of the parent process */ /* return 1 if OK, 0 on error */ -struct handle_table *copy_handle_table( struct process *process, struct process *parent ) +struct handle_table *copy_handle_table( struct process *process, struct process *parent, + const obj_handle_t *handles, unsigned int handle_count ) { struct handle_table *parent_table = parent->handles; struct handle_table *table; @@ -364,18 +365,37 @@ struct handle_table *copy_handle_table( struct process *process, struct process assert( parent_table ); assert( parent_table->obj.ops == &handle_table_ops ); - if (!(table = alloc_handle_table( process, parent_table->count ))) + if (!(table = alloc_handle_table( process, handle_count ? handle_count : parent_table->count ))) return NULL; - if ((table->last = parent_table->last) >= 0) + if (handles) { - struct handle_entry *ptr = table->entries; - memcpy( ptr, parent_table->entries, (table->last + 1) * sizeof(struct handle_entry) ); - for (i = 0; i <= table->last; i++, ptr++) + struct handle_entry *dst, *src; + int j; + + dst = table->entries; + memset( dst, 0, handle_count * sizeof(*dst) ); + + for (i = 0, j = 0; i < handle_count; i++) + { + src = get_handle( parent, handles[i] ); + if (!src || !(src->access & RESERVED_INHERIT)) continue; + grab_object_for_handle( src->ptr ); + dst[j++] = *src; + } + } + else + { + if ((table->last = parent_table->last) >= 0) { - if (!ptr->ptr) continue; - if (ptr->access & RESERVED_INHERIT) grab_object_for_handle( ptr->ptr ); - else ptr->ptr = NULL; /* don't inherit this entry */ + struct handle_entry *ptr = table->entries; + memcpy( ptr, parent_table->entries, (table->last + 1) * sizeof(struct handle_entry) ); + for (i = 0; i <= table->last; i++, ptr++) + { + if (!ptr->ptr) continue; + if (ptr->access & RESERVED_INHERIT) grab_object_for_handle( ptr->ptr ); + else ptr->ptr = NULL; /* don't inherit this entry */ + } } } /* attempt to shrink the table */ diff --git a/server/handle.h b/server/handle.h index f1deb79fb5f..736fd360173 100644 --- a/server/handle.h +++ b/server/handle.h @@ -52,7 +52,8 @@ extern obj_handle_t enumerate_handles( struct process *process, const struct obj unsigned int *index ); extern void close_process_handles( struct process *process ); extern struct handle_table *alloc_handle_table( struct process *process, int count ); -extern struct handle_table *copy_handle_table( struct process *process, struct process *parent ); +extern struct handle_table *copy_handle_table( struct process *process, struct process *parent, + const obj_handle_t *handles, unsigned int handle_count ); extern unsigned int get_handle_table_count( struct process *process); #endif /* __WINE_SERVER_HANDLE_H */ diff --git a/server/process.c b/server/process.c index c1bdb591f60..8206d8ad322 100644 --- a/server/process.c +++ b/server/process.c @@ -500,7 +500,8 @@ static void start_sigkill_timer( struct process *process ) /* create a new process */ /* if the function fails the fd is closed */ struct process *create_process( int fd, struct process *parent, int inherit_all, - const struct security_descriptor *sd ) + const struct security_descriptor *sd, const obj_handle_t *handles, + unsigned int handle_count ) { struct process *process; @@ -573,8 +574,9 @@ struct process *create_process( int fd, struct process *parent, int inherit_all, else { process->parent_id = parent->id; - process->handles = inherit_all ? copy_handle_table( process, parent ) + process->handles = inherit_all ? copy_handle_table( process, parent, handles, handle_count ) : alloc_handle_table( process, 0 ); + /* Note: for security reasons, starting a new process does not attempt * to use the current impersonation token for the new process */ process->token = token_duplicate( parent->token, TRUE, 0, NULL ); @@ -1098,6 +1100,8 @@ DECL_HANDLER(new_process) struct process *parent; struct thread *parent_thread = current; int socket_fd = thread_get_inflight_fd( current, req->socket_fd ); + const obj_handle_t *handles = NULL; + data_size_t data_size; if (socket_fd == -1) { @@ -1158,8 +1162,18 @@ DECL_HANDLER(new_process) info->process = NULL; info->data = NULL; - info_ptr = get_req_data_after_objattr( objattr, &info->data_size ); - info->info_size = min( req->info_size, info->data_size ); + info_ptr = get_req_data_after_objattr( objattr, &data_size ); + + if (req->handles_size) + { + if (req->handles_size < data_size) + handles = info_ptr; + info_ptr = (const char *)info_ptr + req->handles_size; + data_size -= req->handles_size; + } + info->data_size = data_size; + + info->info_size = min( req->info_size, data_size ); if (req->info_size < sizeof(*info->data)) { @@ -1199,7 +1213,8 @@ DECL_HANDLER(new_process) #undef FIXUP_LEN } - if (!(process = create_process( socket_fd, parent, req->inherit_all, sd ))) goto done; + if (!(process = create_process( socket_fd, parent, req->inherit_all, sd, handles, req->handles_size / sizeof(*handles) ))) + goto done; process->startup_info = (struct startup_info *)grab_object( info ); @@ -1294,7 +1309,7 @@ DECL_HANDLER(exec_process) close( socket_fd ); return; } - if (!(process = create_process( socket_fd, NULL, 0, NULL ))) return; + if (!(process = create_process( socket_fd, NULL, 0, NULL, NULL, 0 ))) return; create_thread( -1, process, NULL ); release_object( process ); } diff --git a/server/process.h b/server/process.h index 0fdf070b78e..7facc4f6dfa 100644 --- a/server/process.h +++ b/server/process.h @@ -109,7 +109,8 @@ extern unsigned int alloc_ptid( void *ptr ); extern void free_ptid( unsigned int id ); extern void *get_ptid_entry( unsigned int id ); extern struct process *create_process( int fd, struct process *parent, int inherit_all, - const struct security_descriptor *sd ); + const struct security_descriptor *sd, const obj_handle_t *handles, + unsigned int handle_count ); extern data_size_t init_process( struct thread *thread ); extern struct thread *get_process_first_thread( struct process *process ); extern struct process *get_process_from_id( process_id_t id ); diff --git a/server/protocol.def b/server/protocol.def index 6e92f86cc03..68dec5b594b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -795,7 +795,9 @@ struct rawinput_device unsigned int access; /* access rights for process object */ client_cpu_t cpu; /* CPU that the new process will use */ data_size_t info_size; /* size of startup info */ + data_size_t handles_size; /* length of explicit handles list to inherit */ VARARG(objattr,object_attributes); /* object attributes */ + VARARG(handles,uints,handles_size); /* handles list */ VARARG(info,startup_info,info_size); /* startup information */ VARARG(env,unicode_str); /* environment for new process */ @REPLY diff --git a/server/request.c b/server/request.c index 4c1f30a5fe7..8f3bad8701d 100644 --- a/server/request.c +++ b/server/request.c @@ -582,7 +582,7 @@ static void master_socket_poll_event( struct fd *fd, int event ) int client = accept( get_unix_fd( master_socket->fd ), (struct sockaddr *) &dummy, &len ); if (client == -1) return; fcntl( client, F_SETFL, O_NONBLOCK ); - if ((process = create_process( client, NULL, 0, NULL ))) + if ((process = create_process( client, NULL, 0, NULL, NULL, 0 ))) { create_thread( -1, process, NULL ); release_object( process ); diff --git a/server/request.h b/server/request.h index 5a602d3d816..ef52c5e6923 100644 --- a/server/request.h +++ b/server/request.h @@ -731,6 +731,7 @@ C_ASSERT( FIELD_OFFSET(struct new_process_request, exe_file) == 28 ); C_ASSERT( FIELD_OFFSET(struct new_process_request, access) == 32 ); C_ASSERT( FIELD_OFFSET(struct new_process_request, cpu) == 36 ); C_ASSERT( FIELD_OFFSET(struct new_process_request, info_size) == 40 ); +C_ASSERT( FIELD_OFFSET(struct new_process_request, handles_size) == 44 ); C_ASSERT( sizeof(struct new_process_request) == 48 ); C_ASSERT( FIELD_OFFSET(struct new_process_reply, info) == 8 ); C_ASSERT( FIELD_OFFSET(struct new_process_reply, pid) == 12 ); diff --git a/server/trace.c b/server/trace.c index 93e53d2f42d..f973098c6a5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1288,7 +1288,9 @@ static void dump_new_process_request( const struct new_process_request *req ) fprintf( stderr, ", access=%08x", req->access ); dump_client_cpu( ", cpu=", &req->cpu ); fprintf( stderr, ", info_size=%u", req->info_size ); + fprintf( stderr, ", handles_size=%u", req->handles_size ); dump_varargs_object_attributes( ", objattr=", cur_size ); + dump_varargs_uints( ", handles=", min(cur_size,req->handles_size) ); dump_varargs_startup_info( ", info=", min(cur_size,req->info_size) ); dump_varargs_unicode_str( ", env=", cur_size ); } -- 2.28.0

1 0

Subject: [PATCH] po: Update Brazilian Portuguese translation
by Roberto Pungartnik 31 Aug '20

31 Aug '20

1 0

[PATCH 1/2] vcruntime140_1: Check for NULL type in dump_exception_type().
by Paul Gofman 31 Aug '20

31 Aug '20

Fixes crash with +seh debug channel in https://github.com/microsoft/compiler-tests/blob/master/eh/ehthrow.cxx. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/vcruntime140_1/except_x86_64.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 0e27b02db13..367d5563f1d 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -247,9 +247,17 @@ static inline void dump_type(UINT type_rva, ULONG64 base) static void dump_exception_type(const cxx_exception_type *type, ULONG64 base) { - const cxx_type_info_table *type_info_table = rva_to_ptr(type->type_info_table, base); + const cxx_type_info_table *type_info_table; UINT i; + if (!type) + { + TRACE("NULL type\n"); + return; + } + + type_info_table = rva_to_ptr(type->type_info_table, base); + TRACE("flags %x destr %x(%p) handler %x(%p) type info %x(%p)\n", type->flags, type->destructor, rva_to_ptr(type->destructor, base), type->custom_handler, rva_to_ptr(type->custom_handler, base), -- 2.26.2

1 1

[PATCH 3/3] kernelbase: Move KERNEL32_CONSOLE_ALLOC handling to kernelbase.
by Jacek Caban 31 Aug '20

31 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 6 +++--- dlls/kernel32/kernel_main.c | 13 ------------- dlls/kernel32/kernel_private.h | 1 - dlls/kernelbase/console.c | 10 ++++++++++ include/wine/condrv.h | 3 +++ 5 files changed, 16 insertions(+), 17 deletions(-)

1 0

[PATCH 2/3] conhost: Implement IOCTL_CONDRV_SCROLL.
by Jacek Caban 31 Aug '20

31 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 101 +++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+)

1 0

[PATCH 1/3] conhost: Implement IOCTL_CONDRV_FILL_OUTPUT.
by Jacek Caban 31 Aug '20

31 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 55 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)

1 0

[PATCH v4 1/4] ntdll: Implement RtlGetExtendedContextLength().
by Paul Gofman 31 Aug '20

31 Aug '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - define in ddk/wdm.h for x86/x64 only. v4: - fix return value type. .../api-ms-win-core-xstate-l1-1-0.spec | 2 +- dlls/ntdll/exception.c | 71 +++++++++ dlls/ntdll/ntdll.spec | 2 + dlls/ntdll/tests/exception.c | 147 +++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 + include/ddk/wdm.h | 7 +- 6 files changed, 227 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec b/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec index 36a1c8812f0..15126e5ddfe 100644 --- a/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec +++ b/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec @@ -1,6 +1,6 @@ @ stub RtlCopyExtendedContext @ stdcall RtlGetEnabledExtendedFeatures(int64) ntdll.RtlGetEnabledExtendedFeatures -@ stub RtlGetExtendedContextLength +@ stdcall RtlGetExtendedContextLength(long ptr) ntdll.RtlGetExtendedContextLength @ stub RtlGetExtendedFeaturesMask @ stub RtlInitializeExtendedContext @ stub RtlLocateExtendedFeature diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 3f7443bb45b..9f65bb0464a 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -665,3 +665,74 @@ ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64 feature_mask) { return user_shared_data->XState.EnabledFeatures & feature_mask; } + +static const struct context_parameters +{ + ULONG arch_flag; + ULONG supported_flags; + ULONG context_size; /* sizeof(CONTEXT) */ + ULONG context_ex_size; /* sizeof(CONTEXT_EX) */ + ULONG alignment; +} +arch_context_paramaters[] = +{ + {0x00100000, 0xd810005f, 0x4d0, 0x20, 7}, + {0x00010000, 0xd801007f, 0x2cc, 0x18, 3}, +}; + +static const struct context_parameters *context_get_parameters( ULONG context_flags ) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(arch_context_paramaters); ++i) + { + if (context_flags & arch_context_paramaters[i].arch_flag) + return context_flags & ~arch_context_paramaters[i].supported_flags ? NULL : &arch_context_paramaters[i]; + } + return NULL; +} + + +/********************************************************************** + * RtlGetExtendedContextLength2 (NTDLL.@) + */ +NTSTATUS WINAPI RtlGetExtendedContextLength2( ULONG context_flags, ULONG *length, ULONG64 compaction_mask ) +{ + const struct context_parameters *p; + ULONG64 supported_mask; + ULONG64 size; + + TRACE( "context_flags %#x, length %p, compaction_mask %s.\n", context_flags, length, + wine_dbgstr_longlong(compaction_mask) ); + + if (!(p = context_get_parameters( context_flags ))) + return STATUS_INVALID_PARAMETER; + + if (!(context_flags & 0x40)) + { + *length = p->context_size + p->context_ex_size + p->alignment; + return STATUS_SUCCESS; + } + + if (!(supported_mask = RtlGetEnabledExtendedFeatures( ~(ULONG64)0) )) + return STATUS_NOT_SUPPORTED; + + compaction_mask &= supported_mask; + + size = p->context_size + p->context_ex_size + offsetof(XSTATE, YmmContext) + 63; + + if (compaction_mask & supported_mask & (1 << XSTATE_AVX)) + size += sizeof(YMMCONTEXT); + + *length = size; + return STATUS_SUCCESS; +} + + +/********************************************************************** + * RtlGetExtendedContextLength (NTDLL.@) + */ +NTSTATUS WINAPI RtlGetExtendedContextLength( ULONG context_flags, ULONG *length ) +{ + return RtlGetExtendedContextLength2( context_flags, length, ~(ULONG64)0 ); +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index db2fab19ba4..24e8f4a8f9d 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -695,6 +695,8 @@ # @ stub RtlGetElementGenericTableAvl @ stdcall RtlGetEnabledExtendedFeatures(int64) @ stdcall RtlGetExePath(wstr ptr) +@ stdcall RtlGetExtendedContextLength(long ptr) +@ stdcall RtlGetExtendedContextLength2(long ptr int64) # @ stub RtlGetFirstRange @ stdcall RtlGetFrame() @ stdcall RtlGetFullPathName_U(wstr long ptr ptr) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index fbe437dc1f1..a67e50af6ab 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -45,6 +45,8 @@ static PVOID (WINAPI *pRtlAddVectoredContinueHandler)(ULONG first, PVECTORED static ULONG (WINAPI *pRtlRemoveVectoredContinueHandler)(PVOID handler); static void (WINAPI *pRtlSetUnhandledExceptionFilter)(PRTL_EXCEPTION_FILTER filter); static ULONG64 (WINAPI *pRtlGetEnabledExtendedFeatures)(ULONG64); +static NTSTATUS (WINAPI *pRtlGetExtendedContextLength)(ULONG context_flags, ULONG *length); +static NTSTATUS (WINAPI *pRtlGetExtendedContextLength2)(ULONG context_flags, ULONG *length, ULONG64 compaction_mask); static NTSTATUS (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -6093,6 +6095,8 @@ done: return ExceptionContinueExecution; } +#define CONTEXT_NATIVE (CONTEXT_XSTATE & CONTEXT_CONTROL) + static void test_extended_context(void) { static BYTE except_code_set_ymm0[] = @@ -6129,19 +6133,156 @@ static void test_extended_context(void) 0xc5, 0xfc, 0x11, 0x00, /* vmovups %ymm0,(%ax) */ 0xc3, /* ret */ }; - unsigned int i, address_offset; + static const struct + { + ULONG flag; + ULONG supported_flags; + ULONG broken_flags; + ULONG context_length; + ULONG context_ex_length; + ULONG align; + } + context_arch[] = + { + { + 0x00100000, /* CONTEXT_AMD64 */ + 0xd800005f, + 0xd8000000, + 0x4d0, /* sizeof(CONTEXT) */ + 0x20, /* sizeof(CONTEXT_EX) */ + 7, + }, + { + 0x00010000, /* CONTEXT_X86 */ + 0xd800007f, + 0xd8000000, + 0x2cc, /* sizeof(CONTEXT) */ + 0x18, /* sizeof(CONTEXT_EX) */ + 3, + }, + }; + ULONG expected_length, expected_length_xstate; + unsigned int i, address_offset, test; + ULONG64 enabled_features; + ULONG ret, length; unsigned data[8]; + ULONG flags; address_offset = sizeof(void *) == 8 ? 2 : 1; *(void **)(except_code_set_ymm0 + address_offset) = data; *(void **)(except_code_reset_ymm_state + address_offset) = data; - if (!pRtlGetEnabledExtendedFeatures || !(pRtlGetEnabledExtendedFeatures(~(ULONG64)0) & (1 << XSTATE_AVX))) + if (!pRtlGetEnabledExtendedFeatures) + { + skip("RtlGetEnabledExtendedFeatures is not available.\n"); + return; + } + + enabled_features = pRtlGetEnabledExtendedFeatures(~(ULONG64)0); + + /* Test context manipulation functions. */ + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(0, &length); + ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, "Got unexpected result ret %#x, length %#x.\n", + ret, length); + + for (test = 0; test < ARRAY_SIZE(context_arch); ++test) + { + expected_length = context_arch[test].context_length + context_arch[test].context_ex_length + + context_arch[test].align; + expected_length_xstate = context_arch[test].context_length + context_arch[test].context_ex_length + + sizeof(XSTATE) + 63; + + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(context_arch[test].flag, &length); + ok(!ret && length == expected_length, "Got unexpected result ret %#x, length %#x.\n", + ret, length); + + for (i = 0; i < 32; ++i) + { + if (i == 6) /* CONTEXT_XSTATE */ + continue; + + flags = context_arch[test].flag | (1 << i); + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(flags, &length); + + if ((context_arch[test].supported_flags & flags) || flags == context_arch[test].flag) + { + ok((!ret && length == expected_length) + || broken((context_arch[test].broken_flags & (1 << i)) + && ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef), + "Got unexpected result ret %#x, length %#x, flags 0x%08x.\n", + ret, length, flags); + } + else + { + ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, + "Got unexpected result ret %#x, length %#x, flags 0x%08x.\n", ret, length, flags); + } + } + + flags = context_arch[test].flag | 0x40; + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(flags, &length); + + if (!enabled_features) + { + ok(ret == STATUS_NOT_SUPPORTED && length == 0xdeadbeef, + "Got unexpected result ret %#x, length %#x.\n", ret, length); + continue; + } + + ok(!ret && length >= expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + if (!pRtlGetExtendedContextLength2) + { + win_skip("RtlGetExtendedContextLength2 is not available.\n"); + continue; + } + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 7); + ok(!ret && length == expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, ~0); + ok(!ret && length >= expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 0); + ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT), + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 3); + ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT), + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 4); + ok(!ret && length == expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + } + + if (0) + { + /* Crashes on Windows. */ + pRtlGetExtendedContextLength(CONTEXT_FULL, NULL); + } + + if (!(enabled_features & (1 << XSTATE_AVX))) { skip("AVX is not supported.\n"); return; } + /* Test fault exception context. */ memset(data, 0xff, sizeof(data)); test_extended_context_modified_state = FALSE; run_exception_test(test_extended_context_handler, NULL, except_code_reset_ymm_state, @@ -6206,6 +6347,8 @@ START_TEST(exception) X(RtlGetUnloadEventTrace); X(RtlGetUnloadEventTraceEx); X(RtlGetEnabledExtendedFeatures); + X(RtlGetExtendedContextLength); + X(RtlGetExtendedContextLength2); #undef X pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0e8082fad26..45024a3a8da 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1096,6 +1096,8 @@ @ stub RtlGetDefaultCodePage @ stub RtlGetElementGenericTable @ stub RtlGetElementGenericTableAvl +@ stdcall RtlGetExtendedContextLength(long ptr) +@ stdcall RtlGetExtendedContextLength2(long ptr int64) @ stub RtlGetFirstRange @ stdcall RtlGetGroupSecurityDescriptor(ptr ptr ptr) @ stub RtlGetNextRange diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index cc841326979..0c641fa4122 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1836,12 +1836,17 @@ HANDLE WINAPI PsGetProcessInheritedFromUniqueProcessId(PEPROCESS); BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS); +#if defined(__x86_64__) || defined(__i386__) +ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64); +NTSTATUS WINAPI RtlGetExtendedContextLength(ULONG,ULONG*); +NTSTATUS WINAPI RtlGetExtendedContextLength2(ULONG,ULONG*,ULONG64); +#endif + #ifdef __x86_64__ void WINAPI RtlCopyMemoryNonTemporal(void*,const void*,SIZE_T); #else #define RtlCopyMemoryNonTemporal RtlCopyMemory #endif -ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64); BOOLEAN WINAPI RtlIsNtDdiVersionAvailable(ULONG); NTSTATUS WINAPI ZwAddBootEntry(PUNICODE_STRING,PUNICODE_STRING); -- 2.26.2

2 6

[PATCH 4/4] include/d3dcommon.idl: Add missing names in D3D_SHADER_INPUT_TYPE enum.
by Biswapriyo Nath 31 Aug '20

31 Aug '20

2 1

[PATCH 3/4] include/d3dcommon.idl: Add missing names in D3D_NAME enum.
by Biswapriyo Nath 31 Aug '20

31 Aug '20

2 1

[PATCH 2/4] include/d3dcommon.idl: Add missing names in D3D_SHADER_VARIABLE_TYPE enum.
by Biswapriyo Nath 31 Aug '20

31 Aug '20

2 1

[PATCH 1/4] include/d3dcommon.idl: Add D3DDestructionNotifier interface.
by Biswapriyo Nath 31 Aug '20

31 Aug '20

2 1

[PATCH] wine.inf: Add sRGB color profile
by Alex Henrie 31 Aug '20

31 Aug '20

"This profile is made available by the International Color Consortium, and may be copied, distributed, embedded, made, used, and sold without restriction. Altered versions of this profile shall have the original identification and copyright information removed and shall not be misrepresented as the original profile." See http://www.color.org/srgbprofiles.xalter Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37396 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- The Microsoft version of this file is tagged "sRGB IEC61966-2.1". Any differences from the standard sRGB IEC61966-2.1 profile available on color.org are not likely to be perceptible. In addition to a couple of ICM files, on Windows the directory C:\Windows\System32\spool\drivers\color also has some CAMP, GMMP, and CDMP files. I have generically named the new source directory "color" so that we have a place for these other files in the future. --- Makefile.in | 1 + color/Makefile.in | 2 ++ color/sRGB_Color_Space_Profile.icm | Bin 0 -> 3024 bytes configure.ac | 1 + loader/wine.inf.in | 14 +++++++++----- tools/makedep.c | 12 ++++++++++++ 6 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 color/Makefile.in create mode 100644 color/sRGB_Color_Space_Profile.icm diff --git a/Makefile.in b/Makefile.in index 0e1f6cd6ca..a4b384c09c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,6 +27,7 @@ datarootdir = @datarootdir@ datadir = @datadir@ mandir = @mandir@ includedir = @includedir@ +colordir = ${datadir}/wine/color fontdir = ${datadir}/wine/fonts nlsdir = ${datadir}/wine/nls dlldir = ${libdir}/wine diff --git a/color/Makefile.in b/color/Makefile.in new file mode 100644 index 0000000000..f9f6f62a3b --- /dev/null +++ b/color/Makefile.in @@ -0,0 +1,2 @@ +SOURCES = \ + sRGB_Color_Space_Profile.icm diff --git a/color/sRGB_Color_Space_Profile.icm b/color/sRGB_Color_Space_Profile.icm new file mode 100644 index 0000000000000000000000000000000000000000..49afbfef10f22a1832590b68369d2f248ea553b9 GIT binary patch literal 3024 zcmb`Jc{r5o8^@pboqe;-klom~#=Z=)?<7n1RL0C;EQ4W?v`H$Qlq6e;oU(N2=!6`p zq_j9fq0&N*O8IqkN}I~>9j@P{b6vkb&vRYx^M3C8x$pP6pZoda{Q^K51jvAqCy}2f z2yl0zhlYjIaZeGKxM&3c7CSY0nf@_DE7pfmuw>n3h<vtUtxuW{AMLJ;(HbZuIuESG z{a=#ca8ua;KrYBCI||tx;d+E=QGo%@2zLR1C&&E2f*+WZ$l(A$xPip)i&@Gg`iXKA zgo!)=h{zhCC30D*2xlU!5fz`DhH#b0FIbL0E8;XRI~MWxB1}#fa*;fus4sgn(nRs3 zP*Ds!Ss>yBge}>zEF^|hhw$p<`Vm43NktlHVq|Q#Wc`bi=uVbDr*Q%R@mv7f?y!Y| z^kpAf^uhola$__g2b6(2&;bl!0xW?IZ~(5r3;2RS5C%2@Hi!j@Kmam8HrNI7Kmj-i zj(`eK4eCGxXa=pI9dv;!;5xVs2Ehmz2NPf#yasdN16Y6{2nSIhDkKM~K$?&~WCAfE zJIEDU3k5)7P$U!s@gX6U4ef>spkk;3s(~7yU!e=o73d~31U-Nzp&96J=nIU3$uJF8 zg0)~nm<c<=-f$qi5sraV;4C;7J^+`&weT6Z4ZZ^3hDYED_%%F_0w@wn2BnH(pqMCU zlrJhA6^#<0wxjY<rKnm|GpZBShq{ZJK+U2)qp@fznvQ0mZO|U*AT%4Dg5HiUL|35e z(QW8n^j-8MdJg>^L%}Fw^fA^LPfRE#29trw!<1r9Va{W&VMZ|1m=9PiRtBq$wZwX0 z!?1DKt=K~BF>DL=GIj_%g`LOYaB?_(oGs25$HJxI@^Iz2Gq_8*VcazC6P|=u!JFXS z@ZoqqJ_lclZ^U=whw(4)3j_&*Cc&EEOW+W;5Q+$OgigX8!ZcxlC`r^N+7bhaal~E3 zGGa6F8u1bF9f?FzBUzFBNj%a{QW@zi=>}<%^qDM0)+0NUBgjJX0rF|`W%2{^I|_xO zMRA~nQ_?60C=HaWlqZx=VpK5$F;6j$*bcEuu{N<`u{YubaZPbY@lE1c;-%u}#P5jD zN)RNpB%CE!65AyzB`!#eNz6-9C5<J0B@-nJB^xDgO1_lBNoh&BN^zuerA|s+m71cW zsOnT_Dx12ST1UM`ou*-F+B8pE9Ib%%3vGZlCoLsyCLJuDDP1XjQF=lKC8H(dDU%>m zB-1K0D)VKP(kjPQ+*SKmHLn_8^-)$q)<Kpln=jiUJ0kl<jxOga7cX~6u3hf2JX&5) z-d{dL{<!=#`B?>;f{g-OAzz_Y;h`d|sHYg9xK;6_V!z_NlCqM!QnFIH(p9BdWf^4$ z<v8UM<!<E}6{?Dz3Qwg(<&w%Px-{L9o<J|7_tNK76;(Y{g{n2G1F8#Z+G;^+IchCx zkJX9lO!a8>67?SSISmyJAB}8{CXI)h1Wl%9tmaY8KFyC>+FBu6d$roNUTVu~dunHC zH)%i8q3GD_r0CS@+|$MCGIis1kLeET!FuL;v3iwycl2R>3w@scG5w*{nAKLR`KxPJ zk1@y$M@BlMi7{y)W3bjB$DrNdjiH8NxZxqgKEv-u=0*udbw=aHQpR4!ImVsFf1Bu; zuuUpW?wL|d-As3wc9_03(>LRq9XGpgPBr&2-)r7u{>{SDLSWHsF=MG=8EIK%ImV<h z{g{Q!8&()AC#xM+T~?p1Ev(b5Tdn`HVc5jmG}^peqrHZ^rf$uYt(q;%w#IhCj&2ue zcfxMMUe%suUu*x&LEVAlaLVC@qpo9|;~B>{PDV}wr}Iu9ovod>IbU``xwyOJy9~HW zxdypbxIS@HbBl3na+`BEci-xM*#qO@?QzIs%u~se?b+Zt=Vj@&&8yd&?7iN*!u#1; zy|se1oj$OSm(O9JN9#1#@z=Hc0$)$x!@iIGwEa^2e)q@v`}tS;KMybt$PVaRPhG!x zedGEMflh%%f#X3sLBgP(VDaFH;D+FjAub`sArqm7q1!@lhslTW!aBln;lbgj!sj=* zZaA`GI>J06FJg3~_QuSOH#f;|O4xL9v-oD#=5vvl$dJg!$geD4RxN8j$}_4eYL4y9 zKFWU0ap072X1KQ8V(yD*+vwuxmoc_6hht`9?PE)0XL-)N3f|i|kGSf%kMX|or{fnB zLK0dM@rjX%7x+^Acz$n^a#Ci}P_lk<Uh+hWb;^;HIf1v}R4SCZF|{L&hWtqSg*w7L z!pU^I^vd*48NnInG9@$lnf+Vzw(Q^XBFio7=dI|i?5#c7s@c1;C$~9ntJw~1kJ{d| zLw!f?j_IB5JL`85cg64eBgZJGIOqNDklmfRO1V38r}nt-Y04AJ6XcEUwb@&}5514K zZ(zUa{__3b^Evsq3XBR$3%(Yz3vc~o{8QOaiwB|)3=~-u9Y2UY$UiuG$o^1$v1D;p z@zi0T!)+z>lKhhQM>Ze1S!z~VeUx}qcyyv{ZCOXTM)|?=uNAQsBb82-EmewD`>Q@4 z;~X14?r^-hTB*9A`pXI4iTgF~HEp$8wWTMqC(}<puM4j0`<eN3!zuYw1*g89=AWLZ z52){Luxw~(RBSA2f}4a*GiM^s4F2NsOGh)Kxu!*?rQj?$D?Iz^*T`Q-TfJL*&N0t5 z|EBp{)p_dq{5Gg<OWRy~Z2Lq<SjW%>uM0h$Hl62xH~9T@mugq#Md^!0-Nf$P?!`-4 zm*y`gU!J`Zb7iV$bI<tI(5v@){d)(ld0)G6-R=6-KF7XGH*9Zo-L$@W;TH2&`)!Nc zZT;r`=l?MO<NScdK-(S5I~{{ogPlWbhPsFChp*gqxqJPd=e^q_>qdq~gGTR<MT||{ z=iGn!AmPE=hv^R&#&<r#Jj#D8@woJf;*;8^x=&jsEG8~ax=i*zTmNi)iaquE&(uG^ zPUk+SJTHBr@}l9T$;+-8x0%6L8(vMnPJX>GoA)2d|5UxvdGp&}4uAE}h0aaC6}(;i zyYQXdyVLK@-uKM=%|H2&_+jB={wKLl^`Dua`@V#Hd9jf375BC5o9?&H@7~`ZEha85 z{-8k&JYAjX7RFW<77P=HG2Mk5%@QW0(M8J6IVmAYD4?%TX0f?+23;gpmIcJWHm~TE zsB!?>_W&UKaK(pgBT{F`Sk`1q_=ApIvi~>1Kja-poFc8Ycg2@f3jlK-0Mx-$UJPB7 z<Qx!4|Dg|z0B$r_z~v)H4d!t(c>EaT{Co~CjhDoy^Z4|Cv`LizZ;q8ZSF~{&Hxtp1 zNS#T^TLiqA*fhE)KaDHkvqTlK5|(a9AgVDnNsz`9Ca$I<O41yF)M!(arP?5}3nKHL eE-t>)0svP6z_+5s#f6&1#cxP2P~!kx7XBBF2+<<| literal 0 HcmV?d00001 diff --git a/configure.ac b/configure.ac index e4b0999f76..38d1e83398 100644 --- a/configure.ac +++ b/configure.ac @@ -2830,6 +2830,7 @@ depend: \$(MAKEDEP) dummy WINE_CONFIG_SYMLINK(wine,tools/winewrapper) WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,["x$enable_win64" != xno -o -n "$with_wine64"]) +WINE_CONFIG_MAKEFILE(color) WINE_CONFIG_MAKEFILE(dlls/acledit) WINE_CONFIG_MAKEFILE(dlls/aclui) WINE_CONFIG_MAKEFILE(dlls/activeds.tlb) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 1efc7f9e3b..a9e7e4701e 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -30,7 +30,7 @@ signature="$CHICAGO$" RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -54,7 +54,7 @@ AddReg=\ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -80,7 +80,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -107,7 +107,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -2680,7 +2680,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,catroot, 11,mui, 11,tasks, -11,spool\drivers\color, 11,spool\printers, 10,,explorer.exe 10,,hh.exe @@ -3886,6 +3885,9 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGame",0x10001,0x00000001 HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001 +[ColorFiles] +"sRGB Color Space Profile.icm",sRGB_Color_Space_Profile.icm + [InfFiles] winebus.inf winehid.inf @@ -3968,10 +3970,12 @@ normnfkd.nls sortdefault.nls [WineSourceDirs] +ColorFiles = color NlsFiles = nls SortFiles = nls [DestinationDirs] +ColorFiles = 11,spool\drivers\color InfFiles = 17 NlsFiles = 11 SortFiles = 10,globalization\sorting diff --git a/tools/makedep.c b/tools/makedep.c index 4bd20d469d..c5765a3330 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2955,6 +2955,17 @@ static void output_source_svg( struct makefile *make, struct incl_file *source, } +/******************************************************************* + * output_source_icm + */ +static void output_source_icm( struct makefile *make, struct incl_file *source, const char *obj ) +{ + add_install_rule( make, source->name, source->name, + strmake( "D$(colordir)/%s", source->name )); + output_srcdir_symlink( make, strmake( "%s.icm", obj )); +} + + /******************************************************************* * output_source_nls */ @@ -3169,6 +3180,7 @@ static const struct { "tlb", output_source_tlb }, { "sfd", output_source_sfd }, { "svg", output_source_svg }, + { "icm", output_source_icm }, { "nls", output_source_nls }, { "desktop", output_source_desktop }, { "po", output_source_po }, -- 2.28.0

2 1

[PATCH] ntdll: RtlConvertToAutoInheritSecurityObject is NTSTATUS, not BOOL
by Louis Lenders 31 Aug '20

31 Aug '20

See (already closed) bug report 33279 As explained in comment #1 this is NTSTATUS : https://bugs.winehq.org/show_bug.cgi?id=33279#c1 but then erraneously the patch committed declares it as BOOL: https://source.winehq.org/git/wine.git/commitdiff/56057acdcddd91169c94c9961… Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/ntdll/sec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 70828a76c6..c0f962f056 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1707,7 +1707,7 @@ NTSTATUS WINAPI RtlQueryInformationAcl( return status; } -BOOL WINAPI RtlConvertToAutoInheritSecurityObject( +NTSTATUS WINAPI RtlConvertToAutoInheritSecurityObject( PSECURITY_DESCRIPTOR pdesc, PSECURITY_DESCRIPTOR cdesc, PSECURITY_DESCRIPTOR* ndesc, @@ -1717,5 +1717,5 @@ BOOL WINAPI RtlConvertToAutoInheritSecurityObject( { FIXME("%p %p %p %p %d %p - stub\n", pdesc, cdesc, ndesc, objtype, isdir, genmap); - return FALSE; + return STATUS_NOT_IMPLEMENTED; } -- 2.28.0

1 0

[PATCH v3 4/5] comsvcs: Implement ISharedPropertyGroupManager_get_Group().
by Jactry Zeng 30 Aug '20

30 Aug '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- v3: - Add more tests. v2: No changes. --- dlls/comsvcs/property.c | 19 +++++++++++++++++-- dlls/comsvcs/tests/property.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/comsvcs/property.c b/dlls/comsvcs/property.c index 045415e246..a73964d288 100644 --- a/dlls/comsvcs/property.c +++ b/dlls/comsvcs/property.c @@ -378,8 +378,23 @@ static HRESULT WINAPI group_manager_CreatePropertyGroup(ISharedPropertyGroupMana static HRESULT WINAPI group_manager_get_Group(ISharedPropertyGroupManager *iface, BSTR name, ISharedPropertyGroup **group) { - FIXME("iface %p, name %s, group %p: stub.\n", iface, debugstr_w(name), group); - return E_NOTIMPL; + struct group_manager *manager = impl_from_ISharedPropertyGroupManager(iface); + struct property_group *property_group; + + TRACE("iface %p, name %s, group %p.\n", iface, debugstr_w(name), group); + + if (!name || !group) + return E_POINTER; + + EnterCriticalSection(&manager->cs); + property_group = find_propery_group(manager, name); + LeaveCriticalSection(&manager->cs); + + if (!property_group) + return E_INVALIDARG; + + return ISharedPropertyGroup_QueryInterface(&property_group->ISharedPropertyGroup_iface, + &IID_ISharedPropertyGroup, (void **)group); } static HRESULT WINAPI group_manager_get__NewEnum(ISharedPropertyGroupManager *iface, IUnknown **retval) diff --git a/dlls/comsvcs/tests/property.c b/dlls/comsvcs/tests/property.c index 8ac5e522f5..7321bbcfe6 100644 --- a/dlls/comsvcs/tests/property.c +++ b/dlls/comsvcs/tests/property.c @@ -166,7 +166,7 @@ static void test_interfaces(void) static void test_property_group(void) { - ISharedPropertyGroup *group, *group1; + ISharedPropertyGroup *group, *group1, *group2; ISharedPropertyGroupManager *manager; ULONG refcount, expected_refcount; LONG isolation, release; @@ -284,6 +284,34 @@ static void test_property_group(void) TEST_TYPEINFO(dispatch, test_name_ids, ARRAY_SIZE(test_name_ids), &IID_ISharedPropertyGroup); IDispatch_Release(dispatch); + hr = ISharedPropertyGroupManager_get_Group(manager, NULL, &group2); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + name = SysAllocString(L"nonexistgroup"); + hr = ISharedPropertyGroupManager_get_Group(manager, name, &group2); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + SysFreeString(name); + + name = SysAllocString(L"testgroupname"); + hr = ISharedPropertyGroupManager_get_Group(manager, name, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + expected_refcount = get_refcount(manager); + hr = ISharedPropertyGroupManager_get_Group(manager, name, &group2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(group2 == group, "Got unexpected pointer %p.\n", group2); + refcount = get_refcount(group); + ok(refcount == 2, "Got unexpected refcount: %u.\n", refcount); + refcount = get_refcount(manager); + ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + ISharedPropertyGroup_Release(group2); + SysFreeString(name); + + name = SysAllocString(L"Testgroupname"); + hr = ISharedPropertyGroupManager_get_Group(manager, name, &group2); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + SysFreeString(name); + expected_refcount = get_refcount(manager) - 1; ISharedPropertyGroup_Release(group); refcount = get_refcount(manager); -- 2.28.0

2 1

[PATCH v3 2/5] comsvcs: Add IDispatch support for ISharedPropertyGroupManager.
by Jactry Zeng 30 Aug '20

30 Aug '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- v3: - Fix some leaks. - Test reference count of ITypeInfo. v2: No changes. --- dlls/comsvcs/Makefile.in | 2 +- dlls/comsvcs/comsvcs_private.h | 15 ++++++++ dlls/comsvcs/main.c | 68 ++++++++++++++++++++++++++++++++++ dlls/comsvcs/property.c | 45 ++++++++++++++++++---- dlls/comsvcs/tests/property.c | 59 +++++++++++++++++++++++++++++ 5 files changed, 180 insertions(+), 9 deletions(-) diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index b4a4244bce..82a496ea9c 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -1,6 +1,6 @@ MODULE = comsvcs.dll IMPORTLIB = comsvcs -IMPORTS = ole32 uuid +IMPORTS = ole32 oleaut32 uuid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/comsvcs/comsvcs_private.h b/dlls/comsvcs/comsvcs_private.h index 6d299d3a88..8a67bcffd8 100644 --- a/dlls/comsvcs/comsvcs_private.h +++ b/dlls/comsvcs/comsvcs_private.h @@ -33,6 +33,21 @@ #include "wine/heap.h" #include "wine/debug.h" +enum tid_t +{ + NULL_tid, + ISharedPropertyGroupManager_tid, + LAST_tid +}; + +static REFIID tid_ids[] = +{ + &IID_NULL, + &IID_ISharedPropertyGroupManager, +}; + +HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo); + HRESULT WINAPI group_manager_create(IClassFactory *iface, IUnknown *outer, REFIID riid, void **out); #endif diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 1d3f7db174..7d00084f8a 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -361,6 +361,71 @@ static HRESULT WINAPI dispenser_manager_cf_CreateInstance(IClassFactory *iface, return ret; } +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static HRESULT load_typelib(void) +{ + ITypeLib *tl; + HRESULT hr; + + if (typelib) + return S_OK; + + hr = LoadRegTypeLib(&LIBID_COMSVCSLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if (FAILED(hr)) + { + ERR("LoadRegTypeLib failed: %#x.\n", hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hr; +} + +HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hr; + + hr = load_typelib(); + if (FAILED(hr)) + return hr; + + if (!typeinfos[tid]) + { + ITypeInfo *ti; + + hr = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if (FAILED(hr)) + { + ERR("GetTypeInfoOfGuid(%s) failed: %#x.\n", debugstr_guid(tid_ids[tid]), hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)(typeinfos + tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(typeinfos[tid]); + return S_OK; +} + +static void release_typelib(void) +{ + unsigned i; + + if (!typelib) + return; + + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) + if (typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv) { switch(reason) @@ -371,6 +436,9 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv) COMSVCS_hInstance = hinst; DisableThreadLibraryCalls(hinst); break; + case DLL_PROCESS_DETACH: + release_typelib(); + break; } return TRUE; } diff --git a/dlls/comsvcs/property.c b/dlls/comsvcs/property.c index 3c9917c926..44e111fe71 100644 --- a/dlls/comsvcs/property.c +++ b/dlls/comsvcs/property.c @@ -75,31 +75,60 @@ static ULONG WINAPI group_manager_Release(ISharedPropertyGroupManager *iface) static HRESULT WINAPI group_manager_GetTypeInfoCount(ISharedPropertyGroupManager *iface, UINT *info) { - FIXME("iface %p, info %p: stub.\n", iface, info); - return E_NOTIMPL; + TRACE("iface %p, info %p.\n", iface, info); + + if (!info) + return E_INVALIDARG; + *info = 1; + return S_OK; } static HRESULT WINAPI group_manager_GetTypeInfo(ISharedPropertyGroupManager *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("iface %p, index %u, lcid %u, info %p: stub.\n", iface, index, lcid, info); - return E_NOTIMPL; + TRACE("iface %p, index %u, lcid %u, info %p.\n", iface, index, lcid, info); + + if (index) + return DISP_E_BADINDEX; + + return get_typeinfo(ISharedPropertyGroupManager_tid, info); } static HRESULT WINAPI group_manager_GetIDsOfNames(ISharedPropertyGroupManager *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("iface %p, riid %s, names %p, count %u, lcid %u, dispid %p: stub.\n", + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("iface %p, riid %s, names %p, count %u, lcid %u, dispid %p.\n", iface, debugstr_guid(riid), names, count, lcid, dispid); - return E_NOTIMPL; + hr = get_typeinfo(ISharedPropertyGroupManager_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI group_manager_Invoke(ISharedPropertyGroupManager *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *except, UINT *argerr) { - FIXME("iface %p, member %u, riid %s, lcid %u, flags %x, params %p, result %p, except %p, argerr %p: stub.\n", + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("iface %p, member %u, riid %s, lcid %u, flags %x, params %p, result %p, except %p, argerr %p.\n", iface, member, debugstr_guid(riid), lcid, flags, params, result, except, argerr); - return E_NOTIMPL; + + hr = get_typeinfo(ISharedPropertyGroupManager_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, member, flags, params, result, except, argerr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI group_manager_CreatePropertyGroup(ISharedPropertyGroupManager *iface, BSTR name, LONG *isolation, diff --git a/dlls/comsvcs/tests/property.c b/dlls/comsvcs/tests/property.c index adad7bd539..2cc7ff1d44 100644 --- a/dlls/comsvcs/tests/property.c +++ b/dlls/comsvcs/tests/property.c @@ -60,6 +60,57 @@ static const IUnknownVtbl outer_vtbl = static IUnknown test_outer = {&outer_vtbl}; +struct test_name_id +{ + const WCHAR *name; + DISPID id; +}; + +#define TEST_TYPEINFO(dispatch,test_name_ids,id_count,riid) _test_typeinfo(dispatch, test_name_ids, id_count, riid, __LINE__) +static void _test_typeinfo(IDispatch *dispatch, const struct test_name_id *test_name_ids, UINT id_count, REFIID riid, int line) +{ + static const LCID english = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + ITypeInfo *typeinfo; + TYPEATTR *typeattr; + ULONG refcount; + DISPID dispid; + UINT count; + BSTR names; + HRESULT hr; + int i; + + hr = IDispatch_GetTypeInfoCount(dispatch, NULL); + ok_(__FILE__,line)(hr == E_INVALIDARG, "GetTypeInfoCount got hr %#x.\n", hr); + + count = 0xdeadbeef; + hr = IDispatch_GetTypeInfoCount(dispatch, &count); + ok_(__FILE__,line)(hr == S_OK, "GetTypeInfoCount got hr %#x.\n", hr); + ok_(__FILE__,line)(count == 1, "Got unexpected count: %d.\n", count); + + hr = IDispatch_GetTypeInfo(dispatch, 1, english, &typeinfo); + ok_(__FILE__,line)(hr == DISP_E_BADINDEX, "GetTypeInfo got hr %#x.\n", hr); + + hr = IDispatch_GetTypeInfo(dispatch, 0, english, &typeinfo); + ok_(__FILE__,line)(hr == S_OK, "GetTypeInfo failed %#x.\n", hr); + hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); + ok_(__FILE__,line)(hr == S_OK, "GetTypeAttr got hr %#x.\n", hr); + ok_(__FILE__,line)(IsEqualGUID(&typeattr->guid, riid), + "Got unexpected type guid: %s.\n", wine_dbgstr_guid(&typeattr->guid)); + refcount = get_refcount(typeinfo); + ok_(__FILE__,line)(refcount == 2, "Got refcount: %u.\n", refcount); + ITypeInfo_Release(typeinfo); + + for (i = 0; i < id_count; i++) + { + names = SysAllocString(test_name_ids[i].name); + dispid = 0xdeadbeef; + hr = IDispatch_GetIDsOfNames(dispatch, &IID_NULL, &names, 1, english, &dispid); + SysFreeString(names); + ok_(__FILE__,line)(hr == S_OK, "tests[%d] got hr %#x.\n", i, hr); + ok_(__FILE__,line)(dispid == test_name_ids[i].id, "tests[%d] got wrong dispid %x.\n", i, dispid); + } +} + static void test_interfaces(void) { ISharedPropertyGroupManager *manager, *manager1; @@ -67,6 +118,12 @@ static void test_interfaces(void) IDispatch *dispatch; IUnknown *unk; HRESULT hr; + static const struct test_name_id test_name_ids[] = + { + {L"CreatePropertyGroup", 0x1}, + {L"Group", 0x2}, + {L"_NewEnum", DISPID_NEWENUM}, + }; hr = CoCreateInstance(&CLSID_SharedPropertyGroupManager, &test_outer, CLSCTX_INPROC_SERVER, &IID_ISharedPropertyGroupManager, (void **)&manager); @@ -100,6 +157,8 @@ static void test_interfaces(void) refcount = get_refcount(manager); ok(refcount == expected_refcount, "Got refcount: %u, expected %u.\n", refcount, expected_refcount); + TEST_TYPEINFO(dispatch, test_name_ids, ARRAY_SIZE(test_name_ids), &IID_ISharedPropertyGroupManager); + IDispatch_Release(dispatch); IUnknown_Release(unk); ISharedPropertyGroupManager_Release(manager); -- 2.28.0

2 1

[PATCH] winex11.drv: use vkGetPhysicalDeviceProperties2KHR to get gpu properties.
by Georg Lehmann 30 Aug '20

30 Aug '20

vkGetPhysicalDeviceProperties2 is a Vulkan 1.1 function but wine uses a 1.0 instance, so use the extension function instead. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winex11.drv/xrandr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index faeb4d98d9..6c16fb29ec 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -552,7 +552,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro }; const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ); VkResult (*pvkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * ); - PFN_vkGetPhysicalDeviceProperties2 pvkGetPhysicalDeviceProperties2; + PFN_vkGetPhysicalDeviceProperties2KHR pvkGetPhysicalDeviceProperties2KHR; PFN_vkEnumeratePhysicalDevices pvkEnumeratePhysicalDevices; uint32_t device_count, device_idx, output_idx; VkPhysicalDevice *vk_physical_devices = NULL; @@ -587,7 +587,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro } LOAD_VK_FUNC(vkEnumeratePhysicalDevices) - LOAD_VK_FUNC(vkGetPhysicalDeviceProperties2) + LOAD_VK_FUNC(vkGetPhysicalDeviceProperties2KHR) LOAD_VK_FUNC(vkGetRandROutputDisplayEXT) #undef LOAD_VK_FUNC @@ -624,7 +624,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; properties2.pNext = &id; - pvkGetPhysicalDeviceProperties2( vk_physical_devices[device_idx], &properties2 ); + pvkGetPhysicalDeviceProperties2KHR( vk_physical_devices[device_idx], &properties2 ); memcpy( &gpu->vulkan_uuid, id.deviceUUID, sizeof(id.deviceUUID) ); /* Ignore Khronos vendor IDs */ if (properties2.properties.vendorID < 0x10000) -- 2.28.0

2 1

Wine staging 5.16 release
by Alistair Leslie-Hughes 29 Aug '20

29 Aug '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.16 (653 patches are applied to wine vanilla) NOTE: Currently the esync patchset has been disabled until it can be rebased. Upstreamed (Either directly from staging or fixed with a similar patch). * ole32: Add a check for hglobal pointer to GetHGlobalFromStream. * winepulse: Don't rely on pulseaudio callbacks for timing * winepulse: fix segfault in pulse_rd_loop * winepulse: Fix up recording * winepulse.drv: Fix getting the same timing info. * winepulse: Update last time on underrun * winepulse: account for PA devices that fall way behind * winepulse: Fix local buffer offset wrapping * winepulse: Don't fake being one period behind in GetPosition Added: * [49689] xactengine3_7: Implement IXACT3Engine PrepareWave * [49739] Add netutils dll * [49739] Add srvcli dll * Added windows.gaming.input-dll for Death Stranding control support Updated: * mfplat-streaming-support Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] ntdll: Zero-initialize drive stack buffer.
by Jefferson Carpenter 29 Aug '20

29 Aug '20

1 0

[PATCH 1/4] quartz/vmr9: Avoid leaking the presenter's reference to the d3d9 device.
by Zebediah Figura 29 Aug '20

29 Aug '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/vmr9.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 3b42dd0ed52..8795995b849 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2670,6 +2670,8 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) IDirect3DSurface9_Release(surface); } + if (This->d3d9_dev) + IDirect3DDevice9_Release(This->d3d9_dev); free(This->d3d9_surfaces); This->d3d9_surfaces = NULL; This->num_surfaces = 0; -- 2.28.0

1 3

[PATCH v3 1/4] ntdll: Implement RtlGetExtendedContextLength().
by Paul Gofman 28 Aug '20

28 Aug '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - define in ddk/wdm.h for x86/x64 only. .../api-ms-win-core-xstate-l1-1-0.spec | 2 +- dlls/ntdll/exception.c | 71 +++++++++ dlls/ntdll/ntdll.spec | 2 + dlls/ntdll/tests/exception.c | 147 +++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 + include/ddk/wdm.h | 7 +- 6 files changed, 227 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec b/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec index 36a1c8812f0..15126e5ddfe 100644 --- a/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec +++ b/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec @@ -1,6 +1,6 @@ @ stub RtlCopyExtendedContext @ stdcall RtlGetEnabledExtendedFeatures(int64) ntdll.RtlGetEnabledExtendedFeatures -@ stub RtlGetExtendedContextLength +@ stdcall RtlGetExtendedContextLength(long ptr) ntdll.RtlGetExtendedContextLength @ stub RtlGetExtendedFeaturesMask @ stub RtlInitializeExtendedContext @ stub RtlLocateExtendedFeature diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 3f7443bb45b..1b212cdee7f 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -665,3 +665,74 @@ ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64 feature_mask) { return user_shared_data->XState.EnabledFeatures & feature_mask; } + +static const struct context_parameters +{ + ULONG arch_flag; + ULONG supported_flags; + ULONG context_size; /* sizeof(CONTEXT) */ + ULONG context_ex_size; /* sizeof(CONTEXT_EX) */ + ULONG alignment; +} +arch_context_paramaters[] = +{ + {0x00100000, 0xd810005f, 0x4d0, 0x20, 7}, + {0x00010000, 0xd801007f, 0x2cc, 0x18, 3}, +}; + +static const struct context_parameters *context_get_parameters( ULONG context_flags ) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(arch_context_paramaters); ++i) + { + if (context_flags & arch_context_paramaters[i].arch_flag) + return context_flags & ~arch_context_paramaters[i].supported_flags ? NULL : &arch_context_paramaters[i]; + } + return NULL; +} + + +/********************************************************************** + * RtlGetExtendedContextLength2 (NTDLL.@) + */ +ULONG64 WINAPI RtlGetExtendedContextLength2( ULONG context_flags, ULONG *length, ULONG64 compaction_mask ) +{ + const struct context_parameters *p; + ULONG64 supported_mask; + ULONG64 size; + + TRACE( "context_flags %#x, length %p, compaction_mask %s.\n", context_flags, length, + wine_dbgstr_longlong(compaction_mask) ); + + if (!(p = context_get_parameters( context_flags ))) + return STATUS_INVALID_PARAMETER; + + if (!(context_flags & 0x40)) + { + *length = p->context_size + p->context_ex_size + p->alignment; + return STATUS_SUCCESS; + } + + if (!(supported_mask = RtlGetEnabledExtendedFeatures( ~(ULONG64)0) )) + return STATUS_NOT_SUPPORTED; + + compaction_mask &= supported_mask; + + size = p->context_size + p->context_ex_size + offsetof(XSTATE, YmmContext) + 63; + + if (compaction_mask & supported_mask & (1 << XSTATE_AVX)) + size += sizeof(YMMCONTEXT); + + *length = size; + return STATUS_SUCCESS; +} + + +/********************************************************************** + * RtlGetExtendedContextLength (NTDLL.@) + */ +ULONG64 WINAPI RtlGetExtendedContextLength( ULONG context_flags, ULONG *length ) +{ + return RtlGetExtendedContextLength2( context_flags, length, ~(ULONG64)0 ); +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index db2fab19ba4..0e13540332c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -695,6 +695,8 @@ # @ stub RtlGetElementGenericTableAvl @ stdcall RtlGetEnabledExtendedFeatures(int64) @ stdcall RtlGetExePath(wstr ptr) +@ stdcall -ret64 RtlGetExtendedContextLength(long ptr) +@ stdcall -ret64 RtlGetExtendedContextLength2(long ptr int64) # @ stub RtlGetFirstRange @ stdcall RtlGetFrame() @ stdcall RtlGetFullPathName_U(wstr long ptr ptr) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index fbe437dc1f1..16854c4984f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -45,6 +45,8 @@ static PVOID (WINAPI *pRtlAddVectoredContinueHandler)(ULONG first, PVECTORED static ULONG (WINAPI *pRtlRemoveVectoredContinueHandler)(PVOID handler); static void (WINAPI *pRtlSetUnhandledExceptionFilter)(PRTL_EXCEPTION_FILTER filter); static ULONG64 (WINAPI *pRtlGetEnabledExtendedFeatures)(ULONG64); +static ULONG64 (WINAPI *pRtlGetExtendedContextLength)(ULONG context_flags, ULONG *length); +static ULONG64 (WINAPI *pRtlGetExtendedContextLength2)(ULONG context_flags, ULONG *length, ULONG64 compaction_mask); static NTSTATUS (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -6093,6 +6095,8 @@ done: return ExceptionContinueExecution; } +#define CONTEXT_NATIVE (CONTEXT_XSTATE & CONTEXT_CONTROL) + static void test_extended_context(void) { static BYTE except_code_set_ymm0[] = @@ -6129,19 +6133,156 @@ static void test_extended_context(void) 0xc5, 0xfc, 0x11, 0x00, /* vmovups %ymm0,(%ax) */ 0xc3, /* ret */ }; - unsigned int i, address_offset; + static const struct + { + ULONG flag; + ULONG supported_flags; + ULONG broken_flags; + ULONG context_length; + ULONG context_ex_length; + ULONG align; + } + context_arch[] = + { + { + 0x00100000, /* CONTEXT_AMD64 */ + 0xd800005f, + 0xd8000000, + 0x4d0, /* sizeof(CONTEXT) */ + 0x20, /* sizeof(CONTEXT_EX) */ + 7, + }, + { + 0x00010000, /* CONTEXT_X86 */ + 0xd800007f, + 0xd8000000, + 0x2cc, /* sizeof(CONTEXT) */ + 0x18, /* sizeof(CONTEXT_EX) */ + 3, + }, + }; + ULONG expected_length, expected_length_xstate; + unsigned int i, address_offset, test; + ULONG64 enabled_features; + ULONG ret, length; unsigned data[8]; + ULONG flags; address_offset = sizeof(void *) == 8 ? 2 : 1; *(void **)(except_code_set_ymm0 + address_offset) = data; *(void **)(except_code_reset_ymm_state + address_offset) = data; - if (!pRtlGetEnabledExtendedFeatures || !(pRtlGetEnabledExtendedFeatures(~(ULONG64)0) & (1 << XSTATE_AVX))) + if (!pRtlGetEnabledExtendedFeatures) + { + skip("RtlGetEnabledExtendedFeatures is not available.\n"); + return; + } + + enabled_features = pRtlGetEnabledExtendedFeatures(~(ULONG64)0); + + /* Test context manipulation functions. */ + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(0, &length); + ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, "Got unexpected result ret %#x, length %#x.\n", + ret, length); + + for (test = 0; test < ARRAY_SIZE(context_arch); ++test) + { + expected_length = context_arch[test].context_length + context_arch[test].context_ex_length + + context_arch[test].align; + expected_length_xstate = context_arch[test].context_length + context_arch[test].context_ex_length + + sizeof(XSTATE) + 63; + + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(context_arch[test].flag, &length); + ok(!ret && length == expected_length, "Got unexpected result ret %#x, length %#x.\n", + ret, length); + + for (i = 0; i < 32; ++i) + { + if (i == 6) /* CONTEXT_XSTATE */ + continue; + + flags = context_arch[test].flag | (1 << i); + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(flags, &length); + + if ((context_arch[test].supported_flags & flags) || flags == context_arch[test].flag) + { + ok((!ret && length == expected_length) + || broken((context_arch[test].broken_flags & (1 << i)) + && ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef), + "Got unexpected result ret %#x, length %#x, flags 0x%08x.\n", + ret, length, flags); + } + else + { + ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, + "Got unexpected result ret %#x, length %#x, flags 0x%08x.\n", ret, length, flags); + } + } + + flags = context_arch[test].flag | 0x40; + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(flags, &length); + + if (!enabled_features) + { + ok(ret == STATUS_NOT_SUPPORTED && length == 0xdeadbeef, + "Got unexpected result ret %#x, length %#x.\n", ret, length); + continue; + } + + ok(!ret && length >= expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + if (!pRtlGetExtendedContextLength2) + { + win_skip("RtlGetExtendedContextLength2 is not available.\n"); + continue; + } + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 7); + ok(!ret && length == expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, ~0); + ok(!ret && length >= expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 0); + ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT), + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 3); + ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT), + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 4); + ok(!ret && length == expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + } + + if (0) + { + /* Crashes on Windows. */ + pRtlGetExtendedContextLength(CONTEXT_FULL, NULL); + } + + if (!(enabled_features & (1 << XSTATE_AVX))) { skip("AVX is not supported.\n"); return; } + /* Test fault exception context. */ memset(data, 0xff, sizeof(data)); test_extended_context_modified_state = FALSE; run_exception_test(test_extended_context_handler, NULL, except_code_reset_ymm_state, @@ -6206,6 +6347,8 @@ START_TEST(exception) X(RtlGetUnloadEventTrace); X(RtlGetUnloadEventTraceEx); X(RtlGetEnabledExtendedFeatures); + X(RtlGetExtendedContextLength); + X(RtlGetExtendedContextLength2); #undef X pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0e8082fad26..45024a3a8da 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1096,6 +1096,8 @@ @ stub RtlGetDefaultCodePage @ stub RtlGetElementGenericTable @ stub RtlGetElementGenericTableAvl +@ stdcall RtlGetExtendedContextLength(long ptr) +@ stdcall RtlGetExtendedContextLength2(long ptr int64) @ stub RtlGetFirstRange @ stdcall RtlGetGroupSecurityDescriptor(ptr ptr ptr) @ stub RtlGetNextRange diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index cc841326979..691e519744f 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1836,12 +1836,17 @@ HANDLE WINAPI PsGetProcessInheritedFromUniqueProcessId(PEPROCESS); BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS); +#if defined(__x86_64__) || defined(__i386__) +ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64); +ULONG64 WINAPI RtlGetExtendedContextLength(ULONG,ULONG*); +ULONG64 WINAPI RtlGetExtendedContextLength2(ULONG,ULONG*,ULONG64); +#endif + #ifdef __x86_64__ void WINAPI RtlCopyMemoryNonTemporal(void*,const void*,SIZE_T); #else #define RtlCopyMemoryNonTemporal RtlCopyMemory #endif -ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64); BOOLEAN WINAPI RtlIsNtDdiVersionAvailable(ULONG); NTSTATUS WINAPI ZwAddBootEntry(PUNICODE_STRING,PUNICODE_STRING); -- 2.26.2

3 7

[PATCH 1/4] qcap/tests: Refactor interface testing.
by Jeff Smith 28 Aug '20

28 Aug '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- Supersede 191486 Based on Zebediah Figura's recommendations, I looked into how setting a pin's stream format would affect the media type enumeration. It turned out that it forces the enumeration down to the single format that was set. It remains this way until the filter is released. So it is necessary to track whether the stream format has been explicitly set, and respond to enumeration requests accordingly. dlls/qcap/tests/videocapture.c | 50 ++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 80d4899410..326601a398 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -174,7 +174,30 @@ static void test_stream_config(IPin *pin) IAMStreamConfig_Release(stream_config); } -static void test_capture(IBaseFilter *filter) +static void test_pin_interfaces(IPin *pin) +{ + todo_wine check_interface(pin, &IID_IAMBufferNegotiation, TRUE); + check_interface(pin, &IID_IAMStreamConfig, TRUE); + todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); + todo_wine check_interface(pin, &IID_IKsPin, TRUE); + check_interface(pin, &IID_IKsPropertySet, TRUE); + todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + todo_wine check_interface(pin, &IID_ISpecifyPropertyPages, TRUE); + + check_interface(pin, &IID_IAMCrossbar, FALSE); + check_interface(pin, &IID_IAMDroppedFrames, FALSE); + check_interface(pin, &IID_IAMFilterMiscFlags, FALSE); + check_interface(pin, &IID_IAMPushSource, FALSE); + check_interface(pin, &IID_IAMTVTuner, FALSE); + check_interface(pin, &IID_IAMVideoCompression, FALSE); + check_interface(pin, &IID_IAMVideoProcAmp, FALSE); + check_interface(pin, &IID_IPersistPropertyBag, FALSE); + check_interface(pin, &IID_IStreamBuilder, FALSE); +} + +static void test_pins(IBaseFilter *filter) { IEnumPins *enum_pins; IPin *pin; @@ -189,32 +212,18 @@ static void test_capture(IBaseFilter *filter) IPin_QueryDirection(pin, &pin_direction); if (pin_direction == PINDIR_OUTPUT) { + test_pin_interfaces(pin); test_media_types(pin); test_stream_config(pin); - - todo_wine check_interface(pin, &IID_IAMBufferNegotiation, TRUE); - check_interface(pin, &IID_IAMStreamConfig, TRUE); - todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); - check_interface(pin, &IID_IKsPropertySet, TRUE); - todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); - check_interface(pin, &IID_IPin, TRUE); - todo_wine check_interface(pin, &IID_IQualityControl, TRUE); - todo_wine check_interface(pin, &IID_ISpecifyPropertyPages, TRUE); - - check_interface(pin, &IID_IAMCrossbar, FALSE); - check_interface(pin, &IID_IAMDroppedFrames, FALSE); - check_interface(pin, &IID_IAMFilterMiscFlags, FALSE); - check_interface(pin, &IID_IAMPushSource, FALSE); - check_interface(pin, &IID_IAMTVTuner, FALSE); - check_interface(pin, &IID_IAMVideoCompression, FALSE); - check_interface(pin, &IID_IAMVideoProcAmp, FALSE); - check_interface(pin, &IID_IPersistPropertyBag, FALSE); } IPin_Release(pin); } IEnumPins_Release(enum_pins); +} +static void test_filter_interfaces(IBaseFilter *filter) +{ check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); check_interface(filter, &IID_IAMVideoControl, TRUE); check_interface(filter, &IID_IAMVideoProcAmp, TRUE); @@ -287,7 +296,8 @@ START_TEST(videocapture) hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IBaseFilter, (void**)&filter); if (hr == S_OK) { - test_capture(filter); + test_filter_interfaces(filter); + test_pins(filter); test_misc_flags(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); -- 2.23.0

2 9

[PATCH] devenum: Correct the size of "name" in register_avicap_devices().
by Zebediah Figura 28 Aug '20

28 Aug '20

Fixes: b6f2e9b130da6ba1513f29e6ec271e2470749d17 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/createdevenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index c72bb683f96..f7b53ad271f 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -726,7 +726,7 @@ static void register_avicap_devices(void) REGFILTERPINS2 rgpins = {0}; REGPINTYPES rgtypes; REGFILTER2 rgf; - WCHAR name[6]; + WCHAR name[7]; VARIANT var; HRESULT hr; int i = 0; -- 2.28.0

1 0

[PATCH v3 1/5] mfplat: Remove fallback media source.
by Derek Lesho 28 Aug '20

28 Aug '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v3: - Split up stub media source patch. - Add this patch to simply tests. - Add newlines to end of files. --- dlls/mfplat/main.c | 207 +------------------------------------ dlls/mfplat/tests/mfplat.c | 106 +++++++++++-------- 2 files changed, 64 insertions(+), 249 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 6cd409d63b7..ea1b1770e15 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5679,188 +5679,6 @@ HRESULT WINAPI MFGetPluginControl(IMFPluginControl **ret) return S_OK; } -typedef struct _mfsource -{ - IMFMediaSource IMFMediaSource_iface; - LONG ref; -} mfsource; - -static inline mfsource *impl_from_IMFMediaSource(IMFMediaSource *iface) -{ - return CONTAINING_RECORD(iface, mfsource, IMFMediaSource_iface); -} - -static HRESULT WINAPI mfsource_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); - - if (IsEqualIID(riid, &IID_IMFMediaSource) || - IsEqualIID(riid, &IID_IMFMediaEventGenerator) || - IsEqualIID(riid, &IID_IUnknown)) - { - *out = &This->IMFMediaSource_iface; - } - else - { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); - *out = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*out); - return S_OK; -} - -static ULONG WINAPI mfsource_AddRef(IMFMediaSource *iface) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%u\n", This, ref); - - return ref; -} - -static ULONG WINAPI mfsource_Release(IMFMediaSource *iface) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%u\n", This, ref); - - if (!ref) - { - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - -static HRESULT WINAPI mfsource_GetEvent(IMFMediaSource *iface, DWORD flags, IMFMediaEvent **event) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p)->(%#x, %p)\n", This, flags, event); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_BeginGetEvent(IMFMediaSource *iface, IMFAsyncCallback *callback, IUnknown *state) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p)->(%p, %p)\n", This, callback, state); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_EndGetEvent(IMFMediaSource *iface, IMFAsyncResult *result, IMFMediaEvent **event) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p)->(%p, %p)\n", This, result, event); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_QueueEvent(IMFMediaSource *iface, MediaEventType event_type, REFGUID ext_type, - HRESULT hr, const PROPVARIANT *value) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p)->(%d, %s, %#x, %p)\n", This, event_type, debugstr_guid(ext_type), hr, value); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_GetCharacteristics(IMFMediaSource *iface, DWORD *characteristics) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p)->(%p): stub\n", This, characteristics); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **descriptor) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - IMFStreamDescriptor *sd; - IMFMediaType *mediatype; - HRESULT hr; - - FIXME("(%p)->(%p): stub\n", This, descriptor); - - if (FAILED(hr = MFCreateMediaType(&mediatype))) - return hr; - - hr = MFCreateStreamDescriptor(0, 1, &mediatype, &sd); - IMFMediaType_Release(mediatype); - if (FAILED(hr)) - return hr; - - hr = MFCreatePresentationDescriptor(1, &sd, descriptor); - IMFStreamDescriptor_Release(sd); - - return hr; -} - -static HRESULT WINAPI mfsource_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor, - const GUID *time_format, const PROPVARIANT *start_position) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p)->(%p, %p, %p): stub\n", This, descriptor, time_format, start_position); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_Stop(IMFMediaSource *iface) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p): stub\n", This); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_Pause(IMFMediaSource *iface) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p): stub\n", This); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfsource_Shutdown(IMFMediaSource *iface) -{ - mfsource *This = impl_from_IMFMediaSource(iface); - - FIXME("(%p): stub\n", This); - - return S_OK; -} - -static const IMFMediaSourceVtbl mfsourcevtbl = -{ - mfsource_QueryInterface, - mfsource_AddRef, - mfsource_Release, - mfsource_GetEvent, - mfsource_BeginGetEvent, - mfsource_EndGetEvent, - mfsource_QueueEvent, - mfsource_GetCharacteristics, - mfsource_CreatePresentationDescriptor, - mfsource_Start, - mfsource_Stop, - mfsource_Pause, - mfsource_Shutdown, -}; - enum resolved_object_origin { OBJECT_FROM_BYTESTREAM, @@ -6505,7 +6323,7 @@ static HRESULT WINAPI source_resolver_CreateObjectFromByteStream(IMFSourceResolv return E_POINTER; if (FAILED(hr = resolver_get_bytestream_handler(stream, url, flags, &handler))) - goto fallback; + return MF_E_UNSUPPORTED_BYTESTREAM_TYPE; hr = RtwqCreateAsyncResult((IUnknown *)handler, NULL, NULL, &result); IMFByteStreamHandler_Release(handler); @@ -6528,28 +6346,7 @@ static HRESULT WINAPI source_resolver_CreateObjectFromByteStream(IMFSourceResolv hr = resolver_end_create_object(resolver, OBJECT_FROM_BYTESTREAM, result, obj_type, object); IRtwqAsyncResult_Release(result); - /* TODO: following stub is left intentionally until real source plugins are implemented. */ - if (SUCCEEDED(hr)) - return hr; - -fallback: - if (flags & MF_RESOLUTION_MEDIASOURCE) - { - mfsource *new_object; - - new_object = HeapAlloc( GetProcessHeap(), 0, sizeof(*new_object) ); - if (!new_object) - return E_OUTOFMEMORY; - - new_object->IMFMediaSource_iface.lpVtbl = &mfsourcevtbl; - new_object->ref = 1; - - *object = (IUnknown *)&new_object->IMFMediaSource_iface; - *obj_type = MF_OBJECT_MEDIASOURCE; - return S_OK; - } - - return E_NOTIMPL; + return hr; } static HRESULT WINAPI source_resolver_BeginCreateObjectFromURL(IMFSourceResolver *iface, const WCHAR *url, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 01749dd9ef8..fa90f1e4bac 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -382,12 +382,16 @@ static HRESULT WINAPI test_create_from_file_handler_callback_Invoke(IMFAsyncCall handler = (IMFSchemeHandler *)IMFAsyncResult_GetStateNoAddRef(result); hr = IMFSchemeHandler_EndCreateObject(handler, result, &obj_type, &object); +todo_wine ok(hr == S_OK, "Failed to create an object, hr %#x.\n", hr); - hr = IMFAsyncResult_GetObject(result, &object2); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IMFAsyncResult_GetObject(result, &object2); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); - IUnknown_Release(object); + IUnknown_Release(object); + } SetEvent(callback->event); @@ -502,13 +506,43 @@ static void test_source_resolver(void) hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, &obj_type, (IUnknown **)&mediasource); - todo_wine ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); + ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); if (hr == S_OK) IMFMediaSource_Release(mediasource); hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, (IUnknown **)&mediasource); - todo_wine ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); + ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); + + IMFByteStream_Release(stream); + + /* Create from URL. */ + callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); + + hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"nonexisting.mp4", MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, + (IUnknown **)&stream); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#x.\n", hr); + + hr = IMFSourceResolver_CreateObjectFromURL(resolver, filename, MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, + (IUnknown **)&stream); + ok(hr == S_OK, "Failed to resolve url, hr %#x.\n", hr); + IMFByteStream_Release(stream); + + hr = IMFSourceResolver_BeginCreateObjectFromURL(resolver, filename, MF_RESOLUTION_BYTESTREAM, NULL, + &cancel_cookie, &callback.IMFAsyncCallback_iface, (IUnknown *)resolver); + ok(hr == S_OK, "Create request failed, hr %#x.\n", hr); + ok(cancel_cookie != NULL, "Unexpected cancel object.\n"); + IUnknown_Release(cancel_cookie); + + if (SUCCEEDED(hr)) + WaitForSingleObject(callback.event, INFINITE); + + /* With explicit scheme. */ + lstrcpyW(pathW, fileschemeW); + lstrcatW(pathW, filename); + hr = IMFSourceResolver_CreateObjectFromURL(resolver, pathW, MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, + (IUnknown **)&stream); + ok(hr == S_OK, "Failed to resolve url, hr %#x.\n", hr); IMFByteStream_Release(stream); /* We have to create a new bytestream here, because all following @@ -522,14 +556,31 @@ static void test_source_resolver(void) ok(hr == S_OK, "Failed to set string value, hr %#x.\n", hr); IMFAttributes_Release(attributes); + /* Start of gstreamer dependent tests */ + hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, &obj_type, (IUnknown **)&mediasource); - ok(hr == S_OK, "got 0x%08x\n", hr); + if (strcmp(winetest_platform, "wine")) + ok(hr == S_OK, "got 0x%08x\n", hr); + if (FAILED(hr)) + { + IMFByteStream_Release(stream); + IMFSourceResolver_Release(resolver); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + DeleteFileW(filename); + return; + } ok(mediasource != NULL, "got %p\n", mediasource); ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor); +todo_wine ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); + if (FAILED(hr)) + goto skip_source_tests; ok(descriptor != NULL, "got %p\n", descriptor); hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(descriptor, 0, &selected, &sd); @@ -540,10 +591,7 @@ static void test_source_resolver(void) IMFStreamDescriptor_Release(sd); hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); -todo_wine ok(hr == S_OK, "Failed to get stream major type, hr %#x.\n", hr); - if (FAILED(hr)) - goto skip_source_tests; /* Check major/minor type for the test media. */ ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected major type %s.\n", debugstr_guid(&guid)); @@ -624,6 +672,7 @@ todo_wine get_event((IMFMediaEventGenerator *)mediasource, MEEndOfPresentation, NULL); IMFMediaTypeHandler_Release(handler); + IMFPresentationDescriptor_Release(descriptor); hr = IMFMediaSource_Shutdown(mediasource); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -633,42 +682,9 @@ todo_wine skip_source_tests: - IMFPresentationDescriptor_Release(descriptor); IMFMediaSource_Release(mediasource); IMFByteStream_Release(stream); - /* Create from URL. */ - callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); - - hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"nonexisting.mp4", MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, - (IUnknown **)&stream); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#x.\n", hr); - - hr = IMFSourceResolver_CreateObjectFromURL(resolver, filename, MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, - (IUnknown **)&stream); - ok(hr == S_OK, "Failed to resolve url, hr %#x.\n", hr); - IMFByteStream_Release(stream); - - hr = IMFSourceResolver_BeginCreateObjectFromURL(resolver, filename, MF_RESOLUTION_BYTESTREAM, NULL, - &cancel_cookie, &callback.IMFAsyncCallback_iface, (IUnknown *)resolver); - ok(hr == S_OK, "Create request failed, hr %#x.\n", hr); - ok(cancel_cookie != NULL, "Unexpected cancel object.\n"); - IUnknown_Release(cancel_cookie); - - if (SUCCEEDED(hr)) - WaitForSingleObject(callback.event, INFINITE); - - /* With explicit scheme. */ - lstrcpyW(pathW, fileschemeW); - lstrcatW(pathW, filename); - - hr = IMFSourceResolver_CreateObjectFromURL(resolver, pathW, MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, - (IUnknown **)&stream); - ok(hr == S_OK, "Failed to resolve url, hr %#x.\n", hr); - IMFByteStream_Release(stream); - - IMFSourceResolver_Release(resolver); - /* Create directly through scheme handler. */ hr = CoInitialize(NULL); ok(SUCCEEDED(hr), "Failed to initialize, hr %#x.\n", hr); @@ -693,12 +709,14 @@ skip_source_tests: if (do_uninit) CoUninitialize(); + CloseHandle(callback.event); + + IMFSourceResolver_Release(resolver); + hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); DeleteFileW(filename); - - CloseHandle(callback.event); } static void init_functions(void) -- 2.28.0

3 15

[PATCH] [website] Add Component column to Regressions page.
by Andrey Gusev 28 Aug '20

28 Aug '20

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- template/en/default/global/sidebar.html.tmpl | 2 +- template/en/default/index.html.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index 453bf70..82ed7dd 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -23,7 +23,7 @@ [% INCLUDE global/menu_start.html.tmpl bt = 'Task Lists' %] - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=regression&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc,changeddate&keywords_type=anywords">Regressions</a></li> + <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=regression&columnlist=bug_severity,priority,bug_status,component,cf_regression_sha1sum,short_desc,changeddate&keywords_type=anywords">Regressions</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=download&keywords_type=anywords">With download</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=patch&keywords_type=anywords">With patch</a></li> [% INCLUDE global/menu_end.html.tmpl %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 7934785..4210be2 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -150,7 +150,7 @@ YAHOO.util.Event.onDOMReady(onLoadActions); The bugs we are currently working on are organized into Task lists. <ol class="wine_index_list"> - <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc,changeddate&keywords=regression&keywords_type=anywords">Regressions</a> + <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&columnlist=bug_severity,priority,bug_status,component,cf_regression_sha1sum,short_desc,changeddate&keywords=regression&keywords_type=anywords">Regressions</a> Bugs introduced as result of a regression. </li> -- 2.26.2

1 0

[PATCH] winmm: Pass a fullpath to CreateFileA
by Alistair Leslie-Hughes 28 Aug '20

28 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winmm/mmio.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 48bbd3ed48..a3e2650f50 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -52,6 +52,9 @@ static WINE_MMIO *MMIOList; static HANDLE create_file_OF( LPCSTR path, INT mode ) { DWORD access, sharing, creation; + HANDLE ret; + char *fullpath = NULL; + DWORD len; if (mode & OF_CREATE) { @@ -79,7 +82,20 @@ static HANDLE create_file_OF( LPCSTR path, INT mode ) case OF_SHARE_COMPAT: default: sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; } - return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + len = SearchPathA( NULL, path, NULL, 0, fullpath, NULL ); + if (!len) + return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + fullpath = HeapAlloc(GetProcessHeap(), 0, len); + if (!fullpath) + return INVALID_HANDLE_VALUE; + + SearchPathA( NULL, path, NULL, len, fullpath, NULL ); + ret = CreateFileA( fullpath, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + HeapFree(GetProcessHeap(), 0, fullpath); + return ret; } /************************************************************************** -- 2.28.0

2 2

[PATCH] po: Update German translation.
by Julian Rüger 28 Aug '20

28 Aug '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 4/4] conhost: Implement IOCTL_CONDRV_READ_OUTPUT.
by Jacek Caban 28 Aug '20

28 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 82 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+)

1 0

[PATCH 3/4] conhost: Implement IOCTL_CONDRV_WRITE_OUTPUT.
by Jacek Caban 28 Aug '20

28 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 82 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+)

1 0

[PATCH 2/4] conhost: Implement IOCTL_CONDRV_SET_OUTPUT_INFO.
by Jacek Caban 28 Aug '20

28 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 199 +++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+)

1 0

[PATCH 1/4] conhost: Implement IOCTL_CONDRV_GET_OUTPUT_INFO.
by Jacek Caban 28 Aug '20

28 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 76 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+)

1 0

[PATCH] winedump: Fix the dumping of arm64 packed float restoration
by Martin Storsjo 28 Aug '20

28 Aug '20

This previously dumped one register pair too few. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- tools/winedump/pe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index f03c523be0..fef95c6bb6 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1412,7 +1412,7 @@ static void dump_arm64_packed_info( const struct runtime_function_arm64 *func ) { if (func->u.s.RegF % 2 == 0) printf( " %04x: str d%u,[sp,#%#x]\n", pos++, 8 + func->u.s.RegF, intsz + fpsz - 8 ); - for (i = func->u.s.RegF / 2 - 1; i >= 0; i--) + for (i = (func->u.s.RegF - 1)/ 2; i >= 0; i--) { if (!i && !intsz) printf( " %04x: stp d8,d9,[sp,-#%#x]!\n", pos++, savesz ); -- 2.17.1

1 0

[PATCH 1/4] ole32: Remove unused helper.
by Nikolay Sivov 28 Aug '20

28 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/compobj.c | 37 ------------------------------------ dlls/ole32/compobj_private.h | 1 - 2 files changed, 38 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index dfd81a8d0f5..18580e9b235 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -772,43 +772,6 @@ HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY return S_OK; } -/* open HKCR\\AppId\\{string form of appid clsid} key */ -HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey) -{ - static const WCHAR szAppId[] = { 'A','p','p','I','d',0 }; - static const WCHAR szAppIdKey[] = { 'A','p','p','I','d','\\',0 }; - DWORD res; - WCHAR buf[CHARS_IN_GUID]; - WCHAR keyname[ARRAY_SIZE(szAppIdKey) + CHARS_IN_GUID]; - DWORD size; - HKEY hkey; - DWORD type; - HRESULT hr; - - /* read the AppID value under the class's key */ - hr = COM_OpenKeyForCLSID(clsid, NULL, KEY_READ, &hkey); - if (FAILED(hr)) - return hr; - - size = sizeof(buf); - res = RegQueryValueExW(hkey, szAppId, NULL, &type, (LPBYTE)buf, &size); - RegCloseKey(hkey); - if (res == ERROR_FILE_NOT_FOUND) - return REGDB_E_KEYMISSING; - else if (res != ERROR_SUCCESS || type!=REG_SZ) - return REGDB_E_READREGDB; - - lstrcpyW(keyname, szAppIdKey); - lstrcatW(keyname, buf); - res = open_classes_key(HKEY_CLASSES_ROOT, keyname, access, subkey); - if (res == ERROR_FILE_NOT_FOUND) - return REGDB_E_KEYMISSING; - else if (res != ERROR_SUCCESS) - return REGDB_E_READREGDB; - - return S_OK; -} - /*** * This internal method is used to scan the registered class list to * find a class object. diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 6e14d69e424..7a571352d32 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -189,7 +189,6 @@ extern void release_std_git(void) DECLSPEC_HIDDEN; extern HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *key) DECLSPEC_HIDDEN; -HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey) DECLSPEC_HIDDEN; HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; -- 2.28.0

3 8

[PATCH] include: Add more eAVEncH264VProfile enums
by Alistair Leslie-Hughes 28 Aug '20

28 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/codecapi.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/codecapi.h b/include/codecapi.h index 1d9fd7e255..a250d20250 100644 --- a/include/codecapi.h +++ b/include/codecapi.h @@ -30,6 +30,14 @@ enum eAVEncH264VProfile eAVEncH264VProfile_High10 = 110, eAVEncH264VProfile_444 = 244, eAVEncH264VProfile_Extended = 88, + eAVEncH264VProfile_ScalableBase = 83, + eAVEncH264VProfile_ScalableHigh = 86, + eAVEncH264VProfile_MultiviewHigh = 118, + eAVEncH264VProfile_StereoHigh = 128, + eAVEncH264VProfile_ConstrainedBase = 256, + eAVEncH264VProfile_UCConstrainedHigh = 257, + eAVEncH264VProfile_UCScalableConstrainedBase = 258, + eAVEncH264VProfile_UCScalableConstrainedHigh = 259 }; enum eAVEncH264VLevel -- 2.28.0

1 0

[PATCH] ws2_32: Very minimal support for AF_UNIX.
by Richard W.M. Jones 27 Aug '20

27 Aug '20

This is the most minimal support for AF_UNIX. Windows 10 has had AF_UNIX support for a while: https://devblogs.microsoft.com/commandline/af_unix-comes-to-windows/ Signed-off-by: Richard W.M. Jones <rjones(a)redhat.com> --- dlls/ws2_32/socket.c | 34 ++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/afunix.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4d2afa946b..a42fe0e7a8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -132,6 +132,8 @@ # include <sys/time.h> #endif +#include <sys/un.h> + #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "ntstatus.h" @@ -151,6 +153,7 @@ #include "wshisotp.h" #include "mstcpip.h" #include "af_irda.h" +#include "afunix.h" #include "winnt.h" #define USE_WC_PREFIX /* For CMSG_DATA */ #include "iphlpapi.h" @@ -745,6 +748,7 @@ static const int ws_ipv6_map[][2] = static const int ws_af_map[][2] = { MAP_OPTION( AF_UNSPEC ), + MAP_OPTION( AF_UNIX ), MAP_OPTION( AF_INET ), MAP_OPTION( AF_INET6 ), #ifdef HAS_IPX @@ -1802,6 +1806,7 @@ static inline BOOL supported_pf(int pf) { switch (pf) { + case WS_AF_UNIX: case WS_AF_INET: case WS_AF_INET6: return TRUE; @@ -1900,6 +1905,18 @@ static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsadd memcpy(&uin->sin_addr,&win->sin_addr,4); /* 4 bytes = 32 address bits */ break; } + case WS_AF_UNIX: { + struct sockaddr_un* un = (struct sockaddr_un *)uaddr; + const struct WS_sockaddr_un* wun = (const struct WS_sockaddr_un*)wsaddr; + + if (wsaddrlen<sizeof(struct WS_sockaddr_un)) + return 0; + uaddrlen = sizeof(struct sockaddr_un); + memset( uaddr, 0, uaddrlen ); + un->sun_family = AF_UNIX; + memcpy(&un->sun_path, &wun->sun_path, __WINE_UNIX_PATH_MAX); + break; + } #ifdef HAS_IRDA case WS_AF_IRDA: { struct sockaddr_irda *uin = (struct sockaddr_irda *)uaddr; @@ -1984,6 +2001,12 @@ static BOOL is_sockaddr_bound(const struct sockaddr *uaddr, int uaddrlen) const struct sockaddr_in *in = (const struct sockaddr_in*) uaddr; return in->sin_port || memcmp(&in->sin_addr, &emptyAddr.sin_addr, sizeof(struct in_addr)); } + case AF_UNIX: + { + static const struct sockaddr_un emptyAddr; + const struct sockaddr_un *un = (const struct sockaddr_un*) uaddr; + return memcmp(&un->sun_path, &emptyAddr.sun_path, __WINE_UNIX_PATH_MAX); + } case AF_UNSPEC: return FALSE; default: @@ -2108,6 +2131,17 @@ static int ws_sockaddr_u2ws(const struct sockaddr* uaddr, struct WS_sockaddr* ws *wsaddrlen = sizeof(struct WS_sockaddr_in); return 0; } + case AF_UNIX: { + const struct sockaddr_un* un = (const struct sockaddr_un*)uaddr; + struct WS_sockaddr_un* wun = (struct WS_sockaddr_un*)wsaddr; + + if (*wsaddrlen < sizeof(struct WS_sockaddr_un)) + return -1; + wun->sun_family = WS_AF_INET; + memcpy(&wun->sun_path, &un->sun_path, __WINE_UNIX_PATH_MAX); + *wsaddrlen = sizeof(struct WS_sockaddr_un); + return 0; + } case AF_UNSPEC: { memset(wsaddr,0,*wsaddrlen); return 0; diff --git a/include/Makefile.in b/include/Makefile.in index 49b174ed31..3513b88c23 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -11,6 +11,7 @@ SOURCES = \ adshlp.h \ advpub.h \ af_irda.h \ + afunix.h \ amaudio.h \ amsi.idl \ amstream.idl \ diff --git a/include/afunix.h b/include/afunix.h new file mode 100644 index 0000000000..4266e5f84b --- /dev/null +++ b/include/afunix.h @@ -0,0 +1,43 @@ +/* AFUNIX.H + * + * Copyright (C) the Wine project + * + * 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 + */ + +#ifndef __WINE_AFUNIX_H +#define __WINE_AFUNIX_H + +#define __WINE_UNIX_PATH_MAX 108 + +#ifdef USE_WS_PREFIX + +struct WS_sockaddr_un +{ + ADDRESS_FAMILY sun_family; + char sun_path[__WINE_UNIX_PATH_MAX]; +}; + +#else + +struct sockaddr_un +{ + ADDRESS_FAMILY sun_family; + char sun_path[__WINE_UNIX_PATH_MAX]; +}; + +#endif + +#endif /* __WINE_AFUNIX_H */ -- 2.27.0

1 0

[PATCH vkd3d 1/5] include: Add basic documentation for vkd3d_types.h.
by Zebediah Figura 27 Aug '20

27 Aug '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This is built on Doxygen. I'm not personally attached to Doxygen, but it was easy enough to set up and write for, and I've found its compiled HTML to be reasonably legible. Note that Doxygen does allow for specifying documentation in external files, if keeping the documentation out of the header is desired. .gitignore | 2 + Doxyfile.in | 17 ++ Makefile.am | 2 + configure.ac | 3 + include/vkd3d_types.h | 15 +- m4/ax_prog_doxygen.m4 | 586 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 624 insertions(+), 1 deletion(-) create mode 100644 Doxyfile.in create mode 100644 m4/ax_prog_doxygen.m4 diff --git a/.gitignore b/.gitignore index 72037ddb..51cba319 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ autom4te.cache config.log config.status configure +doc +Doxyfile libtool Makefile Makefile.in diff --git a/Doxyfile.in b/Doxyfile.in new file mode 100644 index 00000000..f5f88dbf --- /dev/null +++ b/Doxyfile.in @@ -0,0 +1,17 @@ +# Doxyfile 1.8.18 + +DOXYFILE_ENCODING = UTF-8 +PROJECT_NAME = @PACKAGE_NAME@ +PROJECT_NUMBER = @PACKAGE_VERSION@ +PROJECT_BRIEF = "D3D12 to Vulkan translation library" +OUTPUT_DIRECTORY = @srcdir@/doc +JAVADOC_AUTOBRIEF = YES +OPTIMIZE_OUTPUT_FOR_C = YES +EXTRACT_STATIC = YES + +INPUT = @srcdir@/include/vkd3d.h \ + @srcdir@/include/vkd3d_shader.h \ + @srcdir@/include/vkd3d_types.h \ + @srcdir@/include/vkd3d_utils.h + +EXCLUDE_SYMBOLS = VKD3D_FORCE_32_BIT_ENUM diff --git a/Makefile.am b/Makefile.am index 58b3174c..b3d3eb63 100644 --- a/Makefile.am +++ b/Makefile.am @@ -167,6 +167,8 @@ demos_triangle_CFLAGS = $(DEMOS_CFLAGS) demos_triangle_LDADD = $(DEMOS_LDADD) endif +@DX_RULES@ + EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers) VKD3D_V_WIDL = $(vkd3d_v_widl_@AM_V@) diff --git a/configure.ac b/configure.ac index ca9d7600..2ce226b6 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,9 @@ AC_PROG_MKDIR_P VKD3D_PROG_WIDL(3, 20) AS_IF([test "x$WIDL" = "xno"], [AC_MSG_WARN([widl is required to build header files.])]) +DX_INIT_DOXYGEN(vkd3d, [Doxyfile], [doc]) +AC_CONFIG_FILES([Doxyfile]) + AM_INIT_AUTOMAKE([1.11 foreign silent-rules subdir-objects no-dist-gzip dist-xz -Wall -Werror]) AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) diff --git a/include/vkd3d_types.h b/include/vkd3d_types.h index 34c66748..cdb8ee61 100644 --- a/include/vkd3d_types.h +++ b/include/vkd3d_types.h @@ -23,15 +23,28 @@ extern "C" { #endif /* __cplusplus */ +/** + * \file vkd3d_types.h + * + * This file contains definitions for basic types used by vkd3d libraries. + */ + #define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff +/** Result codes returned by some vkd3d functions. */ enum vkd3d_result { + /** Success. */ VKD3D_OK = 0, - VKD3D_ERROR = -1, /* unspecified failure */ + /** An unspecified failure occurred. */ + VKD3D_ERROR = -1, + /** There are not enough resources available to complete the operation. */ VKD3D_ERROR_OUT_OF_MEMORY = -2, + /** One or more parameters passed to a vkd3d function were invalid. */ VKD3D_ERROR_INVALID_ARGUMENT = -3, + /** A shader passed to a vkd3d function was invalid. */ VKD3D_ERROR_INVALID_SHADER = -4, + /** The operation is not implemented in this version of vkd3d. */ VKD3D_ERROR_NOT_IMPLEMENTED = -5, VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4 new file mode 100644 index 00000000..ed1dc83b --- /dev/null +++ b/m4/ax_prog_doxygen.m4 @@ -0,0 +1,586 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_doxygen.html +# =========================================================================== +# +# SYNOPSIS +# +# DX_INIT_DOXYGEN(PROJECT-NAME, [DOXYFILE-PATH], [OUTPUT-DIR], ...) +# DX_DOXYGEN_FEATURE(ON|OFF) +# DX_DOT_FEATURE(ON|OFF) +# DX_HTML_FEATURE(ON|OFF) +# DX_CHM_FEATURE(ON|OFF) +# DX_CHI_FEATURE(ON|OFF) +# DX_MAN_FEATURE(ON|OFF) +# DX_RTF_FEATURE(ON|OFF) +# DX_XML_FEATURE(ON|OFF) +# DX_PDF_FEATURE(ON|OFF) +# DX_PS_FEATURE(ON|OFF) +# +# DESCRIPTION +# +# The DX_*_FEATURE macros control the default setting for the given +# Doxygen feature. Supported features are 'DOXYGEN' itself, 'DOT' for +# generating graphics, 'HTML' for plain HTML, 'CHM' for compressed HTML +# help (for MS users), 'CHI' for generating a separate .chi file by the +# .chm file, and 'MAN', 'RTF', 'XML', 'PDF' and 'PS' for the appropriate +# output formats. The environment variable DOXYGEN_PAPER_SIZE may be +# specified to override the default 'a4wide' paper size. +# +# By default, HTML, PDF and PS documentation is generated as this seems to +# be the most popular and portable combination. MAN pages created by +# Doxygen are usually problematic, though by picking an appropriate subset +# and doing some massaging they might be better than nothing. CHM and RTF +# are specific for MS (note that you can't generate both HTML and CHM at +# the same time). The XML is rather useless unless you apply specialized +# post-processing to it. +# +# The macros mainly control the default state of the feature. The use can +# override the default by specifying --enable or --disable. The macros +# ensure that contradictory flags are not given (e.g., +# --enable-doxygen-html and --enable-doxygen-chm, +# --enable-doxygen-anything with --disable-doxygen, etc.) Finally, each +# feature will be automatically disabled (with a warning) if the required +# programs are missing. +# +# Once all the feature defaults have been specified, call DX_INIT_DOXYGEN +# with the following parameters: a one-word name for the project for use +# as a filename base etc., an optional configuration file name (the +# default is '$(srcdir)/Doxyfile', the same as Doxygen's default), and an +# optional output directory name (the default is 'doxygen-doc'). To run +# doxygen multiple times for different configuration files and output +# directories provide more parameters: the second, forth, sixth, etc +# parameter are configuration file names and the third, fifth, seventh, +# etc parameter are output directories. No checking is done to catch +# duplicates. +# +# Automake Support +# +# The DX_RULES substitution can be used to add all needed rules to the +# Makefile. Note that this is a substitution without being a variable: +# only the @DX_RULES@ syntax will work. +# +# The provided targets are: +# +# doxygen-doc: Generate all doxygen documentation. +# +# doxygen-run: Run doxygen, which will generate some of the +# documentation (HTML, CHM, CHI, MAN, RTF, XML) +# but will not do the post processing required +# for the rest of it (PS, PDF). +# +# doxygen-ps: Generate doxygen PostScript documentation. +# +# doxygen-pdf: Generate doxygen PDF documentation. +# +# Note that by default these are not integrated into the automake targets. +# If doxygen is used to generate man pages, you can achieve this +# integration by setting man3_MANS to the list of man pages generated and +# then adding the dependency: +# +# $(man3_MANS): doxygen-doc +# +# This will cause make to run doxygen and generate all the documentation. +# +# The following variable is intended for use in Makefile.am: +# +# DX_CLEANFILES = everything to clean. +# +# Then add this variable to MOSTLYCLEANFILES. +# +# LICENSE +# +# Copyright (c) 2009 Oren Ben-Kiki <oren(a)ben-kiki.org> +# Copyright (c) 2015 Olaf Mandel <olaf(a)mandel.name> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 24 + +## ----------## +## Defaults. ## +## ----------## + +DX_ENV="" +AC_DEFUN([DX_FEATURE_doc], ON) +AC_DEFUN([DX_FEATURE_dot], OFF) +AC_DEFUN([DX_FEATURE_man], OFF) +AC_DEFUN([DX_FEATURE_html], ON) +AC_DEFUN([DX_FEATURE_chm], OFF) +AC_DEFUN([DX_FEATURE_chi], OFF) +AC_DEFUN([DX_FEATURE_rtf], OFF) +AC_DEFUN([DX_FEATURE_xml], OFF) +AC_DEFUN([DX_FEATURE_pdf], ON) +AC_DEFUN([DX_FEATURE_ps], ON) + +## --------------- ## +## Private macros. ## +## --------------- ## + +# DX_ENV_APPEND(VARIABLE, VALUE) +# ------------------------------ +# Append VARIABLE="VALUE" to DX_ENV for invoking doxygen and add it +# as a substitution (but not a Makefile variable). The substitution +# is skipped if the variable name is VERSION. +AC_DEFUN([DX_ENV_APPEND], +[AC_SUBST([DX_ENV], ["$DX_ENV $1='$2'"])dnl +m4_if([$1], [VERSION], [], [AC_SUBST([$1], [$2])dnl +AM_SUBST_NOTMAKE([$1])])dnl +]) + +# DX_DIRNAME_EXPR +# --------------- +# Expand into a shell expression prints the directory part of a path. +AC_DEFUN([DX_DIRNAME_EXPR], + [[expr ".$1" : '$\.$[^/]*$' \| "x$1" : 'x$.*$/[^/]*$']]) + +# DX_IF_FEATURE(FEATURE, IF-ON, IF-OFF) +# ------------------------------------- +# Expands according to the M4 (static) status of the feature. +AC_DEFUN([DX_IF_FEATURE], [ifelse(DX_FEATURE_$1, ON, [$2], [$3])]) + +# DX_REQUIRE_PROG(VARIABLE, PROGRAM) +# ---------------------------------- +# Require the specified program to be found for the DX_CURRENT_FEATURE to work. +AC_DEFUN([DX_REQUIRE_PROG], [ +AC_PATH_TOOL([$1], [$2]) +if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then + AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION]) + AC_SUBST(DX_FLAG_[]DX_CURRENT_FEATURE, 0) +fi +]) + +# DX_TEST_FEATURE(FEATURE) +# ------------------------ +# Expand to a shell expression testing whether the feature is active. +AC_DEFUN([DX_TEST_FEATURE], [test "$DX_FLAG_$1" = 1]) + +# DX_CHECK_DEPEND(REQUIRED_FEATURE, REQUIRED_STATE) +# ------------------------------------------------- +# Verify that a required features has the right state before trying to turn on +# the DX_CURRENT_FEATURE. +AC_DEFUN([DX_CHECK_DEPEND], [ +test "$DX_FLAG_$1" = "$2" \ +|| AC_MSG_ERROR([doxygen-DX_CURRENT_FEATURE ifelse([$2], 1, + requires, contradicts) doxygen-$1]) +]) + +# DX_CLEAR_DEPEND(FEATURE, REQUIRED_FEATURE, REQUIRED_STATE) +# ---------------------------------------------------------- +# Turn off the DX_CURRENT_FEATURE if the required feature is off. +AC_DEFUN([DX_CLEAR_DEPEND], [ +test "$DX_FLAG_$1" = "$2" || AC_SUBST(DX_FLAG_[]DX_CURRENT_FEATURE, 0) +]) + +# DX_FEATURE_ARG(FEATURE, DESCRIPTION, +# CHECK_DEPEND, CLEAR_DEPEND, +# REQUIRE, DO-IF-ON, DO-IF-OFF) +# -------------------------------------------- +# Parse the command-line option controlling a feature. CHECK_DEPEND is called +# if the user explicitly turns the feature on (and invokes DX_CHECK_DEPEND), +# otherwise CLEAR_DEPEND is called to turn off the default state if a required +# feature is disabled (using DX_CLEAR_DEPEND). REQUIRE performs additional +# requirement tests (DX_REQUIRE_PROG). Finally, an automake flag is set and +# DO-IF-ON or DO-IF-OFF are called according to the final state of the feature. +AC_DEFUN([DX_ARG_ABLE], [ + AC_DEFUN([DX_CURRENT_FEATURE], [$1]) + AC_DEFUN([DX_CURRENT_DESCRIPTION], [$2]) + AC_ARG_ENABLE(doxygen-$1, + [AS_HELP_STRING(DX_IF_FEATURE([$1], [--disable-doxygen-$1], + [--enable-doxygen-$1]), + DX_IF_FEATURE([$1], [don't $2], [$2]))], + [ +case "$enableval" in +#( +y|Y|yes|Yes|YES) + AC_SUBST([DX_FLAG_$1], 1) + $3 +;; #( +n|N|no|No|NO) + AC_SUBST([DX_FLAG_$1], 0) +;; #( +*) + AC_MSG_ERROR([invalid value '$enableval' given to doxygen-$1]) +;; +esac +], [ +AC_SUBST([DX_FLAG_$1], [DX_IF_FEATURE([$1], 1, 0)]) +$4 +]) +if DX_TEST_FEATURE([$1]); then + $5 + : +fi +if DX_TEST_FEATURE([$1]); then + $6 + : +else + $7 + : +fi +]) + +## -------------- ## +## Public macros. ## +## -------------- ## + +# DX_XXX_FEATURE(DEFAULT_STATE) +# ----------------------------- +AC_DEFUN([DX_DOXYGEN_FEATURE], [AC_DEFUN([DX_FEATURE_doc], [$1])]) +AC_DEFUN([DX_DOT_FEATURE], [AC_DEFUN([DX_FEATURE_dot], [$1])]) +AC_DEFUN([DX_MAN_FEATURE], [AC_DEFUN([DX_FEATURE_man], [$1])]) +AC_DEFUN([DX_HTML_FEATURE], [AC_DEFUN([DX_FEATURE_html], [$1])]) +AC_DEFUN([DX_CHM_FEATURE], [AC_DEFUN([DX_FEATURE_chm], [$1])]) +AC_DEFUN([DX_CHI_FEATURE], [AC_DEFUN([DX_FEATURE_chi], [$1])]) +AC_DEFUN([DX_RTF_FEATURE], [AC_DEFUN([DX_FEATURE_rtf], [$1])]) +AC_DEFUN([DX_XML_FEATURE], [AC_DEFUN([DX_FEATURE_xml], [$1])]) +AC_DEFUN([DX_XML_FEATURE], [AC_DEFUN([DX_FEATURE_xml], [$1])]) +AC_DEFUN([DX_PDF_FEATURE], [AC_DEFUN([DX_FEATURE_pdf], [$1])]) +AC_DEFUN([DX_PS_FEATURE], [AC_DEFUN([DX_FEATURE_ps], [$1])]) + +# DX_INIT_DOXYGEN(PROJECT, [CONFIG-FILE], [OUTPUT-DOC-DIR], ...) +# -------------------------------------------------------------- +# PROJECT also serves as the base name for the documentation files. +# The default CONFIG-FILE is "$(srcdir)/Doxyfile" and OUTPUT-DOC-DIR is +# "doxygen-doc". +# More arguments are interpreted as interleaved CONFIG-FILE and +# OUTPUT-DOC-DIR values. +AC_DEFUN([DX_INIT_DOXYGEN], [ + +# Files: +AC_SUBST([DX_PROJECT], [$1]) +AC_SUBST([DX_CONFIG], ['ifelse([$2], [], [$(srcdir)/Doxyfile], [$2])']) +AC_SUBST([DX_DOCDIR], ['ifelse([$3], [], [doxygen-doc], [$3])']) +m4_if(m4_eval(3 < m4_count($@)), 1, [m4_for([DX_i], 4, m4_count($@), 2, + [AC_SUBST([DX_CONFIG]m4_eval(DX_i[/2]), + 'm4_default_nblank_quoted(m4_argn(DX_i, $@), + [$(srcdir)/Doxyfile])')])])dnl +m4_if(m4_eval(3 < m4_count($@)), 1, [m4_for([DX_i], 5, m4_count($@,), 2, + [AC_SUBST([DX_DOCDIR]m4_eval([(]DX_i[-1)/2]), + 'm4_default_nblank_quoted(m4_argn(DX_i, $@), + [doxygen-doc])')])])dnl +m4_define([DX_loop], m4_dquote(m4_if(m4_eval(3 < m4_count($@)), 1, + [m4_for([DX_i], 4, m4_count($@), 2, [, m4_eval(DX_i[/2])])], + [])))dnl + +# Environment variables used inside doxygen.cfg: +DX_ENV_APPEND(SRCDIR, $srcdir) +DX_ENV_APPEND(PROJECT, $DX_PROJECT) +DX_ENV_APPEND(VERSION, $PACKAGE_VERSION) + +# Doxygen itself: +DX_ARG_ABLE(doc, [generate any doxygen documentation], + [], + [], + [DX_REQUIRE_PROG([DX_DOXYGEN], doxygen) + DX_REQUIRE_PROG([DX_PERL], perl)], + [DX_ENV_APPEND(PERL_PATH, $DX_PERL)]) + +# Dot for graphics: +DX_ARG_ABLE(dot, [generate graphics for doxygen documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_DOT], dot)], + [DX_ENV_APPEND(HAVE_DOT, YES) + DX_ENV_APPEND(DOT_PATH, [`DX_DIRNAME_EXPR($DX_DOT)`])], + [DX_ENV_APPEND(HAVE_DOT, NO)]) + +# Man pages generation: +DX_ARG_ABLE(man, [generate doxygen manual pages], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [], + [DX_ENV_APPEND(GENERATE_MAN, YES)], + [DX_ENV_APPEND(GENERATE_MAN, NO)]) + +# RTF file generation: +DX_ARG_ABLE(rtf, [generate doxygen RTF documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [], + [DX_ENV_APPEND(GENERATE_RTF, YES)], + [DX_ENV_APPEND(GENERATE_RTF, NO)]) + +# XML file generation: +DX_ARG_ABLE(xml, [generate doxygen XML documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [], + [DX_ENV_APPEND(GENERATE_XML, YES)], + [DX_ENV_APPEND(GENERATE_XML, NO)]) + +# (Compressed) HTML help generation: +DX_ARG_ABLE(chm, [generate doxygen compressed HTML help documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_HHC], hhc)], + [DX_ENV_APPEND(HHC_PATH, $DX_HHC) + DX_ENV_APPEND(GENERATE_HTML, YES) + DX_ENV_APPEND(GENERATE_HTMLHELP, YES)], + [DX_ENV_APPEND(GENERATE_HTMLHELP, NO)]) + +# Separate CHI file generation. +DX_ARG_ABLE(chi, [generate doxygen separate compressed HTML help index file], + [DX_CHECK_DEPEND(chm, 1)], + [DX_CLEAR_DEPEND(chm, 1)], + [], + [DX_ENV_APPEND(GENERATE_CHI, YES)], + [DX_ENV_APPEND(GENERATE_CHI, NO)]) + +# Plain HTML pages generation: +DX_ARG_ABLE(html, [generate doxygen plain HTML documentation], + [DX_CHECK_DEPEND(doc, 1) DX_CHECK_DEPEND(chm, 0)], + [DX_CLEAR_DEPEND(doc, 1) DX_CLEAR_DEPEND(chm, 0)], + [], + [DX_ENV_APPEND(GENERATE_HTML, YES)], + [DX_TEST_FEATURE(chm) || DX_ENV_APPEND(GENERATE_HTML, NO)]) + +# PostScript file generation: +DX_ARG_ABLE(ps, [generate doxygen PostScript documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_LATEX], latex) + DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex) + DX_REQUIRE_PROG([DX_DVIPS], dvips) + DX_REQUIRE_PROG([DX_EGREP], egrep)]) + +# PDF file generation: +DX_ARG_ABLE(pdf, [generate doxygen PDF documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_PDFLATEX], pdflatex) + DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex) + DX_REQUIRE_PROG([DX_EGREP], egrep)]) + +# LaTeX generation for PS and/or PDF: +if DX_TEST_FEATURE(ps) || DX_TEST_FEATURE(pdf); then + DX_ENV_APPEND(GENERATE_LATEX, YES) +else + DX_ENV_APPEND(GENERATE_LATEX, NO) +fi + +# Paper size for PS and/or PDF: +AC_ARG_VAR(DOXYGEN_PAPER_SIZE, + [a4wide (default), a4, letter, legal or executive]) +case "$DOXYGEN_PAPER_SIZE" in +#( +"") + AC_SUBST(DOXYGEN_PAPER_SIZE, "") +;; #( +a4wide|a4|letter|legal|executive) + DX_ENV_APPEND(PAPER_SIZE, $DOXYGEN_PAPER_SIZE) +;; #( +*) + AC_MSG_ERROR([unknown DOXYGEN_PAPER_SIZE='$DOXYGEN_PAPER_SIZE']) +;; +esac + +# Rules: +AS_IF([[test $DX_FLAG_html -eq 1]], +[[DX_SNIPPET_html="## ------------------------------- ## +## Rules specific for HTML output. ## +## ------------------------------- ## + +DX_CLEAN_HTML = \$(DX_DOCDIR)/html]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/html]])[ + +"]], +[[DX_SNIPPET_html=""]]) +AS_IF([[test $DX_FLAG_chi -eq 1]], +[[DX_SNIPPET_chi=" +DX_CLEAN_CHI = \$(DX_DOCDIR)/\$(PACKAGE).chi]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).chi]])["]], +[[DX_SNIPPET_chi=""]]) +AS_IF([[test $DX_FLAG_chm -eq 1]], +[[DX_SNIPPET_chm="## ------------------------------ ## +## Rules specific for CHM output. ## +## ------------------------------ ## + +DX_CLEAN_CHM = \$(DX_DOCDIR)/chm]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/chm]])[\ +${DX_SNIPPET_chi} + +"]], +[[DX_SNIPPET_chm=""]]) +AS_IF([[test $DX_FLAG_man -eq 1]], +[[DX_SNIPPET_man="## ------------------------------ ## +## Rules specific for MAN output. ## +## ------------------------------ ## + +DX_CLEAN_MAN = \$(DX_DOCDIR)/man]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/man]])[ + +"]], +[[DX_SNIPPET_man=""]]) +AS_IF([[test $DX_FLAG_rtf -eq 1]], +[[DX_SNIPPET_rtf="## ------------------------------ ## +## Rules specific for RTF output. ## +## ------------------------------ ## + +DX_CLEAN_RTF = \$(DX_DOCDIR)/rtf]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/rtf]])[ + +"]], +[[DX_SNIPPET_rtf=""]]) +AS_IF([[test $DX_FLAG_xml -eq 1]], +[[DX_SNIPPET_xml="## ------------------------------ ## +## Rules specific for XML output. ## +## ------------------------------ ## + +DX_CLEAN_XML = \$(DX_DOCDIR)/xml]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/xml]])[ + +"]], +[[DX_SNIPPET_xml=""]]) +AS_IF([[test $DX_FLAG_ps -eq 1]], +[[DX_SNIPPET_ps="## ----------------------------- ## +## Rules specific for PS output. ## +## ----------------------------- ## + +DX_CLEAN_PS = \$(DX_DOCDIR)/\$(PACKAGE).ps]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).ps]])[ + +DX_PS_GOAL = doxygen-ps + +doxygen-ps: \$(DX_CLEAN_PS) + +]m4_foreach([DX_i], [DX_loop], +[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).ps: \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag + \$(DX_V_LATEX)cd \$(DX_DOCDIR]DX_i[)/latex; \\ + rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \\ + \$(DX_LATEX) refman.tex; \\ + \$(DX_MAKEINDEX) refman.idx; \\ + \$(DX_LATEX) refman.tex; \\ + countdown=5; \\ + while \$(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \\ + refman.log > /dev/null 2>&1 \\ + && test \$\$countdown -gt 0; do \\ + \$(DX_LATEX) refman.tex; \\ + countdown=\`expr \$\$countdown - 1\`; \\ + done; \\ + \$(DX_DVIPS) -o ../\$(PACKAGE).ps refman.dvi + +]])["]], +[[DX_SNIPPET_ps=""]]) +AS_IF([[test $DX_FLAG_pdf -eq 1]], +[[DX_SNIPPET_pdf="## ------------------------------ ## +## Rules specific for PDF output. ## +## ------------------------------ ## + +DX_CLEAN_PDF = \$(DX_DOCDIR)/\$(PACKAGE).pdf]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).pdf]])[ + +DX_PDF_GOAL = doxygen-pdf + +doxygen-pdf: \$(DX_CLEAN_PDF) + +]m4_foreach([DX_i], [DX_loop], +[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).pdf: \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag + \$(DX_V_LATEX)cd \$(DX_DOCDIR]DX_i[)/latex; \\ + rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \\ + \$(DX_PDFLATEX) refman.tex; \\ + \$(DX_MAKEINDEX) refman.idx; \\ + \$(DX_PDFLATEX) refman.tex; \\ + countdown=5; \\ + while \$(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \\ + refman.log > /dev/null 2>&1 \\ + && test \$\$countdown -gt 0; do \\ + \$(DX_PDFLATEX) refman.tex; \\ + countdown=\`expr \$\$countdown - 1\`; \\ + done; \\ + mv refman.pdf ../\$(PACKAGE).pdf + +]])["]], +[[DX_SNIPPET_pdf=""]]) +AS_IF([[test $DX_FLAG_ps -eq 1 -o $DX_FLAG_pdf -eq 1]], +[[DX_SNIPPET_latex="## ------------------------------------------------- ## +## Rules specific for LaTeX (shared for PS and PDF). ## +## ------------------------------------------------- ## + +DX_V_LATEX = \$(_DX_v_LATEX_\$(V)) +_DX_v_LATEX_ = \$(_DX_v_LATEX_\$(AM_DEFAULT_VERBOSITY)) +_DX_v_LATEX_0 = @echo \" LATEX \" \$][@; + +DX_CLEAN_LATEX = \$(DX_DOCDIR)/latex]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/latex]])[ + +"]], +[[DX_SNIPPET_latex=""]]) + +AS_IF([[test $DX_FLAG_doc -eq 1]], +[[DX_SNIPPET_doc="## --------------------------------- ## +## Format-independent Doxygen rules. ## +## --------------------------------- ## + +${DX_SNIPPET_html}\ +${DX_SNIPPET_chm}\ +${DX_SNIPPET_man}\ +${DX_SNIPPET_rtf}\ +${DX_SNIPPET_xml}\ +${DX_SNIPPET_ps}\ +${DX_SNIPPET_pdf}\ +${DX_SNIPPET_latex}\ +DX_V_DXGEN = \$(_DX_v_DXGEN_\$(V)) +_DX_v_DXGEN_ = \$(_DX_v_DXGEN_\$(AM_DEFAULT_VERBOSITY)) +_DX_v_DXGEN_0 = @echo \" DXGEN \" \$<; + +.PHONY: doxygen-run doxygen-doc \$(DX_PS_GOAL) \$(DX_PDF_GOAL) + +.INTERMEDIATE: doxygen-run \$(DX_PS_GOAL) \$(DX_PDF_GOAL) + +doxygen-run:]m4_foreach([DX_i], [DX_loop], + [[ \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag]])[ + +doxygen-doc: doxygen-run \$(DX_PS_GOAL) \$(DX_PDF_GOAL) + +]m4_foreach([DX_i], [DX_loop], +[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag: \$(DX_CONFIG]DX_i[) \$(pkginclude_HEADERS) + \$(A""M_V_at)rm -rf \$(DX_DOCDIR]DX_i[) + \$(DX_V_DXGEN)\$(DX_ENV) DOCDIR=\$(DX_DOCDIR]DX_i[) \$(DX_DOXYGEN) \$(DX_CONFIG]DX_i[) + \$(A""M_V_at)echo Timestamp >\$][@ + +]])dnl +[DX_CLEANFILES = \\] +m4_foreach([DX_i], [DX_loop], +[[ \$(DX_DOCDIR]DX_i[)/doxygen_sqlite3.db \\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag \\ +]])dnl +[ -r \\ + \$(DX_CLEAN_HTML) \\ + \$(DX_CLEAN_CHM) \\ + \$(DX_CLEAN_CHI) \\ + \$(DX_CLEAN_MAN) \\ + \$(DX_CLEAN_RTF) \\ + \$(DX_CLEAN_XML) \\ + \$(DX_CLEAN_PS) \\ + \$(DX_CLEAN_PDF) \\ + \$(DX_CLEAN_LATEX)"]], +[[DX_SNIPPET_doc=""]]) +AC_SUBST([DX_RULES], +["${DX_SNIPPET_doc}"])dnl +AM_SUBST_NOTMAKE([DX_RULES]) + +#For debugging: +#echo DX_FLAG_doc=$DX_FLAG_doc +#echo DX_FLAG_dot=$DX_FLAG_dot +#echo DX_FLAG_man=$DX_FLAG_man +#echo DX_FLAG_html=$DX_FLAG_html +#echo DX_FLAG_chm=$DX_FLAG_chm +#echo DX_FLAG_chi=$DX_FLAG_chi +#echo DX_FLAG_rtf=$DX_FLAG_rtf +#echo DX_FLAG_xml=$DX_FLAG_xml +#echo DX_FLAG_pdf=$DX_FLAG_pdf +#echo DX_FLAG_ps=$DX_FLAG_ps +#echo DX_ENV=$DX_ENV +]) -- 2.28.0

3 15

[PATCH v3 2/5] windowscodecs: Fix DdsFrameDecode_Dds_CopyBlocks().
by Ziqing Hui 27 Aug '20

27 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 42 +++++++++++----------------- dlls/windowscodecs/tests/ddsformat.c | 1 - 2 files changed, 16 insertions(+), 27 deletions(-)

2 1

[PATCH v3 5/5] windowscodecs: Add more supported formats and fix RGB masks for RGBA1010102.
by Ziqing Hui 27 Aug '20

27 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 14 ++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 9 +++------ 2 files changed, 15 insertions(+), 8 deletions(-)

2 1

[PATCH v3 4/5] windowscodecs: Correctly set pixel format of uncompressed DDS images.
by Ziqing Hui 27 Aug '20

27 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 10 ++++++---- dlls/windowscodecs/tests/ddsformat.c | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-)

2 1

[PATCH v3 3/5] windowscodecs: Support uncompressed format in DdsFrameDecode_CopyPixels().
by Ziqing Hui 27 Aug '20

27 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 20 ++++++++++++-------- dlls/windowscodecs/tests/ddsformat.c | 11 ++++++----- 2 files changed, 18 insertions(+), 13 deletions(-)

2 1

[PATCH v3 1/5] windowscodecs/tests: Fix tests for CopyBlocks.
by Ziqing Hui 27 Aug '20

27 Aug '20

Using strncmp() to compare pixel data buffer leads to incorrect tests. Also, we should clear the pixel data buffer before editing and comparing them. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v3: Merge 2 commits into one. dlls/windowscodecs/tests/ddsformat.c | 32 +++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-)

2 1

[PATCH v2 1/5] winegstreamer: Implement stub bytestream handler and media source.
by Derek Lesho 27 Aug '20

27 Aug '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v2: Fix tests on environments without gstreamer. --- dlls/mfplat/tests/mfplat.c | 14 +- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/gst_private.h | 6 + dlls/winegstreamer/media_source.c | 680 +++++++++++++++++++ dlls/winegstreamer/mfplat.c | 9 + dlls/winegstreamer/winegstreamer.rgs | 32 + dlls/winegstreamer/winegstreamer_classes.idl | 7 + include/mfidl.idl | 1 + 8 files changed, 746 insertions(+), 4 deletions(-) create mode 100644 dlls/winegstreamer/media_source.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 01749dd9ef8..29bcef7e46b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -441,8 +441,8 @@ static void test_source_resolver(void) { struct test_callback callback = { { &test_create_from_url_callback_vtbl } }; struct test_callback callback2 = { { &test_create_from_file_handler_callback_vtbl } }; + IMFPresentationDescriptor *descriptor = NULL; IMFSourceResolver *resolver, *resolver2; - IMFPresentationDescriptor *descriptor; IMFSchemeHandler *scheme_handler; IMFMediaStream *video_stream; IMFAttributes *attributes; @@ -458,9 +458,12 @@ static void test_source_resolver(void) int i, sample_count; WCHAR *filename; PROPVARIANT var; + BOOL is_wine; HRESULT hr; GUID guid; + is_wine = !strcmp(winetest_platform, "wine"); + if (!pMFCreateSourceResolver) { win_skip("MFCreateSourceResolver() not found\n"); @@ -529,7 +532,10 @@ static void test_source_resolver(void) ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor); +if (!is_wine) ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); + if (FAILED(hr)) + goto skip_source_tests; ok(descriptor != NULL, "got %p\n", descriptor); hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(descriptor, 0, &selected, &sd); @@ -540,7 +546,7 @@ static void test_source_resolver(void) IMFStreamDescriptor_Release(sd); hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); -todo_wine +if (!is_wine) ok(hr == S_OK, "Failed to get stream major type, hr %#x.\n", hr); if (FAILED(hr)) goto skip_source_tests; @@ -632,8 +638,8 @@ todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); skip_source_tests: - - IMFPresentationDescriptor_Release(descriptor); + if (descriptor) + IMFPresentationDescriptor_Release(descriptor); IMFMediaSource_Release(mediasource); IMFByteStream_Release(stream); diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 337c1086e6b..e578d194f7f 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ gst_cbs.c \ gstdemux.c \ main.c \ + media_source.c \ mediatype.c \ mfplat.c \ pin.c \ diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index e6fb841fc87..71ca4290885 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -54,4 +54,10 @@ void start_dispatch_thread(void) DECLSPEC_HIDDEN; extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; +enum source_type +{ + SOURCE_TYPE_MPEG_4, +}; +HRESULT container_stream_handler_construct(REFIID riid, void **obj, enum source_type); + #endif /* __GST_PRIVATE_INCLUDED__ */ diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c new file mode 100644 index 00000000000..df28f54444d --- /dev/null +++ b/dlls/winegstreamer/media_source.c @@ -0,0 +1,680 @@ +#include "gst_private.h" + +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "mfapi.h" +#include "mferror.h" +#include "mfidl.h" + +#include "wine/debug.h" +#include "wine/heap.h" +#include "wine/list.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +struct media_source +{ + IMFMediaSource IMFMediaSource_iface; + LONG ref; + IMFMediaEventQueue *event_queue; +}; + +static inline struct media_source *impl_from_IMFMediaSource(IMFMediaSource *iface) +{ + return CONTAINING_RECORD(iface, struct media_source, IMFMediaSource_iface); +} + +static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + TRACE("(%p)->(%s %p)\n", source, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFMediaSource) || + IsEqualIID(riid, &IID_IMFMediaEventGenerator) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = &source->IMFMediaSource_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI media_source_AddRef(IMFMediaSource *iface) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + ULONG ref = InterlockedIncrement(&source->ref); + + TRACE("(%p) ref=%u\n", source, ref); + + return ref; +} + +static ULONG WINAPI media_source_Release(IMFMediaSource *iface) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + ULONG ref = InterlockedDecrement(&source->ref); + + TRACE("(%p) ref=%u\n", source, ref); + + if (!ref) + { + heap_free(source); + } + + return ref; +} + +static HRESULT WINAPI media_source_GetEvent(IMFMediaSource *iface, DWORD flags, IMFMediaEvent **event) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + TRACE("(%p)->(%#x, %p)\n", source, flags, event); + + return IMFMediaEventQueue_GetEvent(source->event_queue, flags, event); +} + +static HRESULT WINAPI media_source_BeginGetEvent(IMFMediaSource *iface, IMFAsyncCallback *callback, IUnknown *state) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + TRACE("(%p)->(%p, %p)\n", source, callback, state); + + return IMFMediaEventQueue_BeginGetEvent(source->event_queue, callback, state); +} + +static HRESULT WINAPI media_source_EndGetEvent(IMFMediaSource *iface, IMFAsyncResult *result, IMFMediaEvent **event) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + TRACE("(%p)->(%p, %p)\n", source, result, event); + + return IMFMediaEventQueue_EndGetEvent(source->event_queue, result, event); +} + +static HRESULT WINAPI media_source_QueueEvent(IMFMediaSource *iface, MediaEventType event_type, REFGUID ext_type, + HRESULT hr, const PROPVARIANT *value) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + TRACE("(%p)->(%d, %s, %#x, %p)\n", source, event_type, debugstr_guid(ext_type), hr, value); + + return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, ext_type, hr, value); +} + +static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWORD *characteristics) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p): stub\n", source, characteristics); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **descriptor) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p): stub\n", source, descriptor); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor, + const GUID *time_format, const PROPVARIANT *start_position) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p, %p, %p): stub\n", source, descriptor, time_format, start_position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + FIXME("(%p): stub\n", source); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_source_Pause(IMFMediaSource *iface) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + FIXME("(%p): stub\n", source); + + return E_NOTIMPL; +} + +static HRESULT media_source_teardown(struct media_source *source) +{ + if (source->event_queue) + IMFMediaEventQueue_Release(source->event_queue); + + return S_OK; +} + +static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + FIXME("(%p): stub\n", source); + + return E_NOTIMPL; +} + +static const IMFMediaSourceVtbl IMFMediaSource_vtbl = +{ + media_source_QueryInterface, + media_source_AddRef, + media_source_Release, + media_source_GetEvent, + media_source_BeginGetEvent, + media_source_EndGetEvent, + media_source_QueueEvent, + media_source_GetCharacteristics, + media_source_CreatePresentationDescriptor, + media_source_Start, + media_source_Stop, + media_source_Pause, + media_source_Shutdown, +}; + +static HRESULT media_source_constructor(IMFByteStream *bytestream, enum source_type type, struct media_source **out_media_source) +{ + struct media_source *object = heap_alloc_zero(sizeof(*object)); + HRESULT hr; + + if (!object) + return E_OUTOFMEMORY; + + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) + goto fail; + + object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; + object->ref = 1; + + *out_media_source = object; + return S_OK; + + fail: + WARN("Failed to construct MFMediaSource, hr %#x.\n", hr); + + media_source_teardown(object); + heap_free(object); + return hr; +} + +/* IMFByteStreamHandler */ + +struct container_stream_handler_result +{ + struct list entry; + IMFAsyncResult *result; + MF_OBJECT_TYPE obj_type; + IUnknown *object; +}; + +struct container_stream_handler +{ + IMFByteStreamHandler IMFByteStreamHandler_iface; + IMFAsyncCallback IMFAsyncCallback_iface; + LONG refcount; + enum source_type type; + struct list results; + CRITICAL_SECTION cs; +}; + +static struct container_stream_handler *impl_from_IMFByteStreamHandler(IMFByteStreamHandler *iface) +{ + return CONTAINING_RECORD(iface, struct container_stream_handler, IMFByteStreamHandler_iface); +} + +static struct container_stream_handler *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct container_stream_handler, IMFAsyncCallback_iface); +} + +static HRESULT WINAPI container_stream_handler_QueryInterface(IMFByteStreamHandler *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFByteStreamHandler) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFByteStreamHandler_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI container_stream_handler_AddRef(IMFByteStreamHandler *iface) +{ + struct container_stream_handler *handler = impl_from_IMFByteStreamHandler(iface); + ULONG refcount = InterlockedIncrement(&handler->refcount); + + TRACE("%p, refcount %u.\n", handler, refcount); + + return refcount; +} + +static ULONG WINAPI container_stream_handler_Release(IMFByteStreamHandler *iface) +{ + struct container_stream_handler *handler = impl_from_IMFByteStreamHandler(iface); + ULONG refcount = InterlockedDecrement(&handler->refcount); + struct container_stream_handler_result *result, *next; + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + LIST_FOR_EACH_ENTRY_SAFE(result, next, &handler->results, struct container_stream_handler_result, entry) + { + list_remove(&result->entry); + IMFAsyncResult_Release(result->result); + if (result->object) + IUnknown_Release(result->object); + heap_free(result); + } + DeleteCriticalSection(&handler->cs); + heap_free(handler); + } + + return refcount; +} + +struct create_object_context +{ + IUnknown IUnknown_iface; + LONG refcount; + + IPropertyStore *props; + IMFByteStream *stream; + WCHAR *url; + DWORD flags; +}; + +static struct create_object_context *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct create_object_context, IUnknown_iface); +} + +static HRESULT WINAPI create_object_context_QueryInterface(IUnknown *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI create_object_context_AddRef(IUnknown *iface) +{ + struct create_object_context *context = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&context->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI create_object_context_Release(IUnknown *iface) +{ + struct create_object_context *context = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&context->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + if (context->props) + IPropertyStore_Release(context->props); + if (context->stream) + IMFByteStream_Release(context->stream); + if (context->url) + heap_free(context->url); + heap_free(context); + } + + return refcount; +} + +static const IUnknownVtbl create_object_context_vtbl = +{ + create_object_context_QueryInterface, + create_object_context_AddRef, + create_object_context_Release, +}; + +static WCHAR *heap_strdupW(const WCHAR *str) +{ + WCHAR *ret = NULL; + + if (str) + { + unsigned int size; + + size = (lstrlenW(str) + 1) * sizeof(WCHAR); + ret = heap_alloc(size); + if (ret) + memcpy(ret, str, size); + } + + return ret; +} + +static HRESULT WINAPI container_stream_handler_BeginCreateObject(IMFByteStreamHandler *iface, IMFByteStream *stream, const WCHAR *url, DWORD flags, + IPropertyStore *props, IUnknown **cancel_cookie, IMFAsyncCallback *callback, IUnknown *state) +{ + struct container_stream_handler *this = impl_from_IMFByteStreamHandler(iface); + struct create_object_context *context; + IMFAsyncResult *caller, *item; + HRESULT hr; + + TRACE("%p, %s, %#x, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state); + + if (cancel_cookie) + *cancel_cookie = NULL; + + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &caller))) + return hr; + + context = heap_alloc(sizeof(*context)); + if (!context) + { + IMFAsyncResult_Release(caller); + return E_OUTOFMEMORY; + } + + context->IUnknown_iface.lpVtbl = &create_object_context_vtbl; + context->refcount = 1; + context->props = props; + if (context->props) + IPropertyStore_AddRef(context->props); + context->flags = flags; + context->stream = stream; + if (context->stream) + IMFByteStream_AddRef(context->stream); + if (url) + context->url = heap_strdupW(url); + if (!context->stream) + { + IMFAsyncResult_Release(caller); + IUnknown_Release(&context->IUnknown_iface); + return E_OUTOFMEMORY; + } + + hr = MFCreateAsyncResult(&context->IUnknown_iface, &this->IMFAsyncCallback_iface, (IUnknown *)caller, &item); + IUnknown_Release(&context->IUnknown_iface); + if (SUCCEEDED(hr)) + { + if (SUCCEEDED(hr = MFPutWorkItemEx(MFASYNC_CALLBACK_QUEUE_IO, item))) + { + if (cancel_cookie) + { + *cancel_cookie = (IUnknown *)caller; + IUnknown_AddRef(*cancel_cookie); + } + } + + IMFAsyncResult_Release(item); + } + IMFAsyncResult_Release(caller); + + return hr; +} + +static HRESULT WINAPI container_stream_handler_EndCreateObject(IMFByteStreamHandler *iface, IMFAsyncResult *result, + MF_OBJECT_TYPE *obj_type, IUnknown **object) +{ + struct container_stream_handler *this = impl_from_IMFByteStreamHandler(iface); + struct container_stream_handler_result *found = NULL, *cur; + HRESULT hr; + + TRACE("%p, %p, %p, %p.\n", iface, result, obj_type, object); + + EnterCriticalSection(&this->cs); + + LIST_FOR_EACH_ENTRY(cur, &this->results, struct container_stream_handler_result, entry) + { + if (result == cur->result) + { + list_remove(&cur->entry); + found = cur; + break; + } + } + + LeaveCriticalSection(&this->cs); + + if (found) + { + *obj_type = found->obj_type; + *object = found->object; + hr = IMFAsyncResult_GetStatus(found->result); + IMFAsyncResult_Release(found->result); + heap_free(found); + } + else + { + *obj_type = MF_OBJECT_INVALID; + *object = NULL; + hr = MF_E_UNEXPECTED; + } + + return hr; +} + +static HRESULT WINAPI container_stream_handler_CancelObjectCreation(IMFByteStreamHandler *iface, IUnknown *cancel_cookie) +{ + struct container_stream_handler *this = impl_from_IMFByteStreamHandler(iface); + struct container_stream_handler_result *found = NULL, *cur; + + TRACE("%p, %p.\n", iface, cancel_cookie); + + EnterCriticalSection(&this->cs); + + LIST_FOR_EACH_ENTRY(cur, &this->results, struct container_stream_handler_result, entry) + { + if (cancel_cookie == (IUnknown *)cur->result) + { + list_remove(&cur->entry); + found = cur; + break; + } + } + + LeaveCriticalSection(&this->cs); + + if (found) + { + IMFAsyncResult_Release(found->result); + if (found->object) + IUnknown_Release(found->object); + heap_free(found); + } + + return found ? S_OK : MF_E_UNEXPECTED; +} + +static HRESULT WINAPI container_stream_handler_GetMaxNumberOfBytesRequiredForResolution(IMFByteStreamHandler *iface, QWORD *bytes) +{ + FIXME("stub (%p %p)\n", iface, bytes); + return E_NOTIMPL; +} + +static const IMFByteStreamHandlerVtbl container_stream_handler_vtbl = +{ + container_stream_handler_QueryInterface, + container_stream_handler_AddRef, + container_stream_handler_Release, + container_stream_handler_BeginCreateObject, + container_stream_handler_EndCreateObject, + container_stream_handler_CancelObjectCreation, + container_stream_handler_GetMaxNumberOfBytesRequiredForResolution, +}; + +static HRESULT WINAPI container_stream_handler_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFAsyncCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI container_stream_handler_callback_AddRef(IMFAsyncCallback *iface) +{ + struct container_stream_handler *handler = impl_from_IMFAsyncCallback(iface); + return IMFByteStreamHandler_AddRef(&handler->IMFByteStreamHandler_iface); +} + +static ULONG WINAPI container_stream_handler_callback_Release(IMFAsyncCallback *iface) +{ + struct container_stream_handler *handler = impl_from_IMFAsyncCallback(iface); + return IMFByteStreamHandler_Release(&handler->IMFByteStreamHandler_iface); +} + +static HRESULT WINAPI container_stream_handler_callback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) +{ + return E_NOTIMPL; +} + +static HRESULT container_stream_handler_create_object(struct container_stream_handler *This, WCHAR *url, IMFByteStream *stream, DWORD flags, + IPropertyStore *props, IUnknown **out_object, MF_OBJECT_TYPE *out_obj_type) +{ + TRACE("(%p %s %p %u %p %p %p)\n", This, debugstr_w(url), stream, flags, props, out_object, out_obj_type); + + if (flags & MF_RESOLUTION_MEDIASOURCE) + { + HRESULT hr; + struct media_source *new_source; + + if (FAILED(hr = media_source_constructor(stream, This->type, &new_source))) + return hr; + + TRACE("->(%p)\n", new_source); + + *out_object = (IUnknown*)&new_source->IMFMediaSource_iface; + *out_obj_type = MF_OBJECT_MEDIASOURCE; + + return S_OK; + } + else + { + FIXME("flags = %08x\n", flags); + return E_NOTIMPL; + } +} + +static HRESULT WINAPI container_stream_handler_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct container_stream_handler *handler = impl_from_IMFAsyncCallback(iface); + struct container_stream_handler_result *handler_result; + MF_OBJECT_TYPE obj_type = MF_OBJECT_INVALID; + IUnknown *object = NULL, *context_object; + struct create_object_context *context; + IMFAsyncResult *caller; + HRESULT hr; + + caller = (IMFAsyncResult *)IMFAsyncResult_GetStateNoAddRef(result); + + if (FAILED(hr = IMFAsyncResult_GetObject(result, &context_object))) + { + WARN("Expected context set for callee result.\n"); + return hr; + } + + context = impl_from_IUnknown(context_object); + + hr = container_stream_handler_create_object(handler, context->url, context->stream, context->flags, context->props, &object, &obj_type); + + handler_result = heap_alloc(sizeof(*handler_result)); + if (handler_result) + { + handler_result->result = caller; + IMFAsyncResult_AddRef(handler_result->result); + handler_result->obj_type = obj_type; + handler_result->object = object; + + EnterCriticalSection(&handler->cs); + list_add_tail(&handler->results, &handler_result->entry); + LeaveCriticalSection(&handler->cs); + } + else + { + if (object) + IUnknown_Release(object); + hr = E_OUTOFMEMORY; + } + + IUnknown_Release(&context->IUnknown_iface); + + IMFAsyncResult_SetStatus(caller, hr); + MFInvokeCallback(caller); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl container_stream_handler_callback_vtbl = +{ + container_stream_handler_callback_QueryInterface, + container_stream_handler_callback_AddRef, + container_stream_handler_callback_Release, + container_stream_handler_callback_GetParameters, + container_stream_handler_callback_Invoke, +}; + +HRESULT container_stream_handler_construct(REFIID riid, void **obj, enum source_type type) +{ + struct container_stream_handler *this; + HRESULT hr; + + TRACE("%s, %p.\n", debugstr_guid(riid), obj); + + this = heap_alloc_zero(sizeof(*this)); + if (!this) + return E_OUTOFMEMORY; + + list_init(&this->results); + InitializeCriticalSection(&this->cs); + + this->type = type; + this->IMFByteStreamHandler_iface.lpVtbl = &container_stream_handler_vtbl; + this->IMFAsyncCallback_iface.lpVtbl = &container_stream_handler_callback_vtbl; + this->refcount = 1; + + hr = IMFByteStreamHandler_QueryInterface(&this->IMFByteStreamHandler_iface, riid, obj); + IMFByteStreamHandler_Release(&this->IMFByteStreamHandler_iface); + + return hr; +} \ No newline at end of file diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 55b9b088765..16e55247de1 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -398,6 +398,11 @@ failed: return hr; } +static HRESULT mp4_stream_handler_create(REFIID riid, void **ret) +{ + return container_stream_handler_construct(riid, ret, SOURCE_TYPE_MPEG_4); +} + static const struct class_object { const GUID *clsid; @@ -406,6 +411,7 @@ static const struct class_object class_objects[] = { { &CLSID_VideoProcessorMFT, &video_processor_create }, + { &CLSID_MPEG4ByteStreamHandler, &mp4_stream_handler_create }, }; HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) @@ -414,6 +420,9 @@ HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) unsigned int i; HRESULT hr; + if (!(init_gstreamer())) + return CLASS_E_CLASSNOTAVAILABLE; + for (i = 0; i < ARRAY_SIZE(class_objects); ++i) { if (IsEqualGUID(class_objects[i].clsid, rclsid)) diff --git a/dlls/winegstreamer/winegstreamer.rgs b/dlls/winegstreamer/winegstreamer.rgs index 923ba673f8c..0bc26761e9d 100644 --- a/dlls/winegstreamer/winegstreamer.rgs +++ b/dlls/winegstreamer/winegstreamer.rgs @@ -12,3 +12,35 @@ HKCR } } } + +HKLM +{ + NoRemove 'Software' + { + NoRemove 'Microsoft' + { + NoRemove 'Windows Media Foundation' + { + NoRemove 'ByteStreamHandlers' + { + '.m4v' + { + val '{271C3902-6095-4c45-A22F-20091816EE9E}' = s 'MPEG4 Byte Stream Handler' + } + '.mp4' + { + val '{271C3902-6095-4c45-A22F-20091816EE9E}' = s 'MPEG4 Byte Stream Handler' + } + 'video/m4v' + { + val '{271C3902-6095-4c45-A22F-20091816EE9E}' = s 'MPEG4 Byte Stream Handler' + } + 'video/mp4' + { + val '{271C3902-6095-4c45-A22F-20091816EE9E}' = s 'MPEG4 Byte Stream Handler' + } + } + } + } + } +} \ No newline at end of file diff --git a/dlls/winegstreamer/winegstreamer_classes.idl b/dlls/winegstreamer/winegstreamer_classes.idl index fa0e1784057..997a28b052f 100644 --- a/dlls/winegstreamer/winegstreamer_classes.idl +++ b/dlls/winegstreamer/winegstreamer_classes.idl @@ -54,3 +54,10 @@ coclass Gstreamer_Splitter {} uuid(88753b26-5b24-49bd-b2e7-0c445c78c982) ] coclass VideoProcessorMFT {} + +[ + helpstring("MP4 Byte Stream Handler"), + threading(both), + uuid(271c3902-6095-4c45-a22f-20091816ee9e) +] +coclass MPEG4ByteStreamHandler {} diff --git a/include/mfidl.idl b/include/mfidl.idl index 4ceeb707bd0..fc13dfba7a1 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1241,3 +1241,4 @@ cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, 0xba491365, cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS, 0xba491366, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);") +cpp_quote("EXTERN_GUID(CLSID_MPEG4ByteStreamHandler, 0x271c3902, 0x6095, 0x4c45, 0xa2, 0x2f, 0x20, 0x09, 0x18, 0x16, 0xee, 0x9e);") \ No newline at end of file -- 2.28.0

3 8

[PATCH] strmbase: Attempt connection using source pin's current media type.
by Jeff Smith 27 Aug '20

27 Aug '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- If no media type is specified, IPin::Connect() currently attempts to connect pins using any accepted media type. With this patch, it first attempts to connect using the source pin's current media type. dlls/qcap/tests/videocapture.c | 64 ++++++++++++++++++++++++++++++++-- dlls/strmbase/pin.c | 27 ++++++++++++++ 2 files changed, 88 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 80d4899410..7938b48376 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -174,7 +174,51 @@ static void test_stream_config(IPin *pin) IAMStreamConfig_Release(stream_config); } -static void test_capture(IBaseFilter *filter) +static void test_connect(IPin *source_pin, IPin *sink_pin) +{ + IEnumMediaTypes *enum_media_types; + IAMStreamConfig *stream_config; + AM_MEDIA_TYPE mt, *pmt; + HRESULT hr; + + hr = IPin_QueryInterface(source_pin, &IID_IAMStreamConfig, (void **)&stream_config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EnumMediaTypes(source_pin, &enum_media_types); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + while (IEnumMediaTypes_Next(enum_media_types, 1, &pmt, NULL) == S_OK) + { + hr = IAMStreamConfig_SetFormat(stream_config, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_Connect(source_pin, sink_pin, NULL); + if (hr == S_OK) + { + hr = IPin_ConnectionMediaType(source_pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(IsEqualGUID(&pmt->majortype, &mt.majortype), "majortype did not match.\n"); + ok(IsEqualGUID(&pmt->subtype, &mt.subtype), "subtype did not match.\n"); + ok(IsEqualGUID(&pmt->formattype, &mt.formattype), "formattype did not match.\n"); + ok(memcmp(pmt->pbFormat, mt.pbFormat, mt.cbFormat) == 0, "format details did not match.\n"); + + FreeMediaType(&mt); + + hr = IPin_Disconnect(source_pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(sink_pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + } + + CoTaskMemFree(pmt); + } + + IEnumMediaTypes_Release(enum_media_types); + IAMStreamConfig_Release(stream_config); +} + +static void test_capture(IBaseFilter *filter, IPin *sink_pin) { IEnumPins *enum_pins; IPin *pin; @@ -209,6 +253,10 @@ static void test_capture(IBaseFilter *filter) check_interface(pin, &IID_IAMVideoCompression, FALSE); check_interface(pin, &IID_IAMVideoProcAmp, FALSE); check_interface(pin, &IID_IPersistPropertyBag, FALSE); + + /* Placed after check_inferface tests, as it can affect the + * result for IID_IAMDroppedFrames on Windows. */ + test_connect(pin, sink_pin); } IPin_Release(pin); } @@ -255,7 +303,8 @@ START_TEST(videocapture) { ICreateDevEnum *dev_enum; IEnumMoniker *class_enum; - IBaseFilter *filter; + IBaseFilter *filter, *null_renderer; + IPin *null_renderer_pin; IMoniker *moniker; WCHAR *name; HRESULT hr; @@ -277,6 +326,13 @@ START_TEST(videocapture) } ok(hr == S_OK, "Got hr=%#x.\n", hr); + hr = CoCreateInstance(&CLSID_NullRenderer, NULL, CLSCTX_INPROC, + &IID_IBaseFilter, (void **)&null_renderer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(null_renderer, L"In", &null_renderer_pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + while (IEnumMoniker_Next(class_enum, 1, &moniker, NULL) == S_OK) { hr = IMoniker_GetDisplayName(moniker, NULL, NULL, &name); @@ -287,7 +343,7 @@ START_TEST(videocapture) hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IBaseFilter, (void**)&filter); if (hr == S_OK) { - test_capture(filter); + test_capture(filter, null_renderer_pin); test_misc_flags(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -298,6 +354,8 @@ START_TEST(videocapture) IMoniker_Release(moniker); } + IPin_Release(null_renderer_pin); + IBaseFilter_Release(null_renderer); ICreateDevEnum_Release(dev_enum); IEnumMoniker_Release(class_enum); CoUninitialize(); diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index e5017c2ff9..35aa6bc77d 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -510,6 +510,33 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP return VFW_E_NOT_STOPPED; } + if (!mt) + { + IAMStreamConfig *stream_config = NULL; + + if (pin->pFuncsTable->base.pin_query_interface) + pin->pFuncsTable->base.pin_query_interface(&pin->pin, &IID_IAMStreamConfig, + (void **)&stream_config); + + if (stream_config) + { + AM_MEDIA_TYPE *pmt = NULL; + IAMStreamConfig_GetFormat(stream_config, &pmt); + if (pmt) + { + if (pin->pFuncsTable->pfnAttemptConnection(pin, peer, pmt) == S_OK) + { + LeaveCriticalSection(&pin->pin.filter->csFilter); + DeleteMediaType(pmt); + IAMStreamConfig_Release(stream_config); + return S_OK; + } + DeleteMediaType(pmt); + } + IAMStreamConfig_Release(stream_config); + } + } + /* We don't check the subtype here. The rationale (as given by the DirectX * documentation) is that the format type is supposed to provide at least * as much information as the subtype. */ -- 2.23.0

2 1

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 27 Aug '20

27 Aug '20

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/po/fi.po b/po/fi.po index b814acb829f..a5f1c55eb38 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6791,10 +6791,8 @@ msgid "Connection reset by peer.\n" msgstr "Vastapuoli nollasi yhteyden.\n" #: winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "Ei toteutettu" +msgstr "Ei toteutettu.\n" #: winerror.mc:3760 msgid "No Signature found in file.\n" @@ -12489,6 +12487,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- Tuetut komennot -\n" +"\n" +"hardlink kovan linkin hallinta\n" #: fsutil.mc:35 msgid "" @@ -12496,10 +12497,13 @@ msgid "" "\n" "create create a hardlink\n" msgstr "" +"- Hardlink - Tuetut komennot -\n" +"\n" +"create luo kova linkki\n" #: fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "Syntaksi: fsutil hardlink create <uusi> <entinen>\n" #: hostname.rc:30 msgid "Usage: hostname\n" @@ -16490,10 +16494,8 @@ msgid "&Beginner" msgstr "&Aloittelija" #: winemine.rc:45 -#, fuzzy -#| msgid "Interface" msgid "&Intermediate" -msgstr "Rajapinta" +msgstr "&Keskitaso" #: winemine.rc:46 msgid "&Expert" @@ -16524,10 +16526,8 @@ msgid "Beginner" msgstr "Aloittelija" #: winemine.rc:65 -#, fuzzy -#| msgid "Interface" msgid "Intermediate" -msgstr "Rajapinta" +msgstr "Keskitaso" #: winemine.rc:66 msgid "Expert" -- 2.28.0

1 0

[PATCH 1/2] winmm: Add timeGetTime() implementation.
by Arkadiusz Hiler 27 Aug '20

27 Aug '20

... and use it instead GetTickCount() within winmm. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/winmm/tests/joystick.c | 4 ++-- dlls/winmm/tests/midi.c | 2 +- dlls/winmm/time.c | 18 ++++++++++++------ dlls/winmm/winmm.c | 12 ++++++------ dlls/winmm/winmm.spec | 2 +- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/winmm/tests/joystick.c b/dlls/winmm/tests/joystick.c index 7531bd6481f..313e9684e96 100644 --- a/dlls/winmm/tests/joystick.c +++ b/dlls/winmm/tests/joystick.c @@ -202,12 +202,12 @@ static void test_api(void) if (winetest_interactive) { #define MAX_TIME 15000 - DWORD tick = GetTickCount(), spent; + DWORD tick = timeGetTime(), spent; infoex.ex.dwSize = sizeof(infoex.ex); infoex.ex.dwFlags = JOY_RETURNALL; do { - spent = GetTickCount() - tick; + spent = timeGetTime() - tick; ret = joyGetPosEx(joyid, &infoex.ex); if (ret == JOYERR_NOERROR) { diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 2b1e91fe98a..a78f9b5ac71 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -555,7 +555,7 @@ static void CALLBACK time_stamp_callback(HMIDIOUT hmo, UINT msg, DWORD_PTR insta switch (msg) { case MM_MOM_POSITIONCB: if (records->count < ARRAY_SIZE(records->time_stamp)) - records->time_stamp[records->count] = GetTickCount(); + records->time_stamp[records->count] = timeGetTime(); records->count++; break; case MM_MOM_DONE: diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 22c89852a2f..de2a3fbc61e 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -131,7 +131,7 @@ static int TIME_MMSysTimeCallback(void) } timer = LIST_ENTRY( ptr, WINE_TIMERENTRY, entry ); - delta_time = timer->dwTriggerTime - GetTickCount(); + delta_time = timer->dwTriggerTime - timeGetTime(); if (delta_time > 0) break; list_remove( &timer->entry ); @@ -242,16 +242,22 @@ void TIME_MMTimeStop(void) */ MMRESULT WINAPI timeGetSystemTime(LPMMTIME lpTime, UINT wSize) { - if (wSize >= sizeof(*lpTime)) { - lpTime->wType = TIME_MS; - lpTime->u.ms = GetTickCount(); - + lpTime->wType = TIME_MS; + lpTime->u.ms = timeGetTime(); } return 0; } +/************************************************************************** + * timeGetTime [WINMM.@] + */ +DWORD WINAPI timeGetTime(void) +{ + return GetTickCount(); +} + /************************************************************************** * timeSetEvent [WINMM.@] */ @@ -272,7 +278,7 @@ MMRESULT WINAPI timeSetEvent(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc, return 0; lpNewTimer->wDelay = wDelay; - lpNewTimer->dwTriggerTime = GetTickCount() + wDelay; + lpNewTimer->dwTriggerTime = timeGetTime() + wDelay; /* FIXME - wResol is not respected, although it is not clear that we could change our precision meaningfully */ diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 9075a78f343..eea29ea61e5 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1030,7 +1030,7 @@ static DWORD midistream_get_playing_position(WINE_MIDIStream* lpMidiStrm) case MSM_STATUS_PAUSED: return lpMidiStrm->dwElapsedMS; case MSM_STATUS_PLAYING: - return GetTickCount() - lpMidiStrm->dwStartTicks; + return timeGetTime() - lpMidiStrm->dwStartTicks; default: FIXME("Unknown playing status %hu\n", lpMidiStrm->status); return 0; @@ -1080,7 +1080,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI /* FIXME: send out cc64 0 (turn off sustain pedal) on every channel */ if (lpMidiStrm->status != MSM_STATUS_PLAYING) { EnterCriticalSection(&lpMidiStrm->lock); - lpMidiStrm->dwStartTicks = GetTickCount() - lpMidiStrm->dwElapsedMS; + lpMidiStrm->dwStartTicks = timeGetTime() - lpMidiStrm->dwElapsedMS; lpMidiStrm->status = MSM_STATUS_PLAYING; LeaveCriticalSection(&lpMidiStrm->lock); } @@ -1090,7 +1090,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI /* FIXME: send out cc64 0 (turn off sustain pedal) on every channel */ if (lpMidiStrm->status != MSM_STATUS_PAUSED) { EnterCriticalSection(&lpMidiStrm->lock); - lpMidiStrm->dwElapsedMS = GetTickCount() - lpMidiStrm->dwStartTicks; + lpMidiStrm->dwElapsedMS = timeGetTime() - lpMidiStrm->dwStartTicks; lpMidiStrm->status = MSM_STATUS_PAUSED; LeaveCriticalSection(&lpMidiStrm->lock); } @@ -1126,7 +1126,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI case WINE_MSM_HEADER: /* sets initial tick count for first MIDIHDR */ if (!lpMidiStrm->dwStartTicks) - lpMidiStrm->dwStartTicks = GetTickCount(); + lpMidiStrm->dwStartTicks = timeGetTime(); lpMidiHdr = (LPMIDIHDR)msg->lParam; lpData = (LPBYTE)lpMidiHdr->lpData; TRACE("Adding %s lpMidiHdr=%p [lpData=0x%p dwBytesRecorded=%u/%u dwFlags=0x%08x size=%lu]\n", @@ -1235,8 +1235,8 @@ start_header: dwToGo = lpMidiStrm->dwStartTicks + lpMidiStrm->position_usec / 1000; - TRACE("%u/%u/%u\n", dwToGo, GetTickCount(), me->dwDeltaTime); - while (dwToGo - (dwCurrTC = GetTickCount()) <= MAXLONG) { + TRACE("%u/%u/%u\n", dwToGo, timeGetTime(), me->dwDeltaTime); + while (dwToGo - (dwCurrTC = timeGetTime()) <= MAXLONG) { if (MsgWaitForMultipleObjects(0, NULL, FALSE, dwToGo - dwCurrTC, QS_ALLINPUT) == WAIT_OBJECT_0) { /* got a message, handle it */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) { diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec index 9c6ed2dfa83..d7c7379d77c 100644 --- a/dlls/winmm/winmm.spec +++ b/dlls/winmm/winmm.spec @@ -147,7 +147,7 @@ @ stdcall timeEndPeriod(long) @ stdcall timeGetDevCaps(ptr long) @ stdcall timeGetSystemTime(ptr long) -@ stdcall timeGetTime() kernel32.GetTickCount +@ stdcall timeGetTime() @ stdcall timeKillEvent(long) @ stdcall timeSetEvent(long long ptr long long) @ stdcall waveInAddBuffer(long ptr long) -- 2.28.0

2 4

[PATCH 6/6] conhost: Implement IOCTL_CONDRV_SET_MODE.
by Jacek Caban 27 Aug '20

27 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 10 ++++++++++ programs/conhost/conhost.c | 6 ++++++ 2 files changed, 16 insertions(+)

2 1

[v2 PATCH] shcore: Add GetScaleFactorForDevice() stub.
by Nikolay Sivov 27 Aug '20

27 Aug '20

From: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed typo in the header. Thanks, Zebediah. dlls/shcore/main.c | 7 +++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index e552ba277f7..32649cccd9c 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -86,6 +86,13 @@ HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR monitor, DEVICE_SCALE_FACTOR *s return S_OK; } +DEVICE_SCALE_FACTOR WINAPI GetScaleFactorForDevice(DISPLAY_DEVICE_TYPE device_type) +{ + FIXME("%d\n", device_type); + + return SCALE_100_PERCENT; +} + HRESULT WINAPI _IStream_Read(IStream *stream, void *dest, ULONG size) { ULONG read; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index d5b7a342e31..368fab19541 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -11,7 +11,7 @@ @ stub GetDpiForShellUIComponent @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) -@ stub GetScaleFactorForDevice +@ stdcall GetScaleFactorForDevice(long) @ stdcall GetScaleFactorForMonitor(long ptr) @ stub IStream_Copy @ stdcall IStream_Read(ptr ptr long) _IStream_Read diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 82a1daaa62b..4689d83e7d9 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -36,8 +36,15 @@ typedef enum PROCESS_DPI_AWARENESS PROCESS_PER_MONITOR_DPI_AWARE } PROCESS_DPI_AWARENESS; +typedef enum +{ + DEVICE_PRIMARY = 0, + DEVICE_IMMERSIVE = 1, +} DISPLAY_DEVICE_TYPE; + HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); +DEVICE_SCALE_FACTOR WINAPI GetScaleFactorForDevice(DISPLAY_DEVICE_TYPE device_type); HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS); -- 2.28.0

1 0

[PATCH v2 1/6] widl: Print full namespace name on error.
by Rémi Bernon 27 Aug '20

27 Aug '20

Not really necessary as the errors are usually more cryptic, but nice to have when it fails there. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Tweak style in a few locations. tools/widl/parser.y | 10 ++++++++-- tools/widl/widltypes.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 3ef8d89ba1c..98bd8949f13 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -118,7 +118,7 @@ static statement_list_t *append_statements(statement_list_t *, statement_list_t static attr_list_t *append_attribs(attr_list_t *, attr_list_t *); static struct namespace global_namespace = { - NULL, NULL, LIST_INIT(global_namespace.entry), LIST_INIT(global_namespace.children) + NULL, NULL, NULL, LIST_INIT(global_namespace.entry), LIST_INIT(global_namespace.children) }; static struct namespace *current_namespace = &global_namespace; @@ -1833,6 +1833,12 @@ static void push_namespace(const char *name) if(!namespace) { namespace = xmalloc(sizeof(*namespace)); namespace->name = xstrdup(name); + if (!current_namespace->full_name) namespace->full_name = xstrdup(name); + else + { + namespace->full_name = xmalloc(strlen(current_namespace->full_name) + strlen(name) + 1); + sprintf(namespace->full_name, "%s.%s", current_namespace->full_name, name); + } namespace->parent = current_namespace; list_add_tail(&current_namespace->children, &namespace->entry); list_init(&namespace->children); @@ -1961,7 +1967,7 @@ static type_t *find_type_or_error(const char *name, int t) { type_t *type = find_type(name, NULL, t); if (!type) { - error_loc("type '%s' not found\n", name); + error_loc("type '%s' not found in %s\n", name, current_namespace->full_name); return NULL; } return type; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 085a0ff55f5..1634f9bd50b 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -409,6 +409,7 @@ struct alias_details struct namespace { const char *name; + char *full_name; struct namespace *parent; struct list entry; struct list children; -- 2.28.0

1 5

[PATCH] msscript.ocx: Uncache the module objects when script is restarted, but not the Procedure count.
by Gabriel Ivăncescu 27 Aug '20

27 Aug '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/msscript.c | 31 ++++++++++++++++-------------- dlls/msscript.ocx/tests/msscript.c | 20 +++++++++++++++++++ 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 112403a..ee0cf25 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -355,8 +355,6 @@ static void uncache_module_objects(ScriptModule *module) ITypeComp_Release(module->script_typecomp); module->script_typecomp = NULL; } - if (module->procedures) - module->procedures->count = -1; } static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) @@ -369,12 +367,15 @@ static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) return hr; } -static HRESULT start_script(ScriptHost *host) +static HRESULT start_script(ScriptModule *module) { HRESULT hr = S_OK; - if (host->script_state != SCRIPTSTATE_STARTED) - hr = set_script_state(host, SCRIPTSTATE_STARTED); + if (module->host->script_state != SCRIPTSTATE_STARTED) + { + hr = set_script_state(module->host, SCRIPTSTATE_STARTED); + if (SUCCEEDED(hr)) uncache_module_objects(module); + } return hr; } @@ -418,10 +419,12 @@ static HRESULT parse_script_text(ScriptModule *module, BSTR script_text, DWORD f EXCEPINFO excepinfo; HRESULT hr; - hr = start_script(module->host); + hr = start_script(module); if (FAILED(hr)) return hr; uncache_module_objects(module); + if (module->procedures) + module->procedures->count = -1; hr = IActiveScriptParse_ParseScriptText(module->host->parse, script_text, module->name, NULL, NULL, 0, 1, flag, res, &excepinfo); @@ -438,7 +441,7 @@ static HRESULT run_procedure(ScriptModule *module, BSTR procedure_name, SAFEARRA HRESULT hr; UINT i; - hr = start_script(module->host); + hr = start_script(module); if (FAILED(hr)) return hr; hr = get_script_dispatch(module, &disp); @@ -1082,7 +1085,7 @@ static HRESULT WINAPI procedure_enum_Next(IEnumVARIANT *iface, ULONG celt, VARIA if (!rgVar) return E_POINTER; if (!This->procedures->module->host) return E_FAIL; - hr = start_script(This->procedures->module->host); + hr = start_script(This->procedures->module); if (FAILED(hr)) return hr; hr = get_script_typeinfo(This->procedures->module, &ti); @@ -1295,7 +1298,7 @@ static HRESULT WINAPI ScriptProcedureCollection_get__NewEnum(IScriptProcedureCol if (!ppenumProcedures) return E_POINTER; if (!This->module->host) return E_FAIL; - hr = start_script(This->module->host); + hr = start_script(This->module); if (FAILED(hr)) return hr; hr = get_script_typeinfo(This->module, &ti); @@ -1334,7 +1337,7 @@ static HRESULT WINAPI ScriptProcedureCollection_get_Item(IScriptProcedureCollect if (!ppdispProcedure) return E_POINTER; if (!This->module->host) return E_FAIL; - hr = start_script(This->module->host); + hr = start_script(This->module); if (FAILED(hr)) return hr; hr = get_script_typeinfo(This->module, &typeinfo); @@ -1414,11 +1417,11 @@ static HRESULT WINAPI ScriptProcedureCollection_get_Count(IScriptProcedureCollec if (!plCount) return E_POINTER; if (!This->module->host) return E_FAIL; - hr = start_script(This->module->host); - if (FAILED(hr)) return hr; - if (This->count == -1) { + hr = start_script(This->module); + if (FAILED(hr)) return hr; + hr = get_script_typeinfo(This->module, &ti); if (FAILED(hr)) return hr; @@ -1609,7 +1612,7 @@ static HRESULT WINAPI ScriptModule_get_CodeObject(IScriptModule *iface, IDispatc if (!This->host) return E_FAIL; - hr = start_script(This->host); + hr = start_script(This); if (FAILED(hr)) return hr; hr = get_script_dispatch(This, ppdispObject); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 5b95863..2e7f14d 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -3855,7 +3855,19 @@ static void test_IScriptControl_get_Procedures(void) CHECK_CALLED(GetTypeAttr); CHECK_CALLED(ReleaseTypeAttr); + /* Reset uncaches the objects, but not the count */ + SET_EXPECT(SetScriptState_INITIALIZED); + IScriptControl_Reset(sc); + CHECK_CALLED(SetScriptState_INITIALIZED); + count = 0; + hr = IScriptProcedureCollection_get_Count(procs, &count); + ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); + ok(count == ARRAY_SIZE(custom_engine_funcs), "count is not %u, got %d.\n", TypeInfo_GetTypeAttr_cFuncs, count); + /* Try without ITypeComp interface */ + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(GetScriptDispatch); + SET_EXPECT(GetTypeInfo); SET_EXPECT(QI_ITypeComp); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"foobar"); @@ -3863,8 +3875,16 @@ static void test_IScriptControl_get_Procedures(void) ok(hr == E_NOINTERFACE, "IScriptProcedureCollection_get_Item returned: 0x%08x.\n", hr); ok(V_VT(&var) == VT_BSTR, "var type not BSTR, got %d.\n", V_VT(&var)); VariantClear(&var); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(GetScriptDispatch); + CHECK_CALLED(GetTypeInfo); CHECK_CALLED(QI_ITypeComp); + count = 0; + hr = IScriptProcedureCollection_get_Count(procs, &count); + ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); + ok(count == ARRAY_SIZE(custom_engine_funcs), "count is not %u, got %d.\n", TypeInfo_GetTypeAttr_cFuncs, count); + /* Make ITypeComp available */ TypeComp_available = TRUE; SET_EXPECT(QI_ITypeComp); -- 2.21.0

2 1

[PATCH 5/6] conhost: Implement IOCTL_CONDRV_GET_MODE.
by Jacek Caban 27 Aug '20

27 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 8 ++++++-- programs/conhost/conhost.c | 12 ++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-)

1 0

[PATCH 4/6] server: Forward screen buffer ioctls to conhost if possible.
by Jacek Caban 27 Aug '20

27 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)

1 0

[PATCH 3/6] conhost: Initial support for screen buffers.
by Jacek Caban 27 Aug '20

27 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 100 ++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-)

1 0

[PATCH 2/6] server: Allow passing screen buffer ioctls to conhost.
by Jacek Caban 27 Aug '20

27 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 4 ++++ server/console.c | 47 +++++++++++++++++++++++++++++++------------ server/protocol.def | 1 + 3 files changed, 39 insertions(+), 13 deletions(-)

1 0

[PATCH 1/6] server: Move setting current screen_buffer into a helper.
by Jacek Caban 27 Aug '20

27 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-)

1 0

[PATCH 1/5] winegstreamer: Implement stub bytestream handler and media source.
by Derek Lesho 27 Aug '20

27 Aug '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 9 +- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/gst_private.h | 6 + dlls/winegstreamer/media_source.c | 680 +++++++++++++++++++ dlls/winegstreamer/mfplat.c | 9 + dlls/winegstreamer/winegstreamer.rgs | 32 + dlls/winegstreamer/winegstreamer_classes.idl | 7 + include/mfidl.idl | 1 + 8 files changed, 740 insertions(+), 5 deletions(-) create mode 100644 dlls/winegstreamer/media_source.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 01749dd9ef8..c9548c6b18f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -529,7 +529,10 @@ static void test_source_resolver(void) ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor); +todo_wine ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); + if (FAILED(hr)) + goto skip_source_tests; ok(descriptor != NULL, "got %p\n", descriptor); hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(descriptor, 0, &selected, &sd); @@ -540,10 +543,7 @@ static void test_source_resolver(void) IMFStreamDescriptor_Release(sd); hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); -todo_wine ok(hr == S_OK, "Failed to get stream major type, hr %#x.\n", hr); - if (FAILED(hr)) - goto skip_source_tests; /* Check major/minor type for the test media. */ ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected major type %s.\n", debugstr_guid(&guid)); @@ -624,6 +624,7 @@ todo_wine get_event((IMFMediaEventGenerator *)mediasource, MEEndOfPresentation, NULL); IMFMediaTypeHandler_Release(handler); + IMFPresentationDescriptor_Release(descriptor); hr = IMFMediaSource_Shutdown(mediasource); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -632,8 +633,6 @@ todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); skip_source_tests: - - IMFPresentationDescriptor_Release(descriptor); IMFMediaSource_Release(mediasource); IMFByteStream_Release(stream); diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 337c1086e6b..e578d194f7f 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ gst_cbs.c \ gstdemux.c \ main.c \ + media_source.c \ mediatype.c \ mfplat.c \ pin.c \ diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index e6fb841fc87..71ca4290885 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -54,4 +54,10 @@ void start_dispatch_thread(void) DECLSPEC_HIDDEN; extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; +enum source_type +{ + SOURCE_TYPE_MPEG_4, +}; +HRESULT container_stream_handler_construct(REFIID riid, void **obj, enum source_type); + #endif /* __GST_PRIVATE_INCLUDED__ */ diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c new file mode 100644 index 00000000000..df28f54444d --- /dev/null +++ b/dlls/winegstreamer/media_source.c @@ -0,0 +1,680 @@ +#include "gst_private.h" + +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "mfapi.h" +#include "mferror.h" +#include "mfidl.h" + +#include "wine/debug.h" +#include "wine/heap.h" +#include "wine/list.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +struct media_source +{ + IMFMediaSource IMFMediaSource_iface; + LONG ref; + IMFMediaEventQueue *event_queue; +}; + +static inline struct media_source *impl_from_IMFMediaSource(IMFMediaSource *iface) +{ + return CONTAINING_RECORD(iface, struct media_source, IMFMediaSource_iface); +} + +static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + TRACE("(%p)->(%s %p)\n", source, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFMediaSource) || + IsEqualIID(riid, &IID_IMFMediaEventGenerator) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = &source->IMFMediaSource_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI media_source_AddRef(IMFMediaSource *iface) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + ULONG ref = InterlockedIncrement(&source->ref); + + TRACE("(%p) ref=%u\n", source, ref); + + return ref; +} + +static ULONG WINAPI media_source_Release(IMFMediaSource *iface) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + ULONG ref = InterlockedDecrement(&source->ref); + + TRACE("(%p) ref=%u\n", source, ref); + + if (!ref) + { + heap_free(source); + } + + return ref; +} + +static HRESULT WINAPI media_source_GetEvent(IMFMediaSource *iface, DWORD flags, IMFMediaEvent **event) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + TRACE("(%p)->(%#x, %p)\n", source, flags, event); + + return IMFMediaEventQueue_GetEvent(source->event_queue, flags, event); +} + +static HRESULT WINAPI media_source_BeginGetEvent(IMFMediaSource *iface, IMFAsyncCallback *callback, IUnknown *state) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + TRACE("(%p)->(%p, %p)\n", source, callback, state); + + return IMFMediaEventQueue_BeginGetEvent(source->event_queue, callback, state); +} + +static HRESULT WINAPI media_source_EndGetEvent(IMFMediaSource *iface, IMFAsyncResult *result, IMFMediaEvent **event) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + TRACE("(%p)->(%p, %p)\n", source, result, event); + + return IMFMediaEventQueue_EndGetEvent(source->event_queue, result, event); +} + +static HRESULT WINAPI media_source_QueueEvent(IMFMediaSource *iface, MediaEventType event_type, REFGUID ext_type, + HRESULT hr, const PROPVARIANT *value) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + TRACE("(%p)->(%d, %s, %#x, %p)\n", source, event_type, debugstr_guid(ext_type), hr, value); + + return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, ext_type, hr, value); +} + +static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWORD *characteristics) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p): stub\n", source, characteristics); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **descriptor) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p): stub\n", source, descriptor); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor, + const GUID *time_format, const PROPVARIANT *start_position) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p, %p, %p): stub\n", source, descriptor, time_format, start_position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + FIXME("(%p): stub\n", source); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_source_Pause(IMFMediaSource *iface) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + FIXME("(%p): stub\n", source); + + return E_NOTIMPL; +} + +static HRESULT media_source_teardown(struct media_source *source) +{ + if (source->event_queue) + IMFMediaEventQueue_Release(source->event_queue); + + return S_OK; +} + +static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + FIXME("(%p): stub\n", source); + + return E_NOTIMPL; +} + +static const IMFMediaSourceVtbl IMFMediaSource_vtbl = +{ + media_source_QueryInterface, + media_source_AddRef, + media_source_Release, + media_source_GetEvent, + media_source_BeginGetEvent, + media_source_EndGetEvent, + media_source_QueueEvent, + media_source_GetCharacteristics, + media_source_CreatePresentationDescriptor, + media_source_Start, + media_source_Stop, + media_source_Pause, + media_source_Shutdown, +}; + +static HRESULT media_source_constructor(IMFByteStream *bytestream, enum source_type type, struct media_source **out_media_source) +{ + struct media_source *object = heap_alloc_zero(sizeof(*object)); + HRESULT hr; + + if (!object) + return E_OUTOFMEMORY; + + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) + goto fail; + + object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; + object->ref = 1; + + *out_media_source = object; + return S_OK; + + fail: + WARN("Failed to construct MFMediaSource, hr %#x.\n", hr); + + media_source_teardown(object); + heap_free(object); + return hr; +} + +/* IMFByteStreamHandler */ + +struct container_stream_handler_result +{ + struct list entry; + IMFAsyncResult *result; + MF_OBJECT_TYPE obj_type; + IUnknown *object; +}; + +struct container_stream_handler +{ + IMFByteStreamHandler IMFByteStreamHandler_iface; + IMFAsyncCallback IMFAsyncCallback_iface; + LONG refcount; + enum source_type type; + struct list results; + CRITICAL_SECTION cs; +}; + +static struct container_stream_handler *impl_from_IMFByteStreamHandler(IMFByteStreamHandler *iface) +{ + return CONTAINING_RECORD(iface, struct container_stream_handler, IMFByteStreamHandler_iface); +} + +static struct container_stream_handler *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct container_stream_handler, IMFAsyncCallback_iface); +} + +static HRESULT WINAPI container_stream_handler_QueryInterface(IMFByteStreamHandler *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFByteStreamHandler) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFByteStreamHandler_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI container_stream_handler_AddRef(IMFByteStreamHandler *iface) +{ + struct container_stream_handler *handler = impl_from_IMFByteStreamHandler(iface); + ULONG refcount = InterlockedIncrement(&handler->refcount); + + TRACE("%p, refcount %u.\n", handler, refcount); + + return refcount; +} + +static ULONG WINAPI container_stream_handler_Release(IMFByteStreamHandler *iface) +{ + struct container_stream_handler *handler = impl_from_IMFByteStreamHandler(iface); + ULONG refcount = InterlockedDecrement(&handler->refcount); + struct container_stream_handler_result *result, *next; + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + LIST_FOR_EACH_ENTRY_SAFE(result, next, &handler->results, struct container_stream_handler_result, entry) + { + list_remove(&result->entry); + IMFAsyncResult_Release(result->result); + if (result->object) + IUnknown_Release(result->object); + heap_free(result); + } + DeleteCriticalSection(&handler->cs); + heap_free(handler); + } + + return refcount; +} + +struct create_object_context +{ + IUnknown IUnknown_iface; + LONG refcount; + + IPropertyStore *props; + IMFByteStream *stream; + WCHAR *url; + DWORD flags; +}; + +static struct create_object_context *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct create_object_context, IUnknown_iface); +} + +static HRESULT WINAPI create_object_context_QueryInterface(IUnknown *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI create_object_context_AddRef(IUnknown *iface) +{ + struct create_object_context *context = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&context->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI create_object_context_Release(IUnknown *iface) +{ + struct create_object_context *context = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&context->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + if (context->props) + IPropertyStore_Release(context->props); + if (context->stream) + IMFByteStream_Release(context->stream); + if (context->url) + heap_free(context->url); + heap_free(context); + } + + return refcount; +} + +static const IUnknownVtbl create_object_context_vtbl = +{ + create_object_context_QueryInterface, + create_object_context_AddRef, + create_object_context_Release, +}; + +static WCHAR *heap_strdupW(const WCHAR *str) +{ + WCHAR *ret = NULL; + + if (str) + { + unsigned int size; + + size = (lstrlenW(str) + 1) * sizeof(WCHAR); + ret = heap_alloc(size); + if (ret) + memcpy(ret, str, size); + } + + return ret; +} + +static HRESULT WINAPI container_stream_handler_BeginCreateObject(IMFByteStreamHandler *iface, IMFByteStream *stream, const WCHAR *url, DWORD flags, + IPropertyStore *props, IUnknown **cancel_cookie, IMFAsyncCallback *callback, IUnknown *state) +{ + struct container_stream_handler *this = impl_from_IMFByteStreamHandler(iface); + struct create_object_context *context; + IMFAsyncResult *caller, *item; + HRESULT hr; + + TRACE("%p, %s, %#x, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state); + + if (cancel_cookie) + *cancel_cookie = NULL; + + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &caller))) + return hr; + + context = heap_alloc(sizeof(*context)); + if (!context) + { + IMFAsyncResult_Release(caller); + return E_OUTOFMEMORY; + } + + context->IUnknown_iface.lpVtbl = &create_object_context_vtbl; + context->refcount = 1; + context->props = props; + if (context->props) + IPropertyStore_AddRef(context->props); + context->flags = flags; + context->stream = stream; + if (context->stream) + IMFByteStream_AddRef(context->stream); + if (url) + context->url = heap_strdupW(url); + if (!context->stream) + { + IMFAsyncResult_Release(caller); + IUnknown_Release(&context->IUnknown_iface); + return E_OUTOFMEMORY; + } + + hr = MFCreateAsyncResult(&context->IUnknown_iface, &this->IMFAsyncCallback_iface, (IUnknown *)caller, &item); + IUnknown_Release(&context->IUnknown_iface); + if (SUCCEEDED(hr)) + { + if (SUCCEEDED(hr = MFPutWorkItemEx(MFASYNC_CALLBACK_QUEUE_IO, item))) + { + if (cancel_cookie) + { + *cancel_cookie = (IUnknown *)caller; + IUnknown_AddRef(*cancel_cookie); + } + } + + IMFAsyncResult_Release(item); + } + IMFAsyncResult_Release(caller); + + return hr; +} + +static HRESULT WINAPI container_stream_handler_EndCreateObject(IMFByteStreamHandler *iface, IMFAsyncResult *result, + MF_OBJECT_TYPE *obj_type, IUnknown **object) +{ + struct container_stream_handler *this = impl_from_IMFByteStreamHandler(iface); + struct container_stream_handler_result *found = NULL, *cur; + HRESULT hr; + + TRACE("%p, %p, %p, %p.\n", iface, result, obj_type, object); + + EnterCriticalSection(&this->cs); + + LIST_FOR_EACH_ENTRY(cur, &this->results, struct container_stream_handler_result, entry) + { + if (result == cur->result) + { + list_remove(&cur->entry); + found = cur; + break; + } + } + + LeaveCriticalSection(&this->cs); + + if (found) + { + *obj_type = found->obj_type; + *object = found->object; + hr = IMFAsyncResult_GetStatus(found->result); + IMFAsyncResult_Release(found->result); + heap_free(found); + } + else + { + *obj_type = MF_OBJECT_INVALID; + *object = NULL; + hr = MF_E_UNEXPECTED; + } + + return hr; +} + +static HRESULT WINAPI container_stream_handler_CancelObjectCreation(IMFByteStreamHandler *iface, IUnknown *cancel_cookie) +{ + struct container_stream_handler *this = impl_from_IMFByteStreamHandler(iface); + struct container_stream_handler_result *found = NULL, *cur; + + TRACE("%p, %p.\n", iface, cancel_cookie); + + EnterCriticalSection(&this->cs); + + LIST_FOR_EACH_ENTRY(cur, &this->results, struct container_stream_handler_result, entry) + { + if (cancel_cookie == (IUnknown *)cur->result) + { + list_remove(&cur->entry); + found = cur; + break; + } + } + + LeaveCriticalSection(&this->cs); + + if (found) + { + IMFAsyncResult_Release(found->result); + if (found->object) + IUnknown_Release(found->object); + heap_free(found); + } + + return found ? S_OK : MF_E_UNEXPECTED; +} + +static HRESULT WINAPI container_stream_handler_GetMaxNumberOfBytesRequiredForResolution(IMFByteStreamHandler *iface, QWORD *bytes) +{ + FIXME("stub (%p %p)\n", iface, bytes); + return E_NOTIMPL; +} + +static const IMFByteStreamHandlerVtbl container_stream_handler_vtbl = +{ + container_stream_handler_QueryInterface, + container_stream_handler_AddRef, + container_stream_handler_Release, + container_stream_handler_BeginCreateObject, + container_stream_handler_EndCreateObject, + container_stream_handler_CancelObjectCreation, + container_stream_handler_GetMaxNumberOfBytesRequiredForResolution, +}; + +static HRESULT WINAPI container_stream_handler_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFAsyncCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI container_stream_handler_callback_AddRef(IMFAsyncCallback *iface) +{ + struct container_stream_handler *handler = impl_from_IMFAsyncCallback(iface); + return IMFByteStreamHandler_AddRef(&handler->IMFByteStreamHandler_iface); +} + +static ULONG WINAPI container_stream_handler_callback_Release(IMFAsyncCallback *iface) +{ + struct container_stream_handler *handler = impl_from_IMFAsyncCallback(iface); + return IMFByteStreamHandler_Release(&handler->IMFByteStreamHandler_iface); +} + +static HRESULT WINAPI container_stream_handler_callback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) +{ + return E_NOTIMPL; +} + +static HRESULT container_stream_handler_create_object(struct container_stream_handler *This, WCHAR *url, IMFByteStream *stream, DWORD flags, + IPropertyStore *props, IUnknown **out_object, MF_OBJECT_TYPE *out_obj_type) +{ + TRACE("(%p %s %p %u %p %p %p)\n", This, debugstr_w(url), stream, flags, props, out_object, out_obj_type); + + if (flags & MF_RESOLUTION_MEDIASOURCE) + { + HRESULT hr; + struct media_source *new_source; + + if (FAILED(hr = media_source_constructor(stream, This->type, &new_source))) + return hr; + + TRACE("->(%p)\n", new_source); + + *out_object = (IUnknown*)&new_source->IMFMediaSource_iface; + *out_obj_type = MF_OBJECT_MEDIASOURCE; + + return S_OK; + } + else + { + FIXME("flags = %08x\n", flags); + return E_NOTIMPL; + } +} + +static HRESULT WINAPI container_stream_handler_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct container_stream_handler *handler = impl_from_IMFAsyncCallback(iface); + struct container_stream_handler_result *handler_result; + MF_OBJECT_TYPE obj_type = MF_OBJECT_INVALID; + IUnknown *object = NULL, *context_object; + struct create_object_context *context; + IMFAsyncResult *caller; + HRESULT hr; + + caller = (IMFAsyncResult *)IMFAsyncResult_GetStateNoAddRef(result); + + if (FAILED(hr = IMFAsyncResult_GetObject(result, &context_object))) + { + WARN("Expected context set for callee result.\n"); + return hr; + } + + context = impl_from_IUnknown(context_object); + + hr = container_stream_handler_create_object(handler, context->url, context->stream, context->flags, context->props, &object, &obj_type); + + handler_result = heap_alloc(sizeof(*handler_result)); + if (handler_result) + { + handler_result->result = caller; + IMFAsyncResult_AddRef(handler_result->result); + handler_result->obj_type = obj_type; + handler_result->object = object; + + EnterCriticalSection(&handler->cs); + list_add_tail(&handler->results, &handler_result->entry); + LeaveCriticalSection(&handler->cs); + } + else + { + if (object) + IUnknown_Release(object); + hr = E_OUTOFMEMORY; + } + + IUnknown_Release(&context->IUnknown_iface); + + IMFAsyncResult_SetStatus(caller, hr); + MFInvokeCallback(caller); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl container_stream_handler_callback_vtbl = +{ + container_stream_handler_callback_QueryInterface, + container_stream_handler_callback_AddRef, + container_stream_handler_callback_Release, + container_stream_handler_callback_GetParameters, + container_stream_handler_callback_Invoke, +}; + +HRESULT container_stream_handler_construct(REFIID riid, void **obj, enum source_type type) +{ + struct container_stream_handler *this; + HRESULT hr; + + TRACE("%s, %p.\n", debugstr_guid(riid), obj); + + this = heap_alloc_zero(sizeof(*this)); + if (!this) + return E_OUTOFMEMORY; + + list_init(&this->results); + InitializeCriticalSection(&this->cs); + + this->type = type; + this->IMFByteStreamHandler_iface.lpVtbl = &container_stream_handler_vtbl; + this->IMFAsyncCallback_iface.lpVtbl = &container_stream_handler_callback_vtbl; + this->refcount = 1; + + hr = IMFByteStreamHandler_QueryInterface(&this->IMFByteStreamHandler_iface, riid, obj); + IMFByteStreamHandler_Release(&this->IMFByteStreamHandler_iface); + + return hr; +} \ No newline at end of file diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 55b9b088765..16e55247de1 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -398,6 +398,11 @@ failed: return hr; } +static HRESULT mp4_stream_handler_create(REFIID riid, void **ret) +{ + return container_stream_handler_construct(riid, ret, SOURCE_TYPE_MPEG_4); +} + static const struct class_object { const GUID *clsid; @@ -406,6 +411,7 @@ static const struct class_object class_objects[] = { { &CLSID_VideoProcessorMFT, &video_processor_create }, + { &CLSID_MPEG4ByteStreamHandler, &mp4_stream_handler_create }, }; HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) @@ -414,6 +420,9 @@ HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) unsigned int i; HRESULT hr; + if (!(init_gstreamer())) + return CLASS_E_CLASSNOTAVAILABLE; + for (i = 0; i < ARRAY_SIZE(class_objects); ++i) { if (IsEqualGUID(class_objects[i].clsid, rclsid)) diff --git a/dlls/winegstreamer/winegstreamer.rgs b/dlls/winegstreamer/winegstreamer.rgs index 923ba673f8c..0bc26761e9d 100644 --- a/dlls/winegstreamer/winegstreamer.rgs +++ b/dlls/winegstreamer/winegstreamer.rgs @@ -12,3 +12,35 @@ HKCR } } } + +HKLM +{ + NoRemove 'Software' + { + NoRemove 'Microsoft' + { + NoRemove 'Windows Media Foundation' + { + NoRemove 'ByteStreamHandlers' + { + '.m4v' + { + val '{271C3902-6095-4c45-A22F-20091816EE9E}' = s 'MPEG4 Byte Stream Handler' + } + '.mp4' + { + val '{271C3902-6095-4c45-A22F-20091816EE9E}' = s 'MPEG4 Byte Stream Handler' + } + 'video/m4v' + { + val '{271C3902-6095-4c45-A22F-20091816EE9E}' = s 'MPEG4 Byte Stream Handler' + } + 'video/mp4' + { + val '{271C3902-6095-4c45-A22F-20091816EE9E}' = s 'MPEG4 Byte Stream Handler' + } + } + } + } + } +} \ No newline at end of file diff --git a/dlls/winegstreamer/winegstreamer_classes.idl b/dlls/winegstreamer/winegstreamer_classes.idl index fa0e1784057..997a28b052f 100644 --- a/dlls/winegstreamer/winegstreamer_classes.idl +++ b/dlls/winegstreamer/winegstreamer_classes.idl @@ -54,3 +54,10 @@ coclass Gstreamer_Splitter {} uuid(88753b26-5b24-49bd-b2e7-0c445c78c982) ] coclass VideoProcessorMFT {} + +[ + helpstring("MP4 Byte Stream Handler"), + threading(both), + uuid(271c3902-6095-4c45-a22f-20091816ee9e) +] +coclass MPEG4ByteStreamHandler {} diff --git a/include/mfidl.idl b/include/mfidl.idl index 4ceeb707bd0..fc13dfba7a1 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1241,3 +1241,4 @@ cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, 0xba491365, cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS, 0xba491366, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);") +cpp_quote("EXTERN_GUID(CLSID_MPEG4ByteStreamHandler, 0x271c3902, 0x6095, 0x4c45, 0xa2, 0x2f, 0x20, 0x09, 0x18, 0x16, 0xee, 0x9e);") \ No newline at end of file -- 2.28.0

3 7

[PATCH 1/6] ole32: Use single static instance for ROT.
by Nikolay Sivov 27 Aug '20

27 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/compobj.c | 10 +-- dlls/ole32/compobj_private.h | 9 +- dlls/ole32/moniker.c | 170 +++++++---------------------------- dlls/ole32/ole32.spec | 1 + 4 files changed, 37 insertions(+), 153 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 55d06f197f7..88482392d5e 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -758,16 +758,8 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoInitializeEx(LPVOID lpReserved, DWORD dwCoIni * And crank-up that lock count. */ if (InterlockedExchangeAdd(&s_COMLockCount,1)==0) - { - /* - * Initialize the various COM libraries and data structures. - */ TRACE("() - Initializing the COM libraries\n"); - /* we may need to defer this until after apartment initialisation */ - RunningObjectTableImpl_Initialize(); - } - lock_init_spies(info); LIST_FOR_EACH_ENTRY(cursor, &info->spies, struct init_spy, entry) { @@ -849,7 +841,7 @@ void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) TRACE("() - Releasing the COM libraries\n"); InternalRevokeAllPSClsids(); - RunningObjectTableImpl_UnInitialize(); + DestroyRunningObjectTable(); } else if (lCOMRefCnt<1) { ERR( "CoUninitialize() - not CoInitialized.\n" ); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 29e4cac3623..e910746fefd 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -234,12 +234,6 @@ HRESULT RPC_RegisterChannelHook(REFGUID rguid, IChannelHook *hook) DECLSPEC_HIDD void RPC_UnregisterAllChannelHooks(void) DECLSPEC_HIDDEN; HRESULT RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info) DECLSPEC_HIDDEN; -/* This function initialize the Running Object Table */ -HRESULT WINAPI RunningObjectTableImpl_Initialize(void) DECLSPEC_HIDDEN; - -/* This function uninitialize the Running Object Table */ -HRESULT WINAPI RunningObjectTableImpl_UnInitialize(void) DECLSPEC_HIDDEN; - /* Drag and drop */ void OLEDD_UnInitialize(void) DECLSPEC_HIDDEN; @@ -365,4 +359,7 @@ static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src) extern HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, BOOL copy, IEnumSTATDATA **ppenum) DECLSPEC_HIDDEN; +extern BOOL WINAPI InternalIsInitialized(void); +extern void WINAPI DestroyRunningObjectTable(void); + #endif /* __WINE_OLE_COMPOBJ_H */ diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index b143b1bc6c6..874b58f99e7 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -63,15 +63,10 @@ struct rot_entry typedef struct RunningObjectTableImpl { IRunningObjectTable IRunningObjectTable_iface; - LONG ref; - struct list rot; /* list of ROT entries */ CRITICAL_SECTION lock; } RunningObjectTableImpl; -static RunningObjectTableImpl* runningObjectTableInstance = NULL; -static IrotHandle irot_handle; - /* define the EnumMonikerImpl structure */ typedef struct EnumMonikerImpl { @@ -256,85 +251,18 @@ RunningObjectTableImpl_QueryInterface(IRunningObjectTable* iface, return S_OK; } -/*********************************************************************** - * RunningObjectTable_AddRef - */ -static ULONG WINAPI -RunningObjectTableImpl_AddRef(IRunningObjectTable* iface) -{ - RunningObjectTableImpl *This = impl_from_IRunningObjectTable(iface); - - TRACE("(%p)\n",This); - - return InterlockedIncrement(&This->ref); -} - -/*********************************************************************** - * RunningObjectTable_Destroy - */ -static HRESULT -RunningObjectTableImpl_Destroy(void) +static ULONG WINAPI RunningObjectTableImpl_AddRef(IRunningObjectTable *iface) { - struct list *cursor, *cursor2; - IrotHandle old_handle; - - TRACE("()\n"); - - if (runningObjectTableInstance==NULL) - return E_INVALIDARG; - - /* free the ROT table memory */ - LIST_FOR_EACH_SAFE(cursor, cursor2, &runningObjectTableInstance->rot) - { - struct rot_entry *rot_entry = LIST_ENTRY(cursor, struct rot_entry, entry); - list_remove(&rot_entry->entry); - rot_entry_delete(rot_entry); - } - - DEBUG_CLEAR_CRITSEC_NAME(&runningObjectTableInstance->lock); - DeleteCriticalSection(&runningObjectTableInstance->lock); + TRACE("%p\n", iface); - /* free the ROT structure memory */ - HeapFree(GetProcessHeap(),0,runningObjectTableInstance); - runningObjectTableInstance = NULL; - - old_handle = irot_handle; - irot_handle = NULL; - if (old_handle) - RpcBindingFree(&old_handle); - - return S_OK; + return 2; } -/*********************************************************************** - * RunningObjectTable_Release - */ -static ULONG WINAPI -RunningObjectTableImpl_Release(IRunningObjectTable* iface) +static ULONG WINAPI RunningObjectTableImpl_Release(IRunningObjectTable *iface) { - RunningObjectTableImpl *This = impl_from_IRunningObjectTable(iface); - ULONG ref; - - TRACE("(%p)\n",This); - - ref = InterlockedDecrement(&This->ref); - - /* uninitialize ROT structure if there are no more references to it */ - if (ref == 0) - { - struct list *cursor, *cursor2; - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->rot) - { - struct rot_entry *rot_entry = LIST_ENTRY(cursor, struct rot_entry, entry); - list_remove(&rot_entry->entry); - rot_entry_delete(rot_entry); - } - /* RunningObjectTable data structure will be not destroyed here ! the destruction will be done only - * when RunningObjectTableImpl_UnInitialize function is called - */ - } + TRACE("%p\n", iface); - return ref; + return 1; } /*********************************************************************** @@ -775,82 +703,48 @@ static const IRunningObjectTableVtbl VT_RunningObjectTableImpl = RunningObjectTableImpl_EnumRunning }; -/*********************************************************************** - * RunningObjectTable_Initialize - */ -HRESULT WINAPI RunningObjectTableImpl_Initialize(void) +static RunningObjectTableImpl rot = { - TRACE("\n"); - - /* create the unique instance of the RunningObjectTableImpl structure */ - runningObjectTableInstance = HeapAlloc(GetProcessHeap(), 0, sizeof(RunningObjectTableImpl)); - - if (!runningObjectTableInstance) - return E_OUTOFMEMORY; - - /* initialize the virtual table function */ - runningObjectTableInstance->IRunningObjectTable_iface.lpVtbl = &VT_RunningObjectTableImpl; - - /* the initial reference is set to "1" so that it isn't destroyed after its - * first use until the process is destroyed, as the running object table is - * a process-wide cache of a global table */ - runningObjectTableInstance->ref = 1; - - list_init(&runningObjectTableInstance->rot); - InitializeCriticalSection(&runningObjectTableInstance->lock); - DEBUG_SET_CRITSEC_NAME(&runningObjectTableInstance->lock, "RunningObjectTableImpl.lock"); - - return S_OK; -} + .IRunningObjectTable_iface.lpVtbl = &VT_RunningObjectTableImpl, + .lock.LockCount = -1, + .rot = LIST_INIT(rot.rot), +}; /*********************************************************************** - * RunningObjectTable_UnInitialize + * GetRunningObjectTable (OLE32.@) */ -HRESULT WINAPI RunningObjectTableImpl_UnInitialize(void) +HRESULT WINAPI GetRunningObjectTable(DWORD reserved, IRunningObjectTable **ret) { - TRACE("\n"); + TRACE("%#x, %p\n", reserved, ret); - if (runningObjectTableInstance==NULL) - return E_POINTER; + if (reserved!=0) + return E_UNEXPECTED; - RunningObjectTableImpl_Release(&runningObjectTableInstance->IRunningObjectTable_iface); + if (!InternalIsInitialized()) + return CO_E_NOTINITIALIZED; - RunningObjectTableImpl_Destroy(); + *ret = &rot.IRunningObjectTable_iface; + IRunningObjectTable_AddRef(*ret); return S_OK; } /*********************************************************************** - * GetRunningObjectTable (OLE32.@) - * - * Retrieves the global running object table. - * - * PARAMS - * reserved [I] Reserved. Set to 0. - * pprot [O] Address that receives the pointer to the running object table. - * - * RETURNS - * Success: S_OK. - * Failure: Any HRESULT code. - */ -HRESULT WINAPI -GetRunningObjectTable(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot) + * DestroyRunningObjectTable (ole32.@) +*/ +void WINAPI DestroyRunningObjectTable(void) { - IID riid=IID_IRunningObjectTable; - HRESULT res; - - TRACE("()\n"); - - if (reserved!=0) - return E_UNEXPECTED; - - if(runningObjectTableInstance==NULL) - return CO_E_NOTINITIALIZED; + struct rot_entry *rot_entry, *cursor2; - res = IRunningObjectTable_QueryInterface(&runningObjectTableInstance->IRunningObjectTable_iface, - &riid,(void**)pprot); + TRACE("\n"); - return res; + EnterCriticalSection(&rot.lock); + LIST_FOR_EACH_ENTRY_SAFE(rot_entry, cursor2, &rot.rot, struct rot_entry, entry) + { + list_remove(&rot_entry->entry); + rot_entry_delete(rot_entry); + } + LeaveCriticalSection(&rot.lock); } static HRESULT get_moniker_for_progid_display_name(LPBC pbc, diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 4908729d1f0..c102bce1776 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -106,6 +106,7 @@ @ stdcall CreateOleAdviseHolder(ptr) @ stdcall CreatePointerMoniker(ptr ptr) @ stdcall CreateStreamOnHGlobal(ptr long ptr) +@ stdcall DestroyRunningObjectTable() @ stdcall DllDebugObjectRPCHook(long ptr) @ stdcall -private DllGetClassObject (ptr ptr ptr) @ stub DllGetClassObjectWOW -- 2.28.0

2 11

[PATCH 1/6] widl: Print full namespace name on error.
by Rémi Bernon 27 Aug '20

27 Aug '20

Not really necessary as the errors are usually more cryptic, but nice to have when it fails there. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This series is just implementing a little better support of WinRT-style interfaces in idl files, required for cleaner stubbing of some WinRT dlls, which are in turn, necessary for some recent games to even start. Namely, Death Stranding requires windows.gaming.input.dll, and Flight Simulator requires windows.media.speech.dll, where some simple stubs are enough to make both happy. tools/widl/parser.y | 10 ++++++++-- tools/widl/widltypes.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 3ef8d89ba1c..98bd8949f13 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -118,7 +118,7 @@ static statement_list_t *append_statements(statement_list_t *, statement_list_t static attr_list_t *append_attribs(attr_list_t *, attr_list_t *); static struct namespace global_namespace = { - NULL, NULL, LIST_INIT(global_namespace.entry), LIST_INIT(global_namespace.children) + NULL, NULL, NULL, LIST_INIT(global_namespace.entry), LIST_INIT(global_namespace.children) }; static struct namespace *current_namespace = &global_namespace; @@ -1833,6 +1833,12 @@ static void push_namespace(const char *name) if(!namespace) { namespace = xmalloc(sizeof(*namespace)); namespace->name = xstrdup(name); + if (!current_namespace->full_name) namespace->full_name = xstrdup(name); + else + { + namespace->full_name = xmalloc(strlen(current_namespace->full_name) + strlen(name) + 1); + sprintf(namespace->full_name, "%s.%s", current_namespace->full_name, name); + } namespace->parent = current_namespace; list_add_tail(&current_namespace->children, &namespace->entry); list_init(&namespace->children); @@ -1961,7 +1967,7 @@ static type_t *find_type_or_error(const char *name, int t) { type_t *type = find_type(name, NULL, t); if (!type) { - error_loc("type '%s' not found\n", name); + error_loc("type '%s' not found in %s\n", name, current_namespace->full_name); return NULL; } return type; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 085a0ff55f5..1634f9bd50b 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -409,6 +409,7 @@ struct alias_details struct namespace { const char *name; + char *full_name; struct namespace *parent; struct list entry; struct list children; -- 2.28.0

3 8

[PATCH 1/2] gdi32: Pass correct pointer to PolyDraw during EMR_POLYDRAW playback.
by Shawn M. Chapla 27 Aug '20

27 Aug '20

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/gdi32/enhmetafile.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index fc3389ff23f..4d6531644b9 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1622,9 +1622,12 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_POLYDRAW: { const EMRPOLYDRAW *lpPolyDraw = (const EMRPOLYDRAW *)mr; + + /* NB abTypes array doesn't start at lpPolyDraw->abTypes. It's actually + lpPolyDraw->aptl + lpPolyDraw->cptl. */ PolyDraw( hdc, (const POINT*)lpPolyDraw->aptl, - lpPolyDraw->abTypes, + (BYTE*)(lpPolyDraw->aptl + lpPolyDraw->cptl), (INT)lpPolyDraw->cptl ); break; -- 2.28.0

2 3

[PATCH 2/5] windowscodecs: Fix DdsFrameDecode_Dds_CopyBlocks().
by Ziqing Hui 27 Aug '20

27 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 42 +++++++++++----------------- dlls/windowscodecs/tests/ddsformat.c | 1 - 2 files changed, 16 insertions(+), 27 deletions(-)

1 1

[PATCH] shcore: Add GetScaleFactorForDevice() stub.
by Nikolay Sivov 26 Aug '20

26 Aug '20

From: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/main.c | 7 +++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index e552ba277f7..32649cccd9c 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -86,6 +86,13 @@ HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR monitor, DEVICE_SCALE_FACTOR *s return S_OK; } +DEVICE_SCALE_FACTOR WINAPI GetScaleFactorForDevice(DISPLAY_DEVICE_TYPE device_type) +{ + FIXME("%d\n", device_type); + + return SCALE_100_PERCENT; +} + HRESULT WINAPI _IStream_Read(IStream *stream, void *dest, ULONG size) { ULONG read; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index d5b7a342e31..368fab19541 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -11,7 +11,7 @@ @ stub GetDpiForShellUIComponent @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) -@ stub GetScaleFactorForDevice +@ stdcall GetScaleFactorForDevice(long) @ stdcall GetScaleFactorForMonitor(long ptr) @ stub IStream_Copy @ stdcall IStream_Read(ptr ptr long) _IStream_Read diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 82a1daaa62b..0ca0c2432af 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -36,8 +36,15 @@ typedef enum PROCESS_DPI_AWARENESS PROCESS_PER_MONITOR_DPI_AWARE } PROCESS_DPI_AWARENESS; +typedef enum +{ + DEVICE_PRIMARY = 0, + DEVICE_IMMERSIVE = 1, +} DISPLAY_DEVICE_TYPE; + HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); +DEVICE_SCALE_FACTOR WINAPI GetScaleFactoryForDevice(DISPLAY_DEVICE_TYPE device_type); HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS); -- 2.28.0

2 1

[PATCH] msvcrt: Import memmove from musl
by Fabian Maurer 26 Aug '20

26 Aug '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49663 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msvcrt/string.c | 53 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index ab6747db5c..fb2ef3ee01 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -30,6 +30,7 @@ #include <stdio.h> #include <math.h> #include <limits.h> +#include <stdint.h> #include <errno.h> #include "msvcrt.h" #include "bnum.h" @@ -2482,22 +2483,50 @@ int __cdecl MSVCRT_memcmp(const void *ptr1, const void *ptr2, MSVCRT_size_t n) /********************************************************************* * memmove (MSVCRT.@) + * Copied from musl (http://www.musl-libc.org/): src/string/memmove.c + * + * ==================================================== + * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * + * Developed at SunSoft, a Sun Microsystems, Inc. business. + * Permission to use, copy, modify, and distribute this + * software is freely granted, provided that this notice + * is preserved. + * ==================================================== */ void * __cdecl MSVCRT_memmove(void *dst, const void *src, MSVCRT_size_t n) { - volatile unsigned char *d = dst; /* avoid gcc optimizations */ - const unsigned char *s = src; - - if ((MSVCRT_size_t)dst - (MSVCRT_size_t)src >= n) - { - while (n--) *d++ = *s++; - } - else - { - d += n - 1; - s += n - 1; - while (n--) *d-- = *s--; + char *d = dst; + const char *s = src; + typedef __attribute__((__may_alias__)) size_t WT; + const int WS = sizeof(WT); + + if (d==s) return d; + + if (d<s) { +#ifdef __GNUC__ + if ((uintptr_t)s % WS == (uintptr_t)d % WS) { + while ((uintptr_t)d % WS) { + if (!n--) return dst; + *d++ = *s++; + } + for (; n>=WS; n-=WS, d+=WS, s+=WS) *(WT *)d = *(WT *)s; + } +#endif + for (; n; n--) *d++ = *s++; + } else { +#ifdef __GNUC__ + if ((uintptr_t)s % WS == (uintptr_t)d % WS) { + while ((uintptr_t)(d+n) % WS) { + if (!n--) return dst; + d[n] = s[n]; + } + while (n>=WS) n-=WS, *(WT *)(d+n) = *(WT *)(s+n); + } +#endif + while (n) n--, d[n] = s[n]; } + return dst; } -- 2.28.0

4 14

[PATCH v2 4/6] include/d3d11sdklayers.idl: Add D3D11SwitchToRef interface.
by Biswapriyo Nath 26 Aug '20

26 Aug '20

2 1

[PATCH v2 1/6] include/d3d10sdklayers.idl: Add D3D10Debug interface.
by Biswapriyo Nath 26 Aug '20

26 Aug '20

2 1

[PATCH v2 2/6] include/d3d10sdklayers.idl: Add D3D10SwitchToRef interface.
by Biswapriyo Nath 26 Aug '20

26 Aug '20

2 1

.NET 5.0 and Wine
by Esme Povirk (they/them) 26 Aug '20

26 Aug '20

Microsoft has announced a feature complete preview of .NET 5.0: https://devblogs.microsoft.com/dotnet/announcing-net-5-0-preview-8/ I thought I would pre-empt the inevitable questions about what this means for Wine and Wine Mono. The answer is, not very much. Summary: Wine Mono will only replace .NET version 4.x and earlier. For .NET 5.0 and later in Wine, the official binaries from https://dotnet.microsoft.com/download/dotnet/5.0 should be used. The 2 runtimes can be installed at the same time and will function independently. .NET 5.0 does not interact with earlier versions of .NET at all, nor is it really part of the OS. It is a runtime that can be installed globally, or packaged with an individual application, similar to how the Mono runtime functions on Windows now. I have been told that it works fine in Wine. It's also (mostly) open source. Since .NET 5.0 breaks compatibility with earlier versions (winforms has removed APIs and changed the default font which breaks some application layouts), is open source, works independently from .NET 4.x and earlier, already works in Wine, and has a build system very different from the one used in Wine Mono, it does not make sense to try to replace it with Wine Mono. Should Wine require any changes that upstream does not wish to merge, we will need our own fork, otherwise we can simply use the official binaries. One reason to fork it might be to remove dependencies on proprietary components, most notably PresentationNative_cor3.dll, and Microsoft SDK build tools. Some of the work I've been doing with WPF may help with that, but it's still incomplete and would need to be forward-ported to the current version of WPF. For folks who want to use Wine to port Windows applications using .NET 5.0 winforms or wpf to other platforms, I am not aware of anything in the .NET 5.0 license that would get in the way of this use case.

1 0

[PATCH 1/5] iphlpapi: Unify conversions to interface guid.
by Isabella Bosia 26 Aug '20

26 Aug '20

Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c039086229..ddde081950 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1008,12 +1008,19 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index WCHAR *dst; DWORD buflen, type; INTERNAL_IF_OPER_STATUS status; + NET_LUID luid; + GUID guid; memset(aa, 0, sizeof(IP_ADAPTER_ADDRESSES)); aa->u.s.Length = sizeof(IP_ADAPTER_ADDRESSES); aa->u.s.IfIndex = index; - sprintf(ptr, "{%08x-0000-0000-0000-000000000000}", index); + ConvertInterfaceIndexToLuid(index, &luid); + ConvertInterfaceLuidToGuid(&luid, &guid); + sprintf(ptr, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], + guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], + guid.Data4[6], guid.Data4[7]); aa->AdapterName = ptr; ptr += 39; @@ -1786,7 +1793,7 @@ DWORD WINAPI GetIfEntry2( MIB_IF_ROW2 *row2 ) row2->InterfaceLuid.Info.NetLuidIndex = row.dwIndex; row2->InterfaceLuid.Info.IfType = row.dwType; row2->InterfaceIndex = row.dwIndex; - row2->InterfaceGuid.Data1 = row.dwIndex; + ConvertInterfaceLuidToGuid( &row2->InterfaceLuid, &row2->InterfaceGuid ); row2->Type = row.dwType; row2->Mtu = row.dwMtu; MultiByteToWideChar( CP_UNIXCP, 0, (const char *)row.bDescr, -1, row2->Description, len ); -- 2.25.1

2 7

[PATCH v2 2/6] windowscodecs/tests: Fix tests for CopyBlocks.
by Ziqing Hui 26 Aug '20

26 Aug '20

Using strncmp() to compare pixel data buffer leads to incorrect tests. Also, we should clear the pixel data buffer before editing and comparing them. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: This is a new patch in patch set. This patch fixes the test failure in previous patch. dlls/windowscodecs/tests/ddsformat.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)

2 1

[PATCH 1/4] gdiplus: Remove outdated FIXME comment about compositing mode.
by Shawn M. Chapla 26 Aug '20

26 Aug '20

Removes an outdated comment about graphics compositing mode being unused. Graphics compositing mode has been used in pixel blending since a16a4d97. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/gdiplus/graphics.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f0da41c6cbb..57022003249 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4781,7 +4781,6 @@ GpStatus WINGDIPAPI GdipGetClipBoundsI(GpGraphics *graphics, GpRect *rect) return GdipGetRegionBoundsI(graphics->clip, graphics, rect); } -/* FIXME: Compositing mode is not used anywhere except the getter/setter. */ GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics *graphics, CompositingMode *mode) { -- 2.28.0

2 7

[PATCH] vbscript: Implement case-insensitive search in Replace function
by Dmitry Kislyuk 26 Aug '20

26 Aug '20

2 1

[PATCH vkd3d v2 1/2] vkd3d-shader: Do not check for NULL in vkd3d_shader_free_scan_descriptor_info().
by Zebediah Figura 26 Aug '20

26 Aug '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index a5931384..60020141 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -838,14 +838,16 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, if (instruction.handler_idx == VKD3DSIH_INVALID) { WARN("Encountered unrecognized or invalid instruction.\n"); - vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); + if (scan_descriptor_info) + vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); ret = VKD3D_ERROR_INVALID_SHADER; goto done; } if ((ret = vkd3d_shader_scan_instruction(&context, &instruction)) < 0) { - vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); + if (scan_descriptor_info) + vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); goto done; } ++message_context->line; @@ -889,9 +891,6 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info) { - if (!scan_descriptor_info) - return; - vkd3d_free(scan_descriptor_info->descriptors); } -- 2.28.0

2 1

[PATCH vkd3d 1/2] vkd3d-shader: Do not check for NULL in vkd3d_shader_free_scan_descriptor_info().
by Zebediah Figura 26 Aug '20

26 Aug '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index a5931384..b1c9dadf 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -889,9 +889,6 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info) { - if (!scan_descriptor_info) - return; - vkd3d_free(scan_descriptor_info->descriptors); } -- 2.28.0

3 3

[PATCH v2 1/6] windowscodecs/tests: Replace strncmp with memcmp for pixel data checking.
by Ziqing Hui 26 Aug '20

26 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

2 1

[PATCH 1/5] ole32: Get rid of typedef'ed type for apartment structure.
by Nikolay Sivov 26 Aug '20

26 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/compobj.c | 56 ++++++++++++++++++------------------ dlls/ole32/compobj_private.h | 24 ++++++++-------- dlls/ole32/marshal.c | 19 ++++++------ dlls/ole32/rpc.c | 10 +++---- dlls/ole32/stubmanager.c | 26 ++++++++--------- 5 files changed, 67 insertions(+), 68 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d45cbcc1734..4bd8c2474b6 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -71,8 +71,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); * This section defines variables internal to the COM module. */ -static APARTMENT *MTA; /* protected by csApartment */ -static APARTMENT *MainApartment; /* the first STA apartment */ +static struct apartment *MTA; /* protected by csApartment */ +static struct apartment *MainApartment; /* the first STA apartment */ static struct list apts = LIST_INIT( apts ); /* protected by csApartment */ static CRITICAL_SECTION csApartment; @@ -174,7 +174,7 @@ struct LocalServer { IServiceProvider IServiceProvider_iface; LONG ref; - APARTMENT *apt; + struct apartment *apt; IStream *marshal_stream; }; @@ -608,9 +608,9 @@ static DWORD apartment_addref(struct apartment *apt) /* allocates memory and fills in the necessary fields for a new apartment * object. must be called inside apartment cs */ -static APARTMENT *apartment_construct(DWORD model) +static struct apartment *apartment_construct(DWORD model) { - APARTMENT *apt; + struct apartment *apt; TRACE("creating new apartment, model=%d\n", model); @@ -651,9 +651,9 @@ static APARTMENT *apartment_construct(DWORD model) /* gets and existing apartment if one exists or otherwise creates an apartment * structure which stores OLE apartment-local information and stores a pointer * to it in the thread-local storage */ -static APARTMENT *apartment_get_or_create(DWORD model) +static struct apartment *apartment_get_or_create(DWORD model) { - APARTMENT *apt = COM_CurrentApt(); + struct apartment *apt = COM_CurrentApt(); if (!apt) { @@ -699,7 +699,7 @@ static APARTMENT *apartment_get_or_create(DWORD model) return apt; } -static inline BOOL apartment_is_model(const APARTMENT *apt, DWORD model) +static inline BOOL apartment_is_model(const struct apartment *apt, DWORD model) { return (apt->multi_threaded == !(model & COINIT_APARTMENTTHREADED)); } @@ -707,9 +707,9 @@ static inline BOOL apartment_is_model(const APARTMENT *apt, DWORD model) /* gets the multi-threaded apartment if it exists. The caller must * release the reference from the apartment as soon as the apartment pointer * is no longer required. */ -static APARTMENT *apartment_find_mta(void) +static struct apartment *apartment_find_mta(void) { - APARTMENT *apt; + struct apartment *apt; EnterCriticalSection(&csApartment); @@ -723,9 +723,9 @@ static APARTMENT *apartment_find_mta(void) /* Return the current apartment if it exists, or, failing that, the MTA. Caller * must free the returned apartment in either case. */ -APARTMENT *apartment_get_current_or_mta(void) +struct apartment *apartment_get_current_or_mta(void) { - APARTMENT *apt = COM_CurrentApt(); + struct apartment *apt = COM_CurrentApt(); if (apt) { apartment_addref(apt); @@ -959,7 +959,7 @@ static ULONG WINAPI LocalServer_Release(IServiceProvider *iface) static HRESULT WINAPI LocalServer_QueryService(IServiceProvider *iface, REFGUID guid, REFIID riid, void **ppv) { LocalServer *This = impl_from_IServiceProvider(iface); - APARTMENT *apt = COM_CurrentApt(); + struct apartment *apt = COM_CurrentApt(); RegisteredClass *iter; HRESULT hres = E_FAIL; @@ -991,7 +991,7 @@ static const IServiceProviderVtbl LocalServerVtbl = { LocalServer_QueryService }; -static HRESULT get_local_server_stream(APARTMENT *apt, IStream **ret) +static HRESULT get_local_server_stream(struct apartment *apt, IStream **ret) { HRESULT hres = S_OK; @@ -1057,7 +1057,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoRevokeClassObject( { HRESULT hr = E_INVALIDARG; RegisteredClass *curClass; - APARTMENT *apt; + struct apartment *apt; TRACE("(%08x)\n",dwRegister); @@ -1242,9 +1242,9 @@ DWORD apartment_release(struct apartment *apt) * The ref parameter is here mostly to ensure people remember that * they get one, you should normally take a ref for thread safety. */ -APARTMENT *apartment_findfromoxid(OXID oxid, BOOL ref) +struct apartment *apartment_findfromoxid(OXID oxid, BOOL ref) { - APARTMENT *result = NULL; + struct apartment *result = NULL; struct list *cursor; EnterCriticalSection(&csApartment); @@ -1266,9 +1266,9 @@ APARTMENT *apartment_findfromoxid(OXID oxid, BOOL ref) /* gets the apartment which has a given creator thread ID. The caller must * release the reference from the apartment as soon as the apartment pointer * is no longer required. */ -APARTMENT *apartment_findfromtid(DWORD tid) +struct apartment *apartment_findfromtid(DWORD tid) { - APARTMENT *result = NULL; + struct apartment *result = NULL; struct list *cursor; EnterCriticalSection(&csApartment); @@ -1290,9 +1290,9 @@ APARTMENT *apartment_findfromtid(DWORD tid) /* gets the main apartment if it exists. The caller must * release the reference from the apartment as soon as the apartment pointer * is no longer required. */ -static APARTMENT *apartment_findmain(void) +static struct apartment *apartment_findmain(void) { - APARTMENT *result; + struct apartment *result; EnterCriticalSection(&csApartment); @@ -1548,7 +1548,7 @@ static HRESULT apartment_hostobject_in_hostapt( if (!multi_threaded && main_apartment) { - APARTMENT *host_apt = apartment_findmain(); + struct apartment *host_apt = apartment_findmain(); if (host_apt) { apartment_hwnd = apartment_getwindow(host_apt); @@ -1601,7 +1601,7 @@ static HRESULT apartment_hostobject_in_hostapt( * us to create the thread for the host apartment */ if (!apartment_hwnd && !multi_threaded && main_apartment) { - APARTMENT *host_apt = apartment_findmain(); + struct apartment *host_apt = apartment_findmain(); if (host_apt) { apartment_hwnd = apartment_getwindow(host_apt); @@ -2008,7 +2008,7 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) struct stub_manager *manager; HRESULT hr; IMarshal *marshal; - APARTMENT *apt; + struct apartment *apt; TRACE("(%p, 0x%08x)\n", lpUnk, reserved); @@ -2203,7 +2203,7 @@ HRESULT WINAPI CoRegisterClassObject( RegisteredClass* newClass; LPUNKNOWN foundObject; HRESULT hr; - APARTMENT *apt; + struct apartment *apt; TRACE("(%s,%p,0x%08x,0x%08x,%p)\n", debugstr_guid(rclsid),pUnk,dwClsContext,flags,lpdwRegister); @@ -2321,7 +2321,7 @@ static enum comclass_threadingmodel get_threading_model(const struct class_reg_d return data->u.actctx.threading_model; } -static HRESULT get_inproc_class_object(APARTMENT *apt, const struct class_reg_data *regdata, +static HRESULT get_inproc_class_object(struct apartment *apt, const struct class_reg_data *regdata, REFCLSID rclsid, REFIID riid, BOOL hostifnecessary, void **ppv) { @@ -2405,7 +2405,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( struct class_reg_data clsreg = { 0 }; IUnknown *regClassObject; HRESULT hres = E_UNEXPECTED; - APARTMENT *apt; + struct apartment *apt; TRACE("CLSID: %s,IID: %s\n", debugstr_guid(rclsid), debugstr_guid(iid)); @@ -3150,7 +3150,7 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) { struct oletls *info = COM_CurrentInfo(); - APARTMENT *apt; + struct apartment *apt; TRACE("(%p, %p)\n", type, qualifier); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 003cf767cb4..7958b119bc2 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -40,7 +40,6 @@ #include "winternl.h" struct apartment; -typedef struct apartment APARTMENT; typedef struct LocalServer LocalServer; DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 ); @@ -89,7 +88,7 @@ struct stub_manager struct list entry; /* entry in apartment stubmgr list (CS apt->cs) */ struct list ifstubs; /* list of active ifstubs for the object (CS lock) */ CRITICAL_SECTION lock; - APARTMENT *apt; /* owning apt (RO) */ + struct apartment *apt; /* owning apt (RO) */ ULONG extrefs; /* number of 'external' references (CS lock) */ ULONG refs; /* internal reference count (CS apt->cs) */ @@ -203,17 +202,18 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, REFIID iid, DWORD dest_context, void *dest_context_data, MSHLFLAGS flags) DECLSPEC_HIDDEN; struct ifstub *stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags) DECLSPEC_HIDDEN; -struct stub_manager *get_stub_manager(APARTMENT *apt, OID oid) DECLSPEC_HIDDEN; -struct stub_manager *get_stub_manager_from_object(APARTMENT *apt, IUnknown *object, BOOL alloc) DECLSPEC_HIDDEN; +struct stub_manager *get_stub_manager(struct apartment *apt, OID oid) DECLSPEC_HIDDEN; +struct stub_manager *get_stub_manager_from_object(struct apartment *apt, IUnknown *object, BOOL alloc) DECLSPEC_HIDDEN; BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN; BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN; void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak) DECLSPEC_HIDDEN; void stub_manager_disconnect(struct stub_manager *m) DECLSPEC_HIDDEN; -HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, struct stub_manager **manager, IRpcStubBuffer **stub, +HRESULT ipid_get_dispatch_params(const IPID *ipid, struct apartment **stub_apt, struct stub_manager **manager, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) DECLSPEC_HIDDEN; -HRESULT start_apartment_remote_unknown(APARTMENT *apt) DECLSPEC_HIDDEN; +HRESULT start_apartment_remote_unknown(struct apartment *apt) DECLSPEC_HIDDEN; -HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *obj, DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags) DECLSPEC_HIDDEN; +HRESULT marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *obj, DWORD dest_context, + void *dest_context_data, MSHLFLAGS mshlflags) DECLSPEC_HIDDEN; /* RPC Backend */ @@ -223,7 +223,7 @@ void RPC_StartRemoting(struct apartment *apt) DECLSPEC_HIDDEN; HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, const OXID_INFO *oxid_info, const IID *iid, DWORD dest_context, void *dest_context_data, - IRpcChannelBuffer **chan, APARTMENT *apt) DECLSPEC_HIDDEN; + IRpcChannelBuffer **chan, struct apartment *apt) DECLSPEC_HIDDEN; HRESULT RPC_CreateServerChannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) DECLSPEC_HIDDEN; void RPC_ExecuteCall(struct dispatch_params *params) DECLSPEC_HIDDEN; HRESULT RPC_RegisterInterface(REFIID riid) DECLSPEC_HIDDEN; @@ -246,8 +246,8 @@ void OLEDD_UnInitialize(void) DECLSPEC_HIDDEN; /* Apartment Functions */ -APARTMENT *apartment_findfromoxid(OXID oxid, BOOL ref) DECLSPEC_HIDDEN; -APARTMENT *apartment_findfromtid(DWORD tid) DECLSPEC_HIDDEN; +struct apartment *apartment_findfromoxid(OXID oxid, BOOL ref) DECLSPEC_HIDDEN; +struct apartment *apartment_findfromtid(DWORD tid) DECLSPEC_HIDDEN; DWORD apartment_release(struct apartment *apt) DECLSPEC_HIDDEN; HRESULT apartment_disconnectproxies(struct apartment *apt) DECLSPEC_HIDDEN; static inline HRESULT apartment_getoxid(const struct apartment *apt, OXID *oxid) @@ -259,7 +259,7 @@ HRESULT apartment_createwindowifneeded(struct apartment *apt) DECLSPEC_HIDDEN; HWND apartment_getwindow(const struct apartment *apt) DECLSPEC_HIDDEN; HRESULT enter_apartment(struct oletls *info, DWORD model) DECLSPEC_HIDDEN; void leave_apartment(struct oletls *info) DECLSPEC_HIDDEN; -APARTMENT *apartment_get_current_or_mta(void) DECLSPEC_HIDDEN; +struct apartment *apartment_get_current_or_mta(void) DECLSPEC_HIDDEN; /* DCOM messages used by the apartment window (not compatible with native) */ #define DM_EXECUTERPC (WM_USER + 0) /* WPARAM = 0, LPARAM = (struct dispatch_params *) */ @@ -282,7 +282,7 @@ static inline struct oletls *COM_CurrentInfo(void) return NtCurrentTeb()->ReservedForOle; } -static inline APARTMENT* COM_CurrentApt(void) +static inline struct apartment * COM_CurrentApt(void) { return COM_CurrentInfo()->apt; } diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 343d1c834f7..9fb68e66f07 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -85,7 +85,7 @@ static inline struct proxy_manager *impl_from_IClientSecurity( IClientSecurity * return CONTAINING_RECORD(iface, struct proxy_manager, IClientSecurity_iface); } -static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, +static HRESULT unmarshal_object(const STDOBJREF *stdobjref, struct apartment *apt, MSHCTX dest_context, void *dest_context_data, REFIID riid, const OXID_INFO *oxid_info, void **object); @@ -118,7 +118,7 @@ static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf) } /* marshals an object into a STDOBJREF structure */ -HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object, +HRESULT marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object, DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags) { struct stub_manager *manager; @@ -310,7 +310,7 @@ static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, UL * the interfaces were returned */ if (SUCCEEDED(hr)) { - APARTMENT *apt = apartment_get_current_or_mta(); + struct apartment *apt = apartment_get_current_or_mta(); /* try to unmarshal each object returned to us */ for (i = 0; i < nonlocal_mqis; i++) @@ -791,7 +791,7 @@ static void ifproxy_destroy(struct ifproxy * This) } static HRESULT proxy_manager_construct( - APARTMENT * apt, ULONG sorflags, OXID oxid, OID oid, + struct apartment * apt, ULONG sorflags, OXID oxid, OID oid, const OXID_INFO *oxid_info, struct proxy_manager ** proxy_manager) { struct proxy_manager * This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); @@ -1197,7 +1197,7 @@ static void proxy_manager_destroy(struct proxy_manager * This) /* finds the proxy manager corresponding to a given OXID and OID that has * been unmarshaled in the specified apartment. The caller must release the * reference to the proxy_manager when the object is no longer used. */ -static BOOL find_proxy_manager(APARTMENT * apt, OXID oxid, OID oid, struct proxy_manager ** proxy_found) +static BOOL find_proxy_manager(struct apartment * apt, OXID oxid, OID oid, struct proxy_manager ** proxy_found) { BOOL found = FALSE; struct list * cursor; @@ -1306,7 +1306,7 @@ StdMarshalImpl_MarshalInterface( { ULONG res; HRESULT hres; - APARTMENT *apt; + struct apartment *apt; OBJREF objref; TRACE("(...,%s,...)\n", debugstr_guid(riid)); @@ -1337,7 +1337,7 @@ StdMarshalImpl_MarshalInterface( /* helper for StdMarshalImpl_UnmarshalInterface - does the unmarshaling with * no questions asked about the rules surrounding same-apartment unmarshals * and table marshaling */ -static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, +static HRESULT unmarshal_object(const STDOBJREF *stdobjref, struct apartment *apt, MSHCTX dest_context, void *dest_context_data, REFIID riid, const OXID_INFO *oxid_info, void **object) @@ -1413,8 +1413,7 @@ static HRESULT std_unmarshal_interface(MSHCTX dest_context, void *dest_context_d struct OR_STANDARD obj; ULONG res; HRESULT hres; - APARTMENT *apt; - APARTMENT *stub_apt; + struct apartment *apt, *stub_apt; OXID oxid; TRACE("(...,%s,....)\n", debugstr_guid(riid)); @@ -1540,7 +1539,7 @@ static HRESULT std_release_marshal_data(IStream *pStm) ULONG res; HRESULT hres; struct stub_manager *stubmgr; - APARTMENT *apt; + struct apartment *apt; hres = IStream_Read(pStm, &obj, FIELD_OFFSET(struct OR_STANDARD, saResAddr.aStringArray), &res); if (hres != S_OK) return STG_E_READFAULT; diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index bd825fd6c10..d0b0f49319d 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -630,7 +630,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, ULONG extension_count; IPID ipid; HRESULT hr; - APARTMENT *apt = NULL; + struct apartment *apt = NULL; TRACE("(%p)->(%p,%s)\n", This, olemsg, debugstr_guid(riid)); @@ -803,7 +803,7 @@ static DWORD WINAPI rpc_sendreceive_thread(LPVOID param) return 0; } -static inline HRESULT ClientRpcChannelBuffer_IsCorrectApartment(ClientRpcChannelBuffer *This, APARTMENT *apt) +static inline HRESULT ClientRpcChannelBuffer_IsCorrectApartment(ClientRpcChannelBuffer *This, struct apartment *apt) { OXID oxid; if (!apt) @@ -827,7 +827,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac ORPC_EXTENT_ARRAY orpc_ext_array; WIRE_ORPC_EXTENT *first_wire_orpc_extent = NULL; HRESULT hrFault = S_OK; - APARTMENT *apt = apartment_get_current_or_mta(); + struct apartment *apt = apartment_get_current_or_mta(); TRACE("(%p) iMethod=%d\n", olemsg, olemsg->iMethod); @@ -1095,7 +1095,7 @@ static const IRpcChannelBufferVtbl ServerRpcChannelBufferVtbl = HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, const OXID_INFO *oxid_info, const IID *iid, DWORD dest_context, void *dest_context_data, - IRpcChannelBuffer **chan, APARTMENT *apt) + IRpcChannelBuffer **chan, struct apartment *apt) { ClientRpcChannelBuffer *This; WCHAR endpoint[200]; @@ -1444,7 +1444,7 @@ static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) { struct dispatch_params *params; struct stub_manager *stub_manager; - APARTMENT *apt; + struct apartment *apt; IPID ipid; HRESULT hr; diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 5f604d42910..16f9c3dc52c 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -177,7 +177,7 @@ struct ifstub *stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHL /* creates a new stub manager and adds it into the apartment. caller must * release stub manager when it is no longer required. the apartment and * external refs together take one implicit ref */ -static struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object) +static struct stub_manager *new_stub_manager(struct apartment *apt, IUnknown *object) { struct stub_manager *sm; HRESULT hres; @@ -311,7 +311,7 @@ static ULONG stub_manager_int_addref(struct stub_manager *This) ULONG stub_manager_int_release(struct stub_manager *This) { ULONG refs; - APARTMENT *apt = This->apt; + struct apartment *apt = This->apt; EnterCriticalSection(&apt->cs); refs = --This->refs; @@ -334,7 +334,7 @@ ULONG stub_manager_int_release(struct stub_manager *This) /* gets the stub manager associated with an object - caller must have * a reference to the apartment while a reference to the stub manager is held. * it must also call release on the stub manager when it is no longer needed */ -struct stub_manager *get_stub_manager_from_object(APARTMENT *apt, IUnknown *obj, BOOL alloc) +struct stub_manager *get_stub_manager_from_object(struct apartment *apt, IUnknown *obj, BOOL alloc) { struct stub_manager *result = NULL; struct list *cursor; @@ -377,7 +377,7 @@ struct stub_manager *get_stub_manager_from_object(APARTMENT *apt, IUnknown *obj, /* gets the stub manager associated with an object id - caller must have * a reference to the apartment while a reference to the stub manager is held. * it must also call release on the stub manager when it is no longer needed */ -struct stub_manager *get_stub_manager(APARTMENT *apt, OID oid) +struct stub_manager *get_stub_manager(struct apartment *apt, OID oid) { struct stub_manager *result = NULL; struct list *cursor; @@ -471,7 +471,7 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea /* gets the stub manager associated with an ipid - caller must have * a reference to the apartment while a reference to the stub manager is held. * it must also call release on the stub manager when it is no longer needed */ -static struct stub_manager *get_stub_manager_from_ipid(APARTMENT *apt, const IPID *ipid, struct ifstub **ifstub) +static struct stub_manager *get_stub_manager_from_ipid(struct apartment *apt, const IPID *ipid, struct ifstub **ifstub) { struct stub_manager *result = NULL; struct list *cursor; @@ -498,7 +498,7 @@ static struct stub_manager *get_stub_manager_from_ipid(APARTMENT *apt, const IPI return result; } -static HRESULT ipid_to_ifstub(const IPID *ipid, APARTMENT **stub_apt, +static HRESULT ipid_to_ifstub(const IPID *ipid, struct apartment **stub_apt, struct stub_manager **stubmgr_ret, struct ifstub **ifstub) { /* FIXME: hack for IRemUnknown */ @@ -521,7 +521,7 @@ static HRESULT ipid_to_ifstub(const IPID *ipid, APARTMENT **stub_apt, return S_OK; } -static HRESULT ipid_to_stub_manager(const IPID *ipid, APARTMENT **stub_apt, struct stub_manager **stub) +static HRESULT ipid_to_stub_manager(const IPID *ipid, struct apartment **stub_apt, struct stub_manager **stub) { struct ifstub *ifstub; return ipid_to_ifstub(ipid, stub_apt, stub, &ifstub); @@ -530,14 +530,14 @@ static HRESULT ipid_to_stub_manager(const IPID *ipid, APARTMENT **stub_apt, stru /* gets the apartment, stub and channel of an object. the caller must * release the references to all objects (except iface) if the function * returned success, otherwise no references are returned. */ -HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, +HRESULT ipid_get_dispatch_params(const IPID *ipid, struct apartment **stub_apt, struct stub_manager **manager, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) { struct stub_manager *stubmgr; struct ifstub *ifstub; - APARTMENT *apt; + struct apartment *apt; HRESULT hr; hr = ipid_to_ifstub(ipid, &apt, &stubmgr, &ifstub); @@ -703,7 +703,7 @@ static HRESULT WINAPI RemUnknown_RemQueryInterface(IRemUnknown *iface, HRESULT hr; USHORT i; USHORT successful_qis = 0; - APARTMENT *apt; + struct apartment *apt; struct stub_manager *stubmgr; struct ifstub *ifstub; DWORD dest_context; @@ -750,7 +750,7 @@ static HRESULT WINAPI RemUnknown_RemAddRef(IRemUnknown *iface, for (i = 0; i < cInterfaceRefs; i++) { - APARTMENT *apt; + struct apartment *apt; struct stub_manager *stubmgr; pResults[i] = ipid_to_stub_manager(&InterfaceRefs[i].ipid, &apt, &stubmgr); @@ -782,7 +782,7 @@ static HRESULT WINAPI RemUnknown_RemRelease(IRemUnknown *iface, for (i = 0; i < cInterfaceRefs; i++) { - APARTMENT *apt; + struct apartment *apt; struct stub_manager *stubmgr; hr = ipid_to_stub_manager(&InterfaceRefs[i].ipid, &apt, &stubmgr); @@ -815,7 +815,7 @@ static const IRemUnknownVtbl RemUnknown_Vtbl = }; /* starts the IRemUnknown listener for the current apartment */ -HRESULT start_apartment_remote_unknown(APARTMENT *apt) +HRESULT start_apartment_remote_unknown(struct apartment *apt) { IRemUnknown *pRemUnknown; HRESULT hr = S_OK; -- 2.28.0

3 13

[PATCH v2 6/6] windowscodecs: Add more supported formats and fix RGB masks for RGBA1010102.
by Ziqing Hui 26 Aug '20

26 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 14 ++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 9 +++------ 2 files changed, 15 insertions(+), 8 deletions(-)

1 0

[PATCH v2 5/6] windowscodecs: Correctly set pixel format of uncompressed DDS images.
by Ziqing Hui 26 Aug '20

26 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 10 ++++++---- dlls/windowscodecs/tests/ddsformat.c | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-)

1 0

[PATCH v2 4/6] windowscodecs: Support uncompressed format in DdsFrameDecode_CopyPixels().
by Ziqing Hui 26 Aug '20

26 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 20 ++++++++++++-------- dlls/windowscodecs/tests/ddsformat.c | 11 ++++++----- 2 files changed, 18 insertions(+), 13 deletions(-)

1 0

[PATCH v2 3/6] windowscodecs: Fix DdsFrameDecode_Dds_CopyBlocks().
by Ziqing Hui 26 Aug '20

26 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: This is a new patch in patch set. dlls/windowscodecs/ddsformat.c | 42 +++++++++++----------------- dlls/windowscodecs/tests/ddsformat.c | 1 - 2 files changed, 16 insertions(+), 27 deletions(-)

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 26 Aug '20

26 Aug '20

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 26 Aug '20

26 Aug '20

1 0

[PATCH 4/4] windowscodecs: Add more supported formats and fix RGB masks for RGBA1010102.
by Ziqing Hui 26 Aug '20

26 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 14 ++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 9 +++------ 2 files changed, 15 insertions(+), 8 deletions(-)

2 1

[PATCH 3/4] windowscodecs: Correctly set pixel format of uncompressed DDS images.
by Ziqing Hui 26 Aug '20

26 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 10 ++++++---- dlls/windowscodecs/tests/ddsformat.c | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-)

2 1

[PATCH 2/4] windowscodecs: Support uncompressed format in DdsFrameDecode_CopyPixels().
by Ziqing Hui 26 Aug '20

26 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 20 ++++++++++++-------- dlls/windowscodecs/tests/ddsformat.c | 11 ++++++----- 2 files changed, 18 insertions(+), 13 deletions(-)

2 1

[PATCH 1/4] windowscodecs/tests: Replace strncmp with memcmp for pixel data checking.
by Ziqing Hui 26 Aug '20

26 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

2 1

[PATCH v3] amstream: Implement IMediaStreamFilter::ReferenceTimeToStreamTime().
by Gijs Vermeulen 25 Aug '20

25 Aug '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/filter.c | 20 ++++++++++-- dlls/amstream/tests/amstream.c | 59 ++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 13fd30c3a5..b63a0301d6 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -616,11 +616,25 @@ static HRESULT WINAPI filter_SupportSeeking(IMediaStreamFilter *iface, BOOL rend return E_NOINTERFACE; } -static HRESULT WINAPI filter_ReferenceTimeToStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *pTime) +static HRESULT WINAPI filter_ReferenceTimeToStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *time) { - FIXME("(%p)->(%p): Stub!\n", iface, pTime); + struct filter *filter = impl_from_IMediaStreamFilter(iface); - return E_NOTIMPL; + TRACE("filter %p, time %p.\n", filter, time); + + EnterCriticalSection(&filter->cs); + + if (!filter->clock) + { + LeaveCriticalSection(&filter->cs); + return S_FALSE; + } + + *time -= filter->start_time; + + LeaveCriticalSection(&filter->cs); + + return S_OK; } static HRESULT WINAPI filter_GetCurrentStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *time) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a25ae42a31..f4c033a180 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5436,6 +5436,64 @@ static void test_mediastreamfilter_get_current_stream_time(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_reference_time_to_stream_time(void) +{ + IMediaStreamFilter *filter; + struct testclock clock; + REFERENCE_TIME time; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaStreamFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + testclock_init(&clock); + + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdeadbeef, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaStreamFilter_SetSyncSource(filter, &clock.IReferenceClock_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + clock.get_time_hr = E_FAIL; + + /* Crashes on native. */ + if (0) + { + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + } + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdeadbeef, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaStreamFilter_Run(filter, 23456789); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdd47d2da, "Got time %s.\n", wine_dbgstr_longlong(time)); + + clock.time = 34567890; + clock.get_time_hr = S_OK; + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdd47d2da, "Got time %s.\n", wine_dbgstr_longlong(time)); + + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_ddrawstream_getsetdirectdraw(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5892,6 +5950,7 @@ START_TEST(amstream) test_mediastreamfilter_get_duration(); test_mediastreamfilter_get_stop_position(); test_mediastreamfilter_get_current_stream_time(); + test_mediastreamfilter_reference_time_to_stream_time(); CoUninitialize(); } -- 2.28.0

2 1

[PATCH v2] amstream: Implement IMediaStreamFilter::ReferenceTimeToStreamTime().
by Gijs Vermeulen 25 Aug '20

25 Aug '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/filter.c | 23 +++++++++++++-- dlls/amstream/tests/amstream.c | 52 ++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 13fd30c3a5..bf0d7e2e86 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -616,11 +616,28 @@ static HRESULT WINAPI filter_SupportSeeking(IMediaStreamFilter *iface, BOOL rend return E_NOINTERFACE; } -static HRESULT WINAPI filter_ReferenceTimeToStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *pTime) +static HRESULT WINAPI filter_ReferenceTimeToStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *time) { - FIXME("(%p)->(%p): Stub!\n", iface, pTime); + struct filter *filter = impl_from_IMediaStreamFilter(iface); - return E_NOTIMPL; + TRACE("filter %p, time %p.\n", filter, time); + + if (!time) + return S_FALSE; + + EnterCriticalSection(&filter->cs); + + if (!filter->clock) + { + LeaveCriticalSection(&filter->cs); + return S_FALSE; + } + + *time -= filter->start_time; + + LeaveCriticalSection(&filter->cs); + + return S_OK; } static HRESULT WINAPI filter_GetCurrentStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *time) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a25ae42a31..fb09c46f07 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5436,6 +5436,57 @@ static void test_mediastreamfilter_get_current_stream_time(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_reference_time_to_stream_time(void) +{ + IMediaStreamFilter *filter; + struct testclock clock; + REFERENCE_TIME time; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaStreamFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + testclock_init(&clock); + + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdeadbeef, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaStreamFilter_SetSyncSource(filter, &clock.IReferenceClock_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + clock.get_time_hr = E_FAIL; + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdeadbeef, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaStreamFilter_Run(filter, 23456789); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdd47d2da, "Got time %s.\n", wine_dbgstr_longlong(time)); + + clock.time = 34567890; + clock.get_time_hr = S_OK; + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdd47d2da, "Got time %s.\n", wine_dbgstr_longlong(time)); + + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_ddrawstream_getsetdirectdraw(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5892,6 +5943,7 @@ START_TEST(amstream) test_mediastreamfilter_get_duration(); test_mediastreamfilter_get_stop_position(); test_mediastreamfilter_get_current_stream_time(); + test_mediastreamfilter_reference_time_to_stream_time(); CoUninitialize(); } -- 2.28.0

2 4

[PATCH] ws2_32: Improve WSCGetProviderPath() stub.
by Gijs Vermeulen 25 Aug '20

25 Aug '20

From: Aaro Altonen <a.altonen(a)hotmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45801 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ws2_32/socket.c | 17 +++++++++-- dlls/ws2_32/tests/sock.c | 62 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4d2afa946b..b7a570043c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -8940,10 +8940,21 @@ INT WINAPI WSCGetProviderPath( LPGUID provider, LPWSTR path, LPINT len, LPINT er { FIXME( "(%s %p %p %p) Stub!\n", debugstr_guid(provider), path, len, errcode ); - if (!errcode || !provider || !len) return WSAEFAULT; + if (!provider || !len) + { + if (errcode) + *errcode = WSAEFAULT; + return SOCKET_ERROR; + } - *errcode = WSAEINVAL; - return SOCKET_ERROR; + if (*len <= 0) + { + if (errcode) + *errcode = WSAEINVAL; + return SOCKET_ERROR; + } + + return 0; } /*********************************************************************** diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b523c326d6..c7f88d6f3b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -86,6 +86,7 @@ static int (WINAPI *pWSAEnumNameSpaceProvidersA)(LPDWORD,LPWSANAMESPACE_INFOA) static int (WINAPI *pWSAEnumNameSpaceProvidersW)(LPDWORD,LPWSANAMESPACE_INFOW); static int (WINAPI *pWSAPoll)(WSAPOLLFD *,ULONG,INT); static int (WINAPI *pWSCGetProviderInfo)(LPGUID,WSC_PROVIDER_INFO_TYPE,PBYTE,size_t*,DWORD,LPINT); +static int (WINAPI *pWSCGetProviderPath)(LPGUID, LPWSTR, LPINT, LPINT); /* Function pointers from iphlpapi */ static DWORD (WINAPI *pGetAdaptersInfo)(PIP_ADAPTER_INFO,PULONG); @@ -1303,6 +1304,7 @@ static void Init (void) pWSAEnumNameSpaceProvidersW = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersW"); pWSAPoll = (void *)GetProcAddress(hws2_32, "WSAPoll"); pWSCGetProviderInfo = (void *)GetProcAddress(hws2_32, "WSCGetProviderInfo"); + pWSCGetProviderPath = (void *)GetProcAddress(hws2_32, "WSCGetProviderPath"); hiphlpapi = LoadLibraryA("iphlpapi.dll"); if (hiphlpapi) @@ -11351,6 +11353,65 @@ static void test_WSCGetProviderInfo(void) ok(errcode == WSANO_RECOVERY, "got %d, expected WSANO_RECOVERY\n", errcode); } +static void test_WSCGetProviderPath(void) +{ + GUID provider = {}; + WCHAR buffer[256]; + INT ret, err, len; + + if (!pWSCGetProviderPath) + { + skip("WSCGetProviderPath is not available.\n"); + return; + } + + ret = pWSCGetProviderPath(NULL, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + + ret = pWSCGetProviderPath(&provider, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + + ret = pWSCGetProviderPath(NULL, buffer, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + + len = -1; + ret = pWSCGetProviderPath(NULL, NULL, &len, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(len == -1, "Got unexpected len %d.\n", len); + + err = 0; + ret = pWSCGetProviderPath(NULL, NULL, NULL, &err); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(err == WSAEFAULT, "Got unexpected error %d.\n", err); + + err = 0; + ret = pWSCGetProviderPath(&provider, NULL, NULL, &err); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(err == WSAEFAULT, "Got unexpected error %d.\n", err); + + err = 0; + len = -1; + ret = pWSCGetProviderPath(&provider, NULL, &len, &err); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(err == WSAEINVAL, "Got unexpected error %d.\n", err); + ok(len == -1, "Got unexpected len %d.\n", len); + + err = 0; + len = 256; + ret = pWSCGetProviderPath(&provider, NULL, &len, &err); + todo_wine ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + todo_wine ok(err == WSAEINVAL, "Got unexpected error %d.\n", err); + ok(len == 256, "Got unexpected len %d.\n", len); + + /* Valid pointers and length but invalid GUID */ + err = 0; + len = 256; + ret = pWSCGetProviderPath(&provider, buffer, &len, &err); + todo_wine ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + todo_wine ok(err == WSAEINVAL, "Got unexpected error %d.\n", err); + ok(len == 256, "Got unexpected len %d.\n", len); +} + START_TEST( sock ) { int i; @@ -11432,6 +11493,7 @@ START_TEST( sock ) test_address_list_query(); test_WSCGetProviderInfo(); + test_WSCGetProviderPath(); /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send(); -- 2.28.0

1 0

[PATCH v2 6/6] include/d3d10.idl: Add unions in D3D10_BUFFER_SRV structure members.
by Biswapriyo Nath 25 Aug '20

25 Aug '20

1 0

[PATCH v2 5/6] include/d3d10.idl: Add unions in D3D10_BUFFER_RTV structure members.
by Biswapriyo Nath 25 Aug '20

25 Aug '20

1 0

[PATCH v2 3/6] include/d3d11sdklayers.idl: Add d3d11 debug feature flags.
by Biswapriyo Nath 25 Aug '20

25 Aug '20

1 0

[PATCH] ntdll: Capture vector registers in arm64 RtlCaptureContext
by Martin Storsjo 25 Aug '20

25 Aug '20

Since 5b3842451ba6 we set the flag indicating that the context contained float registers, but we didn't actually populate them yet. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/ntdll/signal_arm64.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 53f866acab..5e8d56ad46 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -96,6 +96,22 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, "stp x29, x30, [x0, #0xf0]\n\t" /* context->Fp,Lr */ "mov x1, sp\n\t" "stp x1, x30, [x0, #0x100]\n\t" /* context->Sp,Pc */ + "stp q0, q1, [x0, #0x110]\n\t" /* context->V[0-1] */ + "stp q2, q3, [x0, #0x130]\n\t" /* context->V[2-3] */ + "stp q4, q5, [x0, #0x150]\n\t" /* context->V[4-5] */ + "stp q6, q7, [x0, #0x170]\n\t" /* context->V[6-7] */ + "stp q8, q9, [x0, #0x190]\n\t" /* context->V[8-9] */ + "stp q10, q11, [x0, #0x1a0]\n\t" /* context->V[10-11] */ + "stp q12, q13, [x0, #0x1c0]\n\t" /* context->V[12-13] */ + "stp q14, q15, [x0, #0x1e0]\n\t" /* context->V[14-15] */ + "stp q16, q17, [x0, #0x210]\n\t" /* context->V[16-17] */ + "stp q18, q19, [x0, #0x230]\n\t" /* context->V[18-19] */ + "stp q20, q21, [x0, #0x250]\n\t" /* context->V[20-21] */ + "stp q22, q23, [x0, #0x270]\n\t" /* context->V[22-23] */ + "stp q24, q25, [x0, #0x290]\n\t" /* context->V[24-25] */ + "stp q26, q27, [x0, #0x2a0]\n\t" /* context->V[26-27] */ + "stp q28, q29, [x0, #0x2c0]\n\t" /* context->V[28-29] */ + "stp q30, q31, [x0, #0x2e0]\n\t" /* context->V[30-31] */ "mov w1, #0x400000\n\t" /* CONTEXT_ARM64 */ "movk w1, #0x7\n\t" /* CONTEXT_FULL */ "str w1, [x0]\n\t" /* context->ContextFlags */ -- 2.17.1

1 0

[PATCH] ntdll: Fix arm64 jump buffer float restoration
by Martin Storsjo 25 Aug '20

25 Aug '20

Fix a typo in copying fields from the jump buffer to the context, use the right type of long in the struct. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/ntdll/signal_arm64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 4cdc6340fa..53f866acab 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -57,8 +57,8 @@ struct MSVCRT_JUMP_BUFFER unsigned __int64 Fp; unsigned __int64 Lr; unsigned __int64 Sp; - unsigned long Fpcr; - unsigned long Fpsr; + ULONG Fpcr; + ULONG Fpsr; double D[8]; }; @@ -1039,7 +1039,7 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) context->Fpsr = jmp->Fpsr; for (i = 0; i < 8; i++) - context->V[8+i].D[0] = jmp->D[0]; + context->V[8+i].D[0] = jmp->D[i]; } else if (rec && rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) { -- 2.17.1

1 0

[PATCH] server: Implement inherited handles list.
by Nikolay Sivov 25 Aug '20

25 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/unix/process.c | 24 ++++++++++++++++++-- include/wine/server_protocol.h | 4 +++- server/handle.c | 41 +++++++++++++++++++++++++--------- server/handle.h | 3 ++- server/process.c | 35 ++++++++++++++++++++++++----- server/process.h | 2 +- server/protocol.def | 2 ++ server/request.c | 2 +- 8 files changed, 92 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 37d0af19817..19fb8119577 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -215,9 +215,11 @@ static inline DWORD append_string( void **ptr, const RTL_USER_PROCESS_PARAMETERS /*********************************************************************** * create_startup_info */ -static startup_info_t *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *params, DWORD *info_size ) +static startup_info_t *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *params, + const PS_ATTRIBUTE *handle_list, DWORD *info_size ) { startup_info_t *info; + unsigned int i; DWORD size; void *ptr; @@ -230,6 +232,8 @@ static startup_info_t *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *p size += params->Desktop.Length; size += params->ShellInfo.Length; size += params->RuntimeInfo.Length; + if (handle_list) + size += sizeof(obj_handle_t) * handle_list->Size / sizeof(HANDLE); size = (size + 1) & ~1; *info_size = size; @@ -260,6 +264,17 @@ static startup_info_t *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *p info->desktop_len = append_string( &ptr, params, &params->Desktop ); info->shellinfo_len = append_string( &ptr, params, &params->ShellInfo ); info->runtime_len = append_string( &ptr, params, &params->RuntimeInfo ); + + if (handle_list) + { + obj_handle_t *dst = ptr; + HANDLE *src = handle_list->ValuePtr; + + info->handle_count = handle_list->Size / sizeof(HANDLE); + + for (i = 0; i < info->handle_count; ++i) + dst[i] = wine_server_obj_handle( src[i] ); + } return info; } @@ -799,6 +814,7 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ HANDLE parent = 0, debug = 0, token = 0; UNICODE_STRING path = {0}; SIZE_T i, attr_count = (attr->TotalLength - sizeof(attr->TotalLength)) / sizeof(PS_ATTRIBUTE); + const PS_ATTRIBUTE *handle_list = NULL; for (i = 0; i < attr_count; i++) { @@ -817,6 +833,10 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ case PS_ATTRIBUTE_TOKEN: token = attr->Attributes[i].ValuePtr; break; + case PS_ATTRIBUTE_HANDLE_LIST: + if (process_flags & PROCESS_CREATE_FLAGS_INHERIT_HANDLES) + handle_list = &attr->Attributes[i]; + break; default: if (attr->Attributes[i].Attribute & PS_ATTRIBUTE_INPUT) FIXME( "unhandled input attribute %lx\n", attr->Attributes[i].Attribute ); @@ -840,7 +860,7 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ } goto done; } - if (!(startup_info = create_startup_info( params, &startup_info_size ))) goto done; + if (!(startup_info = create_startup_info( params, handle_list, &startup_info_size ))) goto done; env_size = get_env_size( params, &winedebug ); if ((status = alloc_object_attributes( process_attr, &objattr, &attr_len ))) goto done; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index af3353eae33..644e1f976cf 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -227,6 +227,8 @@ typedef struct data_size_t desktop_len; data_size_t shellinfo_len; data_size_t runtime_len; + unsigned int handle_count; + @@ -6333,7 +6335,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 638 +#define SERVER_PROTOCOL_VERSION 639 /* ### protocol_version end ### */ diff --git a/server/handle.c b/server/handle.c index 9ae99cd0c63..51e2bffc514 100644 --- a/server/handle.c +++ b/server/handle.c @@ -353,9 +353,10 @@ static void shrink_handle_table( struct handle_table *table ) table->entries = new_entries; } -/* copy the handle table of the parent process */ +/* copy the whole handle table of the parent process, or a subset if specified */ /* return 1 if OK, 0 on error */ -struct handle_table *copy_handle_table( struct process *process, struct process *parent ) +struct handle_table *copy_handle_table( struct process *process, struct process *parent, + const obj_handle_t *handles, unsigned int count ) { struct handle_table *parent_table = parent->handles; struct handle_table *table; @@ -364,20 +365,40 @@ struct handle_table *copy_handle_table( struct process *process, struct process assert( parent_table ); assert( parent_table->obj.ops == &handle_table_ops ); - if (!(table = alloc_handle_table( process, parent_table->count ))) + if (!(table = alloc_handle_table( process, count ? count : parent_table->count ))) return NULL; - if ((table->last = parent_table->last) >= 0) + if (handles) { - struct handle_entry *ptr = table->entries; - memcpy( ptr, parent_table->entries, (table->last + 1) * sizeof(struct handle_entry) ); - for (i = 0; i <= table->last; i++, ptr++) + struct handle_entry *dst, *src; + int j; + + dst = table->entries; + memset( dst, 0, count * sizeof(*dst) ); + + for (i = 0, j = 0; i < count; i++) + { + src = get_handle( parent, handles[i] ); + if (!src || !(src->access & RESERVED_INHERIT)) continue; + grab_object_for_handle( src->ptr ); + dst[j++] = *src; + } + } + else + { + if ((table->last = parent_table->last) >= 0) { - if (!ptr->ptr) continue; - if (ptr->access & RESERVED_INHERIT) grab_object_for_handle( ptr->ptr ); - else ptr->ptr = NULL; /* don't inherit this entry */ + struct handle_entry *ptr = table->entries; + memcpy( ptr, parent_table->entries, (table->last + 1) * sizeof(struct handle_entry) ); + for (i = 0; i <= table->last; i++, ptr++) + { + if (!ptr->ptr) continue; + if (ptr->access & RESERVED_INHERIT) grab_object_for_handle( ptr->ptr ); + else ptr->ptr = NULL; /* don't inherit this entry */ + } } } + /* attempt to shrink the table */ shrink_handle_table( table ); return table; diff --git a/server/handle.h b/server/handle.h index f1deb79fb5f..736fd360173 100644 --- a/server/handle.h +++ b/server/handle.h @@ -52,7 +52,8 @@ extern obj_handle_t enumerate_handles( struct process *process, const struct obj unsigned int *index ); extern void close_process_handles( struct process *process ); extern struct handle_table *alloc_handle_table( struct process *process, int count ); -extern struct handle_table *copy_handle_table( struct process *process, struct process *parent ); +extern struct handle_table *copy_handle_table( struct process *process, struct process *parent, + const obj_handle_t *handles, unsigned int handle_count ); extern unsigned int get_handle_table_count( struct process *process); #endif /* __WINE_SERVER_HANDLE_H */ diff --git a/server/process.c b/server/process.c index c1bdb591f60..8aadd31bb87 100644 --- a/server/process.c +++ b/server/process.c @@ -500,7 +500,7 @@ static void start_sigkill_timer( struct process *process ) /* create a new process */ /* if the function fails the fd is closed */ struct process *create_process( int fd, struct process *parent, int inherit_all, - const struct security_descriptor *sd ) + const struct security_descriptor *sd, const struct startup_info *info ) { struct process *process; @@ -573,8 +573,33 @@ struct process *create_process( int fd, struct process *parent, int inherit_all, else { process->parent_id = parent->id; - process->handles = inherit_all ? copy_handle_table( process, parent ) - : alloc_handle_table( process, 0 ); + if (!inherit_all) + { + process->handles = alloc_handle_table( process, 0 ); + } + else + { + /* No explicit handle list */ + if (!info->data->handle_count) + { + process->handles = copy_handle_table( process, parent, NULL, 0 ); + } + else + { + const char *ptr = (const char *)(info->data + 1); + + ptr += info->data->curdir_len; + ptr += info->data->dllpath_len; + ptr += info->data->imagepath_len; + ptr += info->data->cmdline_len; + ptr += info->data->title_len; + ptr += info->data->desktop_len; + ptr += info->data->shellinfo_len; + ptr += info->data->runtime_len; + + process->handles = copy_handle_table( process, parent, (obj_handle_t *)ptr, info->data->handle_count ); + } + } /* Note: for security reasons, starting a new process does not attempt * to use the current impersonation token for the new process */ process->token = token_duplicate( parent->token, TRUE, 0, NULL ); @@ -1199,7 +1224,7 @@ DECL_HANDLER(new_process) #undef FIXUP_LEN } - if (!(process = create_process( socket_fd, parent, req->inherit_all, sd ))) goto done; + if (!(process = create_process( socket_fd, parent, req->inherit_all, sd, info ))) goto done; process->startup_info = (struct startup_info *)grab_object( info ); @@ -1294,7 +1319,7 @@ DECL_HANDLER(exec_process) close( socket_fd ); return; } - if (!(process = create_process( socket_fd, NULL, 0, NULL ))) return; + if (!(process = create_process( socket_fd, NULL, 0, NULL, NULL ))) return; create_thread( -1, process, NULL ); release_object( process ); } diff --git a/server/process.h b/server/process.h index 0fdf070b78e..58e0b6b6a1b 100644 --- a/server/process.h +++ b/server/process.h @@ -109,7 +109,7 @@ extern unsigned int alloc_ptid( void *ptr ); extern void free_ptid( unsigned int id ); extern void *get_ptid_entry( unsigned int id ); extern struct process *create_process( int fd, struct process *parent, int inherit_all, - const struct security_descriptor *sd ); + const struct security_descriptor *sd, const struct startup_info *info ); extern data_size_t init_process( struct thread *thread ); extern struct thread *get_process_first_thread( struct process *process ); extern struct process *get_process_from_id( process_id_t id ); diff --git a/server/protocol.def b/server/protocol.def index 75888ea9a22..bc19fcb96b8 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -243,6 +243,7 @@ typedef struct data_size_t desktop_len; data_size_t shellinfo_len; data_size_t runtime_len; + unsigned int handle_count; /* VARARG(curdir,unicode_str,curdir_len); */ /* VARARG(dllpath,unicode_str,dllpath_len); */ /* VARARG(imagepath,unicode_str,imagepath_len); */ @@ -251,6 +252,7 @@ typedef struct /* VARARG(desktop,unicode_str,desktop_len); */ /* VARARG(shellinfo,unicode_str,shellinfo_len); */ /* VARARG(runtime,unicode_str,runtime_len); */ + /* obj_handle_t handle_list[handle_count]; */ } startup_info_t; /* structure returned in the list of window properties */ diff --git a/server/request.c b/server/request.c index 4c1f30a5fe7..321bb6cfa81 100644 --- a/server/request.c +++ b/server/request.c @@ -582,7 +582,7 @@ static void master_socket_poll_event( struct fd *fd, int event ) int client = accept( get_unix_fd( master_socket->fd ), (struct sockaddr *) &dummy, &len ); if (client == -1) return; fcntl( client, F_SETFL, O_NONBLOCK ); - if ((process = create_process( client, NULL, 0, NULL ))) + if ((process = create_process( client, NULL, 0, NULL, NULL ))) { create_thread( -1, process, NULL ); release_object( process ); -- 2.28.0

1 0

[PATCH 6/8] windowscodecs: Remove get_pixel_format_bpp().
by Ziqing Hui 25 Aug '20

25 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-)

2 1

[PATCH 5/8] windowscodecs/tests: Add pixel format bpp to test_data.
by Ziqing Hui 25 Aug '20

25 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- CopyPixels test are skipped because the tests will fail or crash after we set the actual bpp value. dlls/windowscodecs/tests/ddsformat.c | 73 +++++++++++----------------- 1 file changed, 28 insertions(+), 45 deletions(-)

2 1

[PATCH 4/8] windowscodecs/tests: Introduce is_compressed().
by Ziqing Hui 25 Aug '20

25 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 38 ++++++++++++++++++---------- 1 file changed, 25 insertions(+), 13 deletions(-)

2 1

[PATCH 3/8] windowscodecs/tests: Expect actual WIC formats for uncompressed image.
by Ziqing Hui 25 Aug '20

25 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)

2 1

[PATCH 2/8] windowscodecs: Introduce get_dds_format() to replace get_dxgi_format().
by Ziqing Hui 25 Aug '20

25 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)

2 1

[PATCH 1/8] windowscodecs: Add WIC pixel format information to struct dds_format.
by Ziqing Hui 25 Aug '20

25 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 107 ++++++++++++++++++++++----------- 1 file changed, 72 insertions(+), 35 deletions(-)

2 1

[PATCH 7/8] windowscodecs/tests: Add CopyPixels data tests for uncompressed images.
by Ziqing Hui 25 Aug '20

25 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 34 ++++++++++++++++++---------- 1 file changed, 22 insertions(+), 12 deletions(-)

2 1

[PATCH] msxml3: Fix value of 'fetched' in IEnumVariant_Next() for IXMLDOMSelection.
by Gijs Vermeulen 25 Aug '20

25 Aug '20

From: Alexandre Abgrall <aabgrall98(a)gmail.com> It must be the number of elements returned in 'var', as specified here: https://docs.microsoft.com/en-us/windows/win32/api/oaidl/nf-oaidl-ienumvari… Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40430 Signed-off-by: Alexandre Abgrall <aabgrall98(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/msxml3/selection.c | 2 +- dlls/msxml3/tests/domdoc.c | 100 +++++++++++++++++++++++++++++++------ 2 files changed, 87 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 31be4d8f10..3698d036d4 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -519,7 +519,7 @@ static HRESULT WINAPI enumvariant_Next( ret_count++; } - if (fetched) (*fetched)++; + if (fetched) *fetched = ret_count; /* we need to advance one step more for some reason */ if (ret_count) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7f3b42d840..d21b968ce3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9976,9 +9976,9 @@ static void test_selection(void) IXMLDOMNode *node; IDispatch *disp; VARIANT_BOOL b; + VARIANT v[4]; HRESULT hr; DISPID did; - VARIANT v; BSTR name; ULONG ret; LONG len; @@ -10148,10 +10148,10 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); /* no-op if zero count */ - V_VT(&v) = VT_I2; - hr = IEnumVARIANT_Next(enum1, 0, &v, NULL); + V_VT(&v[0]) = VT_I2; + hr = IEnumVARIANT_Next(enum1, 0, &v[0], NULL); EXPECT_HR(hr, S_OK); - ok(V_VT(&v) == VT_I2, "got var type %d\n", V_VT(&v)); + ok(V_VT(&v[0]) == VT_I2, "got var type %d\n", V_VT(&v[0])); /* positive count, null array pointer */ hr = IEnumVARIANT_Next(enum1, 1, NULL, NULL); @@ -10162,19 +10162,19 @@ static void test_selection(void) EXPECT_HR(hr, E_INVALIDARG); ok(ret == 0, "got %d\n", ret); - V_VT(&v) = VT_I2; - hr = IEnumVARIANT_Next(enum1, 1, &v, NULL); + V_VT(&v[0]) = VT_I2; + hr = IEnumVARIANT_Next(enum1, 1, &v[0], NULL); EXPECT_HR(hr, S_OK); - ok(V_VT(&v) == VT_DISPATCH, "got var type %d\n", V_VT(&v)); + ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0])); - hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IXMLDOMNode, (void**)&node); + hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node); EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &name); EXPECT_HR(hr, S_OK); ok(!lstrcmpW(name, L"a"), "got node name %s\n", wine_dbgstr_w(name)); SysFreeString(name); IXMLDOMNode_Release(node); - VariantClear(&v); + VariantClear(&v[0]); /* list cursor is updated */ hr = IXMLDOMSelection_nextNode(selection, &node); @@ -10185,18 +10185,18 @@ static void test_selection(void) IXMLDOMNode_Release(node); SysFreeString(name); - V_VT(&v) = VT_I2; - hr = IEnumVARIANT_Next(enum1, 1, &v, NULL); + V_VT(&v[0]) = VT_I2; + hr = IEnumVARIANT_Next(enum1, 1, &v[0], NULL); EXPECT_HR(hr, S_OK); - ok(V_VT(&v) == VT_DISPATCH, "got var type %d\n", V_VT(&v)); - hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IXMLDOMNode, (void**)&node); + ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0])); + hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node); EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &name); EXPECT_HR(hr, S_OK); ok(!lstrcmpW(name, L"b"), "got node name %s\n", wine_dbgstr_w(name)); SysFreeString(name); IXMLDOMNode_Release(node); - VariantClear(&v); + VariantClear(&v[0]); IEnumVARIANT_Release(enum1); hr = IXMLDOMSelection_nextNode(selection, &node); @@ -10207,6 +10207,78 @@ static void test_selection(void) IXMLDOMNode_Release(node); SysFreeString(name); + /* getting multiple elements */ + enum1 = NULL; + hr = IXMLDOMSelection_get__newEnum(selection, (IUnknown**)&enum1); + EXPECT_HR(hr, S_OK); + ok(enum1 != NULL, "got %p\n", enum1); + + ret = 0; + hr = IEnumVARIANT_Next(enum1, 2, &v[0], &ret); + EXPECT_HR(hr, S_OK); + ok(ret == 2, "got %d, expected 2\n", ret); + ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0])); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, L"a"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v[1]), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + ok(!lstrcmpW(name, L"b"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + VariantClear(&v[1]); + VariantClear(&v[0]); + + /* IEnumVARIANT_Next makes the IXMLDOMSelection cursor advance one step more */ + hr = IXMLDOMSelection_nextNode(selection, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, L"d"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + /* The IEnumVARIANT cursor is still at position '2', */ + /* therefore attempting to fetch 4 elements yields 'c' and 'd' */ + ret = 0; + hr = IEnumVARIANT_Next(enum1, 4, &v[0], &ret); + EXPECT_HR(hr, S_FALSE); + ok(ret == 2, "got %d, expected 2\n", ret); + + ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0])); + hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, L"c"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + ok(V_VT(&v[1]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[1])); + hr = IDispatch_QueryInterface(V_DISPATCH(&v[1]), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, L"d"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + ok(V_VT(&v[2]) == VT_EMPTY, "got var type %d, expected %d (VT_EMPTY)\n", V_VT(&v[2]), VT_EMPTY); + + VariantClear(&v[2]); + VariantClear(&v[1]); + VariantClear(&v[0]); + + IEnumVARIANT_Release(enum1); + IXMLDOMSelection_Release(selection); IXMLDOMNodeList_Release(list); IXMLDOMDocument_Release(doc); -- 2.28.0

3 2

[PATCH 5/6] include/d3d10.idl: Use unions in D3D10_BUFFER_RTV structure.
by Biswapriyo Nath 25 Aug '20

25 Aug '20

3 2

[PATCH 4/6] include/d3d11sdklayers.idl: Add D3D11SwitchToRef interface.
by Biswapriyo Nath 25 Aug '20

25 Aug '20

2 1

[PATCH 2/6] include/d3d10sdklayers.idl: Add D3D10SwitchToRef interface.
by Biswapriyo Nath 25 Aug '20

25 Aug '20

2 1

[PATCH 1/6] include/d3d10sdklayers.idl: Add D3D10Debug interface.
by Biswapriyo Nath 25 Aug '20

25 Aug '20

2 1

[PATCH 6/6] include/d3d10.idl: Use unions in D3D10_BUFFER_SRV structure.
by Biswapriyo Nath 25 Aug '20

25 Aug '20

2 1

[PATCH 3/6] include/d3d11sdklayers.idl: Add d3d11 debug feature flags.
by Biswapriyo Nath 25 Aug '20

25 Aug '20

2 1

[PATCH 8/8] windowscodecs: Support uncompressed format in DdsFrameDecode_CopyPixels().
by Ziqing Hui 25 Aug '20

25 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 20 ++++++++++++-------- dlls/windowscodecs/tests/ddsformat.c | 11 ++++++----- 2 files changed, 18 insertions(+), 13 deletions(-)

1 0

[PATCH 1/2] wmc: Add Null facility.
by Paul Gofman 25 Aug '20

25 Aug '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- tools/wmc/mcl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index 829f955606f..579d4b87882 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -85,6 +85,7 @@ static const WCHAR ustr_language[] = { 'L', 'a', 'n', 'g', 'u', 'a', 'g', 'e', 0 static const WCHAR ustr_languagenames[] = { 'L', 'a', 'n', 'g', 'u', 'a', 'g', 'e', 'N', 'a', 'm', 'e', 's', 0}; static const WCHAR ustr_messageid[] = { 'M', 'e', 's', 's', 'a', 'g', 'e', 'I', 'd', 0 }; static const WCHAR ustr_messageidtypedef[] = { 'M', 'e', 's', 's', 'a', 'g', 'e', 'I', 'd', 'T', 'y', 'p', 'e', 'd', 'e', 'f', 0 }; +static const WCHAR ustr_null[] = { 'N', 'u', 'l', 'l', 0 }; static const WCHAR ustr_outputbase[] = { 'O', 'u', 't', 'p', 'u', 't', 'B', 'a', 's', 'e', 0 }; static const WCHAR ustr_severity[] = { 'S', 'e', 'v', 'e', 'r', 'i', 't', 'y', 0 }; static const WCHAR ustr_severitynames[] = { 'S', 'e', 'v', 'e', 'r', 'i', 't', 'y', 'N', 'a', 'm', 'e', 's', 0 }; @@ -551,6 +552,7 @@ int mcy_lex(void) add_token(tok_severity, ustr_success, 0x00, 0, NULL, 0); add_token(tok_facility, ustr_application, 0xFFF, 0, NULL, 0); add_token(tok_facility, ustr_system, 0x0FF, 0, NULL, 0); + add_token(tok_facility, ustr_null, 0x000, 0, NULL, 0); add_token(tok_language, ustr_english, 0x409, 437, ustr_msg00001, 0); } -- 2.26.2

2 2

[PATCH 4/4] conhost: Implement IOCTL_CONDRV_PEEK.
by Jacek Caban 25 Aug '20

25 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 11 +++++++++++ 1 file changed, 11 insertions(+)

1 0

[PATCH 3/4] conhost: Implement IOCTL_CONDRV_READ_INPUT.
by Jacek Caban 25 Aug '20

25 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 1 + programs/conhost/conhost.c | 53 +++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+)

1 0

[PATCH 2/4] server: Support blocking console host ioctls.
by Jacek Caban 25 Aug '20

25 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 71 +++++++++++++++++++++++++++++++++++++++++---- server/protocol.def | 1 + 2 files changed, 66 insertions(+), 6 deletions(-)

1 0

[PATCH 1/4] conhost: Implement IOCTL_CONDRV_WRITE_INPUT.
by Jacek Caban 25 Aug '20

25 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 54 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-)

1 0

[PATCH vkd3d] vkd3d-shader: Allow structures to be chained in any order.
by Zebediah Figura 25 Aug '20

25 Aug '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 6 +++--- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 14ff7f48..bb251a45 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2241,7 +2241,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader if ((shader_interface = vkd3d_find_struct(compile_info->next, INTERFACE_INFO))) { - compiler->xfb_info = vkd3d_find_struct(shader_interface->next, TRANSFORM_FEEDBACK_INFO); + compiler->xfb_info = vkd3d_find_struct(compile_info->next, TRANSFORM_FEEDBACK_INFO); compiler->shader_interface = *shader_interface; if (shader_interface->push_constant_buffer_count) @@ -9110,7 +9110,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, } int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, - struct vkd3d_shader_code *spirv) + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) { const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; const struct vkd3d_shader_spirv_domain_shader_target_info *ds_info; @@ -9127,7 +9127,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, if (compiler->shader_type == VKD3D_SHADER_TYPE_DOMAIN) { - if (info && (ds_info = vkd3d_find_struct(info->next, SPIRV_DOMAIN_SHADER_TARGET_INFO))) + if (info && (ds_info = vkd3d_find_struct(compile_info->next, SPIRV_DOMAIN_SHADER_TARGET_INFO))) { vkd3d_dxbc_compiler_emit_tessellator_output_primitive(compiler, ds_info->output_primitive); vkd3d_dxbc_compiler_emit_tessellator_partitioning(compiler, ds_info->partitioning); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index f693f581..179bbdba 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -946,7 +946,7 @@ static int compile_dxbc_to_spirv(const struct vkd3d_shader_compile_info *compile } if (ret >= 0) - ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, out); + ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, compile_info, out); vkd3d_dxbc_compiler_destroy(spirv_compiler); vkd3d_shader_parser_destroy(&parser); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c5b2f235..b1c193f3 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -909,7 +909,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) DECLSPEC_HIDDEN; int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, - struct vkd3d_shader_code *spirv) DECLSPEC_HIDDEN; + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) DECLSPEC_HIDDEN; void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler) DECLSPEC_HIDDEN; void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]) DECLSPEC_HIDDEN; -- 2.28.0

2 1

[PATCH] msvcrt/math: In _fcvt/_fcvt_s handle locale decimal separator properly
by Fabian Maurer 25 Aug '20

25 Aug '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49730 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msvcrt/math.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a75b5512100..15d8fa4be72 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2518,6 +2518,7 @@ char * CDECL MSVCRT__fcvt( double number, int ndigits, int *decpt, int *sign ) int stop, dec1, dec2; char *ptr1, *ptr2, *first; char buf[80]; /* ought to be enough */ + char decimal_separator = get_locinfo()->lconv->decimal_point[0]; if (!data->efcvt_buffer) data->efcvt_buffer = MSVCRT_malloc( 80 ); /* ought to be enough */ @@ -2549,7 +2550,7 @@ char * CDECL MSVCRT__fcvt( double number, int ndigits, int *decpt, int *sign ) } while (*ptr1 == '0') ptr1++; /* Skip leading zeroes */ - while (*ptr1 != '\0' && *ptr1 != '.') { + while (*ptr1 != '\0' && *ptr1 != decimal_separator) { if (!first) first = ptr2; if ((ptr1 - buf) < stop) { *ptr2++ = *ptr1++; @@ -2598,6 +2599,7 @@ int CDECL MSVCRT__fcvt_s(char* outbuffer, MSVCRT_size_t size, double number, int int stop, dec1, dec2; char *ptr1, *ptr2, *first; char buf[80]; /* ought to be enough */ + char decimal_separator = get_locinfo()->lconv->decimal_point[0]; if (!outbuffer || !decpt || !sign || size == 0) { @@ -2632,7 +2634,7 @@ int CDECL MSVCRT__fcvt_s(char* outbuffer, MSVCRT_size_t size, double number, int } while (*ptr1 == '0') ptr1++; /* Skip leading zeroes */ - while (*ptr1 != '\0' && *ptr1 != '.') { + while (*ptr1 != '\0' && *ptr1 != decimal_separator) { if (!first) first = ptr2; if ((ptr1 - buf) < stop) { if (size > 1) { -- 2.28.0

2 1

[PATCH 1/5] ntdll: Set handler_data correctly in arm64 RtlVirtualUnwind
by Martin Storsjo 25 Aug '20

25 Aug '20

This matches what tests show is done on actual windows, in the current testcases; in all currently tested cases, handler_data is reset to NULL when no handler is returned. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/ntdll/signal_arm64.c | 2 ++ dlls/ntdll/tests/exception.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 134e40545f..5521e915a7 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -889,6 +889,8 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG_PTR base, ULONG_PTR pc, TRACE( "type %x pc %lx sp %lx func %lx\n", type, pc, context->Sp, base + func->BeginAddress ); + *handler_data = NULL; + if (func->u.s.Flag) handler = unwind_packed_data( base, pc, func, context, ctx_ptr ); else diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index dd9eb966fc..1e9047383b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4331,6 +4331,10 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) else { ok( handler == NULL, "%u/%u: handler %p instead of NULL\n", testnum, i, handler ); + ok( data == (test->results[i].handler < 0 ? + (void *)0xdeadbeef : NULL), + "%u/%u: handler data set to %p/%p\n", testnum, i, data, + (test->results[i].handler < 0 ? (void *)0xdeadbeef : NULL) ); } ok( context.Pc == test->results[i].pc, "%u/%u: wrong pc %p/%p\n", -- 2.17.1

1 4

[PATCH 01/11] msscript.ocx: Add the ScriptError stub implementation.
by Gabriel Ivăncescu 25 Aug '20

25 Aug '20

The error object has to be separate from the control, as it can be referenced while the control is released. It is also available even without a script host, and in fact the same object will be used (same address) when a host is instantiated. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/msscript.c | 240 ++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 39 +++-- 2 files changed, 256 insertions(+), 23 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index d493065..c92a86a 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -119,6 +119,11 @@ struct procedure_enum { ScriptProcedureCollection *procedures; }; +typedef struct { + IScriptError IScriptError_iface; + LONG ref; +} ScriptError; + struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; IActiveScriptSiteWindow IActiveScriptSiteWindow_iface; @@ -164,12 +169,14 @@ struct ScriptControl { IScriptModuleCollection IScriptModuleCollection_iface; ScriptHost *host; + ScriptError *error; }; static HINSTANCE msscript_instance; typedef enum tid_t { IScriptControl_tid, + IScriptError_tid, IScriptModuleCollection_tid, IScriptModule_tid, IScriptProcedureCollection_tid, @@ -182,6 +189,7 @@ static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { &IID_IScriptControl, + &IID_IScriptError, &IID_IScriptModuleCollection, &IID_IScriptModule, &IID_IScriptProcedureCollection, @@ -516,6 +524,11 @@ static inline ScriptModule *impl_from_IScriptModule(IScriptModule *iface) return CONTAINING_RECORD(iface, ScriptModule, IScriptModule_iface); } +static inline ScriptError *impl_from_IScriptError(IScriptError *iface) +{ + return CONTAINING_RECORD(iface, ScriptError, IScriptError_iface); +} + static inline ConnectionPoint *impl_from_IConnectionPoint(IConnectionPoint *iface) { return CONTAINING_RECORD(iface, ConnectionPoint, IConnectionPoint_iface); @@ -2086,6 +2099,212 @@ static const IScriptModuleCollectionVtbl ScriptModuleCollectionVtbl = { ScriptModuleCollection_Add }; +static HRESULT WINAPI ScriptError_QueryInterface(IScriptError *iface, REFIID riid, void **ppv) +{ + ScriptError *This = impl_from_IScriptError(iface); + + if (IsEqualGUID(&IID_IDispatch, riid) || IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IScriptError, riid)) + { + *ppv = &This->IScriptError_iface; + } + else + { + WARN("unsupported interface: (%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ScriptError_AddRef(IScriptError *iface) +{ + ScriptError *This = impl_from_IScriptError(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ScriptError_Release(IScriptError *iface) +{ + ScriptError *This = impl_from_IScriptError(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI ScriptError_GetTypeInfoCount(IScriptError *iface, UINT *pctinfo) +{ + ScriptError *This = impl_from_IScriptError(iface); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI ScriptError_GetTypeInfo(IScriptError *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + ScriptError *This = impl_from_IScriptError(iface); + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + return get_typeinfo(IScriptError_tid, ppTInfo); +} + +static HRESULT WINAPI ScriptError_GetIDsOfNames(IScriptError *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ScriptError *This = impl_from_IScriptError(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IScriptError_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptError_Invoke(IScriptError *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ScriptError *This = impl_from_IScriptError(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IScriptError_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptError_get_Number(IScriptError *iface, LONG *plNumber) +{ + ScriptError *This = impl_from_IScriptError(iface); + + FIXME("(%p)->(%p)\n", This, plNumber); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptError_get_Source(IScriptError *iface, BSTR *pbstrSource) +{ + ScriptError *This = impl_from_IScriptError(iface); + + FIXME("(%p)->(%p)\n", This, pbstrSource); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptError_get_Description(IScriptError *iface, BSTR *pbstrDescription) +{ + ScriptError *This = impl_from_IScriptError(iface); + + FIXME("(%p)->(%p)\n", This, pbstrDescription); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptError_get_HelpFile(IScriptError *iface, BSTR *pbstrHelpFile) +{ + ScriptError *This = impl_from_IScriptError(iface); + + FIXME("(%p)->(%p)\n", This, pbstrHelpFile); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptError_get_HelpContext(IScriptError *iface, LONG *plHelpContext) +{ + ScriptError *This = impl_from_IScriptError(iface); + + FIXME("(%p)->(%p)\n", This, plHelpContext); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptError_get_Text(IScriptError *iface, BSTR *pbstrText) +{ + ScriptError *This = impl_from_IScriptError(iface); + + FIXME("(%p)->(%p)\n", This, pbstrText); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptError_get_Line(IScriptError *iface, LONG *plLine) +{ + ScriptError *This = impl_from_IScriptError(iface); + + FIXME("(%p)->(%p)\n", This, plLine); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptError_get_Column(IScriptError *iface, LONG *plColumn) +{ + ScriptError *This = impl_from_IScriptError(iface); + + FIXME("(%p)->(%p)\n", This, plColumn); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptError_Clear(IScriptError *iface) +{ + ScriptError *This = impl_from_IScriptError(iface); + + FIXME("(%p)->()\n", This); + + return E_NOTIMPL; +} + +static const IScriptErrorVtbl ScriptErrorVtbl = { + ScriptError_QueryInterface, + ScriptError_AddRef, + ScriptError_Release, + ScriptError_GetTypeInfoCount, + ScriptError_GetTypeInfo, + ScriptError_GetIDsOfNames, + ScriptError_Invoke, + ScriptError_get_Number, + ScriptError_get_Source, + ScriptError_get_Description, + ScriptError_get_HelpFile, + ScriptError_get_HelpContext, + ScriptError_get_Text, + ScriptError_get_Line, + ScriptError_get_Column, + ScriptError_Clear +}; + static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) { IObjectSafety *objsafety; @@ -2233,6 +2452,7 @@ static ULONG WINAPI ScriptControl_Release(IScriptControl *iface) release_modules(This, FALSE); IActiveScriptSite_Release(&This->host->IActiveScriptSite_iface); } + IScriptError_Release(&This->error->IScriptError_iface); heap_free(This); } @@ -2513,8 +2733,14 @@ static HRESULT WINAPI ScriptControl_get_Modules(IScriptControl *iface, IScriptMo static HRESULT WINAPI ScriptControl_get_Error(IScriptControl *iface, IScriptError **p) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if (!p) return E_POINTER; + + *p = &This->error->IScriptError_iface; + IScriptError_AddRef(*p); + return S_OK; } static HRESULT WINAPI ScriptControl_get_CodeObject(IScriptControl *iface, IDispatch **p) @@ -3543,6 +3769,13 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow if(!script_control) return E_OUTOFMEMORY; + script_control->error = heap_alloc_zero(sizeof(*script_control->error)); + if(!script_control->error) + { + heap_free(script_control); + return E_OUTOFMEMORY; + } + script_control->IScriptControl_iface.lpVtbl = &ScriptControlVtbl; script_control->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; script_control->IOleObject_iface.lpVtbl = &OleObjectVtbl; @@ -3557,6 +3790,9 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->allow_ui = VARIANT_TRUE; script_control->use_safe_subset = VARIANT_FALSE; + script_control->error->IScriptError_iface.lpVtbl = &ScriptErrorVtbl; + script_control->error->ref = 1; + ConnectionPoint_Init(&script_control->cp_scsource, script_control, &DIID_DScriptControlSource); ConnectionPoint_Init(&script_control->cp_propnotif, script_control, &IID_IPropertyNotifySink); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 085913a..9bbbe4c 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -2075,15 +2075,12 @@ static void _check_error(IScriptControl *sc, LONG exp_num, int line) hr = IScriptControl_get_Error(sc, &script_err); ok_(__FILE__,line)(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr); - if (SUCCEEDED(hr)) - { - error_num = 0xdeadbeef; - hr = IScriptError_get_Number(script_err, &error_num); - ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); - ok_(__FILE__,line)(error_num == exp_num, "got wrong error number: %d, expected %d.\n", - error_num, exp_num); - IScriptError_Release(script_err); - } + error_num = 0xdeadbeef; + hr = IScriptError_get_Number(script_err, &error_num); + todo_wine ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); + todo_wine ok_(__FILE__,line)(error_num == exp_num, "got wrong error number: %d, expected %d.\n", + error_num, exp_num); + IScriptError_Release(script_err); } static void test_IScriptControl_Eval(void) @@ -2112,7 +2109,7 @@ static void test_IScriptControl_Eval(void) ok(hr == E_FAIL, "IScriptControl_Eval returned: 0x%08x.\n", hr); ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", V_VT(&var), V_I4(&var)); - todo_wine CHECK_ERROR(sc, 0); + CHECK_ERROR(sc, 0); script_str = SysAllocString(L"1 + 1"); V_VT(&var) = VT_NULL; @@ -2160,7 +2157,7 @@ static void test_IScriptControl_Eval(void) ok(V_I4(&var) == 0xdeadbeef || broken(V_I4(&var) == 0) /* after Win8 */, "V_I4(var) = %d.\n", V_I4(&var)); SysFreeString(script_str); - todo_wine CHECK_ERROR(sc, 1004); + CHECK_ERROR(sc, 1004); script_str = SysAllocString(L"var2 = var1 + var2"); V_VT(&var) = VT_NULL; @@ -2287,13 +2284,13 @@ static void test_IScriptControl_AddCode(void) hr = IScriptControl_AddCode(sc, code_str); ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); SysFreeString(code_str); - todo_wine CHECK_ERROR(sc, 0); + CHECK_ERROR(sc, 0); code_str = SysAllocString(L"invalid syntax"); hr = IScriptControl_AddCode(sc, code_str); todo_wine ok(hr == 0x800a03ec, "IScriptControl_AddCode returned: 0x%08x.\n", hr); SysFreeString(code_str); - todo_wine CHECK_ERROR(sc, 1004); + CHECK_ERROR(sc, 1004); IScriptControl_Release(sc); @@ -2388,13 +2385,13 @@ static void test_IScriptControl_ExecuteStatement(void) hr = IScriptControl_ExecuteStatement(sc, str); ok(hr == S_OK, "IScriptControl_ExecuteStatement failed: 0x%08x.\n", hr); SysFreeString(str); - todo_wine CHECK_ERROR(sc, 0); + CHECK_ERROR(sc, 0); str = SysAllocString(L"invalid syntax"); hr = IScriptControl_ExecuteStatement(sc, str); todo_wine ok(hr == 0x800a03ec, "IScriptControl_ExecuteStatement returned: 0x%08x.\n", hr); SysFreeString(str); - todo_wine CHECK_ERROR(sc, 1004); + CHECK_ERROR(sc, 1004); IScriptControl_Release(sc); @@ -2500,13 +2497,13 @@ static void test_IScriptControl_Run(void) str = SysAllocString(L"foobar"); hr = IScriptControl_Run(sc, str, &params, &var); ok(hr == DISP_E_UNKNOWNNAME, "IScriptControl_Run failed: 0x%08x.\n", hr); - todo_wine CHECK_ERROR(sc, 0); + CHECK_ERROR(sc, 0); SysFreeString(str); str = SysAllocString(L"function subtract(a, b) { return a - b; }\n"); hr = IScriptControl_AddCode(sc, str); ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); - todo_wine CHECK_ERROR(sc, 0); + CHECK_ERROR(sc, 0); SysFreeString(str); str = SysAllocString(L"Subtract"); @@ -2517,12 +2514,12 @@ static void test_IScriptControl_Run(void) str = SysAllocString(L"subtract"); hr = IScriptControl_Run(sc, str, &params, NULL); ok(hr == E_POINTER, "IScriptControl_Run failed: 0x%08x.\n", hr); - todo_wine CHECK_ERROR(sc, 0); + CHECK_ERROR(sc, 0); hr = IScriptControl_Run(sc, str, &params, &var); ok(hr == S_OK, "IScriptControl_Run failed: 0x%08x.\n", hr); ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 7), "V_VT(var) = %d, V_I4(var) = %d.\n", V_VT(&var), V_I4(&var)); - todo_wine CHECK_ERROR(sc, 0); + CHECK_ERROR(sc, 0); SafeArrayDestroy(params); /* The array's other dimensions are ignored */ @@ -3340,7 +3337,7 @@ static void test_IScriptControl_get_Procedures(void) ); hr = IScriptControl_AddCode(sc, str); ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); - todo_wine CHECK_ERROR(sc, 0); + CHECK_ERROR(sc, 0); SysFreeString(str); hr = IScriptProcedureCollection_get_Count(procs, &count); @@ -3480,7 +3477,7 @@ static void test_IScriptControl_get_Procedures(void) hr = IScriptControl_AddCode(sc, str); ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); SysFreeString(str); - todo_wine CHECK_ERROR(sc, 0); + CHECK_ERROR(sc, 0); CHECK_CALLED(ParseScriptText); GetScriptDispatch_expected_name = NULL; -- 2.21.0

2 22

[PATCH 6/6] winex11.drv: Support clipping full screen windows on non-primary monitors.
by Zhiyi Zhang 25 Aug '20

25 Aug '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 15 ++++++++++----- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 7 ------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d78449c2cc7..eb5e6a6c0d4 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -548,7 +548,8 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) { struct x11drv_win_data *data; struct x11drv_thread_data *thread_data; - RECT rect; + MONITORINFO monitor_info; + HMONITOR monitor; DWORD style; BOOL fullscreen; @@ -559,21 +560,25 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) /* maximized windows don't count as full screen */ if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) return FALSE; if (!(data = get_win_data( hwnd ))) return FALSE; - fullscreen = is_window_rect_fullscreen( &data->whole_rect ); + fullscreen = is_window_rect_full_screen( &data->whole_rect ); release_win_data( data ); if (!fullscreen) return FALSE; if (!(thread_data = x11drv_thread_data())) return FALSE; if (GetTickCount() - thread_data->clip_reset < 1000) return FALSE; if (!reset && clipping_cursor && thread_data->clip_hwnd) return FALSE; /* already clipping */ - rect = get_primary_monitor_rect(); + + monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTONEAREST ); + if (!monitor) return FALSE; + monitor_info.cbSize = sizeof(monitor_info); + if (!GetMonitorInfoW( monitor, &monitor_info )) return FALSE; if (!grab_fullscreen) { RECT virtual_rect = get_virtual_screen_rect(); - if (!EqualRect( &rect, &virtual_rect )) return FALSE; + if (!EqualRect( &monitor_info.rcMonitor, &virtual_rect )) return FALSE; if (is_virtual_desktop()) return FALSE; } TRACE( "win %p clipping fullscreen\n", hwnd ); - return grab_clipping_window( &rect ); + return grab_clipping_window( &monitor_info.rcMonitor ); } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 6378c9c7650..455957264bc 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2460,7 +2460,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags { release_win_data( data ); unmap_window( hwnd ); - if (is_window_rect_fullscreen( &old_window_rect )) reset_clipping_window(); + if (is_window_rect_full_screen( &old_window_rect )) reset_clipping_window(); if (!(data = get_win_data( hwnd ))) return; } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ce00e6c54dd..a92c738a685 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -822,11 +822,4 @@ static inline BOOL is_window_rect_mapped( const RECT *rect ) max( rect->bottom, rect->top + 1 ) > virtual_rect.top); } -static inline BOOL is_window_rect_fullscreen( const RECT *rect ) -{ - RECT primary_rect = get_primary_monitor_rect(); - return (rect->left <= primary_rect.left && rect->right >= primary_rect.right && - rect->top <= primary_rect.top && rect->bottom >= primary_rect.bottom); -} - #endif /* __WINE_X11DRV_H */ -- 2.25.1

1 0

[PATCH 5/6] winex11.drv: Support full screen windows on non-primary monitors.
by Zhiyi Zhang 25 Aug '20

25 Aug '20

A window can be maximized or full screen on non-primary monitors. In this case we need to add _NET_WM_STATE_MAXIMIZED or _NET_WM_STATE_FULLSCREEN hint to the window so that they can be handled correctly by window managers. For example, a full screen window on the secondary monitor needs _NET_WM_STATE_FULLSCREEN so that window managers prevent panels from obscuring it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/window.c | 31 +++++++++++++++++++++++++++++-- dlls/winex11.drv/x11drv.h | 1 + 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 09475d1adb1..6378c9c7650 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -272,9 +272,36 @@ static inline BOOL is_window_resizable( struct x11drv_win_data *data, DWORD styl { if (style & WS_THICKFRAME) return TRUE; /* Metacity needs the window to be resizable to make it fullscreen */ - return is_window_rect_fullscreen( &data->whole_rect ); + return is_window_rect_full_screen( &data->whole_rect ); } +struct monitor_info +{ + const RECT *rect; + BOOL full_screen; +}; + +static BOOL CALLBACK enum_monitor_proc( HMONITOR monitor, HDC hdc, RECT *monitor_rect, LPARAM lparam ) +{ + struct monitor_info *info = (struct monitor_info *)lparam; + + if (info->rect->left <= monitor_rect->left && info->rect->right >= monitor_rect->right && + info->rect->top <= monitor_rect->top && info->rect->bottom >= monitor_rect->bottom) + { + info->full_screen = TRUE; + return FALSE; + } + + return TRUE; +} + +BOOL is_window_rect_full_screen( const RECT *rect ) +{ + struct monitor_info info = {rect, FALSE}; + + EnumDisplayMonitors( NULL, NULL, enum_monitor_proc, (LPARAM)&info ); + return info.full_screen; +} /*********************************************************************** * get_mwm_decorations @@ -945,7 +972,7 @@ void update_net_wm_states( struct x11drv_win_data *data ) style = GetWindowLongW( data->hwnd, GWL_STYLE ); if (style & WS_MINIMIZE) new_state |= data->net_wm_state & ((1 << NET_WM_STATE_FULLSCREEN)|(1 << NET_WM_STATE_MAXIMIZED)); - if (is_window_rect_fullscreen( &data->whole_rect )) + if (is_window_rect_full_screen( &data->whole_rect )) { if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) new_state |= (1 << NET_WM_STATE_MAXIMIZED); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 233891f7b00..ce00e6c54dd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -641,6 +641,7 @@ typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void extern void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) DECLSPEC_HIDDEN; extern int X11DRV_check_error(void) DECLSPEC_HIDDEN; extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect, int x, int y, int cx, int cy ) DECLSPEC_HIDDEN; +extern BOOL is_window_rect_full_screen( const RECT *rect ) DECLSPEC_HIDDEN; extern POINT virtual_screen_to_root( INT x, INT y ) DECLSPEC_HIDDEN; extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; -- 2.25.1

1 0

[PATCH 4/6] winex11.drv: Always update _NET_WM_STATE in update_net_wm_states().
by Zhiyi Zhang 25 Aug '20

25 Aug '20

KWin treats a window covering exactly the whole monitor as maximized when handling its first map request and expects applications to update maximized state later. Wine doesn't know about this added maximized state and expect it unchanged, making the window always maximized as far as KWin is concerned. So always send _NET_WM_STATE updates even if Wine doesn't expect changes to hint KWin that a window should not be maximized. Fix test failures when running the tests introduced by 36b720357bcaf0a1e625f488e0c981ce10e8affa with KWin. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/window.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f4920b802e2..09475d1adb1 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -996,8 +996,6 @@ void update_net_wm_states( struct x11drv_win_data *data ) for (i = 0; i < NB_NET_WM_STATES; i++) { - if (!((data->net_wm_state ^ new_state) & (1 << i))) continue; /* unchanged */ - TRACE( "setting wm state %u for window %p/%lx to %u prev %u\n", i, data->hwnd, data->whole_window, (new_state & (1 << i)) != 0, (data->net_wm_state & (1 << i)) != 0 ); -- 2.25.1

1 0

[PATCH 3/6] winex11.drv: Allow setting a 0bit color depth display mode.
by Zhiyi Zhang 25 Aug '20

25 Aug '20

Windows 8.1 and older allow setting a display mode with 0bit color depth. Fix a regression from 981fb4edb371dd2ccf57dd350e76451df50c0a98. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- This is already tested in user32/tests/monitor.c#test_ChangeDisplaySettingsEx() vid_modes_test[3]. But the test is marked as not must succeed because different Windows versions may return different results. So the TestBots didn't catch this one. dlls/winex11.drv/settings.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 7827ede6560..902f1ec15d9 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -473,7 +473,9 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, DEVMODEW *dev_mode) { found_mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*modes) + modes[0].dmDriverExtra) * mode_idx); - if (dev_mode->dmFields & DM_BITSPERPEL && found_mode->dmBitsPerPel != dev_mode->dmBitsPerPel) + if (dev_mode->dmFields & DM_BITSPERPEL && + dev_mode->dmBitsPerPel && + found_mode->dmBitsPerPel != dev_mode->dmBitsPerPel) continue; if (dev_mode->dmFields & DM_PELSWIDTH && found_mode->dmPelsWidth != dev_mode->dmPelsWidth) continue; -- 2.25.1

1 0

[PATCH 2/6] winex11.drv: Store a full display mode in registry.
by Zhiyi Zhang 25 Aug '20

25 Aug '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 11 +++------ dlls/winex11.drv/settings.c | 48 +++++++++++++++++++++++-------------- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 7cd41145ea1..9a7efb8e9b4 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -749,8 +749,8 @@ static void test_ChangeDisplaySettingsEx(void) "Expected dmPelsWidth %u, got %u.\n", dm3.dmPelsWidth, dm.dmPelsWidth); ok(dm.dmPelsHeight == dm3.dmPelsHeight || broken(dm.dmPelsHeight == dm2.dmPelsHeight), /* Win10 */ "Expected dmPelsHeight %u, got %u.\n", dm3.dmPelsHeight, dm.dmPelsHeight); - todo_wine ok(dm.dmBitsPerPel, "Expected dmBitsPerPel not zero.\n"); - todo_wine ok(dm.dmDisplayFrequency, "Expected dmDisplayFrequency not zero.\n"); + ok(dm.dmBitsPerPel, "Expected dmBitsPerPel not zero.\n"); + ok(dm.dmDisplayFrequency, "Expected dmDisplayFrequency not zero.\n"); } else { @@ -758,12 +758,7 @@ static void test_ChangeDisplaySettingsEx(void) } res = ChangeDisplaySettingsExA(devices[device].name, NULL, NULL, 0, NULL); - todo_wine ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned %d.\n", devices[device].name, res); - if (res != DISP_CHANGE_SUCCESSFUL) - { - skip("ChangeDisplaySettingsExA %s returned %d.\n", devices[device].name, res); - continue; - } + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned %d.\n", devices[device].name, res); flush_events(); res = EnumDisplaySettingsA(devices[device].name, ENUM_REGISTRY_SETTINGS, &dm); diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index c4929e9b584..7827ede6560 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -456,12 +456,15 @@ BOOL is_detached_mode(const DEVMODEW *mode) } /* Get the full display mode with all the necessary fields set. - * Return NULL on failure. Caller should free the returned mode. */ -static DEVMODEW *get_full_mode(ULONG_PTR id, const DEVMODEW *dev_mode) + * Return NULL on failure. Caller should call free_full_mode() to free the returned mode. */ +static DEVMODEW *get_full_mode(ULONG_PTR id, DEVMODEW *dev_mode) { DEVMODEW *modes, *full_mode, *found_mode = NULL; UINT mode_count, mode_idx; + if (is_detached_mode(dev_mode)) + return dev_mode; + if (!handler.get_modes(id, 0, &modes, &mode_count)) return NULL; @@ -500,9 +503,18 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, const DEVMODEW *dev_mode) memcpy(full_mode, found_mode, sizeof(*found_mode) + found_mode->dmDriverExtra); handler.free_modes(modes); + + full_mode->dmFields |= DM_POSITION; + full_mode->u1.s2.dmPosition = dev_mode->u1.s2.dmPosition; return full_mode; } +static void free_full_mode(DEVMODEW *mode) +{ + if (!is_detached_mode(mode)) + heap_free(mode); +} + static LONG get_display_settings(struct x11drv_display_setting **new_displays, INT *new_display_count, const WCHAR *dev_name, DEVMODEW *dev_mode) { @@ -781,19 +793,9 @@ static LONG apply_display_settings(struct x11drv_display_setting *displays, INT if ((attached_mode && !do_attach) || (!attached_mode && do_attach)) continue; - if (attached_mode) - { - full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); - if (!full_mode) - return DISP_CHANGE_BADMODE; - - full_mode->dmFields |= DM_POSITION; - full_mode->u1.s2.dmPosition = displays[display_idx].desired_mode.u1.s2.dmPosition; - } - else - { - full_mode = &displays[display_idx].desired_mode; - } + full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); + if (!full_mode) + return DISP_CHANGE_BADMODE; TRACE("handler:%s changing %s to position:(%d,%d) resolution:%ux%u frequency:%uHz " "depth:%ubits orientation:%#x.\n", handler.name, @@ -803,8 +805,7 @@ static LONG apply_display_settings(struct x11drv_display_setting *displays, INT full_mode->u1.s2.dmDisplayOrientation); ret = handler.set_current_mode(displays[display_idx].id, full_mode); - if (attached_mode) - heap_free(full_mode); + free_full_mode(full_mode); if (ret != DISP_CHANGE_SUCCESSFUL) return ret; } @@ -834,6 +835,7 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, { struct x11drv_display_setting *displays; INT display_idx, display_count; + DEVMODEW *full_mode; LONG ret; ret = get_display_settings(&displays, &display_count, devname, devmode); @@ -846,12 +848,22 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, { if (!lstrcmpiW(displays[display_idx].desired_mode.dmDeviceName, devname)) { - if (!write_registry_settings(devname, &displays[display_idx].desired_mode)) + full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); + if (!full_mode) + { + heap_free(displays); + return DISP_CHANGE_BADMODE; + } + + if (!write_registry_settings(devname, full_mode)) { ERR("Failed to write %s display settings to registry.\n", wine_dbgstr_w(devname)); + free_full_mode(full_mode); heap_free(displays); return DISP_CHANGE_NOTUPDATED; } + + free_full_mode(full_mode); break; } } -- 2.25.1

1 0

[PATCH 1/6] user32/tests: Add more registry display mode tests.
by Zhiyi Zhang 25 Aug '20

25 Aug '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 102 ++++++++++++++++++++++++++++++------ 1 file changed, 87 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index b151721533d..7cd41145ea1 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -298,34 +298,38 @@ static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD te ok_(__FILE__, line)((dm.dmFields & expected.dmFields) == expected.dmFields, "Device %s test %d expect dmFields to contain %#x, got %#x\n", device, test, expected.dmFields, dm.dmFields); /* Wine doesn't support changing color depth yet */ - todo_wine_if(expected.dmBitsPerPel != 32 && expected.dmBitsPerPel != 24) - ok_(__FILE__, line)(dm.dmBitsPerPel == expected.dmBitsPerPel, "Device %s test %d expect dmBitsPerPel %d, got %d\n", - device, test, expected.dmBitsPerPel, dm.dmBitsPerPel); - ok_(__FILE__, line)(dm.dmPelsWidth == expected.dmPelsWidth, "Device %s test %d expect dmPelsWidth %d, got %d\n", - device, test, expected.dmPelsWidth, dm.dmPelsWidth); - ok_(__FILE__, line)(dm.dmPelsHeight == expected.dmPelsHeight, "Device %s test %d expect dmPelsHeight %d, got %d\n", - device, test, expected.dmPelsHeight, dm.dmPelsHeight); - ok_(__FILE__, line)(dm.dmPosition.x == expected.dmPosition.x, "Device %s test %d expect dmPosition.x %d, got %d\n", - device, test, expected.dmPosition.x, dm.dmPosition.x); - ok_(__FILE__, line)(dm.dmPosition.y == expected.dmPosition.y, "Device %s test %d expect dmPosition.y %d, got %d\n", - device, test, expected.dmPosition.y, dm.dmPosition.y); - ok_(__FILE__, line)(dm.dmDisplayFrequency == expected.dmDisplayFrequency, - "Device %s test %d expect dmDisplayFrequency %d, got %d\n", device, test, expected.dmDisplayFrequency, + todo_wine_if(expected.dmFields & DM_BITSPERPEL && expected.dmBitsPerPel != 32 && expected.dmBitsPerPel != 24) + ok_(__FILE__, line)(!(expected.dmFields & DM_BITSPERPEL) || dm.dmBitsPerPel == expected.dmBitsPerPel, + "Device %s test %d expect dmBitsPerPel %u, got %u\n", device, test, expected.dmBitsPerPel, dm.dmBitsPerPel); + ok_(__FILE__, line)(!(expected.dmFields & DM_PELSWIDTH) || dm.dmPelsWidth == expected.dmPelsWidth, + "Device %s test %d expect dmPelsWidth %u, got %u\n", device, test, expected.dmPelsWidth, dm.dmPelsWidth); + ok_(__FILE__, line)(!(expected.dmFields & DM_PELSHEIGHT) || dm.dmPelsHeight == expected.dmPelsHeight, + "Device %s test %d expect dmPelsHeight %u, got %u\n", device, test, expected.dmPelsHeight, dm.dmPelsHeight); + ok_(__FILE__, line)(!(expected.dmFields & DM_POSITION) || dm.dmPosition.x == expected.dmPosition.x, + "Device %s test %d expect dmPosition.x %d, got %d\n", device, test, expected.dmPosition.x, dm.dmPosition.x); + ok_(__FILE__, line)(!(expected.dmFields & DM_POSITION) || dm.dmPosition.y == expected.dmPosition.y, + "Device %s test %d expect dmPosition.y %d, got %d\n", device, test, expected.dmPosition.y, dm.dmPosition.y); + ok_(__FILE__, line)(!(expected.dmFields & DM_DISPLAYFREQUENCY) || + dm.dmDisplayFrequency == expected.dmDisplayFrequency, + "Device %s test %d expect dmDisplayFrequency %u, got %u\n", device, test, expected.dmDisplayFrequency, dm.dmDisplayFrequency); - ok_(__FILE__, line)(dm.dmDisplayOrientation == expected.dmDisplayOrientation, + ok_(__FILE__, line)(!(expected.dmFields & DM_DISPLAYORIENTATION) || + dm.dmDisplayOrientation == expected.dmDisplayOrientation, "Device %s test %d expect dmDisplayOrientation %d, got %d\n", device, test, expected.dmDisplayOrientation, dm.dmDisplayOrientation); } static void test_ChangeDisplaySettingsEx(void) { + static const DWORD registry_fields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; DPI_AWARENESS_CONTEXT context = NULL; UINT primary, device, test, mode; UINT device_size, device_count; struct device_info *devices; + DEVMODEA dm, dm2, dm3; INT count, old_count; DISPLAY_DEVICEA dd; - DEVMODEA dm, dm2; POINTL position; DEVMODEW dmW; LONG res; @@ -672,10 +676,26 @@ static void test_ChangeDisplaySettingsEx(void) /* Test changing modes by saving settings to the registry first */ for (device = 0; device < device_count; ++device) { + /* Place adapter to the right */ + if (device == 0) + { + position.x = 0; + position.y = 0; + } + else + { + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(devices[device - 1].name, ENUM_CURRENT_SETTINGS, &dm); + ok(res, "EnumDisplaySettingsA %s failed, error %#x.\n", devices[device - 1].name, GetLastError()); + position.x = dm.dmPosition.x + dm.dmPelsWidth; + } + memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); + dm3 = dm; /* Find a mode that's different from the current mode */ memset(&dm2, 0, sizeof(dm2)); @@ -687,6 +707,8 @@ static void test_ChangeDisplaySettingsEx(void) } ok(dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, "Failed to find a different mode.\n"); + /* Test normal operation */ + dm.dmPosition = position; dm.dmPelsWidth = dm2.dmPelsWidth; dm.dmPelsHeight = dm2.dmPelsHeight; dm.dmDisplayFrequency = dm2.dmDisplayFrequency; @@ -706,6 +728,56 @@ static void test_ChangeDisplaySettingsEx(void) flush_events(); expect_dm(dm, devices[device].name, 0); + + /* Test specifying only position, width and height */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + dm.dmPosition = position; + dm.dmPelsWidth = dm3.dmPelsWidth; + dm.dmPelsHeight = dm3.dmPelsHeight; + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned %d.\n", devices[device].name, res); + res = EnumDisplaySettingsA(devices[device].name, ENUM_REGISTRY_SETTINGS, &dm); + /* Win10 either returns failure here or retrieves outdated display settings until they're applied */ + if (res) + { + ok((dm.dmFields & registry_fields) == registry_fields, "Got unexpected dmFields %#x.\n", dm.dmFields); + ok(dm.dmPosition.x == position.x, "Expected dmPosition.x %d, got %d.\n", position.x, dm.dmPosition.x); + ok(dm.dmPosition.y == position.y, "Expected dmPosition.y %d, got %d.\n", position.y, dm.dmPosition.y); + ok(dm.dmPelsWidth == dm3.dmPelsWidth || broken(dm.dmPelsWidth == dm2.dmPelsWidth), /* Win10 */ + "Expected dmPelsWidth %u, got %u.\n", dm3.dmPelsWidth, dm.dmPelsWidth); + ok(dm.dmPelsHeight == dm3.dmPelsHeight || broken(dm.dmPelsHeight == dm2.dmPelsHeight), /* Win10 */ + "Expected dmPelsHeight %u, got %u.\n", dm3.dmPelsHeight, dm.dmPelsHeight); + todo_wine ok(dm.dmBitsPerPel, "Expected dmBitsPerPel not zero.\n"); + todo_wine ok(dm.dmDisplayFrequency, "Expected dmDisplayFrequency not zero.\n"); + } + else + { + win_skip("EnumDisplaySettingsA %s failed, error %#x.\n", devices[device].name, GetLastError()); + } + + res = ChangeDisplaySettingsExA(devices[device].name, NULL, NULL, 0, NULL); + todo_wine ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned %d.\n", devices[device].name, res); + if (res != DISP_CHANGE_SUCCESSFUL) + { + skip("ChangeDisplaySettingsExA %s returned %d.\n", devices[device].name, res); + continue; + } + flush_events(); + + res = EnumDisplaySettingsA(devices[device].name, ENUM_REGISTRY_SETTINGS, &dm); + ok(res, "EnumDisplaySettingsA %s failed, error %#x.\n", devices[device].name, GetLastError()); + ok((dm.dmFields & registry_fields) == registry_fields, "Got unexpected dmFields %#x.\n", dm.dmFields); + ok(dm.dmPosition.x == position.x, "Expected dmPosition.x %d, got %d.\n", position.x, dm.dmPosition.x); + ok(dm.dmPosition.y == position.y, "Expected dmPosition.y %d, got %d.\n", position.y, dm.dmPosition.y); + ok(dm.dmPelsWidth == dm3.dmPelsWidth, "Expected dmPelsWidth %u, got %u.\n", dm3.dmPelsWidth, dm.dmPelsWidth); + ok(dm.dmPelsHeight == dm3.dmPelsHeight, "Expected dmPelsHeight %u, got %u.\n", dm3.dmPelsHeight, + dm.dmPelsHeight); + ok(dm.dmBitsPerPel, "Expected dmBitsPerPel not zero.\n"); + ok(dm.dmDisplayFrequency, "Expected dmDisplayFrequency not zero.\n"); + + expect_dm(dm, devices[device].name, 0); } /* Test dmPosition */ -- 2.25.1

1 0

[PATCH v3 1/2] ws2_32/tests: Check if getsockopt returns non-zero protocol for sockets with autoselected protocol
by Robin Ebert 24 Aug '20

24 Aug '20

Signed-off-by: Robin Ebert <ebertrobin2002(a)gmail.com> --- v3: Fixed commit message --- dlls/ws2_32/tests/sock.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b523c326..1450038f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1750,6 +1750,21 @@ todo_wine closesocket(s); } + /* when no protocol is specified + * and the socket creation doesn't fail + * the socket should have a valid WSAPROTOCOL_INFOW struct */ + s = WSASocketW(AF_INET, SOCK_STREAM, 0, NULL, 0, 0); + ok(s != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + + size = sizeof(WSAPROTOCOL_INFOW); + err = getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOW, (char *)&infoW, &size); + + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + if(!err) + ok(infoW.iProtocol != 0, "getsockopt returned zero protocol\n"); + closesocket(s); + /* Test SO_BSP_STATE - Present only in >= Win 2008 */ s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(s != INVALID_SOCKET, "Failed to create socket\n"); -- 2.20.1

2 2

[PATCH v2 1/2] ws2_32/tests: Check if getsockopt returns non-zero protocol for sockets with autoselected protocol
by Robin Ebert 24 Aug '20

24 Aug '20

Signed-off-by: Robin Ebert <ebertrobin2002(a)gmail.com> --- v2: Fixed type of protolen --- dlls/ws2_32/tests/sock.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b523c326..1450038f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1750,6 +1750,21 @@ todo_wine closesocket(s); } + /* when no protocol is specified + * and the socket creation doesn't fail + * the socket should have a valid WSAPROTOCOL_INFOW struct */ + s = WSASocketW(AF_INET, SOCK_STREAM, 0, NULL, 0, 0); + ok(s != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + + size = sizeof(WSAPROTOCOL_INFOW); + err = getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOW, (char *)&infoW, &size); + + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + if(!err) + ok(infoW.iProtocol != 0, "getsockopt returned zero protocol\n"); + closesocket(s); + /* Test SO_BSP_STATE - Present only in >= Win 2008 */ s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(s != INVALID_SOCKET, "Failed to create socket\n"); -- 2.20.1

2 2

[PATCH v2 4/4] windowscodecs: Introduce decode_block() for DdsFrameDecode_CopyPixels().
by Ziqing Hui 24 Aug '20

24 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 126 +++++++++++++++++++++++++++ dlls/windowscodecs/tests/ddsformat.c | 2 - 2 files changed, 126 insertions(+), 2 deletions(-)

2 1

[PATCH v2 3/4] windowscodecs: More complete implementation of DdsFrameDecode_CopyPixels().
by Ziqing Hui 24 Aug '20

24 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)

2 1

[PATCH v2 2/4] windowscodecs: In struct DdsFrameDecode, add a new member "pixel_data" and rename member "data" to "block_data".
by Ziqing Hui 24 Aug '20

24 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: * Remove the pointer check before HeapFree(). * Lock the critical section when accessing pixel_data. dlls/windowscodecs/ddsformat.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-)

2 1

[PATCH v2 1/4] windowscodecs: Add a lock for DdsFrameDecode.
by Ziqing Hui 24 Aug '20

24 Aug '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: This is a new patch in patch set. dlls/windowscodecs/ddsformat.c | 3 +++ 1 file changed, 3 insertions(+)

2 1

[PATCH v2 1/3] ntdll: Implement RtlGetExtendedContextLength().
by Paul Gofman 24 Aug '20

24 Aug '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - no changes. .../api-ms-win-core-xstate-l1-1-0.spec | 2 +- dlls/ntdll/exception.c | 71 +++++++++ dlls/ntdll/ntdll.spec | 2 + dlls/ntdll/tests/exception.c | 147 +++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 + include/ddk/wdm.h | 8 +- 6 files changed, 228 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec b/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec index 36a1c8812f0..15126e5ddfe 100644 --- a/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec +++ b/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec @@ -1,6 +1,6 @@ @ stub RtlCopyExtendedContext @ stdcall RtlGetEnabledExtendedFeatures(int64) ntdll.RtlGetEnabledExtendedFeatures -@ stub RtlGetExtendedContextLength +@ stdcall RtlGetExtendedContextLength(long ptr) ntdll.RtlGetExtendedContextLength @ stub RtlGetExtendedFeaturesMask @ stub RtlInitializeExtendedContext @ stub RtlLocateExtendedFeature diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 3f7443bb45b..1b212cdee7f 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -665,3 +665,74 @@ ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64 feature_mask) { return user_shared_data->XState.EnabledFeatures & feature_mask; } + +static const struct context_parameters +{ + ULONG arch_flag; + ULONG supported_flags; + ULONG context_size; /* sizeof(CONTEXT) */ + ULONG context_ex_size; /* sizeof(CONTEXT_EX) */ + ULONG alignment; +} +arch_context_paramaters[] = +{ + {0x00100000, 0xd810005f, 0x4d0, 0x20, 7}, + {0x00010000, 0xd801007f, 0x2cc, 0x18, 3}, +}; + +static const struct context_parameters *context_get_parameters( ULONG context_flags ) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(arch_context_paramaters); ++i) + { + if (context_flags & arch_context_paramaters[i].arch_flag) + return context_flags & ~arch_context_paramaters[i].supported_flags ? NULL : &arch_context_paramaters[i]; + } + return NULL; +} + + +/********************************************************************** + * RtlGetExtendedContextLength2 (NTDLL.@) + */ +ULONG64 WINAPI RtlGetExtendedContextLength2( ULONG context_flags, ULONG *length, ULONG64 compaction_mask ) +{ + const struct context_parameters *p; + ULONG64 supported_mask; + ULONG64 size; + + TRACE( "context_flags %#x, length %p, compaction_mask %s.\n", context_flags, length, + wine_dbgstr_longlong(compaction_mask) ); + + if (!(p = context_get_parameters( context_flags ))) + return STATUS_INVALID_PARAMETER; + + if (!(context_flags & 0x40)) + { + *length = p->context_size + p->context_ex_size + p->alignment; + return STATUS_SUCCESS; + } + + if (!(supported_mask = RtlGetEnabledExtendedFeatures( ~(ULONG64)0) )) + return STATUS_NOT_SUPPORTED; + + compaction_mask &= supported_mask; + + size = p->context_size + p->context_ex_size + offsetof(XSTATE, YmmContext) + 63; + + if (compaction_mask & supported_mask & (1 << XSTATE_AVX)) + size += sizeof(YMMCONTEXT); + + *length = size; + return STATUS_SUCCESS; +} + + +/********************************************************************** + * RtlGetExtendedContextLength (NTDLL.@) + */ +ULONG64 WINAPI RtlGetExtendedContextLength( ULONG context_flags, ULONG *length ) +{ + return RtlGetExtendedContextLength2( context_flags, length, ~(ULONG64)0 ); +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c21e2bcf32a..08c6e1849a2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -695,6 +695,8 @@ # @ stub RtlGetElementGenericTableAvl @ stdcall RtlGetEnabledExtendedFeatures(int64) @ stdcall RtlGetExePath(wstr ptr) +@ stdcall -ret64 RtlGetExtendedContextLength(long ptr) +@ stdcall -ret64 RtlGetExtendedContextLength2(long ptr int64) # @ stub RtlGetFirstRange @ stdcall RtlGetFrame() @ stdcall RtlGetFullPathName_U(wstr long ptr ptr) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 9f93212acf6..0e00e889d41 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -45,6 +45,8 @@ static PVOID (WINAPI *pRtlAddVectoredContinueHandler)(ULONG first, PVECTORED static ULONG (WINAPI *pRtlRemoveVectoredContinueHandler)(PVOID handler); static void (WINAPI *pRtlSetUnhandledExceptionFilter)(PRTL_EXCEPTION_FILTER filter); static ULONG64 (WINAPI *pRtlGetEnabledExtendedFeatures)(ULONG64); +static ULONG64 (WINAPI *pRtlGetExtendedContextLength)(ULONG context_flags, ULONG *length); +static ULONG64 (WINAPI *pRtlGetExtendedContextLength2)(ULONG context_flags, ULONG *length, ULONG64 compaction_mask); static NTSTATUS (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -5544,6 +5546,8 @@ done: return ExceptionContinueExecution; } +#define CONTEXT_NATIVE (CONTEXT_XSTATE & CONTEXT_CONTROL) + static void test_extended_context(void) { static BYTE except_code_set_ymm0[] = @@ -5580,19 +5584,156 @@ static void test_extended_context(void) 0xc5, 0xfc, 0x11, 0x00, /* vmovups %ymm0,(%ax) */ 0xc3, /* ret */ }; - unsigned int i, address_offset; + static const struct + { + ULONG flag; + ULONG supported_flags; + ULONG broken_flags; + ULONG context_length; + ULONG context_ex_length; + ULONG align; + } + context_arch[] = + { + { + 0x00100000, /* CONTEXT_AMD64 */ + 0xd800005f, + 0xd8000000, + 0x4d0, /* sizeof(CONTEXT) */ + 0x20, /* sizeof(CONTEXT_EX) */ + 7, + }, + { + 0x00010000, /* CONTEXT_X86 */ + 0xd800007f, + 0xd8000000, + 0x2cc, /* sizeof(CONTEXT) */ + 0x18, /* sizeof(CONTEXT_EX) */ + 3, + }, + }; + ULONG expected_length, expected_length_xstate; + unsigned int i, address_offset, test; + ULONG64 enabled_features; + ULONG ret, length; unsigned data[8]; + ULONG flags; address_offset = sizeof(void *) == 8 ? 2 : 1; *(void **)(except_code_set_ymm0 + address_offset) = data; *(void **)(except_code_reset_ymm_state + address_offset) = data; - if (!pRtlGetEnabledExtendedFeatures || !(pRtlGetEnabledExtendedFeatures(~(ULONG64)0) & (1 << XSTATE_AVX))) + if (!pRtlGetEnabledExtendedFeatures) + { + skip("RtlGetEnabledExtendedFeatures is not available.\n"); + return; + } + + enabled_features = pRtlGetEnabledExtendedFeatures(~(ULONG64)0); + + /* Test context manipulation functions. */ + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(0, &length); + ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, "Got unexpected result ret %#x, length %#x.\n", + ret, length); + + for (test = 0; test < ARRAY_SIZE(context_arch); ++test) + { + expected_length = context_arch[test].context_length + context_arch[test].context_ex_length + + context_arch[test].align; + expected_length_xstate = context_arch[test].context_length + context_arch[test].context_ex_length + + sizeof(XSTATE) + 63; + + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(context_arch[test].flag, &length); + ok(!ret && length == expected_length, "Got unexpected result ret %#x, length %#x.\n", + ret, length); + + for (i = 0; i < 32; ++i) + { + if (i == 6) /* CONTEXT_XSTATE */ + continue; + + flags = context_arch[test].flag | (1 << i); + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(flags, &length); + + if ((context_arch[test].supported_flags & flags) || flags == context_arch[test].flag) + { + ok((!ret && length == expected_length) + || broken((context_arch[test].broken_flags & (1 << i)) + && ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef), + "Got unexpected result ret %#x, length %#x, flags 0x%08x.\n", + ret, length, flags); + } + else + { + ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, + "Got unexpected result ret %#x, length %#x, flags 0x%08x.\n", ret, length, flags); + } + } + + flags = context_arch[test].flag | 0x40; + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(flags, &length); + + if (!enabled_features) + { + ok(ret == STATUS_NOT_SUPPORTED && length == 0xdeadbeef, + "Got unexpected result ret %#x, length %#x.\n", ret, length); + continue; + } + + ok(!ret && length >= expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + if (!pRtlGetExtendedContextLength2) + { + win_skip("RtlGetExtendedContextLength2 is not available.\n"); + continue; + } + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 7); + ok(!ret && length == expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, ~0); + ok(!ret && length >= expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 0); + ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT), + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 3); + ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT), + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 4); + ok(!ret && length == expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + } + + if (0) + { + /* Crashes on Windows. */ + pRtlGetExtendedContextLength(CONTEXT_FULL, NULL); + } + + if (!(enabled_features & (1 << XSTATE_AVX))) { skip("AVX is not supported.\n"); return; } + /* Test fault exception context. */ memset(data, 0xff, sizeof(data)); test_extended_context_modified_state = FALSE; run_exception_test(test_extended_context_handler, NULL, except_code_reset_ymm_state, @@ -5657,6 +5798,8 @@ START_TEST(exception) X(RtlGetUnloadEventTrace); X(RtlGetUnloadEventTraceEx); X(RtlGetEnabledExtendedFeatures); + X(RtlGetExtendedContextLength); + X(RtlGetExtendedContextLength2); #undef X pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0e8082fad26..45024a3a8da 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1096,6 +1096,8 @@ @ stub RtlGetDefaultCodePage @ stub RtlGetElementGenericTable @ stub RtlGetElementGenericTableAvl +@ stdcall RtlGetExtendedContextLength(long ptr) +@ stdcall RtlGetExtendedContextLength2(long ptr int64) @ stub RtlGetFirstRange @ stdcall RtlGetGroupSecurityDescriptor(ptr ptr ptr) @ stub RtlGetNextRange diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index cc841326979..fa0f42aadef 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1836,12 +1836,18 @@ HANDLE WINAPI PsGetProcessInheritedFromUniqueProcessId(PEPROCESS); BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS); +ULONG64 WINAPI RtlGetExtendedContextLength(ULONG,ULONG*); +ULONG64 WINAPI RtlGetExtendedContextLength2(ULONG,ULONG*,ULONG64); + +#if defined(__x86_64__) || defined(__i386__) +ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64); +#endif + #ifdef __x86_64__ void WINAPI RtlCopyMemoryNonTemporal(void*,const void*,SIZE_T); #else #define RtlCopyMemoryNonTemporal RtlCopyMemory #endif -ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64); BOOLEAN WINAPI RtlIsNtDdiVersionAvailable(ULONG); NTSTATUS WINAPI ZwAddBootEntry(PUNICODE_STRING,PUNICODE_STRING); -- 2.26.2

2 4

TestBot and graphics tests
by Francois Gouget 24 Aug '20

24 Aug '20

Here are some things I've learned about PCI-passthrough recently, which would be one way (probably the best) to add "real hardware" to the TestBot. I don't want to give anyone false hopes though: this just went from "this is a mysterious thing I need to learn about" to "I think I know how to do it but have not tried it yet". So graphics card PCI-passthrough is now relatively well documented on the Internet and seems to have seen some use-cases that would indicate it may even be reasonably usable. * There are two machines intended to run real GPU tests for Wine: cw1-hd6800 and cw2-gtx560. For now they are only used to run WineTest daily on Windows 8.1, Windows 10 1507, 1709, 1809 and Linux. That's quite a bunch but it would be much better if they were integrated with the TestBot as that would allow developers to submit their own tests. So I had a look at what it would imply to convert them to VM hosts using QEmu + PCI-passthrough. * First one needs a processor with hardware virtualisation support. For Intel that's VT-d. Both machines have an Intel Core 2600 which supports VT-d. Good. * Second the motherboard too needs to support VT-d. Both machines have an ASRock P67 Extreme4 motherboard. Unfortunately UEFI says "unsupported" next to the "VT-d" setting for the motherboard :-( It looks like there was some confusion as to whether the P67 chipset supported VT-d initially. From what I gathered it's only Q67 that does but this caused some manufacturers, among which ASRock, to initially claim support and later retract it. * Then one needs to add the intel_iommu=on option to the kernel command line (resp. amd_iommu). This is should make all the PCI devices appear in /sys/kernel/iommu_groups. But that folder remains empty which confirms that full VT-d support is missing. * Another important aspect is to have a graphics card which is hot-restartable. In some cases when a VM's graphics card is crashed the only way to reset it is to reboot the host. The TestBot is likely to crash the graphics card, particularly if we do a hard-power off on the VMs like we currently do, and it would relaly be annoying to have to reboot the host everytime the graphics card goes belly up. I don't know if the AMD HD6800 and Nvidia GTX560 are suitable but it's quite possible they are not. All I know for now is that we should avoid AMD's R9 line of graphics cards. I still need to find a couple of suitable reasonably lower power graphics cards: one AMD and one Nvidia. * Then one needs to prevent the host from using the graphics card. Usually that's done by having the host use the processor's IGP and dedicating the discrete GPU to the VMs. Unfortunately the 2600's IGP cannot be active when there's a discrete card so that route is denied to us. Fortunately there's quite a bit of documentation on how to shut down not just X but also the Linux virtual consoles to free the GPU and hand it over to the VMs after boot. Doing so means losing KVM access to the host which is a bit annoying in case something goes wrong. So ideally we'd make sure this does not happen in grub's "safe mode" boot option. * Although I have not done any test yet I'm reasonably certain that PCI-passthrough rules out live snapshots: QEmu would have no way to restore the graphics card's internal state. - For Windows VMs that's not an issue: if we provide a power off snapshot the TestBot already knows how to power on the VM and wait for it to boot (as long as the boot is shorter than the connection timeout but it works out usually). - For Linux VM's that's more of an issue: the TestBot will power on the VM as usual. The problem is when it updates Wine: after recompiling everything it deletes the old snapshot and creates a new one from the current state of the VM, which means a live snapshot. So the TestBot will need to be modified so it knows when and how to power off the VM and take a powered off snapshot. * Since the VM has full control of the graphics card QEmu has no access to the content of the screen. That's not an issue for the normal TestBot operation, just for the initial VM setup. Fortunately the graphics card is connected to a KVM so the screen can be accessed through that means. It does mean assigning the mouse and keyboard to the VM too. Should that prove impractical there are a bunch of other options too: VNC, LookingGlass, Synergy, etc. But the less needs to be installed in the VMs the better. * Also the TestBot uses QEmu to take the screenshots. But QEmu does not have access to the content of the screen. The fix is to use a tool to take the screenshots from within the VM and use TestAgent to retrieve them. On Linux there are standard tools we can use. On Windows there's code floating around we can use. So the next steps would be: * Maybe test on my box using the builtin IGP. But that likely won't be very conclusive beyond confirming the snapshot issues, screen access, etc. * Find a suitable AMD or Nvidia graphics card and test that on my box. That would allow me to fully test integration with the TestBot, check for stability issues, etc. * Then see what can be done with the existing cw1 and cw2 boxes. -- Francois Gouget <fgouget(a)codeweavers.com>

4 10

[PATCH 1/4] ntdll: Increase step after failed map attempt in try_map_free_area().
by Paul Gofman 24 Aug '20

24 Aug '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/virtual.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 883e5cff927..7b33b3e82ac 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1033,6 +1033,7 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step, step == 0) break; start = (char *)start + step; + step *= 2; } return NULL; -- 2.26.2

4 17

[PATCH] kernel32: Fix some string leaks (Coverity).
by Sven Baars 24 Aug '20

24 Aug '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/kernel32/profile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index bfaba6cdeb0..38528099a92 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1777,11 +1777,13 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, RegCloseKey( section_key ); if (res) { + HeapFree( GetProcessHeap(), 0, entry_copy ); SetLastError( res ); RegCloseKey( key ); return FALSE; } } + HeapFree( GetProcessHeap(), 0, entry_copy ); } } RegCloseKey( key ); @@ -1919,6 +1921,7 @@ DWORD WINAPI GetPrivateProfileSectionNamesW( LPWSTR buffer, DWORD size, { lstrcpynW( buffer + ret, section, size - ret - 1 ); ret = min( ret + strlenW( section ) + 1, size - 1 ); + HeapFree( GetProcessHeap(), 0, section ); } RegCloseKey( key ); -- 2.25.1

2 2

[PATCH 1/2] combase: Expose ROT access helpers.
by Nikolay Sivov 24 Aug '20

24 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/combase.c | 2 +- dlls/combase/combase.spec | 14 ++--- dlls/combase/combase_private.h | 2 +- dlls/combase/irpcss.idl | 1 + dlls/combase/rpc.c | 108 +++++++++++++++++++++++++++------ 5 files changed, 98 insertions(+), 29 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index df97799fe08..80d6ece266e 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -2245,7 +2245,7 @@ DWORD WINAPI CoGetCurrentProcess(void) return 0; if (!tlsdata->thread_seqid) - tlsdata->thread_seqid = rpcss_get_next_seqid(); + rpcss_get_next_seqid(&tlsdata->thread_seqid); return tlsdata->thread_seqid; } diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index a88c5d66fe1..9038d5fa8bf 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -255,13 +255,13 @@ @ stub InternalFillLocalOXIDInfo @ stub InternalFreeObjRef @ stub InternalGetWindowPropInterface -@ stub InternalIrotEnumRunning -@ stub InternalIrotGetObject -@ stub InternalIrotGetTimeOfLastChange -@ stub InternalIrotIsRunning -@ stub InternalIrotNoteChangeTime -@ stub InternalIrotRegister -@ stub InternalIrotRevoke +@ stdcall InternalIrotEnumRunning(ptr) +@ stdcall InternalIrotGetObject(ptr ptr ptr) +@ stdcall InternalIrotGetTimeOfLastChange(ptr ptr) +@ stdcall InternalIrotIsRunning(ptr) +@ stdcall InternalIrotNoteChangeTime(long ptr) +@ stdcall InternalIrotRegister(ptr ptr ptr ptr long ptr ptr) +@ stdcall InternalIrotRevoke(long ptr ptr ptr) @ stub InternalIsApartmentInitialized @ stub InternalIsProcessInitialized @ stub InternalMarshalObjRef diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index e910166fff2..7d7583282e1 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -90,4 +90,4 @@ static inline struct apartment* com_get_current_apt(void) } /* RpcSs interface */ -DWORD rpcss_get_next_seqid(void) DECLSPEC_HIDDEN; +HRESULT rpcss_get_next_seqid(DWORD *id) DECLSPEC_HIDDEN; diff --git a/dlls/combase/irpcss.idl b/dlls/combase/irpcss.idl index 65078167de2..fab69f7310c 100644 --- a/dlls/combase/irpcss.idl +++ b/dlls/combase/irpcss.idl @@ -18,4 +18,5 @@ #pragma makedep client +#include "wine/irot.idl" #include "wine/irpcss.idl" diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index 2fbccfd740d..3b531661726 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -127,29 +127,97 @@ static RPC_BINDING_HANDLE get_irpcss_handle(void) return irpcss_handle; } -DWORD rpcss_get_next_seqid(void) +static RPC_BINDING_HANDLE get_irot_handle(void) { - DWORD id = 0; - HRESULT hr; + static RPC_BINDING_HANDLE irot_handle; - for (;;) + if (!irot_handle) { - __TRY - { - hr = irpcss_get_thread_seq_id(get_irpcss_handle(), &id); - } - __EXCEPT(rpc_filter) - { - hr = HRESULT_FROM_WIN32(GetExceptionCode()); - } - __ENDTRY - if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) - { - if (start_rpcss()) - continue; - } - break; + unsigned short protseq[] = IROT_PROTSEQ; + unsigned short endpoint[] = IROT_ENDPOINT; + + RPC_BINDING_HANDLE new_handle = get_rpc_handle(protseq, endpoint); + if (InterlockedCompareExchangePointer(&irot_handle, new_handle, NULL)) + /* another thread beat us to it */ + RpcBindingFree(&new_handle); } + return irot_handle; +} + +#define RPCSS_CALL_START \ + HRESULT hr; \ + for (;;) { \ + __TRY { + +#define RPCSS_CALL_END \ + } __EXCEPT(rpc_filter) { \ + hr = HRESULT_FROM_WIN32(GetExceptionCode()); \ + } \ + __ENDTRY \ + if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) { \ + if (start_rpcss()) \ + continue; \ + } \ + break; \ + } \ + return hr; + +HRESULT rpcss_get_next_seqid(DWORD *id) +{ + RPCSS_CALL_START + hr = irpcss_get_thread_seq_id(get_irpcss_handle(), id); + RPCSS_CALL_END +} + +HRESULT WINAPI InternalIrotRegister(const MonikerComparisonData *moniker_data, + const InterfaceData *object, const InterfaceData *moniker, + const FILETIME *time, DWORD flags, IrotCookie *cookie, IrotContextHandle *ctxt_handle) +{ + RPCSS_CALL_START + hr = IrotRegister(get_irot_handle(), moniker_data, object, moniker, time, flags, cookie, ctxt_handle); + RPCSS_CALL_END +} + +HRESULT WINAPI InternalIrotIsRunning(const MonikerComparisonData *moniker_data) +{ + RPCSS_CALL_START + hr = IrotIsRunning(get_irot_handle(), moniker_data); + RPCSS_CALL_END +} + +HRESULT WINAPI InternalIrotGetObject(const MonikerComparisonData *moniker_data, PInterfaceData *obj, + IrotCookie *cookie) +{ + RPCSS_CALL_START + hr = IrotGetObject(get_irot_handle(), moniker_data, obj, cookie); + RPCSS_CALL_END +} + +HRESULT WINAPI InternalIrotNoteChangeTime(IrotCookie cookie, const FILETIME *time) +{ + RPCSS_CALL_START + hr = IrotNoteChangeTime(get_irot_handle(), cookie, time); + RPCSS_CALL_END +} - return id; +HRESULT WINAPI InternalIrotGetTimeOfLastChange(const MonikerComparisonData *moniker_data, FILETIME *time) +{ + RPCSS_CALL_START + hr = IrotGetTimeOfLastChange(get_irot_handle(), moniker_data, time); + RPCSS_CALL_END +} + +HRESULT WINAPI InternalIrotEnumRunning(PInterfaceList *list) +{ + RPCSS_CALL_START + hr = IrotEnumRunning(get_irot_handle(), list); + RPCSS_CALL_END +} + +HRESULT WINAPI InternalIrotRevoke(IrotCookie cookie, IrotContextHandle *ctxt_handle, PInterfaceData *object, + PInterfaceData *moniker) +{ + RPCSS_CALL_START + hr = IrotRevoke(get_irot_handle(), cookie, ctxt_handle, object, moniker); + RPCSS_CALL_END } -- 2.28.0

3 4

[PATCH 1/3] ntdll: Implement RtlGetExtendedContextLength().
by Paul Gofman 24 Aug '20

24 Aug '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- .../api-ms-win-core-xstate-l1-1-0.spec | 2 +- dlls/ntdll/exception.c | 71 +++++++++ dlls/ntdll/ntdll.spec | 2 + dlls/ntdll/tests/exception.c | 147 +++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 + include/ddk/wdm.h | 8 +- 6 files changed, 228 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec b/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec index 36a1c8812f0..15126e5ddfe 100644 --- a/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec +++ b/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec @@ -1,6 +1,6 @@ @ stub RtlCopyExtendedContext @ stdcall RtlGetEnabledExtendedFeatures(int64) ntdll.RtlGetEnabledExtendedFeatures -@ stub RtlGetExtendedContextLength +@ stdcall RtlGetExtendedContextLength(long ptr) ntdll.RtlGetExtendedContextLength @ stub RtlGetExtendedFeaturesMask @ stub RtlInitializeExtendedContext @ stub RtlLocateExtendedFeature diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 3f7443bb45b..1b212cdee7f 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -665,3 +665,74 @@ ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64 feature_mask) { return user_shared_data->XState.EnabledFeatures & feature_mask; } + +static const struct context_parameters +{ + ULONG arch_flag; + ULONG supported_flags; + ULONG context_size; /* sizeof(CONTEXT) */ + ULONG context_ex_size; /* sizeof(CONTEXT_EX) */ + ULONG alignment; +} +arch_context_paramaters[] = +{ + {0x00100000, 0xd810005f, 0x4d0, 0x20, 7}, + {0x00010000, 0xd801007f, 0x2cc, 0x18, 3}, +}; + +static const struct context_parameters *context_get_parameters( ULONG context_flags ) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(arch_context_paramaters); ++i) + { + if (context_flags & arch_context_paramaters[i].arch_flag) + return context_flags & ~arch_context_paramaters[i].supported_flags ? NULL : &arch_context_paramaters[i]; + } + return NULL; +} + + +/********************************************************************** + * RtlGetExtendedContextLength2 (NTDLL.@) + */ +ULONG64 WINAPI RtlGetExtendedContextLength2( ULONG context_flags, ULONG *length, ULONG64 compaction_mask ) +{ + const struct context_parameters *p; + ULONG64 supported_mask; + ULONG64 size; + + TRACE( "context_flags %#x, length %p, compaction_mask %s.\n", context_flags, length, + wine_dbgstr_longlong(compaction_mask) ); + + if (!(p = context_get_parameters( context_flags ))) + return STATUS_INVALID_PARAMETER; + + if (!(context_flags & 0x40)) + { + *length = p->context_size + p->context_ex_size + p->alignment; + return STATUS_SUCCESS; + } + + if (!(supported_mask = RtlGetEnabledExtendedFeatures( ~(ULONG64)0) )) + return STATUS_NOT_SUPPORTED; + + compaction_mask &= supported_mask; + + size = p->context_size + p->context_ex_size + offsetof(XSTATE, YmmContext) + 63; + + if (compaction_mask & supported_mask & (1 << XSTATE_AVX)) + size += sizeof(YMMCONTEXT); + + *length = size; + return STATUS_SUCCESS; +} + + +/********************************************************************** + * RtlGetExtendedContextLength (NTDLL.@) + */ +ULONG64 WINAPI RtlGetExtendedContextLength( ULONG context_flags, ULONG *length ) +{ + return RtlGetExtendedContextLength2( context_flags, length, ~(ULONG64)0 ); +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c21e2bcf32a..08c6e1849a2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -695,6 +695,8 @@ # @ stub RtlGetElementGenericTableAvl @ stdcall RtlGetEnabledExtendedFeatures(int64) @ stdcall RtlGetExePath(wstr ptr) +@ stdcall -ret64 RtlGetExtendedContextLength(long ptr) +@ stdcall -ret64 RtlGetExtendedContextLength2(long ptr int64) # @ stub RtlGetFirstRange @ stdcall RtlGetFrame() @ stdcall RtlGetFullPathName_U(wstr long ptr ptr) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 9f93212acf6..0e00e889d41 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -45,6 +45,8 @@ static PVOID (WINAPI *pRtlAddVectoredContinueHandler)(ULONG first, PVECTORED static ULONG (WINAPI *pRtlRemoveVectoredContinueHandler)(PVOID handler); static void (WINAPI *pRtlSetUnhandledExceptionFilter)(PRTL_EXCEPTION_FILTER filter); static ULONG64 (WINAPI *pRtlGetEnabledExtendedFeatures)(ULONG64); +static ULONG64 (WINAPI *pRtlGetExtendedContextLength)(ULONG context_flags, ULONG *length); +static ULONG64 (WINAPI *pRtlGetExtendedContextLength2)(ULONG context_flags, ULONG *length, ULONG64 compaction_mask); static NTSTATUS (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -5544,6 +5546,8 @@ done: return ExceptionContinueExecution; } +#define CONTEXT_NATIVE (CONTEXT_XSTATE & CONTEXT_CONTROL) + static void test_extended_context(void) { static BYTE except_code_set_ymm0[] = @@ -5580,19 +5584,156 @@ static void test_extended_context(void) 0xc5, 0xfc, 0x11, 0x00, /* vmovups %ymm0,(%ax) */ 0xc3, /* ret */ }; - unsigned int i, address_offset; + static const struct + { + ULONG flag; + ULONG supported_flags; + ULONG broken_flags; + ULONG context_length; + ULONG context_ex_length; + ULONG align; + } + context_arch[] = + { + { + 0x00100000, /* CONTEXT_AMD64 */ + 0xd800005f, + 0xd8000000, + 0x4d0, /* sizeof(CONTEXT) */ + 0x20, /* sizeof(CONTEXT_EX) */ + 7, + }, + { + 0x00010000, /* CONTEXT_X86 */ + 0xd800007f, + 0xd8000000, + 0x2cc, /* sizeof(CONTEXT) */ + 0x18, /* sizeof(CONTEXT_EX) */ + 3, + }, + }; + ULONG expected_length, expected_length_xstate; + unsigned int i, address_offset, test; + ULONG64 enabled_features; + ULONG ret, length; unsigned data[8]; + ULONG flags; address_offset = sizeof(void *) == 8 ? 2 : 1; *(void **)(except_code_set_ymm0 + address_offset) = data; *(void **)(except_code_reset_ymm_state + address_offset) = data; - if (!pRtlGetEnabledExtendedFeatures || !(pRtlGetEnabledExtendedFeatures(~(ULONG64)0) & (1 << XSTATE_AVX))) + if (!pRtlGetEnabledExtendedFeatures) + { + skip("RtlGetEnabledExtendedFeatures is not available.\n"); + return; + } + + enabled_features = pRtlGetEnabledExtendedFeatures(~(ULONG64)0); + + /* Test context manipulation functions. */ + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(0, &length); + ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, "Got unexpected result ret %#x, length %#x.\n", + ret, length); + + for (test = 0; test < ARRAY_SIZE(context_arch); ++test) + { + expected_length = context_arch[test].context_length + context_arch[test].context_ex_length + + context_arch[test].align; + expected_length_xstate = context_arch[test].context_length + context_arch[test].context_ex_length + + sizeof(XSTATE) + 63; + + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(context_arch[test].flag, &length); + ok(!ret && length == expected_length, "Got unexpected result ret %#x, length %#x.\n", + ret, length); + + for (i = 0; i < 32; ++i) + { + if (i == 6) /* CONTEXT_XSTATE */ + continue; + + flags = context_arch[test].flag | (1 << i); + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(flags, &length); + + if ((context_arch[test].supported_flags & flags) || flags == context_arch[test].flag) + { + ok((!ret && length == expected_length) + || broken((context_arch[test].broken_flags & (1 << i)) + && ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef), + "Got unexpected result ret %#x, length %#x, flags 0x%08x.\n", + ret, length, flags); + } + else + { + ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, + "Got unexpected result ret %#x, length %#x, flags 0x%08x.\n", ret, length, flags); + } + } + + flags = context_arch[test].flag | 0x40; + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength(flags, &length); + + if (!enabled_features) + { + ok(ret == STATUS_NOT_SUPPORTED && length == 0xdeadbeef, + "Got unexpected result ret %#x, length %#x.\n", ret, length); + continue; + } + + ok(!ret && length >= expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + if (!pRtlGetExtendedContextLength2) + { + win_skip("RtlGetExtendedContextLength2 is not available.\n"); + continue; + } + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 7); + ok(!ret && length == expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, ~0); + ok(!ret && length >= expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 0); + ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT), + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 3); + ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT), + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + + length = 0xdeadbeef; + ret = pRtlGetExtendedContextLength2(flags, &length, 4); + ok(!ret && length == expected_length_xstate, + "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + } + + if (0) + { + /* Crashes on Windows. */ + pRtlGetExtendedContextLength(CONTEXT_FULL, NULL); + } + + if (!(enabled_features & (1 << XSTATE_AVX))) { skip("AVX is not supported.\n"); return; } + /* Test fault exception context. */ memset(data, 0xff, sizeof(data)); test_extended_context_modified_state = FALSE; run_exception_test(test_extended_context_handler, NULL, except_code_reset_ymm_state, @@ -5657,6 +5798,8 @@ START_TEST(exception) X(RtlGetUnloadEventTrace); X(RtlGetUnloadEventTraceEx); X(RtlGetEnabledExtendedFeatures); + X(RtlGetExtendedContextLength); + X(RtlGetExtendedContextLength2); #undef X pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0e8082fad26..45024a3a8da 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1096,6 +1096,8 @@ @ stub RtlGetDefaultCodePage @ stub RtlGetElementGenericTable @ stub RtlGetElementGenericTableAvl +@ stdcall RtlGetExtendedContextLength(long ptr) +@ stdcall RtlGetExtendedContextLength2(long ptr int64) @ stub RtlGetFirstRange @ stdcall RtlGetGroupSecurityDescriptor(ptr ptr ptr) @ stub RtlGetNextRange diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index cc841326979..fa0f42aadef 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1836,12 +1836,18 @@ HANDLE WINAPI PsGetProcessInheritedFromUniqueProcessId(PEPROCESS); BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS); +ULONG64 WINAPI RtlGetExtendedContextLength(ULONG,ULONG*); +ULONG64 WINAPI RtlGetExtendedContextLength2(ULONG,ULONG*,ULONG64); + +#if defined(__x86_64__) || defined(__i386__) +ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64); +#endif + #ifdef __x86_64__ void WINAPI RtlCopyMemoryNonTemporal(void*,const void*,SIZE_T); #else #define RtlCopyMemoryNonTemporal RtlCopyMemory #endif -ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64); BOOLEAN WINAPI RtlIsNtDdiVersionAvailable(ULONG); NTSTATUS WINAPI ZwAddBootEntry(PUNICODE_STRING,PUNICODE_STRING); -- 2.26.2

2 4

[PATCH 1/5 v2] conhost: Implement IOCTL_CONDRV_SET_MODE.
by Jacek Caban 24 Aug '20

24 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: fix splitting patches dlls/kernel32/tests/console.c | 31 ++++++++++++++++++++++++------- programs/conhost/conhost.c | 6 ++++++ 2 files changed, 30 insertions(+), 7 deletions(-)

2 1

[PATCH 1/5] conhost: Implement IOCTL_CONDRV_SET_MODE.
by Jacek Caban 24 Aug '20

24 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 32 +++++++++++++++++++++++++------- programs/conhost/conhost.c | 6 ++++++ 2 files changed, 31 insertions(+), 7 deletions(-)

2 1

[PATCH 5/5] conhost: Implement IOCTL_CONDRV_SET_TITLE.
by Jacek Caban 24 Aug '20

24 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 2 ++ programs/conhost/conhost.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+)

1 0

[PATCH 4/5] conhost: Implement IOCTL_CONDRV_GET_TITLE.
by Jacek Caban 24 Aug '20

24 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)

1 0

[PATCH 3/5] conhost: Implement IOCTL_CONDRV_SET_INPUT_INFO.
by Jacek Caban 24 Aug '20

24 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 65 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+)

1 0

[PATCH 2/5] conhost: Implement IOCTL_CONDRV_GET_INPUT_INFO.
by Jacek Caban 24 Aug '20

24 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)

1 0

[website] German translation for release 5.15
by Julian Rüger 24 Aug '20

24 Aug '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.0.2
by Julian Rüger 24 Aug '20

24 Aug '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.14
by Julian Rüger 24 Aug '20

24 Aug '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.13
by Julian Rüger 24 Aug '20

24 Aug '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.12
by Julian Rüger 24 Aug '20

24 Aug '20

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 2/2] vbscript: Support arrays in TypeName.
by Jacek Caban 24 Aug '20

24 Aug '20

From: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 3 +++ dlls/vbscript/tests/api.vbs | 2 ++ 2 files changed, 5 insertions(+)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel