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

Nikolay Sivov : combase: Move CoFileTimeNow().
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: 444be8b98e95cef459158d07cfee218b3f843f01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=444be8b98e95cef459158d07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 5 08:55:01 2020 +0300 combase: Move CoFileTimeNow(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 9 +++++++++ dlls/combase/combase.spec | 1 + dlls/ole32/compobj.c | 17 ----------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 74a7643709..bf1228a1f2 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -431,3 +431,12 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, const PROPVARIANT *pvarSrc return S_OK; } + +/*********************************************************************** + * CoFileTimeNow (combase.@) + */ +HRESULT WINAPI CoFileTimeNow(FILETIME *filetime) +{ + GetSystemTimeAsFileTime(filetime); + return S_OK; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 70f7b17244..9940229c46 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -90,6 +90,7 @@ @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation +@ stdcall CoFileTimeNow(ptr) @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx @ stdcall CoGetActivationState(int128 long ptr) ole32.CoGetActivationState diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 6d9904a165..29c8ca6e13 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3701,23 +3701,6 @@ void WINAPI DECLSPEC_HOTPATCH CoFreeUnusedLibraries(void) CoFreeUnusedLibrariesEx(INFINITE, 0); } -/*********************************************************************** - * CoFileTimeNow [OLE32.@] - * - * Retrieves the current time in FILETIME format. - * - * PARAMS - * lpFileTime [O] The current time. - * - * RETURNS - * S_OK. - */ -HRESULT WINAPI CoFileTimeNow( FILETIME *lpFileTime ) -{ - GetSystemTimeAsFileTime( lpFileTime ); - return S_OK; -} - /****************************************************************************** * CoLockObjectExternal [OLE32.@] * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 6699d797b0..87c950cf43 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -19,7 +19,7 @@ @ stdcall CoDisconnectObject(ptr long) @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime @ stdcall CoEnableCallCancellation(ptr) -@ stdcall CoFileTimeNow(ptr) +@ stdcall CoFileTimeNow(ptr) combase.CoFileTimeNow @ stdcall CoFileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime @ stdcall CoFreeAllLibraries() @ stdcall CoFreeLibrary(long)

1 0

Piotr Caban : msvcrt: Import acos from musl.
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: 8034d4179c88ae9176ecaae210c30e40084ae29c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8034d4179c88ae9176ecaae2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 5 17:11:36 2020 +0200 msvcrt: Import acos from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 66 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 46af74f09f..06480911af 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -542,18 +542,75 @@ float CDECL MSVCRT_modff( float x, float *iptr ) /********************************************************************* * MSVCRT_acos (MSVCRT.@) + * + * Copied from musl: src/math/acos.c */ +static double acos_R(double z) +{ + static const double pS0 = 1.66666666666666657415e-01, + pS1 = -3.25565818622400915405e-01, + pS2 = 2.01212532134862925881e-01, + pS3 = -4.00555345006794114027e-02, + pS4 = 7.91534994289814532176e-04, + pS5 = 3.47933107596021167570e-05, + qS1 = -2.40339491173441421878e+00, + qS2 = 2.02094576023350569471e+00, + qS3 = -6.88283971605453293030e-01, + qS4 = 7.70381505559019352791e-02; + + double p, q; + p = z * (pS0 + z * (pS1 + z * (pS2 + z * (pS3 + z * (pS4 + z * pS5))))); + q = 1.0 + z * (qS1 + z * (qS2 + z * (qS3 + z * qS4))); + return p/q; +} + double CDECL MSVCRT_acos( double x ) { - /* glibc implements acos() as the FPU equivalent of atan2(sqrt(1 - x ^ 2), x). - * asin() uses a similar construction. This is bad because as x gets nearer to - * 1 the error in the expression "1 - x^2" can get relatively large due to - * cancellation. The sqrt() makes things worse. A safer way to calculate - * acos() is to use atan2(sqrt((1 - x) * (1 + x)), x). */ - double ret = atan2(sqrt((1 - x) * (1 + x)), x); - if (x < -1.0 || x > 1.0 || !isfinite(x)) - return math_error(_DOMAIN, "acos", x, 0, ret); - return ret; + static const double pio2_hi = 1.57079632679489655800e+00, + pio2_lo = 6.12323399573676603587e-17; + + double z, w, s, c, df; + unsigned int hx, ix; + ULONGLONG llx; + + hx = *(ULONGLONG*)&x >> 32; + ix = hx & 0x7fffffff; + /* |x| >= 1 or nan */ + if (ix >= 0x3ff00000) { + unsigned int lx; + + lx = *(ULONGLONG*)&x; + if (((ix - 0x3ff00000) | lx) == 0) { + /* acos(1)=0, acos(-1)=pi */ + if (hx >> 31) + return 2 * pio2_hi + 7.5231638452626401e-37; + return 0; + } + if (isnan(x)) return x; + return math_error(_DOMAIN, "acos", x, 0, 0 / (x - x)); + } + /* |x| < 0.5 */ + if (ix < 0x3fe00000) { + if (ix <= 0x3c600000) /* |x| < 2**-57 */ + return pio2_hi + 7.5231638452626401e-37; + return pio2_hi - (x - (pio2_lo - x * acos_R(x * x))); + } + /* x < -0.5 */ + if (hx >> 31) { + z = (1.0 + x) * 0.5; + s = sqrt(z); + w = acos_R(z) * s - pio2_lo; + return 2 * (pio2_hi - (s + w)); + } + /* x > 0.5 */ + z = (1.0 - x) * 0.5; + s = sqrt(z); + df = s; + llx = (*(ULONGLONG*)&df >> 32) << 32; + df = *(double*)&llx; + c = (z - df * df) / (s + df); + w = acos_R(z) * s + c; + return 2 * (df + w); } /*********************************************************************

1 0

Nikolay Sivov : combase: Move FreePropVariantArray() and PropVariantClear().
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: 37a36bbf5eb9712bd6daf10b6792c55cb0d1d266 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37a36bbf5eb9712bd6daf10b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 5 08:54:59 2020 +0300 combase: Move FreePropVariantArray() and PropVariantClear(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/Makefile.in | 1 + dlls/combase/combase.c | 253 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/combase/combase.spec | 4 +- dlls/ole32/ole2.c | 151 --------------------------- dlls/ole32/ole32.spec | 4 +- 5 files changed, 258 insertions(+), 155 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=37a36bbf5eb9712bd6da…

1 0

Nikolay Sivov : combase: Move PropVariantCopy().
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: 881e89efa1114510ad2e51b41dcd239ded0995c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=881e89efa1114510ad2e51b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 5 08:55:00 2020 +0300 combase: Move PropVariantCopy(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 180 +++++++++++++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/ole2.c | 267 ---------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 182 insertions(+), 269 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=881e89efa1114510ad2e…

1 0

Gijs Vermeulen : amstream: Increase parent IAMMediaStream refcount in IDirectDrawMediaStream::CreateSample().
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: a51897566340904afdbd42b4d1f81ee278cb8cae URL: https://source.winehq.org/git/wine.git/?a=commit;h=a51897566340904afdbd42b4… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Aug 5 16:31:27 2020 +0200 amstream: Increase parent IAMMediaStream refcount in IDirectDrawMediaStream::CreateSample(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 3 +++ dlls/amstream/tests/amstream.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 917fcad9c9..0d3f2d0d4b 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -1048,6 +1048,8 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) --sample->parent->sample_refs; LeaveCriticalSection(&sample->parent->cs); + IAMMediaStream_Release(&sample->parent->IAMMediaStream_iface); + if (sample->surface) IDirectDrawSurface_Release(sample->surface); HeapFree(GetProcessHeap(), 0, sample); @@ -1163,6 +1165,7 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; object->ref = 1; object->parent = parent; + IAMMediaStream_AddRef(&parent->IAMMediaStream_iface); ++parent->sample_refs; if (surface) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 383ea7e936..910ab11f52 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5670,7 +5670,7 @@ static void test_ddrawstream_create_sample(void) EXPECT_REF(stream, 3); hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine EXPECT_REF(stream, 4); + EXPECT_REF(stream, 4); hr = IDirectDrawStreamSample_GetSurface(sample, NULL, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -5773,13 +5773,13 @@ static void test_ddrawstreamsample_get_media_stream(void) ok(hr == E_POINTER, "Got hr %#x.\n", hr); } - todo_wine EXPECT_REF(stream, 4); + EXPECT_REF(stream, 4); hr = IDirectDrawStreamSample_GetMediaStream(sample, &stream2); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(stream2 == stream, "Expected stream %p, got %p.\n", stream, stream2); - todo_wine EXPECT_REF(stream, 5); + EXPECT_REF(stream, 5); IMediaStream_Release(stream2); - todo_wine EXPECT_REF(stream, 4); + EXPECT_REF(stream, 4); IDirectDrawMediaStream_Release(ddraw_stream); ref = IDirectDrawStreamSample_Release(sample);

1 0

Alexandre Julliard : ntdll: Avoid importing RtlEnterCriticalSection/RtlLeaveCriticalSection from the Unix side.
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: 1d3e3a1c8d08c75e88734ec00b5a2b412e8d6ca3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d3e3a1c8d08c75e88734ec0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 5 15:28:23 2020 +0200 ntdll: Avoid importing RtlEnterCriticalSection/RtlLeaveCriticalSection from the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/sync.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index e7e13a6c7e..23dca9c61b 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2522,9 +2522,20 @@ NTSTATUS CDECL fast_RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variabl val = *futex; - RtlLeaveCriticalSection( cs ); - status = wait_cv( futex, val, timeout ); - RtlEnterCriticalSection( cs ); + if (cs->RecursionCount == 1) + { + /* FIXME: simplified version of RtlLeaveCriticalSection/RtlEnterCriticalSection to avoid imports */ + cs->RecursionCount = 0; + cs->OwningThread = 0; + if (InterlockedDecrement( &cs->LockCount ) >= 0) fast_RtlpUnWaitCriticalSection( cs ); + + status = wait_cv( futex, val, timeout ); + + if (InterlockedIncrement( &cs->LockCount )) fast_RtlpWaitForCriticalSection( cs, INT_MAX ); + cs->OwningThread = ULongToHandle( GetCurrentThreadId() ); + cs->RecursionCount = 1; + } + else status = wait_cv( futex, val, timeout ); return status; }

1 0

Vijay Kiran Kamuju : dbghelp: Add xmm and mxcsr register mapping functions for i386.
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: 7e965d60b542c0baa6f79605f45669a2ea9bceb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e965d60b542c0baa6f79605… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Aug 4 19:14:51 2020 +0200 dbghelp: Add xmm and mxcsr register mapping functions for i386. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_i386.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index fd808a0d32..864b7f7664 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -604,6 +604,16 @@ static void *i386_fetch_context_reg(union ctx *pctx, unsigned regno, unsigned *s case CV_REG_FS: *size = sizeof(ctx->SegFs); return &ctx->SegFs; case CV_REG_GS: *size = sizeof(ctx->SegGs); return &ctx->SegGs; + case CV_REG_XMM0 + 0: *size = 16; return &ctx->ExtendedRegisters[10*16]; + case CV_REG_XMM0 + 1: *size = 16; return &ctx->ExtendedRegisters[11*16]; + case CV_REG_XMM0 + 2: *size = 16; return &ctx->ExtendedRegisters[12*16]; + case CV_REG_XMM0 + 3: *size = 16; return &ctx->ExtendedRegisters[13*16]; + case CV_REG_XMM0 + 4: *size = 16; return &ctx->ExtendedRegisters[14*16]; + case CV_REG_XMM0 + 5: *size = 16; return &ctx->ExtendedRegisters[15*16]; + case CV_REG_XMM0 + 6: *size = 16; return &ctx->ExtendedRegisters[16*16]; + case CV_REG_XMM0 + 7: *size = 16; return &ctx->ExtendedRegisters[17*16]; + + case CV_REG_MXCSR: *size = sizeof(DWORD); return &ctx->ExtendedRegisters[24]; } FIXME("Unknown register %x\n", regno); return NULL;

1 0

Nikolay Sivov : combase: Move IMalloc/IMallocSpy functionality.
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: 28901a86e52829a4ed19ef10a17b3a84ec5b01db URL: https://source.winehq.org/git/wine.git/?a=commit;h=28901a86e52829a4ed19ef10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 5 08:54:57 2020 +0300 combase: Move IMalloc/IMallocSpy functionality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/Makefile.in | 1 + dlls/combase/combase.spec | 12 +- dlls/combase/malloc.c | 456 ++++++++++++++++++++++++++++++++++++++++ dlls/ole32/ifs.c | 515 ---------------------------------------------- dlls/ole32/ole32.spec | 12 +- 5 files changed, 469 insertions(+), 527 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=28901a86e52829a4ed19…

1 0

Piotr Caban : msvcrt: Return error on invalid character in mbstowcs.
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: 5983fcfec932d44f601ad3a520e1996f0fdf5d0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5983fcfec932d44f601ad3a5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 5 15:07:18 2020 +0200 msvcrt: Return error on invalid character in mbstowcs. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 15 +++++++++++---- dlls/msvcrt/tests/string.c | 5 +++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index a065b8b003..dc52cf1b8c 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2472,8 +2472,15 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, } /* Ignore count parameter */ - if(!wcstr) - return MultiByteToWideChar(locinfo->lc_codepage, 0, mbstr, -1, NULL, 0)-1; + if(!wcstr) { + size = MultiByteToWideChar(locinfo->lc_codepage, + MB_ERR_INVALID_CHARS, mbstr, -1, NULL, 0); + if(!size) { + *MSVCRT__errno() = MSVCRT_EILSEQ; + return -1; + } + return size - 1; + } for(i=0, size=0; i<count; i++) { if(mbstr[size] == '\0') @@ -2483,8 +2490,8 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, } if(size) { - size = MultiByteToWideChar(locinfo->lc_codepage, 0, - mbstr, size, wcstr, count); + size = MultiByteToWideChar(locinfo->lc_codepage, + MB_ERR_INVALID_CHARS, mbstr, size, wcstr, count); if(!size) { if(count) wcstr[0] = '\0'; *MSVCRT__errno() = MSVCRT_EILSEQ; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 3970f703f6..a4b1fb9d11 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2107,6 +2107,11 @@ static void test_mbstowcs(void) ok(ret == 0, "mbstowcs did not return 0, got %d\n", (int)ret); ok(!memcmp(wOut, wEmpty, sizeof(wEmpty)), "wOut = %s\n", wine_dbgstr_w(wOut)); + errno = 0xdeadbeef; + ret = mbstowcs(wOut, mHiragana+1, 5); + ok(ret == -1, "mbstowcs did not return -1\n"); + ok(errno == EILSEQ, "errno = %d\n", errno); + ret = wcstombs(mOut, wHiragana, 6); ok(ret == 4, "wcstombs did not return 4\n"); ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut);

1 0

Nikolay Sivov : ole32: Move IsValidInterface() to another file.
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: eb316eda1dceab1d4c1a1335353da79e0c346c26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb316eda1dceab1d4c1a1335… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 5 08:54:58 2020 +0300 ole32: Move IsValidInterface() to another file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/Makefile.in | 1 - dlls/ole32/ifs.c | 54 ------------------------------------------------- dlls/ole32/ole32_main.c | 19 +++++++++++++++++ 3 files changed, 19 insertions(+), 55 deletions(-) diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 4738407d7f..86f13e188c 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -23,7 +23,6 @@ C_SRCS = \ ftmarshal.c \ git.c \ hglobalstream.c \ - ifs.c \ itemmoniker.c \ marshal.c \ memlockbytes.c \ diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c deleted file mode 100644 index 845bdeea4a..0000000000 --- a/dlls/ole32/ifs.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * basic interfaces - * - * Copyright 1997 Marcus Meissner - * - * 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 <ctype.h> -#include <stdarg.h> -#include <stdlib.h> -#include <string.h> -#include <assert.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "winerror.h" - -/****************************************************************************** - * IsValidInterface [OLE32.@] - * - * Determines whether a pointer is a valid interface. - * - * PARAMS - * punk [I] Interface to be tested. - * - * RETURNS - * TRUE, if the passed pointer is a valid interface, or FALSE otherwise. - */ -BOOL WINAPI IsValidInterface(LPUNKNOWN punk) -{ - return !( - IsBadReadPtr(punk,4) || - IsBadReadPtr(punk->lpVtbl,4) || - IsBadReadPtr(punk->lpVtbl->QueryInterface,9) || - IsBadCodePtr((FARPROC)punk->lpVtbl->QueryInterface) - ); -} diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c index c38c525d5a..414fdf2b36 100644 --- a/dlls/ole32/ole32_main.c +++ b/dlls/ole32/ole32_main.c @@ -175,3 +175,22 @@ HRESULT WINAPI CoGetCallState(int unknown, PULONG unknown2) FIXME("%d, %p\n", unknown, unknown2); return E_NOTIMPL; } + +/****************************************************************************** + * IsValidInterface [OLE32.@] + * + * Determines whether a pointer is a valid interface. + * + * PARAMS + * punk [I] Interface to be tested. + * + * RETURNS + * TRUE, if the passed pointer is a valid interface, or FALSE otherwise. + */ +BOOL WINAPI IsValidInterface(LPUNKNOWN punk) +{ + return !(IsBadReadPtr(punk,4) || + IsBadReadPtr(punk->lpVtbl,4) || + IsBadReadPtr(punk->lpVtbl->QueryInterface,9) || + IsBadCodePtr((FARPROC)punk->lpVtbl->QueryInterface)); +}

1 0