- wine-devel - winehq.org

[PATCH 4/4] msvcrt: Implement sequential and random mode flags.
by Akihiro Sagawa 12 Dec '19

12 Dec '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/msvcrt/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[PATCH 3/4] msvcrt: Implement _O_RANDOM and _O_SEQUENTIAL flags.
by Akihiro Sagawa 12 Dec '19

12 Dec '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/msvcrt/file.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

1 0

[PATCH 2/4] kernelbase: Implement FILE_FLAG_SEQUENTIAL_SCAN.
by Akihiro Sagawa 12 Dec '19

12 Dec '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/tests/file.c | 16 ++++++++++++++++ dlls/kernelbase/file.c | 2 ++ 2 files changed, 18 insertions(+)

1 0

[PATCH 1/4] server: Implement access pattern hints for file data.
by Akihiro Sagawa 12 Dec '19

12 Dec '19

1 0

[PATCH] testbot/Build: Update the Gecko download URL.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/Build/Utils.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 15acf6783..a8e5a0e0e 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -314,8 +314,7 @@ sub _UpdateAddOn($$$) return 0; } - $AddOn->{filename} = "wine". ($Name eq "gecko" ? "_" : "-") . - "$Name-$AddOn->{version}". + $AddOn->{filename} = "wine-$Name-$AddOn->{version}". ($Arch eq "" ? "" : "-$Arch") .".msi"; return 1 if (!_VerifyAddOn($AddOn, $Arch)); -- 2.20.1

1 0

[PATCH vkd3d 1/2] vkd3d: Map the copy queue to the compute queue if necessary and possible.
by Conor McCarthy 12 Dec '19

12 Dec '19

The current implementation maps copy to direct unless a dedicated copy queue is present. Compute queues are often more lightly loaded and there is usually more than one available. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/device.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 757d4ac..ad32ff2 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1667,8 +1667,16 @@ static HRESULT vkd3d_select_queues(const struct vkd3d_instance *vkd3d_instance, } if (info->family_index[VKD3D_QUEUE_FAMILY_TRANSFER] == ~0u) { - info->family_index[VKD3D_QUEUE_FAMILY_TRANSFER] = info->family_index[VKD3D_QUEUE_FAMILY_DIRECT]; - info->vk_properties[VKD3D_QUEUE_FAMILY_TRANSFER] = info->vk_properties[VKD3D_QUEUE_FAMILY_DIRECT]; + if (info->vk_properties[VKD3D_QUEUE_FAMILY_COMPUTE].queueFlags & VK_QUEUE_TRANSFER_BIT) + { + info->family_index[VKD3D_QUEUE_FAMILY_TRANSFER] = info->family_index[VKD3D_QUEUE_FAMILY_COMPUTE]; + info->vk_properties[VKD3D_QUEUE_FAMILY_TRANSFER] = info->vk_properties[VKD3D_QUEUE_FAMILY_COMPUTE]; + } + else + { + info->family_index[VKD3D_QUEUE_FAMILY_TRANSFER] = info->family_index[VKD3D_QUEUE_FAMILY_DIRECT]; + info->vk_properties[VKD3D_QUEUE_FAMILY_TRANSFER] = info->vk_properties[VKD3D_QUEUE_FAMILY_DIRECT]; + } } /* Compact the array. */ -- 2.24.0

1 1

[PATCH] include: Add missing defines for tokens in winnt.h
by Vijay Kiran Kamuju 12 Dec '19

12 Dec '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/winnt.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 1db7fdd28e..56734f178d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4177,6 +4177,11 @@ typedef enum _TOKEN_INFORMATION_CLASS { MaxTokenInfoClass } TOKEN_INFORMATION_CLASS; +#define DISABLE_MAX_PRIVILEGE 0x1 +#define SANDBOX_INERT 0x2 +#define LUA_TOKEN 0x4 +#define WRITE_RESTRICTED 0x8 + #define TOKEN_TOKEN_ADJUST_DEFAULT 0x0080 #define TOKEN_ADJUST_GROUPS 0x0040 #define TOKEN_ADJUST_PRIVILEGES 0x0020 -- 2.21.0

1 0

[PATCH] ole32/tests: Fix return value trace.
by Nikolay Sivov 12 Dec '19

12 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/clipboard.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 8901758034..b97c2646bf 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -1014,7 +1014,8 @@ static void test_set_clipboard(void) test_cf_dataobject(data_cmpl); test_enum_fmtetc(data_cmpl); - ok(OleSetClipboard(NULL) == S_OK, "failed to clear clipboard, hr = 0x%08x\n", hr); + hr = OleSetClipboard(NULL); + ok(hr == S_OK, "failed to clear clipboard, hr = 0x%08x.\n", hr); test_no_cf_dataobject(); test_enum_fmtetc(NULL); -- 2.24.0

1 0

[PATCH 1/5] ole32: Fix property name handling for dictionary entries in CP_UNICODE case.
by Nikolay Sivov 12 Dec '19

12 Dec '19

From: Michael Müller <michael(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42046 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Original patch was missing symmetric fix for serialization part. dlls/ole32/stg_prop.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 505467cad5..095bbaab94 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1195,20 +1195,25 @@ static HRESULT PropertyStorage_ReadDictionary(PropertyStorage_impl *This, ptr += sizeof(PROPID); StorageUtl_ReadDWord(ptr, 0, &cbEntry); ptr += sizeof(DWORD); - TRACE("Reading entry with ID 0x%08x, %d bytes\n", propid, cbEntry); /* Make sure the source string is NULL-terminated */ if (This->codePage != CP_UNICODE) ptr[cbEntry - 1] = '\0'; else - *((LPWSTR)ptr + cbEntry / sizeof(WCHAR)) = '\0'; + ((WCHAR *)ptr)[cbEntry - 1] = '\0'; + + TRACE("Reading entry with ID %#x, %d chars, name %s.\n", propid, cbEntry, This->codePage == CP_UNICODE ? + debugstr_wn((WCHAR *)ptr, cbEntry) : debugstr_an((char *)ptr, cbEntry)); + hr = PropertyStorage_StoreNameWithId(This, (char*)ptr, This->codePage, propid); if (This->codePage == CP_UNICODE) { + cbEntry *= sizeof(WCHAR); + /* Unicode entries are padded to DWORD boundaries */ if (cbEntry % sizeof(DWORD)) ptr += sizeof(DWORD) - (cbEntry % sizeof(DWORD)); } - ptr += sizeof(DWORD) + cbEntry; + ptr += cbEntry; } return hr; } @@ -1753,7 +1758,7 @@ static inline HRESULT PropertyStorage_WriteWStringToStream(IStream *stm, HeapFree(GetProcessHeap(), 0, leStr); return hr; #else - return IStream_Write(stm, str, len, written); + return IStream_Write(stm, str, len * sizeof(WCHAR), written); #endif } @@ -1768,7 +1773,7 @@ static BOOL PropertyStorage_DictionaryWriter(const void *key, { PropertyStorage_impl *This = extra; struct DictionaryClosure *c = closure; - DWORD propid; + DWORD propid, keyLen; ULONG count; assert(key); @@ -1780,10 +1785,9 @@ static BOOL PropertyStorage_DictionaryWriter(const void *key, c->bytesWritten += sizeof(DWORD); if (This->codePage == CP_UNICODE) { - DWORD keyLen, pad = 0; + DWORD pad = 0, pad_len; - StorageUtl_WriteDWord((LPBYTE)&keyLen, 0, - (lstrlenW((LPCWSTR)key) + 1) * sizeof(WCHAR)); + StorageUtl_WriteDWord((LPBYTE)&keyLen, 0, lstrlenW((LPCWSTR)key) + 1); c->hr = IStream_Write(This->stm, &keyLen, sizeof(keyLen), &count); if (FAILED(c->hr)) goto end; @@ -1792,20 +1796,21 @@ static BOOL PropertyStorage_DictionaryWriter(const void *key, &count); if (FAILED(c->hr)) goto end; - c->bytesWritten += keyLen * sizeof(WCHAR); - if (keyLen % sizeof(DWORD)) + keyLen *= sizeof(WCHAR); + c->bytesWritten += keyLen; + + /* Align to 4 bytes. */ + pad_len = sizeof(DWORD) - keyLen % sizeof(DWORD); + if (pad_len) { - c->hr = IStream_Write(This->stm, &pad, - sizeof(DWORD) - keyLen % sizeof(DWORD), &count); + c->hr = IStream_Write(This->stm, &pad, pad_len, &count); if (FAILED(c->hr)) goto end; - c->bytesWritten += sizeof(DWORD) - keyLen % sizeof(DWORD); + c->bytesWritten += pad_len; } } else { - DWORD keyLen; - StorageUtl_WriteDWord((LPBYTE)&keyLen, 0, strlen((LPCSTR)key) + 1); c->hr = IStream_Write(This->stm, &keyLen, sizeof(keyLen), &count); if (FAILED(c->hr)) -- 2.24.0

2 6

[PATCH] shell32: Partially implement ShellLink_AddDataBlock
by Vijay Kiran Kamuju 12 Dec '19

12 Dec '19

Wine Bug: https://bugs.winehq.org/show_bug.cgi?id=38171 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/shell32/shelllink.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 0dfb81c6e7..5831a9046e 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2228,8 +2228,11 @@ ShellLink_DataList_Release( IShellLinkDataList* iface ) static HRESULT WINAPI ShellLink_AddDataBlock( IShellLinkDataList* iface, void* pDataBlock ) { - FIXME("(%p)->(%p): stub\n", iface, pDataBlock); - return E_NOTIMPL; + DATABLOCK_HEADER *hdr = (DATABLOCK_HEADER *)pDataBlock; + + FIXME("(%p)->(%p) (Size: %d - Signature: %08x): partially implemented.\n", iface, pDataBlock, hdr->cbSize, hdr->dwSignature); + + return S_OK; } static HRESULT WINAPI -- 2.21.0

1 0

[PATCH] wininet: Fix the spelling of a comment.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wininet/ftp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 5e21076953e..94491689df9 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -3928,7 +3928,7 @@ static DWORD FTP_SetResponseError(DWORD dwResponse) dwCode = ERROR_INTERNET_CANNOT_CONNECT; break; - case 426: /* Connection closed, transer aborted. */ + case 426: /* Connection closed, transfer aborted. */ dwCode = ERROR_INTERNET_CONNECTION_ABORTED; break; -- 2.20.1

2 1

[PATCH v2 1/4] kernelbase: Support PROC_THREAD_ATTRIBUTE_PARENT_PROCESS in CreateProcessInternalW().
by Paul Gofman 12 Dec '19

12 Dec '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - don't use INVALID_HANDLE_VALUE to return an error on zero parent. dlls/kernelbase/process.c | 88 ++++++++++++++++++++++++++------------- 1 file changed, 59 insertions(+), 29 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 90ea299416..d6106eb5f6 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -244,7 +244,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename */ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES *tsa, BOOL inherit, DWORD flags, RTL_USER_PROCESS_PARAMETERS *params, - RTL_USER_PROCESS_INFORMATION *info ) + RTL_USER_PROCESS_INFORMATION *info, HANDLE parent ) { NTSTATUS status; UNICODE_STRING nameW; @@ -257,7 +257,7 @@ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES status = RtlCreateUserProcess( &nameW, OBJ_CASE_INSENSITIVE, params, psa ? psa->lpSecurityDescriptor : NULL, tsa ? tsa->lpSecurityDescriptor : NULL, - 0, inherit, 0, 0, info ); + parent, inherit, 0, 0, info ); RtlFreeUnicodeString( &nameW ); } return status; @@ -288,7 +288,7 @@ static NTSTATUS create_vdm_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE winevdm, params->ImagePathName.Buffer, params->CommandLine.Buffer ); RtlInitUnicodeString( &params->ImagePathName, winevdm ); RtlInitUnicodeString( &params->CommandLine, newcmdline ); - status = create_nt_process( psa, tsa, inherit, flags, params, info ); + status = create_nt_process( psa, tsa, inherit, flags, params, info, NULL ); HeapFree( GetProcessHeap(), 0, newcmdline ); return status; } @@ -316,7 +316,7 @@ static NTSTATUS create_cmd_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE swprintf( newcmdline, len, L"%s /s/c \"%s\"", comspec, params->CommandLine.Buffer ); RtlInitUnicodeString( &params->ImagePathName, comspec ); RtlInitUnicodeString( &params->CommandLine, newcmdline ); - status = create_nt_process( psa, tsa, inherit, flags, params, info ); + status = create_nt_process( psa, tsa, inherit, flags, params, info, NULL ); RtlFreeHeap( GetProcessHeap(), 0, newcmdline ); return status; } @@ -368,7 +368,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessAsUserW( HANDLE token, const WCHAR *a inherit, flags, env, cur_dir, startup_info, info, NULL ); } - /********************************************************************** * CreateProcessInternalA (kernelbase.@) */ @@ -382,7 +381,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalA( HANDLE token, const char * BOOL ret = FALSE; WCHAR *app_nameW = NULL, *cmd_lineW = NULL, *cur_dirW = NULL; UNICODE_STRING desktopW, titleW; - STARTUPINFOW infoW; + STARTUPINFOEXW infoW; desktopW.Buffer = NULL; titleW.Buffer = NULL; @@ -393,12 +392,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalA( HANDLE token, const char * if (startup_info->lpDesktop) RtlCreateUnicodeStringFromAsciiz( &desktopW, startup_info->lpDesktop ); if (startup_info->lpTitle) RtlCreateUnicodeStringFromAsciiz( &titleW, startup_info->lpTitle ); - memcpy( &infoW, startup_info, sizeof(infoW) ); - infoW.lpDesktop = desktopW.Buffer; - infoW.lpTitle = titleW.Buffer; + memcpy( &infoW.StartupInfo, startup_info, sizeof(infoW.StartupInfo) ); + infoW.StartupInfo.lpDesktop = desktopW.Buffer; + infoW.StartupInfo.lpTitle = titleW.Buffer; + + if (flags & EXTENDED_STARTUPINFO_PRESENT) + infoW.lpAttributeList = ((STARTUPINFOEXW *)startup_info)->lpAttributeList; ret = CreateProcessInternalW( token, app_nameW, cmd_lineW, process_attr, thread_attr, - inherit, flags, env, cur_dirW, &infoW, info, new_token ); + inherit, flags, env, cur_dirW, (STARTUPINFOW *)&infoW, info, new_token ); done: RtlFreeHeap( GetProcessHeap(), 0, app_nameW ); RtlFreeHeap( GetProcessHeap(), 0, cmd_lineW ); @@ -408,6 +410,22 @@ done: return ret; } +struct proc_thread_attr +{ + DWORD_PTR attr; + SIZE_T size; + void *value; +}; + +struct _PROC_THREAD_ATTRIBUTE_LIST +{ + DWORD mask; /* bitmask of items in list */ + DWORD size; /* max number of items in list */ + DWORD count; /* number of items in list */ + DWORD pad; + DWORD_PTR unk; + struct proc_thread_attr attrs[1]; +}; /********************************************************************** * CreateProcessInternalW (kernelbase.@) @@ -423,6 +441,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR WCHAR *p, *tidy_cmdline = cmd_line; RTL_USER_PROCESS_PARAMETERS *params = NULL; RTL_USER_PROCESS_INFORMATION rtl_info; + HANDLE parent = NULL; NTSTATUS status; /* Process the AppName and/or CmdLine to get module name and path */ @@ -473,7 +492,36 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR goto done; } - status = create_nt_process( process_attr, thread_attr, inherit, flags, params, &rtl_info ); + if (flags & EXTENDED_STARTUPINFO_PRESENT) + { + struct _PROC_THREAD_ATTRIBUTE_LIST *attrs = + (struct _PROC_THREAD_ATTRIBUTE_LIST *)((STARTUPINFOEXW *)startup_info)->lpAttributeList; + unsigned int i; + + if (attrs) + { + for (i = 0; i < attrs->count; ++i) + { + switch(attrs->attrs[i].attr) + { + case PROC_THREAD_ATTRIBUTE_PARENT_PROCESS: + parent = *(HANDLE *)attrs->attrs[i].value; + TRACE("PROC_THREAD_ATTRIBUTE_PARENT_PROCESS parent %p.\n", parent); + if (!parent) + { + status = STATUS_INVALID_HANDLE; + goto done; + } + break; + default: + FIXME("Unsupported attribute %#lx.\n", attrs->attrs[i].attr); + break; + } + } + } + } + + status = create_nt_process( process_attr, thread_attr, inherit, flags, params, &rtl_info, parent ); switch (status) { case STATUS_SUCCESS: @@ -1301,24 +1349,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetEnvironmentVariableW( LPCWSTR name, LPCWSTR val * Process/thread attribute lists ***********************************************************************/ - -struct proc_thread_attr -{ - DWORD_PTR attr; - SIZE_T size; - void *value; -}; - -struct _PROC_THREAD_ATTRIBUTE_LIST -{ - DWORD mask; /* bitmask of items in list */ - DWORD size; /* max number of items in list */ - DWORD count; /* number of items in list */ - DWORD pad; - DWORD_PTR unk; - struct proc_thread_attr attrs[1]; -}; - /*********************************************************************** * InitializeProcThreadAttributeList (kernelbase.@) */ -- 2.23.0

3 9

[PATCH] msxml3: Fix the spelling of some comments.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msxml3/node.c | 2 +- dlls/msxml3/tests/domdoc.c | 2 +- dlls/msxml3/tests/saxreader.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 27abf945301..35777d65918 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -432,7 +432,7 @@ int xmlnode_get_inst_cnt(xmlnode *node) } /* _private field holds a number of COM instances spawned from this libxml2 node - * most significant bits are used to store information about ignorrable whitespace nodes */ + * most significant bits are used to store information about ignorable whitespace nodes */ void xmlnode_add_ref(xmlNodePtr node) { if (node->type == XML_DOCUMENT_NODE) return; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index aa4c7a28321..843343aa00b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4865,7 +4865,7 @@ static void test_XPath(void) EXPECT_HR(hr, S_OK); expect_list_and_release(list, "E2.D1"); - /* peform xpath tests */ + /* perform xpath tests */ for ( ; xptest->query ; xptest++ ) { char *str; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 4e77b00a639..44b5e1bcb5f 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3172,7 +3172,7 @@ static void test_mxwriter_properties(void) ok(hr == E_INVALIDARG, "got %08x\n", hr); SysFreeString(str); - /* test case sensivity */ + /* test case sensitivity */ hr = IMXWriter_put_encoding(writer, _bstr_("utf-8")); EXPECT_HR(hr, S_OK); str = (void*)0xdeadbeef; @@ -5639,7 +5639,7 @@ static void test_mxattr_localname(void) hr = ISAXAttributes_getIndexFromName(saxattr, NULL, 0, NULL, 0, &index); EXPECT_HR(hr, E_INVALIDARG); - /* add some ambiguos attribute names */ + /* add some ambiguous attribute names */ hr = IMXAttributes_addAttribute(mxattr, _bstr_("uri"), _bstr_("localname"), _bstr_("a:localname"), _bstr_(""), _bstr_("value")); EXPECT_HR(hr, S_OK); -- 2.20.1

1 0

[PATCH] oleaut32: Fix the spelling of some comments.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/oleaut32/dispatch.c | 2 +- dlls/oleaut32/tests/vartype.c | 2 +- dlls/oleaut32/typelib.c | 2 +- dlls/oleaut32/typelib.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index 7e6398a1621..39d6fddee51 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -176,7 +176,7 @@ done: * (linked at run-time), as opposed to early-bound (linked at compile time). * * The interface is used by objects that wish to called by scripting - * languages such as VBA, in order to minimise the amount of COM and C/C++ + * languages such as VBA, in order to minimize the amount of COM and C/C++ * knowledge required, or by objects that wish to live out of process from code * that will call their methods. * diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 7daf2f032ce..8a498defbc0 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5934,7 +5934,7 @@ static void test_bstr_cache(void) str = SysAllocStringLen(NULL, 24); ok(str == strs[0], "str != strs[0]\n"); - /* Smaller buffers may also use larget cached buffers */ + /* Smaller buffers may also use larger cached buffers */ str2 = SysAllocStringLen(NULL, 16); ok(str2 == strs[1], "str2 != strs[1]\n"); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 528fe6372c1..451753e23b1 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4202,7 +4202,7 @@ static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, letter of the name, else the next WORD is an offset to the arg type and paramName points to the first letter. So let's take one char off paramName and see if we're - pointing at an alpha-numeric char. However if *pArg is + pointing at an alphanumeric char. However if *pArg is 0xffff or 0xfffe then the param has no name, the former meaning that the next WORD is the type, the latter meaning that the next WORD is an offset to the type. */ diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 71e8d080c44..9c700b11a76 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -325,7 +325,7 @@ typedef struct { } SLTG_BlkEntry; /* The order of the blocks in the file is given by starting at Block - entry firt_blk and stepping through using the next pointer */ + entry first_blk and stepping through using the next pointer */ /* These then get followed by this magic */ typedef struct { -- 2.20.1

1 0

[PATCH] ntdll: Fix the spelling of some comments.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/file.c | 2 +- dlls/ntdll/sync.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index a65703d6f9e..26acc066cd7 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3281,7 +3281,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io * restart [I] restart EA scan * * RETURNS - * Success: 0. Atrributes read into buffer + * Success: 0. Attributes read into buffer * Failure: An NTSTATUS error code describing the error. */ NTSTATUS WINAPI NtQueryEaFile( HANDLE hFile, PIO_STATUS_BLOCK iosb, PVOID buffer, ULONG length, diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 35b89df52ed..0dc6fc33900 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2143,8 +2143,8 @@ void WINAPI RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) * RtlTryAcquireSRWLockExclusive (NTDLL.@) * * NOTES - * Similar to AcquireSRWLockExclusive recusive calls are not allowed - * and will fail with return value FALSE. + * Similarly to AcquireSRWLockExclusive, recursive calls are not allowed + * and will fail with a FALSE return value. */ BOOLEAN WINAPI RtlTryAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) { -- 2.20.1

1 0

[PATCH] usp10: Fix the spelling of some comments.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/usp10/bidi.c | 4 ++-- dlls/usp10/shape.c | 2 +- dlls/usp10/usp10.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 34ca955dcb1..e1d0a11697d 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -72,7 +72,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(bidi); Note: The list of bidirectional character types here is not grouped the - same way as the table 3-7, since the numberic values for the types + same way as the table 3-7, since the numeric values for the types are chosen to keep the state and action tables compact. ------------------------------------------------------------------------*/ enum directions @@ -1083,7 +1083,7 @@ search: } /************************************************************* - * BIDI_DeterminLevels + * BIDI_DetermineLevels */ BOOL BIDI_DetermineLevels( const WCHAR *lpString, /* [in] The string for which information is to be returned */ diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 86e80aacd5f..8d5d1265fa5 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -998,7 +998,7 @@ static inline BOOL left_join_causing(CHAR joining_type) static inline BOOL word_break_causing(WCHAR chr) { - /* we are working within a string of characters already guareented to + /* we are working within a string of characters already guaranteed to be within one script, Syriac, so we do not worry about any character other than the space character outside of that range */ return (chr == 0 || chr == 0x20 ); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index f66e85cc485..dd6a8543566 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3009,7 +3009,7 @@ HRESULT WINAPI ScriptXtoCP(int iX, else /* (glyph_index >= cGlyphs) */ i = cChars; - /* If not snaping in the reverse direction (such as Hebrew) Then 0 + /* If not snapping in the reverse direction (such as Hebrew) Then 0 point flow to the next character */ if (direction < 0) { -- 2.20.1

1 0

[PATCH] ole32: Fix the spelling of a couple of comments.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ole32/ifs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index ea03e9b0a28..9c7cb0977f8 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -60,7 +60,7 @@ typedef struct { /* this is the static object instance */ static _Malloc32 Malloc32 = {{&VT_IMalloc32}, 0, NULL, 0, 0, NULL, 0}; -/* with a spy active all calls from pre to post methods are threadsave */ +/* with a spy active all calls from pre to post methods are threadsafe */ static CRITICAL_SECTION IMalloc32_SpyCS; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -285,8 +285,8 @@ static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) * * NOTES * FIXME returns: - * win95: size allocated (4 byte boundarys) - * win2k: size originally requested !!! (allocated on 8 byte boundarys) + * win95: size allocated (4 byte boundaries) + * win2k: size originally requested !!! (allocated on 8 byte boundaries) */ static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *pv) { -- 2.20.1

1 0

[PATCH] wineps.drv: Avoid unneeded abbreviations in comments.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wineps.drv/ppd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index aa013940fe7..662dbe6db7e 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -283,7 +283,7 @@ static BOOL get_line( char *buf, int size, struct map_context *ctx ) * * PSDRV_PPDGetInvocationValue * - * Passed string that should be surrounded by `"'s, return string alloced + * Passed string that should be surrounded by `"'s, return string allocated * from process heap. */ static BOOL PSDRV_PPDGetInvocationValue(struct map_context *ctx, PPDTuple *tuple) @@ -318,7 +318,7 @@ static BOOL PSDRV_PPDGetInvocationValue(struct map_context *ctx, PPDTuple *tuple * PSDRV_PPDGetQuotedValue * * Passed string that should be surrounded by `"'s. Expand <xx> as hex - * return string alloced from process heap. + * return string allocated from process heap. */ static BOOL PSDRV_PPDGetQuotedValue(struct map_context *ctx, PPDTuple *tuple) { @@ -517,7 +517,7 @@ static DUPLEX *get_duplex( PPD *ppd, const char *name ) * * PSDRV_PPDGetWord * - * Returns ptr alloced from heap to first word in str. Strips leading spaces. + * Returns ptr allocated from heap to first word in str. Strips leading spaces. * Puts ptr to next word in next */ static char *PSDRV_PPDGetWord(char *str, char **next) -- 2.20.1

1 0

[PATCH] include: Fix the spelling of some comments.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/objbase.h | 2 +- include/winbase.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/objbase.h b/include/objbase.h index 78ec6d366db..75280d6de70 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -146,7 +146,7 @@ * - Each method is declared as a pointer to function field in the jump table. The implementation * will fill this jump table with appropriate values, probably using a static variable, and * initialize the lpVtbl field to point to this variable. - * - The IDirect3D_Xxx macros then just derefence the lpVtbl pointer and use the function pointer + * - The IDirect3D_Xxx macros then just dereference the lpVtbl pointer and use the function pointer * corresponding to the macro name. This emulates the behavior of a virtual table and should be * just as fast. * - This C code should be quite compatible with the Windows headers both for code that uses COM diff --git a/include/winbase.h b/include/winbase.h index 7b7f9f26bd2..2781229fa1e 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1288,7 +1288,7 @@ typedef struct COPYFILE2_EXTENDED_PARAMETERS #define ACTCTX_FLAG_SOURCE_IS_ASSEMBLYREF (0x00000040) #define ACTCTX_FLAG_HMODULE_VALID (0x00000080) -/* flags to DeactiveActCtx */ +/* flags to DeactivateActCtx */ #define DEACTIVATE_ACTCTX_FLAG_FORCE_EARLY_DEACTIVATION (0x00000001) /* flags to FindActCtxSection{Guid,String[AW]} */ -- 2.20.1

1 0

[PATCH] ucrtbase: Use given context in wcstok.
by Daniel Lehman 12 Dec '19

12 Dec '19

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- breaking change in 2015 for wcstok: https://docs.microsoft.com/en-us/cpp/porting/visual-cpp-change-history-2003… compilation will fail if only 2 arguments are provided: 1>: error C4996: 'wcstok': wcstok has been changed to conform with the ISO C standard, adding an extra context parameter. To use the legacy Microsoft wcstok, define _CRT_NON_CONFORMING_WCSTOK. 1>C:\Program Files (x86)\Windows Kits\10\Include\10.0.18362.0\ucrt\corecrt_wstring.h(261): message : see declaration of 'wcstok' --- dlls/msvcrt/wcs.c | 9 +++++++++ dlls/ucrtbase/tests/string.c | 30 ++++++++++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1ae292423c0..a7bfb4ba2db 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1707,10 +1707,19 @@ MSVCRT_wchar_t * CDECL MSVCRT_wcstok_s( MSVCRT_wchar_t *str, const MSVCRT_wchar_ /********************************************************************* * wcstok (MSVCRT.@) */ +#if _MSVCR_VER>=140 +MSVCRT_wchar_t * CDECL MSVCRT_wcstok( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *delim, MSVCRT_wchar_t **ctx ) +{ + if (!ctx) + ctx = &msvcrt_get_thread_data()->wcstok_next; + return MSVCRT_wcstok_s(str, delim, ctx); +} +#else MSVCRT_wchar_t * CDECL MSVCRT_wcstok( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *delim ) { return MSVCRT_wcstok_s(str, delim, &msvcrt_get_thread_data()->wcstok_next); } +#endif /********************************************************************* * _wctomb_s_l (MSVCRT.@) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index bfa602c5387..5ef638e44ac 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -83,6 +83,7 @@ static void (__cdecl *p__free_locale)(_locale_t); static int (__cdecl *p__getmbcp)(void); static int (__cdecl *p__setmbcp)(int); static size_t (__cdecl *p__mbsspn)(const unsigned char*, const unsigned char*); +static wchar_t* (__cdecl *p_wcstok)(wchar_t*, const wchar_t*, wchar_t**); static BOOL init(void) { @@ -110,6 +111,7 @@ static BOOL init(void) p__getmbcp = (void*)GetProcAddress(module, "_getmbcp"); p__setmbcp = (void*)GetProcAddress(module, "_setmbcp"); p__mbsspn = (void*)GetProcAddress(module, "_mbsspn"); + p_wcstok = (void*)GetProcAddress(module, "wcstok"); return TRUE; } @@ -390,6 +392,33 @@ static void test_mbsspn( void) p__setmbcp(cp); } +static void test_wcstok(void) +{ + static const wchar_t *input = L"two words"; + wchar_t buffer[16]; + wchar_t *token; + wchar_t *next; + + next = NULL; + wcscpy(buffer, input); + token = p_wcstok(buffer, L" ", &next); + ok(!wcscmp(L"two", token), "expected \"two\", got \"%ls\"\n", token); + ok(next == token + 4, "expected %p, got %p\n", token + 4, next); + token = p_wcstok(NULL, L" ", &next); + ok(!wcscmp(L"words", token), "expected \"words\", got \"%ls\"\n", token); + ok(next == token + 5, "expected %p, got %p\n", token + 5, next); + token = p_wcstok(NULL, L" ", &next); + ok(!token, "expected NULL, got %p\n", token); + + wcscpy(buffer, input); + token = p_wcstok(buffer, L" ", NULL); + ok(!wcscmp(L"two", token), "expected \"two\", got \"%ls\"\n", token); + token = p_wcstok(NULL, L" ", NULL); + ok(!wcscmp(L"words", token), "expected \"words\", got \"%ls\"\n", token); + token = p_wcstok(NULL, L" ", NULL); + ok(!token, "expected NULL, got %p\n", token); +} + START_TEST(string) { if (!init()) return; @@ -399,4 +428,5 @@ START_TEST(string) test___strncnt(); test_C_locale(); test_mbsspn(); + test_wcstok(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a262cc63459..64102f59cd4 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2579,7 +2579,7 @@ @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstof(ptr ptr) MSVCRT_wcstof @ stub wcstoimax -@ cdecl wcstok(wstr wstr) MSVCRT_wcstok +@ cdecl wcstok(wstr wstr ptr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl wcstol(wstr ptr long) MSVCRT_wcstol @ stub wcstold -- 2.17.1

1 0

[PATCH] wine.inf: add powershell location to the path
by Louis Lenders 12 Dec '19

12 Dec '19

On win7 the location of powershell is present in the path (could not check on other versions) --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d324461c6e..d62fd5065b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -624,7 +624,7 @@ HKLM,%Control%\Session Manager,HeapDeCommitTotalFreeThreshold,0x00040002,0 HKLM,%Control%\Session Manager,HeapSegmentCommit,0x00040002,0 HKLM,%Control%\Session Manager,HeapSegmentReserve,0x00040002,0 HKLM,%Control%\Session Manager\Environment,"ComSpec",0x00020000,"%11%\cmd.exe" -HKLM,%Control%\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem" +HKLM,%Control%\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem;%11%\WindowsPowershell\v1.0" HKLM,%Control%\Session Manager\Environment,"PATHEXT",,".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH" HKLM,%Control%\Session Manager\Environment,"SystemDrive",2,"c:" HKLM,%Control%\Session Manager\Environment,"SYSTEMROOT",,"%10%" -- 2.24.0

1 0

[PATCH] include: Add cdosys.idl
by Alistair Leslie-Hughes 12 Dec '19

12 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/cdosys.idl | 243 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 244 insertions(+) create mode 100644 include/cdosys.idl diff --git a/include/Makefile.in b/include/Makefile.in index 2e9a921df7..7f73ee9010 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -51,6 +51,7 @@ SOURCES = \ bluetoothapis.h \ bthsdpdef.h \ cderr.h \ + cdosys.idl \ cfgmgr32.h \ cguid.h \ chprst.idl \ diff --git a/include/cdosys.idl b/include/cdosys.idl new file mode 100644 index 0000000000..8aee555058 --- /dev/null +++ b/include/cdosys.idl @@ -0,0 +1,243 @@ +/* + * Copyright (C) 2019 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 + */ +import "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; + +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + +[ + uuid(cd000000-8b95-11d1-82db-00c04fb1625d), + version(1.0) +] +library CDO +{ + importlib("stdole2.tlb"); + + interface _Stream; + interface IBodyPart; + interface IBodyParts; + interface IConfiguration; + interface IDataSource; + interface Fields; + + typedef enum + { + cdoDSNDefault = 0, + cdoDSNNever = 1, + cdoDSNFailure = 2, + cdoDSNSuccess = 4, + cdoDSNDelay = 8, + cdoDSNSuccessFailOrDelay = 14 + } CdoDSNOptions; + + typedef enum + { + cdoRefTypeId = 0, + cdoRefTypeLocation = 1 + } CdoReferenceType; + + typedef enum + { + cdoSuppressNone = 0, + cdoSuppressImages = 1, + cdoSuppressBGSounds = 2, + cdoSuppressFrames = 4, + cdoSuppressObjects = 8, + cdoSuppressStyleSheets = 16, + cdoSuppressAll = 31 + } CdoMHTMLFlags; + + [ + odl, + uuid(cd000020-8b95-11d1-82db-00c04fb1625d), + dual, + nonextensible, + oleautomation + ] + interface IMessage : IDispatch + { + [id(0x00000065), propget] + HRESULT BCC([out, retval] BSTR *bcc); + [id(0x00000065), propput] + HRESULT BCC([in] BSTR bcc); + + [id(0x00000067), propget] + HRESULT CC([out, retval] BSTR *cc); + [id(0x00000067), propput] + HRESULT CC([in] BSTR cc); + + [id(0x00000069), propget] + HRESULT FollowUpTo([out, retval] BSTR *follow); + [id(0x00000069), propput] + HRESULT FollowUpTo([in] BSTR follow); + + [id(0x0000006a), propget] + HRESULT From([out, retval] BSTR *from); + [id(0x0000006a), propput] + HRESULT From([in] BSTR from); + + [id(0x0000006b), propget] + HRESULT Keywords([out, retval] BSTR* keywords); + [id(0x0000006b), propput] + HRESULT Keywords([in] BSTR keywords); + + [id(0x0000006e), propget] + HRESULT MimeFormatted([out, retval] VARIANT_BOOL *formatted); + [id(0x0000006e), propput] + HRESULT MimeFormatted([in] VARIANT_BOOL formatted); + + [id(0x0000006f), propget] + HRESULT Newsgroups([out, retval] BSTR *newsgroups); + [id(0x0000006f), propput] + HRESULT Newsgroups([in] BSTR newsgroups); + [id(0x00000070), propget] + + HRESULT Organization([out, retval] BSTR *organization); + [id(0x00000070), propput] + HRESULT Organization([in] BSTR organization); + + [id(0x00000072), propget] + HRESULT ReceivedTime([out, retval] DATE *received); + + [id(0x00000073), propget] + HRESULT ReplyTo([out, retval] BSTR *reply); + [id(0x00000073), propput] + HRESULT ReplyTo([in] BSTR reply); + + [id(0x00000074), propget] + HRESULT DSNOptions([out, retval] CdoDSNOptions *options); + [id(0x00000074), propput] + HRESULT DSNOptions([in] CdoDSNOptions options); + + [id(0x00000077), propget] + HRESULT SentOn([out, retval] DATE *sent); + + [id(0x00000078), propget] + HRESULT Subject([out, retval] BSTR *subject); + [id(0x00000078), propput] + HRESULT Subject([in] BSTR subject); + + [id(0x00000079), propget] + HRESULT To([out, retval] BSTR *to); + [id(0x00000079), propput] + HRESULT To([in] BSTR to); + + [id(0x0000007b), propget] + HRESULT TextBody([out, retval] BSTR *body); + [id(0x0000007b), propput] + HRESULT TextBody([in] BSTR body); + + [id(0x0000007c)] + HRESULT HTMLBody([out, retval] BSTR* body); + [id(0x0000007c), propput] + HRESULT HTMLBody([in] BSTR body); + + [id(0x0000007d), propget] + HRESULT Attachments([out, retval] IBodyParts **attachments); + + [id(0x0000007e), propget] + HRESULT Sender([out, retval] BSTR *sender); + [id(0x0000007e), propput] + HRESULT Sender([in] BSTR sender); + + [id(0x0000007f), propget] + HRESULT Configuration([out, retval] IConfiguration **config); + [id(0x0000007f), propput] + HRESULT Configuration([in] IConfiguration *config); + [id(0x0000007f), propputref] + HRESULT Configuration([in] IConfiguration *config); + + [id(0x00000080), propget] + HRESULT AutoGenerateTextBody([out, retval] VARIANT_BOOL *body); + [id(0x00000080), propput] + HRESULT AutoGenerateTextBody([in] VARIANT_BOOL body); + + [id(0x00000081), propget] + HRESULT EnvelopeFields([out, retval] Fields **fields); + + [id(0x00000082), propget] + HRESULT TextBodyPart([out, retval] IBodyPart **body); + [id(0x00000083), propget] + HRESULT HTMLBodyPart([out, retval] IBodyPart **body); + + [id(0x00000084), propget] + HRESULT BodyPart([out, retval] IBodyPart ** part); + + [id(0x00000085), propget] + HRESULT DataSource([out, retval] IDataSource **datasource); + + [id(0x00000086), propget] + HRESULT Fields([out, retval] Fields **fields); + + [id(0x00000087), propget] + HRESULT MDNRequested([out, retval] VARIANT_BOOL* requested); + [id(0x00000087), propput] + HRESULT MDNRequested([in] VARIANT_BOOL requested); + + [id(0x00000096)] + HRESULT AddRelatedBodyPart([in] BSTR url, [in] BSTR Reference, [in] CdoReferenceType ReferenceType, + [in, optional] BSTR username, [in, optional] BSTR password, [out, retval] IBodyPart **body); + [id(0x00000097)] + HRESULT AddAttachment([in] BSTR url, [in, optional] BSTR username, + [in, optional] BSTR password, [out, retval] IBodyPart **body); + + [id(0x00000098)] + HRESULT CreateMHTMLBody([in] BSTR url, [in, optional, defaultvalue(0)] CdoMHTMLFlags flags, + [in, optional] BSTR username, [in, optional] BSTR password); + + [id(0x00000099)] + HRESULT Forward([out, retval] IMessage **msg); + + [id(0x0000009a)] + HRESULT Post(); + + [id(0x0000009b)] + HRESULT PostReply([out, retval] IMessage **msg); + + [id(0x0000009c)] + HRESULT Reply([out, retval] IMessage **msg); + + [id(0x0000009d)] + HRESULT ReplyAll([out, retval] IMessage **msg); + + [id(0x0000009e)] + HRESULT Send(); + + [id(0x0000009f)] + HRESULT GetStream([out, retval] _Stream **stream); + + [id(0x000000a0)] + HRESULT GetInterface([in] BSTR name, [out, retval] IDispatch **unknown); + }; + + [ + uuid(cd000001-8b95-11d1-82db-00c04fb1625d) + ] + coclass Message + { + [default] interface IMessage; + interface IDataSource; + interface IBodyPart; + }; +} + -- 2.17.1

1 0

[PATCH vkd3d v2 0/5] vkd3d: Add more null resources.
by Conor McCarthy 12 Dec '19

12 Dec '19

An attempt to create a null resource view of an unsupported type leaves the descriptor uninitialised without having any means of indicating that an error occurred. Hitman 2 uses all of these view types. Conor McCarthy (5): vkd3d: Use helper functions for null resource initialisation. vkd3d: Add 1D null resources. vkd3d: Add 2D multisampled null resources. vkd3d: Add 3D null resources. vkd3d: Add cubic null resource. libs/vkd3d/resource.c | 363 +++++++++++++++++++++++++++---------- libs/vkd3d/vkd3d_private.h | 15 ++ 2 files changed, 280 insertions(+), 98 deletions(-) -- 2.24.0

1 5

[PATCH 1/8] wineqtdecoder: Store the sink as a strmbase_sink structure.
by Zebediah Figura 12 Dec '19

12 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wineqtdecoder/qtsplitter.c | 43 ++++++++++++++------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index d861110f5f1..c8a34cbf95e 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -138,7 +138,7 @@ typedef struct QTOutPin { } QTOutPin; typedef struct QTInPin { - struct strmbase_pin pin; + struct strmbase_sink pin; GUID subType; IAsyncReader *pReader; @@ -199,7 +199,7 @@ static inline QTSplitter *impl_from_IBaseFilter( IBaseFilter *iface ) static inline QTInPin *impl_from_IPin(IPin *iface) { - return CONTAINING_RECORD(iface, QTInPin, pin.IPin_iface); + return CONTAINING_RECORD(iface, QTInPin, pin.pin.IPin_iface); } /* @@ -211,7 +211,7 @@ static struct strmbase_pin *qt_splitter_get_pin(struct strmbase_filter *base, un QTSplitter *filter = impl_from_strmbase_filter(base); if (index == 0) - return &filter->pInputPin.pin; + return &filter->pInputPin.pin.pin; else if (index == 1) { if (filter->pVideo_Pin) @@ -232,18 +232,15 @@ static void qt_splitter_destroy(struct strmbase_filter *iface) EnterCriticalSection(&filter->csReceive); /* Don't need to clean up output pins, disconnecting input pin will do that */ + if (filter->pInputPin.pin.pin.peer) + IPin_Disconnect(filter->pInputPin.pin.pin.peer); - if (filter->pInputPin.pin.peer) - IPin_Disconnect(filter->pInputPin.pin.peer); - - FreeMediaType(&filter->pInputPin.pin.mt); if (filter->pInputPin.pAlloc) IMemAllocator_Release(filter->pInputPin.pAlloc); filter->pInputPin.pAlloc = NULL; if (filter->pInputPin.pReader) IAsyncReader_Release(filter->pInputPin.pReader); filter->pInputPin.pReader = NULL; - filter->pInputPin.pin.IPin_iface.lpVtbl = NULL; if (filter->pQTMovie) { @@ -274,6 +271,7 @@ static void qt_splitter_destroy(struct strmbase_filter *iface) filter->csReceive.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->csReceive); + strmbase_sink_cleanup(&filter->pInputPin.pin); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); @@ -333,10 +331,10 @@ static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE return S_FALSE; } -static const BasePinFuncTable sink_ops = +static const struct strmbase_sink_ops sink_ops = { - .pin_query_accept = sink_query_accept, - .pin_get_media_type = strmbase_pin_get_media_type, + .base.pin_query_accept = sink_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, }; IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) @@ -357,6 +355,8 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) ZeroMemory(This,sizeof(*This)); strmbase_filter_init(&This->filter, outer, &CLSID_QTSplitter, &filter_ops); + strmbase_sink_init(&This->pInputPin.pin, &QT_InputPin_Vtbl, &This->filter, + wcsInputPinName, &sink_ops, NULL); InitializeCriticalSection(&This->csReceive); This->csReceive.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": QTSplitter.csReceive"); @@ -366,13 +366,6 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) This->aSession = NULL; This->runEvent = CreateEventW(NULL, 0, 0, NULL); - This->pInputPin.pin.dir = PINDIR_INPUT; - This->pInputPin.pin.filter = &This->filter; - lstrcpynW(This->pInputPin.pin.name, wcsInputPinName, ARRAY_SIZE(This->pInputPin.pin.name)); - This->pInputPin.pin.IPin_iface.lpVtbl = &QT_InputPin_Vtbl; - This->pInputPin.pin.peer = NULL; - This->pInputPin.pin.pFuncsTable = &sink_ops; - *phr = S_OK; return &This->filter.IUnknown_inner; } @@ -984,7 +977,7 @@ static HRESULT WINAPI QTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, EnterCriticalSection(&filter->filter.csFilter); This->pReader = NULL; - if (This->pin.peer) + if (This->pin.pin.peer) hr = VFW_E_ALREADY_CONNECTED; else if (IPin_QueryAccept(iface, pmt) != S_OK) hr = VFW_E_TYPE_NOT_ACCEPTED; @@ -1066,22 +1059,22 @@ static HRESULT WINAPI QTInPin_Disconnect(IPin *iface) { HRESULT hr; QTInPin *This = impl_from_IPin(iface); - QTSplitter *filter = impl_from_strmbase_filter(This->pin.filter); + QTSplitter *filter = impl_from_strmbase_filter(This->pin.pin.filter); FILTER_STATE state; TRACE("()\n"); hr = IBaseFilter_GetState(&filter->filter.IBaseFilter_iface, INFINITE, &state); EnterCriticalSection(&filter->filter.csFilter); - if (This->pin.peer) + if (This->pin.pin.peer) { - QTSplitter *Parser = impl_from_strmbase_filter(This->pin.filter); + QTSplitter *Parser = impl_from_strmbase_filter(This->pin.pin.filter); if (SUCCEEDED(hr) && state == State_Stopped) { IMemAllocator_Decommit(This->pAlloc); - IPin_Disconnect(This->pin.peer); - IPin_Release(This->pin.peer); - This->pin.peer = NULL; + IPin_Disconnect(This->pin.pin.peer); + IPin_Release(This->pin.pin.peer); + This->pin.pin.peer = NULL; hr = QT_RemoveOutputPins(Parser); } else -- 2.24.0

2 10

[PATCH 2/2] msado15: Add _Command stub interface
by Alistair Leslie-Hughes 12 Dec '19

12 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/Makefile.in | 1 + dlls/msado15/command.c | 388 +++++++++++++++++++++++++++++++ dlls/msado15/main.c | 5 + dlls/msado15/msado15_classes.idl | 8 + dlls/msado15/msado15_private.h | 1 + dlls/msado15/tests/msado15.c | 28 +++ 6 files changed, 431 insertions(+) create mode 100644 dlls/msado15/command.c diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in index 604f9ff018..9852e0863d 100644 --- a/dlls/msado15/Makefile.in +++ b/dlls/msado15/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = oleaut32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + command.c \ connection.c \ main.c \ recordset.c \ diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c new file mode 100644 index 0000000000..9856b52e91 --- /dev/null +++ b/dlls/msado15/command.c @@ -0,0 +1,388 @@ +/* + * Copyright 2019 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 + */ +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#define COBJMACROS +#include "objbase.h" +#include "msado15_backcompat.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +#include "msado15_private.h" +#include "msado15_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msado); + +struct command +{ + _Command Command_iface; + + LONG ref; +}; + + +static inline struct command *impl_from_Command(_Command *iface) +{ + return CONTAINING_RECORD(iface, struct command, Command_iface); +} + +static HRESULT WINAPI command_QueryInterface(_Command *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_Command(iface); + TRACE("(%p)->(%s, %p)\n", command, debugstr_guid(riid), out); + + *out = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID__ADO) || + IsEqualIID(riid, &IID_Command15) || + IsEqualIID(riid, &IID_Command25) || + IsEqualIID(riid, &IID__Command)) + { + *out = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + _Command_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI command_AddRef(_Command *iface) +{ + struct command *command = impl_from_Command(iface); + TRACE("(%p)\n", command); + + return InterlockedIncrement(&command->ref); +} + +static ULONG WINAPI command_Release(_Command *iface) +{ + struct command *command = impl_from_Command(iface); + LONG ref; + + TRACE("(%p)\n", command); + + ref = InterlockedDecrement(&command->ref); + if (!ref) + heap_free(command); + + return ref; +} + +static HRESULT WINAPI command_GetTypeInfoCount(_Command *iface, UINT *pctinfo) +{ + struct command *command = impl_from_Command(iface); + TRACE("(%p)->()\n", command); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI command_GetTypeInfo(_Command *iface, UINT iTInfo, LCID lcid, ITypeInfo **typeinfo) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%u %u %p)\n", command, iTInfo, lcid, typeinfo); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_GetIDsOfNames(_Command *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%s %p %u %u %p)\n", command, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_Invoke(_Command *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, + UINT *puArgErr) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", command, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Properties(_Command *iface, Properties **props) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, props); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_ActiveConnection(_Command *iface, _Connection **connection) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, connection); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_putref_ActiveConnection(_Command *iface, _Connection *connection) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, connection); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_ActiveConnection(_Command *iface, VARIANT connection) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->()\n", command); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_CommandText(_Command *iface, BSTR *text) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, text); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_CommandText(_Command *iface, BSTR text) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%s)\n", command, debugstr_w(text)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_CommandTimeout(_Command *iface, LONG *timeout) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, timeout); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_CommandTimeout(_Command *iface, LONG timeout) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%d)\n", command, timeout); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Prepared(_Command *iface, VARIANT_BOOL *prepared) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, prepared); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_Prepared(_Command *iface, VARIANT_BOOL prepared) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%d)\n", command, prepared); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_Execute(_Command *iface, VARIANT *recordsaffected, VARIANT *parameters, + LONG options, _Recordset **recordset) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p %p %d %p)\n", command, recordsaffected, parameters, options, recordset); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_CreateParameter(_Command *iface, BSTR name, DataTypeEnum type, + ParameterDirectionEnum direction, LONG size, VARIANT value, _Parameter **parameter) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%s %d %d %d %p)\n", command, debugstr_w(name), type, direction, size, + parameter); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Parameters(_Command *iface, Parameters **parameters) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, parameters); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_CommandType(_Command *iface, CommandTypeEnum cmdtype) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%d)\n", command, cmdtype); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_CommandType(_Command *iface, CommandTypeEnum *cmdtype) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, cmdtype); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Name(_Command *iface, BSTR *name) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, name); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_Name(_Command *iface, BSTR name) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%s)\n", command, debugstr_w(name)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_State(_Command *iface, LONG *state) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_Cancel(_Command *iface) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->()\n", command); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_putref_CommandStream(_Command *iface, IUnknown *stream) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_CommandStream(_Command *iface, VARIANT *stream) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_Dialect(_Command *iface, BSTR dialect) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%s)\n", command, debugstr_w(dialect)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Dialect(_Command *iface, BSTR *dialect) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, dialect); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_NamedParameters(_Command *iface, VARIANT_BOOL namedparameters) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%d)\n", command, namedparameters); + + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_NamedParameters(_Command *iface, VARIANT_BOOL *namedparameters) +{ + struct command *command = impl_from_Command(iface); + FIXME("(%p)->(%p)\n", command, namedparameters); + + return E_NOTIMPL; +} + +static const struct _CommandVtbl command_vtbl = +{ + command_QueryInterface, + command_AddRef, + command_Release, + command_GetTypeInfoCount, + command_GetTypeInfo, + command_GetIDsOfNames, + command_Invoke, + command_get_Properties, + command_get_ActiveConnection, + command_putref_ActiveConnection, + command_put_ActiveConnection, + command_get_CommandText, + command_put_CommandText, + command_get_CommandTimeout, + command_put_CommandTimeout, + command_get_Prepared, + command_put_Prepared, + command_Execute, + command_CreateParameter, + command_get_Parameters, + command_put_CommandType, + command_get_CommandType, + command_get_Name, + command_put_Name, + command_get_State, + command_Cancel, + command_putref_CommandStream, + command_get_CommandStream, + command_put_Dialect, + command_get_Dialect, + command_put_NamedParameters, + command_get_NamedParameters +}; + +HRESULT Command_create( void **out ) +{ + struct command *command; + + TRACE("(%p)\n", out); + + *out = NULL; + + command = heap_alloc(sizeof(*command)); + if (!command) + return E_OUTOFMEMORY; + + command->Command_iface.lpVtbl = &command_vtbl; + command->ref = 1; + + *out = &command->Command_iface; + + return S_OK; +} diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 32ae252337..3115474b84 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -117,6 +117,7 @@ static const struct IClassFactoryVtbl msadocf_vtbl = msadocf_LockServer }; +static struct msadocf command_cf = { { &msadocf_vtbl }, Command_create }; static struct msadocf connection_cf = { { &msadocf_vtbl }, Connection_create }; static struct msadocf recordset_cf = { { &msadocf_vtbl }, Recordset_create }; static struct msadocf stream_cf = { { &msadocf_vtbl }, Stream_create }; @@ -142,6 +143,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) { cf = &stream_cf.IClassFactory_iface; } + else if (IsEqualGUID( clsid, &CLSID_Command )) + { + cf = &command_cf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, obj ); } diff --git a/dlls/msado15/msado15_classes.idl b/dlls/msado15/msado15_classes.idl index 5ede180240..51f8bd77db 100644 --- a/dlls/msado15/msado15_classes.idl +++ b/dlls/msado15/msado15_classes.idl @@ -18,6 +18,14 @@ #pragma makedep register +[ + threading(apartment), + progid("ADODB.Command.6.0"), + vi_progid("ADODB.Command"), + uuid(00000507-0000-0010-8000-00aa006d2ea4) +] +coclass Command { interface _Command; } + [ threading(apartment), progid("ADODB.Connection.6.0"), diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 7239e48b53..f6c60f0304 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -21,6 +21,7 @@ #define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err ) +HRESULT Command_create( void ** ) DECLSPEC_HIDDEN; HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN; HRESULT Stream_create( void ** ) DECLSPEC_HIDDEN; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 5a1813694b..7850c45231 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -444,6 +444,33 @@ if (0) /* Crashes on windows */ _Connection_Release(connection); } +static void test_Command(void) +{ + HRESULT hr; + _Command *command; + _ADO *ado; + Command15 *command15; + Command25 *command25; + + hr = CoCreateInstance(&CLSID_Command, NULL, CLSCTX_INPROC_SERVER, + &IID__Command, (void**)&command); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Command_QueryInterface(command, &IID__ADO, (void**)&ado); + ok( hr == S_OK, "got %08x\n", hr ); + _ADO_Release(ado); + + hr = _Command_QueryInterface(command, &IID_Command15, (void**)&command15); + ok( hr == S_OK, "got %08x\n", hr ); + Command15_Release(command15); + + hr = _Command_QueryInterface(command, &IID_Command25, (void**)&command25); + ok( hr == S_OK, "got %08x\n", hr ); + Command25_Release(command25); + + _Command_Release(command); +} + START_TEST(msado15) { CoInitialize( NULL ); @@ -451,5 +478,6 @@ START_TEST(msado15) test_Fields(); test_Recordset(); test_Stream(); + test_Command(); CoUninitialize(); } -- 2.17.1

2 1

[PATCH 1/2] msado15: Add ISupportErrorInfo support to _Connection
by Alistair Leslie-Hughes 12 Dec '19

12 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 46 +++++++++++++++++++++++++++++++++++- dlls/msado15/tests/msado15.c | 5 ++-- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 037ab52199..80d921d091 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct connection { _Connection Connection_iface; + ISupportErrorInfo ISupportErrorInfo_iface; LONG refs; ObjectStateEnum state; @@ -44,6 +45,11 @@ static inline struct connection *impl_from_Connection( _Connection *iface ) return CONTAINING_RECORD( iface, struct connection, Connection_iface ); } +static inline struct connection *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface) +{ + return CONTAINING_RECORD(iface, struct connection, ISupportErrorInfo_iface); +} + static ULONG WINAPI connection_AddRef( _Connection *iface ) { struct connection *connection = impl_from_Connection( iface ); @@ -64,13 +70,18 @@ static ULONG WINAPI connection_Release( _Connection *iface ) static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid, void **obj ) { - TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %s, %p\n", connection, debugstr_guid(riid), obj ); if (IsEqualGUID( riid, &IID__Connection ) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { *obj = iface; } + else if(IsEqualGUID( riid, &IID_ISupportErrorInfo )) + { + *obj = &connection->ISupportErrorInfo_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -339,12 +350,45 @@ static const struct _ConnectionVtbl connection_vtbl = connection_Cancel }; +static HRESULT WINAPI SupportErrorInfo_QueryInterface(ISupportErrorInfo *iface, REFIID riid, void **obj) +{ + struct connection *connection = impl_from_ISupportErrorInfo( iface ); + return connection_QueryInterface(&connection->Connection_iface, riid, obj); +} + +static ULONG WINAPI SupportErrorInfo_AddRef(ISupportErrorInfo *iface) +{ + struct connection *connection = impl_from_ISupportErrorInfo( iface ); + return connection_AddRef(&connection->Connection_iface); +} + +static ULONG WINAPI SupportErrorInfo_Release(ISupportErrorInfo *iface) +{ + struct connection *connection = impl_from_ISupportErrorInfo( iface ); + return connection_Release(&connection->Connection_iface); +} + +static HRESULT WINAPI SupportErrorInfo_InterfaceSupportsErrorInfo(ISupportErrorInfo *iface, REFIID riid) +{ + struct connection *connection = impl_from_ISupportErrorInfo( iface ); + FIXME("(%p)->(%s)\n", connection, debugstr_guid(riid)); + return S_FALSE; +} + +static const struct ISupportErrorInfoVtbl support_error_vtbl = { + SupportErrorInfo_QueryInterface, + SupportErrorInfo_AddRef, + SupportErrorInfo_Release, + SupportErrorInfo_InterfaceSupportsErrorInfo +}; + HRESULT Connection_create( void **obj ) { struct connection *connection; if (!(connection = heap_alloc( sizeof(*connection) ))) return E_OUTOFMEMORY; connection->Connection_iface.lpVtbl = &connection_vtbl; + connection->ISupportErrorInfo_iface.lpVtbl = &support_error_vtbl; connection->refs = 1; connection->state = adStateClosed; connection->timeout = 30; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 4ef4762ac6..5a1813694b 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -414,9 +414,8 @@ static void test_Connection(void) ok(hr == E_NOINTERFACE, "Unexpected IRunnableObject interface\n"); hr = _Connection_QueryInterface(connection, &IID_ISupportErrorInfo, (void**)&errorinfo); - todo_wine ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); - if (hr == S_OK) - ISupportErrorInfo_Release(errorinfo); + ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); + ISupportErrorInfo_Release(errorinfo); if (0) /* Crashes on windows */ { -- 2.17.1

2 1

[PATCH 9/9] dmcompos: Use the debug functions provided by dmobject.[ch]
by Michael Stefaniuc 12 Dec '19

12 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmcompos/chordmap.c | 4 +- dlls/dmcompos/composer.c | 1 + dlls/dmcompos/dmcompos_main.c | 265 +------------------------------ dlls/dmcompos/dmcompos_private.h | 22 --- dlls/dmcompos/dmobject.c | 247 +++++++++++++++++++++++++++- dlls/dmcompos/dmobject.h | 14 +- 6 files changed, 258 insertions(+), 295 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index 5296970b56..c58857e04c 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -129,7 +129,9 @@ static HRESULT WINAPI chord_IDirectMusicObject_ParseDescriptor(IDirectMusicObjec desc->guidClass = CLSID_DirectMusicChordMap; desc->dwValidData |= DMUS_OBJ_CLASS; - TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (desc)); + TRACE("returning descriptor:\n"); + dump_DMUS_OBJECTDESC(desc); + return S_OK; } diff --git a/dlls/dmcompos/composer.c b/dlls/dmcompos/composer.c index f2d826020d..9fbe1689c6 100644 --- a/dlls/dmcompos/composer.c +++ b/dlls/dmcompos/composer.c @@ -18,6 +18,7 @@ */ #include "dmcompos_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 3428a58b91..b8b3c5d6d2 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -33,6 +33,7 @@ #include "dmusici.h" #include "dmcompos_private.h" +#include "dmobject.h" #include "rpcproxy.h" WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); @@ -213,267 +214,3 @@ HRESULT WINAPI DllUnregisterServer(void) * * */ -/* FOURCC to string conversion for debug messages */ -const char *debugstr_fourcc (DWORD fourcc) { - if (!fourcc) return "'null'"; - return wine_dbg_sprintf ("\'%c%c%c%c\'", - (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); -} - -/* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion(const DMUS_VERSION *version) -{ - if (!version) - return "'null'"; - return wine_dbg_sprintf("'%hu,%hu,%hu,%hu'", - HIWORD(version->dwVersionMS), LOWORD(version->dwVersionMS), - HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); -} - -/* returns name of given GUID */ -const char *debugstr_dmguid (const GUID *id) { - static const guid_info guids[] = { - /* CLSIDs */ - GE(CLSID_AudioVBScript), - GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPathConfig), - GE(CLSID_DirectMusicAuditionTrack), - GE(CLSID_DirectMusicBand), - GE(CLSID_DirectMusicBandTrack), - GE(CLSID_DirectMusicChordMapTrack), - GE(CLSID_DirectMusicChordMap), - GE(CLSID_DirectMusicChordTrack), - GE(CLSID_DirectMusicCollection), - GE(CLSID_DirectMusicCommandTrack), - GE(CLSID_DirectMusicComposer), - GE(CLSID_DirectMusicContainer), - GE(CLSID_DirectMusicGraph), - GE(CLSID_DirectMusicLoader), - GE(CLSID_DirectMusicLyricsTrack), - GE(CLSID_DirectMusicMarkerTrack), - GE(CLSID_DirectMusicMelodyFormulationTrack), - GE(CLSID_DirectMusicMotifTrack), - GE(CLSID_DirectMusicMuteTrack), - GE(CLSID_DirectMusicParamControlTrack), - GE(CLSID_DirectMusicPatternTrack), - GE(CLSID_DirectMusicPerformance), - GE(CLSID_DirectMusicScript), - GE(CLSID_DirectMusicScriptAutoImpSegment), - GE(CLSID_DirectMusicScriptAutoImpPerformance), - GE(CLSID_DirectMusicScriptAutoImpSegmentState), - GE(CLSID_DirectMusicScriptAutoImpAudioPathConfig), - GE(CLSID_DirectMusicScriptAutoImpAudioPath), - GE(CLSID_DirectMusicScriptAutoImpSong), - GE(CLSID_DirectMusicScriptSourceCodeLoader), - GE(CLSID_DirectMusicScriptTrack), - GE(CLSID_DirectMusicSection), - GE(CLSID_DirectMusicSegment), - GE(CLSID_DirectMusicSegmentState), - GE(CLSID_DirectMusicSegmentTriggerTrack), - GE(CLSID_DirectMusicSegTriggerTrack), - GE(CLSID_DirectMusicSeqTrack), - GE(CLSID_DirectMusicSignPostTrack), - GE(CLSID_DirectMusicSong), - GE(CLSID_DirectMusicStyle), - GE(CLSID_DirectMusicStyleTrack), - GE(CLSID_DirectMusicSynth), - GE(CLSID_DirectMusicSynthSink), - GE(CLSID_DirectMusicSysExTrack), - GE(CLSID_DirectMusicTemplate), - GE(CLSID_DirectMusicTempoTrack), - GE(CLSID_DirectMusicTimeSigTrack), - GE(CLSID_DirectMusicWaveTrack), - GE(CLSID_DirectSoundWave), - /* IIDs */ - GE(IID_IDirectMusic), - GE(IID_IDirectMusic2), - GE(IID_IDirectMusic8), - GE(IID_IDirectMusicAudioPath), - GE(IID_IDirectMusicBand), - GE(IID_IDirectMusicBuffer), - GE(IID_IDirectMusicChordMap), - GE(IID_IDirectMusicCollection), - GE(IID_IDirectMusicComposer), - GE(IID_IDirectMusicContainer), - GE(IID_IDirectMusicDownload), - GE(IID_IDirectMusicDownloadedInstrument), - GE(IID_IDirectMusicGetLoader), - GE(IID_IDirectMusicGraph), - GE(IID_IDirectMusicInstrument), - GE(IID_IDirectMusicLoader), - GE(IID_IDirectMusicLoader8), - GE(IID_IDirectMusicObject), - GE(IID_IDirectMusicPatternTrack), - GE(IID_IDirectMusicPerformance), - GE(IID_IDirectMusicPerformance2), - GE(IID_IDirectMusicPerformance8), - GE(IID_IDirectMusicPort), - GE(IID_IDirectMusicPortDownload), - GE(IID_IDirectMusicScript), - GE(IID_IDirectMusicSegment), - GE(IID_IDirectMusicSegment2), - GE(IID_IDirectMusicSegment8), - GE(IID_IDirectMusicSegmentState), - GE(IID_IDirectMusicSegmentState8), - GE(IID_IDirectMusicStyle), - GE(IID_IDirectMusicStyle8), - GE(IID_IDirectMusicSynth), - GE(IID_IDirectMusicSynth8), - GE(IID_IDirectMusicSynthSink), - GE(IID_IDirectMusicThru), - GE(IID_IDirectMusicTool), - GE(IID_IDirectMusicTool8), - GE(IID_IDirectMusicTrack), - GE(IID_IDirectMusicTrack8), - GE(IID_IUnknown), - GE(IID_IPersistStream), - GE(IID_IStream), - GE(IID_IClassFactory), - /* GUIDs */ - GE(GUID_DirectMusicAllTypes), - GE(GUID_NOTIFICATION_CHORD), - GE(GUID_NOTIFICATION_COMMAND), - GE(GUID_NOTIFICATION_MEASUREANDBEAT), - GE(GUID_NOTIFICATION_PERFORMANCE), - GE(GUID_NOTIFICATION_RECOMPOSE), - GE(GUID_NOTIFICATION_SEGMENT), - GE(GUID_BandParam), - GE(GUID_ChordParam), - GE(GUID_CommandParam), - GE(GUID_CommandParam2), - GE(GUID_CommandParamNext), - GE(GUID_IDirectMusicBand), - GE(GUID_IDirectMusicChordMap), - GE(GUID_IDirectMusicStyle), - GE(GUID_MuteParam), - GE(GUID_Play_Marker), - GE(GUID_RhythmParam), - GE(GUID_TempoParam), - GE(GUID_TimeSignature), - GE(GUID_Valid_Start_Time), - GE(GUID_Clear_All_Bands), - GE(GUID_ConnectToDLSCollection), - GE(GUID_Disable_Auto_Download), - GE(GUID_DisableTempo), - GE(GUID_DisableTimeSig), - GE(GUID_Download), - GE(GUID_DownloadToAudioPath), - GE(GUID_Enable_Auto_Download), - GE(GUID_EnableTempo), - GE(GUID_EnableTimeSig), - GE(GUID_IgnoreBankSelectForGM), - GE(GUID_SeedVariations), - GE(GUID_StandardMIDIFile), - GE(GUID_Unload), - GE(GUID_UnloadFromAudioPath), - GE(GUID_Variations), - GE(GUID_PerfMasterTempo), - GE(GUID_PerfMasterVolume), - GE(GUID_PerfMasterGrooveLevel), - GE(GUID_PerfAutoDownload), - GE(GUID_DefaultGMCollection), - GE(GUID_Synth_Default), - GE(GUID_Buffer_Reverb), - GE(GUID_Buffer_EnvReverb), - GE(GUID_Buffer_Stereo), - GE(GUID_Buffer_3D_Dry), - GE(GUID_Buffer_Mono), - GE(GUID_DMUS_PROP_GM_Hardware), - GE(GUID_DMUS_PROP_GS_Capable), - GE(GUID_DMUS_PROP_GS_Hardware), - GE(GUID_DMUS_PROP_DLS1), - GE(GUID_DMUS_PROP_DLS2), - GE(GUID_DMUS_PROP_Effects), - GE(GUID_DMUS_PROP_INSTRUMENT2), - GE(GUID_DMUS_PROP_LegacyCaps), - GE(GUID_DMUS_PROP_MemorySize), - GE(GUID_DMUS_PROP_SampleMemorySize), - GE(GUID_DMUS_PROP_SamplePlaybackRate), - GE(GUID_DMUS_PROP_SetSynthSink), - GE(GUID_DMUS_PROP_SinkUsesDSound), - GE(GUID_DMUS_PROP_SynthSink_DSOUND), - GE(GUID_DMUS_PROP_SynthSink_WAVE), - GE(GUID_DMUS_PROP_Volume), - GE(GUID_DMUS_PROP_WavesReverb), - GE(GUID_DMUS_PROP_WriteLatency), - GE(GUID_DMUS_PROP_WritePeriod), - GE(GUID_DMUS_PROP_XG_Capable), - GE(GUID_DMUS_PROP_XG_Hardware) - }; - - unsigned int i; - - if (!id) return "(null)"; - - for (i = 0; i < ARRAY_SIZE(guids); i++) { - if (IsEqualGUID(id, guids[i].guid)) - return guids[i].name; - } - /* if we didn't find it, act like standard debugstr_guid */ - return debugstr_guid(id); -} - -/* generic flag-dumping function */ -static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ - char buffer[128] = "", *ptr = &buffer[0]; - unsigned int i; - int size = sizeof(buffer); - - for (i=0; i < num_names; i++) - { - if ((flags & names[i].val) || /* standard flag*/ - ((!flags) && (!names[i].val))) { /* zero value only */ - int cnt = snprintf(ptr, size, "%s ", names[i].name); - if (cnt < 0 || cnt >= size) break; - size -= cnt; - ptr += cnt; - } - } - - return wine_dbg_sprintf("%s", buffer); -} - -/* dump DMUS_OBJ flags */ -static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { - static const flag_info flags[] = { - FE(DMUS_OBJ_OBJECT), - FE(DMUS_OBJ_CLASS), - FE(DMUS_OBJ_NAME), - FE(DMUS_OBJ_CATEGORY), - FE(DMUS_OBJ_FILENAME), - FE(DMUS_OBJ_FULLPATH), - FE(DMUS_OBJ_URL), - FE(DMUS_OBJ_VERSION), - FE(DMUS_OBJ_DATE), - FE(DMUS_OBJ_LOADED), - FE(DMUS_OBJ_MEMORY), - FE(DMUS_OBJ_STREAM) - }; - return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); -} - -/* dump whole DMUS_OBJECTDESC struct */ -const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { - if (pDesc) { - char buffer[1024] = "", *ptr = &buffer[0]; - - ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):\n", pDesc); - ptr += sprintf(ptr, " - dwSize = %d\n", pDesc->dwSize); - ptr += sprintf(ptr, " - dwValidData = %s\n", debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); - if (pDesc->dwValidData & DMUS_OBJ_CLASS) ptr += sprintf(ptr, " - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) ptr += sprintf(ptr, " - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) ptr += sprintf(ptr, " - ftDate = FIXME\n"); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) ptr += sprintf(ptr, " - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); - if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", - wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); - if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); - - return wine_dbg_sprintf("%s", buffer); - } else { - return wine_dbg_sprintf("(NULL)"); - } -} diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index 1958c27378..98796875b8 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -65,26 +65,4 @@ typedef struct _DMUS_PRIVATE_CHUNK { DWORD dwSize; /* size of the chunk */ } DMUS_PRIVATE_CHUNK, *LPDMUS_PRIVATE_CHUNK; -/* used for generic dumping (copied from ddraw) */ -typedef struct { - DWORD val; - const char* name; -} flag_info; - -typedef struct { - const GUID *guid; - const char* name; -} guid_info; - -/* used for initialising structs (primarily for DMUS_OBJECTDESC) */ -#define FE(x) { x, #x } -#define GE(x) { &x, #x } - -/* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; -/* returns name of given GUID */ -extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; -/* dump whole DMUS_OBJECTDESC struct */ -extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; - #endif /* __WINE_DMCOMPOS_PRIVATE_H */ diff --git a/dlls/dmcompos/dmobject.c b/dlls/dmcompos/dmobject.c index 25f3198d2b..9ea31ab32a 100644 --- a/dlls/dmcompos/dmobject.c +++ b/dlls/dmcompos/dmobject.c @@ -25,22 +25,257 @@ #include "objbase.h" #include "dmusici.h" #include "dmusicf.h" +#include "dmusics.h" #include "dmobject.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dmobj); WINE_DECLARE_DEBUG_CHANNEL(dmfile); -/* RIFF format parsing */ -#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) +/* Debugging helpers */ +const char *debugstr_dmguid(const GUID *id) { + unsigned int i; +#define X(guid) { &guid, #guid } + static const struct { + const GUID *guid; + const char *name; + } guids[] = { + /* CLSIDs */ + X(CLSID_AudioVBScript), + X(CLSID_DirectMusic), + X(CLSID_DirectMusicAudioPathConfig), + X(CLSID_DirectMusicAuditionTrack), + X(CLSID_DirectMusicBand), + X(CLSID_DirectMusicBandTrack), + X(CLSID_DirectMusicChordMapTrack), + X(CLSID_DirectMusicChordMap), + X(CLSID_DirectMusicChordTrack), + X(CLSID_DirectMusicCollection), + X(CLSID_DirectMusicCommandTrack), + X(CLSID_DirectMusicComposer), + X(CLSID_DirectMusicContainer), + X(CLSID_DirectMusicGraph), + X(CLSID_DirectMusicLoader), + X(CLSID_DirectMusicLyricsTrack), + X(CLSID_DirectMusicMarkerTrack), + X(CLSID_DirectMusicMelodyFormulationTrack), + X(CLSID_DirectMusicMotifTrack), + X(CLSID_DirectMusicMuteTrack), + X(CLSID_DirectMusicParamControlTrack), + X(CLSID_DirectMusicPatternTrack), + X(CLSID_DirectMusicPerformance), + X(CLSID_DirectMusicScript), + X(CLSID_DirectMusicScriptAutoImpSegment), + X(CLSID_DirectMusicScriptAutoImpPerformance), + X(CLSID_DirectMusicScriptAutoImpSegmentState), + X(CLSID_DirectMusicScriptAutoImpAudioPathConfig), + X(CLSID_DirectMusicScriptAutoImpAudioPath), + X(CLSID_DirectMusicScriptAutoImpSong), + X(CLSID_DirectMusicScriptSourceCodeLoader), + X(CLSID_DirectMusicScriptTrack), + X(CLSID_DirectMusicSection), + X(CLSID_DirectMusicSegment), + X(CLSID_DirectMusicSegmentState), + X(CLSID_DirectMusicSegmentTriggerTrack), + X(CLSID_DirectMusicSegTriggerTrack), + X(CLSID_DirectMusicSeqTrack), + X(CLSID_DirectMusicSignPostTrack), + X(CLSID_DirectMusicSong), + X(CLSID_DirectMusicStyle), + X(CLSID_DirectMusicStyleTrack), + X(CLSID_DirectMusicSynth), + X(CLSID_DirectMusicSynthSink), + X(CLSID_DirectMusicSysExTrack), + X(CLSID_DirectMusicTemplate), + X(CLSID_DirectMusicTempoTrack), + X(CLSID_DirectMusicTimeSigTrack), + X(CLSID_DirectMusicWaveTrack), + X(CLSID_DirectSoundWave), + /* IIDs */ + X(IID_IDirectMusic), + X(IID_IDirectMusic2), + X(IID_IDirectMusic8), + X(IID_IDirectMusicAudioPath), + X(IID_IDirectMusicBand), + X(IID_IDirectMusicBuffer), + X(IID_IDirectMusicChordMap), + X(IID_IDirectMusicCollection), + X(IID_IDirectMusicComposer), + X(IID_IDirectMusicContainer), + X(IID_IDirectMusicDownload), + X(IID_IDirectMusicDownloadedInstrument), + X(IID_IDirectMusicGetLoader), + X(IID_IDirectMusicGraph), + X(IID_IDirectMusicInstrument), + X(IID_IDirectMusicLoader), + X(IID_IDirectMusicLoader8), + X(IID_IDirectMusicObject), + X(IID_IDirectMusicPatternTrack), + X(IID_IDirectMusicPerformance), + X(IID_IDirectMusicPerformance2), + X(IID_IDirectMusicPerformance8), + X(IID_IDirectMusicPort), + X(IID_IDirectMusicPortDownload), + X(IID_IDirectMusicScript), + X(IID_IDirectMusicSegment), + X(IID_IDirectMusicSegment2), + X(IID_IDirectMusicSegment8), + X(IID_IDirectMusicSegmentState), + X(IID_IDirectMusicSegmentState8), + X(IID_IDirectMusicStyle), + X(IID_IDirectMusicStyle8), + X(IID_IDirectMusicSynth), + X(IID_IDirectMusicSynth8), + X(IID_IDirectMusicSynthSink), + X(IID_IDirectMusicThru), + X(IID_IDirectMusicTool), + X(IID_IDirectMusicTool8), + X(IID_IDirectMusicTrack), + X(IID_IDirectMusicTrack8), + X(IID_IUnknown), + X(IID_IPersistStream), + X(IID_IStream), + X(IID_IClassFactory), + /* GUIDs */ + X(GUID_DirectMusicAllTypes), + X(GUID_NOTIFICATION_CHORD), + X(GUID_NOTIFICATION_COMMAND), + X(GUID_NOTIFICATION_MEASUREANDBEAT), + X(GUID_NOTIFICATION_PERFORMANCE), + X(GUID_NOTIFICATION_RECOMPOSE), + X(GUID_NOTIFICATION_SEGMENT), + X(GUID_BandParam), + X(GUID_ChordParam), + X(GUID_CommandParam), + X(GUID_CommandParam2), + X(GUID_CommandParamNext), + X(GUID_IDirectMusicBand), + X(GUID_IDirectMusicChordMap), + X(GUID_IDirectMusicStyle), + X(GUID_MuteParam), + X(GUID_Play_Marker), + X(GUID_RhythmParam), + X(GUID_TempoParam), + X(GUID_TimeSignature), + X(GUID_Valid_Start_Time), + X(GUID_Clear_All_Bands), + X(GUID_ConnectToDLSCollection), + X(GUID_Disable_Auto_Download), + X(GUID_DisableTempo), + X(GUID_DisableTimeSig), + X(GUID_Download), + X(GUID_DownloadToAudioPath), + X(GUID_Enable_Auto_Download), + X(GUID_EnableTempo), + X(GUID_EnableTimeSig), + X(GUID_IgnoreBankSelectForGM), + X(GUID_SeedVariations), + X(GUID_StandardMIDIFile), + X(GUID_Unload), + X(GUID_UnloadFromAudioPath), + X(GUID_Variations), + X(GUID_PerfMasterTempo), + X(GUID_PerfMasterVolume), + X(GUID_PerfMasterGrooveLevel), + X(GUID_PerfAutoDownload), + X(GUID_DefaultGMCollection), + X(GUID_Synth_Default), + X(GUID_Buffer_Reverb), + X(GUID_Buffer_EnvReverb), + X(GUID_Buffer_Stereo), + X(GUID_Buffer_3D_Dry), + X(GUID_Buffer_Mono), + X(GUID_DMUS_PROP_GM_Hardware), + X(GUID_DMUS_PROP_GS_Capable), + X(GUID_DMUS_PROP_GS_Hardware), + X(GUID_DMUS_PROP_DLS1), + X(GUID_DMUS_PROP_DLS2), + X(GUID_DMUS_PROP_Effects), + X(GUID_DMUS_PROP_INSTRUMENT2), + X(GUID_DMUS_PROP_LegacyCaps), + X(GUID_DMUS_PROP_MemorySize), + X(GUID_DMUS_PROP_SampleMemorySize), + X(GUID_DMUS_PROP_SamplePlaybackRate), + X(GUID_DMUS_PROP_SetSynthSink), + X(GUID_DMUS_PROP_SinkUsesDSound), + X(GUID_DMUS_PROP_SynthSink_DSOUND), + X(GUID_DMUS_PROP_SynthSink_WAVE), + X(GUID_DMUS_PROP_Volume), + X(GUID_DMUS_PROP_WavesReverb), + X(GUID_DMUS_PROP_WriteLatency), + X(GUID_DMUS_PROP_WritePeriod), + X(GUID_DMUS_PROP_XG_Capable), + X(GUID_DMUS_PROP_XG_Hardware) + }; +#undef X + + if (!id) + return "(null)"; + + for (i = 0; i < ARRAY_SIZE(guids); i++) + if (IsEqualGUID(id, guids[i].guid)) + return guids[i].name; + + return debugstr_guid(id); +} -static inline const char *debugstr_fourcc(DWORD fourcc) +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) { - if (!fourcc) return "''"; - return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); + if (!desc || !TRACE_ON(dmfile)) + return; + + TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc); + TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize); + +#define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ") + TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData); + X(DMUS_OBJ_OBJECT); + X(DMUS_OBJ_CLASS); + X(DMUS_OBJ_NAME); + X(DMUS_OBJ_CATEGORY); + X(DMUS_OBJ_FILENAME); + X(DMUS_OBJ_FULLPATH); + X(DMUS_OBJ_URL); + X(DMUS_OBJ_VERSION); + X(DMUS_OBJ_DATE); + X(DMUS_OBJ_LOADED); + X(DMUS_OBJ_MEMORY); + X(DMUS_OBJ_STREAM); + TRACE_(dmfile)(")\n"); +#undef X + + if (desc->dwValidData & DMUS_OBJ_CLASS) + TRACE_(dmfile)(" - guidClass = %s\n", debugstr_dmguid(&desc->guidClass)); + if (desc->dwValidData & DMUS_OBJ_OBJECT) + TRACE_(dmfile)(" - guidObject = %s\n", debugstr_guid(&desc->guidObject)); + + if (desc->dwValidData & DMUS_OBJ_DATE) { + SYSTEMTIME time; + FileTimeToSystemTime(&desc->ftDate, &time); + TRACE_(dmfile)(" - ftDate = \'%04u-%02u-%02u %02u:%02u:%02u\'\n", + time.wYear, time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond); + } + if (desc->dwValidData & DMUS_OBJ_VERSION) + TRACE_(dmfile)(" - vVersion = \'%u,%u,%u,%u\'\n", + HIWORD(desc->vVersion.dwVersionMS), LOWORD(desc->vVersion.dwVersionMS), + HIWORD(desc->vVersion.dwVersionLS), LOWORD(desc->vVersion.dwVersionLS)); + if (desc->dwValidData & DMUS_OBJ_NAME) + TRACE_(dmfile)(" - wszName = %s\n", debugstr_w(desc->wszName)); + if (desc->dwValidData & DMUS_OBJ_CATEGORY) + TRACE_(dmfile)(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); + if (desc->dwValidData & DMUS_OBJ_FILENAME) + TRACE_(dmfile)(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); + if (desc->dwValidData & DMUS_OBJ_MEMORY) + TRACE_(dmfile)(" - llMemLength = 0x%s - pbMemData = %p\n", + wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); + if (desc->dwValidData & DMUS_OBJ_STREAM) + TRACE_(dmfile)(" - pStream = %p\n", desc->pStream); } + +/* RIFF format parsing */ +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + const char *debugstr_chunk(const struct chunk_entry *chunk) { const char *type = ""; diff --git a/dlls/dmcompos/dmobject.h b/dlls/dmcompos/dmobject.h index 4a721cc152..d347020691 100644 --- a/dlls/dmcompos/dmobject.h +++ b/dlls/dmcompos/dmobject.h @@ -60,8 +60,6 @@ static inline HRESULT stream_reset_chunk_start(IStream *stream, const struct chu return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL); } -const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; - /* IDirectMusicObject base object */ struct dmobject { @@ -106,3 +104,15 @@ HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream BOOL clear_dirty) DECLSPEC_HIDDEN; HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) DECLSPEC_HIDDEN; + +/* Debugging helpers */ +const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; +const char *debugstr_dmguid(const GUID *id) DECLSPEC_HIDDEN; +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN; + +static inline const char *debugstr_fourcc(DWORD fourcc) +{ + if (!fourcc) return "''"; + return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), + (char)(fourcc >> 16), (char)(fourcc >> 24)); +} -- 2.23.0

1 0

[PATCH 8/9] dmime: Use the debug functions provided by dmobject.[ch]
by Michael Stefaniuc 12 Dec '19

12 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/dmime_main.c | 1 + dlls/dmime/dmobject.c | 247 ++++++++++++++++++++++++++++++- dlls/dmime/dmobject.h | 14 +- dlls/dmime/dmutils.c | 302 +------------------------------------- dlls/dmime/dmutils.h | 26 ---- dlls/dmime/performance.c | 1 + dlls/dmime/segmentstate.c | 1 + 7 files changed, 257 insertions(+), 335 deletions(-) diff --git a/dlls/dmime/dmime_main.c b/dlls/dmime/dmime_main.c index 37302ff0eb..1749bbe69d 100644 --- a/dlls/dmime/dmime_main.c +++ b/dlls/dmime/dmime_main.c @@ -34,6 +34,7 @@ #include "dmusici.h" #include "dmime_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); diff --git a/dlls/dmime/dmobject.c b/dlls/dmime/dmobject.c index 25f3198d2b..9ea31ab32a 100644 --- a/dlls/dmime/dmobject.c +++ b/dlls/dmime/dmobject.c @@ -25,22 +25,257 @@ #include "objbase.h" #include "dmusici.h" #include "dmusicf.h" +#include "dmusics.h" #include "dmobject.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dmobj); WINE_DECLARE_DEBUG_CHANNEL(dmfile); -/* RIFF format parsing */ -#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) +/* Debugging helpers */ +const char *debugstr_dmguid(const GUID *id) { + unsigned int i; +#define X(guid) { &guid, #guid } + static const struct { + const GUID *guid; + const char *name; + } guids[] = { + /* CLSIDs */ + X(CLSID_AudioVBScript), + X(CLSID_DirectMusic), + X(CLSID_DirectMusicAudioPathConfig), + X(CLSID_DirectMusicAuditionTrack), + X(CLSID_DirectMusicBand), + X(CLSID_DirectMusicBandTrack), + X(CLSID_DirectMusicChordMapTrack), + X(CLSID_DirectMusicChordMap), + X(CLSID_DirectMusicChordTrack), + X(CLSID_DirectMusicCollection), + X(CLSID_DirectMusicCommandTrack), + X(CLSID_DirectMusicComposer), + X(CLSID_DirectMusicContainer), + X(CLSID_DirectMusicGraph), + X(CLSID_DirectMusicLoader), + X(CLSID_DirectMusicLyricsTrack), + X(CLSID_DirectMusicMarkerTrack), + X(CLSID_DirectMusicMelodyFormulationTrack), + X(CLSID_DirectMusicMotifTrack), + X(CLSID_DirectMusicMuteTrack), + X(CLSID_DirectMusicParamControlTrack), + X(CLSID_DirectMusicPatternTrack), + X(CLSID_DirectMusicPerformance), + X(CLSID_DirectMusicScript), + X(CLSID_DirectMusicScriptAutoImpSegment), + X(CLSID_DirectMusicScriptAutoImpPerformance), + X(CLSID_DirectMusicScriptAutoImpSegmentState), + X(CLSID_DirectMusicScriptAutoImpAudioPathConfig), + X(CLSID_DirectMusicScriptAutoImpAudioPath), + X(CLSID_DirectMusicScriptAutoImpSong), + X(CLSID_DirectMusicScriptSourceCodeLoader), + X(CLSID_DirectMusicScriptTrack), + X(CLSID_DirectMusicSection), + X(CLSID_DirectMusicSegment), + X(CLSID_DirectMusicSegmentState), + X(CLSID_DirectMusicSegmentTriggerTrack), + X(CLSID_DirectMusicSegTriggerTrack), + X(CLSID_DirectMusicSeqTrack), + X(CLSID_DirectMusicSignPostTrack), + X(CLSID_DirectMusicSong), + X(CLSID_DirectMusicStyle), + X(CLSID_DirectMusicStyleTrack), + X(CLSID_DirectMusicSynth), + X(CLSID_DirectMusicSynthSink), + X(CLSID_DirectMusicSysExTrack), + X(CLSID_DirectMusicTemplate), + X(CLSID_DirectMusicTempoTrack), + X(CLSID_DirectMusicTimeSigTrack), + X(CLSID_DirectMusicWaveTrack), + X(CLSID_DirectSoundWave), + /* IIDs */ + X(IID_IDirectMusic), + X(IID_IDirectMusic2), + X(IID_IDirectMusic8), + X(IID_IDirectMusicAudioPath), + X(IID_IDirectMusicBand), + X(IID_IDirectMusicBuffer), + X(IID_IDirectMusicChordMap), + X(IID_IDirectMusicCollection), + X(IID_IDirectMusicComposer), + X(IID_IDirectMusicContainer), + X(IID_IDirectMusicDownload), + X(IID_IDirectMusicDownloadedInstrument), + X(IID_IDirectMusicGetLoader), + X(IID_IDirectMusicGraph), + X(IID_IDirectMusicInstrument), + X(IID_IDirectMusicLoader), + X(IID_IDirectMusicLoader8), + X(IID_IDirectMusicObject), + X(IID_IDirectMusicPatternTrack), + X(IID_IDirectMusicPerformance), + X(IID_IDirectMusicPerformance2), + X(IID_IDirectMusicPerformance8), + X(IID_IDirectMusicPort), + X(IID_IDirectMusicPortDownload), + X(IID_IDirectMusicScript), + X(IID_IDirectMusicSegment), + X(IID_IDirectMusicSegment2), + X(IID_IDirectMusicSegment8), + X(IID_IDirectMusicSegmentState), + X(IID_IDirectMusicSegmentState8), + X(IID_IDirectMusicStyle), + X(IID_IDirectMusicStyle8), + X(IID_IDirectMusicSynth), + X(IID_IDirectMusicSynth8), + X(IID_IDirectMusicSynthSink), + X(IID_IDirectMusicThru), + X(IID_IDirectMusicTool), + X(IID_IDirectMusicTool8), + X(IID_IDirectMusicTrack), + X(IID_IDirectMusicTrack8), + X(IID_IUnknown), + X(IID_IPersistStream), + X(IID_IStream), + X(IID_IClassFactory), + /* GUIDs */ + X(GUID_DirectMusicAllTypes), + X(GUID_NOTIFICATION_CHORD), + X(GUID_NOTIFICATION_COMMAND), + X(GUID_NOTIFICATION_MEASUREANDBEAT), + X(GUID_NOTIFICATION_PERFORMANCE), + X(GUID_NOTIFICATION_RECOMPOSE), + X(GUID_NOTIFICATION_SEGMENT), + X(GUID_BandParam), + X(GUID_ChordParam), + X(GUID_CommandParam), + X(GUID_CommandParam2), + X(GUID_CommandParamNext), + X(GUID_IDirectMusicBand), + X(GUID_IDirectMusicChordMap), + X(GUID_IDirectMusicStyle), + X(GUID_MuteParam), + X(GUID_Play_Marker), + X(GUID_RhythmParam), + X(GUID_TempoParam), + X(GUID_TimeSignature), + X(GUID_Valid_Start_Time), + X(GUID_Clear_All_Bands), + X(GUID_ConnectToDLSCollection), + X(GUID_Disable_Auto_Download), + X(GUID_DisableTempo), + X(GUID_DisableTimeSig), + X(GUID_Download), + X(GUID_DownloadToAudioPath), + X(GUID_Enable_Auto_Download), + X(GUID_EnableTempo), + X(GUID_EnableTimeSig), + X(GUID_IgnoreBankSelectForGM), + X(GUID_SeedVariations), + X(GUID_StandardMIDIFile), + X(GUID_Unload), + X(GUID_UnloadFromAudioPath), + X(GUID_Variations), + X(GUID_PerfMasterTempo), + X(GUID_PerfMasterVolume), + X(GUID_PerfMasterGrooveLevel), + X(GUID_PerfAutoDownload), + X(GUID_DefaultGMCollection), + X(GUID_Synth_Default), + X(GUID_Buffer_Reverb), + X(GUID_Buffer_EnvReverb), + X(GUID_Buffer_Stereo), + X(GUID_Buffer_3D_Dry), + X(GUID_Buffer_Mono), + X(GUID_DMUS_PROP_GM_Hardware), + X(GUID_DMUS_PROP_GS_Capable), + X(GUID_DMUS_PROP_GS_Hardware), + X(GUID_DMUS_PROP_DLS1), + X(GUID_DMUS_PROP_DLS2), + X(GUID_DMUS_PROP_Effects), + X(GUID_DMUS_PROP_INSTRUMENT2), + X(GUID_DMUS_PROP_LegacyCaps), + X(GUID_DMUS_PROP_MemorySize), + X(GUID_DMUS_PROP_SampleMemorySize), + X(GUID_DMUS_PROP_SamplePlaybackRate), + X(GUID_DMUS_PROP_SetSynthSink), + X(GUID_DMUS_PROP_SinkUsesDSound), + X(GUID_DMUS_PROP_SynthSink_DSOUND), + X(GUID_DMUS_PROP_SynthSink_WAVE), + X(GUID_DMUS_PROP_Volume), + X(GUID_DMUS_PROP_WavesReverb), + X(GUID_DMUS_PROP_WriteLatency), + X(GUID_DMUS_PROP_WritePeriod), + X(GUID_DMUS_PROP_XG_Capable), + X(GUID_DMUS_PROP_XG_Hardware) + }; +#undef X + + if (!id) + return "(null)"; + + for (i = 0; i < ARRAY_SIZE(guids); i++) + if (IsEqualGUID(id, guids[i].guid)) + return guids[i].name; + + return debugstr_guid(id); +} -static inline const char *debugstr_fourcc(DWORD fourcc) +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) { - if (!fourcc) return "''"; - return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); + if (!desc || !TRACE_ON(dmfile)) + return; + + TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc); + TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize); + +#define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ") + TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData); + X(DMUS_OBJ_OBJECT); + X(DMUS_OBJ_CLASS); + X(DMUS_OBJ_NAME); + X(DMUS_OBJ_CATEGORY); + X(DMUS_OBJ_FILENAME); + X(DMUS_OBJ_FULLPATH); + X(DMUS_OBJ_URL); + X(DMUS_OBJ_VERSION); + X(DMUS_OBJ_DATE); + X(DMUS_OBJ_LOADED); + X(DMUS_OBJ_MEMORY); + X(DMUS_OBJ_STREAM); + TRACE_(dmfile)(")\n"); +#undef X + + if (desc->dwValidData & DMUS_OBJ_CLASS) + TRACE_(dmfile)(" - guidClass = %s\n", debugstr_dmguid(&desc->guidClass)); + if (desc->dwValidData & DMUS_OBJ_OBJECT) + TRACE_(dmfile)(" - guidObject = %s\n", debugstr_guid(&desc->guidObject)); + + if (desc->dwValidData & DMUS_OBJ_DATE) { + SYSTEMTIME time; + FileTimeToSystemTime(&desc->ftDate, &time); + TRACE_(dmfile)(" - ftDate = \'%04u-%02u-%02u %02u:%02u:%02u\'\n", + time.wYear, time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond); + } + if (desc->dwValidData & DMUS_OBJ_VERSION) + TRACE_(dmfile)(" - vVersion = \'%u,%u,%u,%u\'\n", + HIWORD(desc->vVersion.dwVersionMS), LOWORD(desc->vVersion.dwVersionMS), + HIWORD(desc->vVersion.dwVersionLS), LOWORD(desc->vVersion.dwVersionLS)); + if (desc->dwValidData & DMUS_OBJ_NAME) + TRACE_(dmfile)(" - wszName = %s\n", debugstr_w(desc->wszName)); + if (desc->dwValidData & DMUS_OBJ_CATEGORY) + TRACE_(dmfile)(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); + if (desc->dwValidData & DMUS_OBJ_FILENAME) + TRACE_(dmfile)(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); + if (desc->dwValidData & DMUS_OBJ_MEMORY) + TRACE_(dmfile)(" - llMemLength = 0x%s - pbMemData = %p\n", + wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); + if (desc->dwValidData & DMUS_OBJ_STREAM) + TRACE_(dmfile)(" - pStream = %p\n", desc->pStream); } + +/* RIFF format parsing */ +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + const char *debugstr_chunk(const struct chunk_entry *chunk) { const char *type = ""; diff --git a/dlls/dmime/dmobject.h b/dlls/dmime/dmobject.h index 4a721cc152..d347020691 100644 --- a/dlls/dmime/dmobject.h +++ b/dlls/dmime/dmobject.h @@ -60,8 +60,6 @@ static inline HRESULT stream_reset_chunk_start(IStream *stream, const struct chu return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL); } -const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; - /* IDirectMusicObject base object */ struct dmobject { @@ -106,3 +104,15 @@ HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream BOOL clear_dirty) DECLSPEC_HIDDEN; HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) DECLSPEC_HIDDEN; + +/* Debugging helpers */ +const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; +const char *debugstr_dmguid(const GUID *id) DECLSPEC_HIDDEN; +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN; + +static inline const char *debugstr_fourcc(DWORD fourcc) +{ + if (!fourcc) return "''"; + return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), + (char)(fourcc >> 16), (char)(fourcc >> 24)); +} diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index cd955fd8a5..a61fd5a463 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -39,9 +39,9 @@ #include "dmusics.h" #include "dmutils.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmfile); -WINE_DECLARE_DEBUG_CHANNEL(dmime); static HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { @@ -161,303 +161,3 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, return hr; } - -/* FOURCC to string conversion for debug messages */ -const char *debugstr_fourcc (DWORD fourcc) { - if (!fourcc) return "'null'"; - return wine_dbg_sprintf ("\'%c%c%c%c\'", - (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); -} - -/* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion (const DMUS_VERSION *version) { - if (!version) return "'null'"; - return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", - HIWORD(version->dwVersionMS),LOWORD(version->dwVersionMS), - HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); -} - -/* month number into month name (for debugstr_filetime) */ -static const char *debugstr_month (DWORD dwMonth) { - switch (dwMonth) { - case 1: return "January"; - case 2: return "February"; - case 3: return "March"; - case 4: return "April"; - case 5: return "May"; - case 6: return "June"; - case 7: return "July"; - case 8: return "August"; - case 9: return "September"; - case 10: return "October"; - case 11: return "November"; - case 12: return "December"; - default: return "Invalid"; - } -} - -/* FILETIME struct to string conversion for debug messages */ -static const char *debugstr_filetime (const FILETIME *time) { - SYSTEMTIME sysTime; - - if (!time) return "'null'"; - - FileTimeToSystemTime (time, &sysTime); - - return wine_dbg_sprintf ("\'%02i. %s %04i %02i:%02i:%02i\'", - sysTime.wDay, debugstr_month(sysTime.wMonth), sysTime.wYear, - sysTime.wHour, sysTime.wMinute, sysTime.wSecond); -} - -/* returns name of given GUID */ -const char *debugstr_dmguid (const GUID *id) { - static const guid_info guids[] = { - /* CLSIDs */ - GE(CLSID_AudioVBScript), - GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPathConfig), - GE(CLSID_DirectMusicAuditionTrack), - GE(CLSID_DirectMusicBand), - GE(CLSID_DirectMusicBandTrack), - GE(CLSID_DirectMusicChordMapTrack), - GE(CLSID_DirectMusicChordMap), - GE(CLSID_DirectMusicChordTrack), - GE(CLSID_DirectMusicCollection), - GE(CLSID_DirectMusicCommandTrack), - GE(CLSID_DirectMusicComposer), - GE(CLSID_DirectMusicContainer), - GE(CLSID_DirectMusicGraph), - GE(CLSID_DirectMusicLoader), - GE(CLSID_DirectMusicLyricsTrack), - GE(CLSID_DirectMusicMarkerTrack), - GE(CLSID_DirectMusicMelodyFormulationTrack), - GE(CLSID_DirectMusicMotifTrack), - GE(CLSID_DirectMusicMuteTrack), - GE(CLSID_DirectMusicParamControlTrack), - GE(CLSID_DirectMusicPatternTrack), - GE(CLSID_DirectMusicPerformance), - GE(CLSID_DirectMusicScript), - GE(CLSID_DirectMusicScriptAutoImpSegment), - GE(CLSID_DirectMusicScriptAutoImpPerformance), - GE(CLSID_DirectMusicScriptAutoImpSegmentState), - GE(CLSID_DirectMusicScriptAutoImpAudioPathConfig), - GE(CLSID_DirectMusicScriptAutoImpAudioPath), - GE(CLSID_DirectMusicScriptAutoImpSong), - GE(CLSID_DirectMusicScriptSourceCodeLoader), - GE(CLSID_DirectMusicScriptTrack), - GE(CLSID_DirectMusicSection), - GE(CLSID_DirectMusicSegment), - GE(CLSID_DirectMusicSegmentState), - GE(CLSID_DirectMusicSegmentTriggerTrack), - GE(CLSID_DirectMusicSegTriggerTrack), - GE(CLSID_DirectMusicSeqTrack), - GE(CLSID_DirectMusicSignPostTrack), - GE(CLSID_DirectMusicSong), - GE(CLSID_DirectMusicStyle), - GE(CLSID_DirectMusicStyleTrack), - GE(CLSID_DirectMusicSynth), - GE(CLSID_DirectMusicSynthSink), - GE(CLSID_DirectMusicSysExTrack), - GE(CLSID_DirectMusicTemplate), - GE(CLSID_DirectMusicTempoTrack), - GE(CLSID_DirectMusicTimeSigTrack), - GE(CLSID_DirectMusicWaveTrack), - GE(CLSID_DirectSoundWave), - /* IIDs */ - GE(IID_IDirectMusic), - GE(IID_IDirectMusic2), - GE(IID_IDirectMusic8), - GE(IID_IDirectMusicAudioPath), - GE(IID_IDirectMusicBand), - GE(IID_IDirectMusicBuffer), - GE(IID_IDirectMusicChordMap), - GE(IID_IDirectMusicCollection), - GE(IID_IDirectMusicComposer), - GE(IID_IDirectMusicContainer), - GE(IID_IDirectMusicDownload), - GE(IID_IDirectMusicDownloadedInstrument), - GE(IID_IDirectMusicGetLoader), - GE(IID_IDirectMusicGraph), - GE(IID_IDirectMusicInstrument), - GE(IID_IDirectMusicLoader), - GE(IID_IDirectMusicLoader8), - GE(IID_IDirectMusicObject), - GE(IID_IDirectMusicPatternTrack), - GE(IID_IDirectMusicPerformance), - GE(IID_IDirectMusicPerformance2), - GE(IID_IDirectMusicPerformance8), - GE(IID_IDirectMusicPort), - GE(IID_IDirectMusicPortDownload), - GE(IID_IDirectMusicScript), - GE(IID_IDirectMusicSegment), - GE(IID_IDirectMusicSegment2), - GE(IID_IDirectMusicSegment8), - GE(IID_IDirectMusicSegmentState), - GE(IID_IDirectMusicSegmentState8), - GE(IID_IDirectMusicStyle), - GE(IID_IDirectMusicStyle8), - GE(IID_IDirectMusicSynth), - GE(IID_IDirectMusicSynth8), - GE(IID_IDirectMusicSynthSink), - GE(IID_IDirectMusicThru), - GE(IID_IDirectMusicTool), - GE(IID_IDirectMusicTool8), - GE(IID_IDirectMusicTrack), - GE(IID_IDirectMusicTrack8), - GE(IID_IUnknown), - GE(IID_IPersistStream), - GE(IID_IStream), - GE(IID_IClassFactory), - /* GUIDs */ - GE(GUID_DirectMusicAllTypes), - GE(GUID_NOTIFICATION_CHORD), - GE(GUID_NOTIFICATION_COMMAND), - GE(GUID_NOTIFICATION_MEASUREANDBEAT), - GE(GUID_NOTIFICATION_PERFORMANCE), - GE(GUID_NOTIFICATION_RECOMPOSE), - GE(GUID_NOTIFICATION_SEGMENT), - GE(GUID_BandParam), - GE(GUID_ChordParam), - GE(GUID_CommandParam), - GE(GUID_CommandParam2), - GE(GUID_CommandParamNext), - GE(GUID_IDirectMusicBand), - GE(GUID_IDirectMusicChordMap), - GE(GUID_IDirectMusicStyle), - GE(GUID_MuteParam), - GE(GUID_Play_Marker), - GE(GUID_RhythmParam), - GE(GUID_TempoParam), - GE(GUID_TimeSignature), - GE(GUID_Valid_Start_Time), - GE(GUID_Clear_All_Bands), - GE(GUID_ConnectToDLSCollection), - GE(GUID_Disable_Auto_Download), - GE(GUID_DisableTempo), - GE(GUID_DisableTimeSig), - GE(GUID_Download), - GE(GUID_DownloadToAudioPath), - GE(GUID_Enable_Auto_Download), - GE(GUID_EnableTempo), - GE(GUID_EnableTimeSig), - GE(GUID_IgnoreBankSelectForGM), - GE(GUID_SeedVariations), - GE(GUID_StandardMIDIFile), - GE(GUID_Unload), - GE(GUID_UnloadFromAudioPath), - GE(GUID_Variations), - GE(GUID_PerfMasterTempo), - GE(GUID_PerfMasterVolume), - GE(GUID_PerfMasterGrooveLevel), - GE(GUID_PerfAutoDownload), - GE(GUID_DefaultGMCollection), - GE(GUID_Synth_Default), - GE(GUID_Buffer_Reverb), - GE(GUID_Buffer_EnvReverb), - GE(GUID_Buffer_Stereo), - GE(GUID_Buffer_3D_Dry), - GE(GUID_Buffer_Mono), - GE(GUID_DMUS_PROP_GM_Hardware), - GE(GUID_DMUS_PROP_GS_Capable), - GE(GUID_DMUS_PROP_GS_Hardware), - GE(GUID_DMUS_PROP_DLS1), - GE(GUID_DMUS_PROP_DLS2), - GE(GUID_DMUS_PROP_Effects), - GE(GUID_DMUS_PROP_INSTRUMENT2), - GE(GUID_DMUS_PROP_LegacyCaps), - GE(GUID_DMUS_PROP_MemorySize), - GE(GUID_DMUS_PROP_SampleMemorySize), - GE(GUID_DMUS_PROP_SamplePlaybackRate), - GE(GUID_DMUS_PROP_SetSynthSink), - GE(GUID_DMUS_PROP_SinkUsesDSound), - GE(GUID_DMUS_PROP_SynthSink_DSOUND), - GE(GUID_DMUS_PROP_SynthSink_WAVE), - GE(GUID_DMUS_PROP_Volume), - GE(GUID_DMUS_PROP_WavesReverb), - GE(GUID_DMUS_PROP_WriteLatency), - GE(GUID_DMUS_PROP_WritePeriod), - GE(GUID_DMUS_PROP_XG_Capable), - GE(GUID_DMUS_PROP_XG_Hardware) - }; - - unsigned int i; - - if (!id) return "(null)"; - for (i = 0; i < ARRAY_SIZE(guids); i++) { - if (IsEqualGUID(id, guids[i].guid)) - return guids[i].name; - } - - /* if we didn't find it, act like standard debugstr_guid */ - return debugstr_guid(id); -} - -/* generic flag-dumping function */ -static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ - static char buffer[128] = "", *ptr = &buffer[0]; - unsigned int i; - int size = sizeof(buffer); - - for (i=0; i < num_names; i++) { - if ((flags & names[i].val)) { - int cnt = snprintf(ptr, size, "%s ", names[i].name); - if (cnt < 0 || cnt >= size) break; - size -= cnt; - ptr += cnt; - } - } - - ptr = &buffer[0]; - return ptr; -} - -/* dump DMUS_OBJ flags */ -static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { - static const flag_info flags[] = { - FE(DMUS_OBJ_OBJECT), - FE(DMUS_OBJ_CLASS), - FE(DMUS_OBJ_NAME), - FE(DMUS_OBJ_CATEGORY), - FE(DMUS_OBJ_FILENAME), - FE(DMUS_OBJ_FULLPATH), - FE(DMUS_OBJ_URL), - FE(DMUS_OBJ_VERSION), - FE(DMUS_OBJ_DATE), - FE(DMUS_OBJ_LOADED), - FE(DMUS_OBJ_MEMORY), - FE(DMUS_OBJ_STREAM) - }; - return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); -} - -void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) -{ - if (!TRACE_ON(dmime)) - return; - - if (pDesc) { - TRACE_(dmime)("DMUS_OBJECTDESC (%p):", pDesc); - TRACE_(dmime)(" - dwSize = 0x%08X\n", pDesc->dwSize); - TRACE_(dmime)(" - dwValidData = 0x%08X ( %s)\n", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); - if (pDesc->dwValidData & DMUS_OBJ_CLASS) - TRACE_(dmime)(" - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) - TRACE_(dmime)(" - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) - TRACE_(dmime)(" - ftDate = %s\n", debugstr_filetime (&pDesc->ftDate)); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) - TRACE_(dmime)(" - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); - if (pDesc->dwValidData & DMUS_OBJ_NAME) - TRACE_(dmime)(" - wszName = %s\n", debugstr_w(pDesc->wszName)); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) - TRACE_(dmime)(" - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) - TRACE_(dmime)(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) - TRACE_(dmime)(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), - pDesc->pbMemData); - if (pDesc->dwValidData & DMUS_OBJ_STREAM) - TRACE_(dmime)(" - pStream = %p\n", pDesc->pStream); - } -} diff --git a/dlls/dmime/dmutils.h b/dlls/dmime/dmutils.h index 7242746031..913bccfabd 100644 --- a/dlls/dmime/dmutils.h +++ b/dlls/dmime/dmutils.h @@ -32,30 +32,4 @@ typedef struct _DMUS_PRIVATE_CHUNK { */ extern HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject) DECLSPEC_HIDDEN; -/** - * Debug utilities - */ -/* used for generic dumping (copied from ddraw) */ -typedef struct { - DWORD val; - const char* name; -} flag_info; - -typedef struct { - const GUID *guid; - const char* name; -} guid_info; - -/* used for initialising structs */ -#define FE(x) { x, #x } -#define GE(x) { &x, #x } - -/* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; -/* returns name of given GUID */ -extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; - -/* dump whole DMUS_OBJECTDESC struct */ -void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) DECLSPEC_HIDDEN; - #endif /* __WINE_DMUTILS_H */ diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 399b9b9919..615a3f8b14 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -19,6 +19,7 @@ */ #include "dmime_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index b1b176ca5c..edd7ed70f0 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -18,6 +18,7 @@ */ #include "dmime_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); -- 2.23.0

1 0

[PATCH 7/9] dmloader: Use the debug functions provided by dmobject.[ch]
by Michael Stefaniuc 12 Dec '19

12 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmloader/container.c | 1 - dlls/dmloader/debug.c | 270 ------------------------------- dlls/dmloader/debug.h | 16 -- dlls/dmloader/dmloader_private.h | 1 + dlls/dmloader/dmobject.c | 247 +++++++++++++++++++++++++++- dlls/dmloader/dmobject.h | 14 +- 6 files changed, 254 insertions(+), 295 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 075843ad32..005f0d7e9e 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -18,7 +18,6 @@ */ #include "dmloader_private.h" -#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmloader); WINE_DECLARE_DEBUG_CHANNEL(dmfile); diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 10ba0bce93..0d274394aa 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -20,8 +20,6 @@ #include "dmloader_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(dmloader); - /* figures out whether given FOURCC is valid DirectMusic form ID */ BOOL IS_VALID_DMFORM (FOURCC chunkID) { if ((chunkID == DMUS_FOURCC_AUDIOPATH_FORM) || (chunkID == DMUS_FOURCC_BAND_FORM) || (chunkID == DMUS_FOURCC_CHORDMAP_FORM) @@ -45,237 +43,6 @@ const char *resolve_STREAM_SEEK (DWORD flag) { } } -/* FOURCC to string conversion for debug messages */ -const char *debugstr_fourcc (DWORD fourcc) { - if (!fourcc) return "'null'"; - return wine_dbg_sprintf ("\'%c%c%c%c\'", - (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); -} - -/* DMUS_VERSION struct to string conversion for debug messages */ -const char *debugstr_dmversion (const DMUS_VERSION *version) { - if (!version) return "'null'"; - return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", - HIWORD(version->dwVersionMS),LOWORD(version->dwVersionMS), - HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); -} - -/* month number into month name (for debugstr_filetime) */ -static const char *debugstr_month (DWORD dwMonth) { - switch (dwMonth) { - case 1: return "January"; - case 2: return "February"; - case 3: return "March"; - case 4: return "April"; - case 5: return "May"; - case 6: return "June"; - case 7: return "July"; - case 8: return "August"; - case 9: return "September"; - case 10: return "October"; - case 11: return "November"; - case 12: return "December"; - default: return "Invalid"; - } -} - -/* FILETIME struct to string conversion for debug messages */ -const char *debugstr_filetime (const FILETIME *time) { - SYSTEMTIME sysTime; - - if (!time) return "'null'"; - - FileTimeToSystemTime (time, &sysTime); - - return wine_dbg_sprintf ("\'%02i. %s %04i %02i:%02i:%02i\'", - sysTime.wDay, debugstr_month(sysTime.wMonth), sysTime.wYear, - sysTime.wHour, sysTime.wMinute, sysTime.wSecond); -} - -/* returns name of given GUID */ -const char *debugstr_dmguid (const GUID *id) { - static const guid_info guids[] = { - /* CLSIDs */ - GE(CLSID_AudioVBScript), - GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPathConfig), - GE(CLSID_DirectMusicAuditionTrack), - GE(CLSID_DirectMusicBand), - GE(CLSID_DirectMusicBandTrack), - GE(CLSID_DirectMusicChordMapTrack), - GE(CLSID_DirectMusicChordMap), - GE(CLSID_DirectMusicChordTrack), - GE(CLSID_DirectMusicCollection), - GE(CLSID_DirectMusicCommandTrack), - GE(CLSID_DirectMusicComposer), - GE(CLSID_DirectMusicContainer), - GE(CLSID_DirectMusicGraph), - GE(CLSID_DirectMusicLoader), - GE(CLSID_DirectMusicLyricsTrack), - GE(CLSID_DirectMusicMarkerTrack), - GE(CLSID_DirectMusicMelodyFormulationTrack), - GE(CLSID_DirectMusicMotifTrack), - GE(CLSID_DirectMusicMuteTrack), - GE(CLSID_DirectMusicParamControlTrack), - GE(CLSID_DirectMusicPatternTrack), - GE(CLSID_DirectMusicPerformance), - GE(CLSID_DirectMusicScript), - GE(CLSID_DirectMusicScriptAutoImpSegment), - GE(CLSID_DirectMusicScriptAutoImpPerformance), - GE(CLSID_DirectMusicScriptAutoImpSegmentState), - GE(CLSID_DirectMusicScriptAutoImpAudioPathConfig), - GE(CLSID_DirectMusicScriptAutoImpAudioPath), - GE(CLSID_DirectMusicScriptAutoImpSong), - GE(CLSID_DirectMusicScriptSourceCodeLoader), - GE(CLSID_DirectMusicScriptTrack), - GE(CLSID_DirectMusicSection), - GE(CLSID_DirectMusicSegment), - GE(CLSID_DirectMusicSegmentState), - GE(CLSID_DirectMusicSegmentTriggerTrack), - GE(CLSID_DirectMusicSegTriggerTrack), - GE(CLSID_DirectMusicSeqTrack), - GE(CLSID_DirectMusicSignPostTrack), - GE(CLSID_DirectMusicSong), - GE(CLSID_DirectMusicStyle), - GE(CLSID_DirectMusicStyleTrack), - GE(CLSID_DirectMusicSynth), - GE(CLSID_DirectMusicSynthSink), - GE(CLSID_DirectMusicSysExTrack), - GE(CLSID_DirectMusicTemplate), - GE(CLSID_DirectMusicTempoTrack), - GE(CLSID_DirectMusicTimeSigTrack), - GE(CLSID_DirectMusicWaveTrack), - GE(CLSID_DirectSoundWave), - /* IIDs */ - GE(IID_IDirectMusic), - GE(IID_IDirectMusic2), - GE(IID_IDirectMusic8), - GE(IID_IDirectMusicAudioPath), - GE(IID_IDirectMusicBand), - GE(IID_IDirectMusicBuffer), - GE(IID_IDirectMusicChordMap), - GE(IID_IDirectMusicCollection), - GE(IID_IDirectMusicComposer), - GE(IID_IDirectMusicContainer), - GE(IID_IDirectMusicDownload), - GE(IID_IDirectMusicDownloadedInstrument), - GE(IID_IDirectMusicGetLoader), - GE(IID_IDirectMusicGraph), - GE(IID_IDirectMusicInstrument), - GE(IID_IDirectMusicLoader), - GE(IID_IDirectMusicLoader8), - GE(IID_IDirectMusicObject), - GE(IID_IDirectMusicPatternTrack), - GE(IID_IDirectMusicPerformance), - GE(IID_IDirectMusicPerformance2), - GE(IID_IDirectMusicPerformance8), - GE(IID_IDirectMusicPort), - GE(IID_IDirectMusicPortDownload), - GE(IID_IDirectMusicScript), - GE(IID_IDirectMusicSegment), - GE(IID_IDirectMusicSegment2), - GE(IID_IDirectMusicSegment8), - GE(IID_IDirectMusicSegmentState), - GE(IID_IDirectMusicSegmentState8), - GE(IID_IDirectMusicStyle), - GE(IID_IDirectMusicStyle8), - GE(IID_IDirectMusicSynth), - GE(IID_IDirectMusicSynth8), - GE(IID_IDirectMusicSynthSink), - GE(IID_IDirectMusicThru), - GE(IID_IDirectMusicTool), - GE(IID_IDirectMusicTool8), - GE(IID_IDirectMusicTrack), - GE(IID_IDirectMusicTrack8), - GE(IID_IUnknown), - GE(IID_IPersistStream), - GE(IID_IStream), - GE(IID_IClassFactory), - /* GUIDs */ - GE(GUID_DirectMusicAllTypes), - GE(GUID_NOTIFICATION_CHORD), - GE(GUID_NOTIFICATION_COMMAND), - GE(GUID_NOTIFICATION_MEASUREANDBEAT), - GE(GUID_NOTIFICATION_PERFORMANCE), - GE(GUID_NOTIFICATION_RECOMPOSE), - GE(GUID_NOTIFICATION_SEGMENT), - GE(GUID_BandParam), - GE(GUID_ChordParam), - GE(GUID_CommandParam), - GE(GUID_CommandParam2), - GE(GUID_CommandParamNext), - GE(GUID_IDirectMusicBand), - GE(GUID_IDirectMusicChordMap), - GE(GUID_IDirectMusicStyle), - GE(GUID_MuteParam), - GE(GUID_Play_Marker), - GE(GUID_RhythmParam), - GE(GUID_TempoParam), - GE(GUID_TimeSignature), - GE(GUID_Valid_Start_Time), - GE(GUID_Clear_All_Bands), - GE(GUID_ConnectToDLSCollection), - GE(GUID_Disable_Auto_Download), - GE(GUID_DisableTempo), - GE(GUID_DisableTimeSig), - GE(GUID_Download), - GE(GUID_DownloadToAudioPath), - GE(GUID_Enable_Auto_Download), - GE(GUID_EnableTempo), - GE(GUID_EnableTimeSig), - GE(GUID_IgnoreBankSelectForGM), - GE(GUID_SeedVariations), - GE(GUID_StandardMIDIFile), - GE(GUID_Unload), - GE(GUID_UnloadFromAudioPath), - GE(GUID_Variations), - GE(GUID_PerfMasterTempo), - GE(GUID_PerfMasterVolume), - GE(GUID_PerfMasterGrooveLevel), - GE(GUID_PerfAutoDownload), - GE(GUID_DefaultGMCollection), - GE(GUID_Synth_Default), - GE(GUID_Buffer_Reverb), - GE(GUID_Buffer_EnvReverb), - GE(GUID_Buffer_Stereo), - GE(GUID_Buffer_3D_Dry), - GE(GUID_Buffer_Mono), - GE(GUID_DMUS_PROP_GM_Hardware), - GE(GUID_DMUS_PROP_GS_Capable), - GE(GUID_DMUS_PROP_GS_Hardware), - GE(GUID_DMUS_PROP_DLS1), - GE(GUID_DMUS_PROP_DLS2), - GE(GUID_DMUS_PROP_Effects), - GE(GUID_DMUS_PROP_INSTRUMENT2), - GE(GUID_DMUS_PROP_LegacyCaps), - GE(GUID_DMUS_PROP_MemorySize), - GE(GUID_DMUS_PROP_SampleMemorySize), - GE(GUID_DMUS_PROP_SamplePlaybackRate), - GE(GUID_DMUS_PROP_SetSynthSink), - GE(GUID_DMUS_PROP_SinkUsesDSound), - GE(GUID_DMUS_PROP_SynthSink_DSOUND), - GE(GUID_DMUS_PROP_SynthSink_WAVE), - GE(GUID_DMUS_PROP_Volume), - GE(GUID_DMUS_PROP_WavesReverb), - GE(GUID_DMUS_PROP_WriteLatency), - GE(GUID_DMUS_PROP_WritePeriod), - GE(GUID_DMUS_PROP_XG_Capable), - GE(GUID_DMUS_PROP_XG_Hardware) - }; - - unsigned int i; - - if (!id) return "(null)"; - for (i = 0; i < ARRAY_SIZE(guids); i++) { - if (IsEqualGUID(id, guids[i].guid)) - return guids[i].name; - } - - /* if we didn't find it, act like standard debugstr_guid */ - return debugstr_guid(id); -} - /* returns name of given error code */ const char *debugstr_dmreturn (DWORD code) { static const flag_info codes[] = { @@ -443,25 +210,6 @@ static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t n return ptr; } -/* dump DMUS_OBJ flags */ -static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { - static const flag_info flags[] = { - FE(DMUS_OBJ_OBJECT), - FE(DMUS_OBJ_CLASS), - FE(DMUS_OBJ_NAME), - FE(DMUS_OBJ_CATEGORY), - FE(DMUS_OBJ_FILENAME), - FE(DMUS_OBJ_FULLPATH), - FE(DMUS_OBJ_URL), - FE(DMUS_OBJ_VERSION), - FE(DMUS_OBJ_DATE), - FE(DMUS_OBJ_LOADED), - FE(DMUS_OBJ_MEMORY), - FE(DMUS_OBJ_STREAM) - }; - return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); -} - /* dump DMUS_CONTAINER flags */ static const char *debugstr_DMUS_CONTAINER_FLAGS (DWORD flagmask) { static const flag_info flags[] = { @@ -478,24 +226,6 @@ static const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) { return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } -/* Dump whole DMUS_OBJECTDESC struct */ -void dump_DMUS_OBJECTDESC(LPDMUS_OBJECTDESC desc) -{ - TRACE("DMUS_OBJECTDESC (%p):\n", desc); - TRACE(" - dwSize = %d\n", desc->dwSize); - TRACE(" - dwValidData = %s\n", debugstr_DMUS_OBJ_FLAGS (desc->dwValidData)); - if (desc->dwValidData & DMUS_OBJ_CLASS) TRACE(" - guidClass = %s\n", debugstr_dmguid(&desc->guidClass)); - if (desc->dwValidData & DMUS_OBJ_OBJECT) TRACE(" - guidObject = %s\n", debugstr_guid(&desc->guidObject)); - if (desc->dwValidData & DMUS_OBJ_DATE) TRACE(" - ftDate = %s\n", debugstr_filetime (&desc->ftDate)); - if (desc->dwValidData & DMUS_OBJ_VERSION) TRACE(" - vVersion = %s\n", debugstr_dmversion(&desc->vVersion)); - if (desc->dwValidData & DMUS_OBJ_NAME) TRACE(" - wszName = %s\n", debugstr_w(desc->wszName)); - if (desc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); - if (desc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); - if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s - pbMemData = %p\n", - wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); - if (desc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", desc->pStream); -} - const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) { if (pHeader) { char buffer[1024], *ptr = buffer; diff --git a/dlls/dmloader/debug.h b/dlls/dmloader/debug.h index 40af340ccf..fec35cfbff 100644 --- a/dlls/dmloader/debug.h +++ b/dlls/dmloader/debug.h @@ -26,11 +26,6 @@ typedef struct { const char* name; } flag_info; -typedef struct { - const GUID *guid; - const char* name; -} guid_info; - /* used for initialising structs */ #define DM_STRUCT_INIT(x) \ do { \ @@ -39,25 +34,14 @@ typedef struct { } while (0) #define FE(x) { x, #x } -#define GE(x) { &x, #x } /* check whether chunkID is valid dmobject form chunk */ extern BOOL IS_VALID_DMFORM (FOURCC chunkID) DECLSPEC_HIDDEN; /* translate STREAM_SEEK flag to string */ extern const char *resolve_STREAM_SEEK (DWORD flag) DECLSPEC_HIDDEN; -/* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; -/* DMUS_VERSION struct to string conversion for debug messages */ -extern const char *debugstr_dmversion (const DMUS_VERSION *version) DECLSPEC_HIDDEN; -/* FILETIME struct to string conversion for debug messages */ -extern const char *debugstr_filetime (const FILETIME *time) DECLSPEC_HIDDEN; -/* returns name of given GUID */ -extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; /* returns name of given error code */ extern const char *debugstr_dmreturn (DWORD code) DECLSPEC_HIDDEN; -/* dump whole DMUS_OBJECTDESC struct */ -extern void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN; extern const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) DECLSPEC_HIDDEN; extern const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT_HEADER pHeader) DECLSPEC_HIDDEN; diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h index a8505003c7..94bb9ddf1b 100644 --- a/dlls/dmloader/dmloader_private.h +++ b/dlls/dmloader/dmloader_private.h @@ -40,6 +40,7 @@ #include "dmusici.h" #include "dmusicf.h" #include "dmusics.h" +#include "dmobject.h" #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) diff --git a/dlls/dmloader/dmobject.c b/dlls/dmloader/dmobject.c index 25f3198d2b..9ea31ab32a 100644 --- a/dlls/dmloader/dmobject.c +++ b/dlls/dmloader/dmobject.c @@ -25,22 +25,257 @@ #include "objbase.h" #include "dmusici.h" #include "dmusicf.h" +#include "dmusics.h" #include "dmobject.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dmobj); WINE_DECLARE_DEBUG_CHANNEL(dmfile); -/* RIFF format parsing */ -#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) +/* Debugging helpers */ +const char *debugstr_dmguid(const GUID *id) { + unsigned int i; +#define X(guid) { &guid, #guid } + static const struct { + const GUID *guid; + const char *name; + } guids[] = { + /* CLSIDs */ + X(CLSID_AudioVBScript), + X(CLSID_DirectMusic), + X(CLSID_DirectMusicAudioPathConfig), + X(CLSID_DirectMusicAuditionTrack), + X(CLSID_DirectMusicBand), + X(CLSID_DirectMusicBandTrack), + X(CLSID_DirectMusicChordMapTrack), + X(CLSID_DirectMusicChordMap), + X(CLSID_DirectMusicChordTrack), + X(CLSID_DirectMusicCollection), + X(CLSID_DirectMusicCommandTrack), + X(CLSID_DirectMusicComposer), + X(CLSID_DirectMusicContainer), + X(CLSID_DirectMusicGraph), + X(CLSID_DirectMusicLoader), + X(CLSID_DirectMusicLyricsTrack), + X(CLSID_DirectMusicMarkerTrack), + X(CLSID_DirectMusicMelodyFormulationTrack), + X(CLSID_DirectMusicMotifTrack), + X(CLSID_DirectMusicMuteTrack), + X(CLSID_DirectMusicParamControlTrack), + X(CLSID_DirectMusicPatternTrack), + X(CLSID_DirectMusicPerformance), + X(CLSID_DirectMusicScript), + X(CLSID_DirectMusicScriptAutoImpSegment), + X(CLSID_DirectMusicScriptAutoImpPerformance), + X(CLSID_DirectMusicScriptAutoImpSegmentState), + X(CLSID_DirectMusicScriptAutoImpAudioPathConfig), + X(CLSID_DirectMusicScriptAutoImpAudioPath), + X(CLSID_DirectMusicScriptAutoImpSong), + X(CLSID_DirectMusicScriptSourceCodeLoader), + X(CLSID_DirectMusicScriptTrack), + X(CLSID_DirectMusicSection), + X(CLSID_DirectMusicSegment), + X(CLSID_DirectMusicSegmentState), + X(CLSID_DirectMusicSegmentTriggerTrack), + X(CLSID_DirectMusicSegTriggerTrack), + X(CLSID_DirectMusicSeqTrack), + X(CLSID_DirectMusicSignPostTrack), + X(CLSID_DirectMusicSong), + X(CLSID_DirectMusicStyle), + X(CLSID_DirectMusicStyleTrack), + X(CLSID_DirectMusicSynth), + X(CLSID_DirectMusicSynthSink), + X(CLSID_DirectMusicSysExTrack), + X(CLSID_DirectMusicTemplate), + X(CLSID_DirectMusicTempoTrack), + X(CLSID_DirectMusicTimeSigTrack), + X(CLSID_DirectMusicWaveTrack), + X(CLSID_DirectSoundWave), + /* IIDs */ + X(IID_IDirectMusic), + X(IID_IDirectMusic2), + X(IID_IDirectMusic8), + X(IID_IDirectMusicAudioPath), + X(IID_IDirectMusicBand), + X(IID_IDirectMusicBuffer), + X(IID_IDirectMusicChordMap), + X(IID_IDirectMusicCollection), + X(IID_IDirectMusicComposer), + X(IID_IDirectMusicContainer), + X(IID_IDirectMusicDownload), + X(IID_IDirectMusicDownloadedInstrument), + X(IID_IDirectMusicGetLoader), + X(IID_IDirectMusicGraph), + X(IID_IDirectMusicInstrument), + X(IID_IDirectMusicLoader), + X(IID_IDirectMusicLoader8), + X(IID_IDirectMusicObject), + X(IID_IDirectMusicPatternTrack), + X(IID_IDirectMusicPerformance), + X(IID_IDirectMusicPerformance2), + X(IID_IDirectMusicPerformance8), + X(IID_IDirectMusicPort), + X(IID_IDirectMusicPortDownload), + X(IID_IDirectMusicScript), + X(IID_IDirectMusicSegment), + X(IID_IDirectMusicSegment2), + X(IID_IDirectMusicSegment8), + X(IID_IDirectMusicSegmentState), + X(IID_IDirectMusicSegmentState8), + X(IID_IDirectMusicStyle), + X(IID_IDirectMusicStyle8), + X(IID_IDirectMusicSynth), + X(IID_IDirectMusicSynth8), + X(IID_IDirectMusicSynthSink), + X(IID_IDirectMusicThru), + X(IID_IDirectMusicTool), + X(IID_IDirectMusicTool8), + X(IID_IDirectMusicTrack), + X(IID_IDirectMusicTrack8), + X(IID_IUnknown), + X(IID_IPersistStream), + X(IID_IStream), + X(IID_IClassFactory), + /* GUIDs */ + X(GUID_DirectMusicAllTypes), + X(GUID_NOTIFICATION_CHORD), + X(GUID_NOTIFICATION_COMMAND), + X(GUID_NOTIFICATION_MEASUREANDBEAT), + X(GUID_NOTIFICATION_PERFORMANCE), + X(GUID_NOTIFICATION_RECOMPOSE), + X(GUID_NOTIFICATION_SEGMENT), + X(GUID_BandParam), + X(GUID_ChordParam), + X(GUID_CommandParam), + X(GUID_CommandParam2), + X(GUID_CommandParamNext), + X(GUID_IDirectMusicBand), + X(GUID_IDirectMusicChordMap), + X(GUID_IDirectMusicStyle), + X(GUID_MuteParam), + X(GUID_Play_Marker), + X(GUID_RhythmParam), + X(GUID_TempoParam), + X(GUID_TimeSignature), + X(GUID_Valid_Start_Time), + X(GUID_Clear_All_Bands), + X(GUID_ConnectToDLSCollection), + X(GUID_Disable_Auto_Download), + X(GUID_DisableTempo), + X(GUID_DisableTimeSig), + X(GUID_Download), + X(GUID_DownloadToAudioPath), + X(GUID_Enable_Auto_Download), + X(GUID_EnableTempo), + X(GUID_EnableTimeSig), + X(GUID_IgnoreBankSelectForGM), + X(GUID_SeedVariations), + X(GUID_StandardMIDIFile), + X(GUID_Unload), + X(GUID_UnloadFromAudioPath), + X(GUID_Variations), + X(GUID_PerfMasterTempo), + X(GUID_PerfMasterVolume), + X(GUID_PerfMasterGrooveLevel), + X(GUID_PerfAutoDownload), + X(GUID_DefaultGMCollection), + X(GUID_Synth_Default), + X(GUID_Buffer_Reverb), + X(GUID_Buffer_EnvReverb), + X(GUID_Buffer_Stereo), + X(GUID_Buffer_3D_Dry), + X(GUID_Buffer_Mono), + X(GUID_DMUS_PROP_GM_Hardware), + X(GUID_DMUS_PROP_GS_Capable), + X(GUID_DMUS_PROP_GS_Hardware), + X(GUID_DMUS_PROP_DLS1), + X(GUID_DMUS_PROP_DLS2), + X(GUID_DMUS_PROP_Effects), + X(GUID_DMUS_PROP_INSTRUMENT2), + X(GUID_DMUS_PROP_LegacyCaps), + X(GUID_DMUS_PROP_MemorySize), + X(GUID_DMUS_PROP_SampleMemorySize), + X(GUID_DMUS_PROP_SamplePlaybackRate), + X(GUID_DMUS_PROP_SetSynthSink), + X(GUID_DMUS_PROP_SinkUsesDSound), + X(GUID_DMUS_PROP_SynthSink_DSOUND), + X(GUID_DMUS_PROP_SynthSink_WAVE), + X(GUID_DMUS_PROP_Volume), + X(GUID_DMUS_PROP_WavesReverb), + X(GUID_DMUS_PROP_WriteLatency), + X(GUID_DMUS_PROP_WritePeriod), + X(GUID_DMUS_PROP_XG_Capable), + X(GUID_DMUS_PROP_XG_Hardware) + }; +#undef X + + if (!id) + return "(null)"; + + for (i = 0; i < ARRAY_SIZE(guids); i++) + if (IsEqualGUID(id, guids[i].guid)) + return guids[i].name; + + return debugstr_guid(id); +} -static inline const char *debugstr_fourcc(DWORD fourcc) +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) { - if (!fourcc) return "''"; - return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); + if (!desc || !TRACE_ON(dmfile)) + return; + + TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc); + TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize); + +#define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ") + TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData); + X(DMUS_OBJ_OBJECT); + X(DMUS_OBJ_CLASS); + X(DMUS_OBJ_NAME); + X(DMUS_OBJ_CATEGORY); + X(DMUS_OBJ_FILENAME); + X(DMUS_OBJ_FULLPATH); + X(DMUS_OBJ_URL); + X(DMUS_OBJ_VERSION); + X(DMUS_OBJ_DATE); + X(DMUS_OBJ_LOADED); + X(DMUS_OBJ_MEMORY); + X(DMUS_OBJ_STREAM); + TRACE_(dmfile)(")\n"); +#undef X + + if (desc->dwValidData & DMUS_OBJ_CLASS) + TRACE_(dmfile)(" - guidClass = %s\n", debugstr_dmguid(&desc->guidClass)); + if (desc->dwValidData & DMUS_OBJ_OBJECT) + TRACE_(dmfile)(" - guidObject = %s\n", debugstr_guid(&desc->guidObject)); + + if (desc->dwValidData & DMUS_OBJ_DATE) { + SYSTEMTIME time; + FileTimeToSystemTime(&desc->ftDate, &time); + TRACE_(dmfile)(" - ftDate = \'%04u-%02u-%02u %02u:%02u:%02u\'\n", + time.wYear, time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond); + } + if (desc->dwValidData & DMUS_OBJ_VERSION) + TRACE_(dmfile)(" - vVersion = \'%u,%u,%u,%u\'\n", + HIWORD(desc->vVersion.dwVersionMS), LOWORD(desc->vVersion.dwVersionMS), + HIWORD(desc->vVersion.dwVersionLS), LOWORD(desc->vVersion.dwVersionLS)); + if (desc->dwValidData & DMUS_OBJ_NAME) + TRACE_(dmfile)(" - wszName = %s\n", debugstr_w(desc->wszName)); + if (desc->dwValidData & DMUS_OBJ_CATEGORY) + TRACE_(dmfile)(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); + if (desc->dwValidData & DMUS_OBJ_FILENAME) + TRACE_(dmfile)(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); + if (desc->dwValidData & DMUS_OBJ_MEMORY) + TRACE_(dmfile)(" - llMemLength = 0x%s - pbMemData = %p\n", + wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); + if (desc->dwValidData & DMUS_OBJ_STREAM) + TRACE_(dmfile)(" - pStream = %p\n", desc->pStream); } + +/* RIFF format parsing */ +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + const char *debugstr_chunk(const struct chunk_entry *chunk) { const char *type = ""; diff --git a/dlls/dmloader/dmobject.h b/dlls/dmloader/dmobject.h index 4a721cc152..d347020691 100644 --- a/dlls/dmloader/dmobject.h +++ b/dlls/dmloader/dmobject.h @@ -60,8 +60,6 @@ static inline HRESULT stream_reset_chunk_start(IStream *stream, const struct chu return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL); } -const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; - /* IDirectMusicObject base object */ struct dmobject { @@ -106,3 +104,15 @@ HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream BOOL clear_dirty) DECLSPEC_HIDDEN; HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) DECLSPEC_HIDDEN; + +/* Debugging helpers */ +const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; +const char *debugstr_dmguid(const GUID *id) DECLSPEC_HIDDEN; +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN; + +static inline const char *debugstr_fourcc(DWORD fourcc) +{ + if (!fourcc) return "''"; + return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), + (char)(fourcc >> 16), (char)(fourcc >> 24)); +} -- 2.23.0

1 0

[PATCH 6/9] dmloader: Get rid of the 'dmdump' debug channel
by Michael Stefaniuc 12 Dec '19

12 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmloader/container.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index f7c7f3e951..075843ad32 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -22,7 +22,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmloader); WINE_DECLARE_DEBUG_CHANNEL(dmfile); -WINE_DECLARE_DEBUG_CHANNEL(dmdump); #define DMUS_MAX_CATEGORY_SIZE DMUS_MAX_CATEGORY*sizeof(WCHAR) #define DMUS_MAX_NAME_SIZE DMUS_MAX_NAME*sizeof(WCHAR) @@ -298,9 +297,8 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_CONTAINER_CHUNK: { - TRACE_(dmfile)(": container header chunk\n"); IStream_Read (pStm, &This->Header, Chunk.dwSize, NULL); - TRACE_(dmdump)(": container header chunk:\n%s\n", debugstr_DMUS_IO_CONTAINER_HEADER(&This->Header)); + TRACE_(dmfile)(": container header chunk:\n%s\n", debugstr_DMUS_IO_CONTAINER_HEADER(&This->Header)); break; } case DMUS_FOURCC_GUID_CHUNK: { @@ -403,14 +401,13 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS TRACE_(dmfile)(": alias chunk\n"); pNewEntry->wszAlias = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, Chunk.dwSize); IStream_Read (pStm, pNewEntry->wszAlias, Chunk.dwSize, NULL); - TRACE_(dmdump)(": alias: %s\n", debugstr_w(pNewEntry->wszAlias)); + TRACE_(dmfile)(": alias: %s\n", debugstr_w(pNewEntry->wszAlias)); break; } case DMUS_FOURCC_CONTAINED_OBJECT_CHUNK: { DMUS_IO_CONTAINED_OBJECT_HEADER tmpObjectHeader; - TRACE_(dmfile)(": contained object header chunk\n"); IStream_Read (pStm, &tmpObjectHeader, Chunk.dwSize, NULL); - TRACE_(dmdump)(": contained object header:\n%s\n", debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER(&tmpObjectHeader)); + TRACE_(dmfile)(": contained object header:\n%s\n", debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER(&tmpObjectHeader)); /* copy guidClass */ pNewEntry->Desc.dwValidData |= DMUS_OBJ_CLASS; pNewEntry->Desc.guidClass = tmpObjectHeader.guidClassID; -- 2.23.0

1 0

[PATCH 5/9] dmloader: Just use dump_DMUS_OBJECTDESC()
by Michael Stefaniuc 12 Dec '19

12 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmloader/container.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 39b105a159..f7c7f3e951 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -307,23 +307,20 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS TRACE_(dmfile)(": GUID chunk\n"); IStream_Read (pStm, &This->dmobj.desc.guidObject, Chunk.dwSize, NULL); This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT; - TRACE_(dmdump)(": GUID: %s\n", debugstr_guid(&This->dmobj.desc.guidObject)); break; } case DMUS_FOURCC_VERSION_CHUNK: { TRACE_(dmfile)(": version chunk\n"); IStream_Read (pStm, &This->dmobj.desc.vVersion, Chunk.dwSize, NULL); This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION; - TRACE_(dmdump)(": version: %s\n", debugstr_dmversion(&This->dmobj.desc.vVersion)); break; } case DMUS_FOURCC_DATE_CHUNK: { TRACE_(dmfile)(": date chunk\n"); IStream_Read (pStm, &This->dmobj.desc.ftDate, Chunk.dwSize, NULL); This->dmobj.desc.dwValidData |= DMUS_OBJ_DATE; - TRACE_(dmdump)(": date: %s\n", debugstr_filetime(&This->dmobj.desc.ftDate)); break; - } + } case DMUS_FOURCC_CATEGORY_CHUNK: { TRACE_(dmfile)(": category chunk\n"); /* if it happens that string is too long, @@ -336,7 +333,6 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS IStream_Read (pStm, This->dmobj.desc.wszCategory, Chunk.dwSize, NULL); } This->dmobj.desc.dwValidData |= DMUS_OBJ_CATEGORY; - TRACE_(dmdump)(": category: %s\n", debugstr_w(This->dmobj.desc.wszCategory)); break; } case FOURCC_LIST: { @@ -367,7 +363,6 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS IStream_Read (pStm, This->dmobj.desc.wszName, Chunk.dwSize, NULL); } This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME; - TRACE_(dmdump)(": name: %s\n", debugstr_w(This->dmobj.desc.wszName)); break; } default: { @@ -606,6 +601,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS } TRACE_(dmfile)(": reading finished\n"); This->dmobj.desc.dwValidData |= DMUS_OBJ_LOADED; + dump_DMUS_OBJECTDESC(&This->dmobj.desc); break; } default: { -- 2.23.0

1 0

[PATCH 4/9] dmband: Simplify dump_DMUS_OBJECTDESC() and move it to dmobject.c
by Michael Stefaniuc 12 Dec '19

12 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmband/band.c | 2 +- dlls/dmband/dmobject.c | 53 ++++++++++++++++++++++ dlls/dmband/dmobject.h | 1 + dlls/dmband/dmutils.c | 100 +---------------------------------------- dlls/dmband/dmutils.h | 14 ------ 5 files changed, 56 insertions(+), 114 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 53f407c1a4..901f5a69ee 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -158,7 +158,7 @@ static HRESULT WINAPI band_IDirectMusicObject_ParseDescriptor(IDirectMusicObject } TRACE("returning descriptor:\n"); - debug_DMUS_OBJECTDESC(desc); + dump_DMUS_OBJECTDESC(desc); return S_OK; } diff --git a/dlls/dmband/dmobject.c b/dlls/dmband/dmobject.c index e0b7eafe25..9ea31ab32a 100644 --- a/dlls/dmband/dmobject.c +++ b/dlls/dmband/dmobject.c @@ -219,6 +219,59 @@ const char *debugstr_dmguid(const GUID *id) { return debugstr_guid(id); } +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) +{ + if (!desc || !TRACE_ON(dmfile)) + return; + + TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc); + TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize); + +#define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ") + TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData); + X(DMUS_OBJ_OBJECT); + X(DMUS_OBJ_CLASS); + X(DMUS_OBJ_NAME); + X(DMUS_OBJ_CATEGORY); + X(DMUS_OBJ_FILENAME); + X(DMUS_OBJ_FULLPATH); + X(DMUS_OBJ_URL); + X(DMUS_OBJ_VERSION); + X(DMUS_OBJ_DATE); + X(DMUS_OBJ_LOADED); + X(DMUS_OBJ_MEMORY); + X(DMUS_OBJ_STREAM); + TRACE_(dmfile)(")\n"); +#undef X + + if (desc->dwValidData & DMUS_OBJ_CLASS) + TRACE_(dmfile)(" - guidClass = %s\n", debugstr_dmguid(&desc->guidClass)); + if (desc->dwValidData & DMUS_OBJ_OBJECT) + TRACE_(dmfile)(" - guidObject = %s\n", debugstr_guid(&desc->guidObject)); + + if (desc->dwValidData & DMUS_OBJ_DATE) { + SYSTEMTIME time; + FileTimeToSystemTime(&desc->ftDate, &time); + TRACE_(dmfile)(" - ftDate = \'%04u-%02u-%02u %02u:%02u:%02u\'\n", + time.wYear, time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond); + } + if (desc->dwValidData & DMUS_OBJ_VERSION) + TRACE_(dmfile)(" - vVersion = \'%u,%u,%u,%u\'\n", + HIWORD(desc->vVersion.dwVersionMS), LOWORD(desc->vVersion.dwVersionMS), + HIWORD(desc->vVersion.dwVersionLS), LOWORD(desc->vVersion.dwVersionLS)); + if (desc->dwValidData & DMUS_OBJ_NAME) + TRACE_(dmfile)(" - wszName = %s\n", debugstr_w(desc->wszName)); + if (desc->dwValidData & DMUS_OBJ_CATEGORY) + TRACE_(dmfile)(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); + if (desc->dwValidData & DMUS_OBJ_FILENAME) + TRACE_(dmfile)(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); + if (desc->dwValidData & DMUS_OBJ_MEMORY) + TRACE_(dmfile)(" - llMemLength = 0x%s - pbMemData = %p\n", + wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); + if (desc->dwValidData & DMUS_OBJ_STREAM) + TRACE_(dmfile)(" - pStream = %p\n", desc->pStream); +} + /* RIFF format parsing */ #define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) diff --git a/dlls/dmband/dmobject.h b/dlls/dmband/dmobject.h index 1354553665..d347020691 100644 --- a/dlls/dmband/dmobject.h +++ b/dlls/dmband/dmobject.h @@ -108,6 +108,7 @@ HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, /* Debugging helpers */ const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; const char *debugstr_dmguid(const GUID *id) DECLSPEC_HIDDEN; +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN; static inline const char *debugstr_fourcc(DWORD fourcc) { diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 39d6358211..c676775d35 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -44,84 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmfile); -/* generic flag-dumping function */ -static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ - static char buffer[128] = "", *ptr = &buffer[0]; - unsigned int i; - int size = sizeof(buffer); - - for (i=0; i < num_names; i++) { - if ((flags & names[i].val)) { - int cnt = snprintf(ptr, size, "%s ", names[i].name); - if (cnt < 0 || cnt >= size) break; - size -= cnt; - ptr += cnt; - } - } - - ptr = &buffer[0]; - return ptr; -} - -/* dump DMUS_OBJ flags */ -static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { - static const flag_info flags[] = { - FE(DMUS_OBJ_OBJECT), - FE(DMUS_OBJ_CLASS), - FE(DMUS_OBJ_NAME), - FE(DMUS_OBJ_CATEGORY), - FE(DMUS_OBJ_FILENAME), - FE(DMUS_OBJ_FULLPATH), - FE(DMUS_OBJ_URL), - FE(DMUS_OBJ_VERSION), - FE(DMUS_OBJ_DATE), - FE(DMUS_OBJ_LOADED), - FE(DMUS_OBJ_MEMORY), - FE(DMUS_OBJ_STREAM) - }; - return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); -} - -/* month number into month name (for debugstr_filetime) */ -static const char *debugstr_month (DWORD dwMonth) { - switch (dwMonth) { - case 1: return "January"; - case 2: return "February"; - case 3: return "March"; - case 4: return "April"; - case 5: return "May"; - case 6: return "June"; - case 7: return "July"; - case 8: return "August"; - case 9: return "September"; - case 10: return "October"; - case 11: return "November"; - case 12: return "December"; - default: return "Invalid"; - } -} - -/* FILETIME struct to string conversion for debug messages */ -static const char *debugstr_filetime (const FILETIME *time) { - SYSTEMTIME sysTime; - - if (!time) return "'null'"; - - FileTimeToSystemTime (time, &sysTime); - - return wine_dbg_sprintf ("\'%02i. %s %04i %02i:%02i:%02i\'", - sysTime.wDay, debugstr_month(sysTime.wMonth), sysTime.wYear, - sysTime.wHour, sysTime.wMinute, sysTime.wSecond); -} - -/* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion (const DMUS_VERSION *version) { - if (!version) return "'null'"; - return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", - HIWORD(version->dwVersionMS),LOWORD(version->dwVersionMS), - HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); -} - HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { switch (pChunk->fccID) { @@ -278,7 +200,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, TRACE("** DM Reference Begin of Load ***\n"); TRACE("With Desc:\n"); - debug_DMUS_OBJECTDESC(&ref_desc); + dump_DMUS_OBJECTDESC(&ref_desc); { LPDIRECTMUSICGETLOADER pGetLoader = NULL; @@ -295,23 +217,3 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, return hr; } - -void debug_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { - if (pDesc) { - TRACE("DMUS_OBJECTDESC (%p):\n", pDesc); - TRACE(" - dwSize = %d\n", pDesc->dwSize); - TRACE(" - dwValidData = %s\n", debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); - if (pDesc->dwValidData & DMUS_OBJ_NAME) TRACE(" - wszName = %s\n", debugstr_w(pDesc->wszName)); - if (pDesc->dwValidData & DMUS_OBJ_CLASS) TRACE(" - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) TRACE(" - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) TRACE(" - ftDate = %s\n", debugstr_filetime(&pDesc->ftDate)); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) TRACE(" - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s - pbMemData = %p\n", - wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); - if (pDesc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", pDesc->pStream); - } else { - TRACE("(NULL)\n"); - } -} diff --git a/dlls/dmband/dmutils.h b/dlls/dmband/dmutils.h index dfa8ac46d6..2f13c4b1f4 100644 --- a/dlls/dmband/dmutils.h +++ b/dlls/dmband/dmutils.h @@ -34,18 +34,4 @@ extern HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_C extern HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; extern HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject) DECLSPEC_HIDDEN; -/** - * Debug utilities - */ -/* used for generic dumping (copied from ddraw) */ -typedef struct { - DWORD val; - const char* name; -} flag_info; - -/* used for initialising structs */ -#define FE(x) { x, #x } - -extern void debug_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; - #endif /* __WINE_DMUTILS_H */ -- 2.23.0

1 0

[PATCH 3/9] dmband: Use only the 'dmfile' debug channel in dmutils.c
by Michael Stefaniuc 12 Dec '19

12 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmband/dmutils.c | 45 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 1309c7c318..39d6358211 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -42,8 +42,7 @@ #include "dmutils.h" #include "dmobject.h" -WINE_DEFAULT_DEBUG_CHANNEL(dmusic); -WINE_DECLARE_DEBUG_CHANNEL(dmfile); +WINE_DEFAULT_DEBUG_CHANNEL(dmfile); /* generic flag-dumping function */ static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ @@ -127,37 +126,37 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* p switch (pChunk->fccID) { case DMUS_FOURCC_GUID_CHUNK: { - TRACE_(dmfile)(": GUID chunk\n"); + TRACE(": GUID chunk\n"); pDesc->dwValidData |= DMUS_OBJ_OBJECT; IStream_Read (pStm, &pDesc->guidObject, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_DATE_CHUNK: { - TRACE_(dmfile)(": file date chunk\n"); + TRACE(": file date chunk\n"); pDesc->dwValidData |= DMUS_OBJ_DATE; IStream_Read (pStm, &pDesc->ftDate, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_NAME_CHUNK: { - TRACE_(dmfile)(": name chunk\n"); + TRACE(": name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_NAME; IStream_Read (pStm, pDesc->wszName, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_FILE_CHUNK: { - TRACE_(dmfile)(": file name chunk\n"); + TRACE(": file name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_FILENAME; IStream_Read (pStm, pDesc->wszFileName, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: { - TRACE_(dmfile)(": version chunk\n"); + TRACE(": version chunk\n"); pDesc->dwValidData |= DMUS_OBJ_VERSION; IStream_Read (pStm, &pDesc->vVersion, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_CATEGORY_CHUNK: { - TRACE_(dmfile)(": category chunk\n"); + TRACE(": category chunk\n"); pDesc->dwValidData |= DMUS_OBJ_CATEGORY; IStream_Read (pStm, pDesc->wszCategory, pChunk->dwSize, NULL); break; @@ -182,37 +181,37 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* p case mmioFOURCC('I','N','A','M'): case DMUS_FOURCC_UNAM_CHUNK: { - TRACE_(dmfile)(": name chunk\n"); + TRACE(": name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_NAME; IStream_Read (pStm, pDesc->wszName, pChunk->dwSize, NULL); - TRACE_(dmfile)(" - wszName: %s\n", debugstr_w(pDesc->wszName)); + TRACE(" - wszName: %s\n", debugstr_w(pDesc->wszName)); break; } case mmioFOURCC('I','A','R','T'): case DMUS_FOURCC_UART_CHUNK: { - TRACE_(dmfile)(": artist chunk (ignored)\n"); + TRACE(": artist chunk (ignored)\n"); liMove.QuadPart = pChunk->dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } case mmioFOURCC('I','C','O','P'): case DMUS_FOURCC_UCOP_CHUNK: { - TRACE_(dmfile)(": copyright chunk (ignored)\n"); + TRACE(": copyright chunk (ignored)\n"); liMove.QuadPart = pChunk->dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } case mmioFOURCC('I','S','B','J'): case DMUS_FOURCC_USBJ_CHUNK: { - TRACE_(dmfile)(": subject chunk (ignored)\n"); + TRACE(": subject chunk (ignored)\n"); liMove.QuadPart = pChunk->dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } case mmioFOURCC('I','C','M','T'): case DMUS_FOURCC_UCMT_CHUNK: { - TRACE_(dmfile)(": comment chunk (ignored)\n"); + TRACE(": comment chunk (ignored)\n"); liMove.QuadPart = pChunk->dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; @@ -248,7 +247,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &ref_desc); if (FAILED(hr)) return hr; @@ -256,29 +255,29 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, if (hr == S_FALSE) { switch (Chunk.fccID) { case DMUS_FOURCC_REF_CHUNK: { - TRACE_(dmfile)(": Reference chunk\n"); + TRACE(": Reference chunk\n"); if (Chunk.dwSize != sizeof(DMUS_IO_REFERENCE)) return E_FAIL; IStream_Read (pStm, &ref, sizeof(DMUS_IO_REFERENCE), NULL); - TRACE_(dmfile)(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID)); - TRACE_(dmfile)(" - dwValidData: %u\n", ref.dwValidData); + TRACE(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID)); + TRACE(" - dwValidData: %u\n", ref.dwValidData); break; } default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); + TRACE(": unknown chunk (irrelevant & skipping)\n"); liMove.QuadPart = Chunk.dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } } } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); + TRACE(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); ref_desc.dwValidData |= DMUS_OBJ_CLASS; ref_desc.guidClass = ref.guidClassID; - TRACE_(dmfile)("** DM Reference Begin of Load ***\n"); - TRACE_(dmfile)("With Desc:\n"); + TRACE("** DM Reference Begin of Load ***\n"); + TRACE("With Desc:\n"); debug_DMUS_OBJECTDESC(&ref_desc); { @@ -292,7 +291,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, hr = IDirectMusicLoader_GetObject (pLoader, &ref_desc, &IID_IDirectMusicObject, (LPVOID*)ppObject); IDirectMusicLoader_Release (pLoader); /* release loader */ } - TRACE_(dmfile)("** DM Reference End of Load ***\n"); + TRACE("** DM Reference End of Load ***\n"); return hr; } -- 2.23.0

1 0

[PATCH 2/9] dmband: Move debugstr_dmguid() to dmobject.c
by Michael Stefaniuc 12 Dec '19

12 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmband/dmband_main.c | 1 + dlls/dmband/dmobject.c | 189 ++++++++++++++++++++++++++++++++++++++ dlls/dmband/dmobject.h | 1 + dlls/dmband/dmutils.c | 184 ------------------------------------- dlls/dmband/dmutils.h | 9 -- 5 files changed, 191 insertions(+), 193 deletions(-) diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c index e63678c831..baf36a3d6a 100644 --- a/dlls/dmband/dmband_main.c +++ b/dlls/dmband/dmband_main.c @@ -19,6 +19,7 @@ #include "dmband_private.h" #include "rpcproxy.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmband); diff --git a/dlls/dmband/dmobject.c b/dlls/dmband/dmobject.c index 3b71a2719c..e0b7eafe25 100644 --- a/dlls/dmband/dmobject.c +++ b/dlls/dmband/dmobject.c @@ -25,12 +25,201 @@ #include "objbase.h" #include "dmusici.h" #include "dmusicf.h" +#include "dmusics.h" #include "dmobject.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dmobj); WINE_DECLARE_DEBUG_CHANNEL(dmfile); +/* Debugging helpers */ +const char *debugstr_dmguid(const GUID *id) { + unsigned int i; +#define X(guid) { &guid, #guid } + static const struct { + const GUID *guid; + const char *name; + } guids[] = { + /* CLSIDs */ + X(CLSID_AudioVBScript), + X(CLSID_DirectMusic), + X(CLSID_DirectMusicAudioPathConfig), + X(CLSID_DirectMusicAuditionTrack), + X(CLSID_DirectMusicBand), + X(CLSID_DirectMusicBandTrack), + X(CLSID_DirectMusicChordMapTrack), + X(CLSID_DirectMusicChordMap), + X(CLSID_DirectMusicChordTrack), + X(CLSID_DirectMusicCollection), + X(CLSID_DirectMusicCommandTrack), + X(CLSID_DirectMusicComposer), + X(CLSID_DirectMusicContainer), + X(CLSID_DirectMusicGraph), + X(CLSID_DirectMusicLoader), + X(CLSID_DirectMusicLyricsTrack), + X(CLSID_DirectMusicMarkerTrack), + X(CLSID_DirectMusicMelodyFormulationTrack), + X(CLSID_DirectMusicMotifTrack), + X(CLSID_DirectMusicMuteTrack), + X(CLSID_DirectMusicParamControlTrack), + X(CLSID_DirectMusicPatternTrack), + X(CLSID_DirectMusicPerformance), + X(CLSID_DirectMusicScript), + X(CLSID_DirectMusicScriptAutoImpSegment), + X(CLSID_DirectMusicScriptAutoImpPerformance), + X(CLSID_DirectMusicScriptAutoImpSegmentState), + X(CLSID_DirectMusicScriptAutoImpAudioPathConfig), + X(CLSID_DirectMusicScriptAutoImpAudioPath), + X(CLSID_DirectMusicScriptAutoImpSong), + X(CLSID_DirectMusicScriptSourceCodeLoader), + X(CLSID_DirectMusicScriptTrack), + X(CLSID_DirectMusicSection), + X(CLSID_DirectMusicSegment), + X(CLSID_DirectMusicSegmentState), + X(CLSID_DirectMusicSegmentTriggerTrack), + X(CLSID_DirectMusicSegTriggerTrack), + X(CLSID_DirectMusicSeqTrack), + X(CLSID_DirectMusicSignPostTrack), + X(CLSID_DirectMusicSong), + X(CLSID_DirectMusicStyle), + X(CLSID_DirectMusicStyleTrack), + X(CLSID_DirectMusicSynth), + X(CLSID_DirectMusicSynthSink), + X(CLSID_DirectMusicSysExTrack), + X(CLSID_DirectMusicTemplate), + X(CLSID_DirectMusicTempoTrack), + X(CLSID_DirectMusicTimeSigTrack), + X(CLSID_DirectMusicWaveTrack), + X(CLSID_DirectSoundWave), + /* IIDs */ + X(IID_IDirectMusic), + X(IID_IDirectMusic2), + X(IID_IDirectMusic8), + X(IID_IDirectMusicAudioPath), + X(IID_IDirectMusicBand), + X(IID_IDirectMusicBuffer), + X(IID_IDirectMusicChordMap), + X(IID_IDirectMusicCollection), + X(IID_IDirectMusicComposer), + X(IID_IDirectMusicContainer), + X(IID_IDirectMusicDownload), + X(IID_IDirectMusicDownloadedInstrument), + X(IID_IDirectMusicGetLoader), + X(IID_IDirectMusicGraph), + X(IID_IDirectMusicInstrument), + X(IID_IDirectMusicLoader), + X(IID_IDirectMusicLoader8), + X(IID_IDirectMusicObject), + X(IID_IDirectMusicPatternTrack), + X(IID_IDirectMusicPerformance), + X(IID_IDirectMusicPerformance2), + X(IID_IDirectMusicPerformance8), + X(IID_IDirectMusicPort), + X(IID_IDirectMusicPortDownload), + X(IID_IDirectMusicScript), + X(IID_IDirectMusicSegment), + X(IID_IDirectMusicSegment2), + X(IID_IDirectMusicSegment8), + X(IID_IDirectMusicSegmentState), + X(IID_IDirectMusicSegmentState8), + X(IID_IDirectMusicStyle), + X(IID_IDirectMusicStyle8), + X(IID_IDirectMusicSynth), + X(IID_IDirectMusicSynth8), + X(IID_IDirectMusicSynthSink), + X(IID_IDirectMusicThru), + X(IID_IDirectMusicTool), + X(IID_IDirectMusicTool8), + X(IID_IDirectMusicTrack), + X(IID_IDirectMusicTrack8), + X(IID_IUnknown), + X(IID_IPersistStream), + X(IID_IStream), + X(IID_IClassFactory), + /* GUIDs */ + X(GUID_DirectMusicAllTypes), + X(GUID_NOTIFICATION_CHORD), + X(GUID_NOTIFICATION_COMMAND), + X(GUID_NOTIFICATION_MEASUREANDBEAT), + X(GUID_NOTIFICATION_PERFORMANCE), + X(GUID_NOTIFICATION_RECOMPOSE), + X(GUID_NOTIFICATION_SEGMENT), + X(GUID_BandParam), + X(GUID_ChordParam), + X(GUID_CommandParam), + X(GUID_CommandParam2), + X(GUID_CommandParamNext), + X(GUID_IDirectMusicBand), + X(GUID_IDirectMusicChordMap), + X(GUID_IDirectMusicStyle), + X(GUID_MuteParam), + X(GUID_Play_Marker), + X(GUID_RhythmParam), + X(GUID_TempoParam), + X(GUID_TimeSignature), + X(GUID_Valid_Start_Time), + X(GUID_Clear_All_Bands), + X(GUID_ConnectToDLSCollection), + X(GUID_Disable_Auto_Download), + X(GUID_DisableTempo), + X(GUID_DisableTimeSig), + X(GUID_Download), + X(GUID_DownloadToAudioPath), + X(GUID_Enable_Auto_Download), + X(GUID_EnableTempo), + X(GUID_EnableTimeSig), + X(GUID_IgnoreBankSelectForGM), + X(GUID_SeedVariations), + X(GUID_StandardMIDIFile), + X(GUID_Unload), + X(GUID_UnloadFromAudioPath), + X(GUID_Variations), + X(GUID_PerfMasterTempo), + X(GUID_PerfMasterVolume), + X(GUID_PerfMasterGrooveLevel), + X(GUID_PerfAutoDownload), + X(GUID_DefaultGMCollection), + X(GUID_Synth_Default), + X(GUID_Buffer_Reverb), + X(GUID_Buffer_EnvReverb), + X(GUID_Buffer_Stereo), + X(GUID_Buffer_3D_Dry), + X(GUID_Buffer_Mono), + X(GUID_DMUS_PROP_GM_Hardware), + X(GUID_DMUS_PROP_GS_Capable), + X(GUID_DMUS_PROP_GS_Hardware), + X(GUID_DMUS_PROP_DLS1), + X(GUID_DMUS_PROP_DLS2), + X(GUID_DMUS_PROP_Effects), + X(GUID_DMUS_PROP_INSTRUMENT2), + X(GUID_DMUS_PROP_LegacyCaps), + X(GUID_DMUS_PROP_MemorySize), + X(GUID_DMUS_PROP_SampleMemorySize), + X(GUID_DMUS_PROP_SamplePlaybackRate), + X(GUID_DMUS_PROP_SetSynthSink), + X(GUID_DMUS_PROP_SinkUsesDSound), + X(GUID_DMUS_PROP_SynthSink_DSOUND), + X(GUID_DMUS_PROP_SynthSink_WAVE), + X(GUID_DMUS_PROP_Volume), + X(GUID_DMUS_PROP_WavesReverb), + X(GUID_DMUS_PROP_WriteLatency), + X(GUID_DMUS_PROP_WritePeriod), + X(GUID_DMUS_PROP_XG_Capable), + X(GUID_DMUS_PROP_XG_Hardware) + }; +#undef X + + if (!id) + return "(null)"; + + for (i = 0; i < ARRAY_SIZE(guids); i++) + if (IsEqualGUID(id, guids[i].guid)) + return guids[i].name; + + return debugstr_guid(id); +} + + /* RIFF format parsing */ #define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) diff --git a/dlls/dmband/dmobject.h b/dlls/dmband/dmobject.h index 9e287a4126..1354553665 100644 --- a/dlls/dmband/dmobject.h +++ b/dlls/dmband/dmobject.h @@ -107,6 +107,7 @@ HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, /* Debugging helpers */ const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; +const char *debugstr_dmguid(const GUID *id) DECLSPEC_HIDDEN; static inline const char *debugstr_fourcc(DWORD fourcc) { diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 2401b20a60..1309c7c318 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -297,190 +297,6 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, return hr; } -/* returns name of given GUID */ -const char *debugstr_dmguid (const GUID *id) { - static const guid_info guids[] = { - /* CLSIDs */ - GE(CLSID_AudioVBScript), - GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPathConfig), - GE(CLSID_DirectMusicAuditionTrack), - GE(CLSID_DirectMusicBand), - GE(CLSID_DirectMusicBandTrack), - GE(CLSID_DirectMusicChordMapTrack), - GE(CLSID_DirectMusicChordMap), - GE(CLSID_DirectMusicChordTrack), - GE(CLSID_DirectMusicCollection), - GE(CLSID_DirectMusicCommandTrack), - GE(CLSID_DirectMusicComposer), - GE(CLSID_DirectMusicContainer), - GE(CLSID_DirectMusicGraph), - GE(CLSID_DirectMusicLoader), - GE(CLSID_DirectMusicLyricsTrack), - GE(CLSID_DirectMusicMarkerTrack), - GE(CLSID_DirectMusicMelodyFormulationTrack), - GE(CLSID_DirectMusicMotifTrack), - GE(CLSID_DirectMusicMuteTrack), - GE(CLSID_DirectMusicParamControlTrack), - GE(CLSID_DirectMusicPatternTrack), - GE(CLSID_DirectMusicPerformance), - GE(CLSID_DirectMusicScript), - GE(CLSID_DirectMusicScriptAutoImpSegment), - GE(CLSID_DirectMusicScriptAutoImpPerformance), - GE(CLSID_DirectMusicScriptAutoImpSegmentState), - GE(CLSID_DirectMusicScriptAutoImpAudioPathConfig), - GE(CLSID_DirectMusicScriptAutoImpAudioPath), - GE(CLSID_DirectMusicScriptAutoImpSong), - GE(CLSID_DirectMusicScriptSourceCodeLoader), - GE(CLSID_DirectMusicScriptTrack), - GE(CLSID_DirectMusicSection), - GE(CLSID_DirectMusicSegment), - GE(CLSID_DirectMusicSegmentState), - GE(CLSID_DirectMusicSegmentTriggerTrack), - GE(CLSID_DirectMusicSegTriggerTrack), - GE(CLSID_DirectMusicSeqTrack), - GE(CLSID_DirectMusicSignPostTrack), - GE(CLSID_DirectMusicSong), - GE(CLSID_DirectMusicStyle), - GE(CLSID_DirectMusicStyleTrack), - GE(CLSID_DirectMusicSynth), - GE(CLSID_DirectMusicSynthSink), - GE(CLSID_DirectMusicSysExTrack), - GE(CLSID_DirectMusicTemplate), - GE(CLSID_DirectMusicTempoTrack), - GE(CLSID_DirectMusicTimeSigTrack), - GE(CLSID_DirectMusicWaveTrack), - GE(CLSID_DirectSoundWave), - /* IIDs */ - GE(IID_IDirectMusic), - GE(IID_IDirectMusic2), - GE(IID_IDirectMusic8), - GE(IID_IDirectMusicAudioPath), - GE(IID_IDirectMusicBand), - GE(IID_IDirectMusicBuffer), - GE(IID_IDirectMusicChordMap), - GE(IID_IDirectMusicCollection), - GE(IID_IDirectMusicComposer), - GE(IID_IDirectMusicContainer), - GE(IID_IDirectMusicDownload), - GE(IID_IDirectMusicDownloadedInstrument), - GE(IID_IDirectMusicGetLoader), - GE(IID_IDirectMusicGraph), - GE(IID_IDirectMusicInstrument), - GE(IID_IDirectMusicLoader), - GE(IID_IDirectMusicLoader8), - GE(IID_IDirectMusicObject), - GE(IID_IDirectMusicPatternTrack), - GE(IID_IDirectMusicPerformance), - GE(IID_IDirectMusicPerformance2), - GE(IID_IDirectMusicPerformance8), - GE(IID_IDirectMusicPort), - GE(IID_IDirectMusicPortDownload), - GE(IID_IDirectMusicScript), - GE(IID_IDirectMusicSegment), - GE(IID_IDirectMusicSegment2), - GE(IID_IDirectMusicSegment8), - GE(IID_IDirectMusicSegmentState), - GE(IID_IDirectMusicSegmentState8), - GE(IID_IDirectMusicStyle), - GE(IID_IDirectMusicStyle8), - GE(IID_IDirectMusicSynth), - GE(IID_IDirectMusicSynth8), - GE(IID_IDirectMusicSynthSink), - GE(IID_IDirectMusicThru), - GE(IID_IDirectMusicTool), - GE(IID_IDirectMusicTool8), - GE(IID_IDirectMusicTrack), - GE(IID_IDirectMusicTrack8), - GE(IID_IUnknown), - GE(IID_IPersistStream), - GE(IID_IStream), - GE(IID_IClassFactory), - /* GUIDs */ - GE(GUID_DirectMusicAllTypes), - GE(GUID_NOTIFICATION_CHORD), - GE(GUID_NOTIFICATION_COMMAND), - GE(GUID_NOTIFICATION_MEASUREANDBEAT), - GE(GUID_NOTIFICATION_PERFORMANCE), - GE(GUID_NOTIFICATION_RECOMPOSE), - GE(GUID_NOTIFICATION_SEGMENT), - GE(GUID_BandParam), - GE(GUID_ChordParam), - GE(GUID_CommandParam), - GE(GUID_CommandParam2), - GE(GUID_CommandParamNext), - GE(GUID_IDirectMusicBand), - GE(GUID_IDirectMusicChordMap), - GE(GUID_IDirectMusicStyle), - GE(GUID_MuteParam), - GE(GUID_Play_Marker), - GE(GUID_RhythmParam), - GE(GUID_TempoParam), - GE(GUID_TimeSignature), - GE(GUID_Valid_Start_Time), - GE(GUID_Clear_All_Bands), - GE(GUID_ConnectToDLSCollection), - GE(GUID_Disable_Auto_Download), - GE(GUID_DisableTempo), - GE(GUID_DisableTimeSig), - GE(GUID_Download), - GE(GUID_DownloadToAudioPath), - GE(GUID_Enable_Auto_Download), - GE(GUID_EnableTempo), - GE(GUID_EnableTimeSig), - GE(GUID_IgnoreBankSelectForGM), - GE(GUID_SeedVariations), - GE(GUID_StandardMIDIFile), - GE(GUID_Unload), - GE(GUID_UnloadFromAudioPath), - GE(GUID_Variations), - GE(GUID_PerfMasterTempo), - GE(GUID_PerfMasterVolume), - GE(GUID_PerfMasterGrooveLevel), - GE(GUID_PerfAutoDownload), - GE(GUID_DefaultGMCollection), - GE(GUID_Synth_Default), - GE(GUID_Buffer_Reverb), - GE(GUID_Buffer_EnvReverb), - GE(GUID_Buffer_Stereo), - GE(GUID_Buffer_3D_Dry), - GE(GUID_Buffer_Mono), - GE(GUID_DMUS_PROP_GM_Hardware), - GE(GUID_DMUS_PROP_GS_Capable), - GE(GUID_DMUS_PROP_GS_Hardware), - GE(GUID_DMUS_PROP_DLS1), - GE(GUID_DMUS_PROP_DLS2), - GE(GUID_DMUS_PROP_Effects), - GE(GUID_DMUS_PROP_INSTRUMENT2), - GE(GUID_DMUS_PROP_LegacyCaps), - GE(GUID_DMUS_PROP_MemorySize), - GE(GUID_DMUS_PROP_SampleMemorySize), - GE(GUID_DMUS_PROP_SamplePlaybackRate), - GE(GUID_DMUS_PROP_SetSynthSink), - GE(GUID_DMUS_PROP_SinkUsesDSound), - GE(GUID_DMUS_PROP_SynthSink_DSOUND), - GE(GUID_DMUS_PROP_SynthSink_WAVE), - GE(GUID_DMUS_PROP_Volume), - GE(GUID_DMUS_PROP_WavesReverb), - GE(GUID_DMUS_PROP_WriteLatency), - GE(GUID_DMUS_PROP_WritePeriod), - GE(GUID_DMUS_PROP_XG_Capable), - GE(GUID_DMUS_PROP_XG_Hardware) - }; - - unsigned int i; - - if (!id) return "(null)"; - for (i = 0; i < ARRAY_SIZE(guids); i++) { - if (IsEqualGUID(id, guids[i].guid)) - return guids[i].name; - } - - /* if we didn't find it, act like standard debugstr_guid */ - return debugstr_guid(id); -} - - void debug_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc) { TRACE("DMUS_OBJECTDESC (%p):\n", pDesc); diff --git a/dlls/dmband/dmutils.h b/dlls/dmband/dmutils.h index 5a845a81a8..dfa8ac46d6 100644 --- a/dlls/dmband/dmutils.h +++ b/dlls/dmband/dmutils.h @@ -43,17 +43,8 @@ typedef struct { const char* name; } flag_info; -typedef struct { - const GUID *guid; - const char* name; -} guid_info; - /* used for initialising structs */ #define FE(x) { x, #x } -#define GE(x) { &x, #x } - -/* returns name of given GUID */ -extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; extern void debug_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH 1/9] dmband: Move debugstr_fourcc() to dmobject.h
by Michael Stefaniuc 12 Dec '19

12 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmband/dmobject.c | 7 ------- dlls/dmband/dmobject.h | 12 ++++++++++-- dlls/dmband/dmutils.c | 9 +-------- dlls/dmband/dmutils.h | 2 -- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/dmband/dmobject.c b/dlls/dmband/dmobject.c index 25f3198d2b..3b71a2719c 100644 --- a/dlls/dmband/dmobject.c +++ b/dlls/dmband/dmobject.c @@ -34,13 +34,6 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /* RIFF format parsing */ #define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) -static inline const char *debugstr_fourcc(DWORD fourcc) -{ - if (!fourcc) return "''"; - return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); -} - const char *debugstr_chunk(const struct chunk_entry *chunk) { const char *type = ""; diff --git a/dlls/dmband/dmobject.h b/dlls/dmband/dmobject.h index 4a721cc152..9e287a4126 100644 --- a/dlls/dmband/dmobject.h +++ b/dlls/dmband/dmobject.h @@ -60,8 +60,6 @@ static inline HRESULT stream_reset_chunk_start(IStream *stream, const struct chu return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL); } -const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; - /* IDirectMusicObject base object */ struct dmobject { @@ -106,3 +104,13 @@ HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream BOOL clear_dirty) DECLSPEC_HIDDEN; HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) DECLSPEC_HIDDEN; + +/* Debugging helpers */ +const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; + +static inline const char *debugstr_fourcc(DWORD fourcc) +{ + if (!fourcc) return "''"; + return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), + (char)(fourcc >> 16), (char)(fourcc >> 24)); +} diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index af24054bf4..2401b20a60 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -40,6 +40,7 @@ #include "dmusics.h" #include "dmutils.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); WINE_DECLARE_DEBUG_CHANNEL(dmfile); @@ -296,14 +297,6 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, return hr; } -/* FOURCC to string conversion for debug messages */ -const char *debugstr_fourcc (DWORD fourcc) { - if (!fourcc) return "'null'"; - return wine_dbg_sprintf ("\'%c%c%c%c\'", - (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); -} - /* returns name of given GUID */ const char *debugstr_dmguid (const GUID *id) { static const guid_info guids[] = { diff --git a/dlls/dmband/dmutils.h b/dlls/dmband/dmutils.h index bb93e05c2b..5a845a81a8 100644 --- a/dlls/dmband/dmutils.h +++ b/dlls/dmband/dmutils.h @@ -52,8 +52,6 @@ typedef struct { #define FE(x) { x, #x } #define GE(x) { &x, #x } -/* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; /* returns name of given GUID */ extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH v2] ucrtbase: Fix handling of tab and non-breaking space in iswctype().
by Chip Davis 11 Dec '19

11 Dec '19

It's just these two that are handled specially AFAICT. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v2: Fix build. dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr110/tests/msvcr110.c | 30 +++++++++++++++++++++++++ dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 28 +++++++++++++++++++++++ dlls/msvcrt/wcs.c | 29 +++++++++++++++++------- dlls/ucrtbase/tests/misc.c | 41 +++++++++++++++++++++++++++++----- dlls/ucrtbase/ucrtbase.spec | 2 +- 13 files changed, 123 insertions(+), 23 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 560e14b33b8..177b67298b2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1719,7 +1719,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 2316535e5d1..376c36cd159 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2077,7 +2077,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index 09876131f07..862d2bfce74 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -33,6 +33,7 @@ static char* (CDECL *p_setlocale)(int category, const char* locale); static size_t (CDECL *p___strncnt)(const char *str, size_t count); +static int (CDECL *p_iswctype)(wchar_t, wctype_t); static unsigned int (CDECL *p_CurrentScheduler_GetNumberOfVirtualProcessors)(void); static unsigned int (CDECL *p__CurrentScheduler__GetNumberOfVirtualProcessors)(void); @@ -52,6 +53,7 @@ static BOOL init(void) p_setlocale = (void*)GetProcAddress(module, "setlocale"); p___strncnt = (void*)GetProcAddress(module, "__strncnt"); + p_iswctype = (void*)GetProcAddress(module, "iswctype"); p_CurrentScheduler_GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?GetNumberOfVirtualProcessors@CurrentScheduler@Concurrency@@SAIXZ"); p__CurrentScheduler__GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?_GetNumberOfVirtualProcessors@_CurrentScheduler@details@Concurrency@@SAIXZ"); p_CurrentScheduler_Id = (void*)GetProcAddress(module, "?Id@CurrentScheduler@Concurrency@@SAIXZ"); @@ -143,10 +145,38 @@ static void test___strncnt(void) } } +static void test_iswctype(void) +{ + static const struct { + WCHAR c; + int t; + int r; + } tests[] = { + { '0', C1_DIGIT, C1_DIGIT }, + { '9', C1_DIGIT, C1_DIGIT }, + { 'a', C1_DIGIT, 0 }, + { 'a', C1_LOWER, C1_LOWER }, + { 0xa0, C1_BLANK, C1_BLANK }, + { 0xe0, _ALPHA, C1_ALPHA|C1_LOWER }, + { 0xff16, C1_DIGIT, C1_DIGIT }, + { 0x0660, C1_DIGIT, C1_DIGIT }, + { 0x0ce6, C1_DIGIT, C1_DIGIT } + }; + int i, r; + + p_setlocale(LC_ALL, "C"); + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + r = p_iswctype(tests[i].c, tests[i].t); + ok(r == tests[i].r, "iswctype returned %x for %x\n", r, tests[i].c); + } +} + START_TEST(msvcr110) { if (!init()) return; test_CurrentScheduler(); /* MUST be first (at least among Concurrency tests) */ test_setlocale(); test___strncnt(); + test_iswctype(); } diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 903f4b7ce38..f04a0ec3494 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2230,7 +2230,7 @@ @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswblank(long) MSVCRT_iswblank @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index a014cf50365..d1457e8a32e 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -754,7 +754,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 21b73d3a75c..72f292e64f0 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -750,7 +750,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 402e6efc109..9e5f03685ce 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1401,7 +1401,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8a079abe254..8c54c5f762d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1374,7 +1374,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b3b9cca0b97..0d6b17eb6d8 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1340,7 +1340,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 1be4dcb129c..5b215728ad4 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -4024,6 +4024,33 @@ static void test_iswdigit(void) } } +static void test_iswctype(void) +{ + static const struct { + WCHAR c; + int t; + int r; + } tests[] = { + { '0', C1_DIGIT, C1_DIGIT }, + { '9', C1_DIGIT, C1_DIGIT }, + { 'a', C1_DIGIT, 0 }, + { 'a', C1_LOWER, C1_LOWER }, + { 0xa0, C1_BLANK, C1_BLANK }, + { 0xe0, _ALPHA, C1_ALPHA|C1_LOWER }, + { 0xff16, C1_DIGIT, C1_DIGIT }, + { 0x0660, C1_DIGIT, C1_DIGIT }, + { 0x0ce6, C1_DIGIT, C1_DIGIT } + }; + int i, r; + + setlocale(LC_ALL, "C"); + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + r = iswctype(tests[i].c, tests[i].t); + ok(r == tests[i].r, "iswctype returned %x for %x\n", r, tests[i].c); + } +} + START_TEST(string) { char mem[100]; @@ -4167,4 +4194,5 @@ START_TEST(string) test_C_locale(); test_strstr(); test_iswdigit(); + test_iswctype(); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1ae292423c0..16e28606bc1 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1845,6 +1845,27 @@ MSVCRT_size_t CDECL MSVCRT_wcrtomb( char *dst, MSVCRT_wchar_t ch, MSVCRT_mbstate return MSVCRT_wctomb(dst, ch); } +/********************************************************************* + * _iswctype_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswctype_l(MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__locale_t locale) +{ + int ret = (get_char_typeW(wc) & 0xffff) & type; + +#if _MSVCR_VER >= 140 + if (wc == '\t' || wc == '\xa0') ret &= ~MSVCRT__BLANK; +#endif + return ret; +} + +/********************************************************************* + * iswctype (MSVCRT.@) + */ +int CDECL MSVCRT_iswctype(MSVCRT_wchar_t wc, MSVCRT_wctype_t type) +{ + return MSVCRT__iswctype_l( wc, type, NULL ); +} + /********************************************************************* * iswalnum (MSVCRT.@) */ @@ -2021,14 +2042,6 @@ int CDECL MSVCRT__iswxdigit_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) return isxdigitW( wc ); } -/********************************************************************* - * _iswctype_l (MSVCRT.@) - */ -INT CDECL MSVCRT__iswctype_l( MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__locale_t locale ) -{ - return (get_char_typeW(wc) & 0xffff) & type; -} - /********************************************************************* * _iswblank_l (MSVCRT.@) */ diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index f637997a0d1..c9b04b7dd47 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -33,6 +33,7 @@ #include <windef.h> #include <winbase.h> +#include <winnls.h> #include "wine/test.h" #define DEFINE_EXPECT(func) \ @@ -154,6 +155,7 @@ static MSVCRT_lldiv_t* (CDECL *p_lldiv)(MSVCRT_lldiv_t*,LONGLONG,LONGLONG); static int (CDECL *p__isctype)(int,int); static int (CDECL *p_isblank)(int); static int (CDECL *p__isblank_l)(int,_locale_t); +static int (CDECL *p_iswctype)(int,int); static int (CDECL *p__iswctype_l)(int,int,_locale_t); static int (CDECL *p_iswblank)(int); static int (CDECL *p__iswblank_l)(wint_t,_locale_t); @@ -531,6 +533,7 @@ static BOOL init(void) p__isctype = (void*)GetProcAddress(module, "_isctype"); p_isblank = (void*)GetProcAddress(module, "isblank"); p__isblank_l = (void*)GetProcAddress(module, "_isblank_l"); + p_iswctype = (void*)GetProcAddress(module, "iswctype"); p__iswctype_l = (void*)GetProcAddress(module, "_iswctype_l"); p_iswblank = (void*)GetProcAddress(module, "iswblank"); p__iswblank_l = (void*)GetProcAddress(module, "_iswblank_l"); @@ -647,21 +650,46 @@ static void test_isblank(void) for(c = 0; c <= 0xffff; c++) { if(c == '\t' || c == ' ' || c == 0x3000 || c == 0xfeff) { if(c == '\t') - todo_wine ok(!p__iswctype_l(c, _BLANK, NULL), "tab shouldn't be blank\n"); + ok(!p__iswctype_l(c, _BLANK, NULL), "tab shouldn't be blank\n"); else ok(p__iswctype_l(c, _BLANK, NULL), "%d should be blank\n", c); ok(p_iswblank(c), "%d should be blank\n", c); ok(p__iswblank_l(c, NULL), "%d should be blank\n", c); } else { - todo_wine_if(c == 0xa0) { - ok(!p__iswctype_l(c, _BLANK, NULL), "%d shouldn't be blank\n", c); - ok(!p_iswblank(c), "%d shouldn't be blank\n", c); - ok(!p__iswblank_l(c, NULL), "%d shouldn't be blank\n", c); - } + ok(!p__iswctype_l(c, _BLANK, NULL), "%d shouldn't be blank\n", c); + ok(!p_iswblank(c), "%d shouldn't be blank\n", c); + ok(!p__iswblank_l(c, NULL), "%d shouldn't be blank\n", c); } } } +static void test_iswctype(void) +{ + static const struct { + WCHAR c; + int t; + int r; + } tests[] = { + { '0', C1_DIGIT, C1_DIGIT }, + { '9', C1_DIGIT, C1_DIGIT }, + { 'a', C1_DIGIT, 0 }, + { 'a', C1_LOWER, C1_LOWER }, + { 0xa0, C1_BLANK, 0 }, + { 0xe0, _ALPHA, C1_ALPHA|C1_LOWER }, + { 0xff16, C1_DIGIT, C1_DIGIT }, + { 0x0660, C1_DIGIT, C1_DIGIT }, + { 0x0ce6, C1_DIGIT, C1_DIGIT } + }; + int i, r; + + p_setlocale(LC_ALL, "C"); + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + r = p_iswctype(tests[i].c, tests[i].t); + ok(r == tests[i].r, "iswctype returned %x for %x\n", r, tests[i].c); + } +} + static struct MSVCRT__exception exception; static int CDECL matherr_callback(struct MSVCRT__exception *e) @@ -1460,6 +1488,7 @@ START_TEST(misc) test__sopen_s(); test_lldiv(); test_isblank(); + test_iswctype(); test_math_errors(); test_asctime(); test_strftime(); diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1293dd62f16..ca474dce9f9 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2364,7 +2364,7 @@ @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswblank(long) MSVCRT_iswblank @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower -- 2.21.0

2 1

[PATCH] ucrtbase: Fix handling of tab and non-breaking space in iswctype().
by Chip Davis 11 Dec '19

11 Dec '19

It's just these two that are handled specially AFAICT. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr110/tests/msvcr110.c | 30 +++++++++++++++++++++++++ dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 28 +++++++++++++++++++++++ dlls/msvcrt/wcs.c | 29 +++++++++++++++++------- dlls/ucrtbase/tests/misc.c | 41 +++++++++++++++++++++++++++++----- dlls/ucrtbase/ucrtbase.spec | 2 +- 13 files changed, 123 insertions(+), 23 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 560e14b33b8..177b67298b2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1719,7 +1719,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 2316535e5d1..376c36cd159 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2077,7 +2077,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index 09876131f07..862d2bfce74 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -33,6 +33,7 @@ static char* (CDECL *p_setlocale)(int category, const char* locale); static size_t (CDECL *p___strncnt)(const char *str, size_t count); +static int (CDECL *p_iswctype)(wchar_t, wctype_t); static unsigned int (CDECL *p_CurrentScheduler_GetNumberOfVirtualProcessors)(void); static unsigned int (CDECL *p__CurrentScheduler__GetNumberOfVirtualProcessors)(void); @@ -52,6 +53,7 @@ static BOOL init(void) p_setlocale = (void*)GetProcAddress(module, "setlocale"); p___strncnt = (void*)GetProcAddress(module, "__strncnt"); + p_iswctype = (void*)GetProcAddress(module, "iswctype"); p_CurrentScheduler_GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?GetNumberOfVirtualProcessors@CurrentScheduler@Concurrency@@SAIXZ"); p__CurrentScheduler__GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?_GetNumberOfVirtualProcessors@_CurrentScheduler@details@Concurrency@@SAIXZ"); p_CurrentScheduler_Id = (void*)GetProcAddress(module, "?Id@CurrentScheduler@Concurrency@@SAIXZ"); @@ -143,10 +145,38 @@ static void test___strncnt(void) } } +static void test_iswctype(void) +{ + static const struct { + WCHAR c; + int t; + int r; + } tests[] = { + { '0', C1_DIGIT, C1_DIGIT }, + { '9', C1_DIGIT, C1_DIGIT }, + { 'a', C1_DIGIT, 0 }, + { 'a', C1_LOWER, C1_LOWER }, + { 0xa0, C1_BLANK, C1_BLANK }, + { 0xe0, _ALPHA, C1_ALPHA|C1_LOWER }, + { 0xff16, C1_DIGIT, C1_DIGIT }, + { 0x0660, C1_DIGIT, C1_DIGIT }, + { 0x0ce6, C1_DIGIT, C1_DIGIT } + }; + int i, r; + + p_setlocale(LC_ALL, "C"); + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + r = p_iswctype(tests[i].c, tests[i].t); + ok(r == tests[i].r, "iswctype returned %x for %x\n", r, tests[i].c); + } +} + START_TEST(msvcr110) { if (!init()) return; test_CurrentScheduler(); /* MUST be first (at least among Concurrency tests) */ test_setlocale(); test___strncnt(); + test_iswctype(); } diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 903f4b7ce38..f04a0ec3494 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2230,7 +2230,7 @@ @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswblank(long) MSVCRT_iswblank @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index a014cf50365..d1457e8a32e 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -754,7 +754,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 21b73d3a75c..72f292e64f0 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -750,7 +750,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 402e6efc109..9e5f03685ce 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1401,7 +1401,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8a079abe254..8c54c5f762d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1374,7 +1374,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b3b9cca0b97..0d6b17eb6d8 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1340,7 +1340,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 1be4dcb129c..5b215728ad4 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -4024,6 +4024,33 @@ static void test_iswdigit(void) } } +static void test_iswctype(void) +{ + static const struct { + WCHAR c; + int t; + int r; + } tests[] = { + { '0', C1_DIGIT, C1_DIGIT }, + { '9', C1_DIGIT, C1_DIGIT }, + { 'a', C1_DIGIT, 0 }, + { 'a', C1_LOWER, C1_LOWER }, + { 0xa0, C1_BLANK, C1_BLANK }, + { 0xe0, _ALPHA, C1_ALPHA|C1_LOWER }, + { 0xff16, C1_DIGIT, C1_DIGIT }, + { 0x0660, C1_DIGIT, C1_DIGIT }, + { 0x0ce6, C1_DIGIT, C1_DIGIT } + }; + int i, r; + + setlocale(LC_ALL, "C"); + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + r = iswctype(tests[i].c, tests[i].t); + ok(r == tests[i].r, "iswctype returned %x for %x\n", r, tests[i].c); + } +} + START_TEST(string) { char mem[100]; @@ -4167,4 +4194,5 @@ START_TEST(string) test_C_locale(); test_strstr(); test_iswdigit(); + test_iswctype(); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1ae292423c0..9e47f5cf6e5 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1845,6 +1845,27 @@ MSVCRT_size_t CDECL MSVCRT_wcrtomb( char *dst, MSVCRT_wchar_t ch, MSVCRT_mbstate return MSVCRT_wctomb(dst, ch); } +/********************************************************************* + * _iswctype_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswctype_l(MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__locale_t locale) +{ + int ret = (get_char_typeW(wc) & 0xffff) & type; + +#if _MSVCR_VER >= 140 + if (wc == '\t' || wc == '\xa0') ret &= ~_BLANK; +#endif + return ret; +} + +/********************************************************************* + * iswctype (MSVCRT.@) + */ +int CDECL MSVCRT_iswctype(MSVCRT_wchar_t wc, MSVCRT_wctype_t type) +{ + return MSVCRT__iswctype_l( wc, type, NULL ); +} + /********************************************************************* * iswalnum (MSVCRT.@) */ @@ -2021,14 +2042,6 @@ int CDECL MSVCRT__iswxdigit_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) return isxdigitW( wc ); } -/********************************************************************* - * _iswctype_l (MSVCRT.@) - */ -INT CDECL MSVCRT__iswctype_l( MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__locale_t locale ) -{ - return (get_char_typeW(wc) & 0xffff) & type; -} - /********************************************************************* * _iswblank_l (MSVCRT.@) */ diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index f637997a0d1..c9b04b7dd47 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -33,6 +33,7 @@ #include <windef.h> #include <winbase.h> +#include <winnls.h> #include "wine/test.h" #define DEFINE_EXPECT(func) \ @@ -154,6 +155,7 @@ static MSVCRT_lldiv_t* (CDECL *p_lldiv)(MSVCRT_lldiv_t*,LONGLONG,LONGLONG); static int (CDECL *p__isctype)(int,int); static int (CDECL *p_isblank)(int); static int (CDECL *p__isblank_l)(int,_locale_t); +static int (CDECL *p_iswctype)(int,int); static int (CDECL *p__iswctype_l)(int,int,_locale_t); static int (CDECL *p_iswblank)(int); static int (CDECL *p__iswblank_l)(wint_t,_locale_t); @@ -531,6 +533,7 @@ static BOOL init(void) p__isctype = (void*)GetProcAddress(module, "_isctype"); p_isblank = (void*)GetProcAddress(module, "isblank"); p__isblank_l = (void*)GetProcAddress(module, "_isblank_l"); + p_iswctype = (void*)GetProcAddress(module, "iswctype"); p__iswctype_l = (void*)GetProcAddress(module, "_iswctype_l"); p_iswblank = (void*)GetProcAddress(module, "iswblank"); p__iswblank_l = (void*)GetProcAddress(module, "_iswblank_l"); @@ -647,21 +650,46 @@ static void test_isblank(void) for(c = 0; c <= 0xffff; c++) { if(c == '\t' || c == ' ' || c == 0x3000 || c == 0xfeff) { if(c == '\t') - todo_wine ok(!p__iswctype_l(c, _BLANK, NULL), "tab shouldn't be blank\n"); + ok(!p__iswctype_l(c, _BLANK, NULL), "tab shouldn't be blank\n"); else ok(p__iswctype_l(c, _BLANK, NULL), "%d should be blank\n", c); ok(p_iswblank(c), "%d should be blank\n", c); ok(p__iswblank_l(c, NULL), "%d should be blank\n", c); } else { - todo_wine_if(c == 0xa0) { - ok(!p__iswctype_l(c, _BLANK, NULL), "%d shouldn't be blank\n", c); - ok(!p_iswblank(c), "%d shouldn't be blank\n", c); - ok(!p__iswblank_l(c, NULL), "%d shouldn't be blank\n", c); - } + ok(!p__iswctype_l(c, _BLANK, NULL), "%d shouldn't be blank\n", c); + ok(!p_iswblank(c), "%d shouldn't be blank\n", c); + ok(!p__iswblank_l(c, NULL), "%d shouldn't be blank\n", c); } } } +static void test_iswctype(void) +{ + static const struct { + WCHAR c; + int t; + int r; + } tests[] = { + { '0', C1_DIGIT, C1_DIGIT }, + { '9', C1_DIGIT, C1_DIGIT }, + { 'a', C1_DIGIT, 0 }, + { 'a', C1_LOWER, C1_LOWER }, + { 0xa0, C1_BLANK, 0 }, + { 0xe0, _ALPHA, C1_ALPHA|C1_LOWER }, + { 0xff16, C1_DIGIT, C1_DIGIT }, + { 0x0660, C1_DIGIT, C1_DIGIT }, + { 0x0ce6, C1_DIGIT, C1_DIGIT } + }; + int i, r; + + p_setlocale(LC_ALL, "C"); + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + r = p_iswctype(tests[i].c, tests[i].t); + ok(r == tests[i].r, "iswctype returned %x for %x\n", r, tests[i].c); + } +} + static struct MSVCRT__exception exception; static int CDECL matherr_callback(struct MSVCRT__exception *e) @@ -1460,6 +1488,7 @@ START_TEST(misc) test__sopen_s(); test_lldiv(); test_isblank(); + test_iswctype(); test_math_errors(); test_asctime(); test_strftime(); diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1293dd62f16..ca474dce9f9 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2364,7 +2364,7 @@ @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswblank(long) MSVCRT_iswblank @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower -- 2.24.0

2 2

[PATCH] winetest: Remove superfluous cast to self
by Michael Stefaniuc 11 Dec '19

11 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winetest/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 60cb49d139..9d6a318e9c 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -202,7 +202,7 @@ static BOOL running_on_visible_desktop (void) HWINSTA wstation; USEROBJECTFLAGS uoflags; - wstation = (HWINSTA)pGetProcessWindowStation(); + wstation = pGetProcessWindowStation(); assert(pGetUserObjectInformationA(wstation, UOI_FLAGS, &uoflags, sizeof(uoflags), &len)); return (uoflags.dwFlags & WSF_VISIBLE) != 0; } -- 2.23.0

1 0

[PATCH] mountmgr.sys: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 11 Dec '19

11 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mountmgr.sys/device.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 3369a92922..0ca2d42517 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -704,19 +704,19 @@ static HKEY get_scsi_device_lun_key( SCSI_ADDRESS *scsi_addr ) if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, scsi_keyW, 0, KEY_READ|KEY_WRITE, &scsi_key )) return NULL; - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), scsi_port_keyW, scsi_addr->PortNumber ); + snprintfW( dataW, ARRAY_SIZE( dataW ), scsi_port_keyW, scsi_addr->PortNumber ); if (RegCreateKeyExW( scsi_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &port_key, NULL )) return NULL; RegCloseKey( scsi_key ); - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), scsi_bus_keyW, scsi_addr->PathId ); + snprintfW( dataW, ARRAY_SIZE( dataW ), scsi_bus_keyW, scsi_addr->PathId ); if (RegCreateKeyExW( port_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &bus_key, NULL )) return NULL; RegCloseKey( port_key ); - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), target_id_keyW, scsi_addr->TargetId ); + snprintfW( dataW, ARRAY_SIZE( dataW ), target_id_keyW, scsi_addr->TargetId ); if (RegCreateKeyExW( bus_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &target_key, NULL )) return NULL; RegCloseKey( bus_key ); - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), lun_keyW, scsi_addr->Lun ); + snprintfW( dataW, ARRAY_SIZE( dataW ), lun_keyW, scsi_addr->Lun ); if (RegCreateKeyExW( target_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &lun_key, NULL )) return NULL; RegCloseKey( target_key ); @@ -746,7 +746,7 @@ void create_scsi_entry( SCSI_ADDRESS *scsi_addr, UINT init_id, const char *drive if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, scsi_keyW, 0, KEY_READ|KEY_WRITE, &scsi_key )) return; - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), scsi_port_keyW, scsi_addr->PortNumber ); + snprintfW( dataW, ARRAY_SIZE( dataW ), scsi_port_keyW, scsi_addr->PortNumber ); if (RegCreateKeyExW( scsi_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &port_key, NULL )) return; RegCloseKey( scsi_key ); @@ -757,19 +757,19 @@ void create_scsi_entry( SCSI_ADDRESS *scsi_addr, UINT init_id, const char *drive value = 0; - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), scsi_bus_keyW, scsi_addr->PathId ); + snprintfW( dataW, ARRAY_SIZE( dataW ), scsi_bus_keyW, scsi_addr->PathId ); if (RegCreateKeyExW( port_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &bus_key, NULL )) return; RegCloseKey( port_key ); - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), init_id_keyW, init_id ); + snprintfW( dataW, ARRAY_SIZE( dataW ), init_id_keyW, init_id ); if (RegCreateKeyExW( bus_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &target_key, NULL )) return; RegCloseKey( target_key ); - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), target_id_keyW, scsi_addr->TargetId ); + snprintfW( dataW, ARRAY_SIZE( dataW ), target_id_keyW, scsi_addr->TargetId ); if (RegCreateKeyExW( bus_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &target_key, NULL )) return; RegCloseKey( bus_key ); - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), lun_keyW, scsi_addr->Lun ); + snprintfW( dataW, ARRAY_SIZE( dataW ), lun_keyW, scsi_addr->Lun ); if (RegCreateKeyExW( target_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &lun_key, NULL )) return; RegCloseKey( target_key ); @@ -811,7 +811,7 @@ void create_scsi_entry( SCSI_ADDRESS *scsi_addr, UINT init_id, const char *drive } else if (type == SCSI_TAPE_PERIPHERAL) { - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), tapeW, tape_no++ ); + snprintfW( dataW, ARRAY_SIZE( dataW ), tapeW, tape_no++ ); RegSetValueExW( lun_key, devnameW, 0, REG_SZ, (const BYTE *)dataW, strlenW( dataW ) ); } -- 2.23.0

1 0

[PATCH] dmime/tests: Fix the spelling of a performance ok() message.
by Francois Gouget 11 Dec '19

11 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dmime/tests/performance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 073625f04b1..1d17e5200e5 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -472,7 +472,7 @@ static void test_notification_type(void) IDirectMusicPerformance8_FreePMsg(perf, (DMUS_PMSG*)msg); } todo_wine ok(prime_segment8 == segment8, "Wrong end segment\n"); - todo_wine ok(found_end, "Didn't recieve DMUS_NOTIFICATION_SEGEND message\n"); + todo_wine ok(found_end, "Didn't receive DMUS_NOTIFICATION_SEGEND message\n"); CloseHandle(messages); -- 2.20.1

2 1

[PATCH] winemac: Only manipulate an NSOpenGLContext's view on the main thread.
by Chip Davis 11 Dec '19

11 Dec '19

From: Ken Thomases <ken(a)codeweavers.com> I was seeing a crash due to an assert about manipulating it on a background thread. I can't recall where I was seeing that. I think it's new in Catalina. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Chip's notes: I have also seen this on Mojave. dlls/winemac.drv/cocoa_opengl.m | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 5a097a12d26..e60b0b388b8 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -79,8 +79,10 @@ - (void) resetSurfaceIfBackingSizeChanged macdrv_set_view_backing_size((macdrv_view)self.view, view_backing); NSView* save = self.view; - [super clearDrawable]; - [super setView:save]; + OnMainThread(^{ + [super clearDrawable]; + [super setView:save]; + }); shouldClearToBlack = TRUE; } } @@ -122,7 +124,11 @@ - (void) wine_updateBackingSize:(const CGSize*)size - (void) setView:(NSView*)newView { NSView* oldView = [self view]; - [super setView:newView]; + if ([NSThread isMainThread]) + [super setView:newView]; + else OnMainThread(^{ + [super setView:newView]; + }); [newView retain]; [oldView release]; } @@ -130,7 +136,11 @@ - (void) setView:(NSView*)newView - (void) clearDrawable { NSView* oldView = [self view]; - [super clearDrawable]; + if ([NSThread isMainThread]) + [super clearDrawable]; + else OnMainThread(^{ + [super clearDrawable]; + }); [oldView release]; [self wine_updateBackingSize:NULL]; -- 2.24.0

1 0

[PATCH] msvcrt: Correct return value of ___mb_cur_max_l_func().
by Chip Davis 11 Dec '19

11 Dec '19

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/msvcr90/tests/msvcr90.c | 17 +++++++++++++++++ dlls/msvcrt/mbcs.c | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 050699e4857..c32677addd5 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -136,6 +136,7 @@ static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, __ms_va_list valist); static size_t (__cdecl *p___strncnt)(const char *str, size_t count); static int (__cdecl *p_swscanf)(const wchar_t *str, const wchar_t* format, ...); +static int (__cdecl *p____mb_cur_max_l_func)(_locale_t locale); /* make sure we use the correct errno */ #undef errno @@ -407,6 +408,7 @@ static BOOL init(void) SET(p__vsnwprintf, "_vsnwprintf"); SET(p___strncnt, "__strncnt"); SET(p_swscanf, "swscanf"); + SET(p____mb_cur_max_l_func, "___mb_cur_max_l_func"); if (sizeof(void *) == 8) { @@ -1938,6 +1940,20 @@ static void test_swscanf(void) ok( ret == (short)WEOF, "ret = %d\n", ret ); } +static void test____mb_cur_max_l_func(void) +{ + int ret; + _locale_t l; + + ret = p____mb_cur_max_l_func(NULL); + ok( ret == 1, "MB_CUR_MAX_L(NULL) = %d\n", ret ); + + l = _create_locale(LC_ALL, "chinese-traditional"); + ret = p____mb_cur_max_l_func(l); + ok( ret == 2, "MB_CUR_MAX_L(cht) = %d\n", ret ); + _free_locale(l); +} + START_TEST(msvcr90) { if(!init()) @@ -1977,4 +1993,5 @@ START_TEST(msvcr90) #endif test___strncnt(); test_swscanf(); + test____mb_cur_max_l_func(); } diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index a9dbcfff661..39f94b17a36 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -184,7 +184,7 @@ int CDECL MSVCRT____mb_cur_max_func(void) /********************************************************************* * ___mb_cur_max_l_func (MSVCR80.@) */ -int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) +int CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; @@ -193,7 +193,7 @@ int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) else locinfo = locale->locinfo; - return &locinfo->mb_cur_max; + return locinfo->mb_cur_max; } #endif -- 2.24.0

2 1

[PATCH v3 01/11] jscript: Keep a pointer to the bytecode in function_code_t.
by Gabriel Ivăncescu 11 Dec '19

11 Dec '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/compile.c | 1 + dlls/jscript/engine.h | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index db05d3c..a530e87 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2279,6 +2279,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, TRACE("\n"); + func->bytecode = ctx->code; ctx->func_head = ctx->func_tail = NULL; ctx->from_eval = from_eval; ctx->func = func; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 955c315..48cc952 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -103,6 +103,8 @@ OP_LIST OP_LAST } jsop_t; +typedef struct _bytecode_t bytecode_t; + typedef union { BSTR bstr; LONG lng; @@ -163,11 +165,13 @@ typedef struct _function_code_t { unsigned locals_cnt; local_ref_t *locals; + + bytecode_t *bytecode; } function_code_t; local_ref_t *lookup_local(const function_code_t*,const WCHAR*) DECLSPEC_HIDDEN; -typedef struct _bytecode_t { +struct _bytecode_t { LONG ref; BOOL is_persistent; @@ -187,7 +191,7 @@ typedef struct _bytecode_t { unsigned str_cnt; struct list entry; -} bytecode_t; +}; HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,BOOL,BOOL,bytecode_t**) DECLSPEC_HIDDEN; void release_bytecode(bytecode_t*) DECLSPEC_HIDDEN; -- 2.21.0

3 30

Suppressing Wine prefix configuration message window?
by Sebastian M. Ernst 11 Dec '19

11 Dec '19

Hi all, whenever I use `wine` in a new prefix or intentionally initialize a new prefix with `wine wineboot -i`, a configuration message window pops up for a few seconds (see attachment: "the configuration of Wine in ... is being updated, please wait ..."). I am heavily using Wine in shell scripts with new prefixes being generated by those scripts on a regular basis. In environments with X, this message window therefore becomes sort of annoying. I'd like to "deactivate" it though I have not found a simple / clean option. The best bad approach I found in forums is to install a virtual X frame-buffer and to point Wine to its DISPAY. Is there anything possibly undocumented - an option, a switch or an environment variable - that would allow me to do what I want? Regards, Sebastian

4 7

[PATCH 11/11] vbscript/tests: Add more tests for the script TypeInfo.
by Jacek Caban 11 Dec '19

11 Dec '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/vbscript.c | 126 ++++++++++++++++++++++++++++++++- 1 file changed, 125 insertions(+), 1 deletion(-)

1 0

[PATCH 10/11] vbscript: Implement ScriptTypeInfo_GetMops.
by Jacek Caban 11 Dec '19

11 Dec '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)

1 0

[PATCH 09/11] vbscript: Implement ScriptTypeInfo_CreateInstance.
by Jacek Caban 11 Dec '19

11 Dec '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

1 0

[PATCH 08/11] vbscript: Implement ScriptTypeInfo_AddressOfMember.
by Jacek Caban 11 Dec '19

11 Dec '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)

1 0

[PATCH 07/11] vbscript: Implement ScriptTypeInfo_GetDllEntry.
by Jacek Caban 11 Dec '19

11 Dec '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)

1 0

[PATCH 06/11] vbscript: Implement ScriptTypeInfo_GetDocumentation.
by Jacek Caban 11 Dec '19

11 Dec '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-)

1 0

[PATCH 05/11] vbscript: Implement ScriptTypeInfo_Invoke.
by Jacek Caban 11 Dec '19

11 Dec '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)

1 0

[PATCH 04/11] vbscript: Implement ScriptTypeInfo_GetImplTypeFlags.
by Jacek Caban 11 Dec '19

11 Dec '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

1 0

[PATCH 03/11] vbscript: Implement ScriptTypeInfo_GetRefTypeInfo.
by Jacek Caban 11 Dec '19

11 Dec '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)

1 0

[PATCH 02/11] vbscript: Implement ScriptTypeInfo_GetRefTypeOfImplType.
by Jacek Caban 11 Dec '19

11 Dec '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)

1 0

[PATCH 01/11] vbscript: Implement ScriptTypeInfo_GetNames.
by Jacek Caban 11 Dec '19

11 Dec '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 67 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-)

1 0

[PATCH] winemac.drv: Fix the spelling of a couple of comments.
by Francois Gouget 11 Dec '19

11 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winemac.drv/display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index bafdb425897..b58a9d172b4 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1468,12 +1468,12 @@ static BOOL macdrv_init_adapter(HKEY video_hkey, int video_index, int gpu_index, RegCreateKeyExW(HKEY_CURRENT_CONFIG, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL); /* Write GPU instance path so that we can find the GPU instance via adapters quickly. Another way is trying to match - * them via the GUID in Device Paramters/VideoID, but it would required enumrating all GPU instances */ + * them via the GUID in Device Parameters/VideoID, but it would require enumerating all GPU instances */ sprintfW(bufferW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); if (RegSetValueExW(hkey, gpu_idW, 0, REG_SZ, (const BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR))) goto done; - /* Write all monitor instances paths under this adapter */ + /* Write all monitor instance paths under this adapter */ for (i = 0; i < monitor_count; i++) { sprintfW(key_nameW, mointor_id_fmtW, i); -- 2.20.1

2 1

[PATCH] msvcrt: Fix the btowc() function.
by Chip Davis 11 Dec '19

11 Dec '19

This function returns WEOF on conversion failure. It should only operate on ASCII characters in the C locale. Finally, it should use the current codepage, instead of the current locale, to do conversions. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/msvcrt/locale.c | 6 ++++-- dlls/msvcrt/tests/string.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 11ad9ed5f5f..57783d9d4b6 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -787,9 +787,11 @@ MSVCRT_wint_t CDECL MSVCRT_btowc(int c) unsigned char letter = c; MSVCRT_wchar_t ret; - if(!MultiByteToWideChar(get_locinfo()->lc_handle[MSVCRT_LC_CTYPE], + if(!get_locinfo()->lc_codepage) + return c <= 127 ? c : MSVCRT_WEOF; + if(!MultiByteToWideChar(get_locinfo()->lc_codepage, 0, (LPCSTR)&letter, 1, &ret, 1)) - return 0; + return MSVCRT_WEOF; return ret; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index f4c4657791c..fe27c826f3e 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -87,6 +87,7 @@ static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); static int (__cdecl *p_wctob)(wint_t); +static wint_t (__cdecl *p_btowc)(int); static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_wcrtomb_s)(size_t*, char*, size_t, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); @@ -2829,6 +2830,42 @@ static void test_wctob(void) _setmbcp(cp); } +static void test_btowc(void) +{ + wint_t ret; + int cp = _getmbcp(); + + if(!p_btowc || !setlocale(LC_ALL, "chinese-traditional")) { + win_skip("Skipping btowc tests\n"); + return; + } + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0x61); + ok(ret == 0xe0, "ret = %x\n", ret); + + _setmbcp(1250); + ret = p_btowc(0x61); + ok(ret == WEOF, "ret = %x\n", ret); + + setlocale(LC_ALL, "C"); + ret = p_btowc(0x61); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0x9f); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + _setmbcp(cp); +} + static void test_wctomb(void) { mbstate_t state; @@ -4007,6 +4044,7 @@ START_TEST(string) p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); + p_btowc = (void*)GetProcAddress(hMsvcrt, "btowc"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); p_wcrtomb_s = (void*)GetProcAddress(hMsvcrt, "wcrtomb_s"); -- 2.24.0

1 1

[PATCH 4/5] msado15: Implement Fields_get_Count.
by Hans Leidekker 11 Dec '19

11 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 8 ++++-- dlls/msado15/tests/msado15.c | 48 ++++++++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index ed3cdf6bbf..99d22e4db0 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -388,8 +388,12 @@ static HRESULT WINAPI fields_Invoke( Fields *iface, DISPID member, REFIID riid, static HRESULT WINAPI fields_get_Count( Fields *iface, LONG *count ) { - FIXME( "%p, %p\n", iface, count ); - return E_NOTIMPL; + struct fields *fields = impl_from_Fields( iface ); + + TRACE( "%p, %p\n", fields, count ); + + *count = fields->count; + return S_OK; } static HRESULT WINAPI fields__NewEnum( Fields *iface, IUnknown **obj ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index e6371b8392..4ef4762ac6 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -77,8 +77,8 @@ static void test_Recordset(void) count = -1; hr = Fields_get_Count( fields2, &count ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( !count, "got %d\n", count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %d\n", count ); refs = _Recordset_Release( recordset ); ok( !refs, "got %d\n", refs ); @@ -88,6 +88,49 @@ static void test_Recordset(void) ok( refs == 1, "got %d\n", refs ); } +static void test_Fields(void) +{ + _Recordset *recordset; + Fields *fields; + VARIANT val; + BSTR name; + LONG count; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Recordset_get_Fields( recordset, &fields ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = -1; + hr = Fields_get_Count( fields, &count ); + ok( !count, "got %d\n", count ); + + name = SysAllocString( L"field" ); + V_VT( &val ) = VT_ERROR; + V_ERROR( &val ) = DISP_E_PARAMNOTFOUND; + hr = Fields_Append( fields, name, adInteger, 4, adFldUnspecified, val ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( name ); + + count = -1; + hr = Fields_get_Count( fields, &count ); + ok( count == 1, "got %d\n", count ); + + name = SysAllocString( L"field2" ); + hr = Fields__Append( fields, name, adInteger, 4, adFldUnspecified ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( name ); + + count = -1; + hr = Fields_get_Count( fields, &count ); + ok( count == 2, "got %d\n", count ); + + Fields_Release( fields ); + _Recordset_Release( recordset ); +} + static HRESULT str_to_byte_array( const char *data, VARIANT *ret ) { SAFEARRAY *vector; @@ -406,6 +449,7 @@ START_TEST(msado15) { CoInitialize( NULL ); test_Connection(); + test_Fields(); test_Recordset(); test_Stream(); CoUninitialize(); -- 2.20.1

2 1

[PATCH 2/5] msado15: Implement _Recordset_get_Fields.
by Hans Leidekker 11 Dec '19

11 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 202 ++++++++++++++++++++++++++++++++++- dlls/msado15/tests/msado15.c | 66 +++++++++++- 2 files changed, 263 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 84adec406f..f520a87807 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -31,12 +31,190 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); +struct fields; struct recordset { - _Recordset Recordset_iface; - LONG refs; + _Recordset Recordset_iface; + LONG refs; + struct fields *fields; }; +struct fields +{ + Fields Fields_iface; + LONG refs; + struct recordset *recordset; +}; + +static inline struct fields *impl_from_Fields( Fields *iface ) +{ + return CONTAINING_RECORD( iface, struct fields, Fields_iface ); +} + +static ULONG WINAPI fields_AddRef( Fields *iface ) +{ + struct fields *fields = impl_from_Fields( iface ); + LONG refs = InterlockedIncrement( &fields->refs ); + TRACE( "%p new refcount %d\n", fields, refs ); + return refs; +} + +static ULONG WINAPI fields_Release( Fields *iface ) +{ + struct fields *fields = impl_from_Fields( iface ); + LONG refs = InterlockedDecrement( &fields->refs ); + TRACE( "%p new refcount %d\n", fields, refs ); + if (!refs) + { + if (fields->recordset) _Recordset_Release( &fields->recordset->Recordset_iface ); + WARN( "not destroying %p\n", fields ); + return InterlockedIncrement( &fields->refs ); + } + return refs; +} + +static HRESULT WINAPI fields_QueryInterface( Fields *iface, REFIID riid, void **obj ) +{ + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + + if (IsEqualGUID( riid, &IID_Fields ) || IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + fields_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI fields_GetTypeInfoCount( Fields *iface, UINT *count ) +{ + FIXME( "%p, %p\n", iface, count ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_GetTypeInfo( Fields *iface, UINT index, LCID lcid, ITypeInfo **info ) +{ + FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_GetIDsOfNames( Fields *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid ) +{ + FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_Invoke( Fields *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) +{ + FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, + result, excep_info, arg_err ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_get_Count( Fields *iface, LONG *count ) +{ + FIXME( "%p, %p\n", iface, count ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields__NewEnum( Fields *iface, IUnknown **obj ) +{ + FIXME( "%p, %p\n", iface, obj ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_Refresh( Fields *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_get_Item( Fields *iface, VARIANT index, Field **obj ) +{ + FIXME( "%p, %s, %p\n", iface, debugstr_variant(&index), obj ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields__Append( Fields *iface, BSTR name, DataTypeEnum type, LONG size, FieldAttributeEnum attr ) +{ + FIXME( "%p, %s, %u, %d, %d\n", iface, debugstr_w(name), type, size, attr ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_Delete( Fields *iface, VARIANT index ) +{ + FIXME( "%p, %s\n", iface, debugstr_variant(&index) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_Append( Fields *iface, BSTR name, DataTypeEnum type, LONG size, FieldAttributeEnum attr, + VARIANT value ) +{ + TRACE( "%p, %s, %u, %d, %d, %s\n", iface, debugstr_w(name), type, size, attr, debugstr_variant(&value) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_Update( Fields *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_Resync( Fields *iface, ResyncEnum resync_values ) +{ + FIXME( "%p, %u\n", iface, resync_values ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_CancelUpdate( Fields *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static const struct FieldsVtbl fields_vtbl = +{ + fields_QueryInterface, + fields_AddRef, + fields_Release, + fields_GetTypeInfoCount, + fields_GetTypeInfo, + fields_GetIDsOfNames, + fields_Invoke, + fields_get_Count, + fields__NewEnum, + fields_Refresh, + fields_get_Item, + fields__Append, + fields_Delete, + fields_Append, + fields_Update, + fields_Resync, + fields_CancelUpdate +}; + +static HRESULT fields_create( struct recordset *recordset, struct fields **ret ) +{ + struct fields *fields; + + if (!(fields = heap_alloc_zero( sizeof(*fields) ))) return E_OUTOFMEMORY; + fields->Fields_iface.lpVtbl = &fields_vtbl; + fields->refs = 1; + fields->recordset = recordset; + _Recordset_AddRef( &fields->recordset->Recordset_iface ); + + *ret = fields; + TRACE( "returning %p\n", *ret ); + return S_OK; +} + static inline struct recordset *impl_from_Recordset( _Recordset *iface ) { return CONTAINING_RECORD( iface, struct recordset, Recordset_iface ); @@ -58,6 +236,7 @@ static ULONG WINAPI recordset_Release( _Recordset *iface ) if (!refs) { TRACE( "destroying %p\n", recordset ); + recordset->fields->recordset = NULL; heap_free( recordset ); } return refs; @@ -199,8 +378,23 @@ static HRESULT WINAPI recordset_get_EOF( _Recordset *iface, VARIANT_BOOL *eof ) static HRESULT WINAPI recordset_get_Fields( _Recordset *iface, Fields **obj ) { - FIXME( "%p, %p\n", iface, obj ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + HRESULT hr; + + TRACE( "%p, %p\n", recordset, obj ); + + if (recordset->fields) + { + /* yes, this adds a reference to the recordset instead of the fields object */ + _Recordset_AddRef( &recordset->Recordset_iface ); + *obj = &recordset->fields->Fields_iface; + return S_OK; + } + + if ((hr = fields_create( recordset, &recordset->fields )) != S_OK) return hr; + + *obj = &recordset->fields->Fields_iface; + return S_OK; } static HRESULT WINAPI recordset_get_LockType( _Recordset *iface, LockTypeEnum *lock_type ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 3f297f4ce2..e6371b8392 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -25,6 +25,69 @@ #define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err ) +static LONG get_refs_fields( Fields *fields ) +{ + Fields_AddRef( fields ); + return Fields_Release( fields ); +} + +static LONG get_refs_recordset( _Recordset *recordset ) +{ + _Recordset_AddRef( recordset ); + return _Recordset_Release( recordset ); +} + +static void test_Recordset(void) +{ + _Recordset *recordset; + Fields *fields, *fields2; + LONG refs, count; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* handing out fields object increases recordset refcount */ + refs = get_refs_recordset( recordset ); + ok( refs == 1, "got %d\n", refs ); + hr = _Recordset_get_Fields( recordset, &fields ); + ok( hr == S_OK, "got %08x\n", hr ); + refs = get_refs_recordset( recordset ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_fields( fields ); + ok( refs == 1, "got %d\n", refs ); + + /* releasing fields object decreases recordset refcount, but fields refcount doesn't drop to zero */ + Fields_Release( fields ); + refs = get_refs_recordset( recordset ); + ok( refs == 1, "got %d\n", refs ); + refs = get_refs_fields( fields ); + ok( refs == 1, "got %d\n", refs ); + + /* calling get_Fields again returns the same object with the same refcount and increases recordset refcount */ + hr = _Recordset_get_Fields( recordset, &fields2 ); + ok( hr == S_OK, "got %08x\n", hr ); + refs = get_refs_recordset( recordset ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_fields( fields2 ); + ok( refs == 1, "got %d\n", refs ); + ok( fields2 == fields, "expected same object\n" ); + refs = Fields_Release( fields2 ); + ok( refs == 1, "got %d\n", refs ); + + count = -1; + hr = Fields_get_Count( fields2, &count ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( !count, "got %d\n", count ); + + refs = _Recordset_Release( recordset ); + ok( !refs, "got %d\n", refs ); + + /* fields object still has a reference */ + refs = Fields_Release( fields2 ); + ok( refs == 1, "got %d\n", refs ); +} + static HRESULT str_to_byte_array( const char *data, VARIANT *ret ) { SAFEARRAY *vector; @@ -342,7 +405,8 @@ if (0) /* Crashes on windows */ START_TEST(msado15) { CoInitialize( NULL ); - test_Stream(); test_Connection(); + test_Recordset(); + test_Stream(); CoUninitialize(); } -- 2.20.1

2 1

[PATCH 5/5] msado15: Implement Field_put_Type, Field_put_DefinedSize and Field_put_Attributes.
by Hans Leidekker 11 Dec '19

11 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 99d22e4db0..78d13d1577 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -54,6 +54,9 @@ struct field Field Field_iface; LONG refs; WCHAR *name; + DataTypeEnum type; + LONG defined_size; + LONG attrs; LONG index; struct recordset *recordset; }; @@ -240,20 +243,32 @@ static HRESULT WINAPI field_put_NumericScale( Field *iface, unsigned char scale static HRESULT WINAPI field_put_Type( Field *iface, DataTypeEnum type ) { - FIXME( "%p, %u\n", iface, type ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %u\n", field, type ); + + field->type = type; + return S_OK; } static HRESULT WINAPI field_put_DefinedSize( Field *iface, LONG size ) { - FIXME( "%p, %d\n", iface, size ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %d\n", field, size ); + + field->defined_size = size; + return S_OK; } static HRESULT WINAPI field_put_Attributes( Field *iface, LONG attrs ) { - FIXME( "%p, %d\n", iface, attrs ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %d\n", field, attrs ); + + field->attrs = attrs; + return S_OK; } static HRESULT WINAPI field_get_Status( Field *iface, LONG *status ) -- 2.20.1

2 1

[PATCH 3/5] msado15: Implement Fields__Append and Fields_Append.
by Hans Leidekker 11 Dec '19

11 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 325 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 318 insertions(+), 7 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index f520a87807..ed3cdf6bbf 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -41,11 +41,279 @@ struct recordset struct fields { - Fields Fields_iface; - LONG refs; - struct recordset *recordset; + Fields Fields_iface; + LONG refs; + Field **field; + ULONG count; + ULONG allocated; + struct recordset *recordset; }; +struct field +{ + Field Field_iface; + LONG refs; + WCHAR *name; + LONG index; + struct recordset *recordset; +}; + +static inline struct field *impl_from_Field( Field *iface ) +{ + return CONTAINING_RECORD( iface, struct field, Field_iface ); +} + +static ULONG WINAPI field_AddRef( Field *iface ) +{ + struct field *field = impl_from_Field( iface ); + LONG refs = InterlockedIncrement( &field->refs ); + TRACE( "%p new refcount %d\n", field, refs ); + return refs; +} + +static ULONG WINAPI field_Release( Field *iface ) +{ + struct field *field = impl_from_Field( iface ); + LONG refs = InterlockedDecrement( &field->refs ); + TRACE( "%p new refcount %d\n", field, refs ); + if (!refs) + { + TRACE( "destroying %p\n", field ); + heap_free( field->name ); + heap_free( field ); + } + return refs; +} + +static HRESULT WINAPI field_QueryInterface( Field *iface, REFIID riid, void **obj ) +{ + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + + if (IsEqualGUID( riid, &IID_Field ) || IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + field_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI field_GetTypeInfoCount( Field *iface, UINT *count ) +{ + FIXME( "%p, %p\n", iface, count ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_GetTypeInfo( Field *iface, UINT index, LCID lcid, ITypeInfo **info ) +{ + FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_GetIDsOfNames( Field *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid ) +{ + FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_Invoke( Field *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) +{ + FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, + result, excep_info, arg_err ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_Properties( Field *iface, Properties **obj ) +{ + FIXME( "%p, %p\n", iface, obj ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_ActualSize( Field *iface, LONG *size ) +{ + FIXME( "%p, %p\n", iface, size ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_Attributes( Field *iface, LONG *attrs ) +{ + TRACE( "%p, %p\n", iface, attrs ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_DefinedSize( Field *iface, LONG *size ) +{ + FIXME( "%p, %p\n", iface, size ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_Name( Field *iface, BSTR *str ) +{ + FIXME( "%p, %p\n", iface, str ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_Type( Field *iface, DataTypeEnum *type ) +{ + FIXME( "%p, %p\n", iface, type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_Value( Field *iface, VARIANT *val ) +{ + FIXME( "%p, %p\n", iface, val ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_put_Value( Field *iface, VARIANT val ) +{ + FIXME( "%p, %s\n", iface, debugstr_variant(&val) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_Precision( Field *iface, unsigned char *precision ) +{ + FIXME( "%p, %p\n", iface, precision ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_NumericScale( Field *iface, unsigned char *scale ) +{ + FIXME( "%p, %p\n", iface, scale ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_AppendChunk( Field *iface, VARIANT data ) +{ + FIXME( "%p, %s\n", iface, debugstr_variant(&data) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_GetChunk( Field *iface, LONG length, VARIANT *var ) +{ + FIXME( "%p, %d, %p\n", iface, length, var ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_OriginalValue( Field *iface, VARIANT *val ) +{ + FIXME( "%p, %p\n", iface, val ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_UnderlyingValue( Field *iface, VARIANT *val ) +{ + FIXME( "%p, %p\n", iface, val ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_DataFormat( Field *iface, IUnknown **format ) +{ + FIXME( "%p, %p\n", iface, format ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_putref_DataFormat( Field *iface, IUnknown *format ) +{ + FIXME( "%p, %p\n", iface, format ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_put_Precision( Field *iface, unsigned char precision ) +{ + FIXME( "%p, %c\n", iface, precision ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_put_NumericScale( Field *iface, unsigned char scale ) +{ + FIXME( "%p, %c\n", iface, scale ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_put_Type( Field *iface, DataTypeEnum type ) +{ + FIXME( "%p, %u\n", iface, type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_put_DefinedSize( Field *iface, LONG size ) +{ + FIXME( "%p, %d\n", iface, size ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_put_Attributes( Field *iface, LONG attrs ) +{ + FIXME( "%p, %d\n", iface, attrs ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_Status( Field *iface, LONG *status ) +{ + FIXME( "%p, %p\n", iface, status ); + return E_NOTIMPL; +} + +static const struct FieldVtbl field_vtbl = +{ + field_QueryInterface, + field_AddRef, + field_Release, + field_GetTypeInfoCount, + field_GetTypeInfo, + field_GetIDsOfNames, + field_Invoke, + field_get_Properties, + field_get_ActualSize, + field_get_Attributes, + field_get_DefinedSize, + field_get_Name, + field_get_Type, + field_get_Value, + field_put_Value, + field_get_Precision, + field_get_NumericScale, + field_AppendChunk, + field_GetChunk, + field_get_OriginalValue, + field_get_UnderlyingValue, + field_get_DataFormat, + field_putref_DataFormat, + field_put_Precision, + field_put_NumericScale, + field_put_Type, + field_put_DefinedSize, + field_put_Attributes, + field_get_Status +}; + +static HRESULT Field_create( const WCHAR *name, LONG index, struct recordset *recordset, Field **obj ) +{ + struct field *field; + + if (!(field = heap_alloc_zero( sizeof(*field) ))) return E_OUTOFMEMORY; + field->Field_iface.lpVtbl = &field_vtbl; + if (!(field->name = strdupW( name ))) + { + heap_free( field ); + return E_OUTOFMEMORY; + } + field->index = index; + field->recordset = recordset; + + *obj = &field->Field_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + static inline struct fields *impl_from_Fields( Fields *iface ) { return CONTAINING_RECORD( iface, struct fields, Fields_iface ); @@ -142,10 +410,50 @@ static HRESULT WINAPI fields_get_Item( Fields *iface, VARIANT index, Field **obj return E_NOTIMPL; } +static BOOL resize_fields( struct fields *fields, ULONG count ) +{ + if (count > fields->allocated) + { + Field **tmp; + ULONG new_size = max( count, fields->allocated * 2 ); + if (!(tmp = heap_realloc( fields->field, new_size * sizeof(*tmp) ))) return FALSE; + fields->field = tmp; + fields->allocated = new_size; + } + + fields->count = count; + return TRUE; +} + +static HRESULT append_field( struct fields *fields, BSTR name, DataTypeEnum type, LONG size, FieldAttributeEnum attr, + VARIANT *value ) +{ + Field *field; + HRESULT hr; + + if ((hr = Field_create( name, fields->count, fields->recordset, &field )) != S_OK) return hr; + Field_put_Type( field, type ); + Field_put_DefinedSize( field, size ); + if (attr != adFldUnspecified) Field_put_Attributes( field, attr ); + if (value) FIXME( "ignoring value %s\n", debugstr_variant(value) ); + + if (!(resize_fields( fields, fields->count + 1 ))) + { + Field_Release( field ); + return E_OUTOFMEMORY; + } + + fields->field[fields->count - 1] = field; + return S_OK; +} + static HRESULT WINAPI fields__Append( Fields *iface, BSTR name, DataTypeEnum type, LONG size, FieldAttributeEnum attr ) { - FIXME( "%p, %s, %u, %d, %d\n", iface, debugstr_w(name), type, size, attr ); - return E_NOTIMPL; + struct fields *fields = impl_from_Fields( iface ); + + TRACE( "%p, %s, %u, %d, %d\n", fields, debugstr_w(name), type, size, attr ); + + return append_field( fields, name, type, size, attr, NULL ); } static HRESULT WINAPI fields_Delete( Fields *iface, VARIANT index ) @@ -157,8 +465,11 @@ static HRESULT WINAPI fields_Delete( Fields *iface, VARIANT index ) static HRESULT WINAPI fields_Append( Fields *iface, BSTR name, DataTypeEnum type, LONG size, FieldAttributeEnum attr, VARIANT value ) { - TRACE( "%p, %s, %u, %d, %d, %s\n", iface, debugstr_w(name), type, size, attr, debugstr_variant(&value) ); - return E_NOTIMPL; + struct fields *fields = impl_from_Fields( iface ); + + TRACE( "%p, %s, %u, %d, %d, %s\n", fields, debugstr_w(name), type, size, attr, debugstr_variant(&value) ); + + return append_field( fields, name, type, size, attr, &value ); } static HRESULT WINAPI fields_Update( Fields *iface ) -- 2.20.1

2 1

[PATCH 1/5] msado15: Implement _Stream_SetEOS.
by Hans Leidekker 11 Dec '19

11 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/stream.c | 7 +++++-- dlls/msado15/tests/msado15.c | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 52f35afe3c..c6add70b1b 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -370,8 +370,11 @@ static HRESULT WINAPI stream_Write( _Stream *iface, VARIANT buf ) static HRESULT WINAPI stream_SetEOS( _Stream *iface ) { - FIXME( "%p\n", iface ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + + TRACE( "%p\n", stream ); + + return resize_buffer( stream, stream->pos ); } static HRESULT WINAPI stream_CopyTo( _Stream *iface, _Stream *dst, LONG size ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index a63ab445a1..3f297f4ce2 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -210,6 +210,19 @@ static void test_Stream(void) hr = _Stream_put_Position( stream, 2 ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_SetEOS( stream ); + ok( hr == S_OK, "got %08x\n", hr ); + + pos = -1; + hr = _Stream_get_Position( stream, &pos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos == 2, "got %d\n", pos ); + + size = -1; + hr = _Stream_get_Size( stream, &size ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( size == 2, "got %d\n", size ); + hr = _Stream_Close( stream ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.20.1

1 0

[PATCH 2/2] msado15: Implement _Connection_get_CommandTimeout and _Connection_put_CommandTimeout.
by Hans Leidekker 11 Dec '19

11 Dec '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v2: Initialize test variable. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/connection.c | 14 ++++++++++---- dlls/msado15/tests/msado15.c | 15 ++++++++++++++- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index c9799862bf..037ab52199 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -36,6 +36,7 @@ struct connection LONG refs; ObjectStateEnum state; + LONG timeout; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -126,14 +127,18 @@ static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *timeout ) { - FIXME( "%p, %p\n", iface, timeout ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %p\n", connection, timeout ); + *timeout = connection->timeout; + return S_OK; } static HRESULT WINAPI connection_put_CommandTimeout( _Connection *iface, LONG timeout ) { - FIXME( "%p, %d\n", iface, timeout ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %d\n", connection, timeout ); + connection->timeout = timeout; + return S_OK; } static HRESULT WINAPI connection_get_ConnectionTimeout( _Connection *iface, LONG *timeout ) @@ -342,6 +347,7 @@ HRESULT Connection_create( void **obj ) connection->Connection_iface.lpVtbl = &connection_vtbl; connection->refs = 1; connection->state = adStateClosed; + connection->timeout = 30; *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 8249a398ba..a63ab445a1 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -286,7 +286,7 @@ static void test_Connection(void) _Connection *connection; IRunnableObject *runtime; ISupportErrorInfo *errorinfo; - LONG state; + LONG state, timeout; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -310,6 +310,19 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(state == adStateClosed, "Unexpected state value 0x%08x\n", state); + timeout = 0; + hr = _Connection_get_CommandTimeout(connection, &timeout); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(timeout == 30, "Unexpected timeout value %d\n", timeout); + + hr = _Connection_put_CommandTimeout(connection, 300); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + + timeout = 0; + hr = _Connection_get_CommandTimeout(connection, &timeout); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + _Connection_Release(connection); } -- 2.20.1

1 0

[PATCH 1/2] msado15: Implement _Connection_get_State.
by Hans Leidekker 11 Dec '19

11 Dec '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v2: Initialize test variable. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/connection.c | 9 +++++++-- dlls/msado15/tests/msado15.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 43497636a8..c9799862bf 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -34,6 +34,8 @@ struct connection { _Connection Connection_iface; LONG refs; + + ObjectStateEnum state; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -271,8 +273,10 @@ static HRESULT WINAPI connection_put_Provider( _Connection *iface, BSTR str ) static HRESULT WINAPI connection_get_State( _Connection *iface, LONG *state ) { - FIXME( "%p, %p\n", iface, state ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %p\n", connection, state ); + *state = connection->state; + return S_OK; } static HRESULT WINAPI connection_OpenSchema( _Connection *iface, SchemaEnum schema, VARIANT restrictions, @@ -337,6 +341,7 @@ HRESULT Connection_create( void **obj ) if (!(connection = heap_alloc( sizeof(*connection) ))) return E_OUTOFMEMORY; connection->Connection_iface.lpVtbl = &connection_vtbl; connection->refs = 1; + connection->state = adStateClosed; *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 079da0a103..8249a398ba 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -280,9 +280,43 @@ static void test_Stream(void) ok( !refs, "got %d\n", refs ); } +static void test_Connection(void) +{ + HRESULT hr; + _Connection *connection; + IRunnableObject *runtime; + ISupportErrorInfo *errorinfo; + LONG state; + + hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Connection_QueryInterface(connection, &IID_IRunnableObject, (void**)&runtime); + ok(hr == E_NOINTERFACE, "Unexpected IRunnableObject interface\n"); + + hr = _Connection_QueryInterface(connection, &IID_ISupportErrorInfo, (void**)&errorinfo); + todo_wine ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); + if (hr == S_OK) + ISupportErrorInfo_Release(errorinfo); + +if (0) /* Crashes on windows */ +{ + hr = _Connection_get_State(connection, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr 0x%08x\n", hr); +} + + state = -1; + hr = _Connection_get_State(connection, &state); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(state == adStateClosed, "Unexpected state value 0x%08x\n", state); + + _Connection_Release(connection); +} + START_TEST(msado15) { CoInitialize( NULL ); test_Stream(); + test_Connection(); CoUninitialize(); } -- 2.20.1

1 0

[PATCH v2 01/11] vbscript: Implement ScriptTypeInfo_GetNames.
by Gabriel Ivăncescu 11 Dec '19

11 Dec '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Use binary search. dlls/vbscript/vbdisp.c | 67 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 6dc34b3..373efcc 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -546,6 +546,26 @@ typedef struct { ScriptDisp *disp; } ScriptTypeInfo; +static function_t *get_func_from_memid(const ScriptTypeInfo *typeinfo, MEMBERID memid) +{ + UINT a = 0, b = typeinfo->num_funcs; + + if (!(memid & DISPID_FUNCTION_MASK)) return NULL; + + while (a < b) + { + UINT i = (a + b - 1) / 2; + + if (memid == typeinfo->funcs[i].memid) + return typeinfo->funcs[i].func; + else if (memid < typeinfo->funcs[i].memid) + b = i; + else + a = i + 1; + } + return NULL; +} + static inline ScriptTypeInfo *ScriptTypeInfo_from_ITypeInfo(ITypeInfo *iface) { return CONTAINING_RECORD(iface, ScriptTypeInfo, ITypeInfo_iface); @@ -707,10 +727,53 @@ static HRESULT WINAPI ScriptTypeInfo_GetNames(ITypeInfo *iface, MEMBERID memid, UINT cMaxNames, UINT *pcNames) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + ITypeInfo *disp_typeinfo; + function_t *func; + HRESULT hr; + UINT i = 0; - FIXME("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + TRACE("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); - return E_NOTIMPL; + if (!rgBstrNames || !pcNames) return E_INVALIDARG; + if (memid <= 0) return TYPE_E_ELEMENTNOTFOUND; + + func = get_func_from_memid(This, memid); + if (!func && memid > This->num_vars) + { + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_GetNames(disp_typeinfo, memid, rgBstrNames, cMaxNames, pcNames); + } + + *pcNames = 0; + if (!cMaxNames) return S_OK; + + if (func) + { + UINT num = min(cMaxNames, func->arg_cnt + 1); + + rgBstrNames[0] = SysAllocString(func->name); + if (!rgBstrNames[0]) return E_OUTOFMEMORY; + + for (i = 1; i < num; i++) + { + if (!(rgBstrNames[i] = SysAllocString(func->args[i - 1].name))) + { + do SysFreeString(rgBstrNames[--i]); while (i); + return E_OUTOFMEMORY; + } + } + } + else + { + rgBstrNames[0] = SysAllocString(This->disp->global_vars[memid - 1]->name); + if (!rgBstrNames[0]) return E_OUTOFMEMORY; + i++; + } + + *pcNames = i; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetRefTypeOfImplType(ITypeInfo *iface, UINT index, HREFTYPE *pRefType) -- 2.21.0

2 13

[PATCH 1/4] user32/listbox: Scroll to specified caret index.
by Nikolay Sivov 11 Dec '19

11 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/listbox.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 3949610e50..95f6a23a28 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1473,19 +1473,23 @@ static void LISTBOX_MakeItemVisible( LB_DESCR *descr, INT index, BOOL fully ) */ static LRESULT LISTBOX_SetCaretIndex( LB_DESCR *descr, INT index, BOOL fully_visible ) { - INT oldfocus = descr->focus_item; + BOOL focus_changed = descr->focus_item != index; - TRACE("old focus %d, index %d\n", oldfocus, index); + TRACE("old focus %d, index %d\n", descr->focus_item, index); if (descr->style & LBS_NOSEL) return LB_ERR; if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; - if (index == oldfocus) return LB_OKAY; - LISTBOX_DrawFocusRect( descr, FALSE ); - descr->focus_item = index; + if (focus_changed) + { + LISTBOX_DrawFocusRect( descr, FALSE ); + descr->focus_item = index; + } LISTBOX_MakeItemVisible( descr, index, fully_visible ); - LISTBOX_DrawFocusRect( descr, TRUE ); + + if (focus_changed) + LISTBOX_DrawFocusRect( descr, TRUE ); return LB_OKAY; } -- 2.24.0

2 7

[PATCH] dinput: Log effect directions, and use effective flags
by Andrew Eikum 11 Dec '19

11 Dec '19

From: Bernat Arlandis <berarma(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/dinput/effect_linuxinput.c | 4 ++-- dlls/dinput/joystick.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 4b2f317ce37..cc2df3ce876 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -489,8 +489,6 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( TRACE("(this=%p,%p,%d)\n", This, peff, dwFlags); - dump_DIEFFECT(peff, &This->guid, dwFlags); - if ((dwFlags & ~DIEP_NORESTART & ~DIEP_NODOWNLOAD & ~DIEP_START) == 0) { /* set everything */ dwFlags = DIEP_AXES | DIEP_DIRECTION | DIEP_DURATION | DIEP_ENVELOPE | @@ -498,6 +496,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( DIEP_TRIGGERREPEATINTERVAL | DIEP_TYPESPECIFICPARAMS; } + dump_DIEFFECT(peff, &This->guid, dwFlags); + if (dwFlags & DIEP_AXES) { /* the linux input effect system only supports one or two axes */ if (peff->cAxes > 2) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 2220b5d576c..01611b0e444 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -207,6 +207,12 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) TRACE(" - dwTriggerButton: %d\n", eff->dwTriggerButton); TRACE(" - dwTriggerRepeatInterval: %d\n", eff->dwTriggerRepeatInterval); TRACE(" - rglDirection: %p\n", eff->rglDirection); + if (dwFlags & DIEP_DIRECTION) { + TRACE(" "); + for (i = 0; i < eff->cAxes; ++i) + TRACE("%d ", eff->rglDirection[i]); + TRACE("\n"); + } TRACE(" - cbTypeSpecificParams: %d\n", eff->cbTypeSpecificParams); TRACE(" - lpvTypeSpecificParams: %p\n", eff->lpvTypeSpecificParams); -- 2.24.1

1 0

[PATCH] include: update d3d9caps.h header file
by Biswapriyo Nath 11 Dec '19

11 Dec '19

1 0

[PATCH] winnt.h: Add missing NTSYSAPI attributes.
by Jacek Caban 11 Dec '19

11 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/winnt.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)

1 0

[PATCH vkd3d 0/5] vkd3d: Add more null resources.
by Conor McCarthy 11 Dec '19

11 Dec '19

An attempt to create a null resource view of an unsupported type leaves the descriptor uninitialised without having any means of indicating that an error occurred. Hitman 2 uses all of these view types. Conor McCarthy (5): vkd3d: Use helper functions for null resource initialisation. vkd3d: Add 1D null resources. vkd3d: Add 2D multisampled null resources. vkd3d: Add 3D null resources. vkd3d: Add cubic null resource. libs/vkd3d/resource.c | 360 +++++++++++++++++++++++++++---------- libs/vkd3d/vkd3d_private.h | 15 ++ 2 files changed, 277 insertions(+), 98 deletions(-) -- 2.24.0

2 6

[PATCH 01/10] jscript: Add script TypeInfo stub.
by Gabriel Ivăncescu 11 Dec '19

11 Dec '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Get rid of special case for global script dispatch. However, source functions are still treated specially, and native/builtin ones ignored (so that patch has been kept). Tests added to verify both of these behaviors. dlls/jscript/dispex.c | 264 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 262 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 463fd2f..92e9b96 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -590,6 +590,254 @@ static HRESULT fill_protrefs(jsdisp_t *This) return S_OK; } +typedef struct { + ITypeInfo ITypeInfo_iface; + LONG ref; +} ScriptTypeInfo; + +static inline ScriptTypeInfo *ScriptTypeInfo_from_ITypeInfo(ITypeInfo *iface) +{ + return CONTAINING_RECORD(iface, ScriptTypeInfo, ITypeInfo_iface); +} + +static HRESULT WINAPI ScriptTypeInfo_QueryInterface(ITypeInfo *iface, REFIID riid, void **ppv) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITypeInfo, riid)) + *ppv = &This->ITypeInfo_iface; + else + { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ScriptTypeInfo_AddRef(ITypeInfo *iface) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ScriptTypeInfo_Release(ITypeInfo *iface) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) + { + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI ScriptTypeInfo_GetTypeAttr(ITypeInfo *iface, TYPEATTR **ppTypeAttr) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, ppTypeAttr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetTypeComp(ITypeInfo *iface, ITypeComp **ppTComp) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, ppTComp); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetFuncDesc(ITypeInfo *iface, UINT index, FUNCDESC **ppFuncDesc) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%u %p)\n", This, index, ppFuncDesc); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetVarDesc(ITypeInfo *iface, UINT index, VARDESC **ppVarDesc) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%u %p)\n", This, index, ppVarDesc); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetNames(ITypeInfo *iface, MEMBERID memid, BSTR *rgBstrNames, + UINT cMaxNames, UINT *pcNames) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetRefTypeOfImplType(ITypeInfo *iface, UINT index, HREFTYPE *pRefType) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%u %p)\n", This, index, pRefType); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetImplTypeFlags(ITypeInfo *iface, UINT index, INT *pImplTypeFlags) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%u %p)\n", This, index, pImplTypeFlags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetIDsOfNames(ITypeInfo *iface, LPOLESTR *rgszNames, UINT cNames, + MEMBERID *pMemId) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p %u %p)\n", This, rgszNames, cNames, pMemId); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_Invoke(ITypeInfo *iface, PVOID pvInstance, MEMBERID memid, WORD wFlags, + DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p %d %d %p %p %p %p)\n", This, pvInstance, memid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetDocumentation(ITypeInfo *iface, MEMBERID memid, BSTR *pBstrName, + BSTR *pBstrDocString, DWORD *pdwHelpContext, BSTR *pBstrHelpFile) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %p %p %p %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetDllEntry(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind, + BSTR *pBstrDllName, BSTR *pBstrName, WORD *pwOrdinal) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %d %p %p %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetRefTypeInfo(ITypeInfo *iface, HREFTYPE hRefType, ITypeInfo **ppTInfo) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%x %p)\n", This, hRefType, ppTInfo); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_AddressOfMember(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind, PVOID *ppv) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %d %p)\n", This, memid, invKind, ppv); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_CreateInstance(ITypeInfo *iface, IUnknown *pUnkOuter, REFIID riid, PVOID *ppvObj) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p %s %p)\n", This, pUnkOuter, debugstr_guid(riid), ppvObj); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetMops(ITypeInfo *iface, MEMBERID memid, BSTR *pBstrMops) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %p)\n", This, memid, pBstrMops); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetContainingTypeLib(ITypeInfo *iface, ITypeLib **ppTLib, UINT *pIndex) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p %p)\n", This, ppTLib, pIndex); + + return E_NOTIMPL; +} + +static void WINAPI ScriptTypeInfo_ReleaseTypeAttr(ITypeInfo *iface, TYPEATTR *pTypeAttr) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, pTypeAttr); +} + +static void WINAPI ScriptTypeInfo_ReleaseFuncDesc(ITypeInfo *iface, FUNCDESC *pFuncDesc) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, pFuncDesc); +} + +static void WINAPI ScriptTypeInfo_ReleaseVarDesc(ITypeInfo *iface, VARDESC *pVarDesc) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, pVarDesc); +} + +static const ITypeInfoVtbl ScriptTypeInfoVtbl = { + ScriptTypeInfo_QueryInterface, + ScriptTypeInfo_AddRef, + ScriptTypeInfo_Release, + ScriptTypeInfo_GetTypeAttr, + ScriptTypeInfo_GetTypeComp, + ScriptTypeInfo_GetFuncDesc, + ScriptTypeInfo_GetVarDesc, + ScriptTypeInfo_GetNames, + ScriptTypeInfo_GetRefTypeOfImplType, + ScriptTypeInfo_GetImplTypeFlags, + ScriptTypeInfo_GetIDsOfNames, + ScriptTypeInfo_Invoke, + ScriptTypeInfo_GetDocumentation, + ScriptTypeInfo_GetDllEntry, + ScriptTypeInfo_GetRefTypeInfo, + ScriptTypeInfo_AddressOfMember, + ScriptTypeInfo_CreateInstance, + ScriptTypeInfo_GetMops, + ScriptTypeInfo_GetContainingTypeLib, + ScriptTypeInfo_ReleaseTypeAttr, + ScriptTypeInfo_ReleaseFuncDesc, + ScriptTypeInfo_ReleaseVarDesc +}; + static inline jsdisp_t *impl_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, jsdisp_t, IDispatchEx_iface); @@ -649,8 +897,20 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC ITypeInfo **ppTInfo) { jsdisp_t *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + ScriptTypeInfo *typeinfo; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + if (iTInfo != 0) return DISP_E_BADINDEX; + + if (!(typeinfo = heap_alloc(sizeof(*typeinfo)))) + return E_OUTOFMEMORY; + + typeinfo->ITypeInfo_iface.lpVtbl = &ScriptTypeInfoVtbl; + typeinfo->ref = 1; + + *ppTInfo = &typeinfo->ITypeInfo_iface; + return S_OK; } static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, -- 2.21.0

2 12

[PATCH v2 1/2] shell32: Implement PathResolve.
by Gijs Vermeulen 11 Dec '19

11 Dec '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48082 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- dlls/shell32/shellpath.c | 69 ++++++++++++++++++++++++++++++++++------ include/shlobj.h | 3 +- 2 files changed, 61 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 06be794812..b6350ea060 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -684,27 +684,78 @@ BOOL WINAPI PathQualifyAW(LPCVOID pszPath) return PathQualifyA(pszPath); } -static BOOL PathResolveA(LPSTR path, LPCSTR *paths, DWORD flags) +BOOL WINAPI PathFindOnPathExA(LPSTR,LPCSTR *,DWORD); +BOOL WINAPI PathFindOnPathExW(LPWSTR,LPCWSTR *,DWORD); +BOOL WINAPI PathFileExistsDefExtA(LPSTR,DWORD); +BOOL WINAPI PathFileExistsDefExtW(LPWSTR,DWORD); + +static BOOL PathResolveA(char *path, const char **dirs, DWORD flags) { - FIXME("(%s,%p,0x%08x),stub!\n", debugstr_a(path), paths, flags); - return FALSE; + BOOL is_file_spec = PathIsFileSpecA(path); + DWORD dwWhich = flags & PRF_DONTFINDLNK ? 0xf : 0xff; + + TRACE("(%s,%p,0x%08x)\n", debugstr_a(path), dirs, flags); + + if (flags & PRF_VERIFYEXISTS && !PathFileExistsA(path)) + { + if (PathFindOnPathExA(path, dirs, dwWhich)) + return TRUE; + if (PathFileExistsDefExtA(path, dwWhich)) + return TRUE; + if (!is_file_spec) GetFullPathNameA(path, MAX_PATH, path, NULL); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + if (is_file_spec) + { + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + GetFullPathNameA(path, MAX_PATH, path, NULL); + + return TRUE; } -static BOOL PathResolveW(LPWSTR path, LPCWSTR *paths, DWORD flags) +static BOOL PathResolveW(WCHAR *path, const WCHAR **dirs, DWORD flags) { - FIXME("(%s,%p,0x%08x),stub!\n", debugstr_w(path), paths, flags); - return FALSE; + BOOL is_file_spec = PathIsFileSpecW(path); + DWORD dwWhich = flags & PRF_DONTFINDLNK ? 0xf : 0xff; + + TRACE("(%s,%p,0x%08x)\n", debugstr_w(path), dirs, flags); + + if (flags & PRF_VERIFYEXISTS && !PathFileExistsW(path)) + { + if (PathFindOnPathExW(path, dirs, dwWhich)) + return TRUE; + if (PathFileExistsDefExtW(path, dwWhich)) + return TRUE; + if (!is_file_spec) GetFullPathNameW(path, MAX_PATH, path, NULL); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + if (is_file_spec) + { + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + GetFullPathNameW(path, MAX_PATH, path, NULL); + + return TRUE; } /************************************************************************* * PathResolve [SHELL32.51] */ -BOOL WINAPI PathResolveAW(LPVOID path, LPCVOID *paths, DWORD flags) +BOOL WINAPI PathResolveAW(void *path, const void **paths, DWORD flags) { if (SHELL_OsIsUnicode()) - return PathResolveW(path, (LPCWSTR*)paths, flags); + return PathResolveW(path, (const WCHAR **)paths, flags); else - return PathResolveA(path, (LPCSTR*)paths, flags); + return PathResolveA(path, (const char **)paths, flags); } /************************************************************************* diff --git a/include/shlobj.h b/include/shlobj.h index 9a7741a193..bc1150bf91 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1752,10 +1752,9 @@ BOOL WINAPI WriteCabinetState(CABINETSTATE *); /* PathResolve flags */ #define PRF_VERIFYEXISTS 0x01 -#define PRF_EXECUTABLE 0x02 #define PRF_TRYPROGRAMEXTENSIONS 0x03 #define PRF_FIRSTDIRDEF 0x04 -#define PRF_DONTFINDLINK 0x08 +#define PRF_DONTFINDLNK 0x08 #define PRF_REQUIREABSOLUTE 0x10 VOID WINAPI PathGetShortPath(LPWSTR pszPath); -- 2.24.0

1 1

[PATCH vkd3d] vkd3d/tests: Enable on vkd3d the tests for ID3D12CommandQueue::Wait().
by Conor McCarthy 11 Dec '19

11 Dec '19

The Wait() implementation was added some time ago and these tests succeed. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 323ef23..f17fe2a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -31426,12 +31426,6 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); - if (!vkd3d_test_platform_is_windows()) - { - skip("Wait() is not implemented yet.\n"); /* FIXME */ - goto skip_tests; - } - /* Wait() before CPU signal */ update_buffer_data(cb, 0, sizeof(blue), &blue); queue_wait(queue, fence, 2); @@ -31507,7 +31501,6 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); -skip_tests: /* Signal() and Wait() in the same command queue */ update_buffer_data(cb, 0, sizeof(blue), &blue); queue_signal(queue, fence, 7); -- 2.24.0

1 0

[PATCH v2 1/6] strmbase: Check for a NULL media type in IPin::ReceiveConnection().
by Zebediah Figura 11 Dec '19

11 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/pin.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 5255a6c7b0b..3dd00b27ccc 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -633,6 +633,9 @@ HRESULT WINAPI BaseInputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceiveP TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); strmbase_dump_media_type(pmt); + if (!pmt) + return E_POINTER; + EnterCriticalSection(&This->pin.filter->csFilter); { if (This->pin.filter->state != State_Stopped) -- 2.24.0

1 5

[PATCH 1/5] qcap/avimux: Use strmbase sink connection methods.
by Zebediah Figura 11 Dec '19

11 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/avimux.c | 71 ++++++++++++++++------------------------------ 1 file changed, 25 insertions(+), 46 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 63e98e8877b..c17d91322bf 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1410,41 +1410,15 @@ static HRESULT WINAPI AviMuxIn_Receive(struct strmbase_sink *base, IMediaSample return hr; } -static const struct strmbase_sink_ops sink_ops = -{ - .base.pin_query_interface = sink_query_interface, - .base.pin_query_accept = sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, - .pfnReceive = AviMuxIn_Receive, -}; - -static inline AviMux* impl_from_in_IPin(IPin *iface) +static HRESULT avi_mux_sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *pmt) { - struct strmbase_pin *pin = CONTAINING_RECORD(iface, struct strmbase_pin, IPin_iface); - return impl_from_strmbase_filter(pin->filter); -} - -static inline AviMuxIn* AviMuxIn_from_IPin(IPin *iface) -{ - return CONTAINING_RECORD(iface, AviMuxIn, pin.pin.IPin_iface); -} - -static HRESULT WINAPI AviMuxIn_ReceiveConnection(IPin *iface, - IPin *pConnector, const AM_MEDIA_TYPE *pmt) -{ - AviMux *This = impl_from_in_IPin(iface); - AviMuxIn *avimuxin = AviMuxIn_from_IPin(iface); + AviMuxIn *avimuxin = impl_sink_from_strmbase_pin(&iface->pin); + AviMux *This = impl_from_strmbase_filter(iface->pin.filter); HRESULT hr; - TRACE("pin %p, pConnector %p, pmt %p.\n", avimuxin, pConnector, pmt); - if(!pmt) return E_POINTER; - hr = BaseInputPinImpl_ReceiveConnection(iface, pConnector, pmt); - if(FAILED(hr)) - return hr; - if(IsEqualIID(&pmt->majortype, &MEDIATYPE_Video) && IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) { ALLOCATOR_PROPERTIES req, act; @@ -1468,10 +1442,8 @@ static HRESULT WINAPI AviMuxIn_ReceiveConnection(IPin *iface, hr = IMemAllocator_SetProperties(avimuxin->samples_allocator, &req, &act); if(SUCCEEDED(hr)) hr = IMemAllocator_Commit(avimuxin->samples_allocator); - if(FAILED(hr)) { - BaseInputPinImpl_Disconnect(iface); + if (FAILED(hr)) return hr; - } size = pmt->cbFormat - FIELD_OFFSET(VIDEOINFOHEADER, bmiHeader); avimuxin->strf = CoTaskMemAlloc(sizeof(RIFFCHUNK) + ALIGN(FIELD_OFFSET(BITMAPINFO, bmiColors[vih->bmiHeader.biClrUsed]))); @@ -1489,23 +1461,15 @@ static HRESULT WINAPI AviMuxIn_ReceiveConnection(IPin *iface, return create_input_pin(This); } -static HRESULT WINAPI AviMuxIn_Disconnect(IPin *iface) +static void avi_mux_sink_disconnect(struct strmbase_sink *iface) { - AviMuxIn *avimuxin = AviMuxIn_from_IPin(iface); + AviMuxIn *avimuxin = impl_sink_from_strmbase_pin(&iface->pin); IMediaSample **prev, *cur; - HRESULT hr; - - TRACE("pin %p.\n", avimuxin); - - hr = BaseInputPinImpl_Disconnect(iface); - if(FAILED(hr)) - return hr; IMemAllocator_Decommit(avimuxin->samples_allocator); while(avimuxin->samples_head) { cur = avimuxin->samples_head; - hr = IMediaSample_GetPointer(cur, (BYTE**)&prev); - if(FAILED(hr)) + if (FAILED(IMediaSample_GetPointer(cur, (BYTE **)&prev))) break; prev--; @@ -1518,7 +1482,22 @@ static HRESULT WINAPI AviMuxIn_Disconnect(IPin *iface) } CoTaskMemFree(avimuxin->strf); avimuxin->strf = NULL; - return hr; +} + +static const struct strmbase_sink_ops sink_ops = +{ + .base.pin_query_interface = sink_query_interface, + .base.pin_query_accept = sink_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, + .pfnReceive = AviMuxIn_Receive, + .sink_connect = avi_mux_sink_connect, + .sink_disconnect = avi_mux_sink_disconnect, +}; + +static inline AviMux* impl_from_in_IPin(IPin *iface) +{ + struct strmbase_pin *pin = CONTAINING_RECORD(iface, struct strmbase_pin, IPin_iface); + return impl_from_strmbase_filter(pin->filter); } static const IPinVtbl AviMuxIn_PinVtbl = { @@ -1526,8 +1505,8 @@ static const IPinVtbl AviMuxIn_PinVtbl = { BasePinImpl_AddRef, BasePinImpl_Release, BaseInputPinImpl_Connect, - AviMuxIn_ReceiveConnection, - AviMuxIn_Disconnect, + BaseInputPinImpl_ReceiveConnection, + BaseInputPinImpl_Disconnect, BasePinImpl_ConnectedTo, BasePinImpl_ConnectionMediaType, BasePinImpl_QueryPinInfo, -- 2.24.0

2 7

[PATCH] urlmon/tests: Fix the spelling of a variable name.
by Francois Gouget 11 Dec '19

11 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/urlmon/tests/stream.c | 4 ++-- dlls/urlmon/tests/url.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/tests/stream.c b/dlls/urlmon/tests/stream.c index 6717198b311..bf8867290f8 100644 --- a/dlls/urlmon/tests/stream.c +++ b/dlls/urlmon/tests/stream.c @@ -204,7 +204,7 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) { HRESULT hres; - DWORD readed; + DWORD read; BYTE buf[512]; CHECK_EXPECT2(OnDataAvailable); @@ -230,7 +230,7 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR } if(U(*pstgmed).pstm) { - do hres = IStream_Read(U(*pstgmed).pstm, buf, 512, &readed); + do hres = IStream_Read(U(*pstgmed).pstm, buf, 512, &read); while(hres == S_OK); ok(hres == S_FALSE || hres == E_PENDING, "IStream_Read returned %08x\n", hres); } diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 287eb2702e4..7c8d1abdb76 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1988,7 +1988,7 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) { HRESULT hres; - DWORD readed; + DWORD read; BYTE buf[512]; CHAR clipfmt[512]; @@ -2075,8 +2075,8 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW if(callback_read) { do { - hres = IStream_Read(stream, buf, 512, &readed); - if(test_protocol == HTTP_TEST && emulate_protocol && readed) + hres = IStream_Read(stream, buf, 512, &read); + if(test_protocol == HTTP_TEST && emulate_protocol && read) ok(buf[0] == (use_cache_file && !(bindf&BINDF_ASYNCHRONOUS) ? 'X' : '?'), "buf[0] = '%c'\n", buf[0]); }while(hres == S_OK); ok(hres == S_FALSE || hres == E_PENDING, "IStream_Read returned %08x\n", hres); @@ -3245,7 +3245,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) if(unk) { BYTE buf[512]; - DWORD readed; + DWORD read; IStream *stream; hres = IUnknown_QueryInterface(unk, &IID_IStream, (void**)&stream); @@ -3253,14 +3253,14 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) IUnknown_Release(unk); do { - readed = 0xdeadbeef; - hres = IStream_Read(stream, buf, sizeof(buf), &readed); - ok(readed != 0xdeadbeef, "readed = 0xdeadbeef\n"); - if(emulate_protocol && test_protocol == HTTP_TEST && readed) + read = 0xdeadbeef; + hres = IStream_Read(stream, buf, sizeof(buf), &read); + ok(read != 0xdeadbeef, "read = 0xdeadbeef\n"); + if(emulate_protocol && test_protocol == HTTP_TEST && read) ok(buf[0] == (use_cache_file && !(bindf&BINDF_ASYNCHRONOUS) ? 'X' : '?'), "buf[0] = '%c'\n", buf[0]); }while(hres == S_OK); ok(hres == S_FALSE, "IStream_Read returned %08x\n", hres); - ok(!readed, "readed = %d\n", readed); + ok(!read, "read = %d\n", read); IStream_Release(stream); } -- 2.20.1

2 1

[PATCH] msvcrt: Implement _ispunct_l().
by Chip Davis 11 Dec '19

11 Dec '19

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/ctype.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index ead56fbcb5a..42f3ed34ab4 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -16,7 +16,7 @@ @ cdecl _isleadbyte_l(long ptr) ucrtbase._isleadbyte_l @ cdecl _islower_l(long ptr) ucrtbase._islower_l @ cdecl _isprint_l(long ptr) ucrtbase._isprint_l -@ stub _ispunct_l +@ cdecl _ispunct_l(long ptr) ucrtbase._ispunct_l @ cdecl _isspace_l(long ptr) ucrtbase._isspace_l @ cdecl _isupper_l(long ptr) ucrtbase._isupper_l @ cdecl _iswalnum_l(long ptr) ucrtbase._iswalnum_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 63c3a9d8a06..560e14b33b8 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1013,7 +1013,7 @@ @ cdecl _isnan(double) MSVCRT__isnan @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf @ cdecl _isprint_l(long ptr) MSVCRT__isprint_l -@ stub _ispunct_l +@ cdecl _ispunct_l(long ptr) MSVCRT__ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 366c7717463..2316535e5d1 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1359,7 +1359,7 @@ @ cdecl _isnan(double) MSVCRT__isnan @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf @ cdecl _isprint_l(long ptr) MSVCRT__isprint_l -@ stub _ispunct_l +@ cdecl _ispunct_l(long ptr) MSVCRT__ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 07ff5abdff5..903f4b7ce38 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1364,7 +1364,7 @@ @ cdecl _isnan(double) MSVCRT__isnan @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf @ cdecl _isprint_l(long ptr) MSVCRT__isprint_l -@ stub _ispunct_l +@ cdecl _ispunct_l(long ptr) MSVCRT__ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 89d240b567e..63a4ccfacf2 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1229,7 +1229,7 @@ @ cdecl _isnan(double) msvcr120._isnan @ cdecl -arch=x86_64 _isnanf(float) msvcr120._isnanf @ cdecl _isprint_l(long ptr) msvcr120._isprint_l -@ stub _ispunct_l +@ cdecl _ispunct_l(long ptr) msvcr120._ispunct_l @ cdecl _isspace_l(long ptr) msvcr120._isspace_l @ cdecl _isupper_l(long ptr) msvcr120._isupper_l @ cdecl _iswalnum_l(long ptr) msvcr120._iswalnum_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 14ed7f35532..402e6efc109 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -685,7 +685,7 @@ @ cdecl _isnan(double) MSVCRT__isnan @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf @ cdecl _isprint_l(long ptr) MSVCRT__isprint_l -@ stub _ispunct_l +@ cdecl _ispunct_l(long ptr) MSVCRT__ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index acb976a7b02..8a079abe254 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -663,7 +663,7 @@ @ cdecl _isnan(double) MSVCRT__isnan @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf @ cdecl _isprint_l(long ptr) MSVCRT__isprint_l -@ stub _ispunct_l +@ cdecl _ispunct_l(long ptr) MSVCRT__ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 3b037aa8de2..9e2d029950e 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -244,6 +244,14 @@ int CDECL MSVCRT_ispunct(int c) return MSVCRT__isctype( c, MSVCRT__PUNCT ); } +/********************************************************************* + * _ispunct_l (MSVCR80.@) + */ +int CDECL MSVCRT__ispunct_l(int c, MSVCRT__locale_t locale) +{ + return MSVCRT__isctype_l( c, MSVCRT__PUNCT, locale ); +} + /********************************************************************* * _isspace_l (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a262cc63459..1293dd62f16 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -503,7 +503,7 @@ @ cdecl _isnan(double) MSVCRT__isnan @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf @ cdecl _isprint_l(long ptr) MSVCRT__isprint_l -@ stub _ispunct_l +@ cdecl _ispunct_l(long ptr) MSVCRT__ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l -- 2.24.0

1 0

[PATCH] usp10: Fix the spelling of some index array variables and function.
by Francois Gouget 11 Dec '19

11 Dec '19

Indices is the plural used by related APIs so use it for consistency. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/usp10/bidi.c | 14 +++++------ dlls/usp10/shape.c | 48 ++++++++++++++++++------------------- dlls/usp10/usp10.c | 18 +++++++------- dlls/usp10/usp10_internal.h | 4 ++-- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 7de2be51d7c..34ca955dcb1 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -1149,7 +1149,7 @@ BOOL BIDI_DetermineLevels( return TRUE; } -/* reverse cch indexes */ +/* reverse cch indices */ static void reverse(int *pidx, int cch) { int temp; @@ -1185,7 +1185,7 @@ static void reverse(int *pidx, int cch) Note: this should be applied a line at a time -------------------------------------------------------------------------*/ -int BIDI_ReorderV2lLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse) +int BIDI_ReorderV2lLevel(int level, int *pIndices, const BYTE* plevel, int cch, BOOL fReverse) { int ich = 0; @@ -1200,19 +1200,19 @@ int BIDI_ReorderV2lLevel(int level, int *pIndexs, const BYTE* plevel, int cch, B } else if (plevel[ich] > level) { - ich += BIDI_ReorderV2lLevel(level + 1, pIndexs + ich, plevel + ich, + ich += BIDI_ReorderV2lLevel(level + 1, pIndices + ich, plevel + ich, cch - ich, fReverse) - 1; } } if (fReverse) { - reverse(pIndexs, ich); + reverse(pIndices, ich); } return ich; } /* Applies the reorder in reverse. Taking an already reordered string and returning the original */ -int BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse) +int BIDI_ReorderL2vLevel(int level, int *pIndices, const BYTE* plevel, int cch, BOOL fReverse) { int ich = 0; int newlevel = -1; @@ -1229,7 +1229,7 @@ int BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, B } if (fReverse) { - reverse(pIndexs, ich); + reverse(pIndices, ich); } if (newlevel >= 0) @@ -1239,7 +1239,7 @@ int BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, B if (plevel[ich] < level) break; else if (plevel[ich] > level) - ich += BIDI_ReorderL2vLevel(level + 1, pIndexs + ich, plevel + ich, + ich += BIDI_ReorderL2vLevel(level + 1, pIndices + ich, plevel + ich, cch - ich, fReverse) - 1; } diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 3827000122a..86e80aacd5f 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -805,7 +805,7 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch } } - /* renumber trailing indexes */ + /* renumber trailing indices */ for (i = target_index; i < chars && i >= 0; i += cluster_dir) { if (pwLogClust[i] != target_glyph) @@ -1971,7 +1971,7 @@ static void SecondReorder_Like_Tamil(const WCHAR *chars, const IndicSyllable *s, } -static inline void shift_syllable_glyph_indexs(IndicSyllable *glyph_index, INT index, INT shift) +static inline void shift_syllable_glyph_indices(IndicSyllable *glyph_index, INT index, INT shift) { if (shift == 0) return; @@ -2005,7 +2005,7 @@ static void Apply_Indic_BasicForm(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, 1, cChars, pwLogClust); - shift_syllable_glyph_indexs(glyph_index,index,*pcGlyphs - prevCount); + shift_syllable_glyph_indices(glyph_index,index,*pcGlyphs - prevCount); index = nextIndex; } else @@ -2040,7 +2040,7 @@ static void Apply_Indic_PreBase(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, 1, cChars, pwLogClust); - shift_syllable_glyph_indexs(glyph_index, index + glyph_index->start + g_offset, (*pcGlyphs - prevCount)); + shift_syllable_glyph_indices(glyph_index, index + glyph_index->start + g_offset, (*pcGlyphs - prevCount)); g_offset += (*pcGlyphs - prevCount); } @@ -2060,7 +2060,7 @@ static void Apply_Indic_Rphf(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WC if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, 1, cChars, pwLogClust); - shift_syllable_glyph_indexs(glyph_index,glyph_index->ralf,*pcGlyphs - prevCount); + shift_syllable_glyph_indices(glyph_index,glyph_index->ralf,*pcGlyphs - prevCount); } } } @@ -2108,7 +2108,7 @@ static void Apply_Indic_PostBase(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, 1, cChars, pwLogClust); - shift_syllable_glyph_indexs(glyph_index,index+glyph_index->start+g_offset, (*pcGlyphs - prevCount)); + shift_syllable_glyph_indices(glyph_index,index+glyph_index->start+g_offset, (*pcGlyphs - prevCount)); g_offset += (*pcGlyphs - prevCount); } else if (!modern) @@ -2138,70 +2138,70 @@ static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, BOOL pref = (load_OT_feature(hdc, psa, psc, FEATURE_GSUB_TABLE, "pref") != NULL); BOOL blwf = (load_OT_feature(hdc, psa, psc, FEATURE_GSUB_TABLE, "blwf") != NULL); BOOL half = (load_OT_feature(hdc, psa, psc, FEATURE_GSUB_TABLE, "half") != NULL); - IndicSyllable glyph_indexs; + IndicSyllable glyph_indices; for (c = 0; c < syllable_count; c++) { int old_end; - memcpy(&glyph_indexs, &syllables[c], sizeof(IndicSyllable)); - shift_syllable_glyph_indexs(&glyph_indexs, -1, overall_shift); - old_end = glyph_indexs.end; + memcpy(&glyph_indices, &syllables[c], sizeof(IndicSyllable)); + shift_syllable_glyph_indices(&glyph_indices, -1, overall_shift); + old_end = glyph_indices.end; if (locl) { TRACE("applying feature locl\n"); - Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, locl); + Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indices, locl); } if (nukt) { TRACE("applying feature nukt\n"); - Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, nukt); + Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indices, nukt); } if (akhn) { TRACE("applying feature akhn\n"); - Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, akhn); + Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indices, akhn); } if (rphf) - Apply_Indic_Rphf(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs); + Apply_Indic_Rphf(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indices); if (rkrf) { TRACE("applying feature rkrf\n"); - Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, rkrf); + Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indices, rkrf); } if (pref) - Apply_Indic_PostBase(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, modern, "pref"); + Apply_Indic_PostBase(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indices, modern, "pref"); if (blwf) { if (!modern) - Apply_Indic_PreBase(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, "blwf"); + Apply_Indic_PreBase(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indices, "blwf"); - Apply_Indic_PostBase(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, modern, "blwf"); + Apply_Indic_PostBase(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indices, modern, "blwf"); } if (half) - Apply_Indic_PreBase(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, "half"); + Apply_Indic_PreBase(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indices, "half"); if (pstf) { TRACE("applying feature pstf\n"); - Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, pstf); + Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indices, pstf); } if (vatu) { TRACE("applying feature vatu\n"); - Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, vatu); + Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indices, vatu); } if (cjct) { TRACE("applying feature cjct\n"); - Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, cjct); + Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indices, cjct); } if (second_reorder) - second_reorder(pwChars, &syllables[c], pwOutGlyphs, &glyph_indexs, lexical); + second_reorder(pwChars, &syllables[c], pwOutGlyphs, &glyph_indices, lexical); - overall_shift += glyph_indexs.end - old_end; + overall_shift += glyph_indices.end - old_end; } } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 3cc6665c2b9..f66e85cc485 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3748,7 +3748,7 @@ HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD glyph, AB */ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *logtovis) { - int* indexs; + int* indices; int ich; TRACE("(%d, %p, %p, %p)\n", runs, level, vistolog, logtovis); @@ -3756,31 +3756,31 @@ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *log if (!level || (!vistolog && !logtovis)) return E_INVALIDARG; - if (!(indexs = heap_calloc(runs, sizeof(*indexs)))) + if (!(indices = heap_calloc(runs, sizeof(*indices)))) return E_OUTOFMEMORY; if (vistolog) { for( ich = 0; ich < runs; ich++) - indexs[ich] = ich; + indices[ich] = ich; ich = 0; while (ich < runs) - ich += BIDI_ReorderV2lLevel(0, indexs+ich, level+ich, runs - ich, FALSE); - memcpy(vistolog, indexs, runs * sizeof(*vistolog)); + ich += BIDI_ReorderV2lLevel(0, indices+ich, level+ich, runs - ich, FALSE); + memcpy(vistolog, indices, runs * sizeof(*vistolog)); } if (logtovis) { for( ich = 0; ich < runs; ich++) - indexs[ich] = ich; + indices[ich] = ich; ich = 0; while (ich < runs) - ich += BIDI_ReorderL2vLevel(0, indexs+ich, level+ich, runs - ich, FALSE); - memcpy(logtovis, indexs, runs * sizeof(*logtovis)); + ich += BIDI_ReorderL2vLevel(0, indices+ich, level+ich, runs - ich, FALSE); + memcpy(logtovis, indices, runs * sizeof(*logtovis)); } - heap_free(indexs); + heap_free(indices); return S_OK; } diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index bd55d8694f1..7f31e8f83f6 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -253,8 +253,8 @@ BOOL BIDI_DetermineLevels(const WCHAR *string, unsigned int count, const SCRIPT_ const SCRIPT_CONTROL *c, WORD *levels, WORD *overrides) DECLSPEC_HIDDEN; BOOL BIDI_GetStrengths(const WCHAR *string, unsigned int count, const SCRIPT_CONTROL *c, WORD *strength) DECLSPEC_HIDDEN; -INT BIDI_ReorderV2lLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse) DECLSPEC_HIDDEN; -INT BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse) DECLSPEC_HIDDEN; +INT BIDI_ReorderV2lLevel(int level, int *pIndices, const BYTE* plevel, int cch, BOOL fReverse) DECLSPEC_HIDDEN; +INT BIDI_ReorderL2vLevel(int level, int *pIndices, const BYTE* plevel, int cch, BOOL fReverse) DECLSPEC_HIDDEN; void SHAPE_ContextualShaping(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) DECLSPEC_HIDDEN; void SHAPE_ApplyDefaultOpentypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, INT cChars, WORD *pwLogClust) DECLSPEC_HIDDEN; void SHAPE_ApplyOpenTypePositions(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WORD* pwGlyphs, INT cGlyphs, int *piAdvance, GOFFSET *pGoffset ) DECLSPEC_HIDDEN; -- 2.20.1

1 0

[PATCH] shell32: Fix the spelling of a variable name.
by Francois Gouget 11 Dec '19

11 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/shell32/assoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index d3f20c225b5..a501dea2e79 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -890,7 +890,7 @@ static HRESULT WINAPI ApplicationAssociationRegistration_QueryCurrentDefault(IAp IApplicationAssociationRegistrationImpl *This = impl_from_IApplicationAssociationRegistration(iface); static WCHAR urlassoc[] = {'U','r','l','A','s','s','o','c','i','a','t','i','o','n','s',0}; static WCHAR mimeassoc[] = {'M','I','M','E','A','s','s','o','c','i','a','t','i','o','n','s',0}; - static WCHAR assocations[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + static WCHAR associations[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\','S','h','e','l','l','\\', 'A','s','s','o','c','i','a','t','i','o','n','s',0}; static WCHAR slash[] = {'\\',0}; @@ -940,7 +940,7 @@ static HRESULT WINAPI ApplicationAssociationRegistration_QueryCurrentDefault(IAp } else { - ret = RegOpenKeyExW(HKEY_CURRENT_USER, assocations, 0, KEY_READ, &hkey); + ret = RegOpenKeyExW(HKEY_CURRENT_USER, associations, 0, KEY_READ, &hkey); if(ret == ERROR_SUCCESS) { if(type == AT_URLPROTOCOL) -- 2.20.1

1 0

[PATCH] d3dx9_36: Fix the spelling of a comment.
by Francois Gouget 11 Dec '19

11 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/d3dx9_36/txc_compress_dxtn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/txc_compress_dxtn.c b/dlls/d3dx9_36/txc_compress_dxtn.c index 86fd8e0aff0..7f10de8076b 100644 --- a/dlls/d3dx9_36/txc_compress_dxtn.c +++ b/dlls/d3dx9_36/txc_compress_dxtn.c @@ -450,7 +450,7 @@ static void encodedxt5alpha(GLubyte *blkaddr, GLubyte srccolors[4][4][4], if ((alphabase[0] > alphabase[1]) && !(alphaabsmin && alphaabsmax)) { /* one color, either max or min */ /* shortcut here since it is a very common case (and also avoids later problems) */ /* || (alphabase[0] == alphabase[1] && !alphaabsmin && !alphaabsmax) */ - /* could also thest for alpha0 == alpha1 (and not min/max), but probably not common, so don't bother */ + /* could also test for alpha0 == alpha1 (and not min/max), but probably not common, so don't bother */ *blkaddr++ = srccolors[0][0][3]; blkaddr++; -- 2.20.1

1 0

[PATCH] vbscript/tests: Fix the spelling of a vbscript comment.
by Francois Gouget 11 Dec '19

11 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/vbscript/tests/lang.vbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 6eebe287fee..fb9f96e4277 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1573,7 +1573,7 @@ sub test_dotIdentifiers end sub call test_dotIdentifiers -' Test End statements not required to be preceeded by a newline or separator +' Test End statements not required to be preceded by a newline or separator Sub EndTestSub x = 1 End Sub -- 2.20.1

1 0

[PATCH] winex11.drv: Fix the spelling of a WARN() message.
by Francois Gouget 11 Dec '19

11 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winex11.drv/xrandr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 56168573471..930e0282be8 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -622,7 +622,7 @@ fallback: if (output_info) pXRRFreeOutputInfo( output_info ); - WARN("Primary is set to a disconneted XRandR output.\n"); + WARN("Primary is set to a disconnected XRandR output.\n"); for (i = 0; i < resources->ncrtc; ++i) { crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[i] ); -- 2.20.1

1 0

[PATCH] dmloader: Fix the spelling of a TRACE() message and a comment.
by Francois Gouget 10 Dec '19

10 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dmloader/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 9048c02dfc7..60dd6f844b9 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -168,7 +168,7 @@ static struct cache_entry *find_cache_object(IDirectMusicLoaderImpl *This, DMUS_ struct cache_entry *existing; /* - * The Object is looked for the the following order. + * The Object is looked up in the following order. * 1. DMUS_OBJ_OBJECT * 2. DMUS_OBJ_STREAM * 3. DMUS_OBJ_MEMORY @@ -682,7 +682,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_CacheObject(IDirectMusicLoader8 *if entry = find_cache_object(This, &desc); if (entry) { if ((entry->Desc.dwValidData & DMUS_OBJ_LOADED) && entry->pObject) { - TRACE("Object already laoded.\n"); + TRACE("Object already loaded.\n"); return S_FALSE; } -- 2.20.1

2 1

[PATCH] configure: Silence -Wincompatible-library-redeclaration warning.
by Jacek Caban 10 Dec '19

10 Dec '19

This is noisy on clang and we can't change declarations due to long double type incompatibility. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- configure.ac | 2 ++ 1 file changed, 2 insertions(+)

1 0

[PATCH] wine.inf: install powershell.exe in WindowsPowerShell/v1.0/
by Louis Lenders 10 Dec '19

10 Dec '19

https://bugs.winehq.org/show_bug.cgi?id=47820 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c830525379..71e95dfa7b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2675,6 +2675,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,gecko\plugin,npmshtml.dll 11,Speech\Common,sapi.dll 11,wbem,mofcomp.exe +11,WindowsPowerShell\v1.0,powershell.exe 10,syswow64,stdole2.tlb 11,,iexplore.exe 11,,winetest.exe,- @@ -2759,6 +2760,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,wbem,wbemprox.dll 11,wbem,wmic.exe 11,wbem,wmiutils.dll +11,WindowsPowerShell\v1.0,powershell.exe ; empty folders to make sure the parent dirs are not removed 16410,Microsoft, 16412,Microsoft, -- 2.24.0

1 0

[PATCH 1/5] wined3d: Introduce wined3d_device_apply_stateblock().
by Zebediah Figura 10 Dec '19

10 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 93 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 95 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0ae841d4e35..50029dfbec2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3829,6 +3829,99 @@ struct wined3d_texture * CDECL wined3d_device_get_texture(const struct wined3d_d return device->state.textures[stage]; } +void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, + struct wined3d_stateblock *stateblock) +{ + const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; + const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; + unsigned int i, j; + + TRACE("device %p, stateblock %p.\n", device, stateblock); + + wined3d_stateblock_init_contained_states(stateblock); + + wined3d_device_set_vertex_shader(device, state->vs); + wined3d_device_set_pixel_shader(device, state->ps); + + for (i = 0; i < d3d_info->limits.vs_uniform_count; ++i) + wined3d_device_set_vs_consts_f(device, i, 1, &state->vs_consts_f[i]); + for (i = 0; i < ARRAY_SIZE(state->vs_consts_i); ++i) + wined3d_device_set_vs_consts_i(device, i, 1, &state->vs_consts_i[i]); + for (i = 0; i < ARRAY_SIZE(state->vs_consts_b); ++i) + wined3d_device_set_vs_consts_b(device, i, 1, &state->vs_consts_b[i]); + + for (i = 0; i < ARRAY_SIZE(state->ps_consts_f); ++i) + wined3d_device_set_ps_consts_f(device, i, 1, &state->ps_consts_f[i]); + for (i = 0; i < ARRAY_SIZE(state->ps_consts_i); ++i) + wined3d_device_set_ps_consts_i(device, i, 1, &state->ps_consts_i[i]); + for (i = 0; i < ARRAY_SIZE(state->ps_consts_b); ++i) + wined3d_device_set_ps_consts_b(device, i, 1, &state->ps_consts_b[i]); + + for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) + { + const struct wined3d_light_info *light; + + LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) + { + wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); + } + } + + for (i = 0; i < ARRAY_SIZE(state->rs); ++i) + { + if (i == WINED3D_RS_BLENDFACTOR) + { + struct wined3d_color color; + wined3d_color_from_d3dcolor(&color, state->rs[i]); + wined3d_device_set_blend_state(device, NULL, &color); + } + else + wined3d_device_set_render_state(device, i, state->rs[i]); + } + + for (i = 0; i < ARRAY_SIZE(state->texture_states); ++i) + { + for (j = 0; j < ARRAY_SIZE(state->texture_states[i]); ++j) + wined3d_device_set_texture_stage_state(device, i, j, state->texture_states[i][j]); + } + + for (i = 0; i < ARRAY_SIZE(state->sampler_states); ++i) + { + DWORD stage = i; + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; + for (j = 0; j < ARRAY_SIZE(state->sampler_states[j]); ++j) + wined3d_device_set_sampler_state(device, stage, j, state->sampler_states[i][j]); + } + + for (i = 0; i < ARRAY_SIZE(state->transforms); ++i) + wined3d_device_set_transform(device, i, &state->transforms[i]); + + wined3d_device_set_index_buffer(device, state->index_buffer, state->index_format, 0); + wined3d_device_set_base_vertex_index(device, state->base_vertex_index); + wined3d_device_set_vertex_declaration(device, state->vertex_declaration); + wined3d_device_set_material(device, &state->material); + wined3d_device_set_viewports(device, 1, &state->viewport); + wined3d_device_set_scissor_rects(device, 1, &state->scissor_rect); + + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) + { + wined3d_device_set_stream_source(device, i, state->streams[i].buffer, + state->streams[i].offset, state->streams[i].stride); + wined3d_device_set_stream_source_freq(device, i, + state->streams[i].frequency | state->streams[i].flags); + } + + for (i = 0; i < ARRAY_SIZE(state->textures); ++i) + wined3d_device_set_texture(device, i < WINED3D_MAX_FRAGMENT_SAMPLERS ? i + : WINED3DVERTEXTEXTURESAMPLER0 + i - WINED3D_MAX_FRAGMENT_SAMPLERS, state->textures[i]); + + for (i = 0; i < ARRAY_SIZE(state->clip_planes); ++i) + wined3d_device_set_clip_plane(device, i, &state->clip_planes[i]); + + TRACE("Applied stateblock %p.\n", stateblock); +} + HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device, struct wined3d_caps *caps) { TRACE("device %p, caps %p.\n", device, caps); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e03c57055b7..c8ef442c72d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -37,6 +37,7 @@ @ cdecl wined3d_buffer_incref(ptr) @ cdecl wined3d_device_acquire_focus_window(ptr ptr) +@ cdecl wined3d_device_apply_stateblock(ptr ptr) @ cdecl wined3d_device_begin_scene(ptr) @ cdecl wined3d_device_clear(ptr long ptr long ptr float long) @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr long ptr float long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4b5d4e02f9b..a6eaaca468c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2287,6 +2287,7 @@ struct wined3d_resource * __cdecl wined3d_buffer_get_resource(struct wined3d_buf ULONG __cdecl wined3d_buffer_incref(struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window); +void __cdecl wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float z, DWORD stencil); -- 2.23.0

4 12

[PATCH v2 1/6] ddraw: Track some more render states in the primary stateblock.
by Zebediah Figura 10 Dec '19

10 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ddraw/device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 51576c81e28..def3e7c2a43 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3555,6 +3555,7 @@ static void setup_lighting(const struct d3d_device *device, DWORD fvf, DWORD fla if (!device->material || !(fvf & D3DFVF_NORMAL) || (flags & D3DDP_DONOTLIGHT)) enable = FALSE; + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_LIGHTING, enable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_LIGHTING, enable); } @@ -7033,11 +7034,18 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, d3d_device_update_depth_stencil(device)); if (version == 1) /* Color keying is initially enabled for version 1 devices. */ + { + wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_COLORKEYENABLE, TRUE); wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_COLORKEYENABLE, TRUE); + } else if (version == 2) + { + wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_SPECULARENABLE, TRUE); wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_SPECULARENABLE, TRUE); + } if (version < 7) { + wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_NORMALIZENORMALS, TRUE); wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_NORMALIZENORMALS, TRUE); IDirect3DDevice3_SetRenderState(&device->IDirect3DDevice3_iface, D3DRENDERSTATE_TEXTUREMAPBLEND, D3DTBLEND_MODULATE); -- 2.23.0

4 17

[PATCH 01/14] vbscript: Implement ScriptTypeComp_Bind.
by Gabriel Ivăncescu 10 Dec '19

10 Dec '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/tests/vbscript.c | 4 --- dlls/vbscript/vbdisp.c | 51 ++++++++++++++++++++++++++++++++-- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 0c3acd0..1d246c5 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -1070,16 +1070,12 @@ static void test_script_typeinfo(void) ITypeComp_Release(typecomp2); wcscpy(str, L"not_found"); hr = ITypeComp_Bind(typecomp, NULL, 0, 0, &typeinfo2, &desckind, &bindptr); - todo_wine ok(hr == E_INVALIDARG, "Bind returned: %08x\n", hr); hr = ITypeComp_Bind(typecomp, str, 0, 0, NULL, &desckind, &bindptr); - todo_wine ok(hr == E_INVALIDARG, "Bind returned: %08x\n", hr); hr = ITypeComp_Bind(typecomp, str, 0, 0, &typeinfo2, NULL, &bindptr); - todo_wine ok(hr == E_INVALIDARG, "Bind returned: %08x\n", hr); hr = ITypeComp_Bind(typecomp, str, 0, 0, &typeinfo2, &desckind, NULL); - todo_wine ok(hr == E_INVALIDARG, "Bind returned: %08x\n", hr); ITypeComp_Release(typecomp); diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 2e59051..0a4f681 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -932,9 +932,56 @@ static HRESULT WINAPI ScriptTypeComp_Bind(ITypeComp *iface, LPOLESTR szName, ULO ITypeInfo **ppTInfo, DESCKIND *pDescKind, BINDPTR *pBindPtr) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeComp(iface); - FIXME("(%p)->(%s %08x %d %p %p %p)\n", This, debugstr_w(szName), lHashVal, + UINT flags = wFlags ? wFlags : ~0; + ITypeInfo *disp_typeinfo; + ITypeComp *disp_typecomp; + HRESULT hr; + UINT i; + + TRACE("(%p)->(%s %08x %d %p %p %p)\n", This, debugstr_w(szName), lHashVal, wFlags, ppTInfo, pDescKind, pBindPtr); - return E_NOTIMPL; + + if (!szName || !ppTInfo || !pDescKind || !pBindPtr) + return E_INVALIDARG; + + for (i = 0; i < This->num_funcs; i++) + { + if (wcsicmp(szName, This->funcs[i].func->name)) continue; + if (!(flags & INVOKE_FUNC)) return TYPE_E_TYPEMISMATCH; + + hr = ITypeInfo_GetFuncDesc(&This->ITypeInfo_iface, i, &pBindPtr->lpfuncdesc); + if (FAILED(hr)) return hr; + + *pDescKind = DESCKIND_FUNCDESC; + *ppTInfo = &This->ITypeInfo_iface; + ITypeInfo_AddRef(*ppTInfo); + return S_OK; + } + + for (i = 0; i < This->num_vars; i++) + { + if (wcsicmp(szName, This->disp->global_vars[i]->name)) continue; + if (!(flags & INVOKE_PROPERTYGET)) return TYPE_E_TYPEMISMATCH; + + hr = ITypeInfo_GetVarDesc(&This->ITypeInfo_iface, i, &pBindPtr->lpvardesc); + if (FAILED(hr)) return hr; + + *pDescKind = DESCKIND_VARDESC; + *ppTInfo = &This->ITypeInfo_iface; + ITypeInfo_AddRef(*ppTInfo); + return S_OK; + } + + /* Look into the inherited IDispatch */ + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + hr = ITypeInfo_GetTypeComp(disp_typeinfo, &disp_typecomp); + if (FAILED(hr)) return hr; + + hr = ITypeComp_Bind(disp_typecomp, szName, lHashVal, wFlags, ppTInfo, pDescKind, pBindPtr); + ITypeComp_Release(disp_typecomp); + return hr; } static HRESULT WINAPI ScriptTypeComp_BindType(ITypeComp *iface, LPOLESTR szName, ULONG lHashVal, -- 2.21.0

2 19

[PATCH 3/3] d3d8: Support texture dirty regions.
by Henri Verbeet 10 Dec '19

10 Dec '19

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> This supersedes patch 175196. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/tests/visual.c | 12 ++++++------ dlls/d3d8/texture.c | 12 +++++++++++- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 4477184b573..ab194b9cedf 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5529,7 +5529,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ff0000, 1), + ok(color_match(color, 0x00ff0000, 1), "Expected color 0x00ff0000, got 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -5542,7 +5542,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ff0000, 1), + ok(color_match(color, 0x00ff0000, 1), "Expected color 0x00ff0000, got 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -5554,7 +5554,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ff0000, 1), + ok(color_match(color, 0x00ff0000, 1), "Expected color 0x00ff0000, got 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -5571,7 +5571,7 @@ static void add_dirty_rect_test(void) ok(color_match(color, 0x0000ff00, 1), "Expected color 0x0000ff00, got 0x%08x.\n", color); color = getPixelColor(device, 1, 1); - todo_wine ok(color_match(color, 0x00ff0000, 1), + ok(color_match(color, 0x00ff0000, 1), "Expected color 0x00ff0000, got 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -5593,7 +5593,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1), "Expected color 0x0000ff00, got 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -5605,7 +5605,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1), "Expected color 0x0000ff00, got 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index e34ae8a9c11..c82a75d87a4 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1124,6 +1124,9 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, if (!levels) levels = wined3d_log2i(max(width, height)) + 1; + if (pool == D3DPOOL_SYSTEMMEM) + flags |= WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS; + wined3d_mutex_lock(); hr = wined3d_texture_create(device->wined3d_device, &desc, 1, levels, flags, NULL, texture, &d3d8_texture_wined3d_parent_ops, &texture->wined3d_texture); @@ -1175,6 +1178,9 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic if (!levels) levels = wined3d_log2i(edge_length) + 1; + if (pool == D3DPOOL_SYSTEMMEM) + flags |= WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS; + wined3d_mutex_lock(); hr = wined3d_texture_create(device->wined3d_device, &desc, 6, levels, flags, NULL, texture, &d3d8_texture_wined3d_parent_ops, &texture->wined3d_texture); @@ -1195,6 +1201,7 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) { struct wined3d_resource_desc desc; + DWORD flags = 0; HRESULT hr; /* In d3d8, 3D textures can't be used as rendertarget or depth/stencil buffer. */ @@ -1228,8 +1235,11 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev if (!levels) levels = wined3d_log2i(max(max(width, height), depth)) + 1; + if (pool == D3DPOOL_SYSTEMMEM) + flags |= WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS; + wined3d_mutex_lock(); - hr = wined3d_texture_create(device->wined3d_device, &desc, 1, levels, 0, + hr = wined3d_texture_create(device->wined3d_device, &desc, 1, levels, flags, NULL, texture, &d3d8_texture_wined3d_parent_ops, &texture->wined3d_texture); wined3d_mutex_unlock(); if (FAILED(hr)) -- 2.11.0

1 0

[PATCH 2/3] wined3d: Update a part of the texture if dirty regions are tracked.
by Henri Verbeet 10 Dec '19

10 Dec '19

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Wine-Bugs: https://bugs.winehq.org/show_bug.cgi?id=35205 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 175195. dlls/d3d9/tests/visual.c | 12 ++++----- dlls/wined3d/device.c | 67 ++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 63 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0a9fb0acc29..c87337057ea 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19340,7 +19340,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ff0000, 1), + ok(color_match(color, 0x00ff0000, 1), "Expected color 0x00ff0000, got 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -19353,7 +19353,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ff0000, 1), + ok(color_match(color, 0x00ff0000, 1), "Expected color 0x00ff0000, got 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -19365,7 +19365,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ff0000, 1), + ok(color_match(color, 0x00ff0000, 1), "Expected color 0x00ff0000, got 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -19382,7 +19382,7 @@ static void add_dirty_rect_test(void) ok(color_match(color, 0x0000ff00, 1), "Expected color 0x0000ff00, got 0x%08x.\n", color); color = getPixelColor(device, 1, 1); - todo_wine ok(color_match(color, 0x00ff0000, 1), + ok(color_match(color, 0x00ff0000, 1), "Expected color 0x00ff0000, got 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -19404,7 +19404,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1), "Expected color 0x0000ff00, got 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -19416,7 +19416,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1), "Expected color 0x0000ff00, got 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dc92d4f4b74..89134207243 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4141,19 +4141,66 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, } } - if (!entire_texture) - FIXME("Ignoring dirty regions.\n"); - /* Update every surface level of the texture. */ - for (i = 0; i < level_count; ++i) + if (entire_texture) { - wined3d_texture_get_level_box(dst_texture, i, &box); - for (j = 0; j < layer_count; ++j) + for (i = 0; i < level_count; ++i) + { + wined3d_texture_get_level_box(dst_texture, i, &box); + for (j = 0; j < layer_count; ++j) + { + wined3d_cs_emit_blt_sub_resource(device->cs, + &dst_texture->resource, j * dst_level_count + i, &box, + &src_texture->resource, j * src_level_count + i + src_skip_levels, &box, + 0, NULL, WINED3D_TEXF_POINT); + } + } + } + else + { + unsigned int src_level, box_count, k; + const struct wined3d_box *boxes; + struct wined3d_box b; + + for (i = 0; i < layer_count; ++i) { - wined3d_cs_emit_blt_sub_resource(device->cs, - &dst_texture->resource, j * dst_level_count + i, &box, - &src_texture->resource, j * src_level_count + i + src_skip_levels, &box, - 0, NULL, WINED3D_TEXF_POINT); + boxes = regions[i].boxes; + box_count = regions[i].box_count; + if (regions[i].box_count >= WINED3D_MAX_DIRTY_REGION_COUNT) + { + boxes = &b; + box_count = 1; + wined3d_texture_get_level_box(dst_texture, i, &b); + } + + for (j = 0; j < level_count; ++j) + { + src_level = j + src_skip_levels; + + /* TODO: We could pass an array of boxes here to avoid + * multiple context acquisitions for the same resource. */ + for (k = 0; k < box_count; ++k) + { + box = boxes[k]; + if (src_level) + { + box.left >>= src_level; + box.top >>= src_level; + box.right = min((box.right + (1u << src_level) - 1) >> src_level, + wined3d_texture_get_level_width(src_texture, src_level)); + box.bottom = min((box.bottom + (1u << src_level) - 1) >> src_level, + wined3d_texture_get_level_height(src_texture, src_level)); + box.front >>= src_level; + box.back = min((box.back + (1u << src_level) - 1) >> src_level, + wined3d_texture_get_level_depth(src_texture, src_level)); + } + + wined3d_cs_emit_blt_sub_resource(device->cs, + &dst_texture->resource, i * dst_level_count + j, &box, + &src_texture->resource, i * src_level_count + src_level, &box, + 0, NULL, WINED3D_TEXF_POINT); + } + } } } -- 2.11.0

1 0

[PATCH 1/3] wined3d: Record dirty regions for d3d9 textures.
by Henri Verbeet 10 Dec '19

10 Dec '19

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patches 175193 and 175194. dlls/d3d9/texture.c | 9 ++++- dlls/wined3d/device.c | 19 ++++++++++ dlls/wined3d/texture.c | 78 ++++++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 10 ++++++ include/wine/wined3d.h | 1 + 5 files changed, 109 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index ae754b5fa2c..2ef27a6de3d 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1369,6 +1369,8 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, } if (!levels) levels = wined3d_log2i(max(width, height)) + 1; + if (pool == D3DPOOL_SYSTEMMEM) + flags |= WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS; wined3d_mutex_lock(); hr = wined3d_texture_create(device->wined3d_device, &desc, 1, levels, flags, @@ -1449,6 +1451,8 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic } if (!levels) levels = wined3d_log2i(edge_length) + 1; + if (pool == D3DPOOL_SYSTEMMEM) + flags |= WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS; wined3d_mutex_lock(); hr = wined3d_texture_create(device->wined3d_device, &desc, 6, levels, flags, @@ -1470,6 +1474,7 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) { struct wined3d_resource_desc desc; + DWORD flags = 0; HRESULT hr; if (pool == D3DPOOL_MANAGED && device->d3d_parent->extended) @@ -1513,9 +1518,11 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev } if (!levels) levels = wined3d_log2i(max(max(width, height), depth)) + 1; + if (pool == D3DPOOL_SYSTEMMEM) + flags |= WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS; wined3d_mutex_lock(); - hr = wined3d_texture_create(device->wined3d_device, &desc, 1, levels, 0, + hr = wined3d_texture_create(device->wined3d_device, &desc, 1, levels, flags, NULL, texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0ae841d4e35..dc92d4f4b74 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4059,8 +4059,10 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, { unsigned int src_size, dst_size, src_skip_levels = 0; unsigned int src_level_count, dst_level_count; + const struct wined3d_dirty_regions *regions; unsigned int layer_count, level_count, i, j; enum wined3d_resource_type type; + BOOL entire_texture = TRUE; struct wined3d_box box; TRACE("device %p, src_texture %p, dst_texture %p.\n", device, src_texture, dst_texture); @@ -4127,6 +4129,21 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } + if ((regions = src_texture->dirty_regions)) + { + for (i = 0; i < layer_count && entire_texture; ++i) + { + if (regions[i].box_count >= WINED3D_MAX_DIRTY_REGION_COUNT) + continue; + + entire_texture = FALSE; + break; + } + } + + if (!entire_texture) + FIXME("Ignoring dirty regions.\n"); + /* Update every surface level of the texture. */ for (i = 0; i < level_count; ++i) { @@ -4140,6 +4157,8 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, } } + wined3d_texture_clear_dirty_regions(src_texture); + return WINED3D_OK; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7c9c8298519..03372504bc6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -340,6 +340,21 @@ void wined3d_texture_invalidate_location(struct wined3d_texture *texture, sub_resource_idx, texture); } +void wined3d_texture_clear_dirty_regions(struct wined3d_texture *texture) +{ + unsigned int i; + + TRACE("texture %p\n", texture); + + if (!texture->dirty_regions) + return; + + for (i = 0; i < texture->layer_count; ++i) + { + texture->dirty_regions[i].box_count = 0; + } +} + static BOOL wined3d_texture_copy_sysmem_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { @@ -1114,6 +1129,15 @@ static void wined3d_texture_destroy_object(void *object) heap_free(texture->overlay_info); } + if (texture->dirty_regions) + { + for (i = 0; i < texture->layer_count; ++i) + { + heap_free(texture->dirty_regions[i].boxes); + } + heap_free(texture->dirty_regions); + } + resource->resource_ops->resource_unload(resource); } @@ -1770,6 +1794,37 @@ static struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(str return &texture->sub_resources[sub_resource_idx]; } +static void wined3d_texture_dirty_region_add(struct wined3d_texture *texture, + unsigned int layer, const struct wined3d_box *box) +{ + struct wined3d_dirty_regions *regions; + unsigned int count; + + if (!texture->dirty_regions) + return; + + regions = &texture->dirty_regions[layer]; + count = regions->box_count + 1; + if (count >= WINED3D_MAX_DIRTY_REGION_COUNT || !box + || (!box->left && !box->top && !box->front + && box->right == texture->resource.width + && box->bottom == texture->resource.height + && box->back == texture->resource.depth)) + { + regions->box_count = WINED3D_MAX_DIRTY_REGION_COUNT; + return; + } + + if (!wined3d_array_reserve((void **)&regions->boxes, &regions->boxes_size, count, sizeof(*regions->boxes))) + { + WARN("Failed to grow boxes array, marking entire texture dirty.\n"); + regions->box_count = WINED3D_MAX_DIRTY_REGION_COUNT; + return; + } + + regions->boxes[regions->box_count++] = *box; +} + HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region) { @@ -1781,16 +1836,13 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, return WINED3DERR_INVALIDCALL; } - if (dirty_region) + if (dirty_region && FAILED(wined3d_texture_check_box_dimensions(texture, 0, dirty_region))) { - if (FAILED(wined3d_texture_check_box_dimensions(texture, 0, dirty_region))) - { - WARN("Invalid dirty_region %s specified.\n", debug_box(dirty_region)); - return WINED3DERR_INVALIDCALL; - } - FIXME("Ignoring dirty_region %s.\n", debug_box(dirty_region)); + WARN("Invalid dirty_region %s specified.\n", debug_box(dirty_region)); + return WINED3DERR_INVALIDCALL; } + wined3d_texture_dirty_region_add(texture, layer, dirty_region); wined3d_cs_emit_add_dirty_texture_region(texture->resource.device->cs, texture, layer); return WINED3D_OK; @@ -3090,6 +3142,11 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour return E_OUTOFMEMORY; } + /* We only record dirty regions for the top-most level. */ + if (texture->dirty_regions && flags & WINED3D_MAP_WRITE + && !(flags & WINED3D_MAP_NO_DIRTY_UPDATE) && !texture_level) + wined3d_texture_dirty_region_add(texture, sub_resource_idx / texture->level_count, box); + if (flags & WINED3D_MAP_WRITE && (!(flags & WINED3D_MAP_NO_DIRTY_UPDATE) || (resource->usage & WINED3DUSAGE_DYNAMIC))) wined3d_texture_invalidate_location(texture, sub_resource_idx, ~resource->map_binding); @@ -3382,6 +3439,13 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_GENERATE_MIPMAPS; } + if (flags & WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS + && !(texture->dirty_regions = heap_calloc(texture->layer_count, sizeof(*texture->dirty_regions)))) + { + wined3d_texture_cleanup_sync(texture); + return E_OUTOFMEMORY; + } + /* Precalculated scaling for 'faked' non power of two texture coords. */ if (texture->resource.gl_type == WINED3D_GL_RES_TYPE_TEX_RECT) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8f9ad1ce856..60ddf74a0ec 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -74,6 +74,8 @@ #define WINED3D_QUIRK_BROKEN_ARB_FOG 0x00000200 #define WINED3D_QUIRK_NO_INDEPENDENT_BIT_DEPTHS 0x00000400 +#define WINED3D_MAX_DIRTY_REGION_COUNT 7 + struct wined3d_fragment_pipe_ops; struct wined3d_adapter; struct wined3d_context; @@ -3538,6 +3540,13 @@ struct wined3d_texture DWORD color_key_flags; } async; + struct wined3d_dirty_regions + { + struct wined3d_box *boxes; + SIZE_T boxes_size; + unsigned int box_count; + } *dirty_regions; + struct wined3d_overlay_info { struct list entry; @@ -3666,6 +3675,7 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) DECLSPEC_HIDDEN; void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; +void wined3d_texture_clear_dirty_regions(struct wined3d_texture *texture) DECLSPEC_HIDDEN; HRESULT wined3d_texture_no3d_init(struct wined3d_texture *texture_no3d, struct wined3d_device *device, const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4b5d4e02f9b..db88e110327 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1565,6 +1565,7 @@ enum wined3d_shader_type #define WINED3D_TEXTURE_CREATE_GET_DC_LENIENT 0x00000004 #define WINED3D_TEXTURE_CREATE_GET_DC 0x00000008 #define WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS 0x00000010 +#define WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS 0x00000020 #define WINED3D_STANDARD_MULTISAMPLE_PATTERN 0xffffffff -- 2.11.0

1 0

[PATCH v4 1/5] strmbase: Combine the SetMediaType() and CompleteConnect() callbacks.
by Zebediah Figura 10 Dec '19

10 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/acmwrapper.c | 115 +++++++----------------- dlls/quartz/avidec.c | 37 ++------ dlls/strmbase/transform.c | 7 +- dlls/winegstreamer/gsttffilter.c | 146 +++++++++++-------------------- dlls/wineqtdecoder/qtvdecoder.c | 25 ++---- include/wine/strmbase.h | 5 +- 6 files changed, 103 insertions(+), 232 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 8eea6ab147..33d9debe5c 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -40,7 +40,6 @@ typedef struct ACMWrapperImpl TransformFilter tf; HACMSTREAM has; - LPWAVEFORMATEX pWfIn; LPWAVEFORMATEX pWfOut; LONGLONG lasttime_real; @@ -224,85 +223,43 @@ error: return hr; } -static HRESULT WINAPI ACMWrapper_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE * pmt) +static BOOL is_audio_subtype(const GUID *guid) { - ACMWrapperImpl* This = impl_from_TransformFilter(tf); - MMRESULT res; - - TRACE("(%p)->(%i %p)\n", This, dir, pmt); - - if (dir != PINDIR_INPUT) - return S_OK; - - /* Check root (GUID w/o FOURCC) */ - if ((IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio)) && - (!memcmp(((const char *)&pmt->subtype)+4, ((const char *)&MEDIATYPE_Audio)+4, sizeof(GUID)-4)) && - (IsEqualIID(&pmt->formattype, &FORMAT_WaveFormatEx))) - { - HACMSTREAM drv; - WAVEFORMATEX *wfx = (WAVEFORMATEX*)pmt->pbFormat; - AM_MEDIA_TYPE* outpmt = &This->tf.pmt; - - if (!wfx || wfx->wFormatTag == WAVE_FORMAT_PCM || wfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) - return VFW_E_TYPE_NOT_ACCEPTED; - FreeMediaType(outpmt); - - This->pWfIn = (LPWAVEFORMATEX)pmt->pbFormat; - - /* HACK */ - /* TRACE("ALIGN = %d\n", pACMWrapper->pWfIn->nBlockAlign); */ - /* pACMWrapper->pWfIn->nBlockAlign = 1; */ - - /* Set output audio data to PCM */ - CopyMediaType(outpmt, pmt); - outpmt->subtype.Data1 = WAVE_FORMAT_PCM; - This->pWfOut = (WAVEFORMATEX*)outpmt->pbFormat; - This->pWfOut->wFormatTag = WAVE_FORMAT_PCM; - This->pWfOut->wBitsPerSample = 16; - This->pWfOut->nBlockAlign = This->pWfOut->wBitsPerSample * This->pWfOut->nChannels / 8; - This->pWfOut->cbSize = 0; - This->pWfOut->nAvgBytesPerSec = This->pWfOut->nChannels * This->pWfOut->nSamplesPerSec - * (This->pWfOut->wBitsPerSample/8); - - if (!(res = acmStreamOpen(&drv, NULL, This->pWfIn, This->pWfOut, NULL, 0, 0, 0))) - { - This->has = drv; - - TRACE("Connection accepted\n"); - return S_OK; - } - else - FIXME("acmStreamOpen returned %d\n", res); - FreeMediaType(outpmt); - TRACE("Unable to find a suitable ACM decompressor\n"); - } - - TRACE("Connection refused\n"); - return VFW_E_TYPE_NOT_ACCEPTED; + return !memcmp(&guid->Data2, &MEDIATYPE_Audio.Data2, sizeof(GUID) - sizeof(int)); } -static HRESULT WINAPI ACMWrapper_CompleteConnect(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) +static HRESULT acm_wrapper_connect_sink(TransformFilter *iface, const AM_MEDIA_TYPE *mt) { - ACMWrapperImpl* This = impl_from_TransformFilter(tf); - MMRESULT res; + ACMWrapperImpl *filter = impl_from_TransformFilter(iface); + const WAVEFORMATEX *wfx = (WAVEFORMATEX *)mt->pbFormat; HACMSTREAM drv; + MMRESULT res; - TRACE("(%p)\n", This); - - if (dir != PINDIR_INPUT) - return S_OK; - - if (!(res = acmStreamOpen(&drv, NULL, This->pWfIn, This->pWfOut, NULL, 0, 0, 0))) + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio) || !is_audio_subtype(&mt->subtype) + || !IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx) || !wfx + || wfx->wFormatTag == WAVE_FORMAT_PCM || wfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + return VFW_E_TYPE_NOT_ACCEPTED; + + CopyMediaType(&filter->tf.pmt, mt); + filter->tf.pmt.subtype.Data1 = WAVE_FORMAT_PCM; + filter->pWfOut = (WAVEFORMATEX *)filter->tf.pmt.pbFormat; + filter->pWfOut->wFormatTag = WAVE_FORMAT_PCM; + filter->pWfOut->wBitsPerSample = 16; + filter->pWfOut->nBlockAlign = filter->pWfOut->wBitsPerSample * filter->pWfOut->nChannels / 8; + filter->pWfOut->cbSize = 0; + filter->pWfOut->nAvgBytesPerSec = filter->pWfOut->nChannels * filter->pWfOut->nSamplesPerSec + * (filter->pWfOut->wBitsPerSample / 8); + + if ((res = acmStreamOpen(&drv, NULL, (WAVEFORMATEX *)wfx, filter->pWfOut, NULL, 0, 0, 0))) { - This->has = drv; - - TRACE("Connection accepted\n"); - return S_OK; + ERR("Failed to open stream, error %u.\n", res); + FreeMediaType(&filter->tf.pmt); + return VFW_E_TYPE_NOT_ACCEPTED; } - FIXME("acmStreamOpen returned %d\n", res); - TRACE("Unable to find a suitable ACM decompressor\n"); - return VFW_E_TYPE_NOT_ACCEPTED; + filter->has = drv; + + return S_OK; } static HRESULT WINAPI ACMWrapper_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir) @@ -341,18 +298,10 @@ static HRESULT WINAPI ACMWrapper_DecideBufferSize(TransformFilter *tf, IMemAlloc } static const TransformFilterFuncTable ACMWrapper_FuncsTable = { - ACMWrapper_DecideBufferSize, - NULL, - ACMWrapper_Receive, - NULL, - NULL, - ACMWrapper_SetMediaType, - ACMWrapper_CompleteConnect, - ACMWrapper_BreakConnect, - NULL, - NULL, - NULL, - NULL + .pfnDecideBufferSize = ACMWrapper_DecideBufferSize, + .pfnReceive = ACMWrapper_Receive, + .transform_connect_sink = acm_wrapper_connect_sink, + .pfnBreakConnect = ACMWrapper_BreakConnect, }; HRESULT ACMWrapper_create(IUnknown *outer, void **out) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 32969a3473..abed957fa6 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -210,16 +210,11 @@ static HRESULT WINAPI AVIDec_StopStreaming(TransformFilter* pTransformFilter) return S_OK; } -static HRESULT WINAPI AVIDec_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE * pmt) +static HRESULT avi_dec_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *pmt) { AVIDecImpl* This = impl_from_TransformFilter(tf); HRESULT hr = VFW_E_TYPE_NOT_ACCEPTED; - TRACE("(%p)->(%p)\n", This, pmt); - - if (dir != PINDIR_INPUT) - return S_OK; - /* Check root (GUID w/o FOURCC) */ if ((IsEqualIID(&pmt->majortype, &MEDIATYPE_Video)) && (!memcmp(((const char *)&pmt->subtype)+4, ((const char *)&MEDIATYPE_Video)+4, sizeof(GUID)-4))) @@ -310,15 +305,6 @@ failed: return hr; } -static HRESULT WINAPI AVIDec_CompleteConnect(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) -{ - AVIDecImpl* This = impl_from_TransformFilter(tf); - - TRACE("(%p)\n", This); - - return S_OK; -} - static HRESULT WINAPI AVIDec_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir) { AVIDecImpl *This = impl_from_TransformFilter(tf); @@ -357,19 +343,14 @@ static HRESULT WINAPI AVIDec_DecideBufferSize(TransformFilter *tf, IMemAllocator } static const TransformFilterFuncTable AVIDec_FuncsTable = { - AVIDec_DecideBufferSize, - AVIDec_StartStreaming, - AVIDec_Receive, - AVIDec_StopStreaming, - NULL, - AVIDec_SetMediaType, - AVIDec_CompleteConnect, - AVIDec_BreakConnect, - NULL, - NULL, - AVIDec_EndFlush, - NULL, - AVIDec_NotifyDrop + .pfnDecideBufferSize = AVIDec_DecideBufferSize, + .pfnStartStreaming = AVIDec_StartStreaming, + .pfnReceive = AVIDec_Receive, + .pfnStopStreaming = AVIDec_StopStreaming, + .transform_connect_sink = avi_dec_connect_sink, + .pfnBreakConnect = AVIDec_BreakConnect, + .pfnEndFlush = AVIDec_EndFlush, + .pfnNotify = AVIDec_NotifyDrop, }; HRESULT AVIDec_create(IUnknown *outer, void **out) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 7a79f70905..30ed0006cb 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -405,11 +405,8 @@ static HRESULT WINAPI TransformFilter_InputPin_ReceiveConnection(IPin * iface, I TRACE("(%p)->(%p, %p)\n", iface, pReceivePin, pmt); strmbase_dump_media_type(pmt); - if (pTransform->pFuncsTable->pfnSetMediaType) - hr = pTransform->pFuncsTable->pfnSetMediaType(pTransform, PINDIR_INPUT, pmt); - - if (SUCCEEDED(hr) && pTransform->pFuncsTable->pfnCompleteConnect) - hr = pTransform->pFuncsTable->pfnCompleteConnect(pTransform, PINDIR_INPUT, pReceivePin); + if (pTransform->pFuncsTable->transform_connect_sink) + hr = pTransform->pFuncsTable->transform_connect_sink(pTransform, pmt); if (SUCCEEDED(hr)) { diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index ee1851dfdc..d44a6ae33a 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -516,7 +516,7 @@ static HRESULT WINAPI Gstreamer_Mp3_QueryConnect(TransformFilter *iface, const A return S_OK; } -static HRESULT WINAPI Gstreamer_Mp3_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT mp3_decoder_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -525,13 +525,8 @@ static HRESULT WINAPI Gstreamer_Mp3_SetMediaType(TransformFilter *tf, PIN_DIRECT HRESULT hr; int layer; - TRACE("%p 0x%x %p\n", This, dir, amt); - mark_wine_thread(); - if (dir != PINDIR_INPUT) - return S_OK; - if (Gstreamer_Mp3_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) return VFW_E_TYPE_NOT_ACCEPTED; @@ -588,26 +583,19 @@ static HRESULT WINAPI Gstreamer_Mp3_SetMediaType(TransformFilter *tf, PIN_DIRECT return hr; } -static HRESULT WINAPI Gstreamer_Mp3_ConnectInput(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) -{ - TRACE("%p 0x%x %p\n", tf, dir, pin); - return S_OK; -} - static const TransformFilterFuncTable Gstreamer_Mp3_vtbl = { - Gstreamer_transform_DecideBufferSize, - Gstreamer_transform_ProcessBegin, - Gstreamer_transform_ProcessData, - Gstreamer_transform_ProcessEnd, - Gstreamer_Mp3_QueryConnect, - Gstreamer_Mp3_SetMediaType, - Gstreamer_Mp3_ConnectInput, - Gstreamer_transform_Cleanup, - Gstreamer_transform_EndOfStream, - Gstreamer_transform_BeginFlush, - Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment, - Gstreamer_transform_QOS + .pfnDecideBufferSize = Gstreamer_transform_DecideBufferSize, + .pfnStartStreaming = Gstreamer_transform_ProcessBegin, + .pfnReceive = Gstreamer_transform_ProcessData, + .pfnStopStreaming = Gstreamer_transform_ProcessEnd, + .pfnCheckInputType = Gstreamer_Mp3_QueryConnect, + .transform_connect_sink = mp3_decoder_connect_sink, + .pfnBreakConnect = Gstreamer_transform_Cleanup, + .pfnEndOfStream = Gstreamer_transform_EndOfStream, + .pfnBeginFlush = Gstreamer_transform_BeginFlush, + .pfnEndFlush = Gstreamer_transform_EndFlush, + .pfnNewSegment = Gstreamer_transform_NewSegment, + .pfnNotify = Gstreamer_transform_QOS, }; IUnknown * CALLBACK Gstreamer_Mp3_create(IUnknown *punkouter, HRESULT *phr) @@ -664,13 +652,7 @@ static HRESULT WINAPI Gstreamer_YUV_QueryConnect(TransformFilter *iface, const A } } -static HRESULT WINAPI Gstreamer_YUV_ConnectInput(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) -{ - TRACE("%p 0x%x %p\n", tf, dir, pin); - return S_OK; -} - -static HRESULT WINAPI Gstreamer_YUV2RGB_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT yuv_to_rgb_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -679,13 +661,8 @@ static HRESULT WINAPI Gstreamer_YUV2RGB_SetMediaType(TransformFilter *tf, PIN_DI int avgtime; LONG width, height; - TRACE("%p 0x%x %p\n", This, dir, amt); - mark_wine_thread(); - if (dir != PINDIR_INPUT) - return S_OK; - if (Gstreamer_YUV_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) return E_FAIL; @@ -738,19 +715,18 @@ static HRESULT WINAPI Gstreamer_YUV2RGB_SetMediaType(TransformFilter *tf, PIN_DI } static const TransformFilterFuncTable Gstreamer_YUV2RGB_vtbl = { - Gstreamer_transform_DecideBufferSize, - Gstreamer_transform_ProcessBegin, - Gstreamer_transform_ProcessData, - Gstreamer_transform_ProcessEnd, - Gstreamer_YUV_QueryConnect, - Gstreamer_YUV2RGB_SetMediaType, - Gstreamer_YUV_ConnectInput, - Gstreamer_transform_Cleanup, - Gstreamer_transform_EndOfStream, - Gstreamer_transform_BeginFlush, - Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment, - Gstreamer_transform_QOS + .pfnDecideBufferSize = Gstreamer_transform_DecideBufferSize, + .pfnStartStreaming = Gstreamer_transform_ProcessBegin, + .pfnReceive = Gstreamer_transform_ProcessData, + .pfnStopStreaming = Gstreamer_transform_ProcessEnd, + .pfnCheckInputType = Gstreamer_YUV_QueryConnect, + .transform_connect_sink = yuv_to_rgb_connect_sink, + .pfnBreakConnect = Gstreamer_transform_Cleanup, + .pfnEndOfStream = Gstreamer_transform_EndOfStream, + .pfnBeginFlush = Gstreamer_transform_BeginFlush, + .pfnEndFlush = Gstreamer_transform_EndFlush, + .pfnNewSegment = Gstreamer_transform_NewSegment, + .pfnNotify = Gstreamer_transform_QOS, }; IUnknown * CALLBACK Gstreamer_YUV2RGB_create(IUnknown *punkouter, HRESULT *phr) @@ -772,7 +748,7 @@ IUnknown * CALLBACK Gstreamer_YUV2RGB_create(IUnknown *punkouter, HRESULT *phr) return obj; } -static HRESULT WINAPI Gstreamer_YUV2ARGB_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT yuv_to_argb_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -781,13 +757,8 @@ static HRESULT WINAPI Gstreamer_YUV2ARGB_SetMediaType(TransformFilter *tf, PIN_D int avgtime; LONG width, height; - TRACE("%p 0x%x %p\n", This, dir, amt); - mark_wine_thread(); - if (dir != PINDIR_INPUT) - return S_OK; - if (Gstreamer_YUV_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) return E_FAIL; @@ -840,19 +811,18 @@ static HRESULT WINAPI Gstreamer_YUV2ARGB_SetMediaType(TransformFilter *tf, PIN_D } static const TransformFilterFuncTable Gstreamer_YUV2ARGB_vtbl = { - Gstreamer_transform_DecideBufferSize, - Gstreamer_transform_ProcessBegin, - Gstreamer_transform_ProcessData, - Gstreamer_transform_ProcessEnd, - Gstreamer_YUV_QueryConnect, - Gstreamer_YUV2ARGB_SetMediaType, - Gstreamer_YUV_ConnectInput, - Gstreamer_transform_Cleanup, - Gstreamer_transform_EndOfStream, - Gstreamer_transform_BeginFlush, - Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment, - Gstreamer_transform_QOS + .pfnDecideBufferSize = Gstreamer_transform_DecideBufferSize, + .pfnStartStreaming = Gstreamer_transform_ProcessBegin, + .pfnReceive = Gstreamer_transform_ProcessData, + .pfnStopStreaming = Gstreamer_transform_ProcessEnd, + .pfnCheckInputType = Gstreamer_YUV_QueryConnect, + .transform_connect_sink = yuv_to_argb_connect_sink, + .pfnBreakConnect = Gstreamer_transform_Cleanup, + .pfnEndOfStream = Gstreamer_transform_EndOfStream, + .pfnBeginFlush = Gstreamer_transform_BeginFlush, + .pfnEndFlush = Gstreamer_transform_EndFlush, + .pfnNewSegment = Gstreamer_transform_NewSegment, + .pfnNotify = Gstreamer_transform_QOS, }; IUnknown * CALLBACK Gstreamer_YUV2ARGB_create(IUnknown *punkouter, HRESULT *phr) @@ -886,13 +856,7 @@ static HRESULT WINAPI Gstreamer_AudioConvert_QueryConnect(TransformFilter *iface return S_OK; } -static HRESULT WINAPI Gstreamer_AudioConvert_ConnectInput(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) -{ - TRACE("%p 0x%x %p\n", tf, dir, pin); - return S_OK; -} - -static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT audio_converter_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -905,13 +869,8 @@ static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, P BOOL inisfloat = FALSE; int indepth; - TRACE("%p 0x%x %p\n", This, dir, amt); - mark_wine_thread(); - if (dir != PINDIR_INPUT) - return S_OK; - if (Gstreamer_AudioConvert_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) return E_FAIL; @@ -972,19 +931,18 @@ static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, P } static const TransformFilterFuncTable Gstreamer_AudioConvert_vtbl = { - Gstreamer_transform_DecideBufferSize, - Gstreamer_transform_ProcessBegin, - Gstreamer_transform_ProcessData, - Gstreamer_transform_ProcessEnd, - Gstreamer_AudioConvert_QueryConnect, - Gstreamer_AudioConvert_SetMediaType, - Gstreamer_AudioConvert_ConnectInput, - Gstreamer_transform_Cleanup, - Gstreamer_transform_EndOfStream, - Gstreamer_transform_BeginFlush, - Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment, - Gstreamer_transform_QOS + .pfnDecideBufferSize = Gstreamer_transform_DecideBufferSize, + .pfnStartStreaming = Gstreamer_transform_ProcessBegin, + .pfnReceive = Gstreamer_transform_ProcessData, + .pfnStopStreaming = Gstreamer_transform_ProcessEnd, + .pfnCheckInputType = Gstreamer_AudioConvert_QueryConnect, + .transform_connect_sink = audio_converter_connect_sink, + .pfnBreakConnect = Gstreamer_transform_Cleanup, + .pfnEndOfStream = Gstreamer_transform_EndOfStream, + .pfnBeginFlush = Gstreamer_transform_BeginFlush, + .pfnEndFlush = Gstreamer_transform_EndFlush, + .pfnNewSegment = Gstreamer_transform_NewSegment, + .pfnNotify = Gstreamer_transform_QOS, }; IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *punkouter, HRESULT *phr) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 3da0738aec..4be654e5a1 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -336,7 +336,7 @@ static HRESULT WINAPI QTVDecoder_StopStreaming(TransformFilter* pTransformFilter return S_OK; } -static HRESULT WINAPI QTVDecoder_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE * pmt) +static HRESULT video_decoder_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *pmt) { QTVDecoderImpl* This = impl_from_TransformFilter(tf); HRESULT hr = VFW_E_TYPE_NOT_ACCEPTED; @@ -344,11 +344,6 @@ static HRESULT WINAPI QTVDecoder_SetMediaType(TransformFilter *tf, PIN_DIRECTION AM_MEDIA_TYPE *outpmt = &This->tf.pmt; CFNumberRef n = NULL; - TRACE("(%p)->(%p)\n", This, pmt); - - if (dir != PINDIR_INPUT) - return S_OK; - FreeMediaType(outpmt); CopyMediaType(outpmt, pmt); @@ -502,18 +497,12 @@ static HRESULT WINAPI QTVDecoder_DecideBufferSize(TransformFilter *tf, IMemAlloc } static const TransformFilterFuncTable QTVDecoder_FuncsTable = { - QTVDecoder_DecideBufferSize, - QTVDecoder_StartStreaming, - QTVDecoder_Receive, - QTVDecoder_StopStreaming, - NULL, - QTVDecoder_SetMediaType, - NULL, - QTVDecoder_BreakConnect, - NULL, - NULL, - NULL, - NULL + .pfnDecideBufferSize = QTVDecoder_DecideBufferSize, + .pfnStartStreaming = QTVDecoder_StartStreaming, + .pfnReceive = QTVDecoder_Receive, + .pfnStopStreaming = QTVDecoder_StopStreaming, + .transform_connect_sink = video_decoder_connect_sink, + .pfnBreakConnect = QTVDecoder_BreakConnect, }; IUnknown * CALLBACK QTVDecoder_create(IUnknown *outer, HRESULT* phr) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index c3699f1925..7e3b38b49d 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -197,9 +197,7 @@ typedef HRESULT (WINAPI *TransformFilter_DecideBufferSize) (TransformFilter *ifa typedef HRESULT (WINAPI *TransformFilter_StartStreaming) (TransformFilter *iface); typedef HRESULT (WINAPI *TransformFilter_StopStreaming) (TransformFilter *iface); typedef HRESULT (WINAPI *TransformFilter_Receive) (TransformFilter* iface, IMediaSample* pIn); -typedef HRESULT (WINAPI *TransformFilter_CompleteConnect) (TransformFilter *iface, PIN_DIRECTION dir, IPin *pPin); typedef HRESULT (WINAPI *TransformFilter_BreakConnect) (TransformFilter *iface, PIN_DIRECTION dir); -typedef HRESULT (WINAPI *TransformFilter_SetMediaType) (TransformFilter *iface, PIN_DIRECTION dir, const AM_MEDIA_TYPE *pMediaType); typedef HRESULT (WINAPI *TransformFilter_CheckInputType) (TransformFilter *iface, const AM_MEDIA_TYPE *pMediaType); typedef HRESULT (WINAPI *TransformFilter_EndOfStream) (TransformFilter *iface); typedef HRESULT (WINAPI *TransformFilter_BeginFlush) (TransformFilter *iface); @@ -216,8 +214,7 @@ typedef struct TransformFilterFuncTable { TransformFilter_Receive pfnReceive; TransformFilter_StopStreaming pfnStopStreaming; TransformFilter_CheckInputType pfnCheckInputType; - TransformFilter_SetMediaType pfnSetMediaType; - TransformFilter_CompleteConnect pfnCompleteConnect; + HRESULT (*transform_connect_sink)(TransformFilter *filter, const AM_MEDIA_TYPE *mt); TransformFilter_BreakConnect pfnBreakConnect; TransformFilter_EndOfStream pfnEndOfStream; TransformFilter_BeginFlush pfnBeginFlush; -- 2.24.0

1 4

[PATCH] vbscript: Remove unused field.
by Gabriel Ivăncescu 10 Dec '19

10 Dec '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/compile.c | 3 --- dlls/vbscript/vbscript.h | 1 - 2 files changed, 4 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index d8ae0fc..c76ba73 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1980,9 +1980,6 @@ HRESULT compile_procedure(script_ctx_t *script, const WCHAR *src, const WCHAR *d desc->func_cnt = 1; desc->funcs->entries[VBDISP_CALLGET] = &code->main_code; - desc->next = script->script_obj->procs; - script->script_obj->procs = desc; - *ret = desc; return S_OK; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index d79be9e..19431e2 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -141,7 +141,6 @@ typedef struct { size_t global_funcs_size; class_desc_t *classes; - class_desc_t *procs; script_ctx_t *ctx; heap_pool_t heap; -- 2.21.0

2 1

[PATCH] jscript: Fix the spelling of a couple of comments.
by Francois Gouget 10 Dec '19

10 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/jscript/jsutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index a36c9c1e5b9..af465300e72 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -672,13 +672,13 @@ static INT32 double_to_int32(double number) * after rounding; if the exponent is > 83 then no bits of precision can be * left in the low 32-bit range of the result (IEEE-754 doubles have 52 bits * of fractional precision). - * Note this case handles 0, -0, and all infinte, NaN, & denormal value. */ + * Note this case handles 0, -0, and all infinite, NaN & denormal values. */ if(exp < 0 || exp > 83) return 0; /* Select the appropriate 32-bits from the floating point mantissa. If the * exponent is 52 then the bits we need to select are already aligned to the - * lowest bits of the 64-bit integer representation of tghe number, no need + * lowest bits of the 64-bit integer representation of the number, no need * to shift. If the exponent is greater than 52 we need to shift the value * left by (exp - 52), if the value is less than 52 we need to shift right * accordingly. */ -- 2.20.1

2 1

[PATCH 3/3] chcp: Set the global codepage when called with an argument.
by Erich E. Hoover 10 Dec '19

10 Dec '19

MSDN does not seem to explicitly say anywhere what happens when setting the "active" code page, but several other sources online state that it sets both the input and output console code page (whereas graftabl sets just the output console code page). This patch adds that functionality so that applications that expect to be able to change the "active" console code page can do so. Best, Erich

1 0

[PATCH 2/3] chcp: Return the active code page when called without arguments.
by Erich E. Hoover 10 Dec '19

10 Dec '19

After doing some sleuthing on MSDN, chcp treats the input console code page as the "active" code page (GetConsoleCP instead of GetACP). This will appease applications that expect chcp to return the "active" console code page. Best, Erich

1 0

[PATCH v3 1/3] chcp: Add a stub application for changing the codepage.
by Erich E. Hoover 10 Dec '19

10 Dec '19

v3: Fix makefile mistake in v2 v2: The executable is called chcp.com even though it's a PE file (thanks Zeb!) Anaconda expects to be able to call chcp to get/set the console codepage. Adding a stub application is sufficient to appease it. Best, Erich

1 0

[PATCH] mshtml: Update to Wine Gecko 2.47.1.
by Jacek Caban 10 Dec '19

10 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The new release is more of a refreshment, bringing compatibility with modern build environments. The biggest change is build system port to python3 by Vincent. This involved changes across the whole build system, thanks Vincent! It's packaged slightly differently. There are archives that contain Wine Gecko build. It may be used for system-wide installations. Users may just unpack the package into /usr/share/wine/gecko/, /opt/wine/gecko, etc. and it should work without in-prefix installation as long as it has a valid dos drive (we should be able to support non-mapped locations in the future as well, but it needs Gecko fixes first). It's just like Wine Mono does it for a while. The release also brings improved compatibility with IE clipboard format. Executable files are marked as nxcompat. It also contains a number of portability fixes for recent GCC versions. It should work with both winpthread and non-winpthread toolchains now. I hoped to include a few more changes in this release, but I don't think it's worth delaying it any more. dlls/appwiz.cpl/addons.c | 8 ++++---- dlls/mshtml/nsiface.idl | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)

2 1

Re: [PATCH] mshtml: Update to Wine Gecko 2.47.1.
by Marvin 10 Dec '19

10 Dec '19

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=61793 Your paranoid android. === debian10 (32 bit report) === mshtml: activex: Timeout dom: Timeout events: Timeout htmldoc: Timeout htmllocation: Timeout === debian10 (build log) === Task errors: The task timed out === debian10 (32 bit WoW report) === mshtml: activex: Timeout dom: Timeout events: Timeout htmldoc: Timeout htmllocation: Timeout === debian10 (build log) === Task errors: The task timed out

1 0

[PATCH 1/4] oleaut32/typelib: Get rid of redundant argument in typeinfo lookup helper.
by Nikolay Sivov 10 Dec '19

10 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 668ad8d582..f490795cc7 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1724,15 +1724,16 @@ static inline TLBCustData *TLB_get_custdata_by_guid(struct list *custdata_list, return NULL; } -static inline ITypeInfoImpl *TLB_get_typeinfo_by_name(ITypeInfoImpl **typeinfos, - UINT n, const OLECHAR *name) +static inline ITypeInfoImpl *TLB_get_typeinfo_by_name(ITypeLibImpl *typelib, const OLECHAR *name) { - while(n){ - if(!lstrcmpiW(TLB_get_bstr((*typeinfos)->Name), name)) - return *typeinfos; - ++typeinfos; - --n; + int i; + + for (i = 0; i < typelib->TypeInfoCount; ++i) + { + if (!lstrcmpiW(TLB_get_bstr(typelib->typeinfos[i]->Name), name)) + return typelib->typeinfos[i]; } + return NULL; } @@ -5507,7 +5508,7 @@ static HRESULT WINAPI ITypeLibComp_fnBindType( if(!szName || !ppTInfo || !ppTComp) return E_INVALIDARG; - info = TLB_get_typeinfo_by_name(This->typeinfos, This->TypeInfoCount, szName); + info = TLB_get_typeinfo_by_name(This, szName); if(!info){ *ppTInfo = NULL; *ppTComp = NULL; @@ -9007,7 +9008,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo(ICreateTypeLib2 *iface, if (!ctinfo || !name) return E_INVALIDARG; - info = TLB_get_typeinfo_by_name(This->typeinfos, This->TypeInfoCount, name); + info = TLB_get_typeinfo_by_name(This, name); if (info) return TYPE_E_NAMECONFLICT; -- 2.24.0

1 3

[PATCH] ieframe: implement COM aggregation in WebBrowser
by Jacek Caban 10 Dec '19

10 Dec '19

From: Damjan Jovanovic <damjan.jov(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12406 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ieframe/classinfo.c | 6 +-- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/oleobject.c | 30 ++++++------- dlls/ieframe/persist.c | 18 ++++---- dlls/ieframe/tests/webbrowser.c | 60 +++++++++++++++++++++++++ dlls/ieframe/view.c | 12 ++--- dlls/ieframe/webbrowser.c | 78 ++++++++++++++++++++++++--------- 7 files changed, 151 insertions(+), 54 deletions(-)

1 0

[PATCH 5/5] msado15: Implement _Stream_ReadText and _Stream_WriteText.
by Hans Leidekker 10 Dec '19

10 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/stream.c | 58 +++++++++++++++++++++++++++++++++--- dlls/msado15/tests/msado15.c | 51 +++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index e2e404a620..52f35afe3c 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -400,14 +400,64 @@ static HRESULT WINAPI stream_LoadFromFile( _Stream *iface, BSTR filename ) static HRESULT WINAPI stream_ReadText( _Stream *iface, LONG len, BSTR *ret ) { - FIXME( "%p, %d, %p\n", iface, len, ret ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + BSTR str; + + TRACE( "%p, %d, %p\n", stream, len, ret ); + if (len == adReadLine) + { + FIXME( "adReadLine not supported\n" ); + return E_NOTIMPL; + } + if (stream->charset && wcscmp( stream->charset, L"Unicode" )) + { + FIXME( "charset %s not supported\n", debugstr_w(stream->charset) ); + return E_NOTIMPL; + } + + if (stream->type != adTypeText) return MAKE_ADO_HRESULT( adErrIllegalOperation ); + if (len < adReadLine) return MAKE_ADO_HRESULT( adErrInvalidArgument ); + + if (len == adReadAll) len = (stream->size - stream->pos) / sizeof(WCHAR); + else len = min( len, stream->size - stream->pos / sizeof(WCHAR) ); + + if (!(str = SysAllocStringLen( NULL, len ))) return E_OUTOFMEMORY; + memcpy( str, stream->buf + stream->pos, len * sizeof(WCHAR) ); + str[len] = 0; + + stream->pos += len * sizeof(WCHAR); + + *ret = str; + return S_OK; } static HRESULT WINAPI stream_WriteText( _Stream *iface, BSTR data, StreamWriteEnum options ) { - FIXME( "%p, %s, %u\n", iface, debugstr_w(data), options ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + HRESULT hr; + LONG size; + + TRACE( "%p, %s, %u\n", stream, debugstr_w(data), options ); + if (options != adWriteChar) + { + FIXME( "options %u not supported\n", options ); + return E_NOTIMPL; + } + if (stream->charset && wcscmp( stream->charset, L"Unicode" )) + { + FIXME( "charset %s not supported\n", debugstr_w(stream->charset) ); + return E_NOTIMPL; + } + + if (stream->type != adTypeText) return MAKE_ADO_HRESULT( adErrIllegalOperation ); + + size = (lstrlenW( data ) + 1) * sizeof(WCHAR); + if ((hr = resize_buffer( stream, stream->size + size )) != S_OK) return hr; + + memcpy( stream->buf + stream->pos, data, size ); + stream->pos += size; + + return S_OK; } static HRESULT WINAPI stream_Cancel( _Stream *iface ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 2c75904837..079da0a103 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -162,11 +162,54 @@ static void test_Stream(void) hr = _Stream_Read( stream, 2, &val ); ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); + hr = _Stream_ReadText( stream, 2, &str ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !str[0], "got %s\n", wine_dbgstr_w(str) ); + SysFreeString( str ); + pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); ok( !pos, "got %d\n", pos ); + str = SysAllocString( L"test" ); + hr = _Stream_WriteText( stream, str, adWriteChar ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( str ); + + hr = _Stream_ReadText( stream, adReadAll, &str ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !str[0], "got %s\n", wine_dbgstr_w(str) ); + SysFreeString( str ); + + hr = _Stream_put_Position( stream, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_ReadText( stream, adReadAll, &str ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( str, L"test" ), "got %s\n", wine_dbgstr_w(str) ); + SysFreeString( str ); + + pos = -1; + hr = _Stream_get_Position( stream, &pos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos == 10, "got %d\n", pos ); + + eos = VARIANT_FALSE; + hr = _Stream_get_EOS( stream, &eos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( eos == VARIANT_TRUE, "got %04x\n", eos ); + + hr = _Stream_put_Position( stream, 6 ); + ok( hr == S_OK, "got %08x\n", hr ); + + size = -1; + hr = _Stream_get_Size( stream, &size ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( size == 10, "got %d\n", size ); + + hr = _Stream_put_Position( stream, 2 ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_Close( stream ); ok( hr == S_OK, "got %08x\n", hr ); @@ -191,6 +234,14 @@ static void test_Stream(void) hr = _Stream_Open( stream, missing, adModeUnknown, adOpenStreamUnspecified, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_ReadText( stream, adReadAll, &str ); + ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); + + str = SysAllocString( L"test" ); + hr = _Stream_WriteText( stream, str, adWriteChar ); + ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); + SysFreeString( str ); + VariantInit( &val ); hr = _Stream_Read( stream, 1, &val ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.20.1

2 2

[PATCH] winhttp/tests: Show that WINHTTP_OPTION_SECURE_PROTOCOLS can't be set on connection handles.
by Hans Leidekker 10 Dec '19

10 Dec '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48254 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index e4c614cb10..3e0e8baeb9 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1070,6 +1070,13 @@ static void test_secure_connection(void) con = WinHttpConnect(ses, test_winehq, 443, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + SetLastError( 0xdeadbeef ); + protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2; + ret = WinHttpSetOption(con, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols)); + err = GetLastError(); + ok(!ret, "unexpected success\n"); + ok(err == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %u\n", err); + /* try without setting WINHTTP_FLAG_SECURE */ req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); -- 2.20.1

1 0

[PATCH 2/5] msado15: Implement _Stream_get_LineSeparator and _Stream_put_LineSeparator.
by Hans Leidekker 10 Dec '19

10 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/stream.c | 32 ++++++++++++++++++++------------ dlls/msado15/tests/msado15.c | 9 +++++++++ 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 9fb6007b57..07027f3829 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -32,14 +32,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct stream { - _Stream Stream_iface; - LONG refs; - ObjectStateEnum state; - StreamTypeEnum type; - LONG size; - LONG allocated; - LONG pos; - BYTE *buf; + _Stream Stream_iface; + LONG refs; + ObjectStateEnum state; + StreamTypeEnum type; + LineSeparatorEnum sep; + LONG size; + LONG allocated; + LONG pos; + BYTE *buf; }; static inline struct stream *impl_from_Stream( _Stream *iface ) @@ -193,14 +194,20 @@ static HRESULT WINAPI stream_put_Type( _Stream *iface, StreamTypeEnum type ) static HRESULT WINAPI stream_get_LineSeparator( _Stream *iface, LineSeparatorEnum *sep ) { - FIXME( "%p, %p\n", iface, sep ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %p\n", stream, sep ); + + *sep = stream->sep; + return S_OK; } static HRESULT WINAPI stream_put_LineSeparator( _Stream *iface, LineSeparatorEnum sep ) { - FIXME( "%p, %d\n", iface, sep ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %d\n", stream, sep ); + + stream->sep = sep; + return S_OK; } static HRESULT WINAPI stream_get_State( _Stream *iface, ObjectStateEnum *state ) @@ -431,6 +438,7 @@ HRESULT Stream_create( void **obj ) stream->Stream_iface.lpVtbl = &stream_vtbl; stream->refs = 1; stream->type = adTypeText; + stream->sep = adCRLF; *obj = &stream->Stream_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 0b10579905..a4de15932d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -51,6 +51,7 @@ static void test_Stream(void) _Stream *stream; VARIANT_BOOL eos; StreamTypeEnum type; + LineSeparatorEnum sep; LONG refs, size, pos; ObjectStateEnum state; VARIANT missing, val; @@ -89,6 +90,14 @@ static void test_Stream(void) hr = _Stream_put_Type( stream, adTypeText ); ok( hr == S_OK, "got %08x\n", hr ); + sep = 0; + hr = _Stream_get_LineSeparator( stream, &sep ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( sep == adCRLF, "got %d\n", sep ); + + hr = _Stream_put_LineSeparator( stream, adLF ); + ok( hr == S_OK, "got %08x\n", hr ); + state = 0xdeadbeef; hr = _Stream_get_State( stream, &state ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.20.1

2 1

[PATCH 2/2] msado15: Implement Connection get/put CommandTimeout
by Alistair Leslie-Hughes 10 Dec '19

10 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 14 ++++++++++---- dlls/msado15/tests/msado15.c | 13 ++++++++++++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index dbf0b03149..ef589ecb7d 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -36,6 +36,7 @@ struct connection LONG refs; ObjectStateEnum state; + LONG timeout; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -126,14 +127,18 @@ static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *timeout ) { - FIXME( "%p, %p\n", iface, timeout ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %p\n", connection, timeout ); + *timeout = connection->timeout; + return S_OK; } static HRESULT WINAPI connection_put_CommandTimeout( _Connection *iface, LONG timeout ) { - FIXME( "%p, %d\n", iface, timeout ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %d\n", connection, timeout ); + connection->timeout = timeout; + return S_OK; } static HRESULT WINAPI connection_get_ConnectionTimeout( _Connection *iface, LONG *timeout ) @@ -342,6 +347,7 @@ HRESULT Connection_create( void **obj ) connection->Connection_iface.lpVtbl = &connection_vtbl; connection->refs = 1; connection->state = adStateClosed; + connection->timeout = 30; *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index f2c9789576..bb356ae5a8 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -197,7 +197,7 @@ static void test_connection(void) _Connection *connection; IRunnableObject *runtime; ISupportErrorInfo *errorinfo; - LONG state; + LONG state, timeout; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -220,6 +220,17 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(state == adStateClosed, "Unexpected state value 0x%08x\n", state); + hr = _Connection_get_CommandTimeout(connection, &timeout); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(timeout == 30, "Unexpected timeout value %d\n", timeout); + + hr = _Connection_put_CommandTimeout(connection, 300); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + + hr = _Connection_get_CommandTimeout(connection, &timeout); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + _Connection_Release(connection); } -- 2.24.0

1 0

[PATCH 1/2] msado15: Implement Connection.get_state
by Alistair Leslie-Hughes 10 Dec '19

10 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 9 +++++++-- dlls/msado15/tests/msado15.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index f33bc89a1a..dbf0b03149 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -34,6 +34,8 @@ struct connection { _Connection Connection_iface; LONG refs; + + ObjectStateEnum state; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -271,8 +273,10 @@ static HRESULT WINAPI connection_put_Provider( _Connection *iface, BSTR str ) static HRESULT WINAPI connection_get_State( _Connection *iface, LONG *state ) { - FIXME( "%p, %p\n", iface, state ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %p\n", connection, state ); + *state = connection->state; + return S_OK; } static HRESULT WINAPI connection_OpenSchema( _Connection *iface, SchemaEnum schema, VARIANT restrictions, @@ -337,6 +341,7 @@ HRESULT Connection_create( void **obj ) if (!(connection = heap_alloc( sizeof(*connection) ))) return E_OUTOFMEMORY; connection->Connection_iface.lpVtbl = &connection_vtbl; connection->refs = 1; + connection->state = adStateClosed; *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 1755a7f3da..f2c9789576 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -191,9 +191,43 @@ static void test_Stream(void) ok( !refs, "got %d\n", refs ); } +static void test_connection(void) +{ + HRESULT hr; + _Connection *connection; + IRunnableObject *runtime; + ISupportErrorInfo *errorinfo; + LONG state; + + hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Connection_QueryInterface(connection, &IID_IRunnableObject, (void**)&runtime); + ok(hr == E_NOINTERFACE, "Unexpected IRunnableObject interface\n"); + + hr = _Connection_QueryInterface(connection, &IID_ISupportErrorInfo, (void**)&errorinfo); + todo_wine ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); + if (hr == S_OK) + ISupportErrorInfo_Release(errorinfo); + +if (0) /* Crashes on windows */ +{ + hr = _Connection_get_State(connection, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr 0x%08x\n", hr); +} + + hr = _Connection_get_State(connection, &state); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(state == adStateClosed, "Unexpected state value 0x%08x\n", state); + + _Connection_Release(connection); +} + START_TEST(msado15) { CoInitialize( NULL ); test_Stream(); + test_connection(); + CoUninitialize(); } -- 2.24.0

1 0

[PATCH 4/5] msado15: Implement _Stream_get_Charset and _Stream_put_Charset.
by Hans Leidekker 10 Dec '19

10 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/msado15_private.h | 8 ++++++++ dlls/msado15/stream.c | 24 ++++++++++++++++++++---- dlls/msado15/tests/msado15.c | 11 +++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 1078cbf64e..7239e48b53 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -31,4 +31,12 @@ static inline void *heap_realloc_zero( void *mem, SIZE_T len ) return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len ); } +static inline WCHAR *strdupW( const WCHAR *src ) +{ + WCHAR *dst; + if (!src) return NULL; + if ((dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(*dst) ))) lstrcpyW( dst, src ); + return dst; +} + #endif /* _WINE_MSADO15_PRIVATE_H_ */ diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 9aa35d5831..e2e404a620 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -38,6 +38,7 @@ struct stream ConnectModeEnum mode; StreamTypeEnum type; LineSeparatorEnum sep; + WCHAR *charset; LONG size; LONG allocated; LONG pos; @@ -62,6 +63,7 @@ static ULONG WINAPI stream_Release( _Stream *iface ) if (!refs) { TRACE( "destroying %p\n", stream ); + heap_free( stream->charset ); heap_free( stream->buf ); heap_free( stream ); } @@ -240,14 +242,28 @@ static HRESULT WINAPI stream_put_Mode( _Stream *iface, ConnectModeEnum mode ) static HRESULT WINAPI stream_get_Charset( _Stream *iface, BSTR *charset ) { - FIXME( "%p, %p\n", iface, charset ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + const WCHAR *src = stream->charset ? stream->charset : L"Unicode"; + BSTR dst; + + TRACE( "%p, %p\n", stream, charset ); + + if (!(dst = SysAllocString( src ))) return E_OUTOFMEMORY; + *charset = dst; + return S_OK; } static HRESULT WINAPI stream_put_Charset( _Stream *iface, BSTR charset ) { - FIXME( "%p, %s\n", iface, debugstr_w(charset) ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + WCHAR *str; + + TRACE( "%p, %s\n", stream, debugstr_w(charset) ); + + if (!(str = strdupW( charset ))) return E_OUTOFMEMORY; + heap_free( stream->charset ); + stream->charset = str; + return S_OK; } static HRESULT create_byte_array( BYTE *data, LONG len, VARIANT *ret ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 6aab518da9..2c75904837 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -55,6 +55,7 @@ static void test_Stream(void) LONG refs, size, pos; ObjectStateEnum state; ConnectModeEnum mode; + BSTR charset, str; VARIANT missing, val; HRESULT hr; @@ -112,6 +113,16 @@ static void test_Stream(void) hr = _Stream_put_Mode( stream, adModeReadWrite ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_get_Charset( stream, &charset ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( charset, L"Unicode" ), "got %s\n", wine_dbgstr_w(charset) ); + SysFreeString( charset ); + + str = SysAllocString( L"Unicode" ); + hr = _Stream_put_Charset( stream, str ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( str ); + hr = _Stream_Read( stream, 2, &val ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); -- 2.20.1

1 0

[PATCH 3/5] msado15: Implement _Stream_get_Mode and _Stream_put_Mode.
by Hans Leidekker 10 Dec '19

10 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/stream.c | 15 +++++++++++---- dlls/msado15/tests/msado15.c | 9 +++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 07027f3829..9aa35d5831 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -35,6 +35,7 @@ struct stream _Stream Stream_iface; LONG refs; ObjectStateEnum state; + ConnectModeEnum mode; StreamTypeEnum type; LineSeparatorEnum sep; LONG size; @@ -221,14 +222,20 @@ static HRESULT WINAPI stream_get_State( _Stream *iface, ObjectStateEnum *state ) static HRESULT WINAPI stream_get_Mode( _Stream *iface, ConnectModeEnum *mode ) { - FIXME( "%p, %p\n", iface, mode ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %p\n", stream, mode ); + + *mode = stream->mode; + return S_OK; } static HRESULT WINAPI stream_put_Mode( _Stream *iface, ConnectModeEnum mode ) { - FIXME( "%p, %u\n", iface, mode ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %u\n", stream, mode ); + + stream->mode = mode; + return S_OK; } static HRESULT WINAPI stream_get_Charset( _Stream *iface, BSTR *charset ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index a4de15932d..6aab518da9 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -54,6 +54,7 @@ static void test_Stream(void) LineSeparatorEnum sep; LONG refs, size, pos; ObjectStateEnum state; + ConnectModeEnum mode; VARIANT missing, val; HRESULT hr; @@ -103,6 +104,14 @@ static void test_Stream(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateClosed, "got %u\n", state ); + mode = 0xdeadbeef; + hr = _Stream_get_Mode( stream, &mode ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( mode == adModeUnknown, "got %u\n", mode ); + + hr = _Stream_put_Mode( stream, adModeReadWrite ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_Read( stream, 2, &val ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); -- 2.20.1

1 0

[PATCH 1/5] msado15: Implement _Stream_get_EOS.
by Hans Leidekker 10 Dec '19

10 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/stream.c | 9 +++++++-- dlls/msado15/tests/msado15.c | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 169be7319e..9fb6007b57 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -124,8 +124,13 @@ static HRESULT WINAPI stream_get_Size( _Stream *iface, LONG *size ) static HRESULT WINAPI stream_get_EOS( _Stream *iface, VARIANT_BOOL *eos ) { - FIXME( "%p, %p\n", iface, eos ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %p\n", stream, eos ); + + if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + *eos = (stream->pos >= stream->size) ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI stream_get_Position( _Stream *iface, LONG *pos ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 1755a7f3da..0b10579905 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -49,6 +49,7 @@ static HRESULT str_to_byte_array( const char *data, VARIANT *ret ) static void test_Stream(void) { _Stream *stream; + VARIANT_BOOL eos; StreamTypeEnum type; LONG refs, size, pos; ObjectStateEnum state; @@ -61,6 +62,9 @@ static void test_Stream(void) hr = _Stream_get_Size( stream, &size ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + hr = _Stream_get_EOS( stream, &eos ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + hr = _Stream_get_Position( stream, &pos ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); @@ -111,6 +115,11 @@ static void test_Stream(void) ok( hr == S_OK, "got %08x\n", hr ); ok( !size, "got %d\n", size ); + eos = VARIANT_FALSE; + hr = _Stream_get_EOS( stream, &eos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( eos == VARIANT_TRUE, "got %04x\n", eos ); + pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.20.1

1 0

[PATCH] ws2_32/tests: Fix the spelling of a couple of ok() messages.
by Francois Gouget 10 Dec '19

10 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ws2_32/tests/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e4b57cfddae..cd97aae4bb8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6611,7 +6611,7 @@ static void test_WSASendMsg(void) ok(!ret, "WSASendMsg should have worked\n"); ok(GetLastError() == 0 || broken(GetLastError() == 0xdeadbeef) /* Win <= 2008 */, "Expected 0, got %d\n", GetLastError()); - ok(bytesSent == iovec[0].len, "incorret bytes sent, expected %d, sent %d\n", + ok(bytesSent == iovec[0].len, "incorrect bytes sent, expected %d, sent %d\n", iovec[0].len, bytesSent); /* receive data */ @@ -6639,7 +6639,7 @@ static void test_WSASendMsg(void) SetLastError(0xdeadbeef); ret = pWSASendMsg(sock, &msg, 0, &bytesSent, NULL, NULL); ok(!ret, "WSASendMsg should have worked\n"); - ok(bytesSent == iovec[0].len + iovec[1].len, "incorret bytes sent, expected %d, sent %d\n", + ok(bytesSent == iovec[0].len + iovec[1].len, "incorrect bytes sent, expected %d, sent %d\n", iovec[0].len + iovec[1].len, bytesSent); ok(GetLastError() == 0 || broken(GetLastError() == 0xdeadbeef) /* Win <= 2008 */, "Expected 0, got %d\n", GetLastError()); -- 2.20.1

2 1

[PATCH] testbot/WineSendLog: Skip checking for new errors if there are no errors.
by Francois Gouget 10 Dec '19

10 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 95cc036c9..98bfc4c0f 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -287,6 +287,9 @@ EOF foreach my $LogName (@{$JobErrors->{$Key}->{LogNames}}) { my $LogErrors = $JobErrors->{$Key}->{$LogName}; + # Skip if there are no errors + next if (!$LogErrors->{Groups}); + my $RefFileName = $StepTask->GetFullFileName($StepTask->VM->Name ."_$LogName"); my ($NewGroups, $NewErrors, $_NewIndices) = GetNewLogErrors($RefFileName, $LogErrors->{Groups}, $LogErrors->{Errors}); if (!$NewGroups) -- 2.20.1

1 0

[PATCH] testbot: Keep the StepTask methods in sync with the Step/Task ones.
by Francois Gouget 10 Dec '19

10 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/StepsTasks.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 19bedaaf4..463f15078 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -33,6 +33,7 @@ use WineTestBot::Config; use WineTestBot::Missions; +# Keep in sync with WineTestBot::Step::GetDir() sub GetStepDir($) { my ($self) = @_; @@ -40,7 +41,7 @@ sub GetStepDir($) return "$DataDir/jobs/$JobId/". $self->StepNo; } -# See WineTestBot::Step::GetFullFileName() +# Keep in sync with WineTestBot::Step::GetFullFileName() sub GetFullFileName($;$) { my ($self, $FileName) = @_; @@ -59,6 +60,7 @@ sub GetFullFileName($;$) return $Path . $FileName; } +# Keep in sync with WineTestBot::Task::GetDir() sub GetTaskDir($) { my ($self) = @_; -- 2.20.1

1 0

[PATCH] wineqtdecoder: Fix macos compile error
by Alistair Leslie-Hughes 10 Dec '19

10 Dec '19

Regression of 498179b4482026091bf7376c0d2ac9a036e7ca0e Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wineqtdecoder/qtsplitter.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 5b1e82ebc9b..956dd0a7d0d 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -285,7 +285,7 @@ static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE QTSplitter *filter = impl_from_strmbase_filter(iface); HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr; - EnterCriticalSection(&This->csReceive); + EnterCriticalSection(&filter->csReceive); if (filter->pVideo_Pin) pin_hr = BaseOutputPinImpl_Active(&filter->pVideo_Pin->pin); @@ -297,7 +297,7 @@ static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE hr = pin_hr; SetEvent(filter->runEvent); - LeaveCriticalSection(&This->csReceive); + LeaveCriticalSection(&filter->csReceive); return hr; } @@ -306,10 +306,10 @@ static HRESULT qt_splitter_cleanup_stream(struct strmbase_filter *iface) { QTSplitter *filter = impl_from_strmbase_filter(iface); - EnterCriticalSection(&This->csReceive); + EnterCriticalSection(&filter->csReceive); IAsyncReader_BeginFlush(filter->pInputPin.pReader); IAsyncReader_EndFlush(filter->pInputPin.pReader); - LeaveCriticalSection(&This->csReceive); + LeaveCriticalSection(&filter->csReceive); return S_OK; } @@ -1170,8 +1170,6 @@ static HRESULT WINAPI QTOutPin_QueryInterface(IPin *iface, REFIID riid, void **p *ppv = iface; else if (IsEqualIID(riid, &IID_IPin)) *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->sourceSeeking.IMediaSeeking_iface; else if (IsEqualIID(riid, &IID_IQualityControl)) *ppv = &This->IQualityControl_iface; -- 2.24.0

4 6

[PATCH] msado15: Fix the name of the GetString() delimiter parameters.
by Francois Gouget 10 Dec '19

10 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msado15/recordset.c | 6 +++--- include/msado15_backcompat.idl | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 52282c7e827..84adec406f4 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -526,11 +526,11 @@ static HRESULT WINAPI recordset_get_StayInSync( _Recordset *iface, VARIANT_BOOL } static HRESULT WINAPI recordset_GetString( _Recordset *iface, StringFormatEnum string_format, LONG num_rows, - BSTR column_delimeter, BSTR row_delimeter, BSTR null_expr, + BSTR column_delimiter, BSTR row_delimiter, BSTR null_expr, BSTR *ret_string ) { - FIXME( "%p, %u, %d, %s, %s, %s, %p\n", iface, string_format, num_rows, debugstr_w(column_delimeter), - debugstr_w(row_delimeter), debugstr_w(null_expr), ret_string ); + FIXME( "%p, %u, %d, %s, %s, %s, %p\n", iface, string_format, num_rows, debugstr_w(column_delimiter), + debugstr_w(row_delimiter), debugstr_w(null_expr), ret_string ); return E_NOTIMPL; } diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index a1d5e28038b..e4a847ab859 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -1068,8 +1068,8 @@ interface Recordset20 : Recordset15 HRESULT GetString( [in, defaultvalue(adClipString)] StringFormatEnum string_format, [in, defaultvalue(-1)] LONG num_rows, - [in, optional] BSTR column_delimeter, - [in, optional] BSTR row_delimeter, + [in, optional] BSTR column_delimiter, + [in, optional] BSTR row_delimiter, [in, optional] BSTR null_expr, [out, retval] BSTR *ret_string); -- 2.20.1

2 1

[PATCH v2] msado15: Print the debug strings and not the pointers to them
by Hans Leidekker 10 Dec '19

10 Dec '19

From: Michael Stefaniuc <mstefani(a)winehq.org> v2: Don't trace the password. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/connection.c | 2 +- dlls/msado15/stream.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index f33bc89a1a..43497636a8 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -187,7 +187,7 @@ static HRESULT WINAPI connection_Open( _Connection *iface, BSTR connect_str, BST LONG options ) { FIXME( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), - debugstr_w(password), options ); + password, options ); return E_NOTIMPL; } diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 0c4d9ea425..169be7319e 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -371,7 +371,7 @@ static HRESULT WINAPI stream_ReadText( _Stream *iface, LONG len, BSTR *ret ) static HRESULT WINAPI stream_WriteText( _Stream *iface, BSTR data, StreamWriteEnum options ) { - FIXME( "%p, %p, %u\n", iface, debugstr_w(data), options ); + FIXME( "%p, %s, %u\n", iface, debugstr_w(data), options ); return E_NOTIMPL; } -- 2.20.1

1 0

[PATCH] winecfg: Avoid an unneeded strlen() call.
by Francois Gouget 10 Dec '19

10 Dec '19

Note that szLinkTarget is an array field and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/winecfg/theme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 66d23448f6f..dffe1861e82 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -842,7 +842,7 @@ static void on_shell_folder_selection_changed(HWND hDlg, LPNMLISTVIEW lpnm) { if (lpnm->uNewState & LVIS_SELECTED) { psfiSelected = (struct ShellFolderInfo *)lpnm->lParam; EnableWindow(GetDlgItem(hDlg, IDC_LINK_SFPATH), 1); - if (strlen(psfiSelected->szLinkTarget)) { + if (*psfiSelected->szLinkTarget) { WCHAR *link; CheckDlgButton(hDlg, IDC_LINK_SFPATH, BST_CHECKED); EnableWindow(GetDlgItem(hDlg, IDC_EDIT_SFPATH), 1); -- 2.20.1

1 0

[PATCH] winedbg: Fix the spelling of various messages and the README.
by Francois Gouget 10 Dec '19

10 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/winedbg/README | 2 +- programs/winedbg/gdbproxy.c | 4 ++-- programs/winedbg/types.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/README b/programs/winedbg/README index e824a1c88ce..66b3953bd22 100644 --- a/programs/winedbg/README +++ b/programs/winedbg/README @@ -1,4 +1,4 @@ - This is the core of the Wine debugger. The reverse assember + This is the core of the Wine debugger. The reverse assembler was stolen from Mach more or less intact. It turns out that there are two variables that are set differently if you are reverse assembling 16 bit code, and on the whole it seems to work. diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 85ebc882a62..052e73b2ad6 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -569,7 +569,7 @@ static void wait_for_debuggee(struct gdb_context* gdbctx) { if (check_for_interrupt(gdbctx)) { if (!DebugBreakProcess(gdbctx->process->handle)) { - ERR("Failed to break into debugee\n"); + ERR("Failed to break into debuggee\n"); break; } WaitForDebugEvent(&de, INFINITE); @@ -624,7 +624,7 @@ static void get_process_info(struct gdb_context* gdbctx, char* buffer, size_t le case ABOVE_NORMAL_PRIORITY_CLASS: strcat(buffer, ", above normal priority"); break; #endif #ifdef BELOW_NORMAL_PRIORITY_CLASS - case BELOW_NORMAL_PRIORITY_CLASS: strcat(buffer, ", below normal priotity"); break; + case BELOW_NORMAL_PRIORITY_CLASS: strcat(buffer, ", below normal priority"); break; #endif case HIGH_PRIORITY_CLASS: strcat(buffer, ", high priority"); break; case IDLE_PRIORITY_CLASS: strcat(buffer, ", idle priority"); break; diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 696a9fd48a5..019554ad1be 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -168,7 +168,7 @@ BOOL types_store_value(struct dbg_lvalue* lvalue_to, const struct dbg_lvalue* lv if (!types_get_info(&lvalue_to->type, TI_GET_LENGTH, &size)) return FALSE; if (sizeof(val) < size) { - dbg_printf("Unsufficient size\n"); + dbg_printf("Insufficient size\n"); return FALSE; } /* FIXME: should support floats as well */ -- 2.20.1

1 0

[PATCH] qcap/tests: Avoid an unneeded lstrlenW() call.
by Francois Gouget 10 Dec '19

10 Dec '19

Note that achName is an array field and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/qcap/tests/smartteefilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 4eac344d537..014c6ee2d13 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -2078,7 +2078,7 @@ static void test_smart_tee_filter(void) if (FAILED(hr)) goto end; - ok(lstrlenW(filterInfo.achName) == 0, + ok(!*filterInfo.achName, "filter's name is meant to be empty but it's %s\n", wine_dbgstr_w(filterInfo.achName)); hr = IBaseFilter_EnumPins(smartTeeFilter, &enumPins); -- 2.20.1

1 0

[PATCH] msvcrt/tests: Avoid an unneeded strlen() call.
by Francois Gouget 10 Dec '19

10 Dec '19

Note that buf is an array and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- I used the buf[0] == 0 form to match the buf[0] == 'X' test a few lines up. I'm fine with replacing it with a !*buf too. dlls/msvcrt/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index c59464f82d6..7e2a7e40690 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -211,7 +211,7 @@ static void test_strerror_s(void) memset(buf, 'X', sizeof(buf)); ret = pstrerror_s(buf, 1, 0); ok(ret == 0, "Expected strerror_s to return 0, got %d\n", ret); - ok(strlen(buf) == 0, "Expected output buffer to be null terminated\n"); + ok(buf[0] == 0, "Expected output buffer to be null terminated\n"); memset(buf, 'X', sizeof(buf)); ret = pstrerror_s(buf, 2, 0); -- 2.20.1

1 0

[PATCH] riched32/tests: Avoid an unneeded strlen() call.
by Francois Gouget 10 Dec '19

10 Dec '19

Note that buffer is an array and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/riched32/tests/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 0d55b7cd6ed..950c175bbbe 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -293,7 +293,7 @@ static void test_EM_STREAMIN(void) result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); ok (result == 0, "EM_STREAMIN: Test 3 returned %ld, expected 0\n", result); - ok (strlen(buffer) == 0, + ok (!*buffer, "EM_STREAMIN: Test 3 set wrong text: Result: %s\n",buffer); ok(es.dwError == -16, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, -16); -- 2.20.1

1 0

[PATCH] msxml3/tests: Avoid an unneeded lstrlenW() call.
by Francois Gouget 10 Dec '19

10 Dec '19

This being a test we have to assume IXMLElement_get_text() could return a NULL string. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msxml3/tests/xmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 359297f592f..693af195717 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -972,7 +972,7 @@ static void test_xmlelem(void) hr = IXMLElement_get_text(element, &str); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(lstrlenW(str) == 0, "Expected empty text\n"); + ok(str && !*str, "Expected empty text\n"); SysFreeString(str); /* put_text with an ELEMENT */ -- 2.20.1

1 0

[PATCH] kernelbase/tests: Avoid an uneeded lstrlenW() call.
by Francois Gouget 10 Dec '19

10 Dec '19

Note that path_outW is an array and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernelbase/tests/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 93303bafc34..d77eaebd913 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -1110,7 +1110,7 @@ static void test_PathCchCanonicalize(void) hr = pPathCchCanonicalize(path_outW, ARRAY_SIZE(path_outW), path_inW); ok(hr == HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), "expect hr %#x, got %#x %s\n", HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), hr, wine_dbgstr_w(path_outW)); - ok(lstrlenW(path_outW) == 0, "got %d\n", lstrlenW(path_outW)); + ok(!*path_outW, "got %d\n", lstrlenW(path_outW)); path_inW[0] = 'C'; path_inW[1] = ':'; -- 2.20.1

1 0

[PATCH v3 1/5] strmbase: Combine the SetMediaType() and CompleteConnect() callbacks.
by Zebediah Figura 10 Dec '19

10 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/acmwrapper.c | 115 +++++++----------------- dlls/quartz/avidec.c | 37 ++------ dlls/strmbase/transform.c | 7 +- dlls/winegstreamer/gsttffilter.c | 146 +++++++++++-------------------- dlls/wineqtdecoder/qtvdecoder.c | 25 ++---- include/wine/strmbase.h | 5 +- 6 files changed, 103 insertions(+), 232 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 8eea6ab147d..33d9debe5cd 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -40,7 +40,6 @@ typedef struct ACMWrapperImpl TransformFilter tf; HACMSTREAM has; - LPWAVEFORMATEX pWfIn; LPWAVEFORMATEX pWfOut; LONGLONG lasttime_real; @@ -224,85 +223,43 @@ error: return hr; } -static HRESULT WINAPI ACMWrapper_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE * pmt) +static BOOL is_audio_subtype(const GUID *guid) { - ACMWrapperImpl* This = impl_from_TransformFilter(tf); - MMRESULT res; - - TRACE("(%p)->(%i %p)\n", This, dir, pmt); - - if (dir != PINDIR_INPUT) - return S_OK; - - /* Check root (GUID w/o FOURCC) */ - if ((IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio)) && - (!memcmp(((const char *)&pmt->subtype)+4, ((const char *)&MEDIATYPE_Audio)+4, sizeof(GUID)-4)) && - (IsEqualIID(&pmt->formattype, &FORMAT_WaveFormatEx))) - { - HACMSTREAM drv; - WAVEFORMATEX *wfx = (WAVEFORMATEX*)pmt->pbFormat; - AM_MEDIA_TYPE* outpmt = &This->tf.pmt; - - if (!wfx || wfx->wFormatTag == WAVE_FORMAT_PCM || wfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) - return VFW_E_TYPE_NOT_ACCEPTED; - FreeMediaType(outpmt); - - This->pWfIn = (LPWAVEFORMATEX)pmt->pbFormat; - - /* HACK */ - /* TRACE("ALIGN = %d\n", pACMWrapper->pWfIn->nBlockAlign); */ - /* pACMWrapper->pWfIn->nBlockAlign = 1; */ - - /* Set output audio data to PCM */ - CopyMediaType(outpmt, pmt); - outpmt->subtype.Data1 = WAVE_FORMAT_PCM; - This->pWfOut = (WAVEFORMATEX*)outpmt->pbFormat; - This->pWfOut->wFormatTag = WAVE_FORMAT_PCM; - This->pWfOut->wBitsPerSample = 16; - This->pWfOut->nBlockAlign = This->pWfOut->wBitsPerSample * This->pWfOut->nChannels / 8; - This->pWfOut->cbSize = 0; - This->pWfOut->nAvgBytesPerSec = This->pWfOut->nChannels * This->pWfOut->nSamplesPerSec - * (This->pWfOut->wBitsPerSample/8); - - if (!(res = acmStreamOpen(&drv, NULL, This->pWfIn, This->pWfOut, NULL, 0, 0, 0))) - { - This->has = drv; - - TRACE("Connection accepted\n"); - return S_OK; - } - else - FIXME("acmStreamOpen returned %d\n", res); - FreeMediaType(outpmt); - TRACE("Unable to find a suitable ACM decompressor\n"); - } - - TRACE("Connection refused\n"); - return VFW_E_TYPE_NOT_ACCEPTED; + return !memcmp(&guid->Data2, &MEDIATYPE_Audio.Data2, sizeof(GUID) - sizeof(int)); } -static HRESULT WINAPI ACMWrapper_CompleteConnect(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) +static HRESULT acm_wrapper_connect_sink(TransformFilter *iface, const AM_MEDIA_TYPE *mt) { - ACMWrapperImpl* This = impl_from_TransformFilter(tf); - MMRESULT res; + ACMWrapperImpl *filter = impl_from_TransformFilter(iface); + const WAVEFORMATEX *wfx = (WAVEFORMATEX *)mt->pbFormat; HACMSTREAM drv; + MMRESULT res; - TRACE("(%p)\n", This); - - if (dir != PINDIR_INPUT) - return S_OK; - - if (!(res = acmStreamOpen(&drv, NULL, This->pWfIn, This->pWfOut, NULL, 0, 0, 0))) + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio) || !is_audio_subtype(&mt->subtype) + || !IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx) || !wfx + || wfx->wFormatTag == WAVE_FORMAT_PCM || wfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + return VFW_E_TYPE_NOT_ACCEPTED; + + CopyMediaType(&filter->tf.pmt, mt); + filter->tf.pmt.subtype.Data1 = WAVE_FORMAT_PCM; + filter->pWfOut = (WAVEFORMATEX *)filter->tf.pmt.pbFormat; + filter->pWfOut->wFormatTag = WAVE_FORMAT_PCM; + filter->pWfOut->wBitsPerSample = 16; + filter->pWfOut->nBlockAlign = filter->pWfOut->wBitsPerSample * filter->pWfOut->nChannels / 8; + filter->pWfOut->cbSize = 0; + filter->pWfOut->nAvgBytesPerSec = filter->pWfOut->nChannels * filter->pWfOut->nSamplesPerSec + * (filter->pWfOut->wBitsPerSample / 8); + + if ((res = acmStreamOpen(&drv, NULL, (WAVEFORMATEX *)wfx, filter->pWfOut, NULL, 0, 0, 0))) { - This->has = drv; - - TRACE("Connection accepted\n"); - return S_OK; + ERR("Failed to open stream, error %u.\n", res); + FreeMediaType(&filter->tf.pmt); + return VFW_E_TYPE_NOT_ACCEPTED; } - FIXME("acmStreamOpen returned %d\n", res); - TRACE("Unable to find a suitable ACM decompressor\n"); - return VFW_E_TYPE_NOT_ACCEPTED; + filter->has = drv; + + return S_OK; } static HRESULT WINAPI ACMWrapper_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir) @@ -341,18 +298,10 @@ static HRESULT WINAPI ACMWrapper_DecideBufferSize(TransformFilter *tf, IMemAlloc } static const TransformFilterFuncTable ACMWrapper_FuncsTable = { - ACMWrapper_DecideBufferSize, - NULL, - ACMWrapper_Receive, - NULL, - NULL, - ACMWrapper_SetMediaType, - ACMWrapper_CompleteConnect, - ACMWrapper_BreakConnect, - NULL, - NULL, - NULL, - NULL + .pfnDecideBufferSize = ACMWrapper_DecideBufferSize, + .pfnReceive = ACMWrapper_Receive, + .transform_connect_sink = acm_wrapper_connect_sink, + .pfnBreakConnect = ACMWrapper_BreakConnect, }; HRESULT ACMWrapper_create(IUnknown *outer, void **out) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 32969a34730..abed957fa6d 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -210,16 +210,11 @@ static HRESULT WINAPI AVIDec_StopStreaming(TransformFilter* pTransformFilter) return S_OK; } -static HRESULT WINAPI AVIDec_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE * pmt) +static HRESULT avi_dec_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *pmt) { AVIDecImpl* This = impl_from_TransformFilter(tf); HRESULT hr = VFW_E_TYPE_NOT_ACCEPTED; - TRACE("(%p)->(%p)\n", This, pmt); - - if (dir != PINDIR_INPUT) - return S_OK; - /* Check root (GUID w/o FOURCC) */ if ((IsEqualIID(&pmt->majortype, &MEDIATYPE_Video)) && (!memcmp(((const char *)&pmt->subtype)+4, ((const char *)&MEDIATYPE_Video)+4, sizeof(GUID)-4))) @@ -310,15 +305,6 @@ failed: return hr; } -static HRESULT WINAPI AVIDec_CompleteConnect(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) -{ - AVIDecImpl* This = impl_from_TransformFilter(tf); - - TRACE("(%p)\n", This); - - return S_OK; -} - static HRESULT WINAPI AVIDec_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir) { AVIDecImpl *This = impl_from_TransformFilter(tf); @@ -357,19 +343,14 @@ static HRESULT WINAPI AVIDec_DecideBufferSize(TransformFilter *tf, IMemAllocator } static const TransformFilterFuncTable AVIDec_FuncsTable = { - AVIDec_DecideBufferSize, - AVIDec_StartStreaming, - AVIDec_Receive, - AVIDec_StopStreaming, - NULL, - AVIDec_SetMediaType, - AVIDec_CompleteConnect, - AVIDec_BreakConnect, - NULL, - NULL, - AVIDec_EndFlush, - NULL, - AVIDec_NotifyDrop + .pfnDecideBufferSize = AVIDec_DecideBufferSize, + .pfnStartStreaming = AVIDec_StartStreaming, + .pfnReceive = AVIDec_Receive, + .pfnStopStreaming = AVIDec_StopStreaming, + .transform_connect_sink = avi_dec_connect_sink, + .pfnBreakConnect = AVIDec_BreakConnect, + .pfnEndFlush = AVIDec_EndFlush, + .pfnNotify = AVIDec_NotifyDrop, }; HRESULT AVIDec_create(IUnknown *outer, void **out) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 7a79f709055..30ed0006cb1 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -405,11 +405,8 @@ static HRESULT WINAPI TransformFilter_InputPin_ReceiveConnection(IPin * iface, I TRACE("(%p)->(%p, %p)\n", iface, pReceivePin, pmt); strmbase_dump_media_type(pmt); - if (pTransform->pFuncsTable->pfnSetMediaType) - hr = pTransform->pFuncsTable->pfnSetMediaType(pTransform, PINDIR_INPUT, pmt); - - if (SUCCEEDED(hr) && pTransform->pFuncsTable->pfnCompleteConnect) - hr = pTransform->pFuncsTable->pfnCompleteConnect(pTransform, PINDIR_INPUT, pReceivePin); + if (pTransform->pFuncsTable->transform_connect_sink) + hr = pTransform->pFuncsTable->transform_connect_sink(pTransform, pmt); if (SUCCEEDED(hr)) { diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index ee1851dfdc6..d44a6ae33a6 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -516,7 +516,7 @@ static HRESULT WINAPI Gstreamer_Mp3_QueryConnect(TransformFilter *iface, const A return S_OK; } -static HRESULT WINAPI Gstreamer_Mp3_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT mp3_decoder_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -525,13 +525,8 @@ static HRESULT WINAPI Gstreamer_Mp3_SetMediaType(TransformFilter *tf, PIN_DIRECT HRESULT hr; int layer; - TRACE("%p 0x%x %p\n", This, dir, amt); - mark_wine_thread(); - if (dir != PINDIR_INPUT) - return S_OK; - if (Gstreamer_Mp3_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) return VFW_E_TYPE_NOT_ACCEPTED; @@ -588,26 +583,19 @@ static HRESULT WINAPI Gstreamer_Mp3_SetMediaType(TransformFilter *tf, PIN_DIRECT return hr; } -static HRESULT WINAPI Gstreamer_Mp3_ConnectInput(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) -{ - TRACE("%p 0x%x %p\n", tf, dir, pin); - return S_OK; -} - static const TransformFilterFuncTable Gstreamer_Mp3_vtbl = { - Gstreamer_transform_DecideBufferSize, - Gstreamer_transform_ProcessBegin, - Gstreamer_transform_ProcessData, - Gstreamer_transform_ProcessEnd, - Gstreamer_Mp3_QueryConnect, - Gstreamer_Mp3_SetMediaType, - Gstreamer_Mp3_ConnectInput, - Gstreamer_transform_Cleanup, - Gstreamer_transform_EndOfStream, - Gstreamer_transform_BeginFlush, - Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment, - Gstreamer_transform_QOS + .pfnDecideBufferSize = Gstreamer_transform_DecideBufferSize, + .pfnStartStreaming = Gstreamer_transform_ProcessBegin, + .pfnReceive = Gstreamer_transform_ProcessData, + .pfnStopStreaming = Gstreamer_transform_ProcessEnd, + .pfnCheckInputType = Gstreamer_Mp3_QueryConnect, + .transform_connect_sink = mp3_decoder_connect_sink, + .pfnBreakConnect = Gstreamer_transform_Cleanup, + .pfnEndOfStream = Gstreamer_transform_EndOfStream, + .pfnBeginFlush = Gstreamer_transform_BeginFlush, + .pfnEndFlush = Gstreamer_transform_EndFlush, + .pfnNewSegment = Gstreamer_transform_NewSegment, + .pfnNotify = Gstreamer_transform_QOS, }; IUnknown * CALLBACK Gstreamer_Mp3_create(IUnknown *punkouter, HRESULT *phr) @@ -664,13 +652,7 @@ static HRESULT WINAPI Gstreamer_YUV_QueryConnect(TransformFilter *iface, const A } } -static HRESULT WINAPI Gstreamer_YUV_ConnectInput(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) -{ - TRACE("%p 0x%x %p\n", tf, dir, pin); - return S_OK; -} - -static HRESULT WINAPI Gstreamer_YUV2RGB_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT yuv_to_rgb_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -679,13 +661,8 @@ static HRESULT WINAPI Gstreamer_YUV2RGB_SetMediaType(TransformFilter *tf, PIN_DI int avgtime; LONG width, height; - TRACE("%p 0x%x %p\n", This, dir, amt); - mark_wine_thread(); - if (dir != PINDIR_INPUT) - return S_OK; - if (Gstreamer_YUV_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) return E_FAIL; @@ -738,19 +715,18 @@ static HRESULT WINAPI Gstreamer_YUV2RGB_SetMediaType(TransformFilter *tf, PIN_DI } static const TransformFilterFuncTable Gstreamer_YUV2RGB_vtbl = { - Gstreamer_transform_DecideBufferSize, - Gstreamer_transform_ProcessBegin, - Gstreamer_transform_ProcessData, - Gstreamer_transform_ProcessEnd, - Gstreamer_YUV_QueryConnect, - Gstreamer_YUV2RGB_SetMediaType, - Gstreamer_YUV_ConnectInput, - Gstreamer_transform_Cleanup, - Gstreamer_transform_EndOfStream, - Gstreamer_transform_BeginFlush, - Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment, - Gstreamer_transform_QOS + .pfnDecideBufferSize = Gstreamer_transform_DecideBufferSize, + .pfnStartStreaming = Gstreamer_transform_ProcessBegin, + .pfnReceive = Gstreamer_transform_ProcessData, + .pfnStopStreaming = Gstreamer_transform_ProcessEnd, + .pfnCheckInputType = Gstreamer_YUV_QueryConnect, + .transform_connect_sink = yuv_to_rgb_connect_sink, + .pfnBreakConnect = Gstreamer_transform_Cleanup, + .pfnEndOfStream = Gstreamer_transform_EndOfStream, + .pfnBeginFlush = Gstreamer_transform_BeginFlush, + .pfnEndFlush = Gstreamer_transform_EndFlush, + .pfnNewSegment = Gstreamer_transform_NewSegment, + .pfnNotify = Gstreamer_transform_QOS, }; IUnknown * CALLBACK Gstreamer_YUV2RGB_create(IUnknown *punkouter, HRESULT *phr) @@ -772,7 +748,7 @@ IUnknown * CALLBACK Gstreamer_YUV2RGB_create(IUnknown *punkouter, HRESULT *phr) return obj; } -static HRESULT WINAPI Gstreamer_YUV2ARGB_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT yuv_to_argb_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -781,13 +757,8 @@ static HRESULT WINAPI Gstreamer_YUV2ARGB_SetMediaType(TransformFilter *tf, PIN_D int avgtime; LONG width, height; - TRACE("%p 0x%x %p\n", This, dir, amt); - mark_wine_thread(); - if (dir != PINDIR_INPUT) - return S_OK; - if (Gstreamer_YUV_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) return E_FAIL; @@ -840,19 +811,18 @@ static HRESULT WINAPI Gstreamer_YUV2ARGB_SetMediaType(TransformFilter *tf, PIN_D } static const TransformFilterFuncTable Gstreamer_YUV2ARGB_vtbl = { - Gstreamer_transform_DecideBufferSize, - Gstreamer_transform_ProcessBegin, - Gstreamer_transform_ProcessData, - Gstreamer_transform_ProcessEnd, - Gstreamer_YUV_QueryConnect, - Gstreamer_YUV2ARGB_SetMediaType, - Gstreamer_YUV_ConnectInput, - Gstreamer_transform_Cleanup, - Gstreamer_transform_EndOfStream, - Gstreamer_transform_BeginFlush, - Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment, - Gstreamer_transform_QOS + .pfnDecideBufferSize = Gstreamer_transform_DecideBufferSize, + .pfnStartStreaming = Gstreamer_transform_ProcessBegin, + .pfnReceive = Gstreamer_transform_ProcessData, + .pfnStopStreaming = Gstreamer_transform_ProcessEnd, + .pfnCheckInputType = Gstreamer_YUV_QueryConnect, + .transform_connect_sink = yuv_to_argb_connect_sink, + .pfnBreakConnect = Gstreamer_transform_Cleanup, + .pfnEndOfStream = Gstreamer_transform_EndOfStream, + .pfnBeginFlush = Gstreamer_transform_BeginFlush, + .pfnEndFlush = Gstreamer_transform_EndFlush, + .pfnNewSegment = Gstreamer_transform_NewSegment, + .pfnNotify = Gstreamer_transform_QOS, }; IUnknown * CALLBACK Gstreamer_YUV2ARGB_create(IUnknown *punkouter, HRESULT *phr) @@ -886,13 +856,7 @@ static HRESULT WINAPI Gstreamer_AudioConvert_QueryConnect(TransformFilter *iface return S_OK; } -static HRESULT WINAPI Gstreamer_AudioConvert_ConnectInput(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) -{ - TRACE("%p 0x%x %p\n", tf, dir, pin); - return S_OK; -} - -static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT audio_converter_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -905,13 +869,8 @@ static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, P BOOL inisfloat = FALSE; int indepth; - TRACE("%p 0x%x %p\n", This, dir, amt); - mark_wine_thread(); - if (dir != PINDIR_INPUT) - return S_OK; - if (Gstreamer_AudioConvert_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) return E_FAIL; @@ -972,19 +931,18 @@ static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, P } static const TransformFilterFuncTable Gstreamer_AudioConvert_vtbl = { - Gstreamer_transform_DecideBufferSize, - Gstreamer_transform_ProcessBegin, - Gstreamer_transform_ProcessData, - Gstreamer_transform_ProcessEnd, - Gstreamer_AudioConvert_QueryConnect, - Gstreamer_AudioConvert_SetMediaType, - Gstreamer_AudioConvert_ConnectInput, - Gstreamer_transform_Cleanup, - Gstreamer_transform_EndOfStream, - Gstreamer_transform_BeginFlush, - Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment, - Gstreamer_transform_QOS + .pfnDecideBufferSize = Gstreamer_transform_DecideBufferSize, + .pfnStartStreaming = Gstreamer_transform_ProcessBegin, + .pfnReceive = Gstreamer_transform_ProcessData, + .pfnStopStreaming = Gstreamer_transform_ProcessEnd, + .pfnCheckInputType = Gstreamer_AudioConvert_QueryConnect, + .transform_connect_sink = audio_converter_connect_sink, + .pfnBreakConnect = Gstreamer_transform_Cleanup, + .pfnEndOfStream = Gstreamer_transform_EndOfStream, + .pfnBeginFlush = Gstreamer_transform_BeginFlush, + .pfnEndFlush = Gstreamer_transform_EndFlush, + .pfnNewSegment = Gstreamer_transform_NewSegment, + .pfnNotify = Gstreamer_transform_QOS, }; IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *punkouter, HRESULT *phr) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 3da0738aecb..4be654e5a10 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -336,7 +336,7 @@ static HRESULT WINAPI QTVDecoder_StopStreaming(TransformFilter* pTransformFilter return S_OK; } -static HRESULT WINAPI QTVDecoder_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE * pmt) +static HRESULT video_decoder_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *pmt) { QTVDecoderImpl* This = impl_from_TransformFilter(tf); HRESULT hr = VFW_E_TYPE_NOT_ACCEPTED; @@ -344,11 +344,6 @@ static HRESULT WINAPI QTVDecoder_SetMediaType(TransformFilter *tf, PIN_DIRECTION AM_MEDIA_TYPE *outpmt = &This->tf.pmt; CFNumberRef n = NULL; - TRACE("(%p)->(%p)\n", This, pmt); - - if (dir != PINDIR_INPUT) - return S_OK; - FreeMediaType(outpmt); CopyMediaType(outpmt, pmt); @@ -502,18 +497,12 @@ static HRESULT WINAPI QTVDecoder_DecideBufferSize(TransformFilter *tf, IMemAlloc } static const TransformFilterFuncTable QTVDecoder_FuncsTable = { - QTVDecoder_DecideBufferSize, - QTVDecoder_StartStreaming, - QTVDecoder_Receive, - QTVDecoder_StopStreaming, - NULL, - QTVDecoder_SetMediaType, - NULL, - QTVDecoder_BreakConnect, - NULL, - NULL, - NULL, - NULL + .pfnDecideBufferSize = QTVDecoder_DecideBufferSize, + .pfnStartStreaming = QTVDecoder_StartStreaming, + .pfnReceive = QTVDecoder_Receive, + .pfnStopStreaming = QTVDecoder_StopStreaming, + .transform_connect_sink = video_decoder_connect_sink, + .pfnBreakConnect = QTVDecoder_BreakConnect, }; IUnknown * CALLBACK QTVDecoder_create(IUnknown *outer, HRESULT* phr) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index c3699f19253..7e3b38b49d5 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -197,9 +197,7 @@ typedef HRESULT (WINAPI *TransformFilter_DecideBufferSize) (TransformFilter *ifa typedef HRESULT (WINAPI *TransformFilter_StartStreaming) (TransformFilter *iface); typedef HRESULT (WINAPI *TransformFilter_StopStreaming) (TransformFilter *iface); typedef HRESULT (WINAPI *TransformFilter_Receive) (TransformFilter* iface, IMediaSample* pIn); -typedef HRESULT (WINAPI *TransformFilter_CompleteConnect) (TransformFilter *iface, PIN_DIRECTION dir, IPin *pPin); typedef HRESULT (WINAPI *TransformFilter_BreakConnect) (TransformFilter *iface, PIN_DIRECTION dir); -typedef HRESULT (WINAPI *TransformFilter_SetMediaType) (TransformFilter *iface, PIN_DIRECTION dir, const AM_MEDIA_TYPE *pMediaType); typedef HRESULT (WINAPI *TransformFilter_CheckInputType) (TransformFilter *iface, const AM_MEDIA_TYPE *pMediaType); typedef HRESULT (WINAPI *TransformFilter_EndOfStream) (TransformFilter *iface); typedef HRESULT (WINAPI *TransformFilter_BeginFlush) (TransformFilter *iface); @@ -216,8 +214,7 @@ typedef struct TransformFilterFuncTable { TransformFilter_Receive pfnReceive; TransformFilter_StopStreaming pfnStopStreaming; TransformFilter_CheckInputType pfnCheckInputType; - TransformFilter_SetMediaType pfnSetMediaType; - TransformFilter_CompleteConnect pfnCompleteConnect; + HRESULT (*transform_connect_sink)(TransformFilter *filter, const AM_MEDIA_TYPE *mt); TransformFilter_BreakConnect pfnBreakConnect; TransformFilter_EndOfStream pfnEndOfStream; TransformFilter_BeginFlush pfnBeginFlush; -- 2.24.0

2 5

[PATCH v2 1/5] strmbase: Combine the SetMediaType() and CompleteConnect() callbacks.
by Zebediah Figura 10 Dec '19

10 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/acmwrapper.c | 115 +++++++----------------- dlls/quartz/avidec.c | 37 ++------ dlls/strmbase/transform.c | 7 +- dlls/winegstreamer/gsttffilter.c | 146 +++++++++++-------------------- dlls/wineqtdecoder/qtvdecoder.c | 25 ++---- include/wine/strmbase.h | 5 +- 6 files changed, 103 insertions(+), 232 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 8eea6ab147d..33d9debe5cd 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -40,7 +40,6 @@ typedef struct ACMWrapperImpl TransformFilter tf; HACMSTREAM has; - LPWAVEFORMATEX pWfIn; LPWAVEFORMATEX pWfOut; LONGLONG lasttime_real; @@ -224,85 +223,43 @@ error: return hr; } -static HRESULT WINAPI ACMWrapper_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE * pmt) +static BOOL is_audio_subtype(const GUID *guid) { - ACMWrapperImpl* This = impl_from_TransformFilter(tf); - MMRESULT res; - - TRACE("(%p)->(%i %p)\n", This, dir, pmt); - - if (dir != PINDIR_INPUT) - return S_OK; - - /* Check root (GUID w/o FOURCC) */ - if ((IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio)) && - (!memcmp(((const char *)&pmt->subtype)+4, ((const char *)&MEDIATYPE_Audio)+4, sizeof(GUID)-4)) && - (IsEqualIID(&pmt->formattype, &FORMAT_WaveFormatEx))) - { - HACMSTREAM drv; - WAVEFORMATEX *wfx = (WAVEFORMATEX*)pmt->pbFormat; - AM_MEDIA_TYPE* outpmt = &This->tf.pmt; - - if (!wfx || wfx->wFormatTag == WAVE_FORMAT_PCM || wfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) - return VFW_E_TYPE_NOT_ACCEPTED; - FreeMediaType(outpmt); - - This->pWfIn = (LPWAVEFORMATEX)pmt->pbFormat; - - /* HACK */ - /* TRACE("ALIGN = %d\n", pACMWrapper->pWfIn->nBlockAlign); */ - /* pACMWrapper->pWfIn->nBlockAlign = 1; */ - - /* Set output audio data to PCM */ - CopyMediaType(outpmt, pmt); - outpmt->subtype.Data1 = WAVE_FORMAT_PCM; - This->pWfOut = (WAVEFORMATEX*)outpmt->pbFormat; - This->pWfOut->wFormatTag = WAVE_FORMAT_PCM; - This->pWfOut->wBitsPerSample = 16; - This->pWfOut->nBlockAlign = This->pWfOut->wBitsPerSample * This->pWfOut->nChannels / 8; - This->pWfOut->cbSize = 0; - This->pWfOut->nAvgBytesPerSec = This->pWfOut->nChannels * This->pWfOut->nSamplesPerSec - * (This->pWfOut->wBitsPerSample/8); - - if (!(res = acmStreamOpen(&drv, NULL, This->pWfIn, This->pWfOut, NULL, 0, 0, 0))) - { - This->has = drv; - - TRACE("Connection accepted\n"); - return S_OK; - } - else - FIXME("acmStreamOpen returned %d\n", res); - FreeMediaType(outpmt); - TRACE("Unable to find a suitable ACM decompressor\n"); - } - - TRACE("Connection refused\n"); - return VFW_E_TYPE_NOT_ACCEPTED; + return !memcmp(&guid->Data2, &MEDIATYPE_Audio.Data2, sizeof(GUID) - sizeof(int)); } -static HRESULT WINAPI ACMWrapper_CompleteConnect(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) +static HRESULT acm_wrapper_connect_sink(TransformFilter *iface, const AM_MEDIA_TYPE *mt) { - ACMWrapperImpl* This = impl_from_TransformFilter(tf); - MMRESULT res; + ACMWrapperImpl *filter = impl_from_TransformFilter(iface); + const WAVEFORMATEX *wfx = (WAVEFORMATEX *)mt->pbFormat; HACMSTREAM drv; + MMRESULT res; - TRACE("(%p)\n", This); - - if (dir != PINDIR_INPUT) - return S_OK; - - if (!(res = acmStreamOpen(&drv, NULL, This->pWfIn, This->pWfOut, NULL, 0, 0, 0))) + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio) || !is_audio_subtype(&mt->subtype) + || !IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx) || !wfx + || wfx->wFormatTag == WAVE_FORMAT_PCM || wfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + return VFW_E_TYPE_NOT_ACCEPTED; + + CopyMediaType(&filter->tf.pmt, mt); + filter->tf.pmt.subtype.Data1 = WAVE_FORMAT_PCM; + filter->pWfOut = (WAVEFORMATEX *)filter->tf.pmt.pbFormat; + filter->pWfOut->wFormatTag = WAVE_FORMAT_PCM; + filter->pWfOut->wBitsPerSample = 16; + filter->pWfOut->nBlockAlign = filter->pWfOut->wBitsPerSample * filter->pWfOut->nChannels / 8; + filter->pWfOut->cbSize = 0; + filter->pWfOut->nAvgBytesPerSec = filter->pWfOut->nChannels * filter->pWfOut->nSamplesPerSec + * (filter->pWfOut->wBitsPerSample / 8); + + if ((res = acmStreamOpen(&drv, NULL, (WAVEFORMATEX *)wfx, filter->pWfOut, NULL, 0, 0, 0))) { - This->has = drv; - - TRACE("Connection accepted\n"); - return S_OK; + ERR("Failed to open stream, error %u.\n", res); + FreeMediaType(&filter->tf.pmt); + return VFW_E_TYPE_NOT_ACCEPTED; } - FIXME("acmStreamOpen returned %d\n", res); - TRACE("Unable to find a suitable ACM decompressor\n"); - return VFW_E_TYPE_NOT_ACCEPTED; + filter->has = drv; + + return S_OK; } static HRESULT WINAPI ACMWrapper_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir) @@ -341,18 +298,10 @@ static HRESULT WINAPI ACMWrapper_DecideBufferSize(TransformFilter *tf, IMemAlloc } static const TransformFilterFuncTable ACMWrapper_FuncsTable = { - ACMWrapper_DecideBufferSize, - NULL, - ACMWrapper_Receive, - NULL, - NULL, - ACMWrapper_SetMediaType, - ACMWrapper_CompleteConnect, - ACMWrapper_BreakConnect, - NULL, - NULL, - NULL, - NULL + .pfnDecideBufferSize = ACMWrapper_DecideBufferSize, + .pfnReceive = ACMWrapper_Receive, + .transform_connect_sink = acm_wrapper_connect_sink, + .pfnBreakConnect = ACMWrapper_BreakConnect, }; HRESULT ACMWrapper_create(IUnknown *outer, void **out) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 32969a34730..abed957fa6d 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -210,16 +210,11 @@ static HRESULT WINAPI AVIDec_StopStreaming(TransformFilter* pTransformFilter) return S_OK; } -static HRESULT WINAPI AVIDec_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE * pmt) +static HRESULT avi_dec_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *pmt) { AVIDecImpl* This = impl_from_TransformFilter(tf); HRESULT hr = VFW_E_TYPE_NOT_ACCEPTED; - TRACE("(%p)->(%p)\n", This, pmt); - - if (dir != PINDIR_INPUT) - return S_OK; - /* Check root (GUID w/o FOURCC) */ if ((IsEqualIID(&pmt->majortype, &MEDIATYPE_Video)) && (!memcmp(((const char *)&pmt->subtype)+4, ((const char *)&MEDIATYPE_Video)+4, sizeof(GUID)-4))) @@ -310,15 +305,6 @@ failed: return hr; } -static HRESULT WINAPI AVIDec_CompleteConnect(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) -{ - AVIDecImpl* This = impl_from_TransformFilter(tf); - - TRACE("(%p)\n", This); - - return S_OK; -} - static HRESULT WINAPI AVIDec_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir) { AVIDecImpl *This = impl_from_TransformFilter(tf); @@ -357,19 +343,14 @@ static HRESULT WINAPI AVIDec_DecideBufferSize(TransformFilter *tf, IMemAllocator } static const TransformFilterFuncTable AVIDec_FuncsTable = { - AVIDec_DecideBufferSize, - AVIDec_StartStreaming, - AVIDec_Receive, - AVIDec_StopStreaming, - NULL, - AVIDec_SetMediaType, - AVIDec_CompleteConnect, - AVIDec_BreakConnect, - NULL, - NULL, - AVIDec_EndFlush, - NULL, - AVIDec_NotifyDrop + .pfnDecideBufferSize = AVIDec_DecideBufferSize, + .pfnStartStreaming = AVIDec_StartStreaming, + .pfnReceive = AVIDec_Receive, + .pfnStopStreaming = AVIDec_StopStreaming, + .transform_connect_sink = avi_dec_connect_sink, + .pfnBreakConnect = AVIDec_BreakConnect, + .pfnEndFlush = AVIDec_EndFlush, + .pfnNotify = AVIDec_NotifyDrop, }; HRESULT AVIDec_create(IUnknown *outer, void **out) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 7a79f709055..30ed0006cb1 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -405,11 +405,8 @@ static HRESULT WINAPI TransformFilter_InputPin_ReceiveConnection(IPin * iface, I TRACE("(%p)->(%p, %p)\n", iface, pReceivePin, pmt); strmbase_dump_media_type(pmt); - if (pTransform->pFuncsTable->pfnSetMediaType) - hr = pTransform->pFuncsTable->pfnSetMediaType(pTransform, PINDIR_INPUT, pmt); - - if (SUCCEEDED(hr) && pTransform->pFuncsTable->pfnCompleteConnect) - hr = pTransform->pFuncsTable->pfnCompleteConnect(pTransform, PINDIR_INPUT, pReceivePin); + if (pTransform->pFuncsTable->transform_connect_sink) + hr = pTransform->pFuncsTable->transform_connect_sink(pTransform, pmt); if (SUCCEEDED(hr)) { diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index ee1851dfdc6..d44a6ae33a6 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -516,7 +516,7 @@ static HRESULT WINAPI Gstreamer_Mp3_QueryConnect(TransformFilter *iface, const A return S_OK; } -static HRESULT WINAPI Gstreamer_Mp3_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT mp3_decoder_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -525,13 +525,8 @@ static HRESULT WINAPI Gstreamer_Mp3_SetMediaType(TransformFilter *tf, PIN_DIRECT HRESULT hr; int layer; - TRACE("%p 0x%x %p\n", This, dir, amt); - mark_wine_thread(); - if (dir != PINDIR_INPUT) - return S_OK; - if (Gstreamer_Mp3_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) return VFW_E_TYPE_NOT_ACCEPTED; @@ -588,26 +583,19 @@ static HRESULT WINAPI Gstreamer_Mp3_SetMediaType(TransformFilter *tf, PIN_DIRECT return hr; } -static HRESULT WINAPI Gstreamer_Mp3_ConnectInput(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) -{ - TRACE("%p 0x%x %p\n", tf, dir, pin); - return S_OK; -} - static const TransformFilterFuncTable Gstreamer_Mp3_vtbl = { - Gstreamer_transform_DecideBufferSize, - Gstreamer_transform_ProcessBegin, - Gstreamer_transform_ProcessData, - Gstreamer_transform_ProcessEnd, - Gstreamer_Mp3_QueryConnect, - Gstreamer_Mp3_SetMediaType, - Gstreamer_Mp3_ConnectInput, - Gstreamer_transform_Cleanup, - Gstreamer_transform_EndOfStream, - Gstreamer_transform_BeginFlush, - Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment, - Gstreamer_transform_QOS + .pfnDecideBufferSize = Gstreamer_transform_DecideBufferSize, + .pfnStartStreaming = Gstreamer_transform_ProcessBegin, + .pfnReceive = Gstreamer_transform_ProcessData, + .pfnStopStreaming = Gstreamer_transform_ProcessEnd, + .pfnCheckInputType = Gstreamer_Mp3_QueryConnect, + .transform_connect_sink = mp3_decoder_connect_sink, + .pfnBreakConnect = Gstreamer_transform_Cleanup, + .pfnEndOfStream = Gstreamer_transform_EndOfStream, + .pfnBeginFlush = Gstreamer_transform_BeginFlush, + .pfnEndFlush = Gstreamer_transform_EndFlush, + .pfnNewSegment = Gstreamer_transform_NewSegment, + .pfnNotify = Gstreamer_transform_QOS, }; IUnknown * CALLBACK Gstreamer_Mp3_create(IUnknown *punkouter, HRESULT *phr) @@ -664,13 +652,7 @@ static HRESULT WINAPI Gstreamer_YUV_QueryConnect(TransformFilter *iface, const A } } -static HRESULT WINAPI Gstreamer_YUV_ConnectInput(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) -{ - TRACE("%p 0x%x %p\n", tf, dir, pin); - return S_OK; -} - -static HRESULT WINAPI Gstreamer_YUV2RGB_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT yuv_to_rgb_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -679,13 +661,8 @@ static HRESULT WINAPI Gstreamer_YUV2RGB_SetMediaType(TransformFilter *tf, PIN_DI int avgtime; LONG width, height; - TRACE("%p 0x%x %p\n", This, dir, amt); - mark_wine_thread(); - if (dir != PINDIR_INPUT) - return S_OK; - if (Gstreamer_YUV_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) return E_FAIL; @@ -738,19 +715,18 @@ static HRESULT WINAPI Gstreamer_YUV2RGB_SetMediaType(TransformFilter *tf, PIN_DI } static const TransformFilterFuncTable Gstreamer_YUV2RGB_vtbl = { - Gstreamer_transform_DecideBufferSize, - Gstreamer_transform_ProcessBegin, - Gstreamer_transform_ProcessData, - Gstreamer_transform_ProcessEnd, - Gstreamer_YUV_QueryConnect, - Gstreamer_YUV2RGB_SetMediaType, - Gstreamer_YUV_ConnectInput, - Gstreamer_transform_Cleanup, - Gstreamer_transform_EndOfStream, - Gstreamer_transform_BeginFlush, - Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment, - Gstreamer_transform_QOS + .pfnDecideBufferSize = Gstreamer_transform_DecideBufferSize, + .pfnStartStreaming = Gstreamer_transform_ProcessBegin, + .pfnReceive = Gstreamer_transform_ProcessData, + .pfnStopStreaming = Gstreamer_transform_ProcessEnd, + .pfnCheckInputType = Gstreamer_YUV_QueryConnect, + .transform_connect_sink = yuv_to_rgb_connect_sink, + .pfnBreakConnect = Gstreamer_transform_Cleanup, + .pfnEndOfStream = Gstreamer_transform_EndOfStream, + .pfnBeginFlush = Gstreamer_transform_BeginFlush, + .pfnEndFlush = Gstreamer_transform_EndFlush, + .pfnNewSegment = Gstreamer_transform_NewSegment, + .pfnNotify = Gstreamer_transform_QOS, }; IUnknown * CALLBACK Gstreamer_YUV2RGB_create(IUnknown *punkouter, HRESULT *phr) @@ -772,7 +748,7 @@ IUnknown * CALLBACK Gstreamer_YUV2RGB_create(IUnknown *punkouter, HRESULT *phr) return obj; } -static HRESULT WINAPI Gstreamer_YUV2ARGB_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT yuv_to_argb_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -781,13 +757,8 @@ static HRESULT WINAPI Gstreamer_YUV2ARGB_SetMediaType(TransformFilter *tf, PIN_D int avgtime; LONG width, height; - TRACE("%p 0x%x %p\n", This, dir, amt); - mark_wine_thread(); - if (dir != PINDIR_INPUT) - return S_OK; - if (Gstreamer_YUV_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) return E_FAIL; @@ -840,19 +811,18 @@ static HRESULT WINAPI Gstreamer_YUV2ARGB_SetMediaType(TransformFilter *tf, PIN_D } static const TransformFilterFuncTable Gstreamer_YUV2ARGB_vtbl = { - Gstreamer_transform_DecideBufferSize, - Gstreamer_transform_ProcessBegin, - Gstreamer_transform_ProcessData, - Gstreamer_transform_ProcessEnd, - Gstreamer_YUV_QueryConnect, - Gstreamer_YUV2ARGB_SetMediaType, - Gstreamer_YUV_ConnectInput, - Gstreamer_transform_Cleanup, - Gstreamer_transform_EndOfStream, - Gstreamer_transform_BeginFlush, - Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment, - Gstreamer_transform_QOS + .pfnDecideBufferSize = Gstreamer_transform_DecideBufferSize, + .pfnStartStreaming = Gstreamer_transform_ProcessBegin, + .pfnReceive = Gstreamer_transform_ProcessData, + .pfnStopStreaming = Gstreamer_transform_ProcessEnd, + .pfnCheckInputType = Gstreamer_YUV_QueryConnect, + .transform_connect_sink = yuv_to_argb_connect_sink, + .pfnBreakConnect = Gstreamer_transform_Cleanup, + .pfnEndOfStream = Gstreamer_transform_EndOfStream, + .pfnBeginFlush = Gstreamer_transform_BeginFlush, + .pfnEndFlush = Gstreamer_transform_EndFlush, + .pfnNewSegment = Gstreamer_transform_NewSegment, + .pfnNotify = Gstreamer_transform_QOS, }; IUnknown * CALLBACK Gstreamer_YUV2ARGB_create(IUnknown *punkouter, HRESULT *phr) @@ -886,13 +856,7 @@ static HRESULT WINAPI Gstreamer_AudioConvert_QueryConnect(TransformFilter *iface return S_OK; } -static HRESULT WINAPI Gstreamer_AudioConvert_ConnectInput(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) -{ - TRACE("%p 0x%x %p\n", tf, dir, pin); - return S_OK; -} - -static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT audio_converter_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -905,13 +869,8 @@ static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, P BOOL inisfloat = FALSE; int indepth; - TRACE("%p 0x%x %p\n", This, dir, amt); - mark_wine_thread(); - if (dir != PINDIR_INPUT) - return S_OK; - if (Gstreamer_AudioConvert_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) return E_FAIL; @@ -972,19 +931,18 @@ static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, P } static const TransformFilterFuncTable Gstreamer_AudioConvert_vtbl = { - Gstreamer_transform_DecideBufferSize, - Gstreamer_transform_ProcessBegin, - Gstreamer_transform_ProcessData, - Gstreamer_transform_ProcessEnd, - Gstreamer_AudioConvert_QueryConnect, - Gstreamer_AudioConvert_SetMediaType, - Gstreamer_AudioConvert_ConnectInput, - Gstreamer_transform_Cleanup, - Gstreamer_transform_EndOfStream, - Gstreamer_transform_BeginFlush, - Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment, - Gstreamer_transform_QOS + .pfnDecideBufferSize = Gstreamer_transform_DecideBufferSize, + .pfnStartStreaming = Gstreamer_transform_ProcessBegin, + .pfnReceive = Gstreamer_transform_ProcessData, + .pfnStopStreaming = Gstreamer_transform_ProcessEnd, + .pfnCheckInputType = Gstreamer_AudioConvert_QueryConnect, + .transform_connect_sink = audio_converter_connect_sink, + .pfnBreakConnect = Gstreamer_transform_Cleanup, + .pfnEndOfStream = Gstreamer_transform_EndOfStream, + .pfnBeginFlush = Gstreamer_transform_BeginFlush, + .pfnEndFlush = Gstreamer_transform_EndFlush, + .pfnNewSegment = Gstreamer_transform_NewSegment, + .pfnNotify = Gstreamer_transform_QOS, }; IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *punkouter, HRESULT *phr) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 3da0738aecb..4be654e5a10 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -336,7 +336,7 @@ static HRESULT WINAPI QTVDecoder_StopStreaming(TransformFilter* pTransformFilter return S_OK; } -static HRESULT WINAPI QTVDecoder_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE * pmt) +static HRESULT video_decoder_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *pmt) { QTVDecoderImpl* This = impl_from_TransformFilter(tf); HRESULT hr = VFW_E_TYPE_NOT_ACCEPTED; @@ -344,11 +344,6 @@ static HRESULT WINAPI QTVDecoder_SetMediaType(TransformFilter *tf, PIN_DIRECTION AM_MEDIA_TYPE *outpmt = &This->tf.pmt; CFNumberRef n = NULL; - TRACE("(%p)->(%p)\n", This, pmt); - - if (dir != PINDIR_INPUT) - return S_OK; - FreeMediaType(outpmt); CopyMediaType(outpmt, pmt); @@ -502,18 +497,12 @@ static HRESULT WINAPI QTVDecoder_DecideBufferSize(TransformFilter *tf, IMemAlloc } static const TransformFilterFuncTable QTVDecoder_FuncsTable = { - QTVDecoder_DecideBufferSize, - QTVDecoder_StartStreaming, - QTVDecoder_Receive, - QTVDecoder_StopStreaming, - NULL, - QTVDecoder_SetMediaType, - NULL, - QTVDecoder_BreakConnect, - NULL, - NULL, - NULL, - NULL + .pfnDecideBufferSize = QTVDecoder_DecideBufferSize, + .pfnStartStreaming = QTVDecoder_StartStreaming, + .pfnReceive = QTVDecoder_Receive, + .pfnStopStreaming = QTVDecoder_StopStreaming, + .transform_connect_sink = video_decoder_connect_sink, + .pfnBreakConnect = QTVDecoder_BreakConnect, }; IUnknown * CALLBACK QTVDecoder_create(IUnknown *outer, HRESULT* phr) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index c3699f19253..7e3b38b49d5 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -197,9 +197,7 @@ typedef HRESULT (WINAPI *TransformFilter_DecideBufferSize) (TransformFilter *ifa typedef HRESULT (WINAPI *TransformFilter_StartStreaming) (TransformFilter *iface); typedef HRESULT (WINAPI *TransformFilter_StopStreaming) (TransformFilter *iface); typedef HRESULT (WINAPI *TransformFilter_Receive) (TransformFilter* iface, IMediaSample* pIn); -typedef HRESULT (WINAPI *TransformFilter_CompleteConnect) (TransformFilter *iface, PIN_DIRECTION dir, IPin *pPin); typedef HRESULT (WINAPI *TransformFilter_BreakConnect) (TransformFilter *iface, PIN_DIRECTION dir); -typedef HRESULT (WINAPI *TransformFilter_SetMediaType) (TransformFilter *iface, PIN_DIRECTION dir, const AM_MEDIA_TYPE *pMediaType); typedef HRESULT (WINAPI *TransformFilter_CheckInputType) (TransformFilter *iface, const AM_MEDIA_TYPE *pMediaType); typedef HRESULT (WINAPI *TransformFilter_EndOfStream) (TransformFilter *iface); typedef HRESULT (WINAPI *TransformFilter_BeginFlush) (TransformFilter *iface); @@ -216,8 +214,7 @@ typedef struct TransformFilterFuncTable { TransformFilter_Receive pfnReceive; TransformFilter_StopStreaming pfnStopStreaming; TransformFilter_CheckInputType pfnCheckInputType; - TransformFilter_SetMediaType pfnSetMediaType; - TransformFilter_CompleteConnect pfnCompleteConnect; + HRESULT (*transform_connect_sink)(TransformFilter *filter, const AM_MEDIA_TYPE *mt); TransformFilter_BreakConnect pfnBreakConnect; TransformFilter_EndOfStream pfnEndOfStream; TransformFilter_BeginFlush pfnBeginFlush; -- 2.24.0

2 7

[PATCH 1/5] strmbase: Combine the SetMediaType() and CompleteConnect() callbacks.
by Zebediah Figura 10 Dec '19

10 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/acmwrapper.c | 115 +++++++----------------- dlls/quartz/avidec.c | 37 ++------ dlls/strmbase/transform.c | 7 +- dlls/winegstreamer/gsttffilter.c | 146 +++++++++++-------------------- dlls/wineqtdecoder/qtvdecoder.c | 25 ++---- include/wine/strmbase.h | 5 +- 6 files changed, 103 insertions(+), 232 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 8eea6ab147d..33d9debe5cd 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -40,7 +40,6 @@ typedef struct ACMWrapperImpl TransformFilter tf; HACMSTREAM has; - LPWAVEFORMATEX pWfIn; LPWAVEFORMATEX pWfOut; LONGLONG lasttime_real; @@ -224,85 +223,43 @@ error: return hr; } -static HRESULT WINAPI ACMWrapper_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE * pmt) +static BOOL is_audio_subtype(const GUID *guid) { - ACMWrapperImpl* This = impl_from_TransformFilter(tf); - MMRESULT res; - - TRACE("(%p)->(%i %p)\n", This, dir, pmt); - - if (dir != PINDIR_INPUT) - return S_OK; - - /* Check root (GUID w/o FOURCC) */ - if ((IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio)) && - (!memcmp(((const char *)&pmt->subtype)+4, ((const char *)&MEDIATYPE_Audio)+4, sizeof(GUID)-4)) && - (IsEqualIID(&pmt->formattype, &FORMAT_WaveFormatEx))) - { - HACMSTREAM drv; - WAVEFORMATEX *wfx = (WAVEFORMATEX*)pmt->pbFormat; - AM_MEDIA_TYPE* outpmt = &This->tf.pmt; - - if (!wfx || wfx->wFormatTag == WAVE_FORMAT_PCM || wfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) - return VFW_E_TYPE_NOT_ACCEPTED; - FreeMediaType(outpmt); - - This->pWfIn = (LPWAVEFORMATEX)pmt->pbFormat; - - /* HACK */ - /* TRACE("ALIGN = %d\n", pACMWrapper->pWfIn->nBlockAlign); */ - /* pACMWrapper->pWfIn->nBlockAlign = 1; */ - - /* Set output audio data to PCM */ - CopyMediaType(outpmt, pmt); - outpmt->subtype.Data1 = WAVE_FORMAT_PCM; - This->pWfOut = (WAVEFORMATEX*)outpmt->pbFormat; - This->pWfOut->wFormatTag = WAVE_FORMAT_PCM; - This->pWfOut->wBitsPerSample = 16; - This->pWfOut->nBlockAlign = This->pWfOut->wBitsPerSample * This->pWfOut->nChannels / 8; - This->pWfOut->cbSize = 0; - This->pWfOut->nAvgBytesPerSec = This->pWfOut->nChannels * This->pWfOut->nSamplesPerSec - * (This->pWfOut->wBitsPerSample/8); - - if (!(res = acmStreamOpen(&drv, NULL, This->pWfIn, This->pWfOut, NULL, 0, 0, 0))) - { - This->has = drv; - - TRACE("Connection accepted\n"); - return S_OK; - } - else - FIXME("acmStreamOpen returned %d\n", res); - FreeMediaType(outpmt); - TRACE("Unable to find a suitable ACM decompressor\n"); - } - - TRACE("Connection refused\n"); - return VFW_E_TYPE_NOT_ACCEPTED; + return !memcmp(&guid->Data2, &MEDIATYPE_Audio.Data2, sizeof(GUID) - sizeof(int)); } -static HRESULT WINAPI ACMWrapper_CompleteConnect(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) +static HRESULT acm_wrapper_connect_sink(TransformFilter *iface, const AM_MEDIA_TYPE *mt) { - ACMWrapperImpl* This = impl_from_TransformFilter(tf); - MMRESULT res; + ACMWrapperImpl *filter = impl_from_TransformFilter(iface); + const WAVEFORMATEX *wfx = (WAVEFORMATEX *)mt->pbFormat; HACMSTREAM drv; + MMRESULT res; - TRACE("(%p)\n", This); - - if (dir != PINDIR_INPUT) - return S_OK; - - if (!(res = acmStreamOpen(&drv, NULL, This->pWfIn, This->pWfOut, NULL, 0, 0, 0))) + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio) || !is_audio_subtype(&mt->subtype) + || !IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx) || !wfx + || wfx->wFormatTag == WAVE_FORMAT_PCM || wfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + return VFW_E_TYPE_NOT_ACCEPTED; + + CopyMediaType(&filter->tf.pmt, mt); + filter->tf.pmt.subtype.Data1 = WAVE_FORMAT_PCM; + filter->pWfOut = (WAVEFORMATEX *)filter->tf.pmt.pbFormat; + filter->pWfOut->wFormatTag = WAVE_FORMAT_PCM; + filter->pWfOut->wBitsPerSample = 16; + filter->pWfOut->nBlockAlign = filter->pWfOut->wBitsPerSample * filter->pWfOut->nChannels / 8; + filter->pWfOut->cbSize = 0; + filter->pWfOut->nAvgBytesPerSec = filter->pWfOut->nChannels * filter->pWfOut->nSamplesPerSec + * (filter->pWfOut->wBitsPerSample / 8); + + if ((res = acmStreamOpen(&drv, NULL, (WAVEFORMATEX *)wfx, filter->pWfOut, NULL, 0, 0, 0))) { - This->has = drv; - - TRACE("Connection accepted\n"); - return S_OK; + ERR("Failed to open stream, error %u.\n", res); + FreeMediaType(&filter->tf.pmt); + return VFW_E_TYPE_NOT_ACCEPTED; } - FIXME("acmStreamOpen returned %d\n", res); - TRACE("Unable to find a suitable ACM decompressor\n"); - return VFW_E_TYPE_NOT_ACCEPTED; + filter->has = drv; + + return S_OK; } static HRESULT WINAPI ACMWrapper_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir) @@ -341,18 +298,10 @@ static HRESULT WINAPI ACMWrapper_DecideBufferSize(TransformFilter *tf, IMemAlloc } static const TransformFilterFuncTable ACMWrapper_FuncsTable = { - ACMWrapper_DecideBufferSize, - NULL, - ACMWrapper_Receive, - NULL, - NULL, - ACMWrapper_SetMediaType, - ACMWrapper_CompleteConnect, - ACMWrapper_BreakConnect, - NULL, - NULL, - NULL, - NULL + .pfnDecideBufferSize = ACMWrapper_DecideBufferSize, + .pfnReceive = ACMWrapper_Receive, + .transform_connect_sink = acm_wrapper_connect_sink, + .pfnBreakConnect = ACMWrapper_BreakConnect, }; HRESULT ACMWrapper_create(IUnknown *outer, void **out) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 32969a34730..abed957fa6d 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -210,16 +210,11 @@ static HRESULT WINAPI AVIDec_StopStreaming(TransformFilter* pTransformFilter) return S_OK; } -static HRESULT WINAPI AVIDec_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE * pmt) +static HRESULT avi_dec_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *pmt) { AVIDecImpl* This = impl_from_TransformFilter(tf); HRESULT hr = VFW_E_TYPE_NOT_ACCEPTED; - TRACE("(%p)->(%p)\n", This, pmt); - - if (dir != PINDIR_INPUT) - return S_OK; - /* Check root (GUID w/o FOURCC) */ if ((IsEqualIID(&pmt->majortype, &MEDIATYPE_Video)) && (!memcmp(((const char *)&pmt->subtype)+4, ((const char *)&MEDIATYPE_Video)+4, sizeof(GUID)-4))) @@ -310,15 +305,6 @@ failed: return hr; } -static HRESULT WINAPI AVIDec_CompleteConnect(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) -{ - AVIDecImpl* This = impl_from_TransformFilter(tf); - - TRACE("(%p)\n", This); - - return S_OK; -} - static HRESULT WINAPI AVIDec_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir) { AVIDecImpl *This = impl_from_TransformFilter(tf); @@ -357,19 +343,14 @@ static HRESULT WINAPI AVIDec_DecideBufferSize(TransformFilter *tf, IMemAllocator } static const TransformFilterFuncTable AVIDec_FuncsTable = { - AVIDec_DecideBufferSize, - AVIDec_StartStreaming, - AVIDec_Receive, - AVIDec_StopStreaming, - NULL, - AVIDec_SetMediaType, - AVIDec_CompleteConnect, - AVIDec_BreakConnect, - NULL, - NULL, - AVIDec_EndFlush, - NULL, - AVIDec_NotifyDrop + .pfnDecideBufferSize = AVIDec_DecideBufferSize, + .pfnStartStreaming = AVIDec_StartStreaming, + .pfnReceive = AVIDec_Receive, + .pfnStopStreaming = AVIDec_StopStreaming, + .transform_connect_sink = avi_dec_connect_sink, + .pfnBreakConnect = AVIDec_BreakConnect, + .pfnEndFlush = AVIDec_EndFlush, + .pfnNotify = AVIDec_NotifyDrop, }; HRESULT AVIDec_create(IUnknown *outer, void **out) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 7a79f709055..30ed0006cb1 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -405,11 +405,8 @@ static HRESULT WINAPI TransformFilter_InputPin_ReceiveConnection(IPin * iface, I TRACE("(%p)->(%p, %p)\n", iface, pReceivePin, pmt); strmbase_dump_media_type(pmt); - if (pTransform->pFuncsTable->pfnSetMediaType) - hr = pTransform->pFuncsTable->pfnSetMediaType(pTransform, PINDIR_INPUT, pmt); - - if (SUCCEEDED(hr) && pTransform->pFuncsTable->pfnCompleteConnect) - hr = pTransform->pFuncsTable->pfnCompleteConnect(pTransform, PINDIR_INPUT, pReceivePin); + if (pTransform->pFuncsTable->transform_connect_sink) + hr = pTransform->pFuncsTable->transform_connect_sink(pTransform, pmt); if (SUCCEEDED(hr)) { diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index ee1851dfdc6..d44a6ae33a6 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -516,7 +516,7 @@ static HRESULT WINAPI Gstreamer_Mp3_QueryConnect(TransformFilter *iface, const A return S_OK; } -static HRESULT WINAPI Gstreamer_Mp3_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT mp3_decoder_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -525,13 +525,8 @@ static HRESULT WINAPI Gstreamer_Mp3_SetMediaType(TransformFilter *tf, PIN_DIRECT HRESULT hr; int layer; - TRACE("%p 0x%x %p\n", This, dir, amt); - mark_wine_thread(); - if (dir != PINDIR_INPUT) - return S_OK; - if (Gstreamer_Mp3_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) return VFW_E_TYPE_NOT_ACCEPTED; @@ -588,26 +583,19 @@ static HRESULT WINAPI Gstreamer_Mp3_SetMediaType(TransformFilter *tf, PIN_DIRECT return hr; } -static HRESULT WINAPI Gstreamer_Mp3_ConnectInput(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) -{ - TRACE("%p 0x%x %p\n", tf, dir, pin); - return S_OK; -} - static const TransformFilterFuncTable Gstreamer_Mp3_vtbl = { - Gstreamer_transform_DecideBufferSize, - Gstreamer_transform_ProcessBegin, - Gstreamer_transform_ProcessData, - Gstreamer_transform_ProcessEnd, - Gstreamer_Mp3_QueryConnect, - Gstreamer_Mp3_SetMediaType, - Gstreamer_Mp3_ConnectInput, - Gstreamer_transform_Cleanup, - Gstreamer_transform_EndOfStream, - Gstreamer_transform_BeginFlush, - Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment, - Gstreamer_transform_QOS + .pfnDecideBufferSize = Gstreamer_transform_DecideBufferSize, + .pfnStartStreaming = Gstreamer_transform_ProcessBegin, + .pfnReceive = Gstreamer_transform_ProcessData, + .pfnStopStreaming = Gstreamer_transform_ProcessEnd, + .pfnCheckInputType = Gstreamer_Mp3_QueryConnect, + .transform_connect_sink = mp3_decoder_connect_sink, + .pfnBreakConnect = Gstreamer_transform_Cleanup, + .pfnEndOfStream = Gstreamer_transform_EndOfStream, + .pfnBeginFlush = Gstreamer_transform_BeginFlush, + .pfnEndFlush = Gstreamer_transform_EndFlush, + .pfnNewSegment = Gstreamer_transform_NewSegment, + .pfnNotify = Gstreamer_transform_QOS, }; IUnknown * CALLBACK Gstreamer_Mp3_create(IUnknown *punkouter, HRESULT *phr) @@ -664,13 +652,7 @@ static HRESULT WINAPI Gstreamer_YUV_QueryConnect(TransformFilter *iface, const A } } -static HRESULT WINAPI Gstreamer_YUV_ConnectInput(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) -{ - TRACE("%p 0x%x %p\n", tf, dir, pin); - return S_OK; -} - -static HRESULT WINAPI Gstreamer_YUV2RGB_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT yuv_to_rgb_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -679,13 +661,8 @@ static HRESULT WINAPI Gstreamer_YUV2RGB_SetMediaType(TransformFilter *tf, PIN_DI int avgtime; LONG width, height; - TRACE("%p 0x%x %p\n", This, dir, amt); - mark_wine_thread(); - if (dir != PINDIR_INPUT) - return S_OK; - if (Gstreamer_YUV_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) return E_FAIL; @@ -738,19 +715,18 @@ static HRESULT WINAPI Gstreamer_YUV2RGB_SetMediaType(TransformFilter *tf, PIN_DI } static const TransformFilterFuncTable Gstreamer_YUV2RGB_vtbl = { - Gstreamer_transform_DecideBufferSize, - Gstreamer_transform_ProcessBegin, - Gstreamer_transform_ProcessData, - Gstreamer_transform_ProcessEnd, - Gstreamer_YUV_QueryConnect, - Gstreamer_YUV2RGB_SetMediaType, - Gstreamer_YUV_ConnectInput, - Gstreamer_transform_Cleanup, - Gstreamer_transform_EndOfStream, - Gstreamer_transform_BeginFlush, - Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment, - Gstreamer_transform_QOS + .pfnDecideBufferSize = Gstreamer_transform_DecideBufferSize, + .pfnStartStreaming = Gstreamer_transform_ProcessBegin, + .pfnReceive = Gstreamer_transform_ProcessData, + .pfnStopStreaming = Gstreamer_transform_ProcessEnd, + .pfnCheckInputType = Gstreamer_YUV_QueryConnect, + .transform_connect_sink = yuv_to_rgb_connect_sink, + .pfnBreakConnect = Gstreamer_transform_Cleanup, + .pfnEndOfStream = Gstreamer_transform_EndOfStream, + .pfnBeginFlush = Gstreamer_transform_BeginFlush, + .pfnEndFlush = Gstreamer_transform_EndFlush, + .pfnNewSegment = Gstreamer_transform_NewSegment, + .pfnNotify = Gstreamer_transform_QOS, }; IUnknown * CALLBACK Gstreamer_YUV2RGB_create(IUnknown *punkouter, HRESULT *phr) @@ -772,7 +748,7 @@ IUnknown * CALLBACK Gstreamer_YUV2RGB_create(IUnknown *punkouter, HRESULT *phr) return obj; } -static HRESULT WINAPI Gstreamer_YUV2ARGB_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT yuv_to_argb_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -781,13 +757,8 @@ static HRESULT WINAPI Gstreamer_YUV2ARGB_SetMediaType(TransformFilter *tf, PIN_D int avgtime; LONG width, height; - TRACE("%p 0x%x %p\n", This, dir, amt); - mark_wine_thread(); - if (dir != PINDIR_INPUT) - return S_OK; - if (Gstreamer_YUV_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) return E_FAIL; @@ -840,19 +811,18 @@ static HRESULT WINAPI Gstreamer_YUV2ARGB_SetMediaType(TransformFilter *tf, PIN_D } static const TransformFilterFuncTable Gstreamer_YUV2ARGB_vtbl = { - Gstreamer_transform_DecideBufferSize, - Gstreamer_transform_ProcessBegin, - Gstreamer_transform_ProcessData, - Gstreamer_transform_ProcessEnd, - Gstreamer_YUV_QueryConnect, - Gstreamer_YUV2ARGB_SetMediaType, - Gstreamer_YUV_ConnectInput, - Gstreamer_transform_Cleanup, - Gstreamer_transform_EndOfStream, - Gstreamer_transform_BeginFlush, - Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment, - Gstreamer_transform_QOS + .pfnDecideBufferSize = Gstreamer_transform_DecideBufferSize, + .pfnStartStreaming = Gstreamer_transform_ProcessBegin, + .pfnReceive = Gstreamer_transform_ProcessData, + .pfnStopStreaming = Gstreamer_transform_ProcessEnd, + .pfnCheckInputType = Gstreamer_YUV_QueryConnect, + .transform_connect_sink = yuv_to_argb_connect_sink, + .pfnBreakConnect = Gstreamer_transform_Cleanup, + .pfnEndOfStream = Gstreamer_transform_EndOfStream, + .pfnBeginFlush = Gstreamer_transform_BeginFlush, + .pfnEndFlush = Gstreamer_transform_EndFlush, + .pfnNewSegment = Gstreamer_transform_NewSegment, + .pfnNotify = Gstreamer_transform_QOS, }; IUnknown * CALLBACK Gstreamer_YUV2ARGB_create(IUnknown *punkouter, HRESULT *phr) @@ -886,13 +856,7 @@ static HRESULT WINAPI Gstreamer_AudioConvert_QueryConnect(TransformFilter *iface return S_OK; } -static HRESULT WINAPI Gstreamer_AudioConvert_ConnectInput(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) -{ - TRACE("%p 0x%x %p\n", tf, dir, pin); - return S_OK; -} - -static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT audio_converter_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -905,13 +869,8 @@ static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, P BOOL inisfloat = FALSE; int indepth; - TRACE("%p 0x%x %p\n", This, dir, amt); - mark_wine_thread(); - if (dir != PINDIR_INPUT) - return S_OK; - if (Gstreamer_AudioConvert_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) return E_FAIL; @@ -972,19 +931,18 @@ static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, P } static const TransformFilterFuncTable Gstreamer_AudioConvert_vtbl = { - Gstreamer_transform_DecideBufferSize, - Gstreamer_transform_ProcessBegin, - Gstreamer_transform_ProcessData, - Gstreamer_transform_ProcessEnd, - Gstreamer_AudioConvert_QueryConnect, - Gstreamer_AudioConvert_SetMediaType, - Gstreamer_AudioConvert_ConnectInput, - Gstreamer_transform_Cleanup, - Gstreamer_transform_EndOfStream, - Gstreamer_transform_BeginFlush, - Gstreamer_transform_EndFlush, - Gstreamer_transform_NewSegment, - Gstreamer_transform_QOS + .pfnDecideBufferSize = Gstreamer_transform_DecideBufferSize, + .pfnStartStreaming = Gstreamer_transform_ProcessBegin, + .pfnReceive = Gstreamer_transform_ProcessData, + .pfnStopStreaming = Gstreamer_transform_ProcessEnd, + .pfnCheckInputType = Gstreamer_AudioConvert_QueryConnect, + .transform_connect_sink = audio_converter_connect_sink, + .pfnBreakConnect = Gstreamer_transform_Cleanup, + .pfnEndOfStream = Gstreamer_transform_EndOfStream, + .pfnBeginFlush = Gstreamer_transform_BeginFlush, + .pfnEndFlush = Gstreamer_transform_EndFlush, + .pfnNewSegment = Gstreamer_transform_NewSegment, + .pfnNotify = Gstreamer_transform_QOS, }; IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *punkouter, HRESULT *phr) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 3da0738aecb..4be654e5a10 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -336,7 +336,7 @@ static HRESULT WINAPI QTVDecoder_StopStreaming(TransformFilter* pTransformFilter return S_OK; } -static HRESULT WINAPI QTVDecoder_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE * pmt) +static HRESULT video_decoder_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *pmt) { QTVDecoderImpl* This = impl_from_TransformFilter(tf); HRESULT hr = VFW_E_TYPE_NOT_ACCEPTED; @@ -344,11 +344,6 @@ static HRESULT WINAPI QTVDecoder_SetMediaType(TransformFilter *tf, PIN_DIRECTION AM_MEDIA_TYPE *outpmt = &This->tf.pmt; CFNumberRef n = NULL; - TRACE("(%p)->(%p)\n", This, pmt); - - if (dir != PINDIR_INPUT) - return S_OK; - FreeMediaType(outpmt); CopyMediaType(outpmt, pmt); @@ -502,18 +497,12 @@ static HRESULT WINAPI QTVDecoder_DecideBufferSize(TransformFilter *tf, IMemAlloc } static const TransformFilterFuncTable QTVDecoder_FuncsTable = { - QTVDecoder_DecideBufferSize, - QTVDecoder_StartStreaming, - QTVDecoder_Receive, - QTVDecoder_StopStreaming, - NULL, - QTVDecoder_SetMediaType, - NULL, - QTVDecoder_BreakConnect, - NULL, - NULL, - NULL, - NULL + .pfnDecideBufferSize = QTVDecoder_DecideBufferSize, + .pfnStartStreaming = QTVDecoder_StartStreaming, + .pfnReceive = QTVDecoder_Receive, + .pfnStopStreaming = QTVDecoder_StopStreaming, + .transform_connect_sink = video_decoder_connect_sink, + .pfnBreakConnect = QTVDecoder_BreakConnect, }; IUnknown * CALLBACK QTVDecoder_create(IUnknown *outer, HRESULT* phr) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index c3699f19253..7e3b38b49d5 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -197,9 +197,7 @@ typedef HRESULT (WINAPI *TransformFilter_DecideBufferSize) (TransformFilter *ifa typedef HRESULT (WINAPI *TransformFilter_StartStreaming) (TransformFilter *iface); typedef HRESULT (WINAPI *TransformFilter_StopStreaming) (TransformFilter *iface); typedef HRESULT (WINAPI *TransformFilter_Receive) (TransformFilter* iface, IMediaSample* pIn); -typedef HRESULT (WINAPI *TransformFilter_CompleteConnect) (TransformFilter *iface, PIN_DIRECTION dir, IPin *pPin); typedef HRESULT (WINAPI *TransformFilter_BreakConnect) (TransformFilter *iface, PIN_DIRECTION dir); -typedef HRESULT (WINAPI *TransformFilter_SetMediaType) (TransformFilter *iface, PIN_DIRECTION dir, const AM_MEDIA_TYPE *pMediaType); typedef HRESULT (WINAPI *TransformFilter_CheckInputType) (TransformFilter *iface, const AM_MEDIA_TYPE *pMediaType); typedef HRESULT (WINAPI *TransformFilter_EndOfStream) (TransformFilter *iface); typedef HRESULT (WINAPI *TransformFilter_BeginFlush) (TransformFilter *iface); @@ -216,8 +214,7 @@ typedef struct TransformFilterFuncTable { TransformFilter_Receive pfnReceive; TransformFilter_StopStreaming pfnStopStreaming; TransformFilter_CheckInputType pfnCheckInputType; - TransformFilter_SetMediaType pfnSetMediaType; - TransformFilter_CompleteConnect pfnCompleteConnect; + HRESULT (*transform_connect_sink)(TransformFilter *filter, const AM_MEDIA_TYPE *mt); TransformFilter_BreakConnect pfnBreakConnect; TransformFilter_EndOfStream pfnEndOfStream; TransformFilter_BeginFlush pfnBeginFlush; -- 2.24.0

2 8

[PATCH] dmband: Get rid of the redundant debugstr_DMUS_OBJECTDESC()
by Michael Stefaniuc 09 Dec '19

09 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmband/dmutils.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index a1dc7e28a5..af24054bf4 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -122,31 +122,6 @@ static const char *debugstr_dmversion (const DMUS_VERSION *version) { HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); } -/* dump whole DMUS_OBJECTDESC struct */ -static const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { - if (pDesc) { - char buffer[1024] = "", *ptr = &buffer[0]; - - ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):\n", pDesc); - ptr += sprintf(ptr, " - dwSize = 0x%08X\n", pDesc->dwSize); - ptr += sprintf(ptr, " - dwValidData = 0x%08X ( %s)\n", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); - if (pDesc->dwValidData & DMUS_OBJ_CLASS) ptr += sprintf(ptr, " - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) ptr += sprintf(ptr, " - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) ptr += sprintf(ptr, " - ftDate = %s\n", debugstr_filetime (&pDesc->ftDate)); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) ptr += sprintf(ptr, " - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); - if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", - wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); - if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream); - - return wine_dbg_sprintf("%s", buffer); - } else { - return "(NULL)"; - } -} - HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { switch (pChunk->fccID) { @@ -303,7 +278,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, TRACE_(dmfile)("** DM Reference Begin of Load ***\n"); TRACE_(dmfile)("With Desc:\n"); - debugstr_DMUS_OBJECTDESC(&ref_desc); + debug_DMUS_OBJECTDESC(&ref_desc); { LPDIRECTMUSICGETLOADER pGetLoader = NULL; @@ -521,7 +496,7 @@ void debug_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) TRACE(" - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CLASS) TRACE(" - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); if (pDesc->dwValidData & DMUS_OBJ_OBJECT) TRACE(" - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) TRACE(" - ftDate = FIXME\n"); + if (pDesc->dwValidData & DMUS_OBJ_DATE) TRACE(" - ftDate = %s\n", debugstr_filetime(&pDesc->ftDate)); if (pDesc->dwValidData & DMUS_OBJ_VERSION) TRACE(" - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); -- 2.23.0

1 0

[PATCH] dmloader: Remove commented out dead code
by Michael Stefaniuc 09 Dec '19

09 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- There's no debugstr_DMUS_OBJECTDESC() any longer in dmloader. dlls/dmloader/container.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index bac52111ac..39b105a159 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -640,25 +640,6 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS IDirectMusicLoader_Release (pLoader); /* release loader */ -#if 0 - /* DEBUG: dumps whole container object tree: */ - if (TRACE_ON(dmloader)) { - int r = 0; - LPWINE_CONTAINER_ENTRY tmpEntry; - struct list *listEntry; - - TRACE("*** IDirectMusicContainer (%p) ***\n", This->ContainerVtbl); - TRACE(" - Objects:\n"); - LIST_FOR_EACH (listEntry, This->pContainedObjects) { - tmpEntry = LIST_ENTRY( listEntry, WINE_CONTAINER_ENTRY, entry ); - TRACE(" - Object[%i]:\n", r); - TRACE(" - wszAlias: %s\n", debugstr_w(tmpEntry->wszAlias)); - TRACE(" - Object descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC(&tmpEntry->Desc)); - r++; - } - } -#endif - return result; } -- 2.23.0

1 0

[PATCH] dmband: Add partial implementation of Band track GetParam/SetParam
by Michael Stefaniuc 09 Dec '19

09 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmband/bandtrack.c | 57 +++++++++++++++++++++++++++++++------- dlls/dmband/tests/dmband.c | 22 ++++++++++++--- 2 files changed, 65 insertions(+), 14 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index a0305bdb28..14d2c7a571 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -132,20 +132,57 @@ static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_dat return S_OK; } -static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + MUSIC_TIME *next, void *param) { - IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + + if (!type) + return E_POINTER; + if (!IsEqualGUID(type, &GUID_BandParam)) + return DMUS_E_GET_UNSUPPORTED; + + FIXME("GUID_BandParam not handled yet\n"); + + return S_OK; } -static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + void *param) { - IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (!type) + return E_POINTER; + if (FAILED(IDirectMusicTrack8_IsParamSupported(iface, type))) + return DMUS_E_TYPE_UNSUPPORTED; + + if (IsEqualGUID(type, &GUID_BandParam)) + FIXME("GUID_BandParam not handled yet\n"); + else if (IsEqualGUID(type, &GUID_Clear_All_Bands)) + FIXME("GUID_Clear_All_Bands not handled yet\n"); + else if (IsEqualGUID(type, &GUID_ConnectToDLSCollection)) + FIXME("GUID_ConnectToDLSCollection not handled yet\n"); + else if (IsEqualGUID(type, &GUID_Disable_Auto_Download)) + FIXME("GUID_Disable_Auto_Download not handled yet\n"); + else if (IsEqualGUID(type, &GUID_Download)) + FIXME("GUID_Download not handled yet\n"); + else if (IsEqualGUID(type, &GUID_DownloadToAudioPath)) + FIXME("GUID_DownloadToAudioPath not handled yet\n"); + else if (IsEqualGUID(type, &GUID_Enable_Auto_Download)) + FIXME("GUID_Enable_Auto_Download not handled yet\n"); + else if (IsEqualGUID(type, &GUID_IDirectMusicBand)) + FIXME("GUID_IDirectMusicBand not handled yet\n"); + else if (IsEqualGUID(type, &GUID_StandardMIDIFile)) + FIXME("GUID_StandardMIDIFile not handled yet\n"); + else if (IsEqualGUID(type, &GUID_UnloadFromAudioPath)) + FIXME("GUID_UnloadFromAudioPath not handled yet\n"); + + return S_OK; } static HRESULT WINAPI band_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 459d00ed1d..dce8a47ba4 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -180,6 +180,7 @@ static void test_bandtrack(void) IPersistStream *ps; CLSID class; ULARGE_INTEGER size; + char buf[64] = { 0 }; HRESULT hr; #define X(guid) &guid, #guid const struct { @@ -233,26 +234,39 @@ static void test_bandtrack(void) } hr = IDirectMusicTrack8_EndPlay(dmt8, NULL); ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); - todo_wine { hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + todo_wine ok(hr == DMUS_S_END, "IDirectMusicTrack8_Play failed: %08x\n", hr); hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); - } hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); for (i = 0; i < ARRAY_SIZE(param_types); i++) { hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[i].type); - if (param_types[i].supported) + if (param_types[i].supported) { ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", param_types[i].name, hr); - else + hr = IDirectMusicTrack8_GetParam(dmt8, param_types[i].type, 0, NULL, buf); + if (param_types[i].type != &GUID_BandParam) + ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + param_types[i].name, hr); + } else { ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[i].name, hr); + hr = IDirectMusicTrack8_GetParam(dmt8, param_types[i].type, 0, NULL, buf); + ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + param_types[i].name, hr); + hr = IDirectMusicTrack8_SetParam(dmt8, param_types[i].type, 0, buf); + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "SetParam(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + param_types[i].name, hr); + } } hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); -- 2.23.0

1 0

[PATCH] msado15: Print the debug strings and not the pointers to them
by Michael Stefaniuc 09 Dec '19

09 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msado15/connection.c | 2 +- dlls/msado15/stream.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index f33bc89a1a..ec8f907322 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -186,7 +186,7 @@ static HRESULT WINAPI connection_RollbackTrans( _Connection *iface ) static HRESULT WINAPI connection_Open( _Connection *iface, BSTR connect_str, BSTR userid, BSTR password, LONG options ) { - FIXME( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), + FIXME( "%p, %s, %s, %s, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), debugstr_w(password), options ); return E_NOTIMPL; } diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 8e88b9aa65..0755a199e0 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -258,7 +258,7 @@ static HRESULT WINAPI stream_ReadText( _Stream *iface, LONG len, BSTR *ret ) static HRESULT WINAPI stream_WriteText( _Stream *iface, BSTR data, StreamWriteEnum options ) { - FIXME( "%p, %p, %u\n", iface, debugstr_w(data), options ); + FIXME( "%p, %s, %u\n", iface, debugstr_w(data), options ); return E_NOTIMPL; } -- 2.23.0

1 0

[PATCH v2] po: Update Ukrainian translation.
by Andrey Gusev 09 Dec '19

09 Dec '19

v2: Added missing '\n' trailing. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- po/uk.po | 446 ++++++++++++++----------------------------------------- 1 file changed, 111 insertions(+), 335 deletions(-) diff --git a/po/uk.po b/po/uk.po index abf9c5e48d..693be57c13 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-12-12 15:58+0200\n" +"PO-Revision-Date: 2019-12-09 22:24+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -6830,535 +6830,387 @@ msgstr "Відсилання пошти" #: mferror.mc:249 mferror.mc:256 msgid "Begin request has already been made.\n" -msgstr "" +msgstr "Запит вже зроблено.\n" #: mferror.mc:599 -#, fuzzy -#| msgid "Already initialized.\n" msgid "Sink has not been finalized.\n" -msgstr "Вже ініціалізовано.\n" +msgstr "Вихід не було завершено.\n" #: mferror.mc:32 -#, fuzzy -#| msgid "Installation platform not supported.\n" msgid "Media Foundation platform is not initialized.\n" -msgstr "Платформа встановлення не підтримується.\n" +msgstr "Платформа Media Foundation не ініціалізована.\n" #: mferror.mc:39 msgid "Buffer is too small.\n" -msgstr "" +msgstr "Розмір буфера занадто малий.\n" #: mferror.mc:46 -#, fuzzy -#| msgid "Invalid query syntax.\n" msgid "Invalid request.\n" -msgstr "Невірний синтаксис запиту.\n" +msgstr "Невірний запит.\n" #: mferror.mc:53 -#, fuzzy -#| msgid "Invalid segment number.\n" msgid "Invalid stream number.\n" -msgstr "Невірний номер сегмента.\n" +msgstr "Невірний номер потоку.\n" #: mferror.mc:60 -#, fuzzy -#| msgid "Invalid data type.\n" msgid "Invalid media type.\n" msgstr "Невірний тип даних.\n" #: mferror.mc:67 -#, fuzzy -#| msgid "Request not accepted.\n" msgid "No more input is accepted.\n" -msgstr "Запит не прийнято.\n" +msgstr "Введення даних більше не приймається.\n" #: mferror.mc:74 -#, fuzzy -#| msgid "Already initialized.\n" msgid "Object is not initialized.\n" -msgstr "Вже ініціалізовано.\n" +msgstr "Об'єкт не ініціалізований.\n" #: mferror.mc:81 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Representation is not supported.\n" -msgstr "Запит не підтримується.\n" +msgstr "Представлення не підтримується.\n" #: mferror.mc:88 msgid "No more types in the list of suggested media types.\n" -msgstr "" +msgstr "Більше типів даних у запропонованому списку немає.\n" #: mferror.mc:95 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported service.\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Непідтримувана служба.\n" #: mferror.mc:102 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Unexpected error.\n" -msgstr "Неочікувана помилка мережі.\n" +msgstr "Неочікувана помилка.\n" #: mferror.mc:116 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid type.\n" -msgstr "Невірний час.\n" +msgstr "Невірний тип.\n" #: mferror.mc:123 -#, fuzzy -#| msgid "Invalid number format." msgid "Invalid file format.\n" -msgstr "Невірний числовий формат." +msgstr "Невірний формат файлу.\n" #: mferror.mc:137 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid timestamp.\n" -msgstr "Невірний час.\n" +msgstr "Невірна мітка часу.\n" #: mferror.mc:144 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported scheme.\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Непідтримувана схема.\n" #: mferror.mc:151 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported bytestream type.\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Непідтримуваний тип потоку даних.\n" #: mferror.mc:158 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported time format.\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Непідтримуваний формат часу.\n" #: mferror.mc:165 msgid "Timestamp is not set for the sample.\n" -msgstr "" +msgstr "Часова позначка для зразка не встановлена.\n" #: mferror.mc:172 msgid "No duration set for the sample.\n" -msgstr "" +msgstr "Тривалість для вибірки не встановлена.\n" #: mferror.mc:179 -#, fuzzy -#| msgid "Invalid data.\n" msgid "Invalid stream data.\n" -msgstr "Невірні дані.\n" +msgstr "Невірні дані потоку.\n" #: mferror.mc:186 -#, fuzzy -#| msgid "Help not available." msgid "Realtime support is not available.\n" -msgstr "Довідка недоступна." +msgstr "Підтримка в режимі реального часу недоступна.\n" #: mferror.mc:193 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported rate.\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Непідтримуваний темп.\n" #: mferror.mc:200 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported thinning.\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Непідтримуване проріджування.\n" #: mferror.mc:207 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Reversing is not supported.\n" -msgstr "Запит не підтримується.\n" +msgstr "Реверс не підтримується.\n" #: mferror.mc:214 -#, fuzzy -#| msgid "Unsupported name syntax.\n" msgid "Unsupported rate transition.\n" -msgstr "Непідтримуваний синтаксис імені.\n" +msgstr "Зміна швидкості не підтримується.\n" #: mferror.mc:221 msgid "Rate change was preempted.\n" -msgstr "" +msgstr "Перешкоджання зміни швидкості.\n" #: mferror.mc:228 -#, fuzzy -#| msgid "Sector not found.\n" msgid "Object or value wasn't found.\n" -msgstr "Сектор не знайдено.\n" +msgstr "Об'єкт або значення не знайдено.\n" #: mferror.mc:235 -#, fuzzy -#| msgid "Help not available." msgid "Value is not available.\n" -msgstr "Довідка недоступна." +msgstr "Значення недоступне.\n" #: mferror.mc:242 -#, fuzzy -#| msgid "Help not available." msgid "Clock is not available.\n" -msgstr "Довідка недоступна." +msgstr "Годинник недоступний.\n" #: mferror.mc:263 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Multiple subscribers are not supported.\n" -msgstr "Запит не підтримується.\n" +msgstr "Підтримка декількох користувачів не надається.\n" #: mferror.mc:270 -#, fuzzy -#| msgid "The driver was not enabled." msgid "The timer was orphaned.\n" -msgstr "Драйвер не підключений." +msgstr "" #: mferror.mc:277 msgid "State transition is pending.\n" -msgstr "" +msgstr "Очікується зміна стану.\n" #: mferror.mc:284 -#, fuzzy -#| msgid "Unsupported name syntax.\n" msgid "Unsupported state transition.\n" -msgstr "Непідтримуваний синтаксис імені.\n" +msgstr "Непідтримувана зміна стану.\n" #: mferror.mc:291 -#, fuzzy -#| msgid "An internal error has occurred.\n" msgid "Unrecoverable error occurred.\n" -msgstr "Виникла внутрішня помилка.\n" +msgstr "Виникла критична помилка.\n" #: mferror.mc:298 msgid "Sample has too many buffers.\n" -msgstr "" +msgstr "Зразок має занадто багато буферів.\n" #: mferror.mc:305 -#, fuzzy -#| msgid "Temporary directory not writable.\n" msgid "Sample is not writable.\n" -msgstr "Тимчасова тека недоступна для запису.\n" +msgstr "Неможливо записати зразок.\n" #: mferror.mc:312 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "Key is invalid.\n" -msgstr "Невірний шлях.\n" +msgstr "Невірний ключ.\n" #: mferror.mc:319 -#, fuzzy -#| msgid "Bad network response.\n" msgid "Bad startup version.\n" -msgstr "Погана відповідь мережі.\n" +msgstr "Некоректна версія під час запуску.\n" #: mferror.mc:326 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported caption.\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Непідтримуваний підпис.\n" #: mferror.mc:333 -#, fuzzy -#| msgid "Invalid Option" msgid "Invalid position.\n" -msgstr "Невірний параметр" +msgstr "Невірна позиція.\n" #: mferror.mc:340 -#, fuzzy -#| msgid "File not found.\n" msgid "Attribute is not found.\n" -msgstr "Файл не знайдено.\n" +msgstr "Атрибут не знайдено.\n" #: mferror.mc:347 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property type is not allowed.\n" -msgstr "Недозволений тип гачка.\n" +msgstr "Недозволений тип властивості.\n" #: mferror.mc:354 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Property type is not supported.\n" -msgstr "Запит не підтримується.\n" +msgstr "Тип властивості не підтримується.\n" #: mferror.mc:361 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is empty.\n" -msgstr "Каталог не порожній.\n" +msgstr "Властивість порожня.\n" #: mferror.mc:368 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is not empty.\n" -msgstr "Каталог не порожній.\n" +msgstr "Властивість не порожня.\n" #: mferror.mc:375 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Vector property is not allowed.\n" -msgstr "Недозволений тип гачка.\n" +msgstr "Недозволена векторна властивість.\n" #: mferror.mc:382 msgid "Vector property is required.\n" -msgstr "" +msgstr "Потребується векторна властивість.\n" #: mferror.mc:389 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Operation was cancelled.\n" -msgstr "Операція скасована користувачем.\n" +msgstr "Операція була скасована.\n" #: mferror.mc:396 -#, fuzzy -#| msgid "Server not disabled.\n" msgid "Bytestream is not seekable.\n" -msgstr "Сервер не вимкнений.\n" +msgstr "Потік не є послідовним.\n" #: mferror.mc:403 msgid "Platform is disabled in safe mode.\n" -msgstr "" +msgstr "Платформа відключена в безпечному режимі.\n" #: mferror.mc:410 -#, fuzzy -#| msgid "Cannot create.\n" msgid "Cannot parse bytestream.\n" -msgstr "Неможливо створити.\n" +msgstr "Неможливо розібрати потік даних.\n" #: mferror.mc:417 msgid "Mutually exclusive flags passed to source resolver.\n" -msgstr "" +msgstr "Конфліктні прапори передані до вихідної резолюції.\n" #: mferror.mc:424 -#, fuzzy -#| msgid "Unknown interface.\n" msgid "Unknown bytestream length.\n" -msgstr "Невідомий інтерфейс.\n" +msgstr "Невідома довжина потоку.\n" #: mferror.mc:431 -#, fuzzy -#| msgid "Invalid index.\n" msgid "Invalid work queue index.\n" -msgstr "Невірний індекс.\n" +msgstr "Невірний індекс черги завдань.\n" #: mferror.mc:438 -#, fuzzy -#| msgid "No more data available.\n" msgid "No events available.\n" -msgstr "Даних більше немає.\n" +msgstr "Подій немає.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Unsupported name syntax.\n" msgid "Invalid media source state transition.\n" -msgstr "Непідтримуваний синтаксис імені.\n" +msgstr "Невірна зміна стану джерела медіа.\n" #: mferror.mc:452 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "End of media stream has been reached.\n" -msgstr "Реєстр відновлено.\n" +msgstr "Досягнуто кінця медіапотоку.\n" #: mferror.mc:459 msgid "Shutdown() was called.\n" -msgstr "" +msgstr "Було викликано Shutdown().\n" #: mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "Реєстр відновлено.\n" +msgstr "Тривалості для медіапотоку не встановлено.\n" #: mferror.mc:473 msgid "Media format was recognized but is invalid.\n" -msgstr "" +msgstr "Формат медіа був розпізнаний, але він невірний.\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "Набір властивостей не знайдено.\n" +msgstr "Властивість не знайдено.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is read-only.\n" -msgstr "Каталог не порожній.\n" +msgstr "Властивість лише для читання.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property is not allowed.\n" -msgstr "Недозволений тип гачка.\n" +msgstr "Недозволена властивість.\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started.\n" -msgstr "Ресурс використовується.\n" +msgstr "Джерело медіа не запускається.\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media format.\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Непідтримуваний формат медіа.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is in wrong state.\n" -msgstr "Ресурс використовується.\n" +msgstr "Невірний стан джерела медіа.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "Даних не виявлено.\n" +msgstr "Не вибрано потоків медіа.\n" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media source characteristics.\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Непідтримувані характеристики джерела медіа.\n" #: mferror.mc:536 msgid "Stream sink was removed.\n" -msgstr "" +msgstr "Вихід потоку даних видалено.\n" #: mferror.mc:543 msgid "Stream sinks are out of sync.\n" -msgstr "" +msgstr "Потік даних не синхронізується.\n" #: mferror.mc:550 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media sink stream sinks set is fixed.\n" -msgstr "Реєстр відновлено.\n" +msgstr "Запис виходу потоку даних медіавиходу неможливо змінити.\n" #: mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "Домен вже існує.\n" +msgstr "Вихід потоку даних вже існує.\n" #: mferror.mc:564 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Sample allocation was canceled.\n" -msgstr "Операція скасована користувачем.\n" +msgstr "Виділення зразка було перервано.\n" #: mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "Каталог не порожній.\n" +msgstr "Розподільник зразків порожній.\n" #: mferror.mc:578 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Sink was already stopped.\n" -msgstr "Клас вже існує.\n" +msgstr "Вихід вже було припинино.\n" #: mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" -msgstr "" +msgstr "Невідомий бітрейт для виводу файлу ASF.\n" #: mferror.mc:592 -#, fuzzy -#| msgid "No data detected.\n" msgid "No streams were selected for the sink.\n" -msgstr "Даних не виявлено.\n" +msgstr "Для виводу не вибрано потоків даних.\n" #: mferror.mc:606 -#, fuzzy -#| msgid "File name is too long.\n" msgid "Metadata was too long.\n" -msgstr "Ім'я файлу занадто довге.\n" +msgstr "Метадані були занадто довгими.\n" #: mferror.mc:613 msgid "No samples were processed by the sink.\n" -msgstr "" +msgstr "Жодні зразки не оброблялися результатами.\n" #: mferror.mc:620 msgid "Sink was not provided with required headers.\n" -msgstr "" +msgstr "Вихідні дані не були забезпечені необхідними заголовками.\n" #: mferror.mc:627 -#, fuzzy -#| msgid "Connection invalid.\n" msgid "Optional node is invalid.\n" -msgstr "Невірне з'єднання.\n" +msgstr "Необов’язковий вузол невірний.\n" #: mferror.mc:634 -#, fuzzy -#| msgid "Cannot find the printer." msgid "Cannot find decryptor.\n" -msgstr "Не вдалось знайти принтер." +msgstr "Модуль розшифровки не знайдено.\n" #: mferror.mc:641 -#, fuzzy -#| msgid "Module not found.\n" msgid "Codec was not found.\n" -msgstr "Модуль не знайдено.\n" +msgstr "Кодек не було знайдено.\n" #: mferror.mc:648 msgid "Cannot connect topology nodes.\n" -msgstr "" +msgstr "Не вдалося підключити топологічні вузли.\n" #: mferror.mc:655 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Topology request is not supported.\n" -msgstr "Запит не підтримується.\n" +msgstr "Запит на топологію не підтримується.\n" #: mferror.mc:662 -#, fuzzy -#| msgid "Invalid oplock message received.\n" msgid "Invalid topology time attributes.\n" -msgstr "Отримане невірне oplock-повідомлення.\n" +msgstr "Невірні атрибути часу топології.\n" #: mferror.mc:669 msgid "Found loops in topology.\n" -msgstr "" +msgstr "Знайдені петлі в топології.\n" #: mferror.mc:676 -#, fuzzy -#| msgid "Installation source is missing.\n" msgid "Presentation descriptor is missing.\n" -msgstr "Джерело встановлення втрачене.\n" +msgstr "Дескриптор презентації відсутній.\n" #: mferror.mc:683 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Stream descriptor is missing.\n" -msgstr "Індекс загублений.\n" +msgstr "Дескриптор потоку відсутній.\n" #: mferror.mc:690 -#, fuzzy -#| msgid "The device is not connected.\n" msgid "Stream descriptor is not selected.\n" -msgstr "Пристрій не під'єднаний.\n" +msgstr "Дескриптор потоку не вибраний.\n" #: mferror.mc:697 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Source is missing.\n" -msgstr "Індекс загублений.\n" +msgstr "Джерело відсутнє.\n" #: mferror.mc:704 msgid "Topology loader does not support sink activates.\n" -msgstr "" +msgstr "Завантажувач топології не підтримує вихідний сигнал.\n" #: mferror.mc:711 msgid "Clock has no time source set.\n" -msgstr "" +msgstr "У годинника немає призначеного джерела часу.\n" #: mferror.mc:718 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Clock state was already set.\n" -msgstr "Клас вже існує.\n" +msgstr "Статус годинника вже встановлено.\n" #: mpr.rc:35 wininet.rc:37 msgid "Enter Network Password" @@ -9718,16 +9570,12 @@ msgid "Cape Verde Daylight Time" msgstr "" #: tzres.rc:74 -#, fuzzy -#| msgid "Central European" msgid "Central European Standard Time" -msgstr "Центральноєвропейський" +msgstr "" #: tzres.rc:75 -#, fuzzy -#| msgid "Central European" msgid "Central European Daylight Time" -msgstr "Центральноєвропейський" +msgstr "" #: tzres.rc:140 msgid "Morocco Standard Time" @@ -9738,16 +9586,12 @@ msgid "Morocco Daylight Time" msgstr "" #: tzres.rc:72 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Standard Time" -msgstr "Центральноєвропейський" +msgstr "" #: tzres.rc:73 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Daylight Time" -msgstr "Центральноєвропейський" +msgstr "" #: tzres.rc:118 msgid "Iran Standard Time" @@ -9782,10 +9626,8 @@ msgid "Mountain Daylight Time (Mexico)" msgstr "" #: tzres.rc:106 -#, fuzzy -#| msgid "&Standard bar" msgid "GMT Standard Time" -msgstr "&Стандартна панель" +msgstr "" #: tzres.rc:107 msgid "GMT Daylight Time" @@ -9956,10 +9798,8 @@ msgid "India Daylight Time" msgstr "" #: tzres.rc:112 -#, fuzzy -#| msgid "&Standard bar" msgid "GTB Standard Time" -msgstr "&Стандартна панель" +msgstr "" #: tzres.rc:113 msgid "GTB Daylight Time" @@ -10278,10 +10118,8 @@ msgid "Paraguay Daylight Time" msgstr "" #: tzres.rc:84 -#, fuzzy -#| msgid "Date and time" msgid "Dateline Standard Time" -msgstr "Дата та час" +msgstr "" #: tzres.rc:85 msgid "Dateline Daylight Time" @@ -10368,16 +10206,12 @@ msgid "Greenland Daylight Time" msgstr "" #: tzres.rc:92 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Standard Time" -msgstr "Дата та час" +msgstr "" #: tzres.rc:93 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Daylight Time" -msgstr "Дата та час" +msgstr "" #: tzres.rc:96 msgid "Egypt Standard Time" @@ -10428,10 +10262,8 @@ msgid "E. Africa Daylight Time" msgstr "" #: tzres.rc:102 -#, fuzzy -#| msgid "&Standard bar" msgid "FLE Standard Time" -msgstr "&Стандартна панель" +msgstr "" #: tzres.rc:103 msgid "FLE Daylight Time" @@ -11249,10 +11081,6 @@ msgstr "" "використовувати їх одночасно." #: winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." @@ -11273,10 +11101,6 @@ msgid "An error occurred with the specified port." msgstr "Сталася помилка зі вказаним портом." #: winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." @@ -15428,7 +15252,7 @@ msgstr "Переглядач звичайних метафайлів" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Метафайли (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program" @@ -15596,16 +15420,12 @@ msgid "Drive configuration" msgstr "Налаштування привода" #: winecfg.rc:233 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." msgstr "" -"Неможливо з'єднатися з менеджером монтування, конфігурація дисків не буде " -"редагуватися." +"Неможливо з'єднатися з менеджером монтування, конфігурацію дисків не можна " +"редагувати." #: winecfg.rc:236 msgid "A&dd..." @@ -15891,19 +15711,13 @@ msgid "System drive" msgstr "Системний диск" #: winecfg.rc:76 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" "Most Windows applications expect drive C to exist, and will die messily if " "it doesn't. If you proceed, remember to recreate it!" msgstr "" -"Справді видалити диск C?\n" +"Ви впевнені, що хочете видалити диск C?\n" "\n" "Більшість Windows-програм перестануть працювати без диску C. Якщо ви все ж " "вирішили видалити диск, не забудьте створити новий!" @@ -16979,10 +16793,8 @@ msgid "Text documents (*.txt)" msgstr "Текстові документи (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" -msgstr "Текстовий документ Юнікод (*.txt)" +msgstr "Текстові документи Юнікод (*.txt)" #: wordpad.rc:150 msgid "Rich text format (*.rtf)" @@ -17183,42 +16995,6 @@ msgid "D" msgstr "Д" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/K] Copy file attributes, without this attributes are not preserved.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" -- 2.23.0

1 0

[PATCH] po: Update Ukrainian translation.
by Andrey Gusev 09 Dec '19

09 Dec '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- po/uk.po | 446 ++++++++++++++----------------------------------------- 1 file changed, 111 insertions(+), 335 deletions(-) diff --git a/po/uk.po b/po/uk.po index abf9c5e48d..0fc5b2a7ea 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-12-12 15:58+0200\n" +"PO-Revision-Date: 2019-12-09 22:03+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -6830,535 +6830,387 @@ msgstr "Відсилання пошти" #: mferror.mc:249 mferror.mc:256 msgid "Begin request has already been made.\n" -msgstr "" +msgstr "Запит вже зроблено.\n" #: mferror.mc:599 -#, fuzzy -#| msgid "Already initialized.\n" msgid "Sink has not been finalized.\n" -msgstr "Вже ініціалізовано.\n" +msgstr "Вихід не було завершено.\n" #: mferror.mc:32 -#, fuzzy -#| msgid "Installation platform not supported.\n" msgid "Media Foundation platform is not initialized.\n" -msgstr "Платформа встановлення не підтримується.\n" +msgstr "Платформа Media Foundation не ініціалізована.\n" #: mferror.mc:39 msgid "Buffer is too small.\n" -msgstr "" +msgstr "Розмір буфера занадто малий.\n" #: mferror.mc:46 -#, fuzzy -#| msgid "Invalid query syntax.\n" msgid "Invalid request.\n" -msgstr "Невірний синтаксис запиту.\n" +msgstr "Невірний запит.\n" #: mferror.mc:53 -#, fuzzy -#| msgid "Invalid segment number.\n" msgid "Invalid stream number.\n" -msgstr "Невірний номер сегмента.\n" +msgstr "Невірний номер потоку.\n" #: mferror.mc:60 -#, fuzzy -#| msgid "Invalid data type.\n" msgid "Invalid media type.\n" msgstr "Невірний тип даних.\n" #: mferror.mc:67 -#, fuzzy -#| msgid "Request not accepted.\n" msgid "No more input is accepted.\n" -msgstr "Запит не прийнято.\n" +msgstr "Введення даних більше не приймається.\n" #: mferror.mc:74 -#, fuzzy -#| msgid "Already initialized.\n" msgid "Object is not initialized.\n" -msgstr "Вже ініціалізовано.\n" +msgstr "Об'єкт не ініціалізований.\n" #: mferror.mc:81 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Representation is not supported.\n" -msgstr "Запит не підтримується.\n" +msgstr "Представлення не підтримується.\n" #: mferror.mc:88 msgid "No more types in the list of suggested media types.\n" -msgstr "" +msgstr "Більше типів даних у запропонованому списку немає.\n" #: mferror.mc:95 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported service.\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Непідтримувана служба.\n" #: mferror.mc:102 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Unexpected error.\n" -msgstr "Неочікувана помилка мережі.\n" +msgstr "Неочікувана помилка.\n" #: mferror.mc:116 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid type.\n" -msgstr "Невірний час.\n" +msgstr "Невірний тип.\n" #: mferror.mc:123 -#, fuzzy -#| msgid "Invalid number format." msgid "Invalid file format.\n" -msgstr "Невірний числовий формат." +msgstr "Невірний формат файлу." #: mferror.mc:137 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid timestamp.\n" -msgstr "Невірний час.\n" +msgstr "Невірна мітка часу.\n" #: mferror.mc:144 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported scheme.\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Непідтримувана схема.\n" #: mferror.mc:151 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported bytestream type.\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Непідтримуваний тип потоку даних.\n" #: mferror.mc:158 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported time format.\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Непідтримуваний формат часу.\n" #: mferror.mc:165 msgid "Timestamp is not set for the sample.\n" -msgstr "" +msgstr "Часова позначка для зразка не встановлена.\n" #: mferror.mc:172 msgid "No duration set for the sample.\n" -msgstr "" +msgstr "Тривалість для вибірки не встановлена.\n" #: mferror.mc:179 -#, fuzzy -#| msgid "Invalid data.\n" msgid "Invalid stream data.\n" -msgstr "Невірні дані.\n" +msgstr "Невірні дані потоку.\n" #: mferror.mc:186 -#, fuzzy -#| msgid "Help not available." msgid "Realtime support is not available.\n" -msgstr "Довідка недоступна." +msgstr "Підтримка в режимі реального часу недоступна.\n" #: mferror.mc:193 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported rate.\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Непідтримуваний темп.\n" #: mferror.mc:200 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported thinning.\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Непідтримуване проріджування.\n" #: mferror.mc:207 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Reversing is not supported.\n" -msgstr "Запит не підтримується.\n" +msgstr "Реверс не підтримується.\n" #: mferror.mc:214 -#, fuzzy -#| msgid "Unsupported name syntax.\n" msgid "Unsupported rate transition.\n" -msgstr "Непідтримуваний синтаксис імені.\n" +msgstr "Зміна швидкості не підтримується.\n" #: mferror.mc:221 msgid "Rate change was preempted.\n" -msgstr "" +msgstr "Перешкоджання зміни швидкості.\n" #: mferror.mc:228 -#, fuzzy -#| msgid "Sector not found.\n" msgid "Object or value wasn't found.\n" -msgstr "Сектор не знайдено.\n" +msgstr "Об'єкт або значення не знайдено.\n" #: mferror.mc:235 -#, fuzzy -#| msgid "Help not available." msgid "Value is not available.\n" -msgstr "Довідка недоступна." +msgstr "Значення недоступне." #: mferror.mc:242 -#, fuzzy -#| msgid "Help not available." msgid "Clock is not available.\n" -msgstr "Довідка недоступна." +msgstr "Годинник недоступний.\n" #: mferror.mc:263 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Multiple subscribers are not supported.\n" -msgstr "Запит не підтримується.\n" +msgstr "Підтримка декількох користувачів не надається.\n" #: mferror.mc:270 -#, fuzzy -#| msgid "The driver was not enabled." msgid "The timer was orphaned.\n" -msgstr "Драйвер не підключений." +msgstr "" #: mferror.mc:277 msgid "State transition is pending.\n" -msgstr "" +msgstr "Очікується зміна стану.\n" #: mferror.mc:284 -#, fuzzy -#| msgid "Unsupported name syntax.\n" msgid "Unsupported state transition.\n" -msgstr "Непідтримуваний синтаксис імені.\n" +msgstr "Непідтримувана зміна стану.\n" #: mferror.mc:291 -#, fuzzy -#| msgid "An internal error has occurred.\n" msgid "Unrecoverable error occurred.\n" -msgstr "Виникла внутрішня помилка.\n" +msgstr "Виникла критична помилка.\n" #: mferror.mc:298 msgid "Sample has too many buffers.\n" -msgstr "" +msgstr "Зразок має занадто багато буферів.\n" #: mferror.mc:305 -#, fuzzy -#| msgid "Temporary directory not writable.\n" msgid "Sample is not writable.\n" -msgstr "Тимчасова тека недоступна для запису.\n" +msgstr "Неможливо записати зразок.\n" #: mferror.mc:312 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "Key is invalid.\n" -msgstr "Невірний шлях.\n" +msgstr "Невірний ключ.\n" #: mferror.mc:319 -#, fuzzy -#| msgid "Bad network response.\n" msgid "Bad startup version.\n" -msgstr "Погана відповідь мережі.\n" +msgstr "Некоректна версія під час запуску.\n" #: mferror.mc:326 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported caption.\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Непідтримуваний підпис.\n" #: mferror.mc:333 -#, fuzzy -#| msgid "Invalid Option" msgid "Invalid position.\n" -msgstr "Невірний параметр" +msgstr "Невірна позиція.\n" #: mferror.mc:340 -#, fuzzy -#| msgid "File not found.\n" msgid "Attribute is not found.\n" -msgstr "Файл не знайдено.\n" +msgstr "Атрибут не знайдено.\n" #: mferror.mc:347 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property type is not allowed.\n" -msgstr "Недозволений тип гачка.\n" +msgstr "Недозволений тип властивості.\n" #: mferror.mc:354 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Property type is not supported.\n" -msgstr "Запит не підтримується.\n" +msgstr "Тип властивості не підтримується.\n" #: mferror.mc:361 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is empty.\n" -msgstr "Каталог не порожній.\n" +msgstr "Властивість порожня.\n" #: mferror.mc:368 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is not empty.\n" -msgstr "Каталог не порожній.\n" +msgstr "Властивість не порожня.\n" #: mferror.mc:375 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Vector property is not allowed.\n" -msgstr "Недозволений тип гачка.\n" +msgstr "Недозволена векторна властивість.\n" #: mferror.mc:382 msgid "Vector property is required.\n" -msgstr "" +msgstr "Потребується векторна властивість.\n" #: mferror.mc:389 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Operation was cancelled.\n" -msgstr "Операція скасована користувачем.\n" +msgstr "Операція була скасована.\n" #: mferror.mc:396 -#, fuzzy -#| msgid "Server not disabled.\n" msgid "Bytestream is not seekable.\n" -msgstr "Сервер не вимкнений.\n" +msgstr "Потік не є послідовним.\n" #: mferror.mc:403 msgid "Platform is disabled in safe mode.\n" -msgstr "" +msgstr "Платформа відключена в безпечному режимі.\n" #: mferror.mc:410 -#, fuzzy -#| msgid "Cannot create.\n" msgid "Cannot parse bytestream.\n" -msgstr "Неможливо створити.\n" +msgstr "Неможливо розібрати потік даних.\n" #: mferror.mc:417 msgid "Mutually exclusive flags passed to source resolver.\n" -msgstr "" +msgstr "Конфліктні прапори передані до вихідної резолюції.\n" #: mferror.mc:424 -#, fuzzy -#| msgid "Unknown interface.\n" msgid "Unknown bytestream length.\n" -msgstr "Невідомий інтерфейс.\n" +msgstr "Невідома довжина потоку.\n" #: mferror.mc:431 -#, fuzzy -#| msgid "Invalid index.\n" msgid "Invalid work queue index.\n" -msgstr "Невірний індекс.\n" +msgstr "Невірний індекс черги завдань.\n" #: mferror.mc:438 -#, fuzzy -#| msgid "No more data available.\n" msgid "No events available.\n" -msgstr "Даних більше немає.\n" +msgstr "Подій немає.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Unsupported name syntax.\n" msgid "Invalid media source state transition.\n" -msgstr "Непідтримуваний синтаксис імені.\n" +msgstr "Невірна зміна стану джерела медіа.\n" #: mferror.mc:452 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "End of media stream has been reached.\n" -msgstr "Реєстр відновлено.\n" +msgstr "Досягнуто кінця медіапотоку.\n" #: mferror.mc:459 msgid "Shutdown() was called.\n" -msgstr "" +msgstr "Було викликано Shutdown().\n" #: mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "Реєстр відновлено.\n" +msgstr "Тривалості для медіапотоку не встановлено.\n" #: mferror.mc:473 msgid "Media format was recognized but is invalid.\n" -msgstr "" +msgstr "Формат медіа був розпізнаний, але він невірний.\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "Набір властивостей не знайдено.\n" +msgstr "Властивість не знайдено.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is read-only.\n" -msgstr "Каталог не порожній.\n" +msgstr "Властивість лише для читання.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property is not allowed.\n" -msgstr "Недозволений тип гачка.\n" +msgstr "Недозволена властивість.\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started.\n" -msgstr "Ресурс використовується.\n" +msgstr "Джерело медіа не запускається.\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media format.\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Непідтримуваний формат медіа.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is in wrong state.\n" -msgstr "Ресурс використовується.\n" +msgstr "Невірний стан джерела медіа.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "Даних не виявлено.\n" +msgstr "Не вибрано потоків медіа.\n" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media source characteristics.\n" -msgstr "Непідтримуваний тип.\n" +msgstr "Непідтримувані характеристики джерела медіа.\n" #: mferror.mc:536 msgid "Stream sink was removed.\n" -msgstr "" +msgstr "Вихід потоку даних видалено.\n" #: mferror.mc:543 msgid "Stream sinks are out of sync.\n" -msgstr "" +msgstr "Потік даних не синхронізується.\n" #: mferror.mc:550 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media sink stream sinks set is fixed.\n" -msgstr "Реєстр відновлено.\n" +msgstr "Запис виходу потоку даних медіавиходу неможливо змінити.\n" #: mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "Домен вже існує.\n" +msgstr "Вихід потоку даних вже існує.\n" #: mferror.mc:564 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Sample allocation was canceled.\n" -msgstr "Операція скасована користувачем.\n" +msgstr "Виділення зразка було перервано.\n" #: mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "Каталог не порожній.\n" +msgstr "Розподільник зразків порожній.\n" #: mferror.mc:578 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Sink was already stopped.\n" -msgstr "Клас вже існує.\n" +msgstr "Вихід вже було припинино.\n" #: mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" -msgstr "" +msgstr "Невідомий бітрейт для виводу файлу ASF.\n" #: mferror.mc:592 -#, fuzzy -#| msgid "No data detected.\n" msgid "No streams were selected for the sink.\n" -msgstr "Даних не виявлено.\n" +msgstr "Для виводу не вибрано потоків даних.\n" #: mferror.mc:606 -#, fuzzy -#| msgid "File name is too long.\n" msgid "Metadata was too long.\n" -msgstr "Ім'я файлу занадто довге.\n" +msgstr "Метадані були занадто довгими.\n" #: mferror.mc:613 msgid "No samples were processed by the sink.\n" -msgstr "" +msgstr "Жодні зразки не оброблялися результатами.\n" #: mferror.mc:620 msgid "Sink was not provided with required headers.\n" -msgstr "" +msgstr "Вихідні дані не були забезпечені необхідними заголовками.\n" #: mferror.mc:627 -#, fuzzy -#| msgid "Connection invalid.\n" msgid "Optional node is invalid.\n" -msgstr "Невірне з'єднання.\n" +msgstr "Необов’язковий вузол невірний.\n" #: mferror.mc:634 -#, fuzzy -#| msgid "Cannot find the printer." msgid "Cannot find decryptor.\n" -msgstr "Не вдалось знайти принтер." +msgstr "Модуль розшифровки не знайдено.\n" #: mferror.mc:641 -#, fuzzy -#| msgid "Module not found.\n" msgid "Codec was not found.\n" -msgstr "Модуль не знайдено.\n" +msgstr "Кодек не було знайдено.\n" #: mferror.mc:648 msgid "Cannot connect topology nodes.\n" -msgstr "" +msgstr "Не вдалося підключити топологічні вузли.\n" #: mferror.mc:655 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Topology request is not supported.\n" -msgstr "Запит не підтримується.\n" +msgstr "Запит на топологію не підтримується.\n" #: mferror.mc:662 -#, fuzzy -#| msgid "Invalid oplock message received.\n" msgid "Invalid topology time attributes.\n" -msgstr "Отримане невірне oplock-повідомлення.\n" +msgstr "Невірні атрибути часу топології.\n" #: mferror.mc:669 msgid "Found loops in topology.\n" -msgstr "" +msgstr "Знайдені петлі в топології.\n" #: mferror.mc:676 -#, fuzzy -#| msgid "Installation source is missing.\n" msgid "Presentation descriptor is missing.\n" -msgstr "Джерело встановлення втрачене.\n" +msgstr "Дескриптор презентації відсутній.\n" #: mferror.mc:683 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Stream descriptor is missing.\n" -msgstr "Індекс загублений.\n" +msgstr "Дескриптор потоку відсутній.\n" #: mferror.mc:690 -#, fuzzy -#| msgid "The device is not connected.\n" msgid "Stream descriptor is not selected.\n" -msgstr "Пристрій не під'єднаний.\n" +msgstr "Дескриптор потоку не вибраний.\n" #: mferror.mc:697 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Source is missing.\n" -msgstr "Індекс загублений.\n" +msgstr "Джерело відсутнє.\n" #: mferror.mc:704 msgid "Topology loader does not support sink activates.\n" -msgstr "" +msgstr "Завантажувач топології не підтримує вихідний сигнал.\n" #: mferror.mc:711 msgid "Clock has no time source set.\n" -msgstr "" +msgstr "У годинника немає призначеного джерела часу.\n" #: mferror.mc:718 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Clock state was already set.\n" -msgstr "Клас вже існує.\n" +msgstr "Статус годинника вже встановлено.\n" #: mpr.rc:35 wininet.rc:37 msgid "Enter Network Password" @@ -9718,16 +9570,12 @@ msgid "Cape Verde Daylight Time" msgstr "" #: tzres.rc:74 -#, fuzzy -#| msgid "Central European" msgid "Central European Standard Time" -msgstr "Центральноєвропейський" +msgstr "" #: tzres.rc:75 -#, fuzzy -#| msgid "Central European" msgid "Central European Daylight Time" -msgstr "Центральноєвропейський" +msgstr "" #: tzres.rc:140 msgid "Morocco Standard Time" @@ -9738,16 +9586,12 @@ msgid "Morocco Daylight Time" msgstr "" #: tzres.rc:72 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Standard Time" -msgstr "Центральноєвропейський" +msgstr "" #: tzres.rc:73 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Daylight Time" -msgstr "Центральноєвропейський" +msgstr "" #: tzres.rc:118 msgid "Iran Standard Time" @@ -9782,10 +9626,8 @@ msgid "Mountain Daylight Time (Mexico)" msgstr "" #: tzres.rc:106 -#, fuzzy -#| msgid "&Standard bar" msgid "GMT Standard Time" -msgstr "&Стандартна панель" +msgstr "" #: tzres.rc:107 msgid "GMT Daylight Time" @@ -9956,10 +9798,8 @@ msgid "India Daylight Time" msgstr "" #: tzres.rc:112 -#, fuzzy -#| msgid "&Standard bar" msgid "GTB Standard Time" -msgstr "&Стандартна панель" +msgstr "" #: tzres.rc:113 msgid "GTB Daylight Time" @@ -10278,10 +10118,8 @@ msgid "Paraguay Daylight Time" msgstr "" #: tzres.rc:84 -#, fuzzy -#| msgid "Date and time" msgid "Dateline Standard Time" -msgstr "Дата та час" +msgstr "" #: tzres.rc:85 msgid "Dateline Daylight Time" @@ -10368,16 +10206,12 @@ msgid "Greenland Daylight Time" msgstr "" #: tzres.rc:92 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Standard Time" -msgstr "Дата та час" +msgstr "" #: tzres.rc:93 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Daylight Time" -msgstr "Дата та час" +msgstr "" #: tzres.rc:96 msgid "Egypt Standard Time" @@ -10428,10 +10262,8 @@ msgid "E. Africa Daylight Time" msgstr "" #: tzres.rc:102 -#, fuzzy -#| msgid "&Standard bar" msgid "FLE Standard Time" -msgstr "&Стандартна панель" +msgstr "" #: tzres.rc:103 msgid "FLE Daylight Time" @@ -11249,10 +11081,6 @@ msgstr "" "використовувати їх одночасно." #: winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." @@ -11273,10 +11101,6 @@ msgid "An error occurred with the specified port." msgstr "Сталася помилка зі вказаним портом." #: winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." @@ -15428,7 +15252,7 @@ msgstr "Переглядач звичайних метафайлів" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Метафайли (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program" @@ -15596,16 +15420,12 @@ msgid "Drive configuration" msgstr "Налаштування привода" #: winecfg.rc:233 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." msgstr "" -"Неможливо з'єднатися з менеджером монтування, конфігурація дисків не буде " -"редагуватися." +"Неможливо з'єднатися з менеджером монтування, конфігурацію дисків не можна " +"редагувати." #: winecfg.rc:236 msgid "A&dd..." @@ -15891,19 +15711,13 @@ msgid "System drive" msgstr "Системний диск" #: winecfg.rc:76 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" "Most Windows applications expect drive C to exist, and will die messily if " "it doesn't. If you proceed, remember to recreate it!" msgstr "" -"Справді видалити диск C?\n" +"Ви впевнені, що хочете видалити диск C?\n" "\n" "Більшість Windows-програм перестануть працювати без диску C. Якщо ви все ж " "вирішили видалити диск, не забудьте створити новий!" @@ -16979,10 +16793,8 @@ msgid "Text documents (*.txt)" msgstr "Текстові документи (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" -msgstr "Текстовий документ Юнікод (*.txt)" +msgstr "Текстові документи Юнікод (*.txt)" #: wordpad.rc:150 msgid "Rich text format (*.rtf)" @@ -17183,42 +16995,6 @@ msgid "D" msgstr "Д" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/K] Copy file attributes, without this attributes are not preserved.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" -- 2.23.0

2 1

[PATCH 1/3] kernelbase: Support PROC_THREAD_ATTRIBUTE_PARENT_PROCESS in CreateProcessInternalW().
by Paul Gofman 09 Dec '19

09 Dec '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/kernelbase/process.c | 85 ++++++++++++++++++++++++++------------- 1 file changed, 56 insertions(+), 29 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 90ea299416..ec034aa75d 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -244,7 +244,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename */ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES *tsa, BOOL inherit, DWORD flags, RTL_USER_PROCESS_PARAMETERS *params, - RTL_USER_PROCESS_INFORMATION *info ) + RTL_USER_PROCESS_INFORMATION *info, HANDLE parent ) { NTSTATUS status; UNICODE_STRING nameW; @@ -257,7 +257,7 @@ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES status = RtlCreateUserProcess( &nameW, OBJ_CASE_INSENSITIVE, params, psa ? psa->lpSecurityDescriptor : NULL, tsa ? tsa->lpSecurityDescriptor : NULL, - 0, inherit, 0, 0, info ); + parent, inherit, 0, 0, info ); RtlFreeUnicodeString( &nameW ); } return status; @@ -288,7 +288,7 @@ static NTSTATUS create_vdm_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE winevdm, params->ImagePathName.Buffer, params->CommandLine.Buffer ); RtlInitUnicodeString( &params->ImagePathName, winevdm ); RtlInitUnicodeString( &params->CommandLine, newcmdline ); - status = create_nt_process( psa, tsa, inherit, flags, params, info ); + status = create_nt_process( psa, tsa, inherit, flags, params, info, NULL ); HeapFree( GetProcessHeap(), 0, newcmdline ); return status; } @@ -316,7 +316,7 @@ static NTSTATUS create_cmd_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE swprintf( newcmdline, len, L"%s /s/c \"%s\"", comspec, params->CommandLine.Buffer ); RtlInitUnicodeString( &params->ImagePathName, comspec ); RtlInitUnicodeString( &params->CommandLine, newcmdline ); - status = create_nt_process( psa, tsa, inherit, flags, params, info ); + status = create_nt_process( psa, tsa, inherit, flags, params, info, NULL ); RtlFreeHeap( GetProcessHeap(), 0, newcmdline ); return status; } @@ -368,7 +368,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessAsUserW( HANDLE token, const WCHAR *a inherit, flags, env, cur_dir, startup_info, info, NULL ); } - /********************************************************************** * CreateProcessInternalA (kernelbase.@) */ @@ -382,7 +381,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalA( HANDLE token, const char * BOOL ret = FALSE; WCHAR *app_nameW = NULL, *cmd_lineW = NULL, *cur_dirW = NULL; UNICODE_STRING desktopW, titleW; - STARTUPINFOW infoW; + STARTUPINFOEXW infoW; desktopW.Buffer = NULL; titleW.Buffer = NULL; @@ -393,12 +392,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalA( HANDLE token, const char * if (startup_info->lpDesktop) RtlCreateUnicodeStringFromAsciiz( &desktopW, startup_info->lpDesktop ); if (startup_info->lpTitle) RtlCreateUnicodeStringFromAsciiz( &titleW, startup_info->lpTitle ); - memcpy( &infoW, startup_info, sizeof(infoW) ); - infoW.lpDesktop = desktopW.Buffer; - infoW.lpTitle = titleW.Buffer; + memcpy( &infoW.StartupInfo, startup_info, sizeof(infoW.StartupInfo) ); + infoW.StartupInfo.lpDesktop = desktopW.Buffer; + infoW.StartupInfo.lpTitle = titleW.Buffer; + + if (flags & EXTENDED_STARTUPINFO_PRESENT) + infoW.lpAttributeList = ((STARTUPINFOEXW *)startup_info)->lpAttributeList; ret = CreateProcessInternalW( token, app_nameW, cmd_lineW, process_attr, thread_attr, - inherit, flags, env, cur_dirW, &infoW, info, new_token ); + inherit, flags, env, cur_dirW, (STARTUPINFOW *)&infoW, info, new_token ); done: RtlFreeHeap( GetProcessHeap(), 0, app_nameW ); RtlFreeHeap( GetProcessHeap(), 0, cmd_lineW ); @@ -408,6 +410,22 @@ done: return ret; } +struct proc_thread_attr +{ + DWORD_PTR attr; + SIZE_T size; + void *value; +}; + +struct _PROC_THREAD_ATTRIBUTE_LIST +{ + DWORD mask; /* bitmask of items in list */ + DWORD size; /* max number of items in list */ + DWORD count; /* number of items in list */ + DWORD pad; + DWORD_PTR unk; + struct proc_thread_attr attrs[1]; +}; /********************************************************************** * CreateProcessInternalW (kernelbase.@) @@ -423,6 +441,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR WCHAR *p, *tidy_cmdline = cmd_line; RTL_USER_PROCESS_PARAMETERS *params = NULL; RTL_USER_PROCESS_INFORMATION rtl_info; + HANDLE parent = NULL; NTSTATUS status; /* Process the AppName and/or CmdLine to get module name and path */ @@ -473,7 +492,33 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR goto done; } - status = create_nt_process( process_attr, thread_attr, inherit, flags, params, &rtl_info ); + if (flags & EXTENDED_STARTUPINFO_PRESENT) + { + struct _PROC_THREAD_ATTRIBUTE_LIST *attrs = + (struct _PROC_THREAD_ATTRIBUTE_LIST *)((STARTUPINFOEXW *)startup_info)->lpAttributeList; + unsigned int i; + + if (attrs) + { + for (i = 0; i < attrs->count; ++i) + { + switch(attrs->attrs[i].attr) + { + case PROC_THREAD_ATTRIBUTE_PARENT_PROCESS: + parent = *(HANDLE *)attrs->attrs[i].value; + TRACE("PROC_THREAD_ATTRIBUTE_PARENT_PROCESS parent %p.\n", parent); + if (!parent) + parent = INVALID_HANDLE_VALUE; + break; + default: + FIXME("Unsupported attribute %#lx.\n", attrs->attrs[i].attr); + break; + } + } + } + } + + status = create_nt_process( process_attr, thread_attr, inherit, flags, params, &rtl_info, parent ); switch (status) { case STATUS_SUCCESS: @@ -1301,24 +1346,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetEnvironmentVariableW( LPCWSTR name, LPCWSTR val * Process/thread attribute lists ***********************************************************************/ - -struct proc_thread_attr -{ - DWORD_PTR attr; - SIZE_T size; - void *value; -}; - -struct _PROC_THREAD_ATTRIBUTE_LIST -{ - DWORD mask; /* bitmask of items in list */ - DWORD size; /* max number of items in list */ - DWORD count; /* number of items in list */ - DWORD pad; - DWORD_PTR unk; - struct proc_thread_attr attrs[1]; -}; - /*********************************************************************** * InitializeProcThreadAttributeList (kernelbase.@) */ -- 2.23.0

2 4

[PATCH 1/2] comctl32: Preserve custom colors between subitems. (v2)
by Vijay Kiran Kamuju 09 Dec '19

09 Dec '19

From: Michael Müller <michael(a)fds-team.de> From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38941 --- dlls/comctl32/listview.c | 20 +++++++++----------- dlls/comctl32/tests/listview.c | 23 ++++++++++++++++++++--- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index eb42526f57..4799920e3a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1065,7 +1065,7 @@ static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRA COLORREF backcolor, textcolor; /* apparently, for selected items, we have to override the returned values */ - if (!SubItem) + if (!SubItem || (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) { if (lpnmlvcd->nmcd.uItemState & CDIS_SELECTED) { @@ -4791,6 +4791,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERAT while (iterator_next(subitems)) { DWORD subitemstage = CDRF_DODEFAULT; + NMLVCUSTOMDRAW temp_nmlvcd; /* We need to query for each subitem, item's data (subitem == 0) is already here at this point */ if (subitems->nItem) @@ -4817,19 +4818,16 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERAT if (cdsubitemmode & CDRF_NOTIFYSUBITEMDRAW) subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPREPAINT, &nmlvcd); - else - { - nmlvcd.clrTextBk = infoPtr->clrTextBk; - nmlvcd.clrText = infoPtr->clrText; - } - if (subitems->nItem == 0 || (cdmode & CDRF_NOTIFYITEMDRAW)) - prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); - else if (!(infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) - prepaint_setup(infoPtr, hdc, &nmlvcd, TRUE); + /* + * A selection should neither affect the colors in the post paint notification nor + * affect the colors of the next drawn subitem. Copy the structure to prevent this. + */ + temp_nmlvcd = nmlvcd; + prepaint_setup(infoPtr, hdc, &temp_nmlvcd, subitems->nItem); if (!(subitemstage & CDRF_SKIPDEFAULT)) - LISTVIEW_DrawItemPart(infoPtr, &lvItem, &nmlvcd, &pos); + LISTVIEW_DrawItemPart(infoPtr, &lvItem, &temp_nmlvcd, &pos); if (subitemstage & CDRF_NOTIFYPOSTPAINT) subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPOSTPAINT, &nmlvcd); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 87f644abd1..57cb227189 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1938,12 +1938,16 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM clr = GetBkColor(nmlvcd->nmcd.hdc); ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk); ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); - todo_wine_if(nmlvcd->iSubItem) - ok(clr == c0ffee, "clr=%.8x\n", clr); + if (!(GetWindowLongW(nmhdr->hwndFrom, GWL_STYLE) & LVS_SHOWSELALWAYS)) + { + todo_wine_if(nmlvcd->iSubItem) + ok(clr == c0ffee, "clr=%.8x\n", clr); + } return CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPOSTPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); - todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); + if (!(GetWindowLongW(nmhdr->hwndFrom, GWL_STYLE) & LVS_SHOWSELALWAYS)) + todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk); ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); return CDRF_DODEFAULT; @@ -1959,6 +1963,7 @@ static void test_customdraw(void) { HWND hwnd; WNDPROC oldwndproc; + LVITEMA item; hwnd = create_listview_control(LVS_REPORT); @@ -1978,6 +1983,18 @@ static void test_customdraw(void) UpdateWindow(hwnd); ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_report_cd_seq, "parent customdraw, LVS_REPORT", FALSE); + /* check colors when item is selected */ + SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) | LVS_SHOWSELALWAYS); + item.mask = LVIF_STATE; + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + InvalidateRect(hwnd, NULL, TRUE); + UpdateWindow(hwnd); + ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_report_cd_seq, "parent customdraw, LVS_REPORT, selection", FALSE); + DestroyWindow(hwnd); hwnd = create_listview_control(LVS_LIST); -- 2.21.0

4 5

[PATCH] ntoskrnl.exe: Avoid infinite recursion loading drivers.
by Chip Davis 09 Dec '19

09 Dec '19

Aside from the fact that both ntoskrnl and hal are already loaded and resolved, ntoskrnl and hal have a cyclic dependency on each other. This results in infinite recursion attempting to relocate both modules. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4c196bc1c98..3f457461fff 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3515,6 +3515,9 @@ static HMODULE load_driver_module( const WCHAR *name ) char *name = (char *)module + imports[i].Name; WCHAR buffer[32], *p = buffer; + /* avoid infinite recursion - don't do this for this module (ntoskrnl) or hal.dll */ + if (!strcmp( name, "ntoskrnl.exe" ) || !strcmp( name, "hal.dll" )) + continue; while (p < buffer + 32) if (!(*p++ = *name++)) break; if (p <= buffer + 32) FreeLibrary( load_driver_module( buffer ) ); } -- 2.24.0

1 0

[PATCH] kernel32: return S_OK in RegisterApplicationRecoveryCallback stub (resend)
by Louis Lenders 09 Dec '19

09 Dec '19

rebased patch against current git (to make testbot happier) https://bugs.winehq.org/show_bug.cgi?id=43817 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/kernel32/process.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 779c13cb54..1984aa0701 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -902,9 +902,8 @@ HRESULT WINAPI ApplicationRecoveryInProgress(PBOOL canceled) */ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK callback, PVOID param, DWORD pingint, DWORD flags) { - FIXME("%p, %p, %d, %d: stub\n", callback, param, pingint, flags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return E_FAIL; + FIXME("%p, %p, %d, %d: stub, faking success\n", callback, param, pingint, flags); + return S_OK; } /*********************************************************************** -- 2.24.0

2 1

[PATCH] vbscript: Don't free procs allocated in the heap pool.
by Gabriel Ivăncescu 09 Dec '19

09 Dec '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- As far as I can see, these procs are allocated in compiler.c into the vbscode's heap pool, and freeing them with heap_free is obviously wrong. dlls/vbscript/vbdisp.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 2e59051..47ecc15 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -1002,13 +1002,6 @@ static ULONG WINAPI ScriptDisp_Release(IDispatchEx *iface) if(!ref) { assert(!This->ctx); - while (This->procs) - { - class_desc_t *class_desc = This->procs; - This->procs = class_desc->next; - heap_free(class_desc); - } - for (i = 0; i < This->global_vars_cnt; i++) release_dynamic_var(This->global_vars[i]); -- 2.21.0

2 1

[PATCH 2/2] mshtml: Support loading Gecko from global location.
by Jacek Caban 09 Dec '19

09 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 2 ++ dlls/mshtml/nsembed.c | 70 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+)

2 1

[PATCH 1/2] mshtml: Refactor Gecko loading code.
by Jacek Caban 09 Dec '19

09 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsembed.c | 271 ++++++++++++++++++++---------------------- 1 file changed, 132 insertions(+), 139 deletions(-)

2 1

[PATCH 01/10] jscript: Add script TypeInfo stub.
by Gabriel Ivăncescu 09 Dec '19

09 Dec '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 272 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 271 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 463fd2f..68e4e1c 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -590,11 +590,273 @@ static HRESULT fill_protrefs(jsdisp_t *This) return S_OK; } +typedef struct { + ITypeInfo ITypeInfo_iface; + LONG ref; +} ScriptTypeInfo; + +static inline ScriptTypeInfo *ScriptTypeInfo_from_ITypeInfo(ITypeInfo *iface) +{ + return CONTAINING_RECORD(iface, ScriptTypeInfo, ITypeInfo_iface); +} + +static HRESULT WINAPI ScriptTypeInfo_QueryInterface(ITypeInfo *iface, REFIID riid, void **ppv) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITypeInfo, riid)) + *ppv = &This->ITypeInfo_iface; + else + { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ScriptTypeInfo_AddRef(ITypeInfo *iface) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ScriptTypeInfo_Release(ITypeInfo *iface) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) + { + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI ScriptTypeInfo_GetTypeAttr(ITypeInfo *iface, TYPEATTR **ppTypeAttr) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, ppTypeAttr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetTypeComp(ITypeInfo *iface, ITypeComp **ppTComp) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, ppTComp); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetFuncDesc(ITypeInfo *iface, UINT index, FUNCDESC **ppFuncDesc) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%u %p)\n", This, index, ppFuncDesc); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetVarDesc(ITypeInfo *iface, UINT index, VARDESC **ppVarDesc) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%u %p)\n", This, index, ppVarDesc); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetNames(ITypeInfo *iface, MEMBERID memid, BSTR *rgBstrNames, + UINT cMaxNames, UINT *pcNames) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetRefTypeOfImplType(ITypeInfo *iface, UINT index, HREFTYPE *pRefType) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%u %p)\n", This, index, pRefType); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetImplTypeFlags(ITypeInfo *iface, UINT index, INT *pImplTypeFlags) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%u %p)\n", This, index, pImplTypeFlags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetIDsOfNames(ITypeInfo *iface, LPOLESTR *rgszNames, UINT cNames, + MEMBERID *pMemId) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p %u %p)\n", This, rgszNames, cNames, pMemId); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_Invoke(ITypeInfo *iface, PVOID pvInstance, MEMBERID memid, WORD wFlags, + DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p %d %d %p %p %p %p)\n", This, pvInstance, memid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetDocumentation(ITypeInfo *iface, MEMBERID memid, BSTR *pBstrName, + BSTR *pBstrDocString, DWORD *pdwHelpContext, BSTR *pBstrHelpFile) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %p %p %p %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetDllEntry(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind, + BSTR *pBstrDllName, BSTR *pBstrName, WORD *pwOrdinal) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %d %p %p %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetRefTypeInfo(ITypeInfo *iface, HREFTYPE hRefType, ITypeInfo **ppTInfo) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%x %p)\n", This, hRefType, ppTInfo); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_AddressOfMember(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind, PVOID *ppv) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %d %p)\n", This, memid, invKind, ppv); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_CreateInstance(ITypeInfo *iface, IUnknown *pUnkOuter, REFIID riid, PVOID *ppvObj) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p %s %p)\n", This, pUnkOuter, debugstr_guid(riid), ppvObj); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetMops(ITypeInfo *iface, MEMBERID memid, BSTR *pBstrMops) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %p)\n", This, memid, pBstrMops); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetContainingTypeLib(ITypeInfo *iface, ITypeLib **ppTLib, UINT *pIndex) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p %p)\n", This, ppTLib, pIndex); + + return E_NOTIMPL; +} + +static void WINAPI ScriptTypeInfo_ReleaseTypeAttr(ITypeInfo *iface, TYPEATTR *pTypeAttr) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, pTypeAttr); +} + +static void WINAPI ScriptTypeInfo_ReleaseFuncDesc(ITypeInfo *iface, FUNCDESC *pFuncDesc) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, pFuncDesc); +} + +static void WINAPI ScriptTypeInfo_ReleaseVarDesc(ITypeInfo *iface, VARDESC *pVarDesc) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, pVarDesc); +} + +static const ITypeInfoVtbl ScriptTypeInfoVtbl = { + ScriptTypeInfo_QueryInterface, + ScriptTypeInfo_AddRef, + ScriptTypeInfo_Release, + ScriptTypeInfo_GetTypeAttr, + ScriptTypeInfo_GetTypeComp, + ScriptTypeInfo_GetFuncDesc, + ScriptTypeInfo_GetVarDesc, + ScriptTypeInfo_GetNames, + ScriptTypeInfo_GetRefTypeOfImplType, + ScriptTypeInfo_GetImplTypeFlags, + ScriptTypeInfo_GetIDsOfNames, + ScriptTypeInfo_Invoke, + ScriptTypeInfo_GetDocumentation, + ScriptTypeInfo_GetDllEntry, + ScriptTypeInfo_GetRefTypeInfo, + ScriptTypeInfo_AddressOfMember, + ScriptTypeInfo_CreateInstance, + ScriptTypeInfo_GetMops, + ScriptTypeInfo_GetContainingTypeLib, + ScriptTypeInfo_ReleaseTypeAttr, + ScriptTypeInfo_ReleaseFuncDesc, + ScriptTypeInfo_ReleaseVarDesc +}; + static inline jsdisp_t *impl_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, jsdisp_t, IDispatchEx_iface); } +static HRESULT create_script_typeinfo(jsdisp_t *jsdisp, ITypeInfo **out) +{ + ScriptTypeInfo *typeinfo; + + if (!(typeinfo = heap_alloc(sizeof(*typeinfo)))) + return E_OUTOFMEMORY; + + typeinfo->ITypeInfo_iface.lpVtbl = &ScriptTypeInfoVtbl; + typeinfo->ref = 1; + + *out = &typeinfo->ITypeInfo_iface; + return S_OK; +} + static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { jsdisp_t *This = impl_from_IDispatchEx(iface); @@ -649,7 +911,15 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC ITypeInfo **ppTInfo) { jsdisp_t *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + if (iTInfo != 0) return DISP_E_BADINDEX; + + if (This == This->ctx->global) + return create_script_typeinfo(This, ppTInfo); + + FIXME("non-global not implemented\n"); return E_NOTIMPL; } -- 2.21.0

2 14

[PATCH] comctl32/listview: Use wcsnicmp() instead of a local helper.
by Nikolay Sivov 09 Dec '19

09 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listview.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index eb42526f57..2dd25908db 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -539,12 +539,6 @@ static inline int textcmpWT(LPCWSTR aw, LPCWSTR bt, BOOL isW) return 1; } - -static inline int lstrncmpiW(LPCWSTR s1, LPCWSTR s2, int n) -{ - n = min(min(n, lstrlenW(s1)), lstrlenW(s2)); - return CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE, s1, n, s2, n) - CSTR_EQUAL; -} /******** Debugging functions *****************************************/ @@ -1953,7 +1947,7 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L item.cchTextMax = MAX_PATH; if (!LISTVIEW_GetItemW(infoPtr, &item)) return 0; - if (!lstrncmpiW(item.pszText, infoPtr->szSearchParam, infoPtr->nSearchParamLength)) + if (!wcsnicmp(item.pszText, infoPtr->szSearchParam, infoPtr->nSearchParamLength)) { nItem = i; break; @@ -1961,7 +1955,7 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L /* this is used to find first char match when search string is not available yet, otherwise every WM_CHAR will search to next item by first char, ignoring that we're already waiting for user to complete a string */ - else if (nItem == -1 && infoPtr->nSearchParamLength == 1 && !lstrncmpiW(item.pszText, infoPtr->szSearchParam, 1)) + else if (nItem == -1 && infoPtr->nSearchParamLength == 1 && !wcsnicmp(item.pszText, infoPtr->szSearchParam, 1)) { /* this would work but we must keep looking for a longer match */ nItem = i; -- 2.24.0

1 0

[PATCH] wbemprox: Use a terminated string in parse_resource.
by Hans Leidekker 09 Dec '19

09 Dec '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48245 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/wbemlocator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 99d90c357f..18c37275ed 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -98,7 +98,7 @@ static BOOL is_local_machine( const WCHAR *server ) static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **namespace ) { - static const WCHAR rootW[] = {'R','O','O','T'}; + static const WCHAR rootW[] = {'R','O','O','T',0}; static const WCHAR cimv2W[] = {'C','I','M','V','2',0}; static const WCHAR defaultW[] = {'D','E','F','A','U','L','T',0}; HRESULT hr = WBEM_E_INVALID_NAMESPACE; @@ -131,7 +131,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na p = q; while (*q && *q != '\\' && *q != '/') q++; len = q - p; - if (len >= ARRAY_SIZE( rootW ) && wcsnicmp( rootW, p, len )) goto done; + if (len >= ARRAY_SIZE( rootW ) - 1 && wcsnicmp( rootW, p, len )) goto done; if (!*q) { hr = S_OK; -- 2.20.1

1 0

[PATCH] winhttp/tests: Fix the spelling of ok() and skip() messages and a comment.
by Francois Gouget 09 Dec '19

09 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winhttp/tests/winhttp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6a8d4962386..e4c614cb104 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -412,7 +412,7 @@ static void test_WinHttpSendRequest (void) ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); /* writing more data than promised by the content-length header causes an error when the connection - is resued, so disable keep-alive */ + is reused, so disable keep-alive */ disable = WINHTTP_DISABLE_KEEP_ALIVE; ret = WinHttpSetOption(request, WINHTTP_OPTION_DISABLE_FEATURE, &disable, sizeof(disable)); ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); @@ -692,7 +692,7 @@ static void test_WinHttpAddHeaders(void) test_header_name, NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICENT_BUFFER, got %u\n", GetLastError()); + "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); ok(index == 0, "WinHttpQueryHeaders incorrectly incremented header index.\n"); @@ -2144,7 +2144,7 @@ static void test_resolve_timeout(void) WinHttpCloseHandle(ses); } else - skip("Skipping host resolution tests, host resolution preformed by proxy\n"); + skip("Skipping host resolution tests, host resolution performed by proxy\n"); ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); -- 2.20.1

3 2

[PATCH 5/5] msado15: Implement _Stream_get_Size.
by Hans Leidekker 09 Dec '19

09 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/stream.c | 9 +++++++-- dlls/msado15/tests/msado15.c | 15 ++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index eb384fbf94..0c4d9ea425 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -113,8 +113,13 @@ static HRESULT WINAPI stream_Invoke( _Stream *iface, DISPID member, REFIID riid, static HRESULT WINAPI stream_get_Size( _Stream *iface, LONG *size ) { - FIXME( "%p, %p\n", iface, size ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %p\n", stream, size ); + + if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + *size = stream->size; + return S_OK; } static HRESULT WINAPI stream_get_EOS( _Stream *iface, VARIANT_BOOL *eos ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index c7563228de..1755a7f3da 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -50,7 +50,7 @@ static void test_Stream(void) { _Stream *stream; StreamTypeEnum type; - LONG refs, pos; + LONG refs, size, pos; ObjectStateEnum state; VARIANT missing, val; HRESULT hr; @@ -58,6 +58,9 @@ static void test_Stream(void) hr = CoCreateInstance( &CLSID_Stream, NULL, CLSCTX_INPROC_SERVER, &IID__Stream, (void **)&stream ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_get_Size( stream, &size ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + hr = _Stream_get_Position( stream, &pos ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); @@ -103,11 +106,21 @@ static void test_Stream(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateOpen, "got %u\n", state ); + size = -1; + hr = _Stream_get_Size( stream, &size ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !size, "got %d\n", size ); + pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); ok( !pos, "got %d\n", pos ); + size = -1; + hr = _Stream_get_Size( stream, &size ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !size, "got %d\n", size ); + hr = _Stream_Read( stream, 2, &val ); ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); -- 2.20.1

1 0

[PATCH 4/5] msado15: Implement _Stream_get_Position and _Stream_put_Position.
by Hans Leidekker 09 Dec '19

09 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/stream.c | 22 +++++++++++++++++---- dlls/msado15/tests/msado15.c | 37 +++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index d5a129f869..eb384fbf94 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -125,8 +125,13 @@ static HRESULT WINAPI stream_get_EOS( _Stream *iface, VARIANT_BOOL *eos ) static HRESULT WINAPI stream_get_Position( _Stream *iface, LONG *pos ) { - FIXME( "%p, %p\n", iface, pos ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %p\n", stream, pos ); + + if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + *pos = stream->pos; + return S_OK; } static HRESULT resize_buffer( struct stream *stream, LONG size ) @@ -145,8 +150,17 @@ static HRESULT resize_buffer( struct stream *stream, LONG size ) static HRESULT WINAPI stream_put_Position( _Stream *iface, LONG pos ) { - FIXME( "%p, %d\n", iface, pos ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + HRESULT hr; + + TRACE( "%p, %d\n", stream, pos ); + + if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (pos < 0) return MAKE_ADO_HRESULT( adErrInvalidArgument ); + + if ((hr = resize_buffer( stream, stream->pos )) != S_OK) return hr; + stream->pos = pos; + return S_OK; } static HRESULT WINAPI stream_get_Type( _Stream *iface, StreamTypeEnum *type ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 257d1c26fa..c7563228de 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -50,7 +50,7 @@ static void test_Stream(void) { _Stream *stream; StreamTypeEnum type; - LONG refs; + LONG refs, pos; ObjectStateEnum state; VARIANT missing, val; HRESULT hr; @@ -58,6 +58,12 @@ static void test_Stream(void) hr = CoCreateInstance( &CLSID_Stream, NULL, CLSCTX_INPROC_SERVER, &IID__Stream, (void **)&stream ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_get_Position( stream, &pos ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + + hr = _Stream_put_Position( stream, 0 ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + /* check default type */ type = 0; hr = _Stream_get_Type( stream, &type ); @@ -97,9 +103,19 @@ static void test_Stream(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateOpen, "got %u\n", state ); + pos = -1; + hr = _Stream_get_Position( stream, &pos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !pos, "got %d\n", pos ); + hr = _Stream_Read( stream, 2, &val ); ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); + pos = -1; + hr = _Stream_get_Position( stream, &pos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !pos, "got %d\n", pos ); + hr = _Stream_Close( stream ); ok( hr == S_OK, "got %08x\n", hr ); @@ -139,6 +155,25 @@ static void test_Stream(void) ok( hr == S_OK, "got %08x\n", hr ); VariantClear( &val ); + pos = -1; + hr = _Stream_get_Position( stream, &pos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos == 4, "got %d\n", pos ); + + hr = _Stream_put_Position( stream, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + + VariantInit( &val ); + hr = _Stream_Read( stream, adReadAll, &val ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == (VT_ARRAY | VT_UI1), "got %04x\n", V_VT( &val ) ); + VariantClear( &val ); + + pos = -1; + hr = _Stream_get_Position( stream, &pos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos == 4, "got %d\n", pos ); + refs = _Stream_Release( stream ); ok( !refs, "got %d\n", refs ); } -- 2.20.1

1 0

[PATCH 3/5] msado15: Implement _Stream_Read and _Stream_Write.
by Hans Leidekker 09 Dec '19

09 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/msado15_private.h | 6 +++ dlls/msado15/stream.c | 95 +++++++++++++++++++++++++++++++--- dlls/msado15/tests/msado15.c | 57 +++++++++++++++++++- 3 files changed, 149 insertions(+), 9 deletions(-) diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index f901791ea9..1078cbf64e 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -25,4 +25,10 @@ HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN; HRESULT Stream_create( void ** ) DECLSPEC_HIDDEN; +static inline void *heap_realloc_zero( void *mem, SIZE_T len ) +{ + if (!mem) return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); + return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len ); +} + #endif /* _WINE_MSADO15_PRIVATE_H_ */ diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index cc67e930a4..d5a129f869 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -32,10 +32,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct stream { - _Stream Stream_iface; - LONG refs; - ObjectStateEnum state; - StreamTypeEnum type; + _Stream Stream_iface; + LONG refs; + ObjectStateEnum state; + StreamTypeEnum type; + LONG size; + LONG allocated; + LONG pos; + BYTE *buf; }; static inline struct stream *impl_from_Stream( _Stream *iface ) @@ -56,6 +60,7 @@ static ULONG WINAPI stream_Release( _Stream *iface ) if (!refs) { TRACE( "destroying %p\n", stream ); + heap_free( stream->buf ); heap_free( stream ); } return refs; @@ -124,6 +129,20 @@ static HRESULT WINAPI stream_get_Position( _Stream *iface, LONG *pos ) return E_NOTIMPL; } +static HRESULT resize_buffer( struct stream *stream, LONG size ) +{ + if (stream->allocated < size) + { + BYTE *tmp; + LONG new_size = max( size, stream->allocated * 2 ); + if (!(tmp = heap_realloc_zero( stream->buf, new_size ))) return E_OUTOFMEMORY; + stream->buf = tmp; + stream->allocated = new_size; + } + stream->size = size; + return S_OK; +} + static HRESULT WINAPI stream_put_Position( _Stream *iface, LONG pos ) { FIXME( "%p, %d\n", iface, pos ); @@ -193,10 +212,49 @@ static HRESULT WINAPI stream_put_Charset( _Stream *iface, BSTR charset ) return E_NOTIMPL; } +static HRESULT create_byte_array( BYTE *data, LONG len, VARIANT *ret ) +{ + SAFEARRAY *vector; + LONG i; + HRESULT hr; + + if (!len) + { + V_VT( ret ) = VT_NULL; + return S_OK; + } + if (!(vector = SafeArrayCreateVector( VT_UI1, 0, len ))) return E_OUTOFMEMORY; + for (i = 0; i < len; i++) + { + if ((hr = SafeArrayPutElement( vector, &i, &data[i] )) != S_OK) + { + SafeArrayDestroy( vector ); + return hr; + } + } + + V_VT( ret ) = VT_ARRAY | VT_UI1; + V_ARRAY( ret ) = vector; + return S_OK; +} + static HRESULT WINAPI stream_Read( _Stream *iface, LONG size, VARIANT *val ) { - FIXME( "%p, %d, %p\n", iface, size, val ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + HRESULT hr; + + TRACE( "%p, %d, %p\n", stream, size, val ); + + if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (stream->type != adTypeBinary) return MAKE_ADO_HRESULT( adErrIllegalOperation ); + if (size < adReadAll) return MAKE_ADO_HRESULT( adErrInvalidArgument ); + + if (size == adReadAll) size = stream->size - stream->pos; + else size = min( size, stream->size - stream->pos ); + + if ((hr = create_byte_array( stream->buf + stream->pos, size, val )) != S_OK) return hr; + stream->pos += size; + return S_OK; } static HRESULT WINAPI stream_Open( _Stream *iface, VARIANT src, ConnectModeEnum mode, StreamOpenOptionsEnum options, @@ -219,6 +277,10 @@ static HRESULT WINAPI stream_Close( _Stream *iface ) if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + heap_free( stream->buf ); + stream->buf = NULL; + stream->size = stream->allocated = stream->pos = 0; + stream->state = adStateClosed; return S_OK; } @@ -231,8 +293,25 @@ static HRESULT WINAPI stream_SkipLine( _Stream *iface ) static HRESULT WINAPI stream_Write( _Stream *iface, VARIANT buf ) { - FIXME( "%p, %s\n", iface, debugstr_variant(&buf) ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + LONG bound, i; + HRESULT hr; + + TRACE( "%p, %s\n", stream, debugstr_variant(&buf) ); + + if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (stream->type != adTypeBinary) return MAKE_ADO_HRESULT( adErrIllegalOperation ); + if (V_VT( &buf ) != (VT_ARRAY | VT_UI1)) return MAKE_ADO_HRESULT( adErrInvalidArgument ); + + if ((hr = SafeArrayGetUBound( V_ARRAY( &buf ), 1, &bound )) != S_OK) return hr; + if ((hr = resize_buffer( stream, stream->size + bound + 1 )) != S_OK) return hr; + + for (i = 0; i <= bound; i++) + { + if ((hr = SafeArrayGetElement( V_ARRAY( &buf ), &i, &stream->buf[stream->pos++] )) != S_OK) return hr; + } + + return S_OK; } static HRESULT WINAPI stream_SetEOS( _Stream *iface ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 9733116151..257d1c26fa 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -25,13 +25,34 @@ #define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err ) +static HRESULT str_to_byte_array( const char *data, VARIANT *ret ) +{ + SAFEARRAY *vector; + LONG i, len = strlen(data); + HRESULT hr; + + if (!(vector = SafeArrayCreateVector( VT_UI1, 0, len ))) return E_OUTOFMEMORY; + for (i = 0; i < len; i++) + { + if ((hr = SafeArrayPutElement( vector, &i, (void *)&data[i] )) != S_OK) + { + SafeArrayDestroy( vector ); + return hr; + } + } + + V_VT( ret ) = VT_ARRAY | VT_UI1; + V_ARRAY( ret ) = vector; + return S_OK; +} + static void test_Stream(void) { _Stream *stream; StreamTypeEnum type; LONG refs; ObjectStateEnum state; - VARIANT missing; + VARIANT missing, val; HRESULT hr; hr = CoCreateInstance( &CLSID_Stream, NULL, CLSCTX_INPROC_SERVER, &IID__Stream, (void **)&stream ); @@ -60,6 +81,9 @@ static void test_Stream(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateClosed, "got %u\n", state ); + hr = _Stream_Read( stream, 2, &val ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + V_VT( &missing ) = VT_ERROR; V_ERROR( &missing ) = DISP_E_PARAMNOTFOUND; hr = _Stream_Open( stream, missing, adModeUnknown, adOpenStreamUnspecified, NULL, NULL ); @@ -73,6 +97,9 @@ static void test_Stream(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateOpen, "got %u\n", state ); + hr = _Stream_Read( stream, 2, &val ); + ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); + hr = _Stream_Close( stream ); ok( hr == S_OK, "got %08x\n", hr ); @@ -86,6 +113,34 @@ static void test_Stream(void) refs = _Stream_Release( stream ); ok( !refs, "got %d\n", refs ); + + /* binary type */ + hr = CoCreateInstance( &CLSID_Stream, NULL, CLSCTX_INPROC_SERVER, &IID__Stream, (void **)&stream ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Stream_put_Type( stream, adTypeBinary ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Stream_Open( stream, missing, adModeUnknown, adOpenStreamUnspecified, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + VariantInit( &val ); + hr = _Stream_Read( stream, 1, &val ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_NULL, "got %u\n", V_VT( &val ) ); + + VariantInit( &val ); + hr = _Stream_Write( stream, val ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); + + hr = str_to_byte_array( "data", &val ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_Write( stream, val ); + ok( hr == S_OK, "got %08x\n", hr ); + VariantClear( &val ); + + refs = _Stream_Release( stream ); + ok( !refs, "got %d\n", refs ); } START_TEST(msado15) -- 2.20.1

1 0

[PATCH 2/5] msado15: Implement _Stream_get_State.
by Hans Leidekker 09 Dec '19

09 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/stream.c | 7 +++++-- dlls/msado15/tests/msado15.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 3c9d885edf..cc67e930a4 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -162,8 +162,11 @@ static HRESULT WINAPI stream_put_LineSeparator( _Stream *iface, LineSeparatorEnu static HRESULT WINAPI stream_get_State( _Stream *iface, ObjectStateEnum *state ) { - FIXME( "%p, %p\n", iface, state ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %p\n", stream, state ); + + *state = stream->state; + return S_OK; } static HRESULT WINAPI stream_get_Mode( _Stream *iface, ConnectModeEnum *mode ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index e562c2299f..9733116151 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -30,6 +30,7 @@ static void test_Stream(void) _Stream *stream; StreamTypeEnum type; LONG refs; + ObjectStateEnum state; VARIANT missing; HRESULT hr; @@ -54,6 +55,11 @@ static void test_Stream(void) hr = _Stream_put_Type( stream, adTypeText ); ok( hr == S_OK, "got %08x\n", hr ); + state = 0xdeadbeef; + hr = _Stream_get_State( stream, &state ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == adStateClosed, "got %u\n", state ); + V_VT( &missing ) = VT_ERROR; V_ERROR( &missing ) = DISP_E_PARAMNOTFOUND; hr = _Stream_Open( stream, missing, adModeUnknown, adOpenStreamUnspecified, NULL, NULL ); @@ -62,9 +68,19 @@ static void test_Stream(void) hr = _Stream_Open( stream, missing, adModeUnknown, adOpenStreamUnspecified, NULL, NULL ); ok( hr == MAKE_ADO_HRESULT( adErrObjectOpen ), "got %08x\n", hr ); + state = 0xdeadbeef; + hr = _Stream_get_State( stream, &state ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == adStateOpen, "got %u\n", state ); + hr = _Stream_Close( stream ); ok( hr == S_OK, "got %08x\n", hr ); + state = 0xdeadbeef; + hr = _Stream_get_State( stream, &state ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == adStateClosed, "got %u\n", state ); + hr = _Stream_Close( stream ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); -- 2.20.1

1 0

[PATCH 1/5] msado15: Implement _Stream_Open and _Stream_Close.
by Hans Leidekker 09 Dec '19

09 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/msado15_private.h | 2 ++ dlls/msado15/stream.c | 20 ++++++++++++++++---- dlls/msado15/tests/msado15.c | 17 +++++++++++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 83c8b7c966..f901791ea9 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -19,6 +19,8 @@ #ifndef _WINE_MSADO15_PRIVATE_H_ #define _WINE_MSADO15_PRIVATE_H_ +#define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err ) + HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN; HRESULT Stream_create( void ** ) DECLSPEC_HIDDEN; diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 8e88b9aa65..3c9d885edf 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -34,6 +34,7 @@ struct stream { _Stream Stream_iface; LONG refs; + ObjectStateEnum state; StreamTypeEnum type; }; @@ -198,14 +199,25 @@ static HRESULT WINAPI stream_Read( _Stream *iface, LONG size, VARIANT *val ) static HRESULT WINAPI stream_Open( _Stream *iface, VARIANT src, ConnectModeEnum mode, StreamOpenOptionsEnum options, BSTR username, BSTR password ) { - FIXME( "%p, %s, %u, %d, %s, %p\n", iface, debugstr_variant(&src), mode, options, debugstr_w(username), password ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + FIXME( "%p, %s, %u, %d, %s, %p\n", stream, debugstr_variant(&src), mode, options, debugstr_w(username), password ); + + if (stream->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen ); + + stream->state = adStateOpen; + return S_OK; } static HRESULT WINAPI stream_Close( _Stream *iface ) { - FIXME( "%p\n", iface ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + + TRACE( "%p\n", stream ); + + if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + stream->state = adStateClosed; + return S_OK; } static HRESULT WINAPI stream_SkipLine( _Stream *iface ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index ed465e2072..e562c2299f 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -23,11 +23,14 @@ #include <msado15_backcompat.h> #include "wine/test.h" +#define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err ) + static void test_Stream(void) { _Stream *stream; StreamTypeEnum type; LONG refs; + VARIANT missing; HRESULT hr; hr = CoCreateInstance( &CLSID_Stream, NULL, CLSCTX_INPROC_SERVER, &IID__Stream, (void **)&stream ); @@ -51,6 +54,20 @@ static void test_Stream(void) hr = _Stream_put_Type( stream, adTypeText ); ok( hr == S_OK, "got %08x\n", hr ); + V_VT( &missing ) = VT_ERROR; + V_ERROR( &missing ) = DISP_E_PARAMNOTFOUND; + hr = _Stream_Open( stream, missing, adModeUnknown, adOpenStreamUnspecified, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Stream_Open( stream, missing, adModeUnknown, adOpenStreamUnspecified, NULL, NULL ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectOpen ), "got %08x\n", hr ); + + hr = _Stream_Close( stream ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Stream_Close( stream ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + refs = _Stream_Release( stream ); ok( !refs, "got %d\n", refs ); } -- 2.20.1

1 0

[PATCH] msado15: Support all interfaces in _Recordset QueryInterface
by Alistair Leslie-Hughes 09 Dec '19

09 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index bf0ca6e90f..52282c7e82 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -67,8 +67,13 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, { TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); - if (IsEqualGUID( riid, &IID__Recordset ) || IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IUnknown )) + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID__ADO) || + IsEqualIID(riid, &IID_Recordset15) || + IsEqualIID(riid, &IID_Recordset20) || + IsEqualIID(riid, &IID_Recordset21) || + IsEqualIID(riid, &IID__Recordset)) { *obj = iface; } -- 2.17.1

2 1

[PATCH] loader: Install msado15.dll into the correct location
by Alistair Leslie-Hughes 09 Dec '19

09 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 19c034d7fd..c830525379 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2706,6 +2706,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16422,Windows NT\Accessories,wordpad.exe 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll +16427,System\ADO,msado15.dll 11,,* [FakeDlls] @@ -2767,6 +2768,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,Microsoft Shared\TextConv, 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll +16427,System\ADO,msado15.dll 11,,* [SystemIni] -- 2.17.1

2 1

[PATCH] kernelbase: Fix GlobalMemoryStatusEx regression
by hari.mail 09 Dec '19

09 Dec '19

ullAvailPageFile calculates down to -> page_size + freeswap, limiting it either to page_size (in case of no swap partition) or to swap size. Most of the bethesda game are detecting wrong amounts of ram due to this and crashing in case of no swap partition.

1 0

[PATCH] user32/tests: Avoid an unneeded lstrlenA() call.
by Francois Gouget 09 Dec '19

09 Dec '19

Note that ptr may be NULL (see ok() check a few lines up). Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/tests/dde.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index eed2ac437e1..d370df181a3 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1977,7 +1977,7 @@ static void test_DdeCreateDataHandle(void) ok(size == 262, "Expected 262, got %d\n", size); todo_wine { - ok(lstrlenA((LPSTR)ptr) == 0, "Expected 0, got %d\n", lstrlenA((LPSTR)ptr)); + ok(ptr && !*ptr, "Expected 0, got %d\n", lstrlenA((LPSTR)ptr)); } ret = DdeUnaccessData(hdata); -- 2.20.1

2 1

[PATCH] bcrypt: Add fallback when gnutls_decode_rs_value isn't present.
by Derek Lesho 09 Dec '19

09 Dec '19

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- I overlooked the fact that wine won't compile on systems where gnutls headers are too old. --- dlls/bcrypt/gnutls.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 1c31b5625f..868f898bbb 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -86,13 +86,15 @@ static int (*pgnutls_privkey_export_rsa_raw)(gnutls_privkey_t, gnutls_datum_t *, gnutls_datum_t *); static int (*pgnutls_privkey_generate)(gnutls_privkey_t, gnutls_pk_algorithm_t, unsigned int, unsigned int); +/* Not present in gnutls version < 3.6.0 */ +static int (*pgnutls_decode_rs_value)(const gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_cipher_decrypt2); MAKE_FUNCPTR(gnutls_cipher_deinit); MAKE_FUNCPTR(gnutls_cipher_encrypt2); MAKE_FUNCPTR(gnutls_cipher_init); -MAKE_FUNCPTR(gnutls_decode_rs_value); MAKE_FUNCPTR(gnutls_global_deinit); MAKE_FUNCPTR(gnutls_global_init); MAKE_FUNCPTR(gnutls_global_set_log_function); @@ -164,6 +166,11 @@ static int compat_gnutls_privkey_generate(gnutls_privkey_t key, gnutls_pk_algori return GNUTLS_E_UNKNOWN_PK_ALGORITHM; } +static int compat_gnutls_decode_rs_value(const gnutls_datum_t * sig_value, gnutls_datum_t * r, gnutls_datum_t * s) +{ + return GNUTLS_E_INTERNAL_ERROR; +} + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -190,7 +197,6 @@ BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_cipher_deinit) LOAD_FUNCPTR(gnutls_cipher_encrypt2) LOAD_FUNCPTR(gnutls_cipher_init) - LOAD_FUNCPTR(gnutls_decode_rs_value) LOAD_FUNCPTR(gnutls_global_deinit) LOAD_FUNCPTR(gnutls_global_init) LOAD_FUNCPTR(gnutls_global_set_log_function) @@ -259,6 +265,11 @@ BOOL gnutls_initialize(void) WARN("gnutls_privkey_generate not found\n"); pgnutls_privkey_generate = compat_gnutls_privkey_generate; } + if (!(pgnutls_decode_rs_value = wine_dlsym( libgnutls_handle, "gnutls_decode_rs_value", NULL, 0 ))) + { + WARN("gnutls_decode_rs_value not found\n"); + pgnutls_decode_rs_value = compat_gnutls_decode_rs_value; + } if (TRACE_ON( bcrypt )) { -- 2.24.0

2 1

[PATCH] Update to Unicode 12.1.
by Nikolay Sivov 09 Dec '19

09 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/bracket.c | 2 +- dlls/dwrite/linebreak.c | 4 +- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 4 +- dlls/dwrite/scripts.h | 2 +- dlls/gdi32/vertical.c | 112 ++-- dlls/kernel32/wctype.c | 52 +- dlls/kernelbase/compose.c | 2 +- dlls/kernelbase/decompose.c | 2 +- dlls/kernelbase/digitmap.c | 2 +- dlls/usp10/bracket.c | 2 +- dlls/usp10/indicsyllable.c | 4 +- dlls/usp10/linebreak.c | 4 +- dlls/usp10/mirror.c | 2 +- dlls/usp10/shaping.c | 2 +- dlls/wineps.drv/vertical.c | 112 ++-- libs/port/casemap.c | 2 +- libs/port/combclass.c | 2 +- libs/port/compose.c | 2 +- libs/port/decompose.c | 985 ++++++++++++++++++------------------ libs/port/digitmap.c | 2 +- libs/port/wctype.c | 2 +- tools/make_unicode | 2 +- 23 files changed, 657 insertions(+), 650 deletions(-) diff --git a/dlls/dwrite/bracket.c b/dlls/dwrite/bracket.c index 210495f38f..a77c1176f6 100644 --- a/dlls/dwrite/bracket.c +++ b/dlls/dwrite/bracket.c @@ -1,5 +1,5 @@ /* Unicode Bidirectional Bracket table */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiBrackets.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/BidiBrackets.txt */ /* DO NOT EDIT!! */ #include "windef.h" diff --git a/dlls/dwrite/linebreak.c b/dlls/dwrite/linebreak.c index 904efc6538..ff656f1e69 100644 --- a/dlls/dwrite/linebreak.c +++ b/dlls/dwrite/linebreak.c @@ -1,5 +1,5 @@ /* Unicode Line Break Properties */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/LineBreak.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/LineBreak.txt */ /* DO NOT EDIT!! */ #include "windef.h" @@ -133,7 +133,7 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7216] = 0x1770, 0x1680, 0x1680, 0x1780, 0x1680, 0x1680, 0x1680, 0x1680, 0x1790, 0x1680, 0x1680, 0x17a0, 0x1680, 0x1680, 0x16a0, 0x17b0, 0x1680, 0x1790, 0x1680, 0x1680, 0x17c0, 0x1680, 0x1680, 0x1680, - 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1790, + 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, diff --git a/dlls/dwrite/mirror.c b/dlls/dwrite/mirror.c index 7b43a85703..28e1e8bd9b 100644 --- a/dlls/dwrite/mirror.c +++ b/dlls/dwrite/mirror.c @@ -1,5 +1,5 @@ /* Unicode BiDi mirroring */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiMirroring.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/BidiMirroring.txt */ /* DO NOT EDIT!! */ #include "windef.h" diff --git a/dlls/dwrite/scripts.c b/dlls/dwrite/scripts.c index cb073a238c..ed85c41122 100644 --- a/dlls/dwrite/scripts.c +++ b/dlls/dwrite/scripts.c @@ -1,5 +1,5 @@ /* Unicode Script IDs */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/Scripts.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/Scripts.txt */ /* DO NOT EDIT!! */ #include "windef.h" @@ -708,7 +708,7 @@ const unsigned short DECLSPEC_HIDDEN wine_scripts_table[6736] = 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0001, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, - 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x0000, + 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x0001, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x005f, 0x005f, 0x005f, 0x005f, 0x005f, 0x005f, 0x005f, 0x005f, diff --git a/dlls/dwrite/scripts.h b/dlls/dwrite/scripts.h index b3cc8fca08..37b678c9db 100644 --- a/dlls/dwrite/scripts.h +++ b/dlls/dwrite/scripts.h @@ -1,5 +1,5 @@ /* Unicode Script IDs */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/Scripts.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/Scripts.txt */ /* DO NOT EDIT!! */ enum unicode_script_id { diff --git a/dlls/gdi32/vertical.c b/dlls/gdi32/vertical.c index b5baffdde5..b8095fe9ba 100644 --- a/dlls/gdi32/vertical.c +++ b/dlls/gdi32/vertical.c @@ -1,10 +1,10 @@ /* Unicode Vertical Orientation */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/VerticalOrientation.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/VerticalOrientation.txt */ /* DO NOT EDIT!! */ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] = +const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1648] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, @@ -13,7 +13,7 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] = 0x0160, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0170, 0x0180, 0x0190, 0x01a0, 0x01b0, 0x01c0, 0x01d0, 0x01e0, 0x0110, 0x0110, 0x0110, 0x01f0, 0x0110, 0x0110, 0x0200, 0x0130, - 0x0210, 0x0220, 0x0130, 0x0230, 0x0130, 0x0130, 0x0130, 0x0130, + 0x0210, 0x0220, 0x0230, 0x0240, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, @@ -27,8 +27,8 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] = 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, - 0x0130, 0x0130, 0x0130, 0x0130, 0x0240, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0250, 0x0110, 0x0110, 0x0130, 0x0130, 0x0130, 0x0130, + 0x0130, 0x0130, 0x0130, 0x0130, 0x0250, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0260, 0x0110, 0x0110, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, @@ -38,56 +38,58 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] = 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, - 0x0130, 0x0130, 0x0130, 0x0110, 0x0110, 0x0110, 0x0260, 0x0270, + 0x0130, 0x0130, 0x0130, 0x0110, 0x0110, 0x0110, 0x0270, 0x0280, /* level 2 offsets */ - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0290, 0x02a0, 0x0280, 0x02b0, 0x0280, 0x02b0, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x02c0, 0x0280, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02e0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x0280, 0x02f0, 0x0300, 0x0310, 0x0320, 0x0330, 0x0340, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0350, 0x0360, 0x0280, - 0x0370, 0x0380, 0x0390, 0x03a0, 0x03b0, 0x02d0, 0x02d0, 0x02d0, - 0x03c0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x03d0, 0x0280, 0x03e0, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x03f0, 0x02d0, 0x0400, 0x0280, 0x0280, 0x0280, 0x0280, 0x0350, - 0x02d0, 0x0410, 0x0280, 0x0420, 0x0430, 0x0440, 0x0450, 0x02d0, - 0x02d0, 0x02d0, 0x0460, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0280, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x0470, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0480, 0x0490, - 0x02d0, 0x04a0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0450, 0x02d0, 0x0280, 0x0280, 0x0470, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x04b0, 0x02d0, 0x04c0, 0x04d0, 0x02d0, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x04e0, 0x04f0, 0x02d0, 0x0500, 0x0510, 0x02d0, 0x0520, 0x02d0, - 0x0530, 0x0540, 0x0550, 0x02d0, 0x0520, 0x02d0, 0x0530, 0x0560, - 0x02d0, 0x02d0, 0x0570, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0580, - 0x0580, 0x0580, 0x0580, 0x0580, 0x0580, 0x0590, 0x02d0, 0x05a0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x02d0, 0x02d0, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x02d0, 0x0280, 0x02d0, 0x05b0, 0x05c0, 0x05d0, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x05e0, 0x05f0, 0x02d0, 0x0600, 0x02d0, 0x0610, 0x0620, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0630, 0x0640, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0290, 0x02a0, 0x02b0, 0x0290, 0x02c0, 0x0290, 0x02c0, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x02d0, 0x0290, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02f0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0290, 0x0290, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x0290, 0x0300, 0x0310, 0x0320, 0x0330, 0x0340, 0x0350, 0x0290, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0360, 0x0370, 0x0290, + 0x0380, 0x0390, 0x03a0, 0x03b0, 0x03c0, 0x02e0, 0x02e0, 0x02e0, + 0x03d0, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x03e0, 0x0290, 0x03f0, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0400, 0x02e0, 0x0410, 0x0290, 0x0290, 0x0290, 0x0290, 0x0360, + 0x02e0, 0x0420, 0x0290, 0x0430, 0x0440, 0x0450, 0x0460, 0x02e0, + 0x02e0, 0x02e0, 0x0470, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0290, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x0480, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x0490, 0x04a0, + 0x02e0, 0x04b0, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0460, 0x02e0, 0x0290, 0x0290, 0x0480, 0x0290, 0x0290, + 0x0290, 0x0290, 0x0290, 0x04c0, 0x02e0, 0x04d0, 0x04e0, 0x02e0, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x04f0, 0x0500, 0x02e0, 0x0510, 0x0520, 0x02e0, 0x0530, 0x02e0, + 0x0540, 0x0550, 0x0560, 0x02e0, 0x0530, 0x02e0, 0x0540, 0x0570, + 0x02e0, 0x02e0, 0x0580, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x0590, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x05a0, + 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x05b0, 0x02e0, 0x05c0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x02e0, 0x02e0, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x02e0, 0x0290, 0x02e0, 0x05d0, 0x05e0, 0x05f0, 0x0290, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0600, 0x0610, 0x02e0, 0x0620, 0x02e0, 0x0630, 0x0640, 0x0290, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0650, 0x0660, /* values */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -187,6 +189,8 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] = 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, diff --git a/dlls/kernel32/wctype.c b/dlls/kernel32/wctype.c index cf25ccc66d..366eaf540d 100644 --- a/dlls/kernel32/wctype.c +++ b/dlls/kernel32/wctype.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN wctype_table[7664] = +const unsigned short DECLSPEC_HIDDEN wctype_table[7648] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, @@ -136,41 +136,41 @@ const unsigned short DECLSPEC_HIDDEN wctype_table[7664] = 0x1890, 0x0a10, 0x0a10, 0x0dd0, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x1190, 0x1610, 0x0a10, 0x18a0, 0x0740, 0x0740, 0x1800, 0x0a10, 0x1610, 0x18b0, 0x1610, 0x1610, 0x1610, 0x0740, 0x1610, 0x18c0, - 0x1610, 0x1610, 0x1610, 0x18d0, 0x18e0, 0x1610, 0x1610, 0x18f0, - 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1900, - 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1910, 0x1610, 0x1920, + 0x1610, 0x1610, 0x1610, 0x18d0, 0x18e0, 0x1610, 0x1610, 0x1610, + 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x18f0, + 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1900, 0x1610, 0x1910, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x1180, 0x0740, 0x0740, 0x0740, 0x0740, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x09c0, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0eb0, 0x0740, 0x0740, 0x0740, 0x1640, 0x0a10, 0x0a10, 0x1350, - 0x1930, 0x0a10, 0x1940, 0x09c0, 0x0620, 0x0620, 0x1950, 0x1960, - 0x0620, 0x1970, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x1980, - 0x0740, 0x1990, 0x19a0, 0x19b0, 0x0620, 0x0620, 0x0620, 0x19c0, - 0x19d0, 0x19e0, 0x19f0, 0x1a00, 0x1a10, 0x09c0, 0x09c0, 0x1a20, - 0x1a30, 0x0a10, 0x1a40, 0x1a50, 0x0a10, 0x0a10, 0x0a10, 0x1a60, - 0x1a70, 0x0a10, 0x0a10, 0x1a80, 0x1a90, 0x1140, 0x0750, 0x1aa0, - 0x12f0, 0x0a10, 0x1ab0, 0x0a10, 0x1ac0, 0x1ad0, 0x0a10, 0x0eb0, - 0x0a00, 0x0a10, 0x0a10, 0x1ae0, 0x1af0, 0x1b00, 0x1b10, 0x1b20, - 0x0a10, 0x0a10, 0x1b30, 0x1b40, 0x1b50, 0x1b60, 0x0a10, 0x1b70, - 0x0a10, 0x0a10, 0x0a10, 0x1b80, 0x1b90, 0x1ba0, 0x1bb0, 0x1bc0, - 0x1bd0, 0x1be0, 0x17d0, 0x0600, 0x0600, 0x1bf0, 0x1c00, 0x0600, - 0x0600, 0x0600, 0x0600, 0x0600, 0x0a10, 0x0a10, 0x1c10, 0x1140, + 0x1920, 0x0a10, 0x1930, 0x09c0, 0x0620, 0x0620, 0x1940, 0x1950, + 0x0620, 0x1960, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x1970, + 0x0740, 0x1980, 0x1990, 0x19a0, 0x0620, 0x0620, 0x0620, 0x19b0, + 0x19c0, 0x19d0, 0x19e0, 0x19f0, 0x1a00, 0x09c0, 0x09c0, 0x1a10, + 0x1a20, 0x0a10, 0x1a30, 0x1a40, 0x0a10, 0x0a10, 0x0a10, 0x1a50, + 0x1a60, 0x0a10, 0x0a10, 0x1a70, 0x1a80, 0x1140, 0x0750, 0x1a90, + 0x12f0, 0x0a10, 0x1aa0, 0x0a10, 0x1ab0, 0x1ac0, 0x0a10, 0x0eb0, + 0x0a00, 0x0a10, 0x0a10, 0x1ad0, 0x1ae0, 0x1af0, 0x1b00, 0x1b10, + 0x0a10, 0x0a10, 0x1b20, 0x1b30, 0x1b40, 0x1b50, 0x0a10, 0x1b60, + 0x0a10, 0x0a10, 0x0a10, 0x1b70, 0x1b80, 0x1b90, 0x1ba0, 0x1bb0, + 0x1bc0, 0x1bd0, 0x17d0, 0x0600, 0x0600, 0x1be0, 0x1bf0, 0x0600, + 0x0600, 0x0600, 0x0600, 0x0600, 0x0a10, 0x0a10, 0x1c00, 0x1140, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, - 0x0a10, 0x0a10, 0x1c20, 0x0a10, 0x1c30, 0x0a10, 0x0a10, 0x11f0, + 0x0a10, 0x0a10, 0x1c10, 0x0a10, 0x1c20, 0x0a10, 0x0a10, 0x11f0, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x11d0, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x0a10, 0x1200, 0x09c0, 0x09c0, - 0x1c40, 0x1c50, 0x1c60, 0x1c70, 0x1c80, 0x0850, 0x0850, 0x0850, - 0x0850, 0x0850, 0x0850, 0x1c90, 0x1ca0, 0x1cb0, 0x0850, 0x0850, + 0x1c30, 0x1c40, 0x1c50, 0x1c60, 0x1c70, 0x0850, 0x0850, 0x0850, + 0x0850, 0x0850, 0x0850, 0x1c80, 0x1c90, 0x1ca0, 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, - 0x0850, 0x0850, 0x0850, 0x1cc0, 0x09c0, 0x0850, 0x0850, 0x0850, - 0x0850, 0x1cd0, 0x0850, 0x0850, 0x1ce0, 0x09c0, 0x09c0, 0x1cf0, - 0x0750, 0x1d00, 0x0750, 0x14d0, 0x14d0, 0x1d10, 0x1d20, 0x1d30, - 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x1d40, - 0x1d50, 0x1d60, 0x0560, 0x1d70, 0x1d80, 0x1d90, 0x1da0, 0x0a10, - 0x0a10, 0x0a10, 0x0a10, 0x1190, 0x1db0, 0x1dc0, 0x1dd0, 0x1de0, + 0x0850, 0x0850, 0x0850, 0x1cb0, 0x09c0, 0x0850, 0x0850, 0x0850, + 0x0850, 0x1cc0, 0x0850, 0x0850, 0x1cd0, 0x09c0, 0x09c0, 0x1ce0, + 0x0750, 0x1cf0, 0x0750, 0x14d0, 0x14d0, 0x1d00, 0x1d10, 0x1d20, + 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x0850, 0x1d30, + 0x1d40, 0x1d50, 0x0560, 0x1d60, 0x1d70, 0x1d80, 0x1d90, 0x0a10, + 0x0a10, 0x0a10, 0x0a10, 0x1190, 0x1da0, 0x1db0, 0x1dc0, 0x1dd0, /* values */ 0x0220, 0x0220, 0x0220, 0x0220, 0x0220, 0x0220, 0x0220, 0x0220, 0x0220, 0x9268, 0x8228, 0x9228, 0xa228, 0x8228, 0x0220, 0x0220, @@ -806,8 +806,6 @@ const unsigned short DECLSPEC_HIDDEN wctype_table[7664] = 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0xb200, 0xb200, 0xb200, 0xb200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x0000, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0xb200, 0xb200, 0xb200, 0xb200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, diff --git a/dlls/kernelbase/compose.c b/dlls/kernelbase/compose.c index b817d1a058..7ac9445007 100644 --- a/dlls/kernelbase/compose.c +++ b/dlls/kernelbase/compose.c @@ -1,5 +1,5 @@ /* Unicode char composition */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "windef.h" diff --git a/dlls/kernelbase/decompose.c b/dlls/kernelbase/decompose.c index c185507fd4..3540ad4362 100644 --- a/dlls/kernelbase/decompose.c +++ b/dlls/kernelbase/decompose.c @@ -1,5 +1,5 @@ /* Unicode char composition */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "windef.h" diff --git a/dlls/kernelbase/digitmap.c b/dlls/kernelbase/digitmap.c index 1e3639e697..35590f3379 100644 --- a/dlls/kernelbase/digitmap.c +++ b/dlls/kernelbase/digitmap.c @@ -1,5 +1,5 @@ /* Unicode digit folding mappings */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "windef.h" diff --git a/dlls/usp10/bracket.c b/dlls/usp10/bracket.c index 210495f38f..a77c1176f6 100644 --- a/dlls/usp10/bracket.c +++ b/dlls/usp10/bracket.c @@ -1,5 +1,5 @@ /* Unicode Bidirectional Bracket table */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiBrackets.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/BidiBrackets.txt */ /* DO NOT EDIT!! */ #include "windef.h" diff --git a/dlls/usp10/indicsyllable.c b/dlls/usp10/indicsyllable.c index bc13fec294..339f6c47af 100644 --- a/dlls/usp10/indicsyllable.c +++ b/dlls/usp10/indicsyllable.c @@ -1,6 +1,6 @@ /* Unicode Indic Syllabic Category */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/IndicSyllabicCategory.txt */ -/* and from http://www.unicode.org/Public/12.0.0/ucd/IndicPositionalCategory.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/IndicSyllabicCategory.txt */ +/* and from http://www.unicode.org/Public/12.1.0/ucd/IndicPositionalCategory.txt */ /* DO NOT EDIT!! */ #include "windef.h" diff --git a/dlls/usp10/linebreak.c b/dlls/usp10/linebreak.c index 904efc6538..ff656f1e69 100644 --- a/dlls/usp10/linebreak.c +++ b/dlls/usp10/linebreak.c @@ -1,5 +1,5 @@ /* Unicode Line Break Properties */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/LineBreak.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/LineBreak.txt */ /* DO NOT EDIT!! */ #include "windef.h" @@ -133,7 +133,7 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7216] = 0x1770, 0x1680, 0x1680, 0x1780, 0x1680, 0x1680, 0x1680, 0x1680, 0x1790, 0x1680, 0x1680, 0x17a0, 0x1680, 0x1680, 0x16a0, 0x17b0, 0x1680, 0x1790, 0x1680, 0x1680, 0x17c0, 0x1680, 0x1680, 0x1680, - 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1790, + 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, diff --git a/dlls/usp10/mirror.c b/dlls/usp10/mirror.c index 7b43a85703..28e1e8bd9b 100644 --- a/dlls/usp10/mirror.c +++ b/dlls/usp10/mirror.c @@ -1,5 +1,5 @@ /* Unicode BiDi mirroring */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiMirroring.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/BidiMirroring.txt */ /* DO NOT EDIT!! */ #include "windef.h" diff --git a/dlls/usp10/shaping.c b/dlls/usp10/shaping.c index ebb6fae509..517a0a871f 100644 --- a/dlls/usp10/shaping.c +++ b/dlls/usp10/shaping.c @@ -1,5 +1,5 @@ /* Unicode Arabic shaping */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/ArabicShaping.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/ArabicShaping.txt */ /* DO NOT EDIT!! */ #include "windef.h" diff --git a/dlls/wineps.drv/vertical.c b/dlls/wineps.drv/vertical.c index b5baffdde5..b8095fe9ba 100644 --- a/dlls/wineps.drv/vertical.c +++ b/dlls/wineps.drv/vertical.c @@ -1,10 +1,10 @@ /* Unicode Vertical Orientation */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/VerticalOrientation.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/VerticalOrientation.txt */ /* DO NOT EDIT!! */ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] = +const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1648] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, @@ -13,7 +13,7 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] = 0x0160, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0170, 0x0180, 0x0190, 0x01a0, 0x01b0, 0x01c0, 0x01d0, 0x01e0, 0x0110, 0x0110, 0x0110, 0x01f0, 0x0110, 0x0110, 0x0200, 0x0130, - 0x0210, 0x0220, 0x0130, 0x0230, 0x0130, 0x0130, 0x0130, 0x0130, + 0x0210, 0x0220, 0x0230, 0x0240, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, @@ -27,8 +27,8 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] = 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, - 0x0130, 0x0130, 0x0130, 0x0130, 0x0240, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0250, 0x0110, 0x0110, 0x0130, 0x0130, 0x0130, 0x0130, + 0x0130, 0x0130, 0x0130, 0x0130, 0x0250, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0260, 0x0110, 0x0110, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, @@ -38,56 +38,58 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] = 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, 0x0130, - 0x0130, 0x0130, 0x0130, 0x0110, 0x0110, 0x0110, 0x0260, 0x0270, + 0x0130, 0x0130, 0x0130, 0x0110, 0x0110, 0x0110, 0x0270, 0x0280, /* level 2 offsets */ - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0290, 0x02a0, 0x0280, 0x02b0, 0x0280, 0x02b0, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x02c0, 0x0280, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02e0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x0280, 0x02f0, 0x0300, 0x0310, 0x0320, 0x0330, 0x0340, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0350, 0x0360, 0x0280, - 0x0370, 0x0380, 0x0390, 0x03a0, 0x03b0, 0x02d0, 0x02d0, 0x02d0, - 0x03c0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x03d0, 0x0280, 0x03e0, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x03f0, 0x02d0, 0x0400, 0x0280, 0x0280, 0x0280, 0x0280, 0x0350, - 0x02d0, 0x0410, 0x0280, 0x0420, 0x0430, 0x0440, 0x0450, 0x02d0, - 0x02d0, 0x02d0, 0x0460, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0280, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x0470, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0480, 0x0490, - 0x02d0, 0x04a0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0450, 0x02d0, 0x0280, 0x0280, 0x0470, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x04b0, 0x02d0, 0x04c0, 0x04d0, 0x02d0, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x04e0, 0x04f0, 0x02d0, 0x0500, 0x0510, 0x02d0, 0x0520, 0x02d0, - 0x0530, 0x0540, 0x0550, 0x02d0, 0x0520, 0x02d0, 0x0530, 0x0560, - 0x02d0, 0x02d0, 0x0570, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0580, - 0x0580, 0x0580, 0x0580, 0x0580, 0x0580, 0x0590, 0x02d0, 0x05a0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0280, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x02d0, 0x02d0, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x02d0, 0x0280, 0x02d0, 0x05b0, 0x05c0, 0x05d0, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x05e0, 0x05f0, 0x02d0, 0x0600, 0x02d0, 0x0610, 0x0620, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0630, 0x0640, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0290, 0x02a0, 0x02b0, 0x0290, 0x02c0, 0x0290, 0x02c0, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x02d0, 0x0290, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02f0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0290, 0x0290, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x0290, 0x0300, 0x0310, 0x0320, 0x0330, 0x0340, 0x0350, 0x0290, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0360, 0x0370, 0x0290, + 0x0380, 0x0390, 0x03a0, 0x03b0, 0x03c0, 0x02e0, 0x02e0, 0x02e0, + 0x03d0, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x03e0, 0x0290, 0x03f0, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0400, 0x02e0, 0x0410, 0x0290, 0x0290, 0x0290, 0x0290, 0x0360, + 0x02e0, 0x0420, 0x0290, 0x0430, 0x0440, 0x0450, 0x0460, 0x02e0, + 0x02e0, 0x02e0, 0x0470, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0290, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x0480, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x0490, 0x04a0, + 0x02e0, 0x04b0, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0460, 0x02e0, 0x0290, 0x0290, 0x0480, 0x0290, 0x0290, + 0x0290, 0x0290, 0x0290, 0x04c0, 0x02e0, 0x04d0, 0x04e0, 0x02e0, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x04f0, 0x0500, 0x02e0, 0x0510, 0x0520, 0x02e0, 0x0530, 0x02e0, + 0x0540, 0x0550, 0x0560, 0x02e0, 0x0530, 0x02e0, 0x0540, 0x0570, + 0x02e0, 0x02e0, 0x0580, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x0590, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x05a0, + 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x05b0, 0x02e0, 0x05c0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, + 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x02e0, 0x0290, 0x0290, 0x0290, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x02e0, 0x02e0, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0290, 0x02e0, 0x0290, 0x02e0, 0x05d0, 0x05e0, 0x05f0, 0x0290, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0600, 0x0610, 0x02e0, 0x0620, 0x02e0, 0x0630, 0x0640, 0x0290, + 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0290, 0x0650, 0x0660, /* values */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -187,6 +189,8 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] = 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, diff --git a/libs/port/casemap.c b/libs/port/casemap.c index 2905000c6e..3bf32c94d2 100644 --- a/libs/port/casemap.c +++ b/libs/port/casemap.c @@ -1,5 +1,5 @@ /* Unicode case mappings */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "windef.h" diff --git a/libs/port/combclass.c b/libs/port/combclass.c index f5c794a3e4..c402d38a2c 100644 --- a/libs/port/combclass.c +++ b/libs/port/combclass.c @@ -1,5 +1,5 @@ /* Unicode Combining Classes */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "windef.h" diff --git a/libs/port/compose.c b/libs/port/compose.c index b817d1a058..7ac9445007 100644 --- a/libs/port/compose.c +++ b/libs/port/compose.c @@ -1,5 +1,5 @@ /* Unicode char composition */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "windef.h" diff --git a/libs/port/decompose.c b/libs/port/decompose.c index 1c3d2b005d..a68156093e 100644 --- a/libs/port/decompose.c +++ b/libs/port/decompose.c @@ -1,5 +1,5 @@ /* Unicode char composition */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "windef.h" @@ -929,7 +929,7 @@ static const WCHAR table[5856] = 0x05d1, 0x05bf, 0x05db, 0x05bf, 0x05e4, 0x05bf, 0x0000, 0x0000 }; -static const WCHAR compatmap_table[8152] = +static const WCHAR compatmap_table[8154] = { /* index */ 0x0110, 0x0120, 0x0130, 0x0140, 0x0100, 0x0150, 0x0160, 0x0100, @@ -1406,283 +1406,283 @@ static const WCHAR compatmap_table[8152] = 0x1639, 0x163a, 0x163b, 0x163c, 0x163d, 0x163e, 0x163f, 0x1640, 0x1641, 0x1642, 0x1643, 0x1644, 0x1645, 0x1646, 0x1647, 0x1648, /* offsets 0x3300 .. 0x330f */ - 0x1648, 0x164c, 0x1650, 0x1654, 0x1657, 0x165b, 0x165e, 0x1661, - 0x1666, 0x166a, 0x166d, 0x1670, 0x1673, 0x1677, 0x167b, 0x167e, + 0x164a, 0x164e, 0x1652, 0x1656, 0x1659, 0x165d, 0x1660, 0x1663, + 0x1668, 0x166c, 0x166f, 0x1672, 0x1675, 0x1679, 0x167d, 0x1680, /* offsets 0x3310 .. 0x331f */ - 0x1681, 0x1683, 0x1686, 0x168a, 0x168e, 0x1690, 0x1695, 0x169b, - 0x16a0, 0x16a3, 0x16a8, 0x16ad, 0x16b1, 0x16b4, 0x16b7, 0x16ba, + 0x1683, 0x1685, 0x1688, 0x168c, 0x1690, 0x1692, 0x1697, 0x169d, + 0x16a2, 0x16a5, 0x16aa, 0x16af, 0x16b3, 0x16b6, 0x16b9, 0x16bc, /* offsets 0x3320 .. 0x332f */ - 0x16be, 0x16c3, 0x16c7, 0x16ca, 0x16cd, 0x16d0, 0x16d2, 0x16d4, - 0x16d6, 0x16d8, 0x16db, 0x16de, 0x16e3, 0x16e6, 0x16ea, 0x16ef, + 0x16c0, 0x16c5, 0x16c9, 0x16cc, 0x16cf, 0x16d2, 0x16d4, 0x16d6, + 0x16d8, 0x16da, 0x16dd, 0x16e0, 0x16e5, 0x16e8, 0x16ec, 0x16f1, /* offsets 0x3330 .. 0x333f */ - 0x16f2, 0x16f4, 0x16f6, 0x16fb, 0x16ff, 0x1704, 0x1707, 0x170c, - 0x170e, 0x1711, 0x1714, 0x1717, 0x171a, 0x171d, 0x1721, 0x1724, + 0x16f4, 0x16f6, 0x16f8, 0x16fd, 0x1701, 0x1706, 0x1709, 0x170e, + 0x1710, 0x1713, 0x1716, 0x1719, 0x171c, 0x171f, 0x1723, 0x1726, /* offsets 0x3340 .. 0x334f */ - 0x1726, 0x1729, 0x172c, 0x172f, 0x1733, 0x1736, 0x1739, 0x173c, - 0x1741, 0x1745, 0x1747, 0x174c, 0x174e, 0x1752, 0x1756, 0x1759, + 0x1728, 0x172b, 0x172e, 0x1731, 0x1735, 0x1738, 0x173b, 0x173e, + 0x1743, 0x1747, 0x1749, 0x174e, 0x1750, 0x1754, 0x1758, 0x175b, /* offsets 0x3350 .. 0x335f */ - 0x175c, 0x175f, 0x1763, 0x1765, 0x1768, 0x176c, 0x176e, 0x1773, - 0x1776, 0x1778, 0x177a, 0x177c, 0x177e, 0x1780, 0x1782, 0x1784, + 0x175e, 0x1761, 0x1765, 0x1767, 0x176a, 0x176e, 0x1770, 0x1775, + 0x1778, 0x177a, 0x177c, 0x177e, 0x1780, 0x1782, 0x1784, 0x1786, /* offsets 0x3360 .. 0x336f */ - 0x1786, 0x1788, 0x178a, 0x178d, 0x1790, 0x1793, 0x1796, 0x1799, - 0x179c, 0x179f, 0x17a2, 0x17a5, 0x17a8, 0x17ab, 0x17ae, 0x17b1, + 0x1788, 0x178a, 0x178c, 0x178f, 0x1792, 0x1795, 0x1798, 0x179b, + 0x179e, 0x17a1, 0x17a4, 0x17a7, 0x17aa, 0x17ad, 0x17b0, 0x17b3, /* offsets 0x3370 .. 0x337f */ - 0x17b4, 0x17b7, 0x17ba, 0x17bc, 0x17be, 0x17c1, 0x17c3, 0x17c5, - 0x17c7, 0x17ca, 0x17cd, 0x17cf, 0x17d1, 0x17d3, 0x17d5, 0x17d7, + 0x17b6, 0x17b9, 0x17bc, 0x17be, 0x17c0, 0x17c3, 0x17c5, 0x17c7, + 0x17c9, 0x17cc, 0x17cf, 0x17d1, 0x17d3, 0x17d5, 0x17d7, 0x17d9, /* offsets 0x3380 .. 0x338f */ - 0x17db, 0x17dd, 0x17df, 0x17e1, 0x17e3, 0x17e5, 0x17e7, 0x17e9, - 0x17eb, 0x17ee, 0x17f2, 0x17f4, 0x17f6, 0x17f8, 0x17fa, 0x17fc, + 0x17dd, 0x17df, 0x17e1, 0x17e3, 0x17e5, 0x17e7, 0x17e9, 0x17eb, + 0x17ed, 0x17f0, 0x17f4, 0x17f6, 0x17f8, 0x17fa, 0x17fc, 0x17fe, /* offsets 0x3390 .. 0x339f */ - 0x17fe, 0x1800, 0x1803, 0x1806, 0x1809, 0x180c, 0x180e, 0x1810, - 0x1812, 0x1814, 0x1816, 0x1818, 0x181a, 0x181c, 0x181e, 0x1820, + 0x1800, 0x1802, 0x1805, 0x1808, 0x180b, 0x180e, 0x1810, 0x1812, + 0x1814, 0x1816, 0x1818, 0x181a, 0x181c, 0x181e, 0x1820, 0x1822, /* offsets 0x33a0 .. 0x33af */ - 0x1823, 0x1826, 0x1828, 0x182b, 0x182e, 0x1831, 0x1833, 0x1836, - 0x1839, 0x183d, 0x183f, 0x1842, 0x1845, 0x1848, 0x184b, 0x1850, + 0x1825, 0x1828, 0x182a, 0x182d, 0x1830, 0x1833, 0x1835, 0x1838, + 0x183b, 0x183f, 0x1841, 0x1844, 0x1847, 0x184a, 0x184d, 0x1852, /* offsets 0x33b0 .. 0x33bf */ - 0x1856, 0x1858, 0x185a, 0x185c, 0x185e, 0x1860, 0x1862, 0x1864, - 0x1866, 0x1868, 0x186a, 0x186c, 0x186e, 0x1870, 0x1872, 0x1874, + 0x1858, 0x185a, 0x185c, 0x185e, 0x1860, 0x1862, 0x1864, 0x1866, + 0x1868, 0x186a, 0x186c, 0x186e, 0x1870, 0x1872, 0x1874, 0x1876, /* offsets 0x33c0 .. 0x33cf */ - 0x1876, 0x1878, 0x187a, 0x187e, 0x1880, 0x1882, 0x1884, 0x1888, - 0x188b, 0x188d, 0x188f, 0x1891, 0x1893, 0x1895, 0x1897, 0x1899, + 0x1878, 0x187a, 0x187c, 0x1880, 0x1882, 0x1884, 0x1886, 0x188a, + 0x188d, 0x188f, 0x1891, 0x1893, 0x1895, 0x1897, 0x1899, 0x189b, /* offsets 0x33d0 .. 0x33df */ - 0x189b, 0x189d, 0x189f, 0x18a2, 0x18a4, 0x18a6, 0x18a9, 0x18ac, - 0x18ae, 0x18b2, 0x18b5, 0x18b7, 0x18b9, 0x18bb, 0x18bd, 0x18c0, + 0x189d, 0x189f, 0x18a1, 0x18a4, 0x18a6, 0x18a8, 0x18ab, 0x18ae, + 0x18b0, 0x18b4, 0x18b7, 0x18b9, 0x18bb, 0x18bd, 0x18bf, 0x18c2, /* offsets 0x33e0 .. 0x33ef */ - 0x18c3, 0x18c5, 0x18c7, 0x18c9, 0x18cb, 0x18cd, 0x18cf, 0x18d1, - 0x18d3, 0x18d5, 0x18d8, 0x18db, 0x18de, 0x18e1, 0x18e4, 0x18e7, + 0x18c5, 0x18c7, 0x18c9, 0x18cb, 0x18cd, 0x18cf, 0x18d1, 0x18d3, + 0x18d5, 0x18d7, 0x18da, 0x18dd, 0x18e0, 0x18e3, 0x18e6, 0x18e9, /* offsets 0x33f0 .. 0x33ff */ - 0x18ea, 0x18ed, 0x18f0, 0x18f3, 0x18f6, 0x18f9, 0x18fc, 0x18ff, - 0x1902, 0x1905, 0x1908, 0x190b, 0x190e, 0x1911, 0x1914, 0x1917, + 0x18ec, 0x18ef, 0x18f2, 0x18f5, 0x18f8, 0x18fb, 0x18fe, 0x1901, + 0x1904, 0x1907, 0x190a, 0x190d, 0x1910, 0x1913, 0x1916, 0x1919, /* offsets 0xa690 .. 0xa69f */ - 0x191a, 0x191a, 0x191a, 0x191a, 0x191a, 0x191a, 0x191a, 0x191a, - 0x191a, 0x191a, 0x191a, 0x191a, 0x191a, 0x191b, 0x191c, 0x191c, + 0x191c, 0x191c, 0x191c, 0x191c, 0x191c, 0x191c, 0x191c, 0x191c, + 0x191c, 0x191c, 0x191c, 0x191c, 0x191c, 0x191d, 0x191e, 0x191e, /* offsets 0xa770 .. 0xa77f */ - 0x191c, 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, - 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, + 0x191e, 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, + 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, /* offsets 0xa7f0 .. 0xa7ff */ - 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, - 0x191d, 0x191e, 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, - /* offsets 0xab50 .. 0xab5f */ 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, - 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, 0x1920, 0x1921, 0x1922, + 0x191f, 0x1920, 0x1921, 0x1921, 0x1921, 0x1921, 0x1921, 0x1921, + /* offsets 0xab50 .. 0xab5f */ + 0x1921, 0x1921, 0x1921, 0x1921, 0x1921, 0x1921, 0x1921, 0x1921, + 0x1921, 0x1921, 0x1921, 0x1921, 0x1921, 0x1922, 0x1923, 0x1924, /* offsets 0xfb00 .. 0xfb0f */ - 0x1923, 0x1925, 0x1927, 0x1929, 0x192c, 0x192f, 0x1931, 0x1933, - 0x1933, 0x1933, 0x1933, 0x1933, 0x1933, 0x1933, 0x1933, 0x1933, + 0x1925, 0x1927, 0x1929, 0x192b, 0x192e, 0x1931, 0x1933, 0x1935, + 0x1935, 0x1935, 0x1935, 0x1935, 0x1935, 0x1935, 0x1935, 0x1935, /* offsets 0xfb10 .. 0xfb1f */ - 0x1933, 0x1933, 0x1933, 0x1933, 0x1935, 0x1937, 0x1939, 0x193b, - 0x193d, 0x193d, 0x193d, 0x193d, 0x193d, 0x193d, 0x193d, 0x193d, + 0x1935, 0x1935, 0x1935, 0x1935, 0x1937, 0x1939, 0x193b, 0x193d, + 0x193f, 0x193f, 0x193f, 0x193f, 0x193f, 0x193f, 0x193f, 0x193f, /* offsets 0xfb20 .. 0xfb2f */ - 0x193d, 0x193e, 0x193f, 0x1940, 0x1941, 0x1942, 0x1943, 0x1944, - 0x1945, 0x1946, 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, + 0x193f, 0x1940, 0x1941, 0x1942, 0x1943, 0x1944, 0x1945, 0x1946, + 0x1947, 0x1948, 0x1949, 0x1949, 0x1949, 0x1949, 0x1949, 0x1949, /* offsets 0xfb40 .. 0xfb4f */ - 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, - 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, + 0x1949, 0x1949, 0x1949, 0x1949, 0x1949, 0x1949, 0x1949, 0x1949, + 0x1949, 0x1949, 0x1949, 0x1949, 0x1949, 0x1949, 0x1949, 0x1949, /* offsets 0xfb50 .. 0xfb5f */ - 0x1949, 0x194a, 0x194b, 0x194c, 0x194d, 0x194e, 0x194f, 0x1950, - 0x1951, 0x1952, 0x1953, 0x1954, 0x1955, 0x1956, 0x1957, 0x1958, + 0x194b, 0x194c, 0x194d, 0x194e, 0x194f, 0x1950, 0x1951, 0x1952, + 0x1953, 0x1954, 0x1955, 0x1956, 0x1957, 0x1958, 0x1959, 0x195a, /* offsets 0xfb60 .. 0xfb6f */ - 0x1959, 0x195a, 0x195b, 0x195c, 0x195d, 0x195e, 0x195f, 0x1960, - 0x1961, 0x1962, 0x1963, 0x1964, 0x1965, 0x1966, 0x1967, 0x1968, + 0x195b, 0x195c, 0x195d, 0x195e, 0x195f, 0x1960, 0x1961, 0x1962, + 0x1963, 0x1964, 0x1965, 0x1966, 0x1967, 0x1968, 0x1969, 0x196a, /* offsets 0xfb70 .. 0xfb7f */ - 0x1969, 0x196a, 0x196b, 0x196c, 0x196d, 0x196e, 0x196f, 0x1970, - 0x1971, 0x1972, 0x1973, 0x1974, 0x1975, 0x1976, 0x1977, 0x1978, + 0x196b, 0x196c, 0x196d, 0x196e, 0x196f, 0x1970, 0x1971, 0x1972, + 0x1973, 0x1974, 0x1975, 0x1976, 0x1977, 0x1978, 0x1979, 0x197a, /* offsets 0xfb80 .. 0xfb8f */ - 0x1979, 0x197a, 0x197b, 0x197c, 0x197d, 0x197e, 0x197f, 0x1980, - 0x1981, 0x1982, 0x1983, 0x1984, 0x1985, 0x1986, 0x1987, 0x1988, + 0x197b, 0x197c, 0x197d, 0x197e, 0x197f, 0x1980, 0x1981, 0x1982, + 0x1983, 0x1984, 0x1985, 0x1986, 0x1987, 0x1988, 0x1989, 0x198a, /* offsets 0xfb90 .. 0xfb9f */ - 0x1989, 0x198a, 0x198b, 0x198c, 0x198d, 0x198e, 0x198f, 0x1990, - 0x1991, 0x1992, 0x1993, 0x1994, 0x1995, 0x1996, 0x1997, 0x1998, + 0x198b, 0x198c, 0x198d, 0x198e, 0x198f, 0x1990, 0x1991, 0x1992, + 0x1993, 0x1994, 0x1995, 0x1996, 0x1997, 0x1998, 0x1999, 0x199a, /* offsets 0xfba0 .. 0xfbaf */ - 0x1999, 0x199a, 0x199b, 0x199c, 0x199d, 0x199e, 0x199f, 0x19a0, - 0x19a1, 0x19a2, 0x19a3, 0x19a4, 0x19a5, 0x19a6, 0x19a7, 0x19a8, + 0x199b, 0x199c, 0x199d, 0x199e, 0x199f, 0x19a0, 0x19a1, 0x19a2, + 0x19a3, 0x19a4, 0x19a5, 0x19a6, 0x19a7, 0x19a8, 0x19a9, 0x19aa, /* offsets 0xfbb0 .. 0xfbbf */ - 0x19a9, 0x19aa, 0x19ab, 0x19ab, 0x19ab, 0x19ab, 0x19ab, 0x19ab, - 0x19ab, 0x19ab, 0x19ab, 0x19ab, 0x19ab, 0x19ab, 0x19ab, 0x19ab, + 0x19ab, 0x19ac, 0x19ad, 0x19ad, 0x19ad, 0x19ad, 0x19ad, 0x19ad, + 0x19ad, 0x19ad, 0x19ad, 0x19ad, 0x19ad, 0x19ad, 0x19ad, 0x19ad, /* offsets 0xfbd0 .. 0xfbdf */ - 0x19ab, 0x19ab, 0x19ab, 0x19ab, 0x19ac, 0x19ad, 0x19ae, 0x19af, - 0x19b0, 0x19b1, 0x19b2, 0x19b3, 0x19b4, 0x19b5, 0x19b6, 0x19b7, + 0x19ad, 0x19ad, 0x19ad, 0x19ad, 0x19ae, 0x19af, 0x19b0, 0x19b1, + 0x19b2, 0x19b3, 0x19b4, 0x19b5, 0x19b6, 0x19b7, 0x19b8, 0x19b9, /* offsets 0xfbe0 .. 0xfbef */ - 0x19b8, 0x19b9, 0x19ba, 0x19bb, 0x19bc, 0x19bd, 0x19be, 0x19bf, - 0x19c0, 0x19c1, 0x19c2, 0x19c4, 0x19c6, 0x19c8, 0x19ca, 0x19cc, + 0x19ba, 0x19bb, 0x19bc, 0x19bd, 0x19be, 0x19bf, 0x19c0, 0x19c1, + 0x19c2, 0x19c3, 0x19c4, 0x19c6, 0x19c8, 0x19ca, 0x19cc, 0x19ce, /* offsets 0xfbf0 .. 0xfbff */ - 0x19ce, 0x19d0, 0x19d2, 0x19d4, 0x19d6, 0x19d8, 0x19da, 0x19dc, - 0x19de, 0x19e0, 0x19e2, 0x19e4, 0x19e6, 0x19e7, 0x19e8, 0x19e9, + 0x19d0, 0x19d2, 0x19d4, 0x19d6, 0x19d8, 0x19da, 0x19dc, 0x19de, + 0x19e0, 0x19e2, 0x19e4, 0x19e6, 0x19e8, 0x19e9, 0x19ea, 0x19eb, /* offsets 0xfc00 .. 0xfc0f */ - 0x19ea, 0x19ec, 0x19ee, 0x19f0, 0x19f2, 0x19f4, 0x19f6, 0x19f8, - 0x19fa, 0x19fc, 0x19fe, 0x1a00, 0x1a02, 0x1a04, 0x1a06, 0x1a08, + 0x19ec, 0x19ee, 0x19f0, 0x19f2, 0x19f4, 0x19f6, 0x19f8, 0x19fa, + 0x19fc, 0x19fe, 0x1a00, 0x1a02, 0x1a04, 0x1a06, 0x1a08, 0x1a0a, /* offsets 0xfc10 .. 0xfc1f */ - 0x1a0a, 0x1a0c, 0x1a0e, 0x1a10, 0x1a12, 0x1a14, 0x1a16, 0x1a18, - 0x1a1a, 0x1a1c, 0x1a1e, 0x1a20, 0x1a22, 0x1a24, 0x1a26, 0x1a28, + 0x1a0c, 0x1a0e, 0x1a10, 0x1a12, 0x1a14, 0x1a16, 0x1a18, 0x1a1a, + 0x1a1c, 0x1a1e, 0x1a20, 0x1a22, 0x1a24, 0x1a26, 0x1a28, 0x1a2a, /* offsets 0xfc20 .. 0xfc2f */ - 0x1a2a, 0x1a2c, 0x1a2e, 0x1a30, 0x1a32, 0x1a34, 0x1a36, 0x1a38, - 0x1a3a, 0x1a3c, 0x1a3e, 0x1a40, 0x1a42, 0x1a44, 0x1a46, 0x1a48, + 0x1a2c, 0x1a2e, 0x1a30, 0x1a32, 0x1a34, 0x1a36, 0x1a38, 0x1a3a, + 0x1a3c, 0x1a3e, 0x1a40, 0x1a42, 0x1a44, 0x1a46, 0x1a48, 0x1a4a, /* offsets 0xfc30 .. 0xfc3f */ - 0x1a4a, 0x1a4c, 0x1a4e, 0x1a50, 0x1a52, 0x1a54, 0x1a56, 0x1a58, - 0x1a5a, 0x1a5c, 0x1a5e, 0x1a60, 0x1a62, 0x1a64, 0x1a66, 0x1a68, + 0x1a4c, 0x1a4e, 0x1a50, 0x1a52, 0x1a54, 0x1a56, 0x1a58, 0x1a5a, + 0x1a5c, 0x1a5e, 0x1a60, 0x1a62, 0x1a64, 0x1a66, 0x1a68, 0x1a6a, /* offsets 0xfc40 .. 0xfc4f */ - 0x1a6a, 0x1a6c, 0x1a6e, 0x1a70, 0x1a72, 0x1a74, 0x1a76, 0x1a78, - 0x1a7a, 0x1a7c, 0x1a7e, 0x1a80, 0x1a82, 0x1a84, 0x1a86, 0x1a88, + 0x1a6c, 0x1a6e, 0x1a70, 0x1a72, 0x1a74, 0x1a76, 0x1a78, 0x1a7a, + 0x1a7c, 0x1a7e, 0x1a80, 0x1a82, 0x1a84, 0x1a86, 0x1a88, 0x1a8a, /* offsets 0xfc50 .. 0xfc5f */ - 0x1a8a, 0x1a8c, 0x1a8e, 0x1a90, 0x1a92, 0x1a94, 0x1a96, 0x1a98, - 0x1a9a, 0x1a9c, 0x1a9e, 0x1aa0, 0x1aa2, 0x1aa4, 0x1aa6, 0x1aa9, + 0x1a8c, 0x1a8e, 0x1a90, 0x1a92, 0x1a94, 0x1a96, 0x1a98, 0x1a9a, + 0x1a9c, 0x1a9e, 0x1aa0, 0x1aa2, 0x1aa4, 0x1aa6, 0x1aa8, 0x1aab, /* offsets 0xfc60 .. 0xfc6f */ - 0x1aac, 0x1aaf, 0x1ab2, 0x1ab5, 0x1ab8, 0x1aba, 0x1abc, 0x1abe, - 0x1ac0, 0x1ac2, 0x1ac4, 0x1ac6, 0x1ac8, 0x1aca, 0x1acc, 0x1ace, + 0x1aae, 0x1ab1, 0x1ab4, 0x1ab7, 0x1aba, 0x1abc, 0x1abe, 0x1ac0, + 0x1ac2, 0x1ac4, 0x1ac6, 0x1ac8, 0x1aca, 0x1acc, 0x1ace, 0x1ad0, /* offsets 0xfc70 .. 0xfc7f */ - 0x1ad0, 0x1ad2, 0x1ad4, 0x1ad6, 0x1ad8, 0x1ada, 0x1adc, 0x1ade, - 0x1ae0, 0x1ae2, 0x1ae4, 0x1ae6, 0x1ae8, 0x1aea, 0x1aec, 0x1aee, + 0x1ad2, 0x1ad4, 0x1ad6, 0x1ad8, 0x1ada, 0x1adc, 0x1ade, 0x1ae0, + 0x1ae2, 0x1ae4, 0x1ae6, 0x1ae8, 0x1aea, 0x1aec, 0x1aee, 0x1af0, /* offsets 0xfc80 .. 0xfc8f */ - 0x1af0, 0x1af2, 0x1af4, 0x1af6, 0x1af8, 0x1afa, 0x1afc, 0x1afe, - 0x1b00, 0x1b02, 0x1b04, 0x1b06, 0x1b08, 0x1b0a, 0x1b0c, 0x1b0e, + 0x1af2, 0x1af4, 0x1af6, 0x1af8, 0x1afa, 0x1afc, 0x1afe, 0x1b00, + 0x1b02, 0x1b04, 0x1b06, 0x1b08, 0x1b0a, 0x1b0c, 0x1b0e, 0x1b10, /* offsets 0xfc90 .. 0xfc9f */ - 0x1b10, 0x1b12, 0x1b14, 0x1b16, 0x1b18, 0x1b1a, 0x1b1c, 0x1b1e, - 0x1b20, 0x1b22, 0x1b24, 0x1b26, 0x1b28, 0x1b2a, 0x1b2c, 0x1b2e, + 0x1b12, 0x1b14, 0x1b16, 0x1b18, 0x1b1a, 0x1b1c, 0x1b1e, 0x1b20, + 0x1b22, 0x1b24, 0x1b26, 0x1b28, 0x1b2a, 0x1b2c, 0x1b2e, 0x1b30, /* offsets 0xfca0 .. 0xfcaf */ - 0x1b30, 0x1b32, 0x1b34, 0x1b36, 0x1b38, 0x1b3a, 0x1b3c, 0x1b3e, - 0x1b40, 0x1b42, 0x1b44, 0x1b46, 0x1b48, 0x1b4a, 0x1b4c, 0x1b4e, + 0x1b32, 0x1b34, 0x1b36, 0x1b38, 0x1b3a, 0x1b3c, 0x1b3e, 0x1b40, + 0x1b42, 0x1b44, 0x1b46, 0x1b48, 0x1b4a, 0x1b4c, 0x1b4e, 0x1b50, /* offsets 0xfcb0 .. 0xfcbf */ - 0x1b50, 0x1b52, 0x1b54, 0x1b56, 0x1b58, 0x1b5a, 0x1b5c, 0x1b5e, - 0x1b60, 0x1b62, 0x1b64, 0x1b66, 0x1b68, 0x1b6a, 0x1b6c, 0x1b6e, + 0x1b52, 0x1b54, 0x1b56, 0x1b58, 0x1b5a, 0x1b5c, 0x1b5e, 0x1b60, + 0x1b62, 0x1b64, 0x1b66, 0x1b68, 0x1b6a, 0x1b6c, 0x1b6e, 0x1b70, /* offsets 0xfcc0 .. 0xfccf */ - 0x1b70, 0x1b72, 0x1b74, 0x1b76, 0x1b78, 0x1b7a, 0x1b7c, 0x1b7e, - 0x1b80, 0x1b82, 0x1b84, 0x1b86, 0x1b88, 0x1b8a, 0x1b8c, 0x1b8e, + 0x1b72, 0x1b74, 0x1b76, 0x1b78, 0x1b7a, 0x1b7c, 0x1b7e, 0x1b80, + 0x1b82, 0x1b84, 0x1b86, 0x1b88, 0x1b8a, 0x1b8c, 0x1b8e, 0x1b90, /* offsets 0xfcd0 .. 0xfcdf */ - 0x1b90, 0x1b92, 0x1b94, 0x1b96, 0x1b98, 0x1b9a, 0x1b9c, 0x1b9e, - 0x1ba0, 0x1ba2, 0x1ba4, 0x1ba6, 0x1ba8, 0x1baa, 0x1bac, 0x1bae, + 0x1b92, 0x1b94, 0x1b96, 0x1b98, 0x1b9a, 0x1b9c, 0x1b9e, 0x1ba0, + 0x1ba2, 0x1ba4, 0x1ba6, 0x1ba8, 0x1baa, 0x1bac, 0x1bae, 0x1bb0, /* offsets 0xfce0 .. 0xfcef */ - 0x1bb0, 0x1bb2, 0x1bb4, 0x1bb6, 0x1bb8, 0x1bba, 0x1bbc, 0x1bbe, - 0x1bc0, 0x1bc2, 0x1bc4, 0x1bc6, 0x1bc8, 0x1bca, 0x1bcc, 0x1bce, + 0x1bb2, 0x1bb4, 0x1bb6, 0x1bb8, 0x1bba, 0x1bbc, 0x1bbe, 0x1bc0, + 0x1bc2, 0x1bc4, 0x1bc6, 0x1bc8, 0x1bca, 0x1bcc, 0x1bce, 0x1bd0, /* offsets 0xfcf0 .. 0xfcff */ - 0x1bd0, 0x1bd2, 0x1bd4, 0x1bd7, 0x1bda, 0x1bdd, 0x1bdf, 0x1be1, - 0x1be3, 0x1be5, 0x1be7, 0x1be9, 0x1beb, 0x1bed, 0x1bef, 0x1bf1, + 0x1bd2, 0x1bd4, 0x1bd6, 0x1bd9, 0x1bdc, 0x1bdf, 0x1be1, 0x1be3, + 0x1be5, 0x1be7, 0x1be9, 0x1beb, 0x1bed, 0x1bef, 0x1bf1, 0x1bf3, /* offsets 0xfd00 .. 0xfd0f */ - 0x1bf3, 0x1bf5, 0x1bf7, 0x1bf9, 0x1bfb, 0x1bfd, 0x1bff, 0x1c01, - 0x1c03, 0x1c05, 0x1c07, 0x1c09, 0x1c0b, 0x1c0d, 0x1c0f, 0x1c11, + 0x1bf5, 0x1bf7, 0x1bf9, 0x1bfb, 0x1bfd, 0x1bff, 0x1c01, 0x1c03, + 0x1c05, 0x1c07, 0x1c09, 0x1c0b, 0x1c0d, 0x1c0f, 0x1c11, 0x1c13, /* offsets 0xfd10 .. 0xfd1f */ - 0x1c13, 0x1c15, 0x1c17, 0x1c19, 0x1c1b, 0x1c1d, 0x1c1f, 0x1c21, - 0x1c23, 0x1c25, 0x1c27, 0x1c29, 0x1c2b, 0x1c2d, 0x1c2f, 0x1c31, + 0x1c15, 0x1c17, 0x1c19, 0x1c1b, 0x1c1d, 0x1c1f, 0x1c21, 0x1c23, + 0x1c25, 0x1c27, 0x1c29, 0x1c2b, 0x1c2d, 0x1c2f, 0x1c31, 0x1c33, /* offsets 0xfd20 .. 0xfd2f */ - 0x1c33, 0x1c35, 0x1c37, 0x1c39, 0x1c3b, 0x1c3d, 0x1c3f, 0x1c41, - 0x1c43, 0x1c45, 0x1c47, 0x1c49, 0x1c4b, 0x1c4d, 0x1c4f, 0x1c51, + 0x1c35, 0x1c37, 0x1c39, 0x1c3b, 0x1c3d, 0x1c3f, 0x1c41, 0x1c43, + 0x1c45, 0x1c47, 0x1c49, 0x1c4b, 0x1c4d, 0x1c4f, 0x1c51, 0x1c53, /* offsets 0xfd30 .. 0xfd3f */ - 0x1c53, 0x1c55, 0x1c57, 0x1c59, 0x1c5b, 0x1c5d, 0x1c5f, 0x1c61, - 0x1c63, 0x1c65, 0x1c67, 0x1c69, 0x1c6b, 0x1c6d, 0x1c6f, 0x1c6f, + 0x1c55, 0x1c57, 0x1c59, 0x1c5b, 0x1c5d, 0x1c5f, 0x1c61, 0x1c63, + 0x1c65, 0x1c67, 0x1c69, 0x1c6b, 0x1c6d, 0x1c6f, 0x1c71, 0x1c71, /* offsets 0xfd50 .. 0xfd5f */ - 0x1c6f, 0x1c72, 0x1c75, 0x1c78, 0x1c7b, 0x1c7e, 0x1c81, 0x1c84, - 0x1c87, 0x1c8a, 0x1c8d, 0x1c90, 0x1c93, 0x1c96, 0x1c99, 0x1c9c, + 0x1c71, 0x1c74, 0x1c77, 0x1c7a, 0x1c7d, 0x1c80, 0x1c83, 0x1c86, + 0x1c89, 0x1c8c, 0x1c8f, 0x1c92, 0x1c95, 0x1c98, 0x1c9b, 0x1c9e, /* offsets 0xfd60 .. 0xfd6f */ - 0x1c9f, 0x1ca2, 0x1ca5, 0x1ca8, 0x1cab, 0x1cae, 0x1cb1, 0x1cb4, - 0x1cb7, 0x1cba, 0x1cbd, 0x1cc0, 0x1cc3, 0x1cc6, 0x1cc9, 0x1ccc, + 0x1ca1, 0x1ca4, 0x1ca7, 0x1caa, 0x1cad, 0x1cb0, 0x1cb3, 0x1cb6, + 0x1cb9, 0x1cbc, 0x1cbf, 0x1cc2, 0x1cc5, 0x1cc8, 0x1ccb, 0x1cce, /* offsets 0xfd70 .. 0xfd7f */ - 0x1ccf, 0x1cd2, 0x1cd5, 0x1cd8, 0x1cdb, 0x1cde, 0x1ce1, 0x1ce4, - 0x1ce7, 0x1cea, 0x1ced, 0x1cf0, 0x1cf3, 0x1cf6, 0x1cf9, 0x1cfc, + 0x1cd1, 0x1cd4, 0x1cd7, 0x1cda, 0x1cdd, 0x1ce0, 0x1ce3, 0x1ce6, + 0x1ce9, 0x1cec, 0x1cef, 0x1cf2, 0x1cf5, 0x1cf8, 0x1cfb, 0x1cfe, /* offsets 0xfd80 .. 0xfd8f */ - 0x1cff, 0x1d02, 0x1d05, 0x1d08, 0x1d0b, 0x1d0e, 0x1d11, 0x1d14, - 0x1d17, 0x1d1a, 0x1d1d, 0x1d20, 0x1d23, 0x1d26, 0x1d29, 0x1d2c, + 0x1d01, 0x1d04, 0x1d07, 0x1d0a, 0x1d0d, 0x1d10, 0x1d13, 0x1d16, + 0x1d19, 0x1d1c, 0x1d1f, 0x1d22, 0x1d25, 0x1d28, 0x1d2b, 0x1d2e, /* offsets 0xfd90 .. 0xfd9f */ - 0x1d2f, 0x1d2f, 0x1d2f, 0x1d32, 0x1d35, 0x1d38, 0x1d3b, 0x1d3e, - 0x1d41, 0x1d44, 0x1d47, 0x1d4a, 0x1d4d, 0x1d50, 0x1d53, 0x1d56, + 0x1d31, 0x1d31, 0x1d31, 0x1d34, 0x1d37, 0x1d3a, 0x1d3d, 0x1d40, + 0x1d43, 0x1d46, 0x1d49, 0x1d4c, 0x1d4f, 0x1d52, 0x1d55, 0x1d58, /* offsets 0xfda0 .. 0xfdaf */ - 0x1d59, 0x1d5c, 0x1d5f, 0x1d62, 0x1d65, 0x1d68, 0x1d6b, 0x1d6e, - 0x1d71, 0x1d74, 0x1d77, 0x1d7a, 0x1d7d, 0x1d80, 0x1d83, 0x1d86, + 0x1d5b, 0x1d5e, 0x1d61, 0x1d64, 0x1d67, 0x1d6a, 0x1d6d, 0x1d70, + 0x1d73, 0x1d76, 0x1d79, 0x1d7c, 0x1d7f, 0x1d82, 0x1d85, 0x1d88, /* offsets 0xfdb0 .. 0xfdbf */ - 0x1d89, 0x1d8c, 0x1d8f, 0x1d92, 0x1d95, 0x1d98, 0x1d9b, 0x1d9e, - 0x1da1, 0x1da4, 0x1da7, 0x1daa, 0x1dad, 0x1db0, 0x1db3, 0x1db6, + 0x1d8b, 0x1d8e, 0x1d91, 0x1d94, 0x1d97, 0x1d9a, 0x1d9d, 0x1da0, + 0x1da3, 0x1da6, 0x1da9, 0x1dac, 0x1daf, 0x1db2, 0x1db5, 0x1db8, /* offsets 0xfdc0 .. 0xfdcf */ - 0x1db9, 0x1dbc, 0x1dbf, 0x1dc2, 0x1dc5, 0x1dc8, 0x1dcb, 0x1dce, - 0x1dd1, 0x1dd1, 0x1dd1, 0x1dd1, 0x1dd1, 0x1dd1, 0x1dd1, 0x1dd1, + 0x1dbb, 0x1dbe, 0x1dc1, 0x1dc4, 0x1dc7, 0x1dca, 0x1dcd, 0x1dd0, + 0x1dd3, 0x1dd3, 0x1dd3, 0x1dd3, 0x1dd3, 0x1dd3, 0x1dd3, 0x1dd3, /* offsets 0xfdf0 .. 0xfdff */ - 0x1dd1, 0x1dd4, 0x1dd7, 0x1ddb, 0x1ddf, 0x1de3, 0x1de7, 0x1deb, - 0x1def, 0x1df3, 0x1df6, 0x1e08, 0x1e10, 0x1e14, 0x1e14, 0x1e14, + 0x1dd3, 0x1dd6, 0x1dd9, 0x1ddd, 0x1de1, 0x1de5, 0x1de9, 0x1ded, + 0x1df1, 0x1df5, 0x1df8, 0x1e0a, 0x1e12, 0x1e16, 0x1e16, 0x1e16, /* offsets 0xfe10 .. 0xfe1f */ - 0x1e14, 0x1e15, 0x1e16, 0x1e17, 0x1e18, 0x1e19, 0x1e1a, 0x1e1b, - 0x1e1c, 0x1e1d, 0x1e1e, 0x1e1e, 0x1e1e, 0x1e1e, 0x1e1e, 0x1e1e, + 0x1e16, 0x1e17, 0x1e18, 0x1e19, 0x1e1a, 0x1e1b, 0x1e1c, 0x1e1d, + 0x1e1e, 0x1e1f, 0x1e20, 0x1e20, 0x1e20, 0x1e20, 0x1e20, 0x1e20, /* offsets 0xfe30 .. 0xfe3f */ - 0x1e1e, 0x1e1f, 0x1e20, 0x1e21, 0x1e22, 0x1e23, 0x1e24, 0x1e25, - 0x1e26, 0x1e27, 0x1e28, 0x1e29, 0x1e2a, 0x1e2b, 0x1e2c, 0x1e2d, + 0x1e20, 0x1e21, 0x1e22, 0x1e23, 0x1e24, 0x1e25, 0x1e26, 0x1e27, + 0x1e28, 0x1e29, 0x1e2a, 0x1e2b, 0x1e2c, 0x1e2d, 0x1e2e, 0x1e2f, /* offsets 0xfe40 .. 0xfe4f */ - 0x1e2e, 0x1e2f, 0x1e30, 0x1e31, 0x1e32, 0x1e33, 0x1e33, 0x1e33, - 0x1e34, 0x1e35, 0x1e36, 0x1e37, 0x1e38, 0x1e39, 0x1e3a, 0x1e3b, + 0x1e30, 0x1e31, 0x1e32, 0x1e33, 0x1e34, 0x1e35, 0x1e35, 0x1e35, + 0x1e36, 0x1e37, 0x1e38, 0x1e39, 0x1e3a, 0x1e3b, 0x1e3c, 0x1e3d, /* offsets 0xfe50 .. 0xfe5f */ - 0x1e3c, 0x1e3d, 0x1e3e, 0x1e3f, 0x1e3f, 0x1e40, 0x1e41, 0x1e42, - 0x1e43, 0x1e44, 0x1e45, 0x1e46, 0x1e47, 0x1e48, 0x1e49, 0x1e4a, + 0x1e3e, 0x1e3f, 0x1e40, 0x1e41, 0x1e41, 0x1e42, 0x1e43, 0x1e44, + 0x1e45, 0x1e46, 0x1e47, 0x1e48, 0x1e49, 0x1e4a, 0x1e4b, 0x1e4c, /* offsets 0xfe60 .. 0xfe6f */ - 0x1e4b, 0x1e4c, 0x1e4d, 0x1e4e, 0x1e4f, 0x1e50, 0x1e51, 0x1e52, - 0x1e52, 0x1e53, 0x1e54, 0x1e55, 0x1e56, 0x1e56, 0x1e56, 0x1e56, + 0x1e4d, 0x1e4e, 0x1e4f, 0x1e50, 0x1e51, 0x1e52, 0x1e53, 0x1e54, + 0x1e54, 0x1e55, 0x1e56, 0x1e57, 0x1e58, 0x1e58, 0x1e58, 0x1e58, /* offsets 0xfe70 .. 0xfe7f */ - 0x1e56, 0x1e58, 0x1e5a, 0x1e5c, 0x1e5c, 0x1e5e, 0x1e5e, 0x1e60, - 0x1e62, 0x1e64, 0x1e66, 0x1e68, 0x1e6a, 0x1e6c, 0x1e6e, 0x1e70, + 0x1e58, 0x1e5a, 0x1e5c, 0x1e5e, 0x1e5e, 0x1e60, 0x1e60, 0x1e62, + 0x1e64, 0x1e66, 0x1e68, 0x1e6a, 0x1e6c, 0x1e6e, 0x1e70, 0x1e72, /* offsets 0xfe80 .. 0xfe8f */ - 0x1e72, 0x1e73, 0x1e74, 0x1e75, 0x1e76, 0x1e77, 0x1e78, 0x1e79, - 0x1e7a, 0x1e7b, 0x1e7c, 0x1e7d, 0x1e7e, 0x1e7f, 0x1e80, 0x1e81, + 0x1e74, 0x1e75, 0x1e76, 0x1e77, 0x1e78, 0x1e79, 0x1e7a, 0x1e7b, + 0x1e7c, 0x1e7d, 0x1e7e, 0x1e7f, 0x1e80, 0x1e81, 0x1e82, 0x1e83, /* offsets 0xfe90 .. 0xfe9f */ - 0x1e82, 0x1e83, 0x1e84, 0x1e85, 0x1e86, 0x1e87, 0x1e88, 0x1e89, - 0x1e8a, 0x1e8b, 0x1e8c, 0x1e8d, 0x1e8e, 0x1e8f, 0x1e90, 0x1e91, + 0x1e84, 0x1e85, 0x1e86, 0x1e87, 0x1e88, 0x1e89, 0x1e8a, 0x1e8b, + 0x1e8c, 0x1e8d, 0x1e8e, 0x1e8f, 0x1e90, 0x1e91, 0x1e92, 0x1e93, /* offsets 0xfea0 .. 0xfeaf */ - 0x1e92, 0x1e93, 0x1e94, 0x1e95, 0x1e96, 0x1e97, 0x1e98, 0x1e99, - 0x1e9a, 0x1e9b, 0x1e9c, 0x1e9d, 0x1e9e, 0x1e9f, 0x1ea0, 0x1ea1, + 0x1e94, 0x1e95, 0x1e96, 0x1e97, 0x1e98, 0x1e99, 0x1e9a, 0x1e9b, + 0x1e9c, 0x1e9d, 0x1e9e, 0x1e9f, 0x1ea0, 0x1ea1, 0x1ea2, 0x1ea3, /* offsets 0xfeb0 .. 0xfebf */ - 0x1ea2, 0x1ea3, 0x1ea4, 0x1ea5, 0x1ea6, 0x1ea7, 0x1ea8, 0x1ea9, - 0x1eaa, 0x1eab, 0x1eac, 0x1ead, 0x1eae, 0x1eaf, 0x1eb0, 0x1eb1, + 0x1ea4, 0x1ea5, 0x1ea6, 0x1ea7, 0x1ea8, 0x1ea9, 0x1eaa, 0x1eab, + 0x1eac, 0x1ead, 0x1eae, 0x1eaf, 0x1eb0, 0x1eb1, 0x1eb2, 0x1eb3, /* offsets 0xfec0 .. 0xfecf */ - 0x1eb2, 0x1eb3, 0x1eb4, 0x1eb5, 0x1eb6, 0x1eb7, 0x1eb8, 0x1eb9, - 0x1eba, 0x1ebb, 0x1ebc, 0x1ebd, 0x1ebe, 0x1ebf, 0x1ec0, 0x1ec1, + 0x1eb4, 0x1eb5, 0x1eb6, 0x1eb7, 0x1eb8, 0x1eb9, 0x1eba, 0x1ebb, + 0x1ebc, 0x1ebd, 0x1ebe, 0x1ebf, 0x1ec0, 0x1ec1, 0x1ec2, 0x1ec3, /* offsets 0xfed0 .. 0xfedf */ - 0x1ec2, 0x1ec3, 0x1ec4, 0x1ec5, 0x1ec6, 0x1ec7, 0x1ec8, 0x1ec9, - 0x1eca, 0x1ecb, 0x1ecc, 0x1ecd, 0x1ece, 0x1ecf, 0x1ed0, 0x1ed1, + 0x1ec4, 0x1ec5, 0x1ec6, 0x1ec7, 0x1ec8, 0x1ec9, 0x1eca, 0x1ecb, + 0x1ecc, 0x1ecd, 0x1ece, 0x1ecf, 0x1ed0, 0x1ed1, 0x1ed2, 0x1ed3, /* offsets 0xfee0 .. 0xfeef */ - 0x1ed2, 0x1ed3, 0x1ed4, 0x1ed5, 0x1ed6, 0x1ed7, 0x1ed8, 0x1ed9, - 0x1eda, 0x1edb, 0x1edc, 0x1edd, 0x1ede, 0x1edf, 0x1ee0, 0x1ee1, + 0x1ed4, 0x1ed5, 0x1ed6, 0x1ed7, 0x1ed8, 0x1ed9, 0x1eda, 0x1edb, + 0x1edc, 0x1edd, 0x1ede, 0x1edf, 0x1ee0, 0x1ee1, 0x1ee2, 0x1ee3, /* offsets 0xfef0 .. 0xfeff */ - 0x1ee2, 0x1ee3, 0x1ee4, 0x1ee5, 0x1ee6, 0x1ee7, 0x1ee9, 0x1eeb, - 0x1eed, 0x1eef, 0x1ef1, 0x1ef3, 0x1ef5, 0x1ef7, 0x1ef7, 0x1ef7, + 0x1ee4, 0x1ee5, 0x1ee6, 0x1ee7, 0x1ee8, 0x1ee9, 0x1eeb, 0x1eed, + 0x1eef, 0x1ef1, 0x1ef3, 0x1ef5, 0x1ef7, 0x1ef9, 0x1ef9, 0x1ef9, /* offsets 0xff00 .. 0xff0f */ - 0x1ef7, 0x1ef7, 0x1ef8, 0x1ef9, 0x1efa, 0x1efb, 0x1efc, 0x1efd, - 0x1efe, 0x1eff, 0x1f00, 0x1f01, 0x1f02, 0x1f03, 0x1f04, 0x1f05, + 0x1ef9, 0x1ef9, 0x1efa, 0x1efb, 0x1efc, 0x1efd, 0x1efe, 0x1eff, + 0x1f00, 0x1f01, 0x1f02, 0x1f03, 0x1f04, 0x1f05, 0x1f06, 0x1f07, /* offsets 0xff10 .. 0xff1f */ - 0x1f06, 0x1f07, 0x1f08, 0x1f09, 0x1f0a, 0x1f0b, 0x1f0c, 0x1f0d, - 0x1f0e, 0x1f0f, 0x1f10, 0x1f11, 0x1f12, 0x1f13, 0x1f14, 0x1f15, + 0x1f08, 0x1f09, 0x1f0a, 0x1f0b, 0x1f0c, 0x1f0d, 0x1f0e, 0x1f0f, + 0x1f10, 0x1f11, 0x1f12, 0x1f13, 0x1f14, 0x1f15, 0x1f16, 0x1f17, /* offsets 0xff20 .. 0xff2f */ - 0x1f16, 0x1f17, 0x1f18, 0x1f19, 0x1f1a, 0x1f1b, 0x1f1c, 0x1f1d, - 0x1f1e, 0x1f1f, 0x1f20, 0x1f21, 0x1f22, 0x1f23, 0x1f24, 0x1f25, + 0x1f18, 0x1f19, 0x1f1a, 0x1f1b, 0x1f1c, 0x1f1d, 0x1f1e, 0x1f1f, + 0x1f20, 0x1f21, 0x1f22, 0x1f23, 0x1f24, 0x1f25, 0x1f26, 0x1f27, /* offsets 0xff30 .. 0xff3f */ - 0x1f26, 0x1f27, 0x1f28, 0x1f29, 0x1f2a, 0x1f2b, 0x1f2c, 0x1f2d, - 0x1f2e, 0x1f2f, 0x1f30, 0x1f31, 0x1f32, 0x1f33, 0x1f34, 0x1f35, + 0x1f28, 0x1f29, 0x1f2a, 0x1f2b, 0x1f2c, 0x1f2d, 0x1f2e, 0x1f2f, + 0x1f30, 0x1f31, 0x1f32, 0x1f33, 0x1f34, 0x1f35, 0x1f36, 0x1f37, /* offsets 0xff40 .. 0xff4f */ - 0x1f36, 0x1f37, 0x1f38, 0x1f39, 0x1f3a, 0x1f3b, 0x1f3c, 0x1f3d, - 0x1f3e, 0x1f3f, 0x1f40, 0x1f41, 0x1f42, 0x1f43, 0x1f44, 0x1f45, + 0x1f38, 0x1f39, 0x1f3a, 0x1f3b, 0x1f3c, 0x1f3d, 0x1f3e, 0x1f3f, + 0x1f40, 0x1f41, 0x1f42, 0x1f43, 0x1f44, 0x1f45, 0x1f46, 0x1f47, /* offsets 0xff50 .. 0xff5f */ - 0x1f46, 0x1f47, 0x1f48, 0x1f49, 0x1f4a, 0x1f4b, 0x1f4c, 0x1f4d, - 0x1f4e, 0x1f4f, 0x1f50, 0x1f51, 0x1f52, 0x1f53, 0x1f54, 0x1f55, + 0x1f48, 0x1f49, 0x1f4a, 0x1f4b, 0x1f4c, 0x1f4d, 0x1f4e, 0x1f4f, + 0x1f50, 0x1f51, 0x1f52, 0x1f53, 0x1f54, 0x1f55, 0x1f56, 0x1f57, /* offsets 0xff60 .. 0xff6f */ - 0x1f56, 0x1f57, 0x1f58, 0x1f59, 0x1f5a, 0x1f5b, 0x1f5c, 0x1f5d, - 0x1f5e, 0x1f5f, 0x1f60, 0x1f61, 0x1f62, 0x1f63, 0x1f64, 0x1f65, + 0x1f58, 0x1f59, 0x1f5a, 0x1f5b, 0x1f5c, 0x1f5d, 0x1f5e, 0x1f5f, + 0x1f60, 0x1f61, 0x1f62, 0x1f63, 0x1f64, 0x1f65, 0x1f66, 0x1f67, /* offsets 0xff70 .. 0xff7f */ - 0x1f66, 0x1f67, 0x1f68, 0x1f69, 0x1f6a, 0x1f6b, 0x1f6c, 0x1f6d, - 0x1f6e, 0x1f6f, 0x1f70, 0x1f71, 0x1f72, 0x1f73, 0x1f74, 0x1f75, + 0x1f68, 0x1f69, 0x1f6a, 0x1f6b, 0x1f6c, 0x1f6d, 0x1f6e, 0x1f6f, + 0x1f70, 0x1f71, 0x1f72, 0x1f73, 0x1f74, 0x1f75, 0x1f76, 0x1f77, /* offsets 0xff80 .. 0xff8f */ - 0x1f76, 0x1f77, 0x1f78, 0x1f79, 0x1f7a, 0x1f7b, 0x1f7c, 0x1f7d, - 0x1f7e, 0x1f7f, 0x1f80, 0x1f81, 0x1f82, 0x1f83, 0x1f84, 0x1f85, + 0x1f78, 0x1f79, 0x1f7a, 0x1f7b, 0x1f7c, 0x1f7d, 0x1f7e, 0x1f7f, + 0x1f80, 0x1f81, 0x1f82, 0x1f83, 0x1f84, 0x1f85, 0x1f86, 0x1f87, /* offsets 0xff90 .. 0xff9f */ - 0x1f86, 0x1f87, 0x1f88, 0x1f89, 0x1f8a, 0x1f8b, 0x1f8c, 0x1f8d, - 0x1f8e, 0x1f8f, 0x1f90, 0x1f91, 0x1f92, 0x1f93, 0x1f94, 0x1f95, + 0x1f88, 0x1f89, 0x1f8a, 0x1f8b, 0x1f8c, 0x1f8d, 0x1f8e, 0x1f8f, + 0x1f90, 0x1f91, 0x1f92, 0x1f93, 0x1f94, 0x1f95, 0x1f96, 0x1f97, /* offsets 0xffa0 .. 0xffaf */ - 0x1f96, 0x1f97, 0x1f98, 0x1f99, 0x1f9a, 0x1f9b, 0x1f9c, 0x1f9d, - 0x1f9e, 0x1f9f, 0x1fa0, 0x1fa1, 0x1fa2, 0x1fa3, 0x1fa4, 0x1fa5, + 0x1f98, 0x1f99, 0x1f9a, 0x1f9b, 0x1f9c, 0x1f9d, 0x1f9e, 0x1f9f, + 0x1fa0, 0x1fa1, 0x1fa2, 0x1fa3, 0x1fa4, 0x1fa5, 0x1fa6, 0x1fa7, /* offsets 0xffb0 .. 0xffbf */ - 0x1fa6, 0x1fa7, 0x1fa8, 0x1fa9, 0x1faa, 0x1fab, 0x1fac, 0x1fad, - 0x1fae, 0x1faf, 0x1fb0, 0x1fb1, 0x1fb2, 0x1fb3, 0x1fb4, 0x1fb5, + 0x1fa8, 0x1fa9, 0x1faa, 0x1fab, 0x1fac, 0x1fad, 0x1fae, 0x1faf, + 0x1fb0, 0x1fb1, 0x1fb2, 0x1fb3, 0x1fb4, 0x1fb5, 0x1fb6, 0x1fb7, /* offsets 0xffc0 .. 0xffcf */ - 0x1fb5, 0x1fb5, 0x1fb5, 0x1fb6, 0x1fb7, 0x1fb8, 0x1fb9, 0x1fba, - 0x1fbb, 0x1fbb, 0x1fbb, 0x1fbc, 0x1fbd, 0x1fbe, 0x1fbf, 0x1fc0, + 0x1fb7, 0x1fb7, 0x1fb7, 0x1fb8, 0x1fb9, 0x1fba, 0x1fbb, 0x1fbc, + 0x1fbd, 0x1fbd, 0x1fbd, 0x1fbe, 0x1fbf, 0x1fc0, 0x1fc1, 0x1fc2, /* offsets 0xffd0 .. 0xffdf */ - 0x1fc1, 0x1fc1, 0x1fc1, 0x1fc2, 0x1fc3, 0x1fc4, 0x1fc5, 0x1fc6, - 0x1fc7, 0x1fc7, 0x1fc7, 0x1fc8, 0x1fc9, 0x1fca, 0x1fca, 0x1fca, + 0x1fc3, 0x1fc3, 0x1fc3, 0x1fc4, 0x1fc5, 0x1fc6, 0x1fc7, 0x1fc8, + 0x1fc9, 0x1fc9, 0x1fc9, 0x1fca, 0x1fcb, 0x1fcc, 0x1fcc, 0x1fcc, /* offsets 0xffe0 .. 0xffef */ - 0x1fca, 0x1fcb, 0x1fcc, 0x1fcd, 0x1fce, 0x1fcf, 0x1fd0, 0x1fd1, - 0x1fd1, 0x1fd2, 0x1fd3, 0x1fd4, 0x1fd5, 0x1fd6, 0x1fd7, 0x1fd8, + 0x1fcc, 0x1fcd, 0x1fce, 0x1fcf, 0x1fd0, 0x1fd1, 0x1fd2, 0x1fd3, + 0x1fd3, 0x1fd4, 0x1fd5, 0x1fd6, 0x1fd7, 0x1fd8, 0x1fd9, 0x1fda, /* offset sentinel */ - 0x1fd8, + 0x1fda, /* data */ 0x0020, 0x0020, 0x0308, 0x0061, 0x0020, 0x0304, 0x0032, 0x0033, 0x0020, 0x0301, 0x03bc, 0x0020, 0x0327, 0x0031, 0x006f, 0x0031, @@ -1886,313 +1886,314 @@ static const WCHAR compatmap_table[8152] = 0x30c1, 0x30c4, 0x30c6, 0x30c8, 0x30ca, 0x30cb, 0x30cc, 0x30cd, 0x30ce, 0x30cf, 0x30d2, 0x30d5, 0x30d8, 0x30db, 0x30de, 0x30df, 0x30e0, 0x30e1, 0x30e2, 0x30e4, 0x30e6, 0x30e8, 0x30e9, 0x30ea, - 0x30eb, 0x30ec, 0x30ed, 0x30ef, 0x30f0, 0x30f1, 0x30f2, 0x30a2, - 0x30d1, 0x30fc, 0x30c8, 0x30a2, 0x30eb, 0x30d5, 0x30a1, 0x30a2, - 0x30f3, 0x30da, 0x30a2, 0x30a2, 0x30fc, 0x30eb, 0x30a4, 0x30cb, - 0x30f3, 0x30b0, 0x30a4, 0x30f3, 0x30c1, 0x30a6, 0x30a9, 0x30f3, - 0x30a8, 0x30b9, 0x30af, 0x30fc, 0x30c9, 0x30a8, 0x30fc, 0x30ab, - 0x30fc, 0x30aa, 0x30f3, 0x30b9, 0x30aa, 0x30fc, 0x30e0, 0x30ab, - 0x30a4, 0x30ea, 0x30ab, 0x30e9, 0x30c3, 0x30c8, 0x30ab, 0x30ed, - 0x30ea, 0x30fc, 0x30ac, 0x30ed, 0x30f3, 0x30ac, 0x30f3, 0x30de, - 0x30ae, 0x30ac, 0x30ae, 0x30cb, 0x30fc, 0x30ad, 0x30e5, 0x30ea, - 0x30fc, 0x30ae, 0x30eb, 0x30c0, 0x30fc, 0x30ad, 0x30ed, 0x30ad, - 0x30ed, 0x30b0, 0x30e9, 0x30e0, 0x30ad, 0x30ed, 0x30e1, 0x30fc, - 0x30c8, 0x30eb, 0x30ad, 0x30ed, 0x30ef, 0x30c3, 0x30c8, 0x30b0, - 0x30e9, 0x30e0, 0x30b0, 0x30e9, 0x30e0, 0x30c8, 0x30f3, 0x30af, - 0x30eb, 0x30bc, 0x30a4, 0x30ed, 0x30af, 0x30ed, 0x30fc, 0x30cd, - 0x30b1, 0x30fc, 0x30b9, 0x30b3, 0x30eb, 0x30ca, 0x30b3, 0x30fc, - 0x30dd, 0x30b5, 0x30a4, 0x30af, 0x30eb, 0x30b5, 0x30f3, 0x30c1, - 0x30fc, 0x30e0, 0x30b7, 0x30ea, 0x30f3, 0x30b0, 0x30bb, 0x30f3, - 0x30c1, 0x30bb, 0x30f3, 0x30c8, 0x30c0, 0x30fc, 0x30b9, 0x30c7, - 0x30b7, 0x30c9, 0x30eb, 0x30c8, 0x30f3, 0x30ca, 0x30ce, 0x30ce, - 0x30c3, 0x30c8, 0x30cf, 0x30a4, 0x30c4, 0x30d1, 0x30fc, 0x30bb, - 0x30f3, 0x30c8, 0x30d1, 0x30fc, 0x30c4, 0x30d0, 0x30fc, 0x30ec, - 0x30eb, 0x30d4, 0x30a2, 0x30b9, 0x30c8, 0x30eb, 0x30d4, 0x30af, - 0x30eb, 0x30d4, 0x30b3, 0x30d3, 0x30eb, 0x30d5, 0x30a1, 0x30e9, - 0x30c3, 0x30c9, 0x30d5, 0x30a3, 0x30fc, 0x30c8, 0x30d6, 0x30c3, - 0x30b7, 0x30a7, 0x30eb, 0x30d5, 0x30e9, 0x30f3, 0x30d8, 0x30af, - 0x30bf, 0x30fc, 0x30eb, 0x30da, 0x30bd, 0x30da, 0x30cb, 0x30d2, - 0x30d8, 0x30eb, 0x30c4, 0x30da, 0x30f3, 0x30b9, 0x30da, 0x30fc, - 0x30b8, 0x30d9, 0x30fc, 0x30bf, 0x30dd, 0x30a4, 0x30f3, 0x30c8, - 0x30dc, 0x30eb, 0x30c8, 0x30db, 0x30f3, 0x30dd, 0x30f3, 0x30c9, - 0x30db, 0x30fc, 0x30eb, 0x30db, 0x30fc, 0x30f3, 0x30de, 0x30a4, - 0x30af, 0x30ed, 0x30de, 0x30a4, 0x30eb, 0x30de, 0x30c3, 0x30cf, - 0x30de, 0x30eb, 0x30af, 0x30de, 0x30f3, 0x30b7, 0x30e7, 0x30f3, - 0x30df, 0x30af, 0x30ed, 0x30f3, 0x30df, 0x30ea, 0x30df, 0x30ea, - 0x30d0, 0x30fc, 0x30eb, 0x30e1, 0x30ac, 0x30e1, 0x30ac, 0x30c8, - 0x30f3, 0x30e1, 0x30fc, 0x30c8, 0x30eb, 0x30e4, 0x30fc, 0x30c9, - 0x30e4, 0x30fc, 0x30eb, 0x30e6, 0x30a2, 0x30f3, 0x30ea, 0x30c3, - 0x30c8, 0x30eb, 0x30ea, 0x30e9, 0x30eb, 0x30d4, 0x30fc, 0x30eb, - 0x30fc, 0x30d6, 0x30eb, 0x30ec, 0x30e0, 0x30ec, 0x30f3, 0x30c8, - 0x30b2, 0x30f3, 0x30ef, 0x30c3, 0x30c8, 0x0030, 0x70b9, 0x0031, - 0x70b9, 0x0032, 0x70b9, 0x0033, 0x70b9, 0x0034, 0x70b9, 0x0035, - 0x70b9, 0x0036, 0x70b9, 0x0037, 0x70b9, 0x0038, 0x70b9, 0x0039, - 0x70b9, 0x0031, 0x0030, 0x70b9, 0x0031, 0x0031, 0x70b9, 0x0031, - 0x0032, 0x70b9, 0x0031, 0x0033, 0x70b9, 0x0031, 0x0034, 0x70b9, - 0x0031, 0x0035, 0x70b9, 0x0031, 0x0036, 0x70b9, 0x0031, 0x0037, - 0x70b9, 0x0031, 0x0038, 0x70b9, 0x0031, 0x0039, 0x70b9, 0x0032, - 0x0030, 0x70b9, 0x0032, 0x0031, 0x70b9, 0x0032, 0x0032, 0x70b9, - 0x0032, 0x0033, 0x70b9, 0x0032, 0x0034, 0x70b9, 0x0068, 0x0050, - 0x0061, 0x0064, 0x0061, 0x0041, 0x0055, 0x0062, 0x0061, 0x0072, - 0x006f, 0x0056, 0x0070, 0x0063, 0x0064, 0x006d, 0x0064, 0x006d, - 0x00b2, 0x0064, 0x006d, 0x00b3, 0x0049, 0x0055, 0x5e73, 0x6210, - 0x662d, 0x548c, 0x5927, 0x6b63, 0x660e, 0x6cbb, 0x682a, 0x5f0f, - 0x4f1a, 0x793e, 0x0070, 0x0041, 0x006e, 0x0041, 0x03bc, 0x0041, - 0x006d, 0x0041, 0x006b, 0x0041, 0x004b, 0x0042, 0x004d, 0x0042, - 0x0047, 0x0042, 0x0063, 0x0061, 0x006c, 0x006b, 0x0063, 0x0061, - 0x006c, 0x0070, 0x0046, 0x006e, 0x0046, 0x03bc, 0x0046, 0x03bc, - 0x0067, 0x006d, 0x0067, 0x006b, 0x0067, 0x0048, 0x007a, 0x006b, - 0x0048, 0x007a, 0x004d, 0x0048, 0x007a, 0x0047, 0x0048, 0x007a, - 0x0054, 0x0048, 0x007a, 0x03bc, 0x2113, 0x006d, 0x2113, 0x0064, - 0x2113, 0x006b, 0x2113, 0x0066, 0x006d, 0x006e, 0x006d, 0x03bc, - 0x006d, 0x006d, 0x006d, 0x0063, 0x006d, 0x006b, 0x006d, 0x006d, - 0x006d, 0x00b2, 0x0063, 0x006d, 0x00b2, 0x006d, 0x00b2, 0x006b, - 0x006d, 0x00b2, 0x006d, 0x006d, 0x00b3, 0x0063, 0x006d, 0x00b3, - 0x006d, 0x00b3, 0x006b, 0x006d, 0x00b3, 0x006d, 0x2215, 0x0073, - 0x006d, 0x2215, 0x0073, 0x00b2, 0x0050, 0x0061, 0x006b, 0x0050, - 0x0061, 0x004d, 0x0050, 0x0061, 0x0047, 0x0050, 0x0061, 0x0072, - 0x0061, 0x0064, 0x0072, 0x0061, 0x0064, 0x2215, 0x0073, 0x0072, - 0x0061, 0x0064, 0x2215, 0x0073, 0x00b2, 0x0070, 0x0073, 0x006e, - 0x0073, 0x03bc, 0x0073, 0x006d, 0x0073, 0x0070, 0x0056, 0x006e, - 0x0056, 0x03bc, 0x0056, 0x006d, 0x0056, 0x006b, 0x0056, 0x004d, - 0x0056, 0x0070, 0x0057, 0x006e, 0x0057, 0x03bc, 0x0057, 0x006d, - 0x0057, 0x006b, 0x0057, 0x004d, 0x0057, 0x006b, 0x03a9, 0x004d, - 0x03a9, 0x0061, 0x002e, 0x006d, 0x002e, 0x0042, 0x0071, 0x0063, - 0x0063, 0x0063, 0x0064, 0x0043, 0x2215, 0x006b, 0x0067, 0x0043, - 0x006f, 0x002e, 0x0064, 0x0042, 0x0047, 0x0079, 0x0068, 0x0061, - 0x0048, 0x0050, 0x0069, 0x006e, 0x004b, 0x004b, 0x004b, 0x004d, - 0x006b, 0x0074, 0x006c, 0x006d, 0x006c, 0x006e, 0x006c, 0x006f, - 0x0067, 0x006c, 0x0078, 0x006d, 0x0062, 0x006d, 0x0069, 0x006c, - 0x006d, 0x006f, 0x006c, 0x0050, 0x0048, 0x0070, 0x002e, 0x006d, - 0x002e, 0x0050, 0x0050, 0x004d, 0x0050, 0x0052, 0x0073, 0x0072, - 0x0053, 0x0076, 0x0057, 0x0062, 0x0056, 0x2215, 0x006d, 0x0041, - 0x2215, 0x006d, 0x0031, 0x65e5, 0x0032, 0x65e5, 0x0033, 0x65e5, - 0x0034, 0x65e5, 0x0035, 0x65e5, 0x0036, 0x65e5, 0x0037, 0x65e5, - 0x0038, 0x65e5, 0x0039, 0x65e5, 0x0031, 0x0030, 0x65e5, 0x0031, - 0x0031, 0x65e5, 0x0031, 0x0032, 0x65e5, 0x0031, 0x0033, 0x65e5, - 0x0031, 0x0034, 0x65e5, 0x0031, 0x0035, 0x65e5, 0x0031, 0x0036, - 0x65e5, 0x0031, 0x0037, 0x65e5, 0x0031, 0x0038, 0x65e5, 0x0031, - 0x0039, 0x65e5, 0x0032, 0x0030, 0x65e5, 0x0032, 0x0031, 0x65e5, - 0x0032, 0x0032, 0x65e5, 0x0032, 0x0033, 0x65e5, 0x0032, 0x0034, - 0x65e5, 0x0032, 0x0035, 0x65e5, 0x0032, 0x0036, 0x65e5, 0x0032, - 0x0037, 0x65e5, 0x0032, 0x0038, 0x65e5, 0x0032, 0x0039, 0x65e5, - 0x0033, 0x0030, 0x65e5, 0x0033, 0x0031, 0x65e5, 0x0067, 0x0061, - 0x006c, 0x044a, 0x044c, 0xa76f, 0x0126, 0x0153, 0xa727, 0xab37, - 0x026b, 0xab52, 0x0066, 0x0066, 0x0066, 0x0069, 0x0066, 0x006c, - 0x0066, 0x0066, 0x0069, 0x0066, 0x0066, 0x006c, 0x017f, 0x0074, - 0x0073, 0x0074, 0x0574, 0x0576, 0x0574, 0x0565, 0x0574, 0x056b, - 0x057e, 0x0576, 0x0574, 0x056d, 0x05e2, 0x05d0, 0x05d3, 0x05d4, - 0x05db, 0x05dc, 0x05dd, 0x05e8, 0x05ea, 0x002b, 0x05d0, 0x05dc, - 0x0671, 0x0671, 0x067b, 0x067b, 0x067b, 0x067b, 0x067e, 0x067e, - 0x067e, 0x067e, 0x0680, 0x0680, 0x0680, 0x0680, 0x067a, 0x067a, - 0x067a, 0x067a, 0x067f, 0x067f, 0x067f, 0x067f, 0x0679, 0x0679, - 0x0679, 0x0679, 0x06a4, 0x06a4, 0x06a4, 0x06a4, 0x06a6, 0x06a6, - 0x06a6, 0x06a6, 0x0684, 0x0684, 0x0684, 0x0684, 0x0683, 0x0683, - 0x0683, 0x0683, 0x0686, 0x0686, 0x0686, 0x0686, 0x0687, 0x0687, - 0x0687, 0x0687, 0x068d, 0x068d, 0x068c, 0x068c, 0x068e, 0x068e, - 0x0688, 0x0688, 0x0698, 0x0698, 0x0691, 0x0691, 0x06a9, 0x06a9, - 0x06a9, 0x06a9, 0x06af, 0x06af, 0x06af, 0x06af, 0x06b3, 0x06b3, - 0x06b3, 0x06b3, 0x06b1, 0x06b1, 0x06b1, 0x06b1, 0x06ba, 0x06ba, - 0x06bb, 0x06bb, 0x06bb, 0x06bb, 0x06c0, 0x06c0, 0x06c1, 0x06c1, - 0x06c1, 0x06c1, 0x06be, 0x06be, 0x06be, 0x06be, 0x06d2, 0x06d2, - 0x06d3, 0x06d3, 0x06ad, 0x06ad, 0x06ad, 0x06ad, 0x06c7, 0x06c7, - 0x06c6, 0x06c6, 0x06c8, 0x06c8, 0x0677, 0x06cb, 0x06cb, 0x06c5, - 0x06c5, 0x06c9, 0x06c9, 0x06d0, 0x06d0, 0x06d0, 0x06d0, 0x0649, - 0x0649, 0x0626, 0x0627, 0x0626, 0x0627, 0x0626, 0x06d5, 0x0626, - 0x06d5, 0x0626, 0x0648, 0x0626, 0x0648, 0x0626, 0x06c7, 0x0626, - 0x06c7, 0x0626, 0x06c6, 0x0626, 0x06c6, 0x0626, 0x06c8, 0x0626, - 0x06c8, 0x0626, 0x06d0, 0x0626, 0x06d0, 0x0626, 0x06d0, 0x0626, - 0x0649, 0x0626, 0x0649, 0x0626, 0x0649, 0x06cc, 0x06cc, 0x06cc, - 0x06cc, 0x0626, 0x062c, 0x0626, 0x062d, 0x0626, 0x0645, 0x0626, - 0x0649, 0x0626, 0x064a, 0x0628, 0x062c, 0x0628, 0x062d, 0x0628, - 0x062e, 0x0628, 0x0645, 0x0628, 0x0649, 0x0628, 0x064a, 0x062a, - 0x062c, 0x062a, 0x062d, 0x062a, 0x062e, 0x062a, 0x0645, 0x062a, - 0x0649, 0x062a, 0x064a, 0x062b, 0x062c, 0x062b, 0x0645, 0x062b, - 0x0649, 0x062b, 0x064a, 0x062c, 0x062d, 0x062c, 0x0645, 0x062d, - 0x062c, 0x062d, 0x0645, 0x062e, 0x062c, 0x062e, 0x062d, 0x062e, - 0x0645, 0x0633, 0x062c, 0x0633, 0x062d, 0x0633, 0x062e, 0x0633, - 0x0645, 0x0635, 0x062d, 0x0635, 0x0645, 0x0636, 0x062c, 0x0636, - 0x062d, 0x0636, 0x062e, 0x0636, 0x0645, 0x0637, 0x062d, 0x0637, - 0x0645, 0x0638, 0x0645, 0x0639, 0x062c, 0x0639, 0x0645, 0x063a, - 0x062c, 0x063a, 0x0645, 0x0641, 0x062c, 0x0641, 0x062d, 0x0641, - 0x062e, 0x0641, 0x0645, 0x0641, 0x0649, 0x0641, 0x064a, 0x0642, - 0x062d, 0x0642, 0x0645, 0x0642, 0x0649, 0x0642, 0x064a, 0x0643, - 0x0627, 0x0643, 0x062c, 0x0643, 0x062d, 0x0643, 0x062e, 0x0643, - 0x0644, 0x0643, 0x0645, 0x0643, 0x0649, 0x0643, 0x064a, 0x0644, - 0x062c, 0x0644, 0x062d, 0x0644, 0x062e, 0x0644, 0x0645, 0x0644, - 0x0649, 0x0644, 0x064a, 0x0645, 0x062c, 0x0645, 0x062d, 0x0645, - 0x062e, 0x0645, 0x0645, 0x0645, 0x0649, 0x0645, 0x064a, 0x0646, - 0x062c, 0x0646, 0x062d, 0x0646, 0x062e, 0x0646, 0x0645, 0x0646, - 0x0649, 0x0646, 0x064a, 0x0647, 0x062c, 0x0647, 0x0645, 0x0647, - 0x0649, 0x0647, 0x064a, 0x064a, 0x062c, 0x064a, 0x062d, 0x064a, - 0x062e, 0x064a, 0x0645, 0x064a, 0x0649, 0x064a, 0x064a, 0x0630, - 0x0670, 0x0631, 0x0670, 0x0649, 0x0670, 0x0020, 0x064c, 0x0651, - 0x0020, 0x064d, 0x0651, 0x0020, 0x064e, 0x0651, 0x0020, 0x064f, - 0x0651, 0x0020, 0x0650, 0x0651, 0x0020, 0x0651, 0x0670, 0x0626, - 0x0631, 0x0626, 0x0632, 0x0626, 0x0645, 0x0626, 0x0646, 0x0626, - 0x0649, 0x0626, 0x064a, 0x0628, 0x0631, 0x0628, 0x0632, 0x0628, - 0x0645, 0x0628, 0x0646, 0x0628, 0x0649, 0x0628, 0x064a, 0x062a, - 0x0631, 0x062a, 0x0632, 0x062a, 0x0645, 0x062a, 0x0646, 0x062a, - 0x0649, 0x062a, 0x064a, 0x062b, 0x0631, 0x062b, 0x0632, 0x062b, - 0x0645, 0x062b, 0x0646, 0x062b, 0x0649, 0x062b, 0x064a, 0x0641, - 0x0649, 0x0641, 0x064a, 0x0642, 0x0649, 0x0642, 0x064a, 0x0643, - 0x0627, 0x0643, 0x0644, 0x0643, 0x0645, 0x0643, 0x0649, 0x0643, - 0x064a, 0x0644, 0x0645, 0x0644, 0x0649, 0x0644, 0x064a, 0x0645, - 0x0627, 0x0645, 0x0645, 0x0646, 0x0631, 0x0646, 0x0632, 0x0646, - 0x0645, 0x0646, 0x0646, 0x0646, 0x0649, 0x0646, 0x064a, 0x0649, - 0x0670, 0x064a, 0x0631, 0x064a, 0x0632, 0x064a, 0x0645, 0x064a, - 0x0646, 0x064a, 0x0649, 0x064a, 0x064a, 0x0626, 0x062c, 0x0626, - 0x062d, 0x0626, 0x062e, 0x0626, 0x0645, 0x0626, 0x0647, 0x0628, - 0x062c, 0x0628, 0x062d, 0x0628, 0x062e, 0x0628, 0x0645, 0x0628, - 0x0647, 0x062a, 0x062c, 0x062a, 0x062d, 0x062a, 0x062e, 0x062a, - 0x0645, 0x062a, 0x0647, 0x062b, 0x0645, 0x062c, 0x062d, 0x062c, + 0x30eb, 0x30ec, 0x30ed, 0x30ef, 0x30f0, 0x30f1, 0x30f2, 0x4ee4, + 0x548c, 0x30a2, 0x30d1, 0x30fc, 0x30c8, 0x30a2, 0x30eb, 0x30d5, + 0x30a1, 0x30a2, 0x30f3, 0x30da, 0x30a2, 0x30a2, 0x30fc, 0x30eb, + 0x30a4, 0x30cb, 0x30f3, 0x30b0, 0x30a4, 0x30f3, 0x30c1, 0x30a6, + 0x30a9, 0x30f3, 0x30a8, 0x30b9, 0x30af, 0x30fc, 0x30c9, 0x30a8, + 0x30fc, 0x30ab, 0x30fc, 0x30aa, 0x30f3, 0x30b9, 0x30aa, 0x30fc, + 0x30e0, 0x30ab, 0x30a4, 0x30ea, 0x30ab, 0x30e9, 0x30c3, 0x30c8, + 0x30ab, 0x30ed, 0x30ea, 0x30fc, 0x30ac, 0x30ed, 0x30f3, 0x30ac, + 0x30f3, 0x30de, 0x30ae, 0x30ac, 0x30ae, 0x30cb, 0x30fc, 0x30ad, + 0x30e5, 0x30ea, 0x30fc, 0x30ae, 0x30eb, 0x30c0, 0x30fc, 0x30ad, + 0x30ed, 0x30ad, 0x30ed, 0x30b0, 0x30e9, 0x30e0, 0x30ad, 0x30ed, + 0x30e1, 0x30fc, 0x30c8, 0x30eb, 0x30ad, 0x30ed, 0x30ef, 0x30c3, + 0x30c8, 0x30b0, 0x30e9, 0x30e0, 0x30b0, 0x30e9, 0x30e0, 0x30c8, + 0x30f3, 0x30af, 0x30eb, 0x30bc, 0x30a4, 0x30ed, 0x30af, 0x30ed, + 0x30fc, 0x30cd, 0x30b1, 0x30fc, 0x30b9, 0x30b3, 0x30eb, 0x30ca, + 0x30b3, 0x30fc, 0x30dd, 0x30b5, 0x30a4, 0x30af, 0x30eb, 0x30b5, + 0x30f3, 0x30c1, 0x30fc, 0x30e0, 0x30b7, 0x30ea, 0x30f3, 0x30b0, + 0x30bb, 0x30f3, 0x30c1, 0x30bb, 0x30f3, 0x30c8, 0x30c0, 0x30fc, + 0x30b9, 0x30c7, 0x30b7, 0x30c9, 0x30eb, 0x30c8, 0x30f3, 0x30ca, + 0x30ce, 0x30ce, 0x30c3, 0x30c8, 0x30cf, 0x30a4, 0x30c4, 0x30d1, + 0x30fc, 0x30bb, 0x30f3, 0x30c8, 0x30d1, 0x30fc, 0x30c4, 0x30d0, + 0x30fc, 0x30ec, 0x30eb, 0x30d4, 0x30a2, 0x30b9, 0x30c8, 0x30eb, + 0x30d4, 0x30af, 0x30eb, 0x30d4, 0x30b3, 0x30d3, 0x30eb, 0x30d5, + 0x30a1, 0x30e9, 0x30c3, 0x30c9, 0x30d5, 0x30a3, 0x30fc, 0x30c8, + 0x30d6, 0x30c3, 0x30b7, 0x30a7, 0x30eb, 0x30d5, 0x30e9, 0x30f3, + 0x30d8, 0x30af, 0x30bf, 0x30fc, 0x30eb, 0x30da, 0x30bd, 0x30da, + 0x30cb, 0x30d2, 0x30d8, 0x30eb, 0x30c4, 0x30da, 0x30f3, 0x30b9, + 0x30da, 0x30fc, 0x30b8, 0x30d9, 0x30fc, 0x30bf, 0x30dd, 0x30a4, + 0x30f3, 0x30c8, 0x30dc, 0x30eb, 0x30c8, 0x30db, 0x30f3, 0x30dd, + 0x30f3, 0x30c9, 0x30db, 0x30fc, 0x30eb, 0x30db, 0x30fc, 0x30f3, + 0x30de, 0x30a4, 0x30af, 0x30ed, 0x30de, 0x30a4, 0x30eb, 0x30de, + 0x30c3, 0x30cf, 0x30de, 0x30eb, 0x30af, 0x30de, 0x30f3, 0x30b7, + 0x30e7, 0x30f3, 0x30df, 0x30af, 0x30ed, 0x30f3, 0x30df, 0x30ea, + 0x30df, 0x30ea, 0x30d0, 0x30fc, 0x30eb, 0x30e1, 0x30ac, 0x30e1, + 0x30ac, 0x30c8, 0x30f3, 0x30e1, 0x30fc, 0x30c8, 0x30eb, 0x30e4, + 0x30fc, 0x30c9, 0x30e4, 0x30fc, 0x30eb, 0x30e6, 0x30a2, 0x30f3, + 0x30ea, 0x30c3, 0x30c8, 0x30eb, 0x30ea, 0x30e9, 0x30eb, 0x30d4, + 0x30fc, 0x30eb, 0x30fc, 0x30d6, 0x30eb, 0x30ec, 0x30e0, 0x30ec, + 0x30f3, 0x30c8, 0x30b2, 0x30f3, 0x30ef, 0x30c3, 0x30c8, 0x0030, + 0x70b9, 0x0031, 0x70b9, 0x0032, 0x70b9, 0x0033, 0x70b9, 0x0034, + 0x70b9, 0x0035, 0x70b9, 0x0036, 0x70b9, 0x0037, 0x70b9, 0x0038, + 0x70b9, 0x0039, 0x70b9, 0x0031, 0x0030, 0x70b9, 0x0031, 0x0031, + 0x70b9, 0x0031, 0x0032, 0x70b9, 0x0031, 0x0033, 0x70b9, 0x0031, + 0x0034, 0x70b9, 0x0031, 0x0035, 0x70b9, 0x0031, 0x0036, 0x70b9, + 0x0031, 0x0037, 0x70b9, 0x0031, 0x0038, 0x70b9, 0x0031, 0x0039, + 0x70b9, 0x0032, 0x0030, 0x70b9, 0x0032, 0x0031, 0x70b9, 0x0032, + 0x0032, 0x70b9, 0x0032, 0x0033, 0x70b9, 0x0032, 0x0034, 0x70b9, + 0x0068, 0x0050, 0x0061, 0x0064, 0x0061, 0x0041, 0x0055, 0x0062, + 0x0061, 0x0072, 0x006f, 0x0056, 0x0070, 0x0063, 0x0064, 0x006d, + 0x0064, 0x006d, 0x00b2, 0x0064, 0x006d, 0x00b3, 0x0049, 0x0055, + 0x5e73, 0x6210, 0x662d, 0x548c, 0x5927, 0x6b63, 0x660e, 0x6cbb, + 0x682a, 0x5f0f, 0x4f1a, 0x793e, 0x0070, 0x0041, 0x006e, 0x0041, + 0x03bc, 0x0041, 0x006d, 0x0041, 0x006b, 0x0041, 0x004b, 0x0042, + 0x004d, 0x0042, 0x0047, 0x0042, 0x0063, 0x0061, 0x006c, 0x006b, + 0x0063, 0x0061, 0x006c, 0x0070, 0x0046, 0x006e, 0x0046, 0x03bc, + 0x0046, 0x03bc, 0x0067, 0x006d, 0x0067, 0x006b, 0x0067, 0x0048, + 0x007a, 0x006b, 0x0048, 0x007a, 0x004d, 0x0048, 0x007a, 0x0047, + 0x0048, 0x007a, 0x0054, 0x0048, 0x007a, 0x03bc, 0x2113, 0x006d, + 0x2113, 0x0064, 0x2113, 0x006b, 0x2113, 0x0066, 0x006d, 0x006e, + 0x006d, 0x03bc, 0x006d, 0x006d, 0x006d, 0x0063, 0x006d, 0x006b, + 0x006d, 0x006d, 0x006d, 0x00b2, 0x0063, 0x006d, 0x00b2, 0x006d, + 0x00b2, 0x006b, 0x006d, 0x00b2, 0x006d, 0x006d, 0x00b3, 0x0063, + 0x006d, 0x00b3, 0x006d, 0x00b3, 0x006b, 0x006d, 0x00b3, 0x006d, + 0x2215, 0x0073, 0x006d, 0x2215, 0x0073, 0x00b2, 0x0050, 0x0061, + 0x006b, 0x0050, 0x0061, 0x004d, 0x0050, 0x0061, 0x0047, 0x0050, + 0x0061, 0x0072, 0x0061, 0x0064, 0x0072, 0x0061, 0x0064, 0x2215, + 0x0073, 0x0072, 0x0061, 0x0064, 0x2215, 0x0073, 0x00b2, 0x0070, + 0x0073, 0x006e, 0x0073, 0x03bc, 0x0073, 0x006d, 0x0073, 0x0070, + 0x0056, 0x006e, 0x0056, 0x03bc, 0x0056, 0x006d, 0x0056, 0x006b, + 0x0056, 0x004d, 0x0056, 0x0070, 0x0057, 0x006e, 0x0057, 0x03bc, + 0x0057, 0x006d, 0x0057, 0x006b, 0x0057, 0x004d, 0x0057, 0x006b, + 0x03a9, 0x004d, 0x03a9, 0x0061, 0x002e, 0x006d, 0x002e, 0x0042, + 0x0071, 0x0063, 0x0063, 0x0063, 0x0064, 0x0043, 0x2215, 0x006b, + 0x0067, 0x0043, 0x006f, 0x002e, 0x0064, 0x0042, 0x0047, 0x0079, + 0x0068, 0x0061, 0x0048, 0x0050, 0x0069, 0x006e, 0x004b, 0x004b, + 0x004b, 0x004d, 0x006b, 0x0074, 0x006c, 0x006d, 0x006c, 0x006e, + 0x006c, 0x006f, 0x0067, 0x006c, 0x0078, 0x006d, 0x0062, 0x006d, + 0x0069, 0x006c, 0x006d, 0x006f, 0x006c, 0x0050, 0x0048, 0x0070, + 0x002e, 0x006d, 0x002e, 0x0050, 0x0050, 0x004d, 0x0050, 0x0052, + 0x0073, 0x0072, 0x0053, 0x0076, 0x0057, 0x0062, 0x0056, 0x2215, + 0x006d, 0x0041, 0x2215, 0x006d, 0x0031, 0x65e5, 0x0032, 0x65e5, + 0x0033, 0x65e5, 0x0034, 0x65e5, 0x0035, 0x65e5, 0x0036, 0x65e5, + 0x0037, 0x65e5, 0x0038, 0x65e5, 0x0039, 0x65e5, 0x0031, 0x0030, + 0x65e5, 0x0031, 0x0031, 0x65e5, 0x0031, 0x0032, 0x65e5, 0x0031, + 0x0033, 0x65e5, 0x0031, 0x0034, 0x65e5, 0x0031, 0x0035, 0x65e5, + 0x0031, 0x0036, 0x65e5, 0x0031, 0x0037, 0x65e5, 0x0031, 0x0038, + 0x65e5, 0x0031, 0x0039, 0x65e5, 0x0032, 0x0030, 0x65e5, 0x0032, + 0x0031, 0x65e5, 0x0032, 0x0032, 0x65e5, 0x0032, 0x0033, 0x65e5, + 0x0032, 0x0034, 0x65e5, 0x0032, 0x0035, 0x65e5, 0x0032, 0x0036, + 0x65e5, 0x0032, 0x0037, 0x65e5, 0x0032, 0x0038, 0x65e5, 0x0032, + 0x0039, 0x65e5, 0x0033, 0x0030, 0x65e5, 0x0033, 0x0031, 0x65e5, + 0x0067, 0x0061, 0x006c, 0x044a, 0x044c, 0xa76f, 0x0126, 0x0153, + 0xa727, 0xab37, 0x026b, 0xab52, 0x0066, 0x0066, 0x0066, 0x0069, + 0x0066, 0x006c, 0x0066, 0x0066, 0x0069, 0x0066, 0x0066, 0x006c, + 0x017f, 0x0074, 0x0073, 0x0074, 0x0574, 0x0576, 0x0574, 0x0565, + 0x0574, 0x056b, 0x057e, 0x0576, 0x0574, 0x056d, 0x05e2, 0x05d0, + 0x05d3, 0x05d4, 0x05db, 0x05dc, 0x05dd, 0x05e8, 0x05ea, 0x002b, + 0x05d0, 0x05dc, 0x0671, 0x0671, 0x067b, 0x067b, 0x067b, 0x067b, + 0x067e, 0x067e, 0x067e, 0x067e, 0x0680, 0x0680, 0x0680, 0x0680, + 0x067a, 0x067a, 0x067a, 0x067a, 0x067f, 0x067f, 0x067f, 0x067f, + 0x0679, 0x0679, 0x0679, 0x0679, 0x06a4, 0x06a4, 0x06a4, 0x06a4, + 0x06a6, 0x06a6, 0x06a6, 0x06a6, 0x0684, 0x0684, 0x0684, 0x0684, + 0x0683, 0x0683, 0x0683, 0x0683, 0x0686, 0x0686, 0x0686, 0x0686, + 0x0687, 0x0687, 0x0687, 0x0687, 0x068d, 0x068d, 0x068c, 0x068c, + 0x068e, 0x068e, 0x0688, 0x0688, 0x0698, 0x0698, 0x0691, 0x0691, + 0x06a9, 0x06a9, 0x06a9, 0x06a9, 0x06af, 0x06af, 0x06af, 0x06af, + 0x06b3, 0x06b3, 0x06b3, 0x06b3, 0x06b1, 0x06b1, 0x06b1, 0x06b1, + 0x06ba, 0x06ba, 0x06bb, 0x06bb, 0x06bb, 0x06bb, 0x06c0, 0x06c0, + 0x06c1, 0x06c1, 0x06c1, 0x06c1, 0x06be, 0x06be, 0x06be, 0x06be, + 0x06d2, 0x06d2, 0x06d3, 0x06d3, 0x06ad, 0x06ad, 0x06ad, 0x06ad, + 0x06c7, 0x06c7, 0x06c6, 0x06c6, 0x06c8, 0x06c8, 0x0677, 0x06cb, + 0x06cb, 0x06c5, 0x06c5, 0x06c9, 0x06c9, 0x06d0, 0x06d0, 0x06d0, + 0x06d0, 0x0649, 0x0649, 0x0626, 0x0627, 0x0626, 0x0627, 0x0626, + 0x06d5, 0x0626, 0x06d5, 0x0626, 0x0648, 0x0626, 0x0648, 0x0626, + 0x06c7, 0x0626, 0x06c7, 0x0626, 0x06c6, 0x0626, 0x06c6, 0x0626, + 0x06c8, 0x0626, 0x06c8, 0x0626, 0x06d0, 0x0626, 0x06d0, 0x0626, + 0x06d0, 0x0626, 0x0649, 0x0626, 0x0649, 0x0626, 0x0649, 0x06cc, + 0x06cc, 0x06cc, 0x06cc, 0x0626, 0x062c, 0x0626, 0x062d, 0x0626, + 0x0645, 0x0626, 0x0649, 0x0626, 0x064a, 0x0628, 0x062c, 0x0628, + 0x062d, 0x0628, 0x062e, 0x0628, 0x0645, 0x0628, 0x0649, 0x0628, + 0x064a, 0x062a, 0x062c, 0x062a, 0x062d, 0x062a, 0x062e, 0x062a, + 0x0645, 0x062a, 0x0649, 0x062a, 0x064a, 0x062b, 0x062c, 0x062b, + 0x0645, 0x062b, 0x0649, 0x062b, 0x064a, 0x062c, 0x062d, 0x062c, 0x0645, 0x062d, 0x062c, 0x062d, 0x0645, 0x062e, 0x062c, 0x062e, - 0x0645, 0x0633, 0x062c, 0x0633, 0x062d, 0x0633, 0x062e, 0x0633, - 0x0645, 0x0635, 0x062d, 0x0635, 0x062e, 0x0635, 0x0645, 0x0636, + 0x062d, 0x062e, 0x0645, 0x0633, 0x062c, 0x0633, 0x062d, 0x0633, + 0x062e, 0x0633, 0x0645, 0x0635, 0x062d, 0x0635, 0x0645, 0x0636, 0x062c, 0x0636, 0x062d, 0x0636, 0x062e, 0x0636, 0x0645, 0x0637, - 0x062d, 0x0638, 0x0645, 0x0639, 0x062c, 0x0639, 0x0645, 0x063a, - 0x062c, 0x063a, 0x0645, 0x0641, 0x062c, 0x0641, 0x062d, 0x0641, - 0x062e, 0x0641, 0x0645, 0x0642, 0x062d, 0x0642, 0x0645, 0x0643, - 0x062c, 0x0643, 0x062d, 0x0643, 0x062e, 0x0643, 0x0644, 0x0643, - 0x0645, 0x0644, 0x062c, 0x0644, 0x062d, 0x0644, 0x062e, 0x0644, - 0x0645, 0x0644, 0x0647, 0x0645, 0x062c, 0x0645, 0x062d, 0x0645, - 0x062e, 0x0645, 0x0645, 0x0646, 0x062c, 0x0646, 0x062d, 0x0646, - 0x062e, 0x0646, 0x0645, 0x0646, 0x0647, 0x0647, 0x062c, 0x0647, - 0x0645, 0x0647, 0x0670, 0x064a, 0x062c, 0x064a, 0x062d, 0x064a, - 0x062e, 0x064a, 0x0645, 0x064a, 0x0647, 0x0626, 0x0645, 0x0626, - 0x0647, 0x0628, 0x0645, 0x0628, 0x0647, 0x062a, 0x0645, 0x062a, - 0x0647, 0x062b, 0x0645, 0x062b, 0x0647, 0x0633, 0x0645, 0x0633, - 0x0647, 0x0634, 0x0645, 0x0634, 0x0647, 0x0643, 0x0644, 0x0643, - 0x0645, 0x0644, 0x0645, 0x0646, 0x0645, 0x0646, 0x0647, 0x064a, - 0x0645, 0x064a, 0x0647, 0x0640, 0x064e, 0x0651, 0x0640, 0x064f, - 0x0651, 0x0640, 0x0650, 0x0651, 0x0637, 0x0649, 0x0637, 0x064a, - 0x0639, 0x0649, 0x0639, 0x064a, 0x063a, 0x0649, 0x063a, 0x064a, - 0x0633, 0x0649, 0x0633, 0x064a, 0x0634, 0x0649, 0x0634, 0x064a, - 0x062d, 0x0649, 0x062d, 0x064a, 0x062c, 0x0649, 0x062c, 0x064a, - 0x062e, 0x0649, 0x062e, 0x064a, 0x0635, 0x0649, 0x0635, 0x064a, - 0x0636, 0x0649, 0x0636, 0x064a, 0x0634, 0x062c, 0x0634, 0x062d, - 0x0634, 0x062e, 0x0634, 0x0645, 0x0634, 0x0631, 0x0633, 0x0631, - 0x0635, 0x0631, 0x0636, 0x0631, 0x0637, 0x0649, 0x0637, 0x064a, - 0x0639, 0x0649, 0x0639, 0x064a, 0x063a, 0x0649, 0x063a, 0x064a, - 0x0633, 0x0649, 0x0633, 0x064a, 0x0634, 0x0649, 0x0634, 0x064a, - 0x062d, 0x0649, 0x062d, 0x064a, 0x062c, 0x0649, 0x062c, 0x064a, - 0x062e, 0x0649, 0x062e, 0x064a, 0x0635, 0x0649, 0x0635, 0x064a, - 0x0636, 0x0649, 0x0636, 0x064a, 0x0634, 0x062c, 0x0634, 0x062d, - 0x0634, 0x062e, 0x0634, 0x0645, 0x0634, 0x0631, 0x0633, 0x0631, - 0x0635, 0x0631, 0x0636, 0x0631, 0x0634, 0x062c, 0x0634, 0x062d, - 0x0634, 0x062e, 0x0634, 0x0645, 0x0633, 0x0647, 0x0634, 0x0647, - 0x0637, 0x0645, 0x0633, 0x062c, 0x0633, 0x062d, 0x0633, 0x062e, - 0x0634, 0x062c, 0x0634, 0x062d, 0x0634, 0x062e, 0x0637, 0x0645, - 0x0638, 0x0645, 0x0627, 0x064b, 0x0627, 0x064b, 0x062a, 0x062c, - 0x0645, 0x062a, 0x062d, 0x062c, 0x062a, 0x062d, 0x062c, 0x062a, - 0x062d, 0x0645, 0x062a, 0x062e, 0x0645, 0x062a, 0x0645, 0x062c, - 0x062a, 0x0645, 0x062d, 0x062a, 0x0645, 0x062e, 0x062c, 0x0645, - 0x062d, 0x062c, 0x0645, 0x062d, 0x062d, 0x0645, 0x064a, 0x062d, - 0x0645, 0x0649, 0x0633, 0x062d, 0x062c, 0x0633, 0x062c, 0x062d, - 0x0633, 0x062c, 0x0649, 0x0633, 0x0645, 0x062d, 0x0633, 0x0645, - 0x062d, 0x0633, 0x0645, 0x062c, 0x0633, 0x0645, 0x0645, 0x0633, - 0x0645, 0x0645, 0x0635, 0x062d, 0x062d, 0x0635, 0x062d, 0x062d, - 0x0635, 0x0645, 0x0645, 0x0634, 0x062d, 0x0645, 0x0634, 0x062d, - 0x0645, 0x0634, 0x062c, 0x064a, 0x0634, 0x0645, 0x062e, 0x0634, - 0x0645, 0x062e, 0x0634, 0x0645, 0x0645, 0x0634, 0x0645, 0x0645, - 0x0636, 0x062d, 0x0649, 0x0636, 0x062e, 0x0645, 0x0636, 0x062e, - 0x0645, 0x0637, 0x0645, 0x062d, 0x0637, 0x0645, 0x062d, 0x0637, - 0x0645, 0x0645, 0x0637, 0x0645, 0x064a, 0x0639, 0x062c, 0x0645, - 0x0639, 0x0645, 0x0645, 0x0639, 0x0645, 0x0645, 0x0639, 0x0645, - 0x0649, 0x063a, 0x0645, 0x0645, 0x063a, 0x0645, 0x064a, 0x063a, - 0x0645, 0x0649, 0x0641, 0x062e, 0x0645, 0x0641, 0x062e, 0x0645, - 0x0642, 0x0645, 0x062d, 0x0642, 0x0645, 0x0645, 0x0644, 0x062d, - 0x0645, 0x0644, 0x062d, 0x064a, 0x0644, 0x062d, 0x0649, 0x0644, - 0x062c, 0x062c, 0x0644, 0x062c, 0x062c, 0x0644, 0x062e, 0x0645, - 0x0644, 0x062e, 0x0645, 0x0644, 0x0645, 0x062d, 0x0644, 0x0645, - 0x062d, 0x0645, 0x062d, 0x062c, 0x0645, 0x062d, 0x0645, 0x0645, - 0x062d, 0x064a, 0x0645, 0x062c, 0x062d, 0x0645, 0x062c, 0x0645, - 0x0645, 0x062e, 0x062c, 0x0645, 0x062e, 0x0645, 0x0645, 0x062c, - 0x062e, 0x0647, 0x0645, 0x062c, 0x0647, 0x0645, 0x0645, 0x0646, - 0x062d, 0x0645, 0x0646, 0x062d, 0x0649, 0x0646, 0x062c, 0x0645, - 0x0646, 0x062c, 0x0645, 0x0646, 0x062c, 0x0649, 0x0646, 0x0645, - 0x064a, 0x0646, 0x0645, 0x0649, 0x064a, 0x0645, 0x0645, 0x064a, - 0x0645, 0x0645, 0x0628, 0x062e, 0x064a, 0x062a, 0x062c, 0x064a, - 0x062a, 0x062c, 0x0649, 0x062a, 0x062e, 0x064a, 0x062a, 0x062e, - 0x0649, 0x062a, 0x0645, 0x064a, 0x062a, 0x0645, 0x0649, 0x062c, - 0x0645, 0x064a, 0x062c, 0x062d, 0x0649, 0x062c, 0x0645, 0x0649, - 0x0633, 0x062e, 0x0649, 0x0635, 0x062d, 0x064a, 0x0634, 0x062d, - 0x064a, 0x0636, 0x062d, 0x064a, 0x0644, 0x062c, 0x064a, 0x0644, - 0x0645, 0x064a, 0x064a, 0x062d, 0x064a, 0x064a, 0x062c, 0x064a, - 0x064a, 0x0645, 0x064a, 0x0645, 0x0645, 0x064a, 0x0642, 0x0645, - 0x064a, 0x0646, 0x062d, 0x064a, 0x0642, 0x0645, 0x062d, 0x0644, - 0x062d, 0x0645, 0x0639, 0x0645, 0x064a, 0x0643, 0x0645, 0x064a, - 0x0646, 0x062c, 0x062d, 0x0645, 0x062e, 0x064a, 0x0644, 0x062c, - 0x0645, 0x0643, 0x0645, 0x0645, 0x0644, 0x062c, 0x0645, 0x0646, - 0x062c, 0x062d, 0x062c, 0x062d, 0x064a, 0x062d, 0x062c, 0x064a, - 0x0645, 0x062c, 0x064a, 0x0641, 0x0645, 0x064a, 0x0628, 0x062d, - 0x064a, 0x0643, 0x0645, 0x0645, 0x0639, 0x062c, 0x0645, 0x0635, - 0x0645, 0x0645, 0x0633, 0x062e, 0x064a, 0x0646, 0x062c, 0x064a, - 0x0635, 0x0644, 0x06d2, 0x0642, 0x0644, 0x06d2, 0x0627, 0x0644, - 0x0644, 0x0647, 0x0627, 0x0643, 0x0628, 0x0631, 0x0645, 0x062d, - 0x0645, 0x062f, 0x0635, 0x0644, 0x0639, 0x0645, 0x0631, 0x0633, - 0x0648, 0x0644, 0x0639, 0x0644, 0x064a, 0x0647, 0x0648, 0x0633, - 0x0644, 0x0645, 0x0635, 0x0644, 0x0649, 0x0635, 0x0644, 0x0649, - 0x0020, 0x0627, 0x0644, 0x0644, 0x0647, 0x0020, 0x0639, 0x0644, - 0x064a, 0x0647, 0x0020, 0x0648, 0x0633, 0x0644, 0x0645, 0x062c, - 0x0644, 0x0020, 0x062c, 0x0644, 0x0627, 0x0644, 0x0647, 0x0631, - 0x06cc, 0x0627, 0x0644, 0x002c, 0x3001, 0x3002, 0x003a, 0x003b, - 0x0021, 0x003f, 0x3016, 0x3017, 0x2026, 0x2025, 0x2014, 0x2013, - 0x005f, 0x005f, 0x0028, 0x0029, 0x007b, 0x007d, 0x3014, 0x3015, - 0x3010, 0x3011, 0x300a, 0x300b, 0x3008, 0x3009, 0x300c, 0x300d, - 0x300e, 0x300f, 0x005b, 0x005d, 0x203e, 0x203e, 0x203e, 0x203e, - 0x005f, 0x005f, 0x005f, 0x002c, 0x3001, 0x002e, 0x003b, 0x003a, - 0x003f, 0x0021, 0x2014, 0x0028, 0x0029, 0x007b, 0x007d, 0x3014, - 0x3015, 0x0023, 0x0026, 0x002a, 0x002b, 0x002d, 0x003c, 0x003e, - 0x003d, 0x005c, 0x0024, 0x0025, 0x0040, 0x0020, 0x064b, 0x0640, - 0x064b, 0x0020, 0x064c, 0x0020, 0x064d, 0x0020, 0x064e, 0x0640, - 0x064e, 0x0020, 0x064f, 0x0640, 0x064f, 0x0020, 0x0650, 0x0640, - 0x0650, 0x0020, 0x0651, 0x0640, 0x0651, 0x0020, 0x0652, 0x0640, - 0x0652, 0x0621, 0x0622, 0x0622, 0x0623, 0x0623, 0x0624, 0x0624, - 0x0625, 0x0625, 0x0626, 0x0626, 0x0626, 0x0626, 0x0627, 0x0627, - 0x0628, 0x0628, 0x0628, 0x0628, 0x0629, 0x0629, 0x062a, 0x062a, - 0x062a, 0x062a, 0x062b, 0x062b, 0x062b, 0x062b, 0x062c, 0x062c, - 0x062c, 0x062c, 0x062d, 0x062d, 0x062d, 0x062d, 0x062e, 0x062e, - 0x062e, 0x062e, 0x062f, 0x062f, 0x0630, 0x0630, 0x0631, 0x0631, - 0x0632, 0x0632, 0x0633, 0x0633, 0x0633, 0x0633, 0x0634, 0x0634, - 0x0634, 0x0634, 0x0635, 0x0635, 0x0635, 0x0635, 0x0636, 0x0636, - 0x0636, 0x0636, 0x0637, 0x0637, 0x0637, 0x0637, 0x0638, 0x0638, - 0x0638, 0x0638, 0x0639, 0x0639, 0x0639, 0x0639, 0x063a, 0x063a, - 0x063a, 0x063a, 0x0641, 0x0641, 0x0641, 0x0641, 0x0642, 0x0642, - 0x0642, 0x0642, 0x0643, 0x0643, 0x0643, 0x0643, 0x0644, 0x0644, - 0x0644, 0x0644, 0x0645, 0x0645, 0x0645, 0x0645, 0x0646, 0x0646, - 0x0646, 0x0646, 0x0647, 0x0647, 0x0647, 0x0647, 0x0648, 0x0648, - 0x0649, 0x0649, 0x064a, 0x064a, 0x064a, 0x064a, 0x0644, 0x0622, - 0x0644, 0x0622, 0x0644, 0x0623, 0x0644, 0x0623, 0x0644, 0x0625, - 0x0644, 0x0625, 0x0644, 0x0627, 0x0644, 0x0627, 0x0021, 0x0022, - 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, - 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030, 0x0031, 0x0032, - 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, - 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040, 0x0041, 0x0042, - 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, - 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 0x0050, 0x0051, 0x0052, - 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, - 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 0x0060, 0x0061, 0x0062, - 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, - 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070, 0x0071, 0x0072, - 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, - 0x007b, 0x007c, 0x007d, 0x007e, 0x2985, 0x2986, 0x3002, 0x300c, - 0x300d, 0x3001, 0x30fb, 0x30f2, 0x30a1, 0x30a3, 0x30a5, 0x30a7, - 0x30a9, 0x30e3, 0x30e5, 0x30e7, 0x30c3, 0x30fc, 0x30a2, 0x30a4, - 0x30a6, 0x30a8, 0x30aa, 0x30ab, 0x30ad, 0x30af, 0x30b1, 0x30b3, - 0x30b5, 0x30b7, 0x30b9, 0x30bb, 0x30bd, 0x30bf, 0x30c1, 0x30c4, - 0x30c6, 0x30c8, 0x30ca, 0x30cb, 0x30cc, 0x30cd, 0x30ce, 0x30cf, - 0x30d2, 0x30d5, 0x30d8, 0x30db, 0x30de, 0x30df, 0x30e0, 0x30e1, - 0x30e2, 0x30e4, 0x30e6, 0x30e8, 0x30e9, 0x30ea, 0x30eb, 0x30ec, - 0x30ed, 0x30ef, 0x30f3, 0x3099, 0x309a, 0x3164, 0x3131, 0x3132, - 0x3133, 0x3134, 0x3135, 0x3136, 0x3137, 0x3138, 0x3139, 0x313a, - 0x313b, 0x313c, 0x313d, 0x313e, 0x313f, 0x3140, 0x3141, 0x3142, - 0x3143, 0x3144, 0x3145, 0x3146, 0x3147, 0x3148, 0x3149, 0x314a, - 0x314b, 0x314c, 0x314d, 0x314e, 0x314f, 0x3150, 0x3151, 0x3152, - 0x3153, 0x3154, 0x3155, 0x3156, 0x3157, 0x3158, 0x3159, 0x315a, - 0x315b, 0x315c, 0x315d, 0x315e, 0x315f, 0x3160, 0x3161, 0x3162, - 0x3163, 0x00a2, 0x00a3, 0x00ac, 0x00af, 0x00a6, 0x00a5, 0x20a9, - 0x2502, 0x2190, 0x2191, 0x2192, 0x2193, 0x25a0, 0x25cb + 0x062d, 0x0637, 0x0645, 0x0638, 0x0645, 0x0639, 0x062c, 0x0639, + 0x0645, 0x063a, 0x062c, 0x063a, 0x0645, 0x0641, 0x062c, 0x0641, + 0x062d, 0x0641, 0x062e, 0x0641, 0x0645, 0x0641, 0x0649, 0x0641, + 0x064a, 0x0642, 0x062d, 0x0642, 0x0645, 0x0642, 0x0649, 0x0642, + 0x064a, 0x0643, 0x0627, 0x0643, 0x062c, 0x0643, 0x062d, 0x0643, + 0x062e, 0x0643, 0x0644, 0x0643, 0x0645, 0x0643, 0x0649, 0x0643, + 0x064a, 0x0644, 0x062c, 0x0644, 0x062d, 0x0644, 0x062e, 0x0644, + 0x0645, 0x0644, 0x0649, 0x0644, 0x064a, 0x0645, 0x062c, 0x0645, + 0x062d, 0x0645, 0x062e, 0x0645, 0x0645, 0x0645, 0x0649, 0x0645, + 0x064a, 0x0646, 0x062c, 0x0646, 0x062d, 0x0646, 0x062e, 0x0646, + 0x0645, 0x0646, 0x0649, 0x0646, 0x064a, 0x0647, 0x062c, 0x0647, + 0x0645, 0x0647, 0x0649, 0x0647, 0x064a, 0x064a, 0x062c, 0x064a, + 0x062d, 0x064a, 0x062e, 0x064a, 0x0645, 0x064a, 0x0649, 0x064a, + 0x064a, 0x0630, 0x0670, 0x0631, 0x0670, 0x0649, 0x0670, 0x0020, + 0x064c, 0x0651, 0x0020, 0x064d, 0x0651, 0x0020, 0x064e, 0x0651, + 0x0020, 0x064f, 0x0651, 0x0020, 0x0650, 0x0651, 0x0020, 0x0651, + 0x0670, 0x0626, 0x0631, 0x0626, 0x0632, 0x0626, 0x0645, 0x0626, + 0x0646, 0x0626, 0x0649, 0x0626, 0x064a, 0x0628, 0x0631, 0x0628, + 0x0632, 0x0628, 0x0645, 0x0628, 0x0646, 0x0628, 0x0649, 0x0628, + 0x064a, 0x062a, 0x0631, 0x062a, 0x0632, 0x062a, 0x0645, 0x062a, + 0x0646, 0x062a, 0x0649, 0x062a, 0x064a, 0x062b, 0x0631, 0x062b, + 0x0632, 0x062b, 0x0645, 0x062b, 0x0646, 0x062b, 0x0649, 0x062b, + 0x064a, 0x0641, 0x0649, 0x0641, 0x064a, 0x0642, 0x0649, 0x0642, + 0x064a, 0x0643, 0x0627, 0x0643, 0x0644, 0x0643, 0x0645, 0x0643, + 0x0649, 0x0643, 0x064a, 0x0644, 0x0645, 0x0644, 0x0649, 0x0644, + 0x064a, 0x0645, 0x0627, 0x0645, 0x0645, 0x0646, 0x0631, 0x0646, + 0x0632, 0x0646, 0x0645, 0x0646, 0x0646, 0x0646, 0x0649, 0x0646, + 0x064a, 0x0649, 0x0670, 0x064a, 0x0631, 0x064a, 0x0632, 0x064a, + 0x0645, 0x064a, 0x0646, 0x064a, 0x0649, 0x064a, 0x064a, 0x0626, + 0x062c, 0x0626, 0x062d, 0x0626, 0x062e, 0x0626, 0x0645, 0x0626, + 0x0647, 0x0628, 0x062c, 0x0628, 0x062d, 0x0628, 0x062e, 0x0628, + 0x0645, 0x0628, 0x0647, 0x062a, 0x062c, 0x062a, 0x062d, 0x062a, + 0x062e, 0x062a, 0x0645, 0x062a, 0x0647, 0x062b, 0x0645, 0x062c, + 0x062d, 0x062c, 0x0645, 0x062d, 0x062c, 0x062d, 0x0645, 0x062e, + 0x062c, 0x062e, 0x0645, 0x0633, 0x062c, 0x0633, 0x062d, 0x0633, + 0x062e, 0x0633, 0x0645, 0x0635, 0x062d, 0x0635, 0x062e, 0x0635, + 0x0645, 0x0636, 0x062c, 0x0636, 0x062d, 0x0636, 0x062e, 0x0636, + 0x0645, 0x0637, 0x062d, 0x0638, 0x0645, 0x0639, 0x062c, 0x0639, + 0x0645, 0x063a, 0x062c, 0x063a, 0x0645, 0x0641, 0x062c, 0x0641, + 0x062d, 0x0641, 0x062e, 0x0641, 0x0645, 0x0642, 0x062d, 0x0642, + 0x0645, 0x0643, 0x062c, 0x0643, 0x062d, 0x0643, 0x062e, 0x0643, + 0x0644, 0x0643, 0x0645, 0x0644, 0x062c, 0x0644, 0x062d, 0x0644, + 0x062e, 0x0644, 0x0645, 0x0644, 0x0647, 0x0645, 0x062c, 0x0645, + 0x062d, 0x0645, 0x062e, 0x0645, 0x0645, 0x0646, 0x062c, 0x0646, + 0x062d, 0x0646, 0x062e, 0x0646, 0x0645, 0x0646, 0x0647, 0x0647, + 0x062c, 0x0647, 0x0645, 0x0647, 0x0670, 0x064a, 0x062c, 0x064a, + 0x062d, 0x064a, 0x062e, 0x064a, 0x0645, 0x064a, 0x0647, 0x0626, + 0x0645, 0x0626, 0x0647, 0x0628, 0x0645, 0x0628, 0x0647, 0x062a, + 0x0645, 0x062a, 0x0647, 0x062b, 0x0645, 0x062b, 0x0647, 0x0633, + 0x0645, 0x0633, 0x0647, 0x0634, 0x0645, 0x0634, 0x0647, 0x0643, + 0x0644, 0x0643, 0x0645, 0x0644, 0x0645, 0x0646, 0x0645, 0x0646, + 0x0647, 0x064a, 0x0645, 0x064a, 0x0647, 0x0640, 0x064e, 0x0651, + 0x0640, 0x064f, 0x0651, 0x0640, 0x0650, 0x0651, 0x0637, 0x0649, + 0x0637, 0x064a, 0x0639, 0x0649, 0x0639, 0x064a, 0x063a, 0x0649, + 0x063a, 0x064a, 0x0633, 0x0649, 0x0633, 0x064a, 0x0634, 0x0649, + 0x0634, 0x064a, 0x062d, 0x0649, 0x062d, 0x064a, 0x062c, 0x0649, + 0x062c, 0x064a, 0x062e, 0x0649, 0x062e, 0x064a, 0x0635, 0x0649, + 0x0635, 0x064a, 0x0636, 0x0649, 0x0636, 0x064a, 0x0634, 0x062c, + 0x0634, 0x062d, 0x0634, 0x062e, 0x0634, 0x0645, 0x0634, 0x0631, + 0x0633, 0x0631, 0x0635, 0x0631, 0x0636, 0x0631, 0x0637, 0x0649, + 0x0637, 0x064a, 0x0639, 0x0649, 0x0639, 0x064a, 0x063a, 0x0649, + 0x063a, 0x064a, 0x0633, 0x0649, 0x0633, 0x064a, 0x0634, 0x0649, + 0x0634, 0x064a, 0x062d, 0x0649, 0x062d, 0x064a, 0x062c, 0x0649, + 0x062c, 0x064a, 0x062e, 0x0649, 0x062e, 0x064a, 0x0635, 0x0649, + 0x0635, 0x064a, 0x0636, 0x0649, 0x0636, 0x064a, 0x0634, 0x062c, + 0x0634, 0x062d, 0x0634, 0x062e, 0x0634, 0x0645, 0x0634, 0x0631, + 0x0633, 0x0631, 0x0635, 0x0631, 0x0636, 0x0631, 0x0634, 0x062c, + 0x0634, 0x062d, 0x0634, 0x062e, 0x0634, 0x0645, 0x0633, 0x0647, + 0x0634, 0x0647, 0x0637, 0x0645, 0x0633, 0x062c, 0x0633, 0x062d, + 0x0633, 0x062e, 0x0634, 0x062c, 0x0634, 0x062d, 0x0634, 0x062e, + 0x0637, 0x0645, 0x0638, 0x0645, 0x0627, 0x064b, 0x0627, 0x064b, + 0x062a, 0x062c, 0x0645, 0x062a, 0x062d, 0x062c, 0x062a, 0x062d, + 0x062c, 0x062a, 0x062d, 0x0645, 0x062a, 0x062e, 0x0645, 0x062a, + 0x0645, 0x062c, 0x062a, 0x0645, 0x062d, 0x062a, 0x0645, 0x062e, + 0x062c, 0x0645, 0x062d, 0x062c, 0x0645, 0x062d, 0x062d, 0x0645, + 0x064a, 0x062d, 0x0645, 0x0649, 0x0633, 0x062d, 0x062c, 0x0633, + 0x062c, 0x062d, 0x0633, 0x062c, 0x0649, 0x0633, 0x0645, 0x062d, + 0x0633, 0x0645, 0x062d, 0x0633, 0x0645, 0x062c, 0x0633, 0x0645, + 0x0645, 0x0633, 0x0645, 0x0645, 0x0635, 0x062d, 0x062d, 0x0635, + 0x062d, 0x062d, 0x0635, 0x0645, 0x0645, 0x0634, 0x062d, 0x0645, + 0x0634, 0x062d, 0x0645, 0x0634, 0x062c, 0x064a, 0x0634, 0x0645, + 0x062e, 0x0634, 0x0645, 0x062e, 0x0634, 0x0645, 0x0645, 0x0634, + 0x0645, 0x0645, 0x0636, 0x062d, 0x0649, 0x0636, 0x062e, 0x0645, + 0x0636, 0x062e, 0x0645, 0x0637, 0x0645, 0x062d, 0x0637, 0x0645, + 0x062d, 0x0637, 0x0645, 0x0645, 0x0637, 0x0645, 0x064a, 0x0639, + 0x062c, 0x0645, 0x0639, 0x0645, 0x0645, 0x0639, 0x0645, 0x0645, + 0x0639, 0x0645, 0x0649, 0x063a, 0x0645, 0x0645, 0x063a, 0x0645, + 0x064a, 0x063a, 0x0645, 0x0649, 0x0641, 0x062e, 0x0645, 0x0641, + 0x062e, 0x0645, 0x0642, 0x0645, 0x062d, 0x0642, 0x0645, 0x0645, + 0x0644, 0x062d, 0x0645, 0x0644, 0x062d, 0x064a, 0x0644, 0x062d, + 0x0649, 0x0644, 0x062c, 0x062c, 0x0644, 0x062c, 0x062c, 0x0644, + 0x062e, 0x0645, 0x0644, 0x062e, 0x0645, 0x0644, 0x0645, 0x062d, + 0x0644, 0x0645, 0x062d, 0x0645, 0x062d, 0x062c, 0x0645, 0x062d, + 0x0645, 0x0645, 0x062d, 0x064a, 0x0645, 0x062c, 0x062d, 0x0645, + 0x062c, 0x0645, 0x0645, 0x062e, 0x062c, 0x0645, 0x062e, 0x0645, + 0x0645, 0x062c, 0x062e, 0x0647, 0x0645, 0x062c, 0x0647, 0x0645, + 0x0645, 0x0646, 0x062d, 0x0645, 0x0646, 0x062d, 0x0649, 0x0646, + 0x062c, 0x0645, 0x0646, 0x062c, 0x0645, 0x0646, 0x062c, 0x0649, + 0x0646, 0x0645, 0x064a, 0x0646, 0x0645, 0x0649, 0x064a, 0x0645, + 0x0645, 0x064a, 0x0645, 0x0645, 0x0628, 0x062e, 0x064a, 0x062a, + 0x062c, 0x064a, 0x062a, 0x062c, 0x0649, 0x062a, 0x062e, 0x064a, + 0x062a, 0x062e, 0x0649, 0x062a, 0x0645, 0x064a, 0x062a, 0x0645, + 0x0649, 0x062c, 0x0645, 0x064a, 0x062c, 0x062d, 0x0649, 0x062c, + 0x0645, 0x0649, 0x0633, 0x062e, 0x0649, 0x0635, 0x062d, 0x064a, + 0x0634, 0x062d, 0x064a, 0x0636, 0x062d, 0x064a, 0x0644, 0x062c, + 0x064a, 0x0644, 0x0645, 0x064a, 0x064a, 0x062d, 0x064a, 0x064a, + 0x062c, 0x064a, 0x064a, 0x0645, 0x064a, 0x0645, 0x0645, 0x064a, + 0x0642, 0x0645, 0x064a, 0x0646, 0x062d, 0x064a, 0x0642, 0x0645, + 0x062d, 0x0644, 0x062d, 0x0645, 0x0639, 0x0645, 0x064a, 0x0643, + 0x0645, 0x064a, 0x0646, 0x062c, 0x062d, 0x0645, 0x062e, 0x064a, + 0x0644, 0x062c, 0x0645, 0x0643, 0x0645, 0x0645, 0x0644, 0x062c, + 0x0645, 0x0646, 0x062c, 0x062d, 0x062c, 0x062d, 0x064a, 0x062d, + 0x062c, 0x064a, 0x0645, 0x062c, 0x064a, 0x0641, 0x0645, 0x064a, + 0x0628, 0x062d, 0x064a, 0x0643, 0x0645, 0x0645, 0x0639, 0x062c, + 0x0645, 0x0635, 0x0645, 0x0645, 0x0633, 0x062e, 0x064a, 0x0646, + 0x062c, 0x064a, 0x0635, 0x0644, 0x06d2, 0x0642, 0x0644, 0x06d2, + 0x0627, 0x0644, 0x0644, 0x0647, 0x0627, 0x0643, 0x0628, 0x0631, + 0x0645, 0x062d, 0x0645, 0x062f, 0x0635, 0x0644, 0x0639, 0x0645, + 0x0631, 0x0633, 0x0648, 0x0644, 0x0639, 0x0644, 0x064a, 0x0647, + 0x0648, 0x0633, 0x0644, 0x0645, 0x0635, 0x0644, 0x0649, 0x0635, + 0x0644, 0x0649, 0x0020, 0x0627, 0x0644, 0x0644, 0x0647, 0x0020, + 0x0639, 0x0644, 0x064a, 0x0647, 0x0020, 0x0648, 0x0633, 0x0644, + 0x0645, 0x062c, 0x0644, 0x0020, 0x062c, 0x0644, 0x0627, 0x0644, + 0x0647, 0x0631, 0x06cc, 0x0627, 0x0644, 0x002c, 0x3001, 0x3002, + 0x003a, 0x003b, 0x0021, 0x003f, 0x3016, 0x3017, 0x2026, 0x2025, + 0x2014, 0x2013, 0x005f, 0x005f, 0x0028, 0x0029, 0x007b, 0x007d, + 0x3014, 0x3015, 0x3010, 0x3011, 0x300a, 0x300b, 0x3008, 0x3009, + 0x300c, 0x300d, 0x300e, 0x300f, 0x005b, 0x005d, 0x203e, 0x203e, + 0x203e, 0x203e, 0x005f, 0x005f, 0x005f, 0x002c, 0x3001, 0x002e, + 0x003b, 0x003a, 0x003f, 0x0021, 0x2014, 0x0028, 0x0029, 0x007b, + 0x007d, 0x3014, 0x3015, 0x0023, 0x0026, 0x002a, 0x002b, 0x002d, + 0x003c, 0x003e, 0x003d, 0x005c, 0x0024, 0x0025, 0x0040, 0x0020, + 0x064b, 0x0640, 0x064b, 0x0020, 0x064c, 0x0020, 0x064d, 0x0020, + 0x064e, 0x0640, 0x064e, 0x0020, 0x064f, 0x0640, 0x064f, 0x0020, + 0x0650, 0x0640, 0x0650, 0x0020, 0x0651, 0x0640, 0x0651, 0x0020, + 0x0652, 0x0640, 0x0652, 0x0621, 0x0622, 0x0622, 0x0623, 0x0623, + 0x0624, 0x0624, 0x0625, 0x0625, 0x0626, 0x0626, 0x0626, 0x0626, + 0x0627, 0x0627, 0x0628, 0x0628, 0x0628, 0x0628, 0x0629, 0x0629, + 0x062a, 0x062a, 0x062a, 0x062a, 0x062b, 0x062b, 0x062b, 0x062b, + 0x062c, 0x062c, 0x062c, 0x062c, 0x062d, 0x062d, 0x062d, 0x062d, + 0x062e, 0x062e, 0x062e, 0x062e, 0x062f, 0x062f, 0x0630, 0x0630, + 0x0631, 0x0631, 0x0632, 0x0632, 0x0633, 0x0633, 0x0633, 0x0633, + 0x0634, 0x0634, 0x0634, 0x0634, 0x0635, 0x0635, 0x0635, 0x0635, + 0x0636, 0x0636, 0x0636, 0x0636, 0x0637, 0x0637, 0x0637, 0x0637, + 0x0638, 0x0638, 0x0638, 0x0638, 0x0639, 0x0639, 0x0639, 0x0639, + 0x063a, 0x063a, 0x063a, 0x063a, 0x0641, 0x0641, 0x0641, 0x0641, + 0x0642, 0x0642, 0x0642, 0x0642, 0x0643, 0x0643, 0x0643, 0x0643, + 0x0644, 0x0644, 0x0644, 0x0644, 0x0645, 0x0645, 0x0645, 0x0645, + 0x0646, 0x0646, 0x0646, 0x0646, 0x0647, 0x0647, 0x0647, 0x0647, + 0x0648, 0x0648, 0x0649, 0x0649, 0x064a, 0x064a, 0x064a, 0x064a, + 0x0644, 0x0622, 0x0644, 0x0622, 0x0644, 0x0623, 0x0644, 0x0623, + 0x0644, 0x0625, 0x0644, 0x0625, 0x0644, 0x0627, 0x0644, 0x0627, + 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, + 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030, + 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, + 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040, + 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, + 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 0x0050, + 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, + 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 0x0060, + 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, + 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070, + 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, + 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x2985, 0x2986, + 0x3002, 0x300c, 0x300d, 0x3001, 0x30fb, 0x30f2, 0x30a1, 0x30a3, + 0x30a5, 0x30a7, 0x30a9, 0x30e3, 0x30e5, 0x30e7, 0x30c3, 0x30fc, + 0x30a2, 0x30a4, 0x30a6, 0x30a8, 0x30aa, 0x30ab, 0x30ad, 0x30af, + 0x30b1, 0x30b3, 0x30b5, 0x30b7, 0x30b9, 0x30bb, 0x30bd, 0x30bf, + 0x30c1, 0x30c4, 0x30c6, 0x30c8, 0x30ca, 0x30cb, 0x30cc, 0x30cd, + 0x30ce, 0x30cf, 0x30d2, 0x30d5, 0x30d8, 0x30db, 0x30de, 0x30df, + 0x30e0, 0x30e1, 0x30e2, 0x30e4, 0x30e6, 0x30e8, 0x30e9, 0x30ea, + 0x30eb, 0x30ec, 0x30ed, 0x30ef, 0x30f3, 0x3099, 0x309a, 0x3164, + 0x3131, 0x3132, 0x3133, 0x3134, 0x3135, 0x3136, 0x3137, 0x3138, + 0x3139, 0x313a, 0x313b, 0x313c, 0x313d, 0x313e, 0x313f, 0x3140, + 0x3141, 0x3142, 0x3143, 0x3144, 0x3145, 0x3146, 0x3147, 0x3148, + 0x3149, 0x314a, 0x314b, 0x314c, 0x314d, 0x314e, 0x314f, 0x3150, + 0x3151, 0x3152, 0x3153, 0x3154, 0x3155, 0x3156, 0x3157, 0x3158, + 0x3159, 0x315a, 0x315b, 0x315c, 0x315d, 0x315e, 0x315f, 0x3160, + 0x3161, 0x3162, 0x3163, 0x00a2, 0x00a3, 0x00ac, 0x00af, 0x00a6, + 0x00a5, 0x20a9, 0x2502, 0x2190, 0x2191, 0x2192, 0x2193, 0x25a0, + 0x25cb }; #include "wine/unicode.h" diff --git a/libs/port/digitmap.c b/libs/port/digitmap.c index 99be476545..0af6011ea7 100644 --- a/libs/port/digitmap.c +++ b/libs/port/digitmap.c @@ -1,5 +1,5 @@ /* Unicode digit folding mappings */ -/* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ +/* generated from http://www.unicode.org/Public/12.1.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "windef.h" diff --git a/libs/port/wctype.c b/libs/port/wctype.c index 661966c5a1..5439e7db57 100644 --- a/libs/port/wctype.c +++ b/libs/port/wctype.c @@ -1606,7 +1606,7 @@ const unsigned short wine_wctype_table[17152] = 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x0000, + 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, diff --git a/tools/make_unicode b/tools/make_unicode index 3e2d3e88fc..5644fab05e 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -23,7 +23,7 @@ use strict; # base URLs for www.unicode.org files my $MAPPINGS = "http://www.unicode.org/Public/MAPPINGS"; -my $UNIDATA = "http://www.unicode.org/Public/12.0.0/ucd"; +my $UNIDATA = "http://www.unicode.org/Public/12.1.0/ucd"; my $REPORTS = "http://www.unicode.org/reports"; my $RFCS = "http://www.rfc-editor.org/rfc"; -- 2.24.0

2 1

[PATCH vkd3d 1/2] vkd3d/tests: Add tests for GetCopyableFootprints() depth/stencil planes.
by Conor McCarthy 09 Dec '19

09 Dec '19

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 19 +++++++++++++++++++ tests/d3d12_test_utils.h | 1 + 2 files changed, 20 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 323ef23..1e0e25f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -18810,6 +18810,8 @@ static void test_get_copyable_footprints(void) {DXGI_FORMAT_BC6H_UF16, true}, {DXGI_FORMAT_BC6H_SF16, true}, {DXGI_FORMAT_BC7_UNORM, true}, + {DXGI_FORMAT_D32_FLOAT, false}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, false}, }; static const uint64_t base_offsets[] = { @@ -18855,6 +18857,14 @@ static void test_get_copyable_footprints(void) {D3D12_RESOURCE_DIMENSION_TEXTURE3D, 3, 2, 2, 2, 2, DXGI_FORMAT_BC1_UNORM, {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 1, }, + { + {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 0, 4, 4, 1, 1, DXGI_FORMAT_D32_FLOAT, + {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL}, 0, 2, + }, + { + {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 0, 4, 4, 1, 1, DXGI_FORMAT_D24_UNORM_S8_UINT, + {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL}, 0, 3, + }, }; if (!(device = create_device())) @@ -18894,6 +18904,15 @@ static void test_get_copyable_footprints(void) sub_resource_count = resource_desc.MipLevels; if (resources[i].dimension != D3D12_RESOURCE_DIMENSION_TEXTURE3D) sub_resource_count *= resource_desc.DepthOrArraySize; + if (resource_desc.Format == DXGI_FORMAT_D24_UNORM_S8_UINT) + { + if (!vkd3d_test_platform_is_windows()) + { + skip("Depth/stencil planes are not supported.\n"); + continue; + } + sub_resource_count *= 2; + } assert(sub_resource_count <= ARRAY_SIZE(layouts)); for (k = 0; k < ARRAY_SIZE(base_offsets); ++k) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 5092183..f9d49de 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -308,6 +308,7 @@ static unsigned int format_size(DXGI_FORMAT format) case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: case DXGI_FORMAT_R8G8B8A8_UINT: case DXGI_FORMAT_B8G8R8A8_UNORM: + case DXGI_FORMAT_D24_UNORM_S8_UINT: return 4; case DXGI_FORMAT_R16_FLOAT: case DXGI_FORMAT_R16_UNORM: -- 2.24.0

1 1

[PATCH] cmd: Avoid unneeded strlenW() calls.
by Francois Gouget 09 Dec '19

09 Dec '19

Neither WCMD_give_help(), nor WCMD_setshow_default() are ever called with a NULL pointer (notice how WCMD_skip_leading_spaces() already assumes its argument is not NULL and does not return NULL). Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/cmd/builtins.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index c6048eb5c1a..effb3e526b4 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2549,7 +2549,7 @@ void WCMD_give_help (const WCHAR *args) size_t i; args = WCMD_skip_leading_spaces((WCHAR*) args); - if (lstrlenW(args) == 0) { + if (!*args) { WCMD_output_asis (WCMD_LoadMessage(WCMD_ALLHELP)); } else { @@ -3460,7 +3460,8 @@ void WCMD_setshow_default (const WCHAR *args) { } GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); - if (lstrlenW(args) == 0) { + + if (!*args) { lstrcatW (cwd, newlineW); WCMD_output_asis (cwd); } @@ -3552,7 +3553,7 @@ void WCMD_setshow_date (void) { DWORD count; static const WCHAR parmT[] = {'/','T','\0'}; - if (lstrlenW(param1) == 0) { + if (!*param1) { if (GetDateFormatW(LOCALE_USER_DEFAULT, 0, NULL, NULL, curdate, ARRAY_SIZE(curdate))) { WCMD_output (WCMD_LoadMessage(WCMD_CURRENTDATE), curdate); if (wcsstr (quals, parmT) == NULL) { @@ -4194,7 +4195,7 @@ void WCMD_setshow_env (WCHAR *s) { /* Output the prompt */ *p++ = '\0'; - if (lstrlenW(p) != 0) WCMD_output_asis(p); + if (*p) WCMD_output_asis(p); /* Read the reply */ WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count); @@ -4268,7 +4269,7 @@ void WCMD_setshow_env (WCHAR *s) { } *p++ = '\0'; - if (lstrlenW(p) == 0) p = NULL; + if (!*p) p = NULL; WINE_TRACE("set: Setting var '%s' to '%s'\n", wine_dbgstr_w(s), wine_dbgstr_w(p)); status = SetEnvironmentVariableW(s, p); @@ -4293,7 +4294,7 @@ void WCMD_setshow_path (const WCHAR *args) { static const WCHAR pathW[] = {'P','A','T','H','\0'}; static const WCHAR pathEqW[] = {'P','A','T','H','=','\0'}; - if (lstrlenW(param1) == 0 && lstrlenW(param2) == 0) { + if (!*param1 && !*param2) { status = GetEnvironmentVariableW(pathW, string, ARRAY_SIZE(string)); if (status != 0) { WCMD_output_asis ( pathEqW); @@ -4322,13 +4323,13 @@ void WCMD_setshow_prompt (void) { WCHAR *s; static const WCHAR promptW[] = {'P','R','O','M','P','T','\0'}; - if (lstrlenW(param1) == 0) { + if (!*param1) { SetEnvironmentVariableW(promptW, NULL); } else { s = param1; while ((*s == '=') || (*s == ' ') || (*s == '\t')) s++; - if (lstrlenW(s) == 0) { + if (!*s) { SetEnvironmentVariableW(promptW, NULL); } else SetEnvironmentVariableW(promptW, s); @@ -4349,7 +4350,7 @@ void WCMD_setshow_time (void) { SYSTEMTIME st; static const WCHAR parmT[] = {'/','T','\0'}; - if (lstrlenW(param1) == 0) { + if (!*param1) { GetLocalTime(&st); if (GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, curtime, ARRAY_SIZE(curtime))) { WCMD_output (WCMD_LoadMessage(WCMD_CURRENTTIME), curtime); @@ -4756,7 +4757,7 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) WCHAR string[MAX_PATH], label[MAX_PATH], curdir[MAX_PATH]; BOOL status; - if (lstrlenW(path) == 0) { + if (!*path) { status = GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); if (!status) { WCMD_print_error (); @@ -4794,7 +4795,7 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ } - if (lstrlenW(path) != 0) { + if (*path) { if (!SetVolumeLabelW(curdir, string)) WCMD_print_error (); } else { -- 2.20.1

1 0

[PATCH] winedbg: Avoid unneeded strlen() calls.
by Francois Gouget 09 Dec '19

09 Dec '19

Note that target_xml is an array and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/winedbg/gdbproxy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index b7f59ee05be..85ebc882a62 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1615,7 +1615,7 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) return packet_ok; if (strncmp(gdbctx->in_packet, "Supported", 9) == 0) { - if (strlen(target_xml)) + if (*target_xml) return packet_reply(gdbctx, "PacketSize=400;qXfer:features:read+"); else { @@ -1652,7 +1652,7 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) } break; case 'X': - if (strlen(target_xml) && strncmp(gdbctx->in_packet, "Xfer:features:read:target.xml", 29) == 0) + if (*target_xml && strncmp(gdbctx->in_packet, "Xfer:features:read:target.xml", 29) == 0) return packet_reply(gdbctx, target_xml); break; } -- 2.20.1

1 0

[PATCH] user32/tests: Fix the spelling of an ok() message.
by Francois Gouget 09 Dec '19

09 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/tests/winstation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 6bebfe95f4b..aaa51d560ac 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -591,7 +591,7 @@ static void test_inputdesktop(void) /* by default, GetThreadDesktop is the input desktop, SendInput should succeed. */ old_thread_desk = GetThreadDesktop(GetCurrentThreadId()); - ok(old_thread_desk != NULL, "GetThreadDesktop faile!\n"); + ok(old_thread_desk != NULL, "GetThreadDesktop failed!\n"); memset(name, 0, sizeof(name)); ret = GetUserObjectInformationA(old_thread_desk, UOI_NAME, name, 1024, NULL); ok(!strcmp(name, "Default"), "unexpected desktop %s\n", name); -- 2.20.1

1 0

[PATCH] oleaut32: Fix the spelling of a FIXME() message.
by Francois Gouget 09 Dec '19

09 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/oleaut32/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index eb713a4e2f8..11e83789483 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3757,7 +3757,7 @@ static DWORD SLTG_ReadLibBlk(LPVOID pLibBlk, ITypeLibImpl *pTypeLibImpl) ptr += 6; if((w = *(WORD*)ptr) != 0xffff) { - FIXME("LibBlk.res06 = %04x. Assumung string and skipping\n", w); + FIXME("LibBlk.res06 = %04x. Assuming string and skipping\n", w); ptr += w; } ptr += 2; -- 2.20.1

1 0

[PATCH] kernel32/tests: Trace LastError when GetPhysicallyInstalledSystemMemory() fails.
by Francois Gouget 09 Dec '19

09 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 38fae0eede2..5ea7a25c46c 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1206,7 +1206,7 @@ static void test_GetPhysicallyInstalledSystemMemory(void) total_memory = 0; ret = pGetPhysicallyInstalledSystemMemory(&total_memory); - ok(ret, "GetPhysicallyInstalledSystemMemory unexpectedly failed\n"); + ok(ret, "GetPhysicallyInstalledSystemMemory unexpectedly failed (%u)\n", GetLastError()); ok(total_memory != 0, "expected total_memory != 0\n"); memstatus.dwLength = sizeof(memstatus); -- 2.20.1

1 0

[PATCH] shlwapi/tests: Fix the spelling of a couple of ok() messages.
by Francois Gouget 09 Dec '19

09 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/shell32/tests/progman_dde.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 2d19404a763..ef087893016 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -449,7 +449,7 @@ START_TEST(progman_dde) /* Cleanup & Exit */ ret = DdeDisconnect(hConv); - ok(ret, "DdeDisonnect() failed: %u\n", DdeGetLastError(instance)); + ok(ret, "DdeDisconnect() failed: %u\n", DdeGetLastError(instance)); ret = DdeUninitialize(instance); ok(ret, "DdeUninitialize() failed: %u\n", DdeGetLastError(instance)); @@ -472,7 +472,7 @@ START_TEST(progman_dde) /* Cleanup & Exit */ ret = DdeDisconnect(hConv); - ok(ret, "DdeDisonnect() failed: %u\n", DdeGetLastError(instance)); + ok(ret, "DdeDisconnect() failed: %u\n", DdeGetLastError(instance)); ret = DdeUninitialize(instance); ok(ret, "DdeUninitialize() failed: %u\n", DdeGetLastError(instance)); } -- 2.20.1

1 0

[PATCH] wmvcore: Fix the spelling of WMReaderAdvanced6_SetProtectStreamSamples().
by Francois Gouget 09 Dec '19

09 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wmvcore/reader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wmvcore/reader.c b/dlls/wmvcore/reader.c index 68e35cfd484..50bf9d80079 100644 --- a/dlls/wmvcore/reader.c +++ b/dlls/wmvcore/reader.c @@ -621,7 +621,7 @@ static HRESULT WINAPI WMReaderAdvanced5_SetPlayerHook(IWMReaderAdvanced6 *iface, return E_NOTIMPL; } -static HRESULT WINAPI WMReaderAdvanced6_SetProtextStreamSamples(IWMReaderAdvanced6 *iface, BYTE *cert, +static HRESULT WINAPI WMReaderAdvanced6_SetProtectStreamSamples(IWMReaderAdvanced6 *iface, BYTE *cert, DWORD cert_size, DWORD cert_type, DWORD flags, BYTE *initialization_vector, DWORD *initialization_vector_size) { WMReader *This = impl_from_IWMReaderAdvanced6(iface); @@ -681,7 +681,7 @@ static const IWMReaderAdvanced6Vtbl WMReaderAdvanced6Vtbl = { WMReaderAdvanced4_CancelSaveFileAs, WMReaderAdvanced4_GetURL, WMReaderAdvanced5_SetPlayerHook, - WMReaderAdvanced6_SetProtextStreamSamples + WMReaderAdvanced6_SetProtectStreamSamples }; static inline WMReader *impl_from_IWMReaderAccelerator(IWMReaderAccelerator *iface) -- 2.20.1

1 0

[PATCH] cmd: Fix the spelling of a WINE_TRACE() message and a comment.
by Francois Gouget 09 Dec '19

09 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/cmd/builtins.c | 2 +- programs/cmd/wcmd.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index effb3e526b4..43c4d9efef3 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2511,7 +2511,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { heap_free(dirsToWalk->dirName); heap_free(dirsToWalk); dirsToWalk = nextDir; - if (dirsToWalk) WINE_TRACE("Moving to next directorty to iterate: %s\n", + if (dirsToWalk) WINE_TRACE("Moving to next directory to iterate: %s\n", wine_dbgstr_w(dirsToWalk->dirName)); else WINE_TRACE("Finished all directories.\n"); } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 3e99a0d2038..b0769bd839d 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -34,7 +34,7 @@ /* msdn specified max for Win XP */ #define MAXSTRING 8192 -/* Data structure to hold commands delimitors/separators */ +/* Data structure to hold commands delimiters/separators */ typedef enum _CMDdelimiters { CMD_NONE, /* End of line or single & */ -- 2.20.1

1 0

[PATCH] comctl32/tests: Avoid a couple of unneeded lstrlenA() calls.
by Francois Gouget 09 Dec '19

09 Dec '19

Note that text is an array and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/comctl32/tests/updown.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index e7ceeffd4cd..d0fff562499 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -791,7 +791,7 @@ static void test_updown_create(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); GetWindowTextA(g_edit, text, MAX_PATH); - ok(lstrlenA(text) == 0, "Expected empty string\n"); + ok(!*text, "Expected empty string\n"); ok_sequence(sequences, EDIT_SEQ_INDEX, get_edit_text_seq, "get edit text", FALSE); DestroyWindow(updown); @@ -865,7 +865,7 @@ static void test_UDS_SETBUDDYINT(void) ok(style & UDS_SETBUDDYINT, "Expected UDS_SETBUDDY to be set\n"); SendMessageA(updown, UDM_SETPOS, 0, 20); GetWindowTextA(g_edit, text, ARRAY_SIZE(text)); - ok(lstrlenA(text) == 0, "Expected empty string\n"); + ok(!*text, "Expected empty string\n"); DestroyWindow(updown); /* creating with UDS_SETBUDDYINT */ -- 2.20.1

1 0

[PATCH] user32: Fix the spelling of a TRACE() message.
by Francois Gouget 09 Dec '19

09 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/winpos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index aad5274973f..f759bd10f94 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1397,7 +1397,7 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f if (flags & PLACE_MAX) make_point_onscreen( &wp.ptMaxPosition ); if (flags & PLACE_RECT) make_rect_onscreen( &wp.rcNormalPosition ); - TRACE( "%p: setting min %d,%d max %d,%d normal %s flags %x ajusted to min %d,%d max %d,%d normal %s\n", + TRACE( "%p: setting min %d,%d max %d,%d normal %s flags %x adjusted to min %d,%d max %d,%d normal %s\n", hwnd, wndpl->ptMinPosition.x, wndpl->ptMinPosition.y, wndpl->ptMaxPosition.x, wndpl->ptMaxPosition.y, wine_dbgstr_rect(&wndpl->rcNormalPosition), flags, -- 2.20.1

1 0

[PATCH] comctl32/tests: Avoid an unneeded strlen() call.
by Francois Gouget 09 Dec '19

09 Dec '19

Note that pathBuffer is an array and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/comctl32/tests/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index dc3b247fb62..a3769423ee6 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -1819,7 +1819,7 @@ static void test_listbox_dlgdir(void) ok (res == 0, "DlgDirSelectEx() with no selection returned %d, expected 0\n", res); /* WinXP-SP2 leaves pathBuffer untouched, but Win98 fills it with garbage. */ /* - ok (strlen(pathBuffer) == 0, "DlgDirSelectEx() with no selection filled buffer with %s\n", pathBuffer); + ok (!*pathBuffer, "DlgDirSelectEx() with no selection filled buffer with %s\n", pathBuffer); */ /* Test proper drive/dir/file recognition */ itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); -- 2.20.1

1 0

[PATCH] user32/tests: Avoid a couple of unneeded strlen() calls.
by Francois Gouget 09 Dec '19

09 Dec '19

Note that DeviceString is an array field and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/tests/monitor.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 567870e3d1f..47e01b1a6a6 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -71,7 +71,6 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de int device_id; int subsys_id; int revision_id; - size_t length; HDC hdc; adapter_count++; @@ -87,9 +86,8 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de "#%d: wrong DeviceKey %s\n", index, device->DeviceKey); /* DeviceString */ - length = strlen(device->DeviceString); - ok(broken(length == 0) || /* XP on Testbot will return an empty string, whereas XP on real machine doesn't. Probably a bug in virtual adapter driver */ - length > 0, "#%d: expect DeviceString not empty\n", index); + ok(broken(!*device->DeviceString) || /* XP on Testbot will return an empty string, whereas XP on real machine doesn't. Probably a bug in virtual adapter driver */ + *device->DeviceString, "#%d: expect DeviceString not empty\n", index); /* StateFlags */ if (index == 0) @@ -139,7 +137,7 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); /* DeviceString */ - ok(strlen(device->DeviceString) > 0, "#%d: expect DeviceString not empty\n", monitor_index); + ok(*device->DeviceString, "#%d: expect DeviceString not empty\n", monitor_index); /* StateFlags */ if (adapter_index == 0 && monitor_index == 0) -- 2.20.1

1 0

[PATCH] user32/tests: Avoid an unneeded (&commented out) strlen() call.
by Francois Gouget 09 Dec '19

09 Dec '19

Note that pathBuffer is an array and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/tests/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 8d8115131ef..9f6f45990f5 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1710,7 +1710,7 @@ static void test_listbox_dlgdir(void) ok (res == 0, "DlgDirSelectEx() with no selection returned %d, expected 0\n", res); /* WinXP-SP2 leaves pathBuffer untouched, but Win98 fills it with garbage. */ /* - ok (strlen(pathBuffer) == 0, "DlgDirSelectEx() with no selection filled buffer with %s\n", pathBuffer); + ok (!*pathBuffer, "DlgDirSelectEx() with no selection filled buffer with %s\n", pathBuffer); */ /* Test proper drive/dir/file recognition */ itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); -- 2.20.1

1 0

[PATCH 1/2] dwrite: Compare axis values when testing for face reference equality.
by Nikolay Sivov 09 Dec '19

09 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 28 +++++++++++++------ dlls/dwrite/tests/font.c | 60 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 75 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 2670a22839..84e3af8b70 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -236,6 +236,8 @@ struct dwrite_fontfacereference IDWriteFactory7 *factory; }; +static const IDWriteFontFaceReference1Vtbl fontfacereferencevtbl; + struct dwrite_fontresource { IDWriteFontResource IDWriteFontResource_iface; @@ -1896,6 +1898,16 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface) return CONTAINING_RECORD(iface, struct dwrite_fontface, IDWriteFontFace5_iface); } +static struct dwrite_fontfacereference *unsafe_impl_from_IDWriteFontFaceReference(IDWriteFontFaceReference *iface) +{ + if (!iface) + return NULL; + if (iface->lpVtbl != (IDWriteFontFaceReferenceVtbl *)&fontfacereferencevtbl) + return NULL; + return CONTAINING_RECORD((IDWriteFontFaceReference1 *)iface, struct dwrite_fontfacereference, + IDWriteFontFaceReference1_iface); +} + void get_logfont_from_font(IDWriteFont *iface, LOGFONTW *lf) { struct dwrite_font *font = unsafe_impl_from_IDWriteFont(iface); @@ -6132,18 +6144,18 @@ static HRESULT WINAPI fontfacereference_CreateFontFaceWithSimulations(IDWriteFon static BOOL WINAPI fontfacereference_Equals(IDWriteFontFaceReference1 *iface, IDWriteFontFaceReference *ref) { struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); - IDWriteFontFile *file; + struct dwrite_fontfacereference *other = unsafe_impl_from_IDWriteFontFaceReference(ref); BOOL ret; TRACE("%p, %p.\n", iface, ref); - if (FAILED(IDWriteFontFaceReference_GetFontFile(ref, &file))) - return FALSE; - - ret = is_same_fontfile(reference->file, file) && - reference->index == IDWriteFontFaceReference_GetFontFaceIndex(ref) && - reference->simulations == IDWriteFontFaceReference_GetSimulations(ref); - IDWriteFontFile_Release(file); + ret = is_same_fontfile(reference->file, other->file) && reference->index == other->index && + reference->simulations == other->simulations; + if (reference->axis_values_count) + { + ret &= reference->axis_values_count == other->axis_values_count && + !memcmp(reference->axis_values, other->axis_values, reference->axis_values_count * sizeof(*reference->axis_values)); + } return ret; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index a0d36e2f0b..219a0510ea 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9279,13 +9279,14 @@ static void test_font_resource(void) IDWriteFontFaceReference1 *reference, *reference2; IDWriteFontResource *resource, *resource2; IDWriteFontFile *fontfile, *fontfile2; - DWRITE_FONT_AXIS_VALUE axis_value; + DWRITE_FONT_AXIS_VALUE axis_values[2]; IDWriteFontFace5 *fontface5; IDWriteFontFace *fontface; IDWriteFactory6 *factory; UINT32 count, index; HRESULT hr; ULONG ref; + BOOL ret; if (!(factory = create_factory_iid(&IID_IDWriteFactory6))) { @@ -9316,9 +9317,9 @@ static void test_font_resource(void) ok(!index, "Unexpected index %u.\n", index); /* Specify axis value, font has no variations. */ - axis_value.axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; - axis_value.value = 400.0f; - hr = IDWriteFontResource_CreateFontFaceReference(resource, DWRITE_FONT_SIMULATIONS_NONE, &axis_value, 1, &reference); + axis_values[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axis_values[0].value = 400.0f; + hr = IDWriteFontResource_CreateFontFaceReference(resource, DWRITE_FONT_SIMULATIONS_NONE, axis_values, 1, &reference); ok(hr == S_OK, "Failed to create reference object, hr %#x.\n", hr); count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference); @@ -9326,7 +9327,7 @@ static void test_font_resource(void) IDWriteFontFaceReference1_Release(reference); - hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, &axis_value, 1, + hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, axis_values, 1, &reference); count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference); ok(count == 1, "Unexpected axis value count.\n"); @@ -9360,6 +9361,55 @@ static void test_font_resource(void) IDWriteFontFace5_Release(fontface5); + /* Reference equality regarding set axis values. */ + axis_values[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axis_values[0].value = 400.0f; + axis_values[1].axisTag = DWRITE_FONT_AXIS_TAG_ITALIC; + axis_values[1].value = 1.0f; + hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, axis_values, 2, + &reference); + count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference); + ok(count == 2, "Unexpected axis value count.\n"); + + hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, NULL, 0, + &reference2); + count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference2); + ok(!count, "Unexpected axis value count.\n"); + + ret = IDWriteFontFaceReference1_Equals(reference, (IDWriteFontFaceReference *)reference2); + ok(!ret, "Unexpected result.\n"); + IDWriteFontFaceReference1_Release(reference2); + + /* Different values order. */ + axis_values[0].axisTag = DWRITE_FONT_AXIS_TAG_ITALIC; + axis_values[0].value = 1.0f; + axis_values[1].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axis_values[1].value = 400.0f; + hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, axis_values, 2, + &reference2); + count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference2); + ok(count == 2, "Unexpected axis value count.\n"); + + ret = IDWriteFontFaceReference1_Equals(reference, (IDWriteFontFaceReference *)reference2); + ok(!ret, "Unexpected result.\n"); + IDWriteFontFaceReference1_Release(reference2); + + /* Different axis values. */ + axis_values[0].axisTag = DWRITE_FONT_AXIS_TAG_ITALIC; + axis_values[0].value = 1.0f; + axis_values[1].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axis_values[1].value = 401.0f; + hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, axis_values, 2, + &reference2); + count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference2); + ok(count == 2, "Unexpected axis value count.\n"); + + ret = IDWriteFontFaceReference1_Equals(reference, (IDWriteFontFaceReference *)reference2); + ok(!ret, "Unexpected result.\n"); + IDWriteFontFaceReference1_Release(reference2); + + IDWriteFontFaceReference1_Release(reference); + IDWriteFontFile_Release(fontfile); IDWriteFontFace_Release(fontface); -- 2.24.0

1 1

[PATCH] oleaut32/typelib: No need to query self for supported interface.
by Nikolay Sivov 09 Dec '19

09 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index eb713a4e2f..6e8a18c9d7 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -11180,7 +11180,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeIdldesc(ICreateTypeInfo2 *iface, static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - ITypeInfo *tinfo; + ITypeInfo2 *tinfo = &This->ITypeInfo2_iface; TLBFuncDesc *func_desc; UINT user_vft = 0, i, depth = 0; HRESULT hres = S_OK; @@ -11189,25 +11189,20 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) This->needs_layout = FALSE; - hres = ICreateTypeInfo2_QueryInterface(iface, &IID_ITypeInfo, (LPVOID*)&tinfo); - if (FAILED(hres)) - return hres; - if (This->typeattr.typekind == TKIND_INTERFACE) { ITypeInfo *inh; TYPEATTR *attr; HREFTYPE inh_href; - hres = ITypeInfo_GetRefTypeOfImplType(tinfo, 0, &inh_href); + hres = ITypeInfo2_GetRefTypeOfImplType(tinfo, 0, &inh_href); if (SUCCEEDED(hres)) { - hres = ITypeInfo_GetRefTypeInfo(tinfo, inh_href, &inh); + hres = ITypeInfo2_GetRefTypeInfo(tinfo, inh_href, &inh); if (SUCCEEDED(hres)) { hres = ITypeInfo_GetTypeAttr(inh, &attr); if (FAILED(hres)) { ITypeInfo_Release(inh); - ITypeInfo_Release(tinfo); return hres; } This->typeattr.cbSizeVft = attr->cbSizeVft; @@ -11231,17 +11226,13 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) } else if (hres == TYPE_E_ELEMENTNOTFOUND) { This->typeattr.cbSizeVft = 0; hres = S_OK; - } else { - ITypeInfo_Release(tinfo); + } else return hres; - } } else if (hres == TYPE_E_ELEMENTNOTFOUND) { This->typeattr.cbSizeVft = 0; hres = S_OK; - } else { - ITypeInfo_Release(tinfo); + } else return hres; - } } else if (This->typeattr.typekind == TKIND_DISPATCH) This->typeattr.cbSizeVft = 7 * This->pTypeLib->ptr_size; else @@ -11316,7 +11307,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) } } - ITypeInfo_Release(tinfo); return hres; } -- 2.24.0

1 0

[PATCH] ntdll/tests: Enable some more string API tests.
by Nikolay Sivov 09 Dec '19

09 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/tests/rtlstr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 6f59e956c2..d2091859b8 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -597,6 +597,7 @@ static void test_RtlUpcaseUnicodeChar(void) } else { expected_upper_ch = ch; } +todo_wine_if(ch == 0xb5) ok(upper_ch == expected_upper_ch, "RtlUpcaseUnicodeChar('%c'[=0x%x]) has result '%c'[=0x%x], expected: '%c'[=0x%x]\n", ch, ch, upper_ch, upper_ch, expected_upper_ch, expected_upper_ch); @@ -646,6 +647,7 @@ static void test_RtlUpcaseUnicodeString(void) pRtlUpcaseUnicodeString(&result_str, &ascii_str, 0); for (i = 0; i <= 255; i++) { +todo_wine_if(ascii_str.Buffer[i] == 0xb5) ok(result_str.Buffer[i] == upper_str.Buffer[i], "RtlUpcaseUnicodeString works wrong: '%c'[=0x%x] is converted to '%c'[=0x%x], expected: '%c'[=0x%x]\n", ascii_str.Buffer[i], ascii_str.Buffer[i], @@ -2615,10 +2617,10 @@ START_TEST(rtlstr) test_RtlStringFromGUID(); test_RtlIsTextUnicode(); test_RtlCompareUnicodeString(); + test_RtlUpcaseUnicodeChar(); + test_RtlUpcaseUnicodeString(); if(0) { - test_RtlUpcaseUnicodeChar(); - test_RtlUpcaseUnicodeString(); test_RtlDowncaseUnicodeString(); } test_RtlHashUnicodeString(); -- 2.24.0

1 0

Re: TestBot job 61617 results: [PATCH] kernel32: return S_OK in RegisterApplicationRecoveryCallback stub
by Louis Lenders 09 Dec '19

09 Dec '19

patch apparently failed to apply on testbot , but applies here on my wine-tree. Don`t know why.... Op ma 9 dec. 2019 om 07:49 schreef Marvin <testbot(a)winehq.org>: > VM Status Failures Command > debian10 badpatch > debian10 badpatch > > You can also see the results at: > https://testbot.winehq.org/JobDetails.pl?Key=61617 > > > === debian10 (build log) === > > error: patch failed: dlls/kernel32/process.c:4153 > Task: Patch failed to apply > > === debian10 (build log) === > > error: patch failed: dlls/kernel32/process.c:4153 > Task: Patch failed to apply >

2 1

[PATCH] kernel32: return S_OK in RegisterApplicationRecoveryCallback stub
by Louis Lenders 09 Dec '19

09 Dec '19

https://bugs.winehq.org/show_bug.cgi?id=43817 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/kernel32/process.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 939ec9b..48dde58 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4153,9 +4153,8 @@ HRESULT WINAPI ApplicationRecoveryInProgress(PBOOL canceled) */ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK callback, PVOID param, DWORD pingint, DWORD flags) { - FIXME("%p, %p, %d, %d: stub\n", callback, param, pingint, flags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return E_FAIL; + FIXME("%p, %p, %d, %d: stub, faking succes\n", callback, param, pingint, flags); + return S_OK; } /********************************************************************** -- 2.7.4

2 1

[PATCH] httpapi: return ERROR_SUCCESS for unimplemented flags in HttpInitialize
by Austin English 09 Dec '19

09 Dec '19

Returning ERROR_CALL_NOT_IMPLEMENTED breaks .Net installers. MSDN suggests that ERROR_INVALID_PARAMETER may be more appropriate, but that too breaks .Net. Note that this is (currently) only effective if mingw is disabled. mingw enabled builds has separate issues that I'm still looking into. Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/httpapi/httpapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 0449d53045..8adbd38be5 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -62,7 +62,7 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved if (flags & ~HTTP_INITIALIZE_SERVER) { FIXME("Unhandled flags %#x.\n", flags); - return ERROR_CALL_NOT_IMPLEMENTED; + return ERROR_SUCCESS; } if (!(manager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT))) -- 2.23.0

1 0

[PATCH] oledb32: Implement IDataSourceLocator PromptNew
by Alistair Leslie-Hughes 09 Dec '19

09 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/Makefile.in | 1 + dlls/oledb32/dslocator.c | 133 +++++++++++++++++++++++++++++++++-- dlls/oledb32/main.c | 2 +- dlls/oledb32/oledb_private.h | 2 + dlls/oledb32/resource.h | 24 +++++++ dlls/oledb32/version.rc | 21 ++++++ 6 files changed, 178 insertions(+), 5 deletions(-) create mode 100644 dlls/oledb32/resource.h diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in index b55a66c5db..33cc312ee3 100644 --- a/dlls/oledb32/Makefile.in +++ b/dlls/oledb32/Makefile.in @@ -1,5 +1,6 @@ MODULE = oledb32.dll IMPORTS = uuid oleaut32 ole32 user32 advapi32 +DELAYIMPORTS = comctl32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index d397e47aa5..0a31a99130 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -20,6 +20,7 @@ #include <string.h> #define COBJMACROS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" @@ -29,8 +30,11 @@ #include "oledb.h" #include "oledberr.h" #include "msdasc.h" +#include "prsht.h" +#include "commctrl.h" #include "oledb_private.h" +#include "resource.h" #include "wine/debug.h" #include "wine/heap.h" @@ -188,13 +192,134 @@ static HRESULT WINAPI dslocator_put_hWnd(IDataSourceLocator *iface, COMPATIBLE_L return S_OK; } -static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch **ppADOConnection) +static void create_connections_columns(HWND lv) { - DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); + RECT rc; + WCHAR buf[256]; + LVCOLUMNW column; + + SendMessageW(lv, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); + GetWindowRect(lv, &rc); + LoadStringW(instance, IDS_COL_PROVIDER, buf, ARRAY_SIZE(buf)); + column.mask = LVCF_WIDTH | LVCF_TEXT; + column.cx = (rc.right - rc.left) - 5; + column.pszText = buf; + SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); +} + +static void add_connectons_providers(HWND lv) +{ + static const WCHAR oledbprov[] = {'\\','O','L','E',' ','D','B',' ','P','r','o','v','i','d','e','r',0}; + LONG res; + HKEY key = NULL, subkey; + DWORD index = 0; + LONG next_key; + WCHAR provider[MAX_PATH]; + WCHAR guidkey[MAX_PATH]; + LONG size; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_READ, &key); + if (res == ERROR_FILE_NOT_FOUND) + return; + + next_key = RegEnumKeyW(key, index, provider, MAX_PATH); + while (next_key == ERROR_SUCCESS) + { + WCHAR description[MAX_PATH]; + + lstrcpyW(guidkey, provider); + lstrcatW(guidkey, oledbprov); + + res = RegOpenKeyW(key, guidkey, &subkey); + if (res == ERROR_SUCCESS) + { + TRACE("Found %s\n", debugstr_w(guidkey)); + + size = MAX_PATH; + res = RegQueryValueW(subkey, NULL, description, &size); + if (res == ERROR_SUCCESS) + { + LVITEMW item; + item.mask = LVIF_TEXT; + item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); + item.iSubItem = 0; + item.pszText = description; + SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); + /* TODO - Add ProgID to item data */ + } + RegCloseKey(subkey); + } + + index++; + next_key = RegEnumKeyW(key, index, provider, MAX_PATH); + } - FIXME("(%p)->(%p)\n",This, ppADOConnection); + RegCloseKey(key); +} - return E_NOTIMPL; +static LRESULT CALLBACK data_link_properties_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 btn, lv = GetDlgItem(hwnd, IDC_LST_CONNECTIONS); + create_connections_columns(lv); + add_connectons_providers(lv); + + btn = GetDlgItem(GetParent(hwnd), IDOK); + EnableWindow(btn, FALSE); + + break; + } + case WM_COMMAND: + { + if (LOWORD(wp) == IDC_BTN_NEXT) + { + /* TODO: Implement Connection dialog */ + MessageBoxA(hwnd, "Not implemented yet.", "Error", MB_OK | MB_ICONEXCLAMATION); + } + break; + } + default: + break; + } + return 0; +} + +static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch **connection) +{ + DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); + PROPSHEETHEADERW hdr; + PROPSHEETPAGEW page; + INT_PTR ret; + + FIXME("(%p, %p) Semi-stub\n", iface, connection); + + if(!connection) + return E_INVALIDARG; + + *connection = NULL; + + memset(&page, 0, sizeof(PROPSHEETPAGEW)); + page.dwSize = sizeof(page); + page.hInstance = instance; + page.u.pszTemplate = MAKEINTRESOURCEW(IDD_PROVIDER); + page.pfnDlgProc = data_link_properties_dlg_proc; + + memset(&hdr, 0, sizeof(hdr)); + hdr.dwSize = sizeof(hdr); + hdr.hwndParent = This->hwnd; + hdr.dwFlags = PSH_NOAPPLYNOW | PSH_PROPSHEETPAGE; + hdr.hInstance = instance; + hdr.pszCaption = MAKEINTRESOURCEW(IDS_PROPSHEET_TITLE); + hdr.u3.ppsp = &page; + hdr.nPages = 1; + ret = PropertySheetW(&hdr); + + return ret ? S_OK : S_FALSE; } static HRESULT WINAPI dslocator_PromptEdit(IDataSourceLocator *iface, IDispatch **ppADOConnection, VARIANT_BOOL *success) diff --git a/dlls/oledb32/main.c b/dlls/oledb32/main.c index f28e57a3f3..9c8c7f231b 100644 --- a/dlls/oledb32/main.c +++ b/dlls/oledb32/main.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); -static HINSTANCE instance; +HINSTANCE instance; DEFINE_GUID(CSLID_MSDAER, 0xc8b522cf,0x5cf3,0x11ce,0xad,0xe5,0x00,0xaa,0x00,0x44,0x77,0x3d); diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index 4e285b5460..fee0318de1 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -26,6 +26,8 @@ HRESULT create_dslocator(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID riid, IUnknown **datasource) DECLSPEC_HIDDEN; +extern HINSTANCE instance; + static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); diff --git a/dlls/oledb32/resource.h b/dlls/oledb32/resource.h new file mode 100644 index 0000000000..df88a10829 --- /dev/null +++ b/dlls/oledb32/resource.h @@ -0,0 +1,24 @@ +/* + * Copyright 2019 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 + */ + +#define IDD_PROVIDER 1000 +#define IDC_BTN_NEXT 1001 +#define IDC_LST_CONNECTIONS 1002 + +#define IDS_PROPSHEET_TITLE 2000 +#define IDS_COL_PROVIDER 2001 diff --git a/dlls/oledb32/version.rc b/dlls/oledb32/version.rc index e082acccae..23bbee543d 100644 --- a/dlls/oledb32/version.rc +++ b/dlls/oledb32/version.rc @@ -15,6 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep po + +#include "resource.h" #define WINE_FILEDESCRIPTION_STR "Wine oledb" #define WINE_FILENAME_STR "oledb32.dll" @@ -24,3 +27,21 @@ #define WINE_PRODUCTVERSION_STR "2.81.1117.0" #include "wine/wine_common_ver.rc" + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_PROPSHEET_TITLE "Data Link Properties" + IDS_COL_PROVIDER "OLE DB Provider(s)" +} + +IDD_PROVIDER DIALOG 0, 0, 227, 225 +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Provider" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Select the data you want to connect to:",-1,8,7,206,8 + CONTROL "List1",IDC_LST_CONNECTIONS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,14,20,206,162 + PUSHBUTTON "&Next >>",IDC_BTN_NEXT,170,194,50,14 +END -- 2.17.1

1 0

[PATCH] msado15: Add missing interfaces in _Connection QueryInterface
by Alistair Leslie-Hughes 08 Dec '19

08 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index ef589ecb7d..caca81daa8 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -66,8 +66,13 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid { TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); - if (IsEqualGUID( riid, &IID__Connection ) || IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IUnknown )) + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID__ADO) || + IsEqualIID(riid, &IID_Recordset15) || + IsEqualIID(riid, &IID_Recordset20) || + IsEqualIID(riid, &IID_Recordset21) || + IsEqualIID(riid, &IID__Recordset)) { *obj = iface; } -- 2.17.1

1 1

[PATCH v3] msxml3: all string passed to IXMLDOMDocument_load() need to be URL-unescaped
by Damjan Jovanovic 08 Dec '19

08 Dec '19

msxml3 allows URL escape sequences even for C:\ style paths. eg. C:\Program%20Files\... Try 3 preserves my tests from try 2, while using a simpler patch to bsc.c written by Nikolay Sivov and tested by me. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48242 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/msxml3/bsc.c | 10 +++++++--- dlls/msxml3/tests/domdoc.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-)

2 1

[PATCH 3/3] dmime/tests: Add segment GetParam/SetParam tests
by Michael Stefaniuc 08 Dec '19

08 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/dmime.c | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 2e0626cde4..5bb3a8b5b3 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -630,6 +630,47 @@ static void test_gettrack(void) IDirectMusicSegment8_Release(seg); } +static void test_segment_param(void) +{ + IDirectMusicSegment8 *seg; + char buf[64]; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSegment8, (void **)&seg); + ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + + add_track(seg, LyricsTrack, 0x1); /* no params */ + add_track(seg, SegmentTriggerTrack, 0x1); /* all params "supported" */ + + hr = IDirectMusicSegment8_GetParam(seg, NULL, 0x1, 0, 0, NULL, buf); + ok(hr == E_POINTER, "GetParam failed: %08x, expected E_POINTER\n", hr); + hr = IDirectMusicSegment8_SetParam(seg, NULL, 0x1, 0, 0, buf); + todo_wine ok(hr == E_POINTER, "SetParam failed: %08x, expected E_POINTER\n", hr); + + hr = IDirectMusicSegment8_GetParam(seg, &GUID_Valid_Start_Time, 0x1, 0, 0, NULL, buf); + ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", hr); + hr = IDirectMusicSegment8_GetParam(seg, &GUID_Valid_Start_Time, 0x1, 1, 0, NULL, buf); + ok(hr == DMUS_E_TRACK_NOT_FOUND, + "GetParam failed: %08x, expected DMUS_E_TRACK_NOT_FOUND\n", hr); + hr = IDirectMusicSegment8_GetParam(seg, &GUID_Valid_Start_Time, 0x1, DMUS_SEG_ANYTRACK, 0, + NULL, buf); + ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", hr); + + hr = IDirectMusicSegment8_SetParam(seg, &GUID_Valid_Start_Time, 0x1, 0, 0, buf); + ok(hr == S_OK, "SetParam failed: %08x, expected S_OK\n", hr); + hr = IDirectMusicSegment8_SetParam(seg, &GUID_Valid_Start_Time, 0x1, 1, 0, buf); + todo_wine ok(hr == DMUS_E_TRACK_NOT_FOUND, + "SetParam failed: %08x, expected DMUS_E_TRACK_NOT_FOUND\n", hr); + hr = IDirectMusicSegment8_SetParam(seg, &GUID_Valid_Start_Time, 0x1, DMUS_SEG_ALLTRACKS, + 0, buf); + ok(hr == S_OK, "SetParam failed: %08x, expected S_OK\n", hr); + + IDirectMusicSegment8_Release(seg); +} + static void expect_getparam(IDirectMusicTrack *track, REFGUID type, const char *name, HRESULT expect) { @@ -1117,6 +1158,7 @@ START_TEST(dmime) test_graph(); test_segment(); test_gettrack(); + test_segment_param(); test_track(); test_parsedescriptor(); -- 2.23.0

1 0

[PATCH 2/3] dmime: Fix index handling in segment GetParam()
by Michael Stefaniuc 08 Dec '19

08 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Fixes the last infinite loop in PlayMotif.exe and lets it start. dlls/dmime/segment.c | 55 +++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 34 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 5284ac5fec..b6357b6f5f 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -368,49 +368,36 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_RemoveNotificationType(IDirectMus return S_OK; } -static HRESULT WINAPI IDirectMusicSegment8Impl_GetParam(IDirectMusicSegment8 *iface, - REFGUID type, DWORD group, DWORD index, MUSIC_TIME time, MUSIC_TIME *next, - void *param) +static HRESULT WINAPI IDirectMusicSegment8Impl_GetParam(IDirectMusicSegment8 *iface, REFGUID type, + DWORD group, DWORD index, MUSIC_TIME time, MUSIC_TIME *next, void *param) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - struct list *item; IDirectMusicTrack *track; - DMUS_PRIVATE_SEGMENT_TRACK *segment; - HRESULT hr; - - FIXME("(%p, %s, 0x%x, %d, %d, %p, %p) Semi-stub\n", This, debugstr_dmguid(type), group, - index, time, next, param); - - if (index == DMUS_SEG_ANYTRACK || group == 0xffffffff) { - if (group == 0xffffffff && index != DMUS_SEG_ANYTRACK) - WARN("Any group doesnt have DMUS_SEG_ANYTRACK index.\n"); + unsigned int i, count; + HRESULT hr = DMUS_E_TRACK_NOT_FOUND; - LIST_FOR_EACH (item, &This->Tracks) { - segment = LIST_ENTRY(item, DMUS_PRIVATE_SEGMENT_TRACK, entry); + TRACE("(%p, %s, %#x, %u, %d, %p, %p)\n", This, debugstr_dmguid(type), group, index, time, + next, param); - TRACE(" - %p -> 0x%x,%p\n", segment, segment->dwGroupBits, segment->pTrack); - - if (group != 0xffffffff && !(segment->dwGroupBits & group)) - continue; - if (FAILED(IDirectMusicTrack_IsParamSupported(segment->pTrack, type))) - continue; - hr = IDirectMusicTrack_GetParam(segment->pTrack, type, time, next, param); - if (SUCCEEDED(hr)) - return hr; - } + if (!type) + return E_POINTER; - WARN("(%p): not found\n", This); - return DMUS_E_TRACK_NOT_FOUND; - } + /* Index is relative to the search pattern: group bits and supported param type */ + for (i = 0, count = 0; i < DMUS_SEG_ANYTRACK && count <= index; i++) { + if (FAILED(IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, group, i, &track))) + break; + if (FAILED(IDirectMusicTrack_IsParamSupported(track, type))) + continue; + if (index == count || index == DMUS_SEG_ANYTRACK) + hr = IDirectMusicTrack_GetParam(track, type, time, next, param); + IDirectMusicTrack_Release(track); - hr = IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, group, index, &track); - if (FAILED(hr)) { - ERR("(%p): not found\n", This); - return DMUS_E_TRACK_NOT_FOUND; + if (SUCCEEDED(hr)) + return hr; + count++; } - hr = IDirectMusicTrack_GetParam(track, type, time, next, param); - IDirectMusicTrack_Release(track); + TRACE("(%p): not found\n", This); return hr; } -- 2.23.0

1 0

[PATCH 1/3] dmime/tests: Add more GetTrack() tests
by Michael Stefaniuc 08 Dec '19

08 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/dmime.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index e8fa6a596d..2e0626cde4 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -543,14 +543,17 @@ static void _add_track(IDirectMusicSegment8 *seg, REFCLSID class, const char *na #define add_track(seg, class, group) _add_track(seg, &CLSID_DirectMusic ## class, #class, group) static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char *name, DWORD group, - DWORD index) + DWORD index, BOOL ignore_guid) { IDirectMusicTrack *track; IPersistStream *ps; CLSID class; HRESULT hr; - hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, group, index, &track); + if (ignore_guid) + hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, group, index, &track); + else + hr = IDirectMusicSegment8_GetTrack(seg, expect, group, index, &track); if (!expect) { ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); return; @@ -568,9 +571,12 @@ static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char IDirectMusicTrack_Release(track); } -#define expect_track(seg, class, group, index) _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index) +#define expect_track(seg, class, group, index) \ + _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index, TRUE) +#define expect_guid_track(seg, class, group, index) \ + _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index, FALSE) -static void test_track_identify(void) +static void test_gettrack(void) { IDirectMusicSegment8 *seg; IDirectMusicTrack *track; @@ -586,7 +592,9 @@ static void test_track_identify(void) add_track(seg, SegmentTriggerTrack, 0x2); /* idx 1 group 2 */ add_track(seg, SeqTrack, 0x1); /* idx 2 group 1 */ add_track(seg, TempoTrack, 0x7); /* idx 3 group 1, idx 2 group 2, idx 0 group 3 */ + add_track(seg, WaveTrack, 0xffffffff); /* idx 4 group 1, idx 3 group 2, idx 1 group 3 */ + /* Ignore GUID in GetTrack */ hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, 0, 0, &track); ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); @@ -594,12 +602,30 @@ static void test_track_identify(void) expect_track(seg, ParamControlTrack, 0x1, 1); expect_track(seg, SeqTrack, 0x1, 2); expect_track(seg, TempoTrack, 0x1, 3); - _expect_track(seg, NULL, "", 0x1, 4); + expect_track(seg, WaveTrack, 0x1, 4); + _expect_track(seg, NULL, "", 0x1, 5, TRUE); + _expect_track(seg, NULL, "", 0x1, DMUS_SEG_ANYTRACK, TRUE); expect_track(seg, ParamControlTrack, 0x2, 0); + expect_track(seg, WaveTrack, 0x80000000, 0); expect_track(seg, SegmentTriggerTrack, 0x3, 2); /* groups 1+2 combined index */ expect_track(seg, SeqTrack, 0x3, 3); /* groups 1+2 combined index */ expect_track(seg, TempoTrack, 0x7, 4); /* groups 1+2+3 combined index */ expect_track(seg, TempoTrack, 0xffffffff, 4); /* all groups combined index */ + _expect_track(seg, NULL, "", 0xffffffff, DMUS_SEG_ANYTRACK, TRUE); + + /* Use the GUID in GetTrack */ + hr = IDirectMusicSegment8_GetTrack(seg, &CLSID_DirectMusicLyricsTrack, 0, 0, &track); + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + + expect_guid_track(seg, LyricsTrack, 0x1, 0); + expect_guid_track(seg, ParamControlTrack, 0x1, 0); + expect_guid_track(seg, SeqTrack, 0x1, 0); + expect_guid_track(seg, TempoTrack, 0x1, 0); + expect_guid_track(seg, ParamControlTrack, 0x2, 0); + expect_guid_track(seg, SegmentTriggerTrack, 0x3, 0); + expect_guid_track(seg, SeqTrack, 0x3, 0); + expect_guid_track(seg, TempoTrack, 0x7, 0); + expect_guid_track(seg, TempoTrack, 0xffffffff, 0); IDirectMusicSegment8_Release(seg); } @@ -1090,7 +1116,7 @@ START_TEST(dmime) test_audiopathconfig(); test_graph(); test_segment(); - test_track_identify(); + test_gettrack(); test_track(); test_parsedescriptor(); -- 2.23.0

1 0

[PATCH v2] msxml3: all string passed to IXMLDOMDocument_load() need to be URL-unescaped
by Damjan Jovanovic 08 Dec '19

08 Dec '19

msxml3 allows URL escape sequences even for C:\ style paths. eg. C:\Program%20Files\... Try 2 determines URL length dynamically, suppresses some compiler const warnings, and cleans up tests. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/msxml3/bsc.c | 33 ++++++++++++++++++++++++++++----- dlls/msxml3/tests/domdoc.c | 17 +++++++++++++++++ 2 files changed, 45 insertions(+), 5 deletions(-)

2 4

[PATCH] include: update thumbcache.idl file
by Biswapriyo Nath 08 Dec '19

08 Dec '19

2 2

[PATCH v2 1/8] wineqtdecoder: Fix some copy-paste errors.
by Zebediah Figura 08 Dec '19

08 Dec '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wineqtdecoder/qtsplitter.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 5b1e82ebc9b..0dbc3d8bf19 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -285,7 +285,7 @@ static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE QTSplitter *filter = impl_from_strmbase_filter(iface); HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr; - EnterCriticalSection(&This->csReceive); + EnterCriticalSection(&filter->csReceive); if (filter->pVideo_Pin) pin_hr = BaseOutputPinImpl_Active(&filter->pVideo_Pin->pin); @@ -297,7 +297,7 @@ static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE hr = pin_hr; SetEvent(filter->runEvent); - LeaveCriticalSection(&This->csReceive); + LeaveCriticalSection(&filter->csReceive); return hr; } @@ -306,10 +306,10 @@ static HRESULT qt_splitter_cleanup_stream(struct strmbase_filter *iface) { QTSplitter *filter = impl_from_strmbase_filter(iface); - EnterCriticalSection(&This->csReceive); + EnterCriticalSection(&filter->csReceive); IAsyncReader_BeginFlush(filter->pInputPin.pReader); IAsyncReader_EndFlush(filter->pInputPin.pReader); - LeaveCriticalSection(&This->csReceive); + LeaveCriticalSection(&filter->csReceive); return S_OK; } -- 2.24.0

1 7

[PATCH v2 1/2] kernel32/tests: Trace the mapped string when FoldStringW fails.
by Mathew Hodson 08 Dec '19

08 Dec '19

Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> --- dlls/kernel32/tests/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index e43eee2..9328666 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3585,7 +3585,7 @@ static void test_FoldStringW(void) ok(ret == ARRAY_SIZE(foldczone_dst), "Got %d, error %d\n", ret, GetLastError()); ok(!memcmp(dst, foldczone_dst, sizeof(foldczone_dst)) || broken(!memcmp(dst, foldczone_broken_dst, sizeof(foldczone_broken_dst))), - "MAP_FOLDCZONE: Expanded incorrectly\n"); + "Got unexpected string %s.\n", wine_dbgstr_w(dst)); /* MAP_EXPAND_LIGATURES */ SetLastError(0); @@ -3594,7 +3594,7 @@ static void test_FoldStringW(void) if (!(ret == 0 && GetLastError() == ERROR_INVALID_FLAGS)) { ok(ret == ARRAY_SIZE(ligatures_dst), "Got %d, error %d\n", ret, GetLastError()); ok(!memcmp(dst, ligatures_dst, sizeof(ligatures_dst)), - "MAP_EXPAND_LIGATURES: Expanded incorrectly\n"); + "Got unexpected string %s.\n", wine_dbgstr_w(dst)); } /* FIXME: MAP_PRECOMPOSED : MAP_COMPOSITE */ -- 2.7.4

2 3

[PATCH 2/2] kernel32/tests: Add broken result for Windows XP and 2003.
by Mathew Hodson 08 Dec '19

08 Dec '19

Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> --- dlls/kernel32/tests/locale.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9328666..c8cc904 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3439,7 +3439,7 @@ static void test_FoldStringW(void) }; static const WCHAR foldczone_broken_dst[] = { - 'W','i','n','e',0x0348,0x0551,0x1323,0x280d,'W','i','n','e',0x3cb,0x1f0,0xa0,0xaa,0 + 'W','i','n','e',0x0348,0x0551,0x1323,0x280d,'W','i','n','e',0x03c5,0x0308,'j',0x030c,0x00a0,0x00aa,0 }; static const WCHAR ligatures_src[] = { @@ -3582,9 +3582,11 @@ static void test_FoldStringW(void) /* MAP_FOLDCZONE */ SetLastError(0); ret = pFoldStringW(MAP_FOLDCZONE, foldczone_src, -1, dst, 256); - ok(ret == ARRAY_SIZE(foldczone_dst), "Got %d, error %d\n", ret, GetLastError()); + ok(ret == ARRAY_SIZE(foldczone_dst) + || broken(ret == ARRAY_SIZE(foldczone_broken_dst)), /* winxp, win2003 */ + "Got %d, error %d.\n", ret, GetLastError()); ok(!memcmp(dst, foldczone_dst, sizeof(foldczone_dst)) - || broken(!memcmp(dst, foldczone_broken_dst, sizeof(foldczone_broken_dst))), + || broken(!memcmp(dst, foldczone_broken_dst, sizeof(foldczone_broken_dst))), /* winxp, win2003 */ "Got unexpected string %s.\n", wine_dbgstr_w(dst)); /* MAP_EXPAND_LIGATURES */ -- 2.7.4

1 0

[PATCH v2] ieframe: implement COM aggregation in WebBrowser
by Damjan Jovanovic 07 Dec '19

07 Dec '19

Wine's WebBrowser currently just ignores the "outer" it is passed. Support COM aggregation like Windows does instead. Try 2 renames the internal IUnknown functions, uses the hlink_frame to store the outer, and beefs up the unit tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12406 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ieframe/classinfo.c | 6 +- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/oleobject.c | 30 +-- dlls/ieframe/persist.c | 18 +- dlls/ieframe/tests/webbrowser.c | 60 ++++++ dlls/ieframe/view.c | 12 +- dlls/ieframe/webbrowser.c | 325 ++++++++++++++++++-------------- 7 files changed, 277 insertions(+), 175 deletions(-)

2 1

I posted another fix for a Bugzilla bug.
by Thales 07 Dec '19

07 Dec '19

Hello, I've been working on the Bugzilla problem #47641, "Treeview Expand using option TVE_COLLAPSE|TVE_COLLAPSERESET causes crash" https://bugs.winehq.org/show_bug.cgi?id=47641 I applied the patch supplied there that was created by Alistair Leslie-Hughes. I came up with a fix that works as far as I can tell. I explain what I did at the Bugzilla link. I've posted the patch fix to this list under the title: "[PATCH] comctl32: Fix Treeview Expand using TVE_COLLAPSE|TVE_COLLAPSERESET" Thanks!...John Alway

1 0

[PATCH] comctl32: Fix Treeview Expand using TVE_COLLAPSE|TVE_COLLAPSERESET
by Thales 07 Dec '19

07 Dec '19

1 0

Re: [wine-devel] Wine staging 4.21 release
by Alan W. Irwin 07 Dec '19

07 Dec '19

On 2019-11-30 04:56-0000 Alistair Leslie-Hughes wrote: > Binary packages for various distributions will be available from: > https://www.winehq.org/download > > Summary since last release > * Rebased to current wine 4.21 (833 patches are applied to wine vanilla) > > Upstreamed (Either directly from staging or fixed with a similar patch). > * none > > Added: > * [47668] kernelbase: Improve stub for ReOpenFile and add small test > * [48138] League of Legends 9.23: Crash after champ select > * [47970] Legends of Runeterra crashes at launch > * [40334] AION - Wine /Unhandled exception: page fault on read access to > 0x00000000 in 64-bit code (0x0000000000000000). > * [48175] AION (64 bit) - crashes in crysystem.dll.CryFree() due to high > memory pointers allocated > * [46568] 64-bit msxml6.dll from Microsoft Core XML Services 6.0 redist > package fails to load (Wine doesn't respect 44-bit user-mode VA > limitation from Windows < 8.1) > > Updated: > * d3d9-Direct3DShaderValidatorCreate9 > * winecfg-Staging [...] Hi Alistair: Could you explain how these patch numbers in your report are related with each other? For example, my initial assumption was the rebased patch number should be equal to the corresponding number in the last report plus the added patches in this report less the upstreamed patches in this report, i.e., r = r_old + a - u where r and r_old are the current and last reported rebased patch numbers and a and u are the current added and upstreamed patch numbers. But looking at the last several reports that formula predicts incorrect results with the rebased patch number changing in what looks like a completely arbitrary way from report to report compared to the prediction. So it appears the above formula is incorrect and/or incomplete. Could you let me know what the correct formula is for predicting the rebased patch number from report to report (which helps to evaluate the reliability of the staging patch number statistics that you present), and if that formula depends on information (my guess is it is the number of patches in staging that have just been deleted by the staging maintainers because they judge those patches to not be worthwhile) that you currently do not include in your reports, could you include that important information in your following reports? TIA. Alan __________________________ Alan W. Irwin Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net); the Time Ephemerides project (timeephem.sf.net); PLplot scientific plotting software package (plplot.org); the libLASi project (unifont.org/lasi); the Loads of Linux Links project (loll.sf.net); and the Linux Brochure Project (lbproject.sf.net). __________________________ Linux-powered Science __________________________

5 9

Winter is coming
by Alexandre Julliard 07 Dec '19

07 Dec '19

Folks, As you are probably aware, we are now entering the code freeze season. The plan is to start the code freeze after the next release, i.e. one week from today. So if there are things you want to see in Wine 5.0, now is the last moment to submit them... -- Alexandre Julliard julliard(a)winehq.org

2 1

[PATCH vkd3d v4] Support RS 1.0 VOLATILE descriptors
by Sveinar Søpler 07 Dec '19

07 Dec '19

This fixes bug: https://bugs.winehq.org/show_bug.cgi?id=46410 v4: Rebase and resubmit patch. Original commit message: From: post(a)arntzen-software.no Use EXT_descriptor_indexing's UPDATE_AFTER_BIND feature to support semantics required by RS 1.0 VOLATILE descriptors. We implement this by deferring all updates of desciptor sets until Submit time. This is fine, as command buffers cannot be executed simultaneously on D3D12, so at Submit time, we know that the command buffer is not being executed on the GPU, and updating descriptors for multiple submissions is correct. If EXT_descriptor_indexing is not available, the fallback is the older method, which matches RS 1.1 STATIC descriptor model. Signed-off-by: Sveinar Søpler <cybermax(a)dexter.no>

1 0

[PATCH vkd3d v4] Allocate one large buffer for a heap and offset into it.
by Hans-Kristian Arntzen 07 Dec '19

07 Dec '19

Greatly reduce VA allocations we have to make and makes returned VA more sensible, and better matches returned VAs we see on native drivers. D3D12 usage flags for buffers seem generic enough that there is no obvious benefit to place smaller VkBuffers on top of VkDeviceMemory. Ideally, physical_buffer_address is used here, but this works as a good fallback if that path is added later. With this patch and previous VA optimization, I'm observing a 2.0-2.5% FPS uplift on SOTTR when CPU bound. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> --- libs/vkd3d/command.c | 14 ++-- libs/vkd3d/resource.c | 133 ++++++++++++++++++++++++++++++++----- libs/vkd3d/vkd3d_private.h | 2 + 3 files changed, 128 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 8a7ff66..8bff7ea 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3081,8 +3081,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyBufferRegion(ID3D12Graphics d3d12_command_list_end_current_render_pass(list); - buffer_copy.srcOffset = src_offset; - buffer_copy.dstOffset = dst_offset; + buffer_copy.srcOffset = src_offset + src_resource->heap_offset; + buffer_copy.dstOffset = dst_offset + dst_resource->heap_offset; buffer_copy.size = byte_count; VK_CALL(vkCmdCopyBuffer(list->vk_command_buffer, @@ -3395,6 +3395,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic vk_image_buffer_copy_from_d3d12(&buffer_image_copy, &dst->u.PlacedFootprint, src->u.SubresourceIndex, &src_resource->desc, dst_format, src_box, dst_x, dst_y, dst_z); + buffer_image_copy.bufferOffset += dst_resource->heap_offset; VK_CALL(vkCmdCopyImageToBuffer(list->vk_command_buffer, src_resource->u.vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_resource->u.vk_buffer, 1, &buffer_image_copy)); @@ -3424,6 +3425,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic vk_buffer_image_copy_from_d3d12(&buffer_image_copy, &src->u.PlacedFootprint, dst->u.SubresourceIndex, &dst_resource->desc, src_format, src_box, dst_x, dst_y, dst_z); + buffer_image_copy.bufferOffset += src_resource->heap_offset; VK_CALL(vkCmdCopyBufferToImage(list->vk_command_buffer, src_resource->u.vk_buffer, dst_resource->u.vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &buffer_image_copy)); @@ -3504,8 +3506,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm assert(d3d12_resource_is_buffer(src_resource)); assert(src_resource->desc.Width == dst_resource->desc.Width); - vk_buffer_copy.srcOffset = 0; - vk_buffer_copy.dstOffset = 0; + vk_buffer_copy.srcOffset = src_resource->heap_offset; + vk_buffer_copy.dstOffset = dst_resource->heap_offset; vk_buffer_copy.size = dst_resource->desc.Width; VK_CALL(vkCmdCopyBuffer(list->vk_command_buffer, src_resource->u.vk_buffer, dst_resource->u.vk_buffer, 1, &vk_buffer_copy)); @@ -3962,8 +3964,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.buffer = resource->u.vk_buffer; - vk_barrier.offset = 0; - vk_barrier.size = VK_WHOLE_SIZE; + vk_barrier.offset = resource->heap_offset; + vk_barrier.size = resource->desc.Width; VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, src_stage_mask, dst_stage_mask, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f40d986..ed2b18f 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -315,6 +315,8 @@ static ULONG STDMETHODCALLTYPE d3d12_heap_AddRef(ID3D12Heap *iface) return refcount; } +static ULONG d3d12_resource_decref(struct d3d12_resource *resource); + static void d3d12_heap_destroy(struct d3d12_heap *heap) { struct d3d12_device *device = heap->device; @@ -322,6 +324,9 @@ static void d3d12_heap_destroy(struct d3d12_heap *heap) TRACE("Destroying heap %p.\n", heap); + if (heap->buffer_resource) + d3d12_resource_decref(heap->buffer_resource); + vkd3d_private_store_destroy(&heap->private_store); VK_CALL(vkFreeMemory(device->vk_device, heap->vk_memory, NULL)); @@ -562,6 +567,12 @@ static HRESULT validate_heap_desc(const D3D12_HEAP_DESC *desc, const struct d3d1 return S_OK; } +static HRESULT d3d12_resource_create(struct d3d12_device *device, + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, + const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, + const D3D12_CLEAR_VALUE *optimized_clear_value, bool placed, + struct d3d12_resource **resource); + static HRESULT d3d12_heap_init(struct d3d12_heap *heap, struct d3d12_device *device, const D3D12_HEAP_DESC *desc, const struct d3d12_resource *resource) { @@ -569,6 +580,9 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, VkDeviceSize vk_memory_size; HRESULT hr; int rc; + bool buffers_allowed; + D3D12_RESOURCE_DESC resource_desc; + D3D12_RESOURCE_STATES initial_resource_state; heap->ID3D12Heap_iface.lpVtbl = &d3d12_heap_vtbl; heap->refcount = 1; @@ -579,6 +593,7 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, heap->map_ptr = NULL; heap->map_count = 0; + heap->buffer_resource = NULL; if (!heap->desc.Properties.CreationNodeMask) heap->desc.Properties.CreationNodeMask = 1; @@ -606,6 +621,53 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, return hr; } + buffers_allowed = !(heap->desc.Flags & D3D12_HEAP_FLAG_DENY_BUFFERS); + if (buffers_allowed && !resource) + { + /* Create a single omnipotent buffer which fills the entire heap. + * Whenever we place buffer resources on this heap, we'll just offset this VkBuffer. + * This allows us to keep VA space somewhat sane, and keeps number of (limited) VA allocations down. + * One possible downside is that the buffer might be slightly slower to access, + * but D3D12 has very lenient usage flags for buffers. */ + + memset(&resource_desc, 0, sizeof(resource_desc)); + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + resource_desc.Width = desc->SizeInBytes; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.SampleDesc.Count = 1; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + + switch (desc->Properties.Type) + { + case D3D12_HEAP_TYPE_UPLOAD: + initial_resource_state = D3D12_RESOURCE_STATE_GENERIC_READ; + break; + + case D3D12_HEAP_TYPE_READBACK: + initial_resource_state = D3D12_RESOURCE_STATE_COPY_DEST; + break; + + default: + /* Upload and readback heaps do not allow UAV access, only enable this flag for other heaps. */ + resource_desc.Flags |= D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS; + initial_resource_state = D3D12_RESOURCE_STATE_COMMON; + break; + } + + if (FAILED(hr = d3d12_resource_create(device, &desc->Properties, desc->Flags, + &resource_desc, initial_resource_state, + NULL, false, &heap->buffer_resource))) + { + heap->buffer_resource = NULL; + return hr; + } + /* This internal resource should not own a reference on the device. + * d3d12_resource_create takes a reference on the device. */ + d3d12_device_release(device); + } + if (resource) { if (d3d12_resource_is_buffer(resource)) @@ -623,8 +685,16 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, heap->desc.SizeInBytes = vk_memory_size; } + else if (heap->buffer_resource) + { + hr = vkd3d_allocate_buffer_memory(device, heap->buffer_resource->u.vk_buffer, + &heap->desc.Properties, heap->desc.Flags, + &heap->vk_memory, &heap->vk_memory_type, &vk_memory_size); + } else { + /* Allocate generic memory which should hopefully match up with whatever resources + * we want to place here. */ memory_requirements.size = heap->desc.SizeInBytes; memory_requirements.alignment = heap->desc.Alignment; memory_requirements.memoryTypeBits = ~(uint32_t)0; @@ -637,6 +707,11 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, { vkd3d_private_store_destroy(&heap->private_store); pthread_mutex_destroy(&heap->mutex); + if (heap->buffer_resource) + { + d3d12_resource_decref(heap->buffer_resource); + heap->buffer_resource = NULL; + } return hr; } @@ -1030,13 +1105,16 @@ static void d3d12_resource_destroy(struct d3d12_resource *resource, struct d3d12 if (resource->flags & VKD3D_RESOURCE_EXTERNAL) return; - if (resource->gpu_address) - vkd3d_gpu_va_allocator_free(&device->gpu_va_allocator, resource->gpu_address); + if (!(resource->flags & VKD3D_RESOURCE_PLACED_BUFFER)) + { + if (resource->gpu_address) + vkd3d_gpu_va_allocator_free(&device->gpu_va_allocator, resource->gpu_address); - if (d3d12_resource_is_buffer(resource)) - VK_CALL(vkDestroyBuffer(device->vk_device, resource->u.vk_buffer, NULL)); - else - VK_CALL(vkDestroyImage(device->vk_device, resource->u.vk_image, NULL)); + if (d3d12_resource_is_buffer(resource)) + VK_CALL(vkDestroyBuffer(device->vk_device, resource->u.vk_buffer, NULL)); + else + VK_CALL(vkDestroyImage(device->vk_device, resource->u.vk_image, NULL)); + } if (resource->flags & VKD3D_RESOURCE_DEDICATED_HEAP) d3d12_heap_destroy(resource->heap); @@ -1738,7 +1816,7 @@ static bool d3d12_resource_validate_heap_properties(const struct d3d12_resource static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value) + const D3D12_CLEAR_VALUE *optimized_clear_value, bool placed) { HRESULT hr; @@ -1768,6 +1846,8 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->gpu_address = 0; resource->flags = 0; + if (placed && d3d12_resource_is_buffer(resource)) + resource->flags |= VKD3D_RESOURCE_PLACED_BUFFER; if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc, device))) return hr; @@ -1775,6 +1855,13 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 switch (desc->Dimension) { case D3D12_RESOURCE_DIMENSION_BUFFER: + /* We'll inherit a VkBuffer reference from the heap with an implied offset. */ + if (placed) + { + resource->u.vk_buffer = VK_NULL_HANDLE; + break; + } + if (FAILED(hr = vkd3d_create_buffer(device, heap_properties, heap_flags, &resource->desc, &resource->u.vk_buffer))) return hr; @@ -1825,7 +1912,7 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 static HRESULT d3d12_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) + const D3D12_CLEAR_VALUE *optimized_clear_value, bool placed, struct d3d12_resource **resource) { struct d3d12_resource *object; HRESULT hr; @@ -1834,7 +1921,7 @@ static HRESULT d3d12_resource_create(struct d3d12_device *device, return E_OUTOFMEMORY; if (FAILED(hr = d3d12_resource_init(object, device, heap_properties, heap_flags, - desc, initial_state, optimized_clear_value))) + desc, initial_state, optimized_clear_value, placed))) { vkd3d_free(object); return hr; @@ -1876,7 +1963,7 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, } if (FAILED(hr = d3d12_resource_create(device, heap_properties, heap_flags, - desc, initial_state, optimized_clear_value, &object))) + desc, initial_state, optimized_clear_value, false, &object))) return hr; if (FAILED(hr = vkd3d_allocate_resource_memory(device, object, heap_properties, heap_flags))) @@ -1900,6 +1987,16 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, VkMemoryRequirements requirements; VkResult vr; + if (resource->flags & VKD3D_RESOURCE_PLACED_BUFFER) + { + /* Just inherit the buffer from the heap. */ + resource->u.vk_buffer = heap->buffer_resource->u.vk_buffer; + resource->heap = heap; + resource->heap_offset = heap_offset; + resource->gpu_address = heap->buffer_resource->gpu_address + heap_offset; + return S_OK; + } + if (d3d12_resource_is_buffer(resource)) VK_CALL(vkGetBufferMemoryRequirements(vk_device, resource->u.vk_buffer, &requirements)); else @@ -1949,7 +2046,7 @@ HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_h HRESULT hr; if (FAILED(hr = d3d12_resource_create(device, &heap->desc.Properties, heap->desc.Flags, - desc, initial_state, optimized_clear_value, &object))) + desc, initial_state, optimized_clear_value, true, &object))) return hr; if (FAILED(hr = vkd3d_bind_heap_memory(device, object, heap, heap_offset))) @@ -1973,7 +2070,7 @@ HRESULT d3d12_reserved_resource_create(struct d3d12_device *device, HRESULT hr; if (FAILED(hr = d3d12_resource_create(device, NULL, 0, - desc, initial_state, optimized_clear_value, &object))) + desc, initial_state, optimized_clear_value, false, &object))) return hr; TRACE("Created reserved resource %p.\n", object); @@ -2275,7 +2372,7 @@ static bool vkd3d_create_buffer_view_for_resource(struct d3d12_device *device, assert(d3d12_resource_is_buffer(resource)); return vkd3d_create_buffer_view(device, resource->u.vk_buffer, - format, offset * element_size, size * element_size, view); + format, resource->heap_offset + offset * element_size, size * element_size, view); } static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, @@ -2869,7 +2966,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); if (!vkd3d_create_vk_buffer_view(device, counter_resource->u.vk_buffer, format, - desc->u.Buffer.CounterOffsetInBytes, sizeof(uint32_t), &view->vk_counter_view)) + desc->u.Buffer.CounterOffsetInBytes + resource->heap_offset, sizeof(uint32_t), &view->vk_counter_view)) { WARN("Failed to create counter buffer view.\n"); view->vk_counter_view = VK_NULL_HANDLE; @@ -2960,12 +3057,18 @@ bool vkd3d_create_raw_buffer_view(struct d3d12_device *device, { const struct vkd3d_format *format; struct d3d12_resource *resource; + uint64_t range; + uint64_t offset; format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); resource = vkd3d_gpu_va_allocator_dereference(&device->gpu_va_allocator, gpu_address); assert(d3d12_resource_is_buffer(resource)); + + offset = gpu_address - resource->gpu_address; + range = min(resource->desc.Width - offset, device->vk_info.device_limits.maxStorageBufferRange); + return vkd3d_create_vk_buffer_view(device, resource->u.vk_buffer, format, - gpu_address - resource->gpu_address, VK_WHOLE_SIZE, vk_buffer_view); + offset, range, vk_buffer_view); } /* samplers */ diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 0c031d2..206e550 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -379,6 +379,7 @@ struct d3d12_heap unsigned int map_count; uint32_t vk_memory_type; + struct d3d12_resource *buffer_resource; struct d3d12_device *device; struct vkd3d_private_store private_store; @@ -393,6 +394,7 @@ struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface) DECLSPEC_HIDDE #define VKD3D_RESOURCE_EXTERNAL 0x00000004 #define VKD3D_RESOURCE_DEDICATED_HEAP 0x00000008 #define VKD3D_RESOURCE_LINEAR_TILING 0x00000010 +#define VKD3D_RESOURCE_PLACED_BUFFER 0x00000020 /* ID3D12Resource */ struct d3d12_resource -- 2.24.0

1 0

[PATCH] kernel32/tests: Trace the mapped string when FoldStringW fails.
by Mathew Hodson 07 Dec '19

07 Dec '19

Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> --- dlls/kernel32/tests/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index e43eee2..9328666 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3585,7 +3585,7 @@ static void test_FoldStringW(void) ok(ret == ARRAY_SIZE(foldczone_dst), "Got %d, error %d\n", ret, GetLastError()); ok(!memcmp(dst, foldczone_dst, sizeof(foldczone_dst)) || broken(!memcmp(dst, foldczone_broken_dst, sizeof(foldczone_broken_dst))), - "MAP_FOLDCZONE: Expanded incorrectly\n"); + "Got unexpected string %s.\n", wine_dbgstr_w(dst)); /* MAP_EXPAND_LIGATURES */ SetLastError(0); @@ -3594,7 +3594,7 @@ static void test_FoldStringW(void) if (!(ret == 0 && GetLastError() == ERROR_INVALID_FLAGS)) { ok(ret == ARRAY_SIZE(ligatures_dst), "Got %d, error %d\n", ret, GetLastError()); ok(!memcmp(dst, ligatures_dst, sizeof(ligatures_dst)), - "MAP_EXPAND_LIGATURES: Expanded incorrectly\n"); + "Got unexpected string %s.\n", wine_dbgstr_w(dst)); } /* FIXME: MAP_PRECOMPOSED : MAP_COMPOSITE */ -- 2.7.4

2 1

[PATCH 4/4] d3d8: Support texture dirty regions.
by Akihiro Sagawa 07 Dec '19

07 Dec '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/d3d8/tests/visual.c | 12 ++++++------ dlls/d3d8/texture.c | 12 +++++++++++- 2 files changed, 17 insertions(+), 7 deletions(-)

1 0

[PATCH 3/4] wined3d: Update a part of the texture if dirty regions is tracked.
by Akihiro Sagawa 07 Dec '19

07 Dec '19

Wine-Bugs: https://bugs.winehq.org/show_bug.cgi?id=35205 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/d3d9/tests/visual.c | 12 ++++++------ dlls/wined3d/device.c | 49 +++++++++++++++++++++++++++++++++++++++++------- dlls/wined3d/texture.c | 11 ++++------- 3 files changed, 52 insertions(+), 20 deletions(-)

1 0

[PATCH 2/4] wined3d: Record texture dirty regions.
by Akihiro Sagawa 07 Dec '19

07 Dec '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/wined3d/device.c | 2 ++ dlls/wined3d/texture.c | 66 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 3 ++ 3 files changed, 71 insertions(+)

1 0

[PATCH 1/4] wined3d: Add dirty region members for d3d9 textures.
by Akihiro Sagawa 07 Dec '19

07 Dec '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/d3d9/texture.c | 9 ++++++++- dlls/wined3d/texture.c | 13 +++++++++++++ dlls/wined3d/wined3d_private.h | 7 +++++++ include/wine/wined3d.h | 1 + 4 files changed, 29 insertions(+), 1 deletion(-)

1 0

[PATCH] wtsapi32: Make WTSRegisterSessionNotificationEx's return consistant with WTSRegisterSessionNotification.
by Patrick Hibbs 07 Dec '19

07 Dec '19

No point in these returning different values, considering one is a superset of the other. Fix as per Zebediah Figura's bug comment (#12). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47433 Signed-off-by: Patrick Hibbs <hibbsncc1701(a)gmail.com> --- dlls/wtsapi32/wtsapi32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index c2b817a6ed..026e7f4369 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -385,7 +385,7 @@ BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) BOOL WINAPI WTSRegisterSessionNotificationEx(HANDLE hServer, HWND hWnd, DWORD dwFlags) { FIXME("Stub %p %p 0x%08x\n", hServer, hWnd, dwFlags); - return FALSE; + return TRUE; } -- 2.24.0

1 0

[PATCH v3 1/3] xmllite/tests: Extract nul-character test from XML declaration test.
by Jeff Smith 07 Dec '19

07 Dec '19

The comments in the XML declaration test suggest that it is supposed to be to checking for failure when no element follows the XML declaration. However, the error being tested for is due to a nul character in the input stream. Create a separate test for nul-character errors, and fix the XML declaration test accordingly. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/xmllite/tests/reader.c | 83 +++++++++++++++++++++++++++++-------- 1 file changed, 66 insertions(+), 17 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 41adad1598..88b9103e1e 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -863,7 +863,6 @@ static void test_read_xmldeclaration(void) { {'s','t','a','n','d','a','l','o','n','e',0}, {'y','e','s',0} } }; IXmlReader *reader; - IStream *stream; HRESULT hr; XmlNodeType type; UINT count = 0, len, i; @@ -873,10 +872,7 @@ static void test_read_xmldeclaration(void) hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - stream = create_stream_on_data(xmldecl_full, sizeof(xmldecl_full)); - - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + set_input_string(reader, xmldecl_full); hr = IXmlReader_GetAttributeCount(reader, &count); ok(hr == S_OK, "got %08x\n", hr); @@ -968,19 +964,19 @@ static void test_read_xmldeclaration(void) type = XmlNodeType_XmlDeclaration; hr = IXmlReader_Read(reader, &type); - /* newer versions return syntax error here cause document is incomplete, - it makes more sense than invalid char error */ + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Whitespace, "expected XmlNodeType_Whitespace, got %s\n", type_to_str(type)); + + type = XmlNodeType_Whitespace; + hr = IXmlReader_Read(reader, &type); todo_wine { - ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "got 0x%08x\n", hr); + ok(hr == WC_E_ROOTELEMENT, "got %08x\n", hr); ok(type == XmlNodeType_None, "got %d\n", type); + TEST_READER_STATE(reader, XmlReadState_Error); } - IStream_Release(stream); /* test short variant */ - stream = create_stream_on_data(xmldecl_short, sizeof(xmldecl_short)); - - hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + set_input_string(reader, xmldecl_short); read_node(reader, XmlNodeType_XmlDeclaration); TEST_READER_POSITION2(reader, 1, 3, ~0u, 21); @@ -1027,14 +1023,66 @@ todo_wine { type = -1; hr = IXmlReader_Read(reader, &type); -todo_wine - ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "expected WC_E_SYNTAX, got %08x\n", hr); + ok(hr == S_FALSE, "expected S_FALSE, got %08x\n", hr); ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); - TEST_READER_POSITION(reader, 1, 41); + + IXmlReader_Release(reader); +} + +static void test_read_nul(void) +{ + static const char xml_empty[] = "<a/>"; + static const char xml_ws[] = "<a/> "; + static const char xml_comment[] = "<a/>"; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + stream = create_stream_on_data(xml_empty, sizeof(xml_empty)); + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + IStream_Release(stream); + + read_node(reader, XmlNodeType_Element); + + type = -1; + hr = IXmlReader_Read(reader, &type); todo_wine - TEST_READER_STATE(reader, XmlReadState_Error); + ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "expected WC_E_SYNTAX, got 0x%08x\n", hr); + ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); + stream = create_stream_on_data(xml_ws, sizeof(xml_ws)); + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); IStream_Release(stream); + + read_node(reader, XmlNodeType_Element); + + type = -1; + hr = IXmlReader_Read(reader, &type); +todo_wine { + ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "expected WC_E_SYNTAX, got 0x%08x\n", hr); + ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); +} + + stream = create_stream_on_data(xml_comment, sizeof(xml_comment)); + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + IStream_Release(stream); + + read_node(reader, XmlNodeType_Element); + read_node(reader, XmlNodeType_Comment); + + type = -1; + hr = IXmlReader_Read(reader, &type); +todo_wine + ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "expected WC_E_SYNTAX, got 0x%08x\n", hr); + ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); + IXmlReader_Release(reader); } @@ -2672,6 +2720,7 @@ START_TEST(reader) test_read_pending(); test_readvaluechunk(); test_read_xmldeclaration(); + test_read_nul(); test_reader_properties(); test_prefix(); test_namespaceuri(); -- 2.23.0

2 8

[PATCH 1/6] winegstreamer: Use BasePinImpl_QueryInterface().
by Zebediah Figura 07 Dec '19

07 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 63 ++++++++--------------------------- 1 file changed, 13 insertions(+), 50 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 78c8e38701a..04fb54915c6 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1735,29 +1735,19 @@ static inline struct gstdemux_source *impl_source_from_IPin(IPin *iface) return CONTAINING_RECORD(iface, struct gstdemux_source, pin.pin.IPin_iface); } -static HRESULT WINAPI GSTOutPin_QueryInterface(IPin *iface, REFIID riid, void **ppv) +static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - struct gstdemux_source *This = impl_source_from_IPin(iface); + struct gstdemux_source *pin = impl_source_from_IPin(&iface->IPin_iface); - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IPin)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->seek; - else if (IsEqualIID(riid, &IID_IQualityControl)) - *ppv = &This->IQualityControl_iface; + if (IsEqualGUID(iid, &IID_IMediaSeeking)) + *out = &pin->seek.IMediaSeeking_iface; + else if (IsEqualGUID(iid, &IID_IQualityControl)) + *out = &pin->IQualityControl_iface; + else + return E_NOINTERFACE; - if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - FIXME("No interface for %s!\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) @@ -1847,7 +1837,7 @@ static void free_source_pin(struct gstdemux_source *pin) } static const IPinVtbl GST_OutputPin_Vtbl = { - GSTOutPin_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseOutputPinImpl_Connect, @@ -1869,6 +1859,7 @@ static const IPinVtbl GST_OutputPin_Vtbl = { static const struct strmbase_source_ops source_ops = { + .base.pin_query_interface = source_query_interface, .base.pin_query_accept = source_query_accept, .base.pin_get_media_type = source_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, @@ -2071,36 +2062,8 @@ static HRESULT WINAPI GSTInPin_NewSegment(IPin *iface, REFERENCE_TIME start, return S_OK; } -static HRESULT WINAPI GSTInPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) -{ - struct gstdemux *filter = impl_from_sink_IPin(iface); - - TRACE("filter %p, riid %s, ppv %p.\n", filter, debugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IPin)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - { - return IBaseFilter_QueryInterface(&filter->filter.IBaseFilter_iface, &IID_IMediaSeeking, ppv); - } - - if (*ppv) - { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - - FIXME("No interface for %s!\n", debugstr_guid(riid)); - - return E_NOINTERFACE; -} - static const IPinVtbl GST_InputPin_Vtbl = { - GSTInPin_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseInputPinImpl_Connect, -- 2.23.0

2 6

[PATCH 3/3] wined3d: Unload resources in wined3d_device_uninit_3d().
by Henri Verbeet 06 Dec '19

06 Dec '19

Instead of in wined3d_device_delete_opengl_contexts_cs(), which is specific to the GL backend. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 90c08876505..0ae841d4e35 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -939,7 +939,6 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi void wined3d_device_delete_opengl_contexts_cs(void *object) { - struct wined3d_resource *resource, *cursor; struct wined3d_swapchain_gl *swapchain_gl; struct wined3d_device *device = object; struct wined3d_context_gl *context_gl; @@ -949,12 +948,6 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) device_gl = wined3d_device_gl(device); - LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) - { - TRACE("Unloading resource %p.\n", resource); - wined3d_cs_emit_unload_resource(device->cs, resource); - } - LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) { device->shader_backend->shader_destroy(shader); @@ -1106,6 +1099,7 @@ static void device_free_sampler(struct wine_rb_entry *entry, void *context) void wined3d_device_uninit_3d(struct wined3d_device *device) { BOOL no3d = device->wined3d->flags & WINED3D_NO3D; + struct wined3d_resource *resource, *cursor; struct wined3d_rendertarget_view *view; struct wined3d_texture *texture; unsigned int i; @@ -1145,6 +1139,12 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wine_rb_clear(&device->samplers, device_free_sampler, NULL); + LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) + { + TRACE("Unloading resource %p.\n", resource); + wined3d_cs_emit_unload_resource(device->cs, resource); + } + device->adapter->adapter_ops->adapter_uninit_3d(device); device->d3d_initialized = FALSE; @@ -5298,6 +5298,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); + LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) + { + TRACE("Unloading resource %p.\n", resource); + wined3d_cs_emit_unload_resource(device->cs, resource); + } + if (device->d3d_initialized) device->adapter->adapter_ops->adapter_uninit_3d(device); -- 2.11.0

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel