wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Nikolay Sivov : evr/presenter: Notify renderer host about mixer latency.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 38d75c4294399dc7465c7c5f86c6c578962e1cdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=38d75c4294399dc7465c7c5f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 13:07:20 2020 +0300 evr/presenter: Notify renderer host about mixer latency. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 8be3dd91aa7..5bffa9af228 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -131,6 +131,13 @@ static struct video_presenter *impl_from_IMFVideoPositionMapper(IMFVideoPosition return CONTAINING_RECORD(iface, struct video_presenter, IMFVideoPositionMapper_iface); } +static void video_presenter_notify_renderer(struct video_presenter *presenter, + LONG event, LONG_PTR param1, LONG_PTR param2) +{ + if (presenter->event_sink) + IMediaEventSink_Notify(presenter->event_sink, event, param1, param2); +} + static unsigned int get_gcd(unsigned int a, unsigned int b) { unsigned int m; @@ -329,6 +336,9 @@ static HRESULT video_presenter_process_input(struct video_presenter *presenter) while (hr == S_OK) { + LONGLONG mixing_started, mixing_finished; + MFTIME systime; + if (!(presenter->flags & PRESENTER_MIXER_HAS_INPUT)) break; @@ -341,6 +351,9 @@ static HRESULT video_presenter_process_input(struct video_presenter *presenter) memset(&buffer, 0, sizeof(buffer)); buffer.pSample = sample; + if (presenter->clock) + IMFClock_GetCorrelatedTime(presenter->clock, 0, &mixing_started, &systime); + if (FAILED(hr = IMFTransform_ProcessOutput(presenter->mixer, 0, 1, &buffer, &status))) { /* FIXME: failure path probably needs to handle some errors specifically */ @@ -350,6 +363,15 @@ static HRESULT video_presenter_process_input(struct video_presenter *presenter) } else { + if (presenter->clock) + { + LONGLONG latency; + + IMFClock_GetCorrelatedTime(presenter->clock, 0, &mixing_finished, &systime); + latency = mixing_finished - mixing_started; + video_presenter_notify_renderer(presenter, EC_PROCESSING_LATENCY, (LONG_PTR)&latency, 0); + } + if (buffer.pEvents) IMFCollection_Release(buffer.pEvents);

1 0

Nikolay Sivov : evr/presenter: Add a helpe for input processing.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: e4ec280ec7d56875d2097c8094608dbf7bdcb697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4ec280ec7d56875d2097c80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 13:07:19 2020 +0300 evr/presenter: Add a helpe for input processing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 2102882e084..8be3dd91aa7 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -40,6 +40,11 @@ enum presenter_state PRESENTER_STATE_PAUSED, }; +enum presenter_flags +{ + PRESENTER_MIXER_HAS_INPUT = 0x1, +}; + enum streaming_thread_message { EVRM_STOP = WM_USER, @@ -82,6 +87,7 @@ struct video_presenter SIZE native_ratio; unsigned int ar_mode; unsigned int state; + unsigned int flags; CRITICAL_SECTION cs; }; @@ -311,6 +317,50 @@ static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) return S_OK; } +static HRESULT video_presenter_process_input(struct video_presenter *presenter) +{ + MFT_OUTPUT_DATA_BUFFER buffer; + HRESULT hr = S_OK; + IMFSample *sample; + DWORD status; + + if (!presenter->media_type) + return S_OK; + + while (hr == S_OK) + { + if (!(presenter->flags & PRESENTER_MIXER_HAS_INPUT)) + break; + + if (FAILED(hr = IMFVideoSampleAllocator_AllocateSample(presenter->allocator, &sample))) + { + WARN("Failed to allocate a sample, hr %#x.\n", hr); + break; + } + + memset(&buffer, 0, sizeof(buffer)); + buffer.pSample = sample; + + if (FAILED(hr = IMFTransform_ProcessOutput(presenter->mixer, 0, 1, &buffer, &status))) + { + /* FIXME: failure path probably needs to handle some errors specifically */ + presenter->flags &= ~PRESENTER_MIXER_HAS_INPUT; + IMFSample_Release(sample); + break; + } + else + { + if (buffer.pEvents) + IMFCollection_Release(buffer.pEvents); + + /* FIXME: for now drop output sample back to the pool */ + IMFSample_Release(sample); + } + } + + return S_OK; +} + static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { struct video_presenter *presenter = impl_from_IUnknown(iface); @@ -511,6 +561,10 @@ static HRESULT WINAPI video_presenter_ProcessMessage(IMFVideoPresenter *iface, M case MFVP_MESSAGE_ENDSTREAMING: hr = video_presenter_end_streaming(presenter); break; + case MFVP_MESSAGE_PROCESSINPUTNOTIFY: + presenter->flags |= PRESENTER_MIXER_HAS_INPUT; + hr = video_presenter_process_input(presenter); + break; default: FIXME("Unsupported message %u.\n", message); hr = E_NOTIMPL;

1 0

Nikolay Sivov : evr/presenter: Create sample allocator on object creation.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 603b00fe55139115c6ba4c302bae0d0c6f3150e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=603b00fe55139115c6ba4c30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 13:07:18 2020 +0300 evr/presenter: Create sample allocator on object creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 335e5df2459..2102882e084 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -70,6 +70,7 @@ struct video_presenter IMediaEventSink *event_sink; IDirect3DDeviceManager9 *device_manager; + IMFVideoSampleAllocator *allocator; struct streaming_thread thread; IMFMediaType *media_type; UINT reset_token; @@ -175,12 +176,13 @@ static void video_presenter_reset_media_type(struct video_presenter *presenter) IMFMediaType_Release(presenter->media_type); presenter->media_type = NULL; - /* FIXME: release samples pool */ + IMFVideoSampleAllocator_UninitializeSampleAllocator(presenter->allocator); } static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, IMFMediaType *media_type) { unsigned int flags; + HRESULT hr; if (!media_type) { @@ -193,12 +195,15 @@ static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, video_presenter_reset_media_type(presenter); - /* FIXME: allocate samples pool */ - - presenter->media_type = media_type; - IMFMediaType_AddRef(presenter->media_type); + if (SUCCEEDED(hr = IMFVideoSampleAllocator_InitializeSampleAllocator(presenter->allocator, 3, media_type))) + { + presenter->media_type = media_type; + IMFMediaType_AddRef(presenter->media_type); + } + else + WARN("Failed to initialize sample allocator, hr %#x.\n", hr); - return S_OK; + return hr; } static HRESULT video_presenter_invalidate_media_type(struct video_presenter *presenter) @@ -220,7 +225,9 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre if (SUCCEEDED(hr)) hr = video_presenter_set_media_type(presenter, media_type); - hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, 0); + if (SUCCEEDED(hr)) + hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, 0); + IMFMediaType_Release(media_type); if (SUCCEEDED(hr)) @@ -388,9 +395,12 @@ static ULONG WINAPI video_presenter_inner_Release(IUnknown *iface) { video_presenter_end_streaming(presenter); video_presenter_clear_container(presenter); + video_presenter_reset_media_type(presenter); DeleteCriticalSection(&presenter->cs); if (presenter->device_manager) IDirect3DDeviceManager9_Release(presenter->device_manager); + if (presenter->allocator) + IMFVideoSampleAllocator_Release(presenter->allocator); heap_free(presenter); } @@ -1179,6 +1189,11 @@ static HRESULT video_presenter_init_d3d(struct video_presenter *presenter) if (FAILED(hr)) WARN("Failed to set new device for the manager, hr %#x.\n", hr); + if (SUCCEEDED(hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&presenter->allocator))) + { + hr = IMFVideoSampleAllocator_SetDirectXManager(presenter->allocator, (IUnknown *)presenter->device_manager); + } + return hr; }

1 0

Alexandre Julliard : mscms: Build with msvcrt.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 11fb2a59181c42478075a9576cf37450c277c625 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11fb2a59181c42478075a957… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 12:47:53 2020 +0100 mscms: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/Makefile.in | 2 ++ dlls/mscms/handle.c | 4 +--- dlls/mscms/icc.c | 2 -- dlls/mscms/mscms_main.c | 6 +----- dlls/mscms/profile.c | 39 +++++++++++++-------------------------- dlls/mscms/stub.c | 4 +--- dlls/mscms/transform.c | 4 +--- 7 files changed, 19 insertions(+), 42 deletions(-) diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in index 495f9af98d5..4c976247ebf 100644 --- a/dlls/mscms/Makefile.in +++ b/dlls/mscms/Makefile.in @@ -4,6 +4,8 @@ IMPORTS = shlwapi advapi32 EXTRAINCL = $(LCMS2_CFLAGS) EXTRALIBS = $(LCMS2_LIBS) +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ handle.c \ icc.c \ diff --git a/dlls/mscms/handle.c b/dlls/mscms/handle.c index ee59ad3b5bd..4e532a6fca3 100644 --- a/dlls/mscms/handle.c +++ b/dlls/mscms/handle.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" - #include <stdarg.h> #include "windef.h" @@ -28,6 +25,7 @@ #include "wingdi.h" #include "winuser.h" #include "icm.h" +#include "wine/debug.h" #include "mscms_priv.h" diff --git a/dlls/mscms/icc.c b/dlls/mscms/icc.c index 2033374d30c..2765888709c 100644 --- a/dlls/mscms/icc.c +++ b/dlls/mscms/icc.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/mscms/mscms_main.c b/dlls/mscms/mscms_main.c index 2ea0255c4a1..516dd82540c 100644 --- a/dlls/mscms/mscms_main.c +++ b/dlls/mscms/mscms_main.c @@ -18,11 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include "wine/port.h" -#include "wine/debug.h" - #include <stdarg.h> #include "windef.h" @@ -31,6 +26,7 @@ #include "winuser.h" #include "winternl.h" #include "icm.h" +#include "wine/debug.h" #include "mscms_priv.h" diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 0e5af035d87..bc7f200006b 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -18,10 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" -#include "wine/unicode.h" - #include <stdarg.h> #include "windef.h" @@ -32,6 +28,7 @@ #include "winreg.h" #include "shlwapi.h" #include "icm.h" +#include "wine/debug.h" #include "mscms_priv.h" @@ -104,12 +101,6 @@ BOOL WINAPI AssociateColorProfileWithDeviceA( PCSTR machine, PCSTR profile, PCST static BOOL set_profile_device_key( PCWSTR file, const BYTE *value, DWORD size ) { - static const WCHAR fmtW[] = {'%','c','%','c','%','c','%','c',0}; - static const WCHAR icmW[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','C','M',0}; PROFILEHEADER header; PROFILE profile; HPROFILE handle; @@ -132,11 +123,13 @@ static BOOL set_profile_device_key( PCWSTR file, const BYTE *value, DWORD size ) SetLastError( ERROR_INVALID_PROFILE ); return FALSE; } - RegCreateKeyExW( HKEY_LOCAL_MACHINE, icmW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &icm_key, NULL ); + RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\ICM", + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &icm_key, NULL ); basename( file, basenameW ); - sprintfW( classW, fmtW, (header.phClass >> 24) & 0xff, (header.phClass >> 16) & 0xff, - (header.phClass >> 8) & 0xff, header.phClass & 0xff ); + swprintf( classW, ARRAY_SIZE(classW), L"%c%c%c%c", + (header.phClass >> 24) & 0xff, (header.phClass >> 16) & 0xff, + (header.phClass >> 8) & 0xff, header.phClass & 0xff ); RegCreateKeyExW( icm_key, classW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &class_key, NULL ); if (value) RegSetValueExW( class_key, basenameW, 0, REG_BINARY, value, size ); @@ -287,8 +280,6 @@ BOOL WINAPI GetColorDirectoryA( PCSTR machine, PSTR buffer, PDWORD size ) BOOL WINAPI GetColorDirectoryW( PCWSTR machine, PWSTR buffer, PDWORD size ) { WCHAR colordir[MAX_PATH]; - static const WCHAR colorsubdir[] = - {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\','c','o','l','o','r',0}; DWORD len; TRACE( "( %p, %p )\n", buffer, size ); @@ -296,7 +287,7 @@ BOOL WINAPI GetColorDirectoryW( PCWSTR machine, PWSTR buffer, PDWORD size ) if (machine || !size) return FALSE; GetSystemDirectoryW( colordir, ARRAY_SIZE( colordir )); - lstrcatW( colordir, colorsubdir ); + lstrcatW( colordir, L"\\spool\\drivers\\color" ); len = lstrlenW( colordir ) * sizeof(WCHAR); @@ -573,9 +564,6 @@ BOOL WINAPI GetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile */ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profile, PDWORD size ) { - static const WCHAR rgbprofilefile[] = - { '\\','s','r','g','b',' ','c','o','l','o','r',' ', - 's','p','a','c','e',' ','p','r','o','f','i','l','e','.','i','c','m',0 }; WCHAR rgbprofile[MAX_PATH]; DWORD len = sizeof(rgbprofile); @@ -605,7 +593,7 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi { case LCS_sRGB: case LCS_WINDOWS_COLOR_SPACE: /* FIXME */ - lstrcatW( rgbprofile, rgbprofilefile ); + lstrcatW( rgbprofile, L"\\srgb color space profile.icm" ); len = lstrlenW( rgbprofile ) * sizeof(WCHAR); if (*size < len) @@ -917,7 +905,6 @@ exit: BOOL WINAPI EnumColorProfilesW( PCWSTR machine, PENUMTYPEW record, PBYTE buffer, PDWORD size, PDWORD number ) { - static const WCHAR spec[] = {'\\','*','i','c','m',0}; BOOL match, ret = FALSE; WCHAR colordir[MAX_PATH], glob[MAX_PATH], **profiles = NULL; DWORD i, len = sizeof(colordir), count = 0, totalsize = 0; @@ -932,14 +919,14 @@ BOOL WINAPI EnumColorProfilesW( PCWSTR machine, PENUMTYPEW record, PBYTE buffer, record->dwVersion != ENUM_TYPE_VERSION) return FALSE; ret = GetColorDirectoryW( machine, colordir, &len ); - if (!ret || len + sizeof(spec) > MAX_PATH) + if (!ret || len + ARRAY_SIZE(L"\\*icm") > MAX_PATH) { WARN( "Can't retrieve color directory\n" ); return FALSE; } lstrcpyW( glob, colordir ); - lstrcatW( glob, spec ); + lstrcatW( glob, L"\\*icm" ); find = FindFirstFileW( glob, &data ); if (find == INVALID_HANDLE_VALUE) return FALSE; @@ -1085,7 +1072,7 @@ BOOL WINAPI InstallColorProfileW( PCWSTR machine, PCWSTR profile ) lstrcatW( dest, base ); /* Is source equal to destination? */ - if (!lstrcmpW( profile, dest )) return TRUE; + if (!wcscmp( profile, dest )) return TRUE; return CopyFileW( profile, dest, TRUE ); } @@ -1385,11 +1372,11 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing if (!GetColorDirectoryW( NULL, NULL, &size ) && GetLastError() == ERROR_MORE_DATA) { - size += (strlenW( profile->pProfileData ) + 2) * sizeof(WCHAR); + size += (lstrlenW( profile->pProfileData ) + 2) * sizeof(WCHAR); if (!(path = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; GetColorDirectoryW( NULL, path, &size ); PathAddBackslashW( path ); - strcatW( path, profile->pProfileData ); + lstrcatW( path, profile->pProfileData ); } else return NULL; handle = CreateFileW( path, flags, sharing, NULL, creation, 0, NULL ); diff --git a/dlls/mscms/stub.c b/dlls/mscms/stub.c index 4cd6863f219..28c08e20868 100644 --- a/dlls/mscms/stub.c +++ b/dlls/mscms/stub.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" - #include <stdarg.h> #include "windef.h" @@ -28,6 +25,7 @@ #include "wingdi.h" #include "winuser.h" #include "icm.h" +#include "wine/debug.h" #include "mscms_priv.h" diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 29d977e58f6..fc005062e38 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" - #include <stdarg.h> #include "windef.h" @@ -29,6 +26,7 @@ #include "wingdi.h" #include "winuser.h" #include "icm.h" +#include "wine/debug.h" #include "mscms_priv.h"

1 0

Alexandre Julliard : mscms: Move liblcms support to a new Unix library.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: daf9f128507980bb87506be43ebad36941af6218 URL: https://source.winehq.org/git/wine.git/?a=commit;h=daf9f128507980bb87506be4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 12:46:37 2020 +0100 mscms: Move liblcms support to a new Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/Makefile.in | 1 + dlls/mscms/handle.c | 9 +- dlls/mscms/icc.c | 4 - dlls/mscms/liblcms.c | 226 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mscms/mscms_main.c | 17 +--- dlls/mscms/mscms_priv.h | 22 +++-- dlls/mscms/profile.c | 88 +++++-------------- dlls/mscms/transform.c | 221 ++++------------------------------------------ 8 files changed, 287 insertions(+), 301 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=daf9f128507980bb8750…

1 0

Alexandre Julliard : mscms: Implement profile tag functions without relying on liblcms2.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 881dad65035b5453184c9421dbb9685179a8366e URL: https://source.winehq.org/git/wine.git/?a=commit;h=881dad65035b5453184c9421… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 12:40:09 2020 +0100 mscms: Implement profile tag functions without relying on liblcms2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/icc.c | 75 ++++++++++++++++++++++++++++++++++++++++--------- dlls/mscms/mscms_priv.h | 12 +++++++- dlls/mscms/profile.c | 33 ++++------------------ 3 files changed, 79 insertions(+), 41 deletions(-) diff --git a/dlls/mscms/icc.c b/dlls/mscms/icc.c index 3b1c718b174..0476d805547 100644 --- a/dlls/mscms/icc.c +++ b/dlls/mscms/icc.c @@ -40,6 +40,11 @@ static inline void adjust_endianness32( ULONG *ptr ) #endif } +static const struct tag_entry *first_tag( const struct profile *profile ) +{ + return (const struct tag_entry *)(profile->data + sizeof(PROFILEHEADER) + sizeof(DWORD)); +} + void get_profile_header( const struct profile *profile, PROFILEHEADER *header ) { unsigned int i; @@ -62,34 +67,77 @@ void set_profile_header( const struct profile *profile, const PROFILEHEADER *hea adjust_endianness32( (ULONG *)profile->data + i ); } -static BOOL get_adjusted_tag( const struct profile *profile, TAGTYPE type, cmsTagEntry *tag ) +DWORD get_tag_count( const struct profile *profile ) { - DWORD i, num_tags = *(DWORD *)(profile->data + sizeof(cmsICCHeader)); - cmsTagEntry *entry; - ULONG sig; - + DWORD num_tags = *(DWORD *)(profile->data + sizeof(PROFILEHEADER)); adjust_endianness32( &num_tags ); - for (i = 0; i < num_tags; i++) + if ((const BYTE *)(first_tag( profile ) + num_tags) > (const BYTE *)profile->data + profile->size) + return 0; + return num_tags; +} + +BOOL get_tag_entry( const struct profile *profile, DWORD index, struct tag_entry *tag ) +{ + const struct tag_entry *entry = first_tag( profile ); + + if (index < 1 || index > get_tag_count( profile )) return FALSE; + *tag = entry[index - 1]; + adjust_endianness32( &tag->sig ); + adjust_endianness32( &tag->offset ); + adjust_endianness32( &tag->size ); + if (tag->offset > profile->size || tag->size > profile->size - tag->offset) return FALSE; + return TRUE; +} + +BOOL get_adjusted_tag( const struct profile *profile, TAGTYPE type, struct tag_entry *tag ) +{ + const struct tag_entry *entry = first_tag( profile ); + DWORD sig, i; + + for (i = get_tag_count(profile); i > 0; i--, entry++) { - entry = (cmsTagEntry *)(profile->data + sizeof(cmsICCHeader) + sizeof(DWORD) + i * sizeof(*tag)); sig = entry->sig; adjust_endianness32( &sig ); if (sig == type) { - tag->sig = sig; - tag->offset = entry->offset; - tag->size = entry->size; + *tag = *entry; + adjust_endianness32( &tag->sig ); adjust_endianness32( &tag->offset ); adjust_endianness32( &tag->size ); + if (tag->offset > profile->size || tag->size > profile->size - tag->offset) return FALSE; + return TRUE; + } + } + return FALSE; +} + +static BOOL get_linked_tag( const struct profile *profile, struct tag_entry *ret ) +{ + const struct tag_entry *entry = first_tag( profile ); + DWORD sig, offset, size, i; + + for (i = get_tag_count(profile); i > 0; i--, entry++) + { + sig = entry->sig; + adjust_endianness32( &sig ); + if (sig == ret->sig) continue; + offset = entry->offset; + size = entry->size; + adjust_endianness32( &offset ); + adjust_endianness32( &size ); + if (size == ret->size && offset == ret->offset) + { + ret->sig = sig; return TRUE; } } return FALSE; } -BOOL get_tag_data( const struct profile *profile, TAGTYPE type, DWORD offset, void *buffer, DWORD *len ) +BOOL get_tag_data( const struct profile *profile, TAGTYPE type, DWORD offset, void *buffer, + DWORD *len, BOOL *linked ) { - cmsTagEntry tag; + struct tag_entry tag; if (!get_adjusted_tag( profile, type, &tag )) return FALSE; @@ -102,12 +150,13 @@ BOOL get_tag_data( const struct profile *profile, TAGTYPE type, DWORD offset, vo } memcpy( buffer, profile->data + tag.offset + offset, tag.size - offset ); *len = tag.size - offset; + if (linked) *linked = get_linked_tag( profile, &tag ); return TRUE; } BOOL set_tag_data( const struct profile *profile, TAGTYPE type, DWORD offset, const void *buffer, DWORD *len ) { - cmsTagEntry tag; + struct tag_entry tag; if (!get_adjusted_tag( profile, type, &tag )) return FALSE; diff --git a/dlls/mscms/mscms_priv.h b/dlls/mscms/mscms_priv.h index ffa2cb4b4c9..f085c5bfbd6 100644 --- a/dlls/mscms/mscms_priv.h +++ b/dlls/mscms/mscms_priv.h @@ -56,7 +56,17 @@ void release_transform( struct transform * ) DECLSPEC_HIDDEN; extern void free_handle_tables( void ) DECLSPEC_HIDDEN; -extern BOOL get_tag_data( const struct profile *, TAGTYPE, DWORD, void *, DWORD * ) DECLSPEC_HIDDEN; +struct tag_entry +{ + DWORD sig; + DWORD offset; + DWORD size; +}; + +extern DWORD get_tag_count( const struct profile * ) DECLSPEC_HIDDEN; +extern BOOL get_tag_entry( const struct profile *, DWORD, struct tag_entry * ) DECLSPEC_HIDDEN; +extern BOOL get_adjusted_tag( const struct profile *, TAGTYPE, struct tag_entry * ) DECLSPEC_HIDDEN; +extern BOOL get_tag_data( const struct profile *, TAGTYPE, DWORD, void *, DWORD *, BOOL * ) DECLSPEC_HIDDEN; extern BOOL set_tag_data( const struct profile *, TAGTYPE, DWORD, const void *, DWORD * ) DECLSPEC_HIDDEN; extern void get_profile_header( const struct profile *, PROFILEHEADER * ) DECLSPEC_HIDDEN; extern void set_profile_header( const struct profile *, const PROFILEHEADER * ) DECLSPEC_HIDDEN; diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index ed0ed53158a..0f31ae91155 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -347,13 +347,7 @@ BOOL WINAPI GetColorProfileElement( HPROFILE handle, TAGTYPE type, DWORD offset, release_profile( profile ); return FALSE; } - if (!get_tag_data( profile, type, offset, buffer, size )) - { - release_profile( profile ); - return FALSE; - } - ret = get_tag_data( profile, type, offset, buffer, size ); - *ref = cmsTagLinkedTo( profile->cmsprofile, type ) != 0; + ret = get_tag_data( profile, type, offset, buffer, size, ref ); release_profile( profile ); #endif /* HAVE_LCMS2 */ return ret; @@ -382,8 +376,7 @@ BOOL WINAPI GetColorProfileElementTag( HPROFILE handle, DWORD index, PTAGTYPE ty BOOL ret = FALSE; #ifdef HAVE_LCMS2 struct profile *profile = grab_profile( handle ); - cmsInt32Number num_tags; - cmsTagSignature sig; + struct tag_entry tag; TRACE( "( %p, %d, %p )\n", handle, index, type ); @@ -394,17 +387,7 @@ BOOL WINAPI GetColorProfileElementTag( HPROFILE handle, DWORD index, PTAGTYPE ty release_profile( profile ); return FALSE; } - num_tags = cmsGetTagCount( profile->cmsprofile ); - if (num_tags < 0 || index > num_tags || index < 1) - { - release_profile( profile ); - return FALSE; - } - if ((sig = cmsGetTagSignature( profile->cmsprofile, index - 1 ))) - { - *type = sig; - ret = TRUE; - } + if ((ret = get_tag_entry( profile, index, &tag ))) *type = tag.sig; release_profile( profile ); #endif /* HAVE_LCMS2 */ @@ -523,7 +506,6 @@ BOOL WINAPI GetCountColorProfileElements( HPROFILE handle, PDWORD count ) BOOL ret = FALSE; #ifdef HAVE_LCMS2 struct profile *profile = grab_profile( handle ); - cmsInt32Number num_tags; TRACE( "( %p, %p )\n", handle, count ); @@ -534,11 +516,7 @@ BOOL WINAPI GetCountColorProfileElements( HPROFILE handle, PDWORD count ) release_profile( profile ); return FALSE; } - if ((num_tags = cmsGetTagCount( profile->cmsprofile )) >= 0) - { - *count = num_tags; - ret = TRUE; - } + *count = get_tag_count( profile ); release_profile( profile ); #endif /* HAVE_LCMS2 */ @@ -1151,6 +1129,7 @@ BOOL WINAPI IsColorProfileTagPresent( HPROFILE handle, TAGTYPE type, PBOOL prese BOOL ret = FALSE; #ifdef HAVE_LCMS2 struct profile *profile = grab_profile( handle ); + struct tag_entry tag; TRACE( "( %p, 0x%08x, %p )\n", handle, type, present ); @@ -1161,7 +1140,7 @@ BOOL WINAPI IsColorProfileTagPresent( HPROFILE handle, TAGTYPE type, PBOOL prese release_profile( profile ); return FALSE; } - *present = (cmsIsTag( profile->cmsprofile, type ) != 0); + *present = get_adjusted_tag( profile, type, &tag ); release_profile( profile ); ret = TRUE;

1 0

Francois Gouget : gdi32/tests: Avoid a D3DKMTOpenAdapterFromHdc() crash on Windows 10 >= 2004.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: dd51cd8d00b3b2cebca1353a85a3c7d3f332ade9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd51cd8d00b3b2cebca1353a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 9 17:59:45 2020 +0100 gdi32/tests: Avoid a D3DKMTOpenAdapterFromHdc() crash on Windows 10 >= 2004. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 8276c1c4bee..2110765835f 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -105,18 +105,23 @@ static void test_D3DKMTOpenAdapterFromHdc(void) HDC hdc; DWORD i; - if (!pD3DKMTOpenAdapterFromHdc || pD3DKMTOpenAdapterFromHdc(NULL) == STATUS_PROCEDURE_NOT_FOUND) + if (!pD3DKMTOpenAdapterFromHdc) { - win_skip("D3DKMTOpenAdapterFromHdc() is unavailable.\n"); + win_skip("D3DKMTOpenAdapterFromHdc() is missing.\n"); return; } /* Invalid parameters */ - status = pD3DKMTOpenAdapterFromHdc(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + /* Passing a NULL pointer crashes on Windows 10 >= 2004 */ + if (0) status = pD3DKMTOpenAdapterFromHdc(NULL); memset(&open_adapter_hdc_desc, 0, sizeof(open_adapter_hdc_desc)); status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); + if (status == STATUS_PROCEDURE_NOT_FOUND) + { + win_skip("D3DKMTOpenAdapterFromHdc() is not supported.\n"); + return; + } todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); /* Open adapter */

1 0

Alistair Leslie-Hughes : include: Add IConvertType interface.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 34155d099835d49941793e3364be975a4a41a486 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34155d099835d49941793e33… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 10 20:29:58 2020 +1100 include: Add IConvertType interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 13 +++++++++++++ include/Makefile.in | 1 + include/cvttyp.idl | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 4 files changed, 65 insertions(+) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 9eb14147690..fa086290061 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1616,3 +1616,16 @@ HRESULT __RPC_STUB ICommandProperties_SetProperties_Stub(ICommandProperties* Thi FIXME("(%p)->(%d %p %d %p %p): stub\n", This, count, propertyset, total, propstatus, error); return E_NOTIMPL; } + +HRESULT CALLBACK IConvertType_CanConvert_Proxy(IConvertType* This, DBTYPE from, DBTYPE to, DBCONVERTFLAGS flags) +{ + FIXME("(%p)->(%d %d 0x%08x): stub\n", This, from, to, flags); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IConvertType_CanConvert_Stub(IConvertType* This, DBTYPE from, DBTYPE to, + DBCONVERTFLAGS flags, IErrorInfo **error) +{ + FIXME("(%p)->(%d %d 0x%08x %p): stub\n", This, from, to, flags, error); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index c9c8ebe8bb5..3ccacdaeecf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -91,6 +91,7 @@ SOURCES = \ ctxtcall.idl \ custcntl.h \ cvconst.h \ + cvttyp.idl \ d2d1.idl \ d2d1_1.idl \ d2d1_2.idl \ diff --git a/include/cvttyp.idl b/include/cvttyp.idl new file mode 100644 index 00000000000..87bc385a5ba --- /dev/null +++ b/include/cvttyp.idl @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * 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 + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a88-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IConvertType : IUnknown +{ + typedef DWORD DBCONVERTFLAGS; + + enum DBCONVERTFLAGSENUM + { + DBCONVERTFLAGS_COLUMN = 0x000, + DBCONVERTFLAGS_PARAMETER = 0x001, + }; + + enum DBCONVERTFLAGSENUM20 + { + DBCONVERTFLAGS_ISLONG = 0x002, + DBCONVERTFLAGS_ISFIXEDLENGTH = 0x004, + DBCONVERTFLAGS_FROMVARIANT = 0x008, + }; + + [local] + HRESULT CanConvert([in] DBTYPE from, [in] DBTYPE to, [in] DBCONVERTFLAGS flags); + + [call_as(CanConvert)] + HRESULT RemoteCanConvert([in] DBTYPE from, [in] DBTYPE to, [in] DBCONVERTFLAGS flags, [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 4370c7f6bcc..c56460262f5 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -72,6 +72,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "getdts.idl" #include "cmdstrm.idl" #include "cmdprp.idl" +#include "cvttyp.idl" cpp_quote("#include <accctrl.h>")

1 0

Alistair Leslie-Hughes : include: Add ICommandProperties interface.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: e9d6612a0157eae10682b7a5346eb325ca55308b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9d6612a0157eae10682b7a5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 10 20:29:57 2020 +1100 include: Add ICommandProperties interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 27 +++++++++++++++++++++++++++ include/Makefile.in | 1 + include/cmdprp.idl | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 4 files changed, 73 insertions(+) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 2fe4e60b68b..9eb14147690 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1589,3 +1589,30 @@ HRESULT __RPC_STUB IGetDataSource_GetDataSource_Stub(IGetDataSource* This, REFII FIXME("(%p)->(%s %p %p): stub\n", This, debugstr_guid(riid), datasource, error); return E_NOTIMPL; } + +HRESULT CALLBACK ICommandProperties_GetProperties_Proxy(ICommandProperties* This, const ULONG count, + const DBPROPIDSET propertyidsets[], ULONG *sets_cnt, DBPROPSET **propertyset) +{ + FIXME("(%p)->(%d %p %p %p): stub\n", This, count, propertyidsets, sets_cnt, propertyset); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandProperties_GetProperties_Stub(ICommandProperties* This, const ULONG count, + const DBPROPIDSET *propertyidsets, ULONG *sets_cnt, DBPROPSET **propertyset, IErrorInfo **error) +{ + FIXME("(%p)->(%d %p %p %p %p): stub\n", This, count, propertyidsets, sets_cnt, propertyset, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ICommandProperties_SetProperties_Proxy(ICommandProperties* This, ULONG count, DBPROPSET propertyset[]) +{ + FIXME("(%p)->(%d %p): stub\n", This, count, propertyset); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandProperties_SetProperties_Stub(ICommandProperties* This, ULONG count, + DBPROPSET *propertyset, ULONG total, DBPROPSTATUS *propstatus, IErrorInfo **error) +{ + FIXME("(%p)->(%d %p %d %p %p): stub\n", This, count, propertyset, total, propstatus, error); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 1db3765f68b..c9c8ebe8bb5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -63,6 +63,7 @@ SOURCES = \ cierror.h \ clusapi.h \ cmdbas.idl \ + cmdprp.idl \ cmdstrm.idl \ cmdtxt.idl \ cmnquery.idl \ diff --git a/include/cmdprp.idl b/include/cmdprp.idl new file mode 100644 index 00000000000..ce9e7075523 --- /dev/null +++ b/include/cmdprp.idl @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * 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 + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a79-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ICommandProperties : IUnknown +{ + [local] + HRESULT GetProperties([in] ULONG count, [in, size_is(count)] const DBPROPIDSET propertyidsets[], + [in, out] ULONG *sets_cnt, [out, size_is(,*sets_cnt)] DBPROPSET **propertyset); + + [call_as(GetProperties)] + HRESULT RemoteGetProperties([in] ULONG count, [in, unique, size_is(count)] const DBPROPIDSET *propertyidsets, + [in, out] ULONG *sets_cnt, [out, size_is(,*sets_cnt)] DBPROPSET **propertyset, [out] IErrorInfo **error); + + [local] + HRESULT SetProperties([in] ULONG count, [in, out, unique, size_is(count)] DBPROPSET propertyset[]); + + [call_as(SetProperties)] + HRESULT RemoteSetProperties([in] ULONG count, [in, unique, size_is(count)] DBPROPSET *propertyset, + [in] ULONG total, [out, size_is(total)] DBPROPSTATUS *propstatus, [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 87d148f67b4..4370c7f6bcc 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -71,6 +71,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "errrec.idl" #include "getdts.idl" #include "cmdstrm.idl" +#include "cmdprp.idl" cpp_quote("#include <accctrl.h>")

1 0

Alistair Leslie-Hughes : include: Add ICommandStream interface.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 951793c71ec5626d8fed155ce05f0145a941ea92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=951793c71ec5626d8fed155c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 10 20:29:56 2020 +1100 include: Add ICommandStream interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/cmdstrm.idl | 35 +++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 3 files changed, 37 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index ea021a4b80a..1db3765f68b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -63,6 +63,7 @@ SOURCES = \ cierror.h \ clusapi.h \ cmdbas.idl \ + cmdstrm.idl \ cmdtxt.idl \ cmnquery.idl \ codecapi.h \ diff --git a/include/cmdstrm.idl b/include/cmdstrm.idl new file mode 100644 index 00000000000..caadf046f1b --- /dev/null +++ b/include/cmdstrm.idl @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * 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 + */ +#if 0 +#pragma makedep install +#endif + +[ + local, + object, + uuid(0c733abf-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ICommandStream : IUnknown +{ + [local] + HRESULT GetCommandStream([out] IID *iid, [in,out] GUID *dialect, [out, iid_is(*iid)] IUnknown **commandstream); + + [local] + HRESULT SetCommandStream([in] REFIID riid, [in] REFGUID dialect, [in, iid_is(riid)] IUnknown *commandstream); +} diff --git a/include/oledb.idl b/include/oledb.idl index 1ffbefa9ffd..87d148f67b4 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -70,6 +70,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "crtrow.idl" #include "errrec.idl" #include "getdts.idl" +#include "cmdstrm.idl" cpp_quote("#include <accctrl.h>")

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
86
Older →

Jump to page:

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-commits November 2020