July 2017 - Wine-Commits - list.winehq.org

Hans Leidekker : webservices: Add support for UNIQUE_ID records in the writer.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: f40d88a0c757b4eac4b021752ea9f9bb9da5ec2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40d88a0c757b4eac4b021752… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:36 2017 +0200 webservices: Add support for UNIQUE_ID records in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index e3b9214..e262254 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -719,6 +719,9 @@ static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text ) case WS_XML_TEXT_TYPE_GUID: return RECORD_GUID_TEXT; + case WS_XML_TEXT_TYPE_UNIQUE_ID: + return RECORD_UNIQUE_ID_TEXT; + default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -861,6 +864,13 @@ static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TE write_bytes( writer, (const BYTE *)&text_guid->value, sizeof(text_guid->value) ); return S_OK; } + case RECORD_UNIQUE_ID_TEXT: + { + WS_XML_UNIQUE_ID_TEXT *text_unique_id = (WS_XML_UNIQUE_ID_TEXT *)text; + if ((hr = write_grow_buffer( writer, sizeof(text_unique_id->value) )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&text_unique_id->value, sizeof(text_unique_id->value) ); + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -2494,6 +2504,9 @@ static enum record_type get_text_record_type( const WS_XML_TEXT *text ) case WS_XML_TEXT_TYPE_GUID: return RECORD_GUID_TEXT_WITH_ENDELEMENT; + case WS_XML_TEXT_TYPE_UNIQUE_ID: + return RECORD_UNIQUE_ID_TEXT_WITH_ENDELEMENT; + default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -2642,6 +2655,14 @@ static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, U write_bytes( writer, (const BYTE *)&text_guid->value, sizeof(text_guid->value) ); return S_OK; } + case RECORD_UNIQUE_ID_TEXT_WITH_ENDELEMENT: + { + WS_XML_UNIQUE_ID_TEXT *text_unique_id = (WS_XML_UNIQUE_ID_TEXT *)text; + if ((hr = write_grow_buffer( writer, 1 + sizeof(text_unique_id->value) )) != S_OK) return hr; + write_char( writer, type ); + write_bytes( writer, (const BYTE *)&text_unique_id->value, sizeof(text_unique_id->value) ); + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -3204,9 +3225,8 @@ static HRESULT write_type_unique_id( struct writer *writer, WS_TYPE_MAPPING mapp const WS_UNIQUE_ID_DESCRIPTION *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) { - WS_XML_UTF8_TEXT utf8; - WS_XML_UTF16_TEXT utf16; - unsigned char buf[46]; /* "urn:uuid:00000000-0000-0000-0000-000000000000" */ + WS_XML_UNIQUE_ID_TEXT text_unique_id; + WS_XML_UTF16_TEXT text_utf16; const WS_UNIQUE_ID *ptr; HRESULT hr; @@ -3222,16 +3242,15 @@ static HRESULT write_type_unique_id( struct writer *writer, WS_TYPE_MAPPING mapp if (ptr->uri.length) { - utf16.text.textType = WS_XML_TEXT_TYPE_UTF16; - utf16.bytes = (BYTE *)ptr->uri.chars; - utf16.byteCount = ptr->uri.length * sizeof(WCHAR); - return write_type_text( writer, mapping, &utf16.text ); + text_utf16.text.textType = WS_XML_TEXT_TYPE_UTF16; + text_utf16.bytes = (BYTE *)ptr->uri.chars; + text_utf16.byteCount = ptr->uri.length * sizeof(WCHAR); + return write_type_text( writer, mapping, &text_utf16.text ); } - utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; - utf8.value.bytes = buf; - utf8.value.length = format_urn( &ptr->guid, buf ); - return write_type_text( writer, mapping, &utf8.text ); + text_unique_id.text.textType = WS_XML_TEXT_TYPE_UNIQUE_ID; + text_unique_id.value = ptr->guid; + return write_type_text( writer, mapping, &text_unique_id.text ); } static HRESULT write_type_string( struct writer *writer, WS_TYPE_MAPPING mapping,

1 0

Hugh McMaster : regedit: Output an error message and exit with error code zero instead of calling exit (1).
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: ae147a5bf68bf65511ee4711ab237de5293fa672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae147a5bf68bf65511ee4711a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 12 11:09:05 2017 +0000 regedit: Output an error message and exit with error code zero instead of calling exit(1). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 29 +++++++++++++++++++++-------- programs/regedit/regproc.c | 23 +++++++++-------------- programs/regedit/regproc.h | 1 + 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 47fec63..c563628 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -83,6 +83,23 @@ void __cdecl output_message(unsigned int id, ...) __ms_va_end(va_args); } +void __cdecl error_exit(unsigned int id, ...) +{ + WCHAR fmt[1536]; + __ms_va_list va_args; + + if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, sizeof(fmt)/sizeof(*fmt))) + { + WINE_FIXME("LoadString failed with %u\n", GetLastError()); + return; + } + __ms_va_start(va_args, id); + output_formatstring(fmt, va_args); + __ms_va_end(va_args); + + exit(0); /* regedit.exe always terminates with error code zero */ +} + typedef enum { ACTION_ADD, ACTION_EXPORT, ACTION_DELETE } REGEDIT_ACTION; @@ -147,8 +164,7 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) break; } default: - output_message(STRING_UNHANDLED_ACTION); - exit(1); + error_exit(STRING_UNHANDLED_ACTION); break; } } @@ -184,8 +200,7 @@ BOOL ProcessCmdLine(WCHAR *cmdline) switch (toupperW(argv[i][1])) { case '?': - output_message(STRING_USAGE); - exit(0); + error_exit(STRING_USAGE); break; case 'D': action = ACTION_DELETE; @@ -204,8 +219,7 @@ BOOL ProcessCmdLine(WCHAR *cmdline) break; default: output_message(STRING_INVALID_SWITCH, argv[i]); - output_message(STRING_HELP); - exit(1); + error_exit(STRING_HELP); } } @@ -221,8 +235,7 @@ BOOL ProcessCmdLine(WCHAR *cmdline) output_message(STRING_NO_REG_KEY); break; } - output_message(STRING_HELP); - exit(1); + error_exit(STRING_HELP); } for (; i < argc; i++) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index ea0b6f8..9ebe2fa 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1421,8 +1421,7 @@ static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) file = _wfopen(file_name, wb_mode); if (!file) { _wperror(regedit); - output_message(STRING_CANNOT_OPEN_FILE, file_name); - exit(1); + error_exit(STRING_CANNOT_OPEN_FILE, file_name); } } if(unicode) @@ -1478,10 +1477,9 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) lstrcpyW(reg_key_name_buf, reg_key_name); /* open the specified key */ - if (!(reg_key_class = parse_key_name(reg_key_name, &branch_name))) { - output_message(STRING_INCORRECT_REG_CLASS, reg_key_name); - exit(1); - } + if (!(reg_key_class = parse_key_name(reg_key_name, &branch_name))) + error_exit(STRING_INCORRECT_REG_CLASS, reg_key_name); + if (!branch_name || !*branch_name) { /* no branch - registry class is specified */ file = REGPROC_open_export_file(file_name, unicode); @@ -1591,14 +1589,11 @@ void delete_registry_key(WCHAR *reg_key_name) if (!reg_key_name || !reg_key_name[0]) return; - if (!(key_class = parse_key_name(reg_key_name, &key_name))) { - output_message(STRING_INCORRECT_REG_CLASS, reg_key_name); - exit(1); - } - if (!*key_name) { - output_message(STRING_DELETE_REG_CLASS_FAILED, reg_key_name); - exit(1); - } + if (!(key_class = parse_key_name(reg_key_name, &key_name))) + error_exit(STRING_INCORRECT_REG_CLASS, reg_key_name); + + if (!*key_name) + error_exit(STRING_DELETE_REG_CLASS_FAILED, reg_key_name); RegDeleteTreeW(key_class, key_name); } diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index 72e6b38..81ac3e3 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -34,6 +34,7 @@ if (!(p)) \ } void __cdecl output_message(unsigned int id, ...); +void __cdecl error_exit(unsigned int id, ...); BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format); BOOL import_registry_file(FILE *in);

1 0

Sebastian Lackner : reg/tests: Don' t call RegCloseKey on uninitialized memory.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: db11f739ea73d7c2d7d6cc09c5a40cc8b0d76dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db11f739ea73d7c2d7d6cc09c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 12 15:03:19 2017 +0200 reg/tests: Don't call RegCloseKey on uninitialized memory. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index af09290..941d325 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -793,7 +793,7 @@ static void test_import(void) DWORD r, dword = 0x123, type, size; char test1_reg[MAX_PATH], test2_reg[MAX_PATH], cmdline[MAX_PATH]; char test_string[] = "Test string", buffer[24]; - HKEY hkey, subkey; + HKEY hkey, subkey = NULL; LONG err; BYTE hex[8];

1 0

Hans Leidekker : webservices: Add support for DATETIME records in the writer.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: dbe2163d43733a940de200733ff8ffb11ab1fdcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe2163d43733a940de200733… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:37 2017 +0200 webservices: Add support for DATETIME records in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index e262254..2071a95 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -722,6 +722,9 @@ static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text ) case WS_XML_TEXT_TYPE_UNIQUE_ID: return RECORD_UNIQUE_ID_TEXT; + case WS_XML_TEXT_TYPE_DATETIME: + return RECORD_DATETIME_TEXT; + default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -871,6 +874,19 @@ static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TE write_bytes( writer, (const BYTE *)&text_unique_id->value, sizeof(text_unique_id->value) ); return S_OK; } + case RECORD_DATETIME_TEXT: + { + WS_XML_DATETIME_TEXT *text_datetime = (WS_XML_DATETIME_TEXT *)text; + UINT64 val = text_datetime->value.ticks; + + assert( val <= TICKS_MAX ); + if (text_datetime->value.format == WS_DATETIME_FORMAT_UTC) val |= (UINT64)1 << 62; + else if (text_datetime->value.format == WS_DATETIME_FORMAT_LOCAL) val |= (UINT64)1 << 63; + + if ((hr = write_grow_buffer( writer, sizeof(val) )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&val, sizeof(val) ); + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -2507,6 +2523,9 @@ static enum record_type get_text_record_type( const WS_XML_TEXT *text ) case WS_XML_TEXT_TYPE_UNIQUE_ID: return RECORD_UNIQUE_ID_TEXT_WITH_ENDELEMENT; + case WS_XML_TEXT_TYPE_DATETIME: + return RECORD_DATETIME_TEXT_WITH_ENDELEMENT; + default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -2663,6 +2682,20 @@ static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, U write_bytes( writer, (const BYTE *)&text_unique_id->value, sizeof(text_unique_id->value) ); return S_OK; } + case RECORD_DATETIME_TEXT_WITH_ENDELEMENT: + { + WS_XML_DATETIME_TEXT *text_datetime = (WS_XML_DATETIME_TEXT *)text; + UINT64 val = text_datetime->value.ticks; + + assert( val <= TICKS_MAX ); + if (text_datetime->value.format == WS_DATETIME_FORMAT_UTC) val |= (UINT64)1 << 62; + else if (text_datetime->value.format == WS_DATETIME_FORMAT_LOCAL) val |= (UINT64)1 << 63; + + if ((hr = write_grow_buffer( writer, 1 + sizeof(val) )) != S_OK) return hr; + write_char( writer, type ); + write_bytes( writer, (const BYTE *)&val, sizeof(val) ); + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -3176,8 +3209,7 @@ static HRESULT write_type_datetime( struct writer *writer, WS_TYPE_MAPPING mappi const WS_DATETIME_DESCRIPTION *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) { - WS_XML_UTF8_TEXT utf8; - unsigned char buf[34]; /* "0000-00-00T00:00:00.0000000-00:00" */ + WS_XML_DATETIME_TEXT text_datetime; const WS_DATETIME *ptr; HRESULT hr; @@ -3192,10 +3224,9 @@ static HRESULT write_type_datetime( struct writer *writer, WS_TYPE_MAPPING mappi if (option == WS_WRITE_NILLABLE_POINTER && !ptr) return write_add_nil_attribute( writer ); if (ptr->ticks > TICKS_MAX || ptr->format > WS_DATETIME_FORMAT_NONE) return WS_E_INVALID_FORMAT; - utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; - utf8.value.bytes = buf; - utf8.value.length = format_datetime( ptr, buf ); - return write_type_text( writer, mapping, &utf8.text ); + text_datetime.text.textType = WS_XML_TEXT_TYPE_DATETIME; + text_datetime.value = *ptr; + return write_type_text( writer, mapping, &text_datetime.text ); } static HRESULT write_type_guid( struct writer *writer, WS_TYPE_MAPPING mapping,

1 0

Hugh McMaster : regedit: Update the listview path when renaming a treeview node.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: 7d0f2deca303468ed67582caa2a0fa56d4eb4cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d0f2deca303468ed67582caa… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 12 11:08:54 2017 +0000 regedit: Update the listview path when renaming a treeview node. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 1 + programs/regedit/listview.c | 19 +++++++++++++------ programs/regedit/main.h | 1 + 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 37f4261..2a646ef 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -466,6 +466,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa fullPath = GetPathFullPath(g_pChildWnd->hTreeWnd, path); SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); HeapFree(GetProcessHeap(), 0, fullPath); + update_listview_path(path); HeapFree(GetProcessHeap(), 0, path); } SetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA, 0); diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index dc3152d..9e271ad 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -91,6 +91,17 @@ LPCWSTR GetValueName(HWND hwndLV) return g_valueName; } +BOOL update_listview_path(const WCHAR *path) +{ + HeapFree(GetProcessHeap(), 0, g_currentPath); + + g_currentPath = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(path) + 1) * sizeof(WCHAR)); + if (!g_currentPath) return FALSE; + lstrcpyW(g_currentPath, path); + + return TRUE; +} + /* convert '\0' separated string list into ',' separated string list */ static void MakeMULTISZDisplayable(LPWSTR multi) { @@ -557,12 +568,8 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli SendMessageW(hwndLV, LVM_SORTITEMS, (WPARAM)hwndLV, (LPARAM)CompareFunc); g_currentRootKey = hKeyRoot; - if (keyPath != g_currentPath) { - HeapFree(GetProcessHeap(), 0, g_currentPath); - g_currentPath = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(keyPath) + 1) * sizeof(WCHAR)); - if (!g_currentPath) goto done; - lstrcpyW(g_currentPath, keyPath); - } + if (keyPath != g_currentPath && !update_listview_path(keyPath)) + goto done; result = TRUE; diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 5331189..f3fbf86 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -117,6 +117,7 @@ extern void SetupStatusBar(HWND hWnd, BOOL bResize); extern void UpdateStatusBar(void); /* listview.c */ +extern BOOL update_listview_path(const WCHAR *path); extern void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD size); extern int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos); extern HWND CreateListView(HWND hwndParent, UINT id);

1 0

Hans Leidekker : webservices: Add support for integer records in the writer.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: bfa4a6010bc4487aa44b13dafa90cc777cebcb42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa4a6010bc4487aa44b13daf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:33 2017 +0200 webservices: Add support for integer records in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 271 +++++++++++++++++++++++++++++++++------------- 1 file changed, 198 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bfa4a6010bc4487aa44b1…

1 0

Hans Leidekker : webservices: Add support for BOOL records in the writer.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: a2eb6d6f7e6a01f9343eea81e38bd4208d423b12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2eb6d6f7e6a01f9343eea81e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:32 2017 +0200 webservices: Add support for BOOL records in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 40e549f..e6bee56 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -668,6 +668,11 @@ static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text ) if (text_base64->length <= MAX_UINT16) return RECORD_BYTES16_TEXT; return RECORD_BYTES32_TEXT; } + case WS_XML_TEXT_TYPE_BOOL: + { + const WS_XML_BOOL_TEXT *text_bool = (const WS_XML_BOOL_TEXT *)text; + return text_bool->value ? RECORD_TRUE_TEXT : RECORD_FALSE_TEXT; + } default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -724,6 +729,10 @@ static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TE write_bytes( writer, text_base64->bytes, len ); return S_OK; } + case RECORD_FALSE_TEXT: + case RECORD_TRUE_TEXT: + return S_OK; + default: ERR( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -2332,6 +2341,11 @@ static enum record_type get_text_record_type( const WS_XML_TEXT *text ) if (len <= MAX_UINT16) return RECORD_BYTES16_TEXT; return RECORD_BYTES32_TEXT; } + case WS_XML_TEXT_TYPE_BOOL: + { + const WS_XML_BOOL_TEXT *text_bool = (const WS_XML_BOOL_TEXT *)text; + return text_bool->value ? RECORD_TRUE_TEXT_WITH_ENDELEMENT : RECORD_FALSE_TEXT_WITH_ENDELEMENT; + } default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -2415,6 +2429,13 @@ static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, U } return S_OK; } + case RECORD_FALSE_TEXT_WITH_ENDELEMENT: + case RECORD_TRUE_TEXT_WITH_ENDELEMENT: + { + if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; + write_char( writer, type ); + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -2698,8 +2719,7 @@ static HRESULT write_type_bool( struct writer *writer, WS_TYPE_MAPPING mapping, const WS_BOOL_DESCRIPTION *desc, WS_WRITE_OPTION option, const BOOL *value, ULONG size ) { - WS_XML_UTF8_TEXT utf8; - unsigned char buf[6]; /* "false" */ + WS_XML_BOOL_TEXT text_bool; const BOOL *ptr; HRESULT hr; @@ -2713,10 +2733,9 @@ static HRESULT write_type_bool( struct writer *writer, WS_TYPE_MAPPING mapping, if ((hr = get_value_ptr( option, value, size, sizeof(BOOL), (const void **)&ptr )) != S_OK) return hr; if (option == WS_WRITE_NILLABLE_POINTER && !ptr) return write_add_nil_attribute( writer ); - utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; - utf8.value.bytes = buf; - utf8.value.length = format_bool( ptr, buf ); - return write_type_text( writer, mapping, &utf8.text ); + text_bool.text.textType = WS_XML_TEXT_TYPE_BOOL; + text_bool.value = *ptr; + return write_type_text( writer, mapping, &text_bool.text ); } static HRESULT write_type_int8( struct writer *writer, WS_TYPE_MAPPING mapping,

1 0

Hans Leidekker : webservices: Add support for byte records in the writer.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: 11028500a75906dc510da2cdaeb1055f68ce453e URL: http://source.winehq.org/git/wine.git/?a=commit;h=11028500a75906dc510da2cda… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:31 2017 +0200 webservices: Add support for byte records in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 5f16623..40e549f 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -661,6 +661,13 @@ static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text ) if (text_utf8->value.length <= MAX_UINT16) return RECORD_CHARS16_TEXT; return RECORD_CHARS32_TEXT; } + case WS_XML_TEXT_TYPE_BASE64: + { + const WS_XML_BASE64_TEXT *text_base64 = (const WS_XML_BASE64_TEXT *)text; + if (text_base64->length <= MAX_UINT8) return RECORD_BYTES8_TEXT; + if (text_base64->length <= MAX_UINT16) return RECORD_BYTES16_TEXT; + return RECORD_BYTES32_TEXT; + } default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -700,6 +707,23 @@ static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TE write_bytes( writer, text_utf8->value.bytes, len ); return S_OK; } + case RECORD_BYTES8_TEXT: + { + WS_XML_BASE64_TEXT *text_base64 = (WS_XML_BASE64_TEXT *)text; + if ((hr = write_grow_buffer( writer, 1 + text_base64->length )) != S_OK) return hr; + write_char( writer, text_base64->length ); + write_bytes( writer, text_base64->bytes, text_base64->length ); + return S_OK; + } + case RECORD_BYTES16_TEXT: + { + WS_XML_BASE64_TEXT *text_base64 = (WS_XML_BASE64_TEXT *)text; + UINT16 len = text_base64->length; + if ((hr = write_grow_buffer( writer, sizeof(len) + len )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&len, sizeof(len) ); + write_bytes( writer, text_base64->bytes, len ); + return S_OK; + } default: ERR( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -2300,6 +2324,14 @@ static enum record_type get_text_record_type( const WS_XML_TEXT *text ) if (text_utf8->value.length <= MAX_UINT16) return RECORD_CHARS16_TEXT_WITH_ENDELEMENT; return RECORD_CHARS32_TEXT_WITH_ENDELEMENT; } + case WS_XML_TEXT_TYPE_BASE64: + { + const WS_XML_BASE64_TEXT *text_base64 = (const WS_XML_BASE64_TEXT *)text; + ULONG rem = text_base64->length % 3, len = text_base64->length - rem; + if (len <= MAX_UINT8) return RECORD_BYTES8_TEXT; + if (len <= MAX_UINT16) return RECORD_BYTES16_TEXT; + return RECORD_BYTES32_TEXT; + } default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -2341,6 +2373,48 @@ static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, U write_bytes( writer, text_utf8->value.bytes, len ); return S_OK; } + case RECORD_BYTES8_TEXT: + { + const WS_XML_BASE64_TEXT *text_base64 = (const WS_XML_BASE64_TEXT *)text; + UINT8 rem = text_base64->length % 3, len = text_base64->length - rem; + + if (len) + { + if ((hr = write_grow_buffer( writer, 1 + sizeof(len) + len )) != S_OK) return hr; + write_char( writer, rem ? RECORD_BYTES8_TEXT : RECORD_BYTES8_TEXT_WITH_ENDELEMENT ); + write_char( writer, len ); + write_bytes( writer, text_base64->bytes, len ); + } + if (rem) + { + if ((hr = write_grow_buffer( writer, 3 )) != S_OK) return hr; + write_char( writer, RECORD_BYTES8_TEXT_WITH_ENDELEMENT ); + write_char( writer, rem ); + write_bytes( writer, (const BYTE *)text_base64->bytes + len, rem ); + } + return S_OK; + } + case RECORD_BYTES16_TEXT: + { + const WS_XML_BASE64_TEXT *text_base64 = (const WS_XML_BASE64_TEXT *)text; + UINT16 rem = text_base64->length % 3, len = text_base64->length - rem; + + if (len) + { + if ((hr = write_grow_buffer( writer, 1 + sizeof(len) + len )) != S_OK) return hr; + write_char( writer, rem ? RECORD_BYTES16_TEXT : RECORD_BYTES16_TEXT_WITH_ENDELEMENT ); + write_bytes( writer, (const BYTE *)&len, sizeof(len) ); + write_bytes( writer, text_base64->bytes, len ); + } + if (rem) + { + if ((hr = write_grow_buffer( writer, 3 )) != S_OK) return hr; + write_char( writer, RECORD_BYTES8_TEXT_WITH_ENDELEMENT ); + write_char( writer, rem ); + write_bytes( writer, (const BYTE *)text_base64->bytes + len, rem ); + } + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL;

1 0

Alistair Leslie-Hughes : mfplat/tests: Add MFCreateAttributes tests.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: a324786b9e2aab5fce13238b59cdc01c2ce596b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a324786b9e2aab5fce13238b5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 05:22:19 2017 +0000 mfplat/tests: Add MFCreateAttributes tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index edbce46..13853c5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -32,11 +32,14 @@ #include "mfapi.h" #include "mfidl.h" #include "mferror.h" +#include "mfreadwrite.h" #include "wine/test.h" static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); +DEFINE_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, 0xa4, 0x94, 0x4d, 0xe4, 0x64, 0x36, 0x12, 0xb0); + DEFINE_GUID(MFT_CATEGORY_OTHER, 0x90175d57,0xb7ea,0x4901,0xae,0xb3,0x93,0x3a,0x87,0x47,0x75,0x6f); DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); @@ -217,6 +220,30 @@ if(0) MFShutdown(); } +static void test_MFCreateAttributes(void) +{ + IMFAttributes *attributes; + HRESULT hr; + UINT32 count; + + hr = MFCreateAttributes( &attributes, 3 ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 88; + hr = IMFAttributes_GetCount(attributes, &count); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 0, "got %d\n", count); + + hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFAttributes_GetCount(attributes, &count); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(count == 1, "got %d\n", count); + + IMFAttributes_Release(attributes); +} + START_TEST(mfplat) { @@ -227,6 +254,7 @@ START_TEST(mfplat) test_register(); test_source_resolver(); test_MFCreateMediaType(); + test_MFCreateAttributes(); CoUninitialize(); }

1 0

Alistair Leslie-Hughes : wmvcore: Support IWMReaderTypeNegotiation interface in IWMReader.
by Alexandre Julliard July 12, 2017

July 12, 2017

Module: wine Branch: master Commit: 465feb7a9ef971717f338fec9ae2682ac8723fe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=465feb7a9ef971717f338fec9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 06:48:14 2017 +0000 wmvcore: Support IWMReaderTypeNegotiation interface in IWMReader. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 2 +- dlls/wmvcore/wmvcore_main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index c4d8115..4369748 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -136,7 +136,7 @@ static void test_wmreader_interfaces(void) ok(hr == S_OK, "Failed 0x%08x\n", hr); hr = IWMReader_QueryInterface(reader, &IID_IWMReaderTypeNegotiation, (void **)&negotiation); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + ok(hr == S_OK, "Failed 0x%08x\n", hr); hr = IWMReader_QueryInterface(reader, &IID_IWMDRMReader, (void **)&drmreader); ok(hr == E_NOINTERFACE, "Failed 0x%08x\n", hr); diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index f7fa6e9..2969668 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -69,6 +69,7 @@ typedef struct { IWMReaderAccelerator IWMReaderAccelerator_iface; IWMReaderNetworkConfig2 IWMReaderNetworkConfig2_iface; IWMReaderStreamClock IWMReaderStreamClock_iface; + IWMReaderTypeNegotiation IWMReaderTypeNegotiation_iface; LONG ref; } WMReader; @@ -117,6 +118,9 @@ static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, voi }else if(IsEqualGUID(riid, &IID_IWMReaderStreamClock)) { TRACE("(%p)->(IWMReaderStreamClock %p)\n", This, ppv); *ppv = &This->IWMReaderStreamClock_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderTypeNegotiation)) { + TRACE("(%p)->(IWMReaderTypeNegotiation %p)\n", This, ppv); + *ppv = &This->IWMReaderTypeNegotiation_iface; }else { *ppv = NULL; FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -1190,6 +1194,44 @@ static const IWMReaderStreamClockVtbl WMReaderStreamClockVtbl = readclock_KillTimer }; +static inline WMReader *impl_from_IWMReaderTypeNegotiation(IWMReaderTypeNegotiation *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReaderTypeNegotiation_iface); +} + +static HRESULT WINAPI negotiation_QueryInterface(IWMReaderTypeNegotiation *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI negotiation_AddRef(IWMReaderTypeNegotiation *iface) +{ + WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI negotiation_Release(IWMReaderTypeNegotiation *iface) +{ + WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI negotiation_TryOutputProps(IWMReaderTypeNegotiation *iface, DWORD output, IWMOutputMediaProps *props) +{ + WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); + FIXME("%p, %d, %p\n", This, output, props); + return E_NOTIMPL; +} + +static const IWMReaderTypeNegotiationVtbl WMReaderTypeNegotiationVtbl = +{ + negotiation_QueryInterface, + negotiation_AddRef, + negotiation_Release, + negotiation_TryOutputProps +}; + HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) { WMReader *reader; @@ -1205,6 +1247,7 @@ HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_ reader->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; reader->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl; reader->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; + reader->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl; reader->ref = 1; *ret_reader = &reader->IWMReader_iface;

1 0