February 2020 - Wine-devel - list.winehq.org

[PATCH] activeds: Implement AllocADsMem and FreeADsMem.
by Dmitry Timoshkov 12 Feb '20

12 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/activeds/activeds_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 69c5c447dc..1ac0add3db 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -141,8 +141,7 @@ HRESULT WINAPI ADsGetLastError(LPDWORD perror, LPWSTR errorbuf, DWORD errorbufle */ LPVOID WINAPI AllocADsMem(DWORD cb) { - FIXME("(%d)!stub\n",cb); - return NULL; + return HeapAlloc(GetProcessHeap(), 0, cb); } /***************************************************** @@ -150,8 +149,7 @@ LPVOID WINAPI AllocADsMem(DWORD cb) */ BOOL WINAPI FreeADsMem(LPVOID pMem) { - FIXME("(%p)!stub\n",pMem); - return FALSE; + return HeapFree(GetProcessHeap(), 0, pMem); } /***************************************************** -- 2.20.1

1 0

[PATCH] ole32: Implement MTA pinning with CoIncrementMTAUsage()/CoDecrementMTAUsage().
by Nikolay Sivov 12 Feb '20

12 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- .../api-ms-win-core-com-l1-1-0.spec | 4 +- .../api-ms-win-core-com-l1-1-1.spec | 4 +- dlls/combase/combase.spec | 4 +- dlls/ole32/compobj.c | 71 +++++++++++++++++++ dlls/ole32/compobj_private.h | 2 + dlls/ole32/ole32.spec | 2 + dlls/ole32/tests/compobj.c | 41 +++++++++++ include/objbase.h | 4 ++ 8 files changed, 126 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec index bc85dda7fa..eb81d23855 100644 --- a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec @@ -10,7 +10,7 @@ @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx @ stub CoCreateInstanceFromApp @ stub CoDecodeProxy -@ stub CoDecrementMTAUsage +@ stdcall CoDecrementMTAUsage(ptr) ole32.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @@ -35,7 +35,7 @@ @ stub CoGetStdMarshalEx @ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass @ stdcall CoImpersonateClient() ole32.CoImpersonateClient -@ stub CoIncrementMTAUsage +@ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage @ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity @ stub CoInvalidateRemoteMachineBindings diff --git a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec index 9a8f1da3cc..6c3115d600 100644 --- a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec +++ b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec @@ -10,7 +10,7 @@ @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx @ stub CoCreateInstanceFromApp @ stub CoDecodeProxy -@ stub CoDecrementMTAUsage +@ stdcall CoDecrementMTAUsage(ptr) ole32.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @@ -35,7 +35,7 @@ @ stub CoGetStdMarshalEx @ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass @ stdcall CoImpersonateClient() ole32.CoImpersonateClient -@ stub CoIncrementMTAUsage +@ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage @ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity @ stub CoInvalidateRemoteMachineBindings diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 64394f461d..36005929da 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -81,7 +81,7 @@ @ stub CoCreateObjectInContext @ stub CoDeactivateObject @ stub CoDecodeProxy -@ stub CoDecrementMTAUsage +@ stdcall CoDecrementMTAUsage(ptr) ole32.CoDecrementMTAUsage @ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @@ -116,7 +116,7 @@ @ stub CoGetSystemSecurityPermissions @ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass @ stdcall CoImpersonateClient() ole32.CoImpersonateClient -@ stub CoIncrementMTAUsage +@ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage @ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity @ stdcall CoInitializeWOW(long long) ole32.CoInitializeWOW diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index daa405356f..69b9cec3b3 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -637,6 +637,7 @@ static APARTMENT *apartment_construct(DWORD model) list_init(&apt->proxies); list_init(&apt->stubmgrs); list_init(&apt->loaded_dlls); + list_init(&apt->usage_cookies); apt->ipidc = 0; apt->refs = 1; apt->remunk_exported = FALSE; @@ -5268,6 +5269,76 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) return info->apt ? S_OK : CO_E_NOTINITIALIZED; } +struct mta_cookie +{ + struct list entry; +}; + +/*********************************************************************** + * CoIncrementMTAUsage [OLE32.@] + */ +HRESULT WINAPI CoIncrementMTAUsage(CO_MTA_USAGE_COOKIE *cookie) +{ + struct mta_cookie *mta_cookie; + + TRACE("%p\n", cookie); + + *cookie = NULL; + + if (!(mta_cookie = heap_alloc(sizeof(*mta_cookie)))) + return E_OUTOFMEMORY; + + EnterCriticalSection(&csApartment); + + if (MTA) + apartment_addref(MTA); + else + MTA = apartment_construct(0); + list_add_head(&MTA->usage_cookies, &mta_cookie->entry); + + LeaveCriticalSection(&csApartment); + + *cookie = (CO_MTA_USAGE_COOKIE)mta_cookie; + + return S_OK; +} + +/*********************************************************************** + * CoDecrementMTAUsage [OLE32.@] + */ +HRESULT WINAPI CoDecrementMTAUsage(CO_MTA_USAGE_COOKIE cookie) +{ + struct mta_cookie *mta_cookie = (struct mta_cookie *)cookie; + BOOL release = FALSE; + + ERR("%p\n", cookie); + + EnterCriticalSection(&csApartment); + + if (MTA) + { + struct mta_cookie *cur; + + LIST_FOR_EACH_ENTRY(cur, &MTA->usage_cookies, struct mta_cookie, entry) + { + release = mta_cookie == cur; + if (release) + { + list_remove(&cur->entry); + apartment_release(MTA); + break; + } + } + } + + LeaveCriticalSection(&csApartment); + + if (release) + heap_free(mta_cookie); + + return S_OK; +} + /*********************************************************************** * CoDisableCallCancellation [OLE32.@] */ diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 29f94421d1..e151241673 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -151,6 +151,8 @@ struct apartment 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 diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index eaf0e6b7f4..dd10d65b78 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -14,6 +14,7 @@ @ stdcall CoCreateGuid(ptr) @ stdcall CoCreateInstance(ptr ptr long ptr ptr) @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) +@ stdcall CoDecrementMTAUsage(ptr) @ stdcall CoDisableCallCancellation(ptr) @ stdcall CoDisconnectObject(ptr long) @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime @@ -47,6 +48,7 @@ @ stub CoGetTIDFromIPID @ stdcall CoGetTreatAsClass(ptr ptr) @ stdcall CoImpersonateClient() +@ stdcall CoIncrementMTAUsage(ptr) @ stdcall CoInitialize(ptr) @ stdcall CoInitializeEx(ptr long) @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 3404c806b8..7eb25af9e6 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -76,6 +76,8 @@ static HRESULT (WINAPI * pCoGetTreatAsClass)(REFCLSID clsidOld, LPCLSID pClsidNe static HRESULT (WINAPI * pCoTreatAsClass)(REFCLSID clsidOld, REFCLSID pClsidNew); static HRESULT (WINAPI * pCoGetContextToken)(ULONG_PTR *token); static HRESULT (WINAPI * pCoGetApartmentType)(APTTYPE *type, APTTYPEQUALIFIER *qualifier); +static HRESULT (WINAPI * pCoIncrementMTAUsage)(CO_MTA_USAGE_COOKIE *cookie); +static HRESULT (WINAPI * pCoDecrementMTAUsage)(CO_MTA_USAGE_COOKIE cookie); static LONG (WINAPI * pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static LONG (WINAPI * pRegOverridePredefKey)(HKEY key, HKEY override); @@ -3818,6 +3820,8 @@ static void init_funcs(void) pCoTreatAsClass = (void*)GetProcAddress(hOle32,"CoTreatAsClass"); pCoGetContextToken = (void*)GetProcAddress(hOle32, "CoGetContextToken"); pCoGetApartmentType = (void*)GetProcAddress(hOle32, "CoGetApartmentType"); + pCoIncrementMTAUsage = (void*)GetProcAddress(hOle32, "CoIncrementMTAUsage"); + pCoDecrementMTAUsage = (void*)GetProcAddress(hOle32, "CoDecrementMTAUsage"); pRegDeleteKeyExA = (void*)GetProcAddress(hAdvapi32, "RegDeleteKeyExA"); pRegOverridePredefKey = (void*)GetProcAddress(hAdvapi32, "RegOverridePredefKey"); @@ -3916,6 +3920,42 @@ static void test_CoGetCurrentProcess(void) ok(id2 && id2 != id, "Unexpected id from another thread.\n"); } +static void test_mta_usage(void) +{ + CO_MTA_USAGE_COOKIE cookie, cookie2; + HRESULT hr; + + if (!pCoIncrementMTAUsage) + { + win_skip("CoIncrementMTAUsage() is not available.\n"); + return; + } + + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); + + cookie = 0; + hr = pCoIncrementMTAUsage(&cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(cookie != NULL, "Unexpected cookie %p.\n", cookie); + + cookie2 = 0; + hr = pCoIncrementMTAUsage(&cookie2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(cookie2 != NULL && cookie2 != cookie, "Unexpected cookie %p.\n", cookie2); + + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA); + + hr = pCoDecrementMTAUsage(cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA); + + hr = pCoDecrementMTAUsage(cookie2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); +} + START_TEST(compobj) { init_funcs(); @@ -3967,6 +4007,7 @@ START_TEST(compobj) test_GlobalOptions(); test_implicit_mta(); test_CoGetCurrentProcess(); + test_mta_usage(); DeleteFileA( testlib ); } diff --git a/include/objbase.h b/include/objbase.h index 0eae397b43..a17cbeb870 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -287,12 +287,16 @@ typedef enum tagCOINIT COINIT_SPEED_OVER_MEMORY = 0x8 /* Trade memory for speed */ } COINIT; +DECLARE_HANDLE(CO_MTA_USAGE_COOKIE); + HRESULT WINAPI CoInitialize(LPVOID lpReserved); HRESULT WINAPI CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit); void WINAPI CoUninitialize(void); DWORD WINAPI CoGetCurrentProcess(void); HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *id); HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier); +HRESULT WINAPI CoIncrementMTAUsage(CO_MTA_USAGE_COOKIE *cookie); +HRESULT WINAPI CoDecrementMTAUsage(CO_MTA_USAGE_COOKIE cookie); HINSTANCE WINAPI CoLoadLibrary(LPOLESTR lpszLibName, BOOL bAutoFree); void WINAPI CoFreeAllLibraries(void); -- 2.25.0

2 1

[PATCH] api-ms: Update EnumDisplayDevicesW() entries.
by Nikolay Sivov 12 Feb '20

12 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- .../api-ms-win-ntuser-sysparams-l1-1-0.spec | 2 +- .../ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec b/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec index 587a495563..3283708ec6 100644 --- a/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec +++ b/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec @@ -1,7 +1,7 @@ @ stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr) user32.ChangeDisplaySettingsExW @ stdcall DisplayConfigGetDeviceInfo(ptr) user32.DisplayConfigGetDeviceInfo @ stub DisplayConfigSetDeviceInfo -@ stdcall EnumDisplayDevicesW(ptr long ptr long) user32.EnumDisplayDevicesW +@ stdcall EnumDisplayDevicesW(wstr long ptr long) user32.EnumDisplayDevicesW @ stdcall EnumDisplayMonitors(long ptr ptr long) user32.EnumDisplayMonitors @ stdcall EnumDisplaySettingsExW(wstr long ptr long) user32.EnumDisplaySettingsExW @ stdcall EnumDisplaySettingsW(wstr long ptr ) user32.EnumDisplaySettingsW diff --git a/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec b/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec index ffb8f5b381..ff83143469 100644 --- a/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec +++ b/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec @@ -1,7 +1,7 @@ @ stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr) user32.ChangeDisplaySettingsExW @ stdcall DisplayConfigGetDeviceInfo(ptr) user32.DisplayConfigGetDeviceInfo @ stub DisplayConfigSetDeviceInfo -@ stdcall EnumDisplayDevicesW(ptr long ptr long) user32.EnumDisplayDevicesW +@ stdcall EnumDisplayDevicesW(wstr long ptr long) user32.EnumDisplayDevicesW @ stdcall EnumDisplayMonitors(long ptr ptr long) user32.EnumDisplayMonitors @ stdcall EnumDisplaySettingsExW(wstr long ptr long) user32.EnumDisplaySettingsExW @ stdcall EnumDisplaySettingsW(wstr long ptr ) user32.EnumDisplaySettingsW -- 2.25.0

1 0

[v2 PATCH] mfplat: Implement IMFByteStream::SetCurrentPosition() for file streams.
by Nikolay Sivov 12 Feb '20

12 Feb '20

From: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed messed up implementation diff dlls/mfplat/main.c | 50 ++++++++++++++++++-------------------- dlls/mfplat/tests/mfplat.c | 20 ++++++++++++++- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1ebd443131..ef0db5a276 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -3287,22 +3287,18 @@ static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) return E_NOTIMPL; } -static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) +static HRESULT WINAPI bytestream_file_GetCurrentPosition(IMFByteStream *iface, QWORD *position) { - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, position); + struct bytestream *stream = impl_from_IMFByteStream(iface); - return E_NOTIMPL; -} + TRACE("%p, %p.\n", iface, position); -static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); + if (!position) + return E_INVALIDARG; - FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); + *position = stream->position; - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI bytestream_file_GetLength(IMFByteStream *iface, QWORD *length) @@ -3445,6 +3441,19 @@ static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) return E_NOTIMPL; } +static HRESULT WINAPI bytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) +{ + struct bytestream *stream = impl_from_IMFByteStream(iface); + + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(position)); + + EnterCriticalSection(&stream->cs); + stream->position = position; + LeaveCriticalSection(&stream->cs); + + return S_OK; +} + static const IMFByteStreamVtbl bytestream_file_vtbl = { bytestream_QueryInterface, @@ -3453,8 +3462,8 @@ static const IMFByteStreamVtbl bytestream_file_vtbl = bytestream_GetCapabilities, bytestream_file_GetLength, mfbytestream_SetLength, - mfbytestream_GetCurrentPosition, - mfbytestream_SetCurrentPosition, + bytestream_file_GetCurrentPosition, + bytestream_SetCurrentPosition, bytestream_file_IsEndOfStream, bytestream_file_Read, bytestream_BeginRead, @@ -3512,19 +3521,6 @@ static HRESULT WINAPI bytestream_stream_GetCurrentPosition(IMFByteStream *iface, return S_OK; } -static HRESULT WINAPI bytestream_stream_SetCurrentPosition(IMFByteStream *iface, QWORD position) -{ - struct bytestream *stream = impl_from_IMFByteStream(iface); - - TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(position)); - - EnterCriticalSection(&stream->cs); - stream->position = position; - LeaveCriticalSection(&stream->cs); - - return S_OK; -} - static HRESULT WINAPI bytestream_stream_IsEndOfStream(IMFByteStream *iface, BOOL *ret) { struct bytestream *stream = impl_from_IMFByteStream(iface); @@ -3642,7 +3638,7 @@ static const IMFByteStreamVtbl bytestream_stream_vtbl = bytestream_stream_GetLength, bytestream_stream_SetLength, bytestream_stream_GetCurrentPosition, - bytestream_stream_SetCurrentPosition, + bytestream_SetCurrentPosition, bytestream_stream_IsEndOfStream, bytestream_stream_Read, bytestream_BeginRead, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7ec0b01982..67123d0b69 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1340,15 +1340,16 @@ static void test_MFCreateMFByteStreamOnStream(void) static void test_file_stream(void) { IMFByteStream *bytestream, *bytestream2; + QWORD bytestream_length, position; IMFAttributes *attributes = NULL; MF_ATTRIBUTE_TYPE item_type; - QWORD bytestream_length; WCHAR pathW[MAX_PATH]; DWORD caps, count; WCHAR *filename; IUnknown *unk; HRESULT hr; WCHAR *str; + BOOL eos; static const WCHAR newfilename[] = {'n','e','w','.','m','p','4',0}; @@ -1415,6 +1416,23 @@ static void test_file_stream(void) ok(hr == S_OK, "Failed to get bytestream length, hr %#x.\n", hr); ok(bytestream_length > 0, "Unexpected bytestream length %s.\n", wine_dbgstr_longlong(bytestream_length)); + hr = IMFByteStream_SetCurrentPosition(bytestream, bytestream_length); + ok(hr == S_OK, "Failed to set bytestream position, hr %#x.\n", hr); + + hr = IMFByteStream_IsEndOfStream(bytestream, &eos); + ok(hr == S_OK, "Failed query end of stream, hr %#x.\n", hr); + ok(eos == TRUE, "Unexpected IsEndOfStream result, %u.\n", eos); + + hr = IMFByteStream_SetCurrentPosition(bytestream, 2 * bytestream_length); + ok(hr == S_OK, "Failed to set bytestream position, hr %#x.\n", hr); + + hr = IMFByteStream_GetCurrentPosition(bytestream, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFByteStream_GetCurrentPosition(bytestream, &position); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(position == 2 * bytestream_length, "Unexpected position.\n"); + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.25.0

2 1

[PATCH] oledb32: Add All page to Data Link dialog.
by Alistair Leslie-Hughes 12 Feb '20

12 Feb '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/dslocator.c | 53 +++++++++++++++++++++++++++++++++++++++- dlls/oledb32/resource.h | 6 +++++ dlls/oledb32/version.rc | 12 +++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index d33d637264..11ee76cddb 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -436,11 +436,57 @@ static LRESULT CALLBACK data_link_advanced_dlg_proc(HWND hwnd, UINT msg, WPARAM return 0; } +static void create_page_all_columns(HWND lv) +{ + RECT rc; + WCHAR buf[256]; + LVCOLUMNW column; + + SendMessageW(lv, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); + GetWindowRect(lv, &rc); + LoadStringW(instance, IDS_COL_NAME, buf, ARRAY_SIZE(buf)); + column.mask = LVCF_WIDTH | LVCF_TEXT; + column.cx = (rc.right / 2); + column.pszText = buf; + SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); + + LoadStringW(instance, IDS_COL_VALUE, buf, ARRAY_SIZE(buf)); + column.mask = LVCF_WIDTH | LVCF_TEXT; + column.cx = (rc.right / 2); + column.pszText = buf; + SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); +} + +static LRESULT CALLBACK data_link_all_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); + + switch (msg) + { + case WM_INITDIALOG: + { + HWND lv = GetDlgItem(hwnd, IDC_LST_PROPERTIES); + create_page_all_columns(lv); + break; + } + case WM_COMMAND: + { + if (LOWORD(wp) == IDC_BTN_EDIT) + { + /* TODO: Implement Connection dialog */ + MessageBoxA(hwnd, "Not implemented yet.", "Error", MB_OK | MB_ICONEXCLAMATION); + } + } + } + + return 0; + } + static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch **connection) { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); PROPSHEETHEADERW hdr; - PROPSHEETPAGEW pages[3]; + PROPSHEETPAGEW pages[4]; INT_PTR ret; FIXME("(%p, %p) Semi-stub\n", iface, connection); @@ -467,6 +513,11 @@ static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch * pages[2].u.pszTemplate = MAKEINTRESOURCEW(IDD_ADVANCED); pages[2].pfnDlgProc = data_link_advanced_dlg_proc; + pages[3].dwSize = sizeof(pages[0]); + pages[3].hInstance = instance; + pages[3].u.pszTemplate = MAKEINTRESOURCEW(IDD_ALL); + pages[3].pfnDlgProc = data_link_all_dlg_proc; + memset(&hdr, 0, sizeof(hdr)); hdr.dwSize = sizeof(hdr); hdr.hwndParent = This->hwnd; diff --git a/dlls/oledb32/resource.h b/dlls/oledb32/resource.h index 99d3595d4a..5a4c9a2a71 100644 --- a/dlls/oledb32/resource.h +++ b/dlls/oledb32/resource.h @@ -57,3 +57,9 @@ #define IDC_GRP_NETWORK 4005 #define IDC_LBL_LEVEL 4006 #define IDC_LBL_PROTECTION 4007 + +#define IDD_ALL 5010 +#define IDC_BTN_EDIT 5011 +#define IDC_LST_PROPERTIES 5012 +#define IDS_COL_NAME 5013 +#define IDS_COL_VALUE 5014 diff --git a/dlls/oledb32/version.rc b/dlls/oledb32/version.rc index 33ef916b83..e6bcadd256 100644 --- a/dlls/oledb32/version.rc +++ b/dlls/oledb32/version.rc @@ -35,6 +35,8 @@ STRINGTABLE { IDS_PROPSHEET_TITLE "Data Link Properties" IDS_COL_PROVIDER "OLE DB Provider(s)" + IDS_COL_NAME "Name" + IDS_COL_VALUE "Value" IDS_PERM_READ "Read" IDS_PERM_READWRITE "ReadWrite" @@ -98,3 +100,13 @@ BEGIN LTEXT "A&ccess:",-1,14,91,100,8 CONTROL "",IDC_LST_PERMISSIONS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | LVS_NOLABELWRAP | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,83,91,131,55 END + +IDD_ALL DIALOG 0, 0, 227, 225 +STYLE DS_SETFONT | WS_CHILD | WS_CAPTION +CAPTION "All" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List1",IDC_LST_PROPERTIES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,33,213,155 + LTEXT "These are the initialization properties for this type of data. To edit a value, select a property, then choose Edit Value below.",-1,7,7,213,23 + PUSHBUTTON "&Edit Value...",IDC_BTN_EDIT,7,194,60,14 +END -- 2.25.0

1 0

[PATCH 1/6] quartz/vmr9: Fix copying from the d3d9 surface if the pitch doesn't match the width.
by Zebediah Figura 12 Feb '20

12 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Thanks to Henri Verbeet. dlls/quartz/vmr9.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 928e98f6056..58a7e2b1218 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -627,7 +627,10 @@ static HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo *iface, LONG *size, L IDirect3DSurface9 *rt = NULL, *surface = NULL; D3DLOCKED_RECT locked_rect; IDirect3DDevice9 *device; + unsigned int row_size; BITMAPINFOHEADER bih; + LONG i, size_left; + char *dst; HRESULT hr; TRACE("filter %p, size %d, image %p.\n", filter, *size, image); @@ -661,7 +664,20 @@ static HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo *iface, LONG *size, L if (FAILED(hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, D3DLOCK_READONLY))) goto out; - memcpy(image, &bih, min(*size, sizeof(BITMAPINFOHEADER))); + size_left = *size; + memcpy(image, &bih, min(size_left, sizeof(BITMAPINFOHEADER))); + size_left -= sizeof(BITMAPINFOHEADER); + + dst = (char *)image + sizeof(BITMAPINFOHEADER); + row_size = bih.biWidth * bih.biBitCount / 8; + + for (i = 0; i < bih.biHeight && size_left > 0; ++i) + { + memcpy(dst, (char *)locked_rect.pBits + (i * locked_rect.Pitch), min(row_size, size_left)); + dst += row_size; + size_left -= row_size; + } + if (*size > sizeof(BITMAPINFOHEADER)) memcpy((char *)image + sizeof(BITMAPINFOHEADER), locked_rect.pBits, min(*size - sizeof(BITMAPINFOHEADER), bih.biSizeImage)); -- 2.25.0

2 8

[PATCH] tests: Restore the colon in the todo, skip and trace lines.
by Francois Gouget 12 Feb '20

12 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Sigh. Some more colons were missing :-( I hacked the build, debian10 and debiant VMs so they have this patch. It should also not interfere with WineTest and all should get back to normal when this patch gets committed. So the TestBot should not be broken for a second day. But some jobs completed before I tweaked the VMs so it's too late for those. include/wine/test.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 7a5606a1ec5..3af3ffd2a91 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -346,7 +346,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (winetest_debug > 0) { - printf( "%s:%d Test marked todo: ", + printf( "%s:%d: Test marked todo: ", data->current_file, data->current_line ); vprintf(msg, args); } @@ -396,7 +396,7 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) if (winetest_add_line() < winetest_mute_threshold) { struct tls_data *data = get_tls_data(); - printf( "%s:%d ", data->current_file, data->current_line ); + printf( "%s:%d: ", data->current_file, data->current_line ); __winetest_va_start(valist, msg); vprintf(msg, valist); __winetest_va_end(valist); @@ -410,7 +410,7 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) if (winetest_add_line() < winetest_mute_threshold) { struct tls_data *data = get_tls_data(); - printf( "%s:%d Tests skipped: ", data->current_file, data->current_line ); + printf( "%s:%d: Tests skipped: ", data->current_file, data->current_line ); vprintf(msg, args); InterlockedIncrement(&skipped); } -- 2.20.1

2 1

sponsored development to make Autodesk's "DWG TrueView" installer work
by René Genz 12 Feb '20

12 Feb '20

Dear sir or madam, I would like to use Autodesk's "DWG TrueView 2020" to open DWG files on GNU/Linux without using a virtual computer running Microsoft Windows. But the installer fails in Crossover and Wine [1]. It is a known issue [2]. You can try the installer yourself [3]. I cannot fix it. I would like to spend money to make the installer work. Whom can I sponsor? At which company can I buy development hours? Are there other options from your point of view? Thank you for your input. [1] I tried "DWG TrueView 2020" with Crossover 18.5.0 without success. The installer fails with error message "Install error 120: Call not implemented." I tried with Wine 4.14, 5.0, and 5.1 staging on Fedora 30 x86_64. Same problem. [2] On 2019-08-24 I reported the problem to Codeweavers at: https://www.codeweavers.com/support/tickets/browse/?ticket_id=1230834 The problem was confirmed 2 days later, but no solution available. I asked for information about sponsored development to no avail. This seems to be the bug on WineHQ.org: https://bugs.winehq.org/show_bug.cgi?id=12532 [3] Since the 2020 version a 64-bit operating system is required. On the website: https://www.autodesk.com/products/dwg/viewers you can download the "DWG TrueView" installer. It is 680 MiB. Note that the installer will download 1.9 GiB during installation. -- Kind regards, René

2 1

[PATCH] include: Fix size of RecordCreateOptionsEnum.
by Brendan Shanks 12 Feb '20

12 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48577 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- include/msado15_backcompat.idl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index e4a847ab85..68fda6ab21 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -430,12 +430,12 @@ typedef [uuid(00000574-0000-0010-8000-00aa006d2ea4)] enum CopyRecordOptionsEnum typedef [uuid(00000570-0000-0010-8000-00aa006d2ea4)] enum RecordCreateOptionsEnum { - adCreateCollection = 0x00002000, - adCreateStructDoc = 0x80000000, - adCreateNonCollection = 0x00000000, - adOpenIfExists = 0x02000000, - adCreateOverwrite = 0x04000000, - adFailIfNotExists = -1 + adCreateCollection = (int) 0x00002000, + adCreateStructDoc = (int) 0x80000000, + adCreateNonCollection = (int) 0x00000000, + adOpenIfExists = (int) 0x02000000, + adCreateOverwrite = (int) 0x04000000, + adFailIfNotExists = (int) -1 } RecordCreateOptionsEnum; typedef [uuid(00000571-0000-0010-8000-00aa006d2ea4)] enum RecordOpenOptionsEnum -- 2.24.1

1 0

[PATCH] include: Fix size of tomConstants enum.
by Brendan Shanks 12 Feb '20

12 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48577 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- include/tom.idl | 342 ++++++++++++++++++++++++------------------------ 1 file changed, 171 insertions(+), 171 deletions(-) diff --git a/include/tom.idl b/include/tom.idl index 5c1fd6bd97..fda81777db 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -25,185 +25,185 @@ cpp_quote("#endif") typedef enum tagTomConstants { - tomFalse = 0, - tomTrue = -1, - tomUndefined = -9999999, - tomToggle = -9999998, - tomAutoColor = -9999997, - tomDefault = -9999996, - tomSuspend = -9999995, - tomResume = -9999994, + tomFalse = (int) 0, + tomTrue = (int) -1, + tomUndefined = (int) -9999999, + tomToggle = (int) -9999998, + tomAutoColor = (int) -9999997, + tomDefault = (int) -9999996, + tomSuspend = (int) -9999995, + tomResume = (int) -9999994, /* ITextFont::Reset() modes */ - tomApplyNow = 0, - tomApplyLater = 1, - tomTrackParms = 2, - tomCacheParms = 3, - tomApplyTmp = 4, - tomDisableSmartFont = 8, - tomEnableSmartFont = 9, - tomUsePoints = 10, - tomUseTwips = 11, + tomApplyNow = (int) 0, + tomApplyLater = (int) 1, + tomTrackParms = (int) 2, + tomCacheParms = (int) 3, + tomApplyTmp = (int) 4, + tomDisableSmartFont = (int) 8, + tomEnableSmartFont = (int) 9, + tomUsePoints = (int) 10, + tomUseTwips = (int) 11, - tomBackward = 0xc0000001, - tomForward = 0x3fffffff, - tomMove = 0, - tomExtend = 1, - tomNoSelection = 0, - tomSelectionIP = 1, - tomSelectionNormal = 2, - tomSelectionFrame = 3, - tomSelectionColumn = 4, - tomSelectionRow = 5, - tomSelectionBlock = 6, - tomSelectionInlineShape = 7, - tomSelectionShape = 8, - tomSelStartActive = 1, - tomSelAtEOL = 2, - tomSelOvertype = 4, - tomSelActive = 8, - tomSelReplace = 16, - tomEnd = 0, - tomStart = 32, - tomCollapseEnd = 0, - tomCollapseStart = 1, - tomClientCoord = 256, - tomNone = 0, - tomSingle = 1, - tomWords = 2, - tomDouble = 3, - tomDotted = 4, - tomDash = 5, - tomDashDot = 6, - tomDashDotDot = 7, - tomWave = 8, - tomThick = 9, - tomHair = 10, - tomLineSpaceSingle = 0, - tomLineSpace1pt5 = 1, - tomLineSpaceDouble = 2, - tomLineSpaceAtLeast = 3, - tomLineSpaceExactly = 4, - tomLineSpaceMultiple = 5, - tomAlignLeft = 0, - tomAlignCenter = 1, - tomAlignRight = 2, - tomAlignJustify = 3, - tomAlignDecimal = 3, - tomAlignBar = 4, - tomAlignInterWord = 3, - tomAlignInterLetter = 4, - tomAlignScaled = 5, - tomAlignGlyphs = 6, - tomAlignSnapGrid = 7, - tomSpaces = 0, - tomDots = 1, - tomDashes = 2, - tomLines = 3, - tomThickLines = 4, - tomEquals = 5, - tomTabBack = -3, - tomTabNext = -2, - tomTabHere = -1, - tomListBullet = 1, - tomListNumberAsArabic = 2, - tomListNumberAsLCLetter = 3, - tomListNumberAsUCLetter = 4, - tomListNumberAsLCRoman = 5, - tomListNumberAsUCRoman = 6, - tomListNumberAsSequence = 7, - tomListParentheses = 0x10000, - tomListPeriod = 0x20000, - tomListPlain = 0x30000, - tomCharacter = 1, - tomWord = 2, - tomSentence = 3, - tomParagraph = 4, - tomLine = 5, - tomStory = 6, - tomScreen = 7, - tomSection = 8, - tomColumn = 9, - tomRow = 10, - tomWindow = 11, - tomCell = 12, - tomCharFormat = 13, - tomParaFormat = 14, - tomTable = 15, - tomObject = 16, - tomMatchWord = 2, - tomMatchCase = 4, - tomMatchPattern = 8, + tomBackward = (int) 0xc0000001, + tomForward = (int) 0x3fffffff, + tomMove = (int) 0, + tomExtend = (int) 1, + tomNoSelection = (int) 0, + tomSelectionIP = (int) 1, + tomSelectionNormal = (int) 2, + tomSelectionFrame = (int) 3, + tomSelectionColumn = (int) 4, + tomSelectionRow = (int) 5, + tomSelectionBlock = (int) 6, + tomSelectionInlineShape = (int) 7, + tomSelectionShape = (int) 8, + tomSelStartActive = (int) 1, + tomSelAtEOL = (int) 2, + tomSelOvertype = (int) 4, + tomSelActive = (int) 8, + tomSelReplace = (int) 16, + tomEnd = (int) 0, + tomStart = (int) 32, + tomCollapseEnd = (int) 0, + tomCollapseStart = (int) 1, + tomClientCoord = (int) 256, + tomNone = (int) 0, + tomSingle = (int) 1, + tomWords = (int) 2, + tomDouble = (int) 3, + tomDotted = (int) 4, + tomDash = (int) 5, + tomDashDot = (int) 6, + tomDashDotDot = (int) 7, + tomWave = (int) 8, + tomThick = (int) 9, + tomHair = (int) 10, + tomLineSpaceSingle = (int) 0, + tomLineSpace1pt5 = (int) 1, + tomLineSpaceDouble = (int) 2, + tomLineSpaceAtLeast = (int) 3, + tomLineSpaceExactly = (int) 4, + tomLineSpaceMultiple = (int) 5, + tomAlignLeft = (int) 0, + tomAlignCenter = (int) 1, + tomAlignRight = (int) 2, + tomAlignJustify = (int) 3, + tomAlignDecimal = (int) 3, + tomAlignBar = (int) 4, + tomAlignInterWord = (int) 3, + tomAlignInterLetter = (int) 4, + tomAlignScaled = (int) 5, + tomAlignGlyphs = (int) 6, + tomAlignSnapGrid = (int) 7, + tomSpaces = (int) 0, + tomDots = (int) 1, + tomDashes = (int) 2, + tomLines = (int) 3, + tomThickLines = (int) 4, + tomEquals = (int) 5, + tomTabBack = (int) -3, + tomTabNext = (int) -2, + tomTabHere = (int) -1, + tomListBullet = (int) 1, + tomListNumberAsArabic = (int) 2, + tomListNumberAsLCLetter = (int) 3, + tomListNumberAsUCLetter = (int) 4, + tomListNumberAsLCRoman = (int) 5, + tomListNumberAsUCRoman = (int) 6, + tomListNumberAsSequence = (int) 7, + tomListParentheses = (int) 0x10000, + tomListPeriod = (int) 0x20000, + tomListPlain = (int) 0x30000, + tomCharacter = (int) 1, + tomWord = (int) 2, + tomSentence = (int) 3, + tomParagraph = (int) 4, + tomLine = (int) 5, + tomStory = (int) 6, + tomScreen = (int) 7, + tomSection = (int) 8, + tomColumn = (int) 9, + tomRow = (int) 10, + tomWindow = (int) 11, + tomCell = (int) 12, + tomCharFormat = (int) 13, + tomParaFormat = (int) 14, + tomTable = (int) 15, + tomObject = (int) 16, + tomMatchWord = (int) 2, + tomMatchCase = (int) 4, + tomMatchPattern = (int) 8, /* ITextRange story type values */ - tomUnknownStory = 0, - tomMainTextStory = 1, - tomFootnotesStory = 2, - tomEndnotesStory = 3, - tomCommentsStory = 4, - tomTextFrameStory = 5, - tomEvenPagesHeaderStory = 6, - tomPrimaryHeaderStory = 7, - tomEvenPagesFooterStory = 8, - tomPrimaryFooterStory = 9, - tomFirstPageHeaderStory = 10, - tomFirstPageFooterStory = 11, + tomUnknownStory = (int) 0, + tomMainTextStory = (int) 1, + tomFootnotesStory = (int) 2, + tomEndnotesStory = (int) 3, + tomCommentsStory = (int) 4, + tomTextFrameStory = (int) 5, + tomEvenPagesHeaderStory = (int) 6, + tomPrimaryHeaderStory = (int) 7, + tomEvenPagesFooterStory = (int) 8, + tomPrimaryFooterStory = (int) 9, + tomFirstPageHeaderStory = (int) 10, + tomFirstPageFooterStory = (int) 11, /* ITextFont animation property */ - tomNoAnimation = 0, - tomLasVegasLights = 1, - tomBlinkingBackground = 2, - tomSparkleText = 3, - tomMarchingBlackAnts = 4, - tomMarchingRedAnts = 5, - tomShimmer = 6, - tomWipeDown = 7, - tomWipeRight = 8, - tomAnimationMax = 8, + tomNoAnimation = (int) 0, + tomLasVegasLights = (int) 1, + tomBlinkingBackground = (int) 2, + tomSparkleText = (int) 3, + tomMarchingBlackAnts = (int) 4, + tomMarchingRedAnts = (int) 5, + tomShimmer = (int) 6, + tomWipeDown = (int) 7, + tomWipeRight = (int) 8, + tomAnimationMax = (int) 8, - tomLowerCase = 0, - tomUpperCase = 1, - tomTitleCase = 2, - tomSentenceCase = 4, - tomToggleCase = 5, - tomReadOnly = 0x100, - tomShareDenyRead = 0x200, - tomShareDenyWrite = 0x400, - tomPasteFile = 0x1000, - tomCreateNew = 0x10, - tomCreateAlways = 0x20, - tomOpenExisting = 0x30, - tomOpenAlways = 0x40, - tomTruncateExisting = 0x50, - tomRTF = 0x1, - tomText = 0x2, - tomHTML = 0x3, - tomWordDocument = 0x4, - tomBold = 0x80000001, - tomItalic = 0x80000002, - tomUnderline = 0x80000004, - tomStrikeout = 0x80000008, - tomProtected = 0x80000010, - tomLink = 0x80000020, - tomSmallCaps = 0x80000040, - tomAllCaps = 0x80000080, - tomHidden = 0x80000100, - tomOutline = 0x80000200, - tomShadow = 0x80000400, - tomEmboss = 0x80000800, - tomImprint = 0x80001000, - tomDisabled = 0x80002000, - tomRevised = 0x80004000, - tomNormalCaret = 0, - tomKoreanBlockCaret = 0x1, - tomIncludeInset = 0x1, - tomIgnoreCurrentFont = 0, - tomMatchFontCharset = 0x1, - tomMatchFontSignature = 0x2, - tomCharset = 0x80000000, - tomRE10Mode = 0x1, - tomNoIME = 0x80000, - tomSelfIME = 0x40000 + tomLowerCase = (int) 0, + tomUpperCase = (int) 1, + tomTitleCase = (int) 2, + tomSentenceCase = (int) 4, + tomToggleCase = (int) 5, + tomReadOnly = (int) 0x100, + tomShareDenyRead = (int) 0x200, + tomShareDenyWrite = (int) 0x400, + tomPasteFile = (int) 0x1000, + tomCreateNew = (int) 0x10, + tomCreateAlways = (int) 0x20, + tomOpenExisting = (int) 0x30, + tomOpenAlways = (int) 0x40, + tomTruncateExisting = (int) 0x50, + tomRTF = (int) 0x1, + tomText = (int) 0x2, + tomHTML = (int) 0x3, + tomWordDocument = (int) 0x4, + tomBold = (int) 0x80000001, + tomItalic = (int) 0x80000002, + tomUnderline = (int) 0x80000004, + tomStrikeout = (int) 0x80000008, + tomProtected = (int) 0x80000010, + tomLink = (int) 0x80000020, + tomSmallCaps = (int) 0x80000040, + tomAllCaps = (int) 0x80000080, + tomHidden = (int) 0x80000100, + tomOutline = (int) 0x80000200, + tomShadow = (int) 0x80000400, + tomEmboss = (int) 0x80000800, + tomImprint = (int) 0x80001000, + tomDisabled = (int) 0x80002000, + tomRevised = (int) 0x80004000, + tomNormalCaret = (int) 0, + tomKoreanBlockCaret = (int) 0x1, + tomIncludeInset = (int) 0x1, + tomIgnoreCurrentFont = (int) 0, + tomMatchFontCharset = (int) 0x1, + tomMatchFontSignature = (int) 0x2, + tomCharset = (int) 0x80000000, + tomRE10Mode = (int) 0x1, + tomNoIME = (int) 0x80000, + tomSelfIME = (int) 0x40000 } tomConstants; interface ITextRange; -- 2.24.1

1 0