March 2019 - Wine-commits - list.winehq.org

Vijay Kiran Kamuju : wmvcore: Add tests for WMCreateSyncReader.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 101710c7eb7dcf2368c165f3857b58ccb2fd371f URL: https://source.winehq.org/git/wine.git/?a=commit;h=101710c7eb7dcf2368c165f3… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Feb 27 21:48:36 2019 +0100 wmvcore: Add tests for WMCreateSyncReader. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 87 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index af6d32a..ebeab3f 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Alistair Leslie-Hughes + * Copyright 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -201,6 +202,91 @@ static void test_wmreader_interfaces(void) IWMReader_Release(reader); } +static void test_wmsyncreader_interfaces(void) +{ + HRESULT hr; + IWMSyncReader *reader; + IWMHeaderInfo *header; + IWMHeaderInfo2 *header2; + IWMHeaderInfo3 *header3; + IWMProfile *profile; + IWMProfile2 *profile2; + IWMProfile3 *profile3; + IWMPacketSize *packet; + IWMPacketSize2 *packet2; + IWMReaderTimecode *timecode; + IWMReaderPlaylistBurn *playlist; + IWMLanguageList *langlist; + + hr = WMCreateSyncReader( NULL, 0, &reader ); + todo_wine ok(hr == S_OK, "WMCreateSyncReader failed 0x%08x\n", hr); + if(FAILED(hr)) + { + skip("Failed to create IWMSyncReader\n"); + return; + } + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo, (void **)&header); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo2, (void **)&header2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo3, (void **)&header3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile2, (void **)&profile2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile3, (void **)&profile3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMPacketSize, (void **)&packet); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMPacketSize2, (void **)&packet2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMReaderTimecode, (void **)&timecode); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMReaderPlaylistBurn, (void **)&playlist); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMLanguageList, (void **)&langlist); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + if(packet) + IWMPacketSize_Release(packet); + if(packet2) + IWMPacketSize2_Release(packet2); + if(profile) + IWMProfile_Release(profile); + if(profile2) + IWMProfile2_Release(profile2); + if(profile3) + IWMProfile3_Release(profile3); + if(header) + IWMHeaderInfo_Release(header); + if(header2) + IWMHeaderInfo2_Release(header2); + if(header3) + IWMHeaderInfo3_Release(header3); + if(timecode) + IWMReaderTimecode_Release(timecode); + if(playlist) + IWMReaderPlaylistBurn_Release(playlist); + if(langlist) + IWMLanguageList_Release(langlist); + + + IWMSyncReader_Release(reader); +} + + static void test_profile_manager_interfaces(void) { HRESULT hr; @@ -262,6 +348,7 @@ START_TEST(wmvcore) return; test_wmreader_interfaces(); + test_wmsyncreader_interfaces(); test_wmwriter_interfaces(); test_profile_manager_interfaces(); test_WMCreateWriterPriv();

1 0

Matteo Bruni : d3dx9: Get rid of the ID3DXEffectImpl #define.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: d18fb86134d40ccee8df84ce7ccc4e1bdcb2d481 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d18fb86134d40ccee8df84ce… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 28 19:14:39 2019 +0100 d3dx9: Get rid of the ID3DXEffectImpl #define. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 78aa1c0..bdc96e7 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -148,11 +148,9 @@ struct d3dx_technique struct IDirect3DStateBlock9 *saved_state; }; -#define ID3DXEffectImpl d3dx_effect - struct d3dx9_base_effect { - struct ID3DXEffectImpl *effect; + struct d3dx_effect *effect; UINT parameter_count; UINT technique_count; @@ -718,7 +716,7 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) } } -static void free_effect(struct ID3DXEffectImpl *effect) +static void free_effect(struct d3dx_effect *effect) { TRACE("Free effect %p\n", effect); @@ -2841,7 +2839,7 @@ static void d3dx9_set_material_parameter(enum MATERIAL_TYPE op, D3DMATERIAL9 *ma } } -static HRESULT d3dx_set_shader_const_state(struct ID3DXEffectImpl *effect, enum SHADER_CONSTANT_TYPE op, UINT index, +static HRESULT d3dx_set_shader_const_state(struct d3dx_effect *effect, enum SHADER_CONSTANT_TYPE op, UINT index, struct d3dx_parameter *param, void *value_ptr) { static const struct @@ -2940,10 +2938,10 @@ static HRESULT d3dx_set_shader_const_state(struct ID3DXEffectImpl *effect, enum return ret; } -static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, +static HRESULT d3dx9_apply_state(struct d3dx_effect *effect, struct d3dx_pass *pass, struct d3dx_state *state, unsigned int parent_index, BOOL update_all); -static HRESULT d3dx_set_shader_constants(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, +static HRESULT d3dx_set_shader_constants(struct d3dx_effect *effect, struct d3dx_pass *pass, struct d3dx_parameter *param, BOOL vs, BOOL update_all) { HRESULT hr, ret; @@ -2989,7 +2987,7 @@ static HRESULT d3dx_set_shader_constants(struct ID3DXEffectImpl *effect, struct return ret; } -static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, +static HRESULT d3dx9_apply_state(struct d3dx_effect *effect, struct d3dx_pass *pass, struct d3dx_state *state, unsigned int parent_index, BOOL update_all) { struct d3dx_parameter *param; @@ -3125,7 +3123,7 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas return D3D_OK; } -static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, BOOL update_all) +static HRESULT d3dx9_apply_pass_states(struct d3dx_effect *effect, struct d3dx_pass *pass, BOOL update_all) { unsigned int i; HRESULT ret; @@ -6540,7 +6538,7 @@ static const char **parse_skip_constants_string(char *skip_constants_string, uns static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, - UINT eflags, ID3DBlob **errors, struct ID3DXEffectImpl *effect, struct d3dx_effect_pool *pool, + UINT eflags, ID3DBlob **errors, struct d3dx_effect *effect, struct d3dx_effect_pool *pool, const char *skip_constants_string) { DWORD tag, offset; @@ -6683,7 +6681,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, return D3D_OK; } -static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, struct IDirect3DDevice9 *device, +static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDevice9 *device, const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, UINT eflags, ID3DBlob **error_messages, struct ID3DXEffectPool *pool, const char *skip_constants) { @@ -6727,7 +6725,7 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skip_constants, DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors) { - struct ID3DXEffectImpl *object; + struct d3dx_effect *object; HRESULT hr; TRACE("device %p, srcdata %p, srcdatalen %u, defines %p, include %p,"

1 0

Alexandre Julliard : wrc: Don' t map version block names to the target language.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 4b2d797d6ecfec9f9d85c2e96fb710181a490d91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b2d797d6ecfec9f9d85c2e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 15:45:56 2019 +0100 wrc: Don't map version block names to the target language. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 939d265..b01aced 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -1465,7 +1465,7 @@ static void versionblock2res(res_t *res, ver_block_t *blk, int level, const lang put_word(res, 0); if(win32) put_word(res, 0); /* level ? */ - put_string(res, blk->name, win32 ? str_unicode : str_char, TRUE, lang); + put_string(res, blk->name, win32 ? str_unicode : str_char, TRUE, NULL); put_pad(res); for(val = blk->values; val; val = val->next) { @@ -1479,7 +1479,7 @@ static void versionblock2res(res_t *res, ver_block_t *blk, int level, const lang { put_word(res, level); } - put_string(res, val->key, win32 ? str_unicode : str_char, TRUE, lang); + put_string(res, val->key, win32 ? str_unicode : str_char, TRUE, NULL); put_pad(res); tag = res->size; put_string(res, val->value.str, win32 ? str_unicode : str_char, TRUE, lang); @@ -1500,7 +1500,7 @@ static void versionblock2res(res_t *res, ver_block_t *blk, int level, const lang { put_word(res, level); } - put_string(res, val->key, win32 ? str_unicode : str_char, TRUE, lang); + put_string(res, val->key, win32 ? str_unicode : str_char, TRUE, NULL); put_pad(res); tag = res->size; for(i = 0; i < val->value.words->nwords; i++) @@ -1562,8 +1562,7 @@ static res_t *versioninfo2res(name_id_t *name, versioninfo_t *ver) put_word(res, 0); /* ValueSize filled in later*/ if(win32) put_word(res, 0); /* Tree-level ? */ - put_string(res, &vsvi, win32 ? str_unicode : str_char, - TRUE, win32 ? ver->lvc.language : NULL); + put_string(res, &vsvi, win32 ? str_unicode : str_char, TRUE, NULL); if(win32) put_pad(res); tag = res->size;

1 0

Isira Seneviratne : kernel32: Fix LOCALE_SSCRIPTS value for Sinhala.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 057df127387eee0fb127f224465cb21419203dea URL: https://source.winehq.org/git/wine.git/?a=commit;h=057df127387eee0fb127f224… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Fri Mar 1 09:07:45 2019 +0530 kernel32: Fix LOCALE_SSCRIPTS value for Sinhala. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/sin.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/sin.nls b/dlls/kernel32/nls/sin.nls index 04fe70f..8a96aa7 100644 --- a/dlls/kernel32/nls/sin.nls +++ b/dlls/kernel32/nls/sin.nls @@ -133,7 +133,7 @@ STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_DEFAULT LOCALE_SNEGATIVESIGN "-" LOCALE_SOPENTYPELANGUAGETAG "SIN " LOCALE_SPOSITIVESIGN "" - LOCALE_SSCRIPTS "Taml;" + LOCALE_SSCRIPTS "Sinh;" LOCALE_SPARENT "si" LOCALE_SSHORTDATE "yyyy/MMMM/dd" LOCALE_SSHORTESTDAYNAME1 "ස"

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: f3457d6a8d0a8be80bbe8cb0a46d2ffaa56f2dac URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3457d6a8d0a8be80bbe8cb0… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Fri Mar 1 11:18:13 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 399 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 230 insertions(+), 169 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f3457d6a8d0a8be80bbe…

1 0

Zebediah Figura : mshtml: Open pages in the native browser in HlinkTarget_Navigate().
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: f29317dcc23e2154809b751b17e65190a7e4d8f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f29317dcc23e2154809b751b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 27 23:45:41 2019 -0600 mshtml: Open pages in the native browser in HlinkTarget_Navigate(). This matches native Windows behaviour as well, as demonstrated by running the interactive hlink:hlink tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44423 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/persist.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index b82750a..0607306 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -30,6 +30,7 @@ #include "shlguid.h" #include "idispids.h" #include "mimeole.h" +#include "shellapi.h" #define NO_SHLWAPI_REG #include "shlwapi.h" @@ -1187,8 +1188,19 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L if(pwzJumpLocation) FIXME("JumpLocation not supported\n"); - if(!This->doc_obj->client) - return navigate_new_window(This->window, This->window->uri, NULL, NULL, NULL); + if(!This->doc_obj->client) { + static const WCHAR szOpen[] = {'o','p','e','n',0}; + HRESULT hres; + BSTR uri; + + hres = IUri_GetAbsoluteUri(This->window->uri, &uri); + if (FAILED(hres)) + return hres; + + ShellExecuteW(NULL, szOpen, uri, NULL, NULL, SW_SHOW); + SysFreeString(uri); + return S_OK; + } return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL); }

1 0

Michael Stefaniuc : urlmon: Remove useless casts to self.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 554a804742955c644132dda6ba1480f60e116fb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=554a804742955c644132dda6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 28 21:39:47 2019 +0100 urlmon: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/bindctx.c | 2 +- dlls/urlmon/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 2759f3d..6191751 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -45,7 +45,7 @@ static void *get_callback_iface(BindStatusCallback *This, REFIID riid) void *ret; HRESULT hres; - hres = IBindStatusCallback_QueryInterface(This->callback, riid, (void**)&ret); + hres = IBindStatusCallback_QueryInterface(This->callback, riid, &ret); if(FAILED(hres) && This->serv_prov) hres = IServiceProvider_QueryService(This->serv_prov, riid, riid, &ret); diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 11e6ece..cc1ba81 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -434,7 +434,7 @@ HRESULT FileProtocol_Construct(IUnknown *outer, LPVOID *ppobj) ret->file = INVALID_HANDLE_VALUE; ret->priority = 0; ret->ref = 1; - ret->outer = outer ? outer : (IUnknown*)&ret->IUnknown_outer; + ret->outer = outer ? outer : &ret->IUnknown_outer; *ppobj = &ret->IUnknown_outer; return S_OK;

1 0

Dmitry Timoshkov : wpcap: Fix compilation with recent pcap/ pcap.h versions.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 40c9b46500c3606e966d5404d45b68a48609b6ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=40c9b46500c3606e966d5404… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 28 20:37:47 2019 +0300 wpcap: Fix compilation with recent pcap/pcap.h versions. Recent libpcap versions have added inclusion of pcap/socket.h to pcap.h that includes sys/socket.h and other system .h files that lead to conflicts with winsock2.h. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index e7908cd..f163235 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -24,6 +24,7 @@ #undef SOCKET #undef INVALID_SOCKET +#define USE_WS_PREFIX #include "winsock2.h" #include "windef.h" #include "winbase.h"

1 0

Isira Seneviratne : po: Update German translation.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 563da6fe70e944b7101d4a47a8bf8a9969a9bfb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=563da6fe70e944b7101d4a47… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Wed Feb 27 09:12:25 2019 +0530 po: Update German translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index 1a2e965..802c5e1 100644 --- a/po/de.po +++ b/po/de.po @@ -5,14 +5,15 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-01-09 14:31+0100\n" -"Last-Translator: Julian Rüger\n" +"PO-Revision-Date: 2019-02-27 09:09+0530\n" +"Last-Translator: Isira Seneviratne <isirasen96(a)gmail.com>\n" "Language-Team: German\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 18.12.2\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -14873,7 +14874,7 @@ msgstr "Regulärer Metafile-Betrachter" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Metadateien (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program" @@ -16424,8 +16425,6 @@ msgid "Text documents (*.txt)" msgstr "Textdokumente (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" msgstr "Unicode-Textdokumente (*.txt)"

1 0

Hans Leidekker : dnsapi: Add support for DNS_TYPE_OPT records.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: ecaeaa974ce93fe0c51cf063a0828831a2be3dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecaeaa974ce93fe0c51cf063… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 1 17:37:33 2019 +0100 dnsapi: Add support for DNS_TYPE_OPT records. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46704 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/query.c | 10 ++++++++++ dlls/dnsapi/record.c | 10 ++++++++++ include/windns.h | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 19eecfd..e601191 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -218,6 +218,7 @@ static unsigned int dns_get_record_size( const ns_rr *rr ) break; } case ns_t_null: + case ns_t_opt: { size += rr->rdlength - 1; break; @@ -313,6 +314,15 @@ static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, W *dlen = sizeof(DNS_NULL_DATA) + rr->rdlength - 1; break; } + case ns_t_opt: + { + r->Data.OPT.wDataLength = rr->rdlength; + r->Data.OPT.wPad = 0; + memcpy( r->Data.OPT.Data, rr->rdata, rr->rdlength ); + + *dlen = sizeof(DNS_OPT_DATA) + rr->rdlength - 1; + break; + } case ns_t_cname: case ns_t_ns: case ns_t_mb: diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 7882b22..8d7b17a 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -222,6 +222,16 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) return FALSE; break; } + case DNS_TYPE_OPT: + { + if (r1->Data.Opt.wDataLength != r2->Data.Opt.wDataLength) + return FALSE; + /* ignore wPad */ + if (memcmp( r1->Data.Opt.Data, + r2->Data.Opt.Data, r1->Data.Opt.wDataLength )) + return FALSE; + break; + } case DNS_TYPE_AAAA: { for (i = 0; i < sizeof(IP6_ADDRESS)/sizeof(DWORD); i++) diff --git a/include/windns.h b/include/windns.h index f150919..d9a4b9a 100644 --- a/include/windns.h +++ b/include/windns.h @@ -519,6 +519,14 @@ typedef struct DECL_WINELIB_TYPE_AW(DNS_WINSR_DATA) DECL_WINELIB_TYPE_AW(PDNS_WINSR_DATA) +typedef struct +{ + WORD wDataLength; + WORD wPad; + BYTE Data[1]; +} +DNS_OPT_DATA, *PDNS_OPT_DATA; + typedef struct _DnsRecordA { struct _DnsRecordA *pNext; @@ -552,6 +560,7 @@ typedef struct _DnsRecordA DNS_TSIG_DATAA TSIG, Tsig; DNS_WINS_DATA WINS, Wins; DNS_WINSR_DATAA WINSR, WinsR, NBSTAT, Nbstat; + DNS_OPT_DATA OPT, Opt; } Data; } DNS_RECORDA, *PDNS_RECORDA; @@ -588,6 +597,7 @@ typedef struct _DnsRecordW DNS_TSIG_DATAW TSIG, Tsig; DNS_WINS_DATA WINS, Wins; DNS_WINSR_DATAW WINSR, WinsR, NBSTAT, Nbstat; + DNS_OPT_DATA OPT, Opt; } Data; } DNS_RECORDW, *PDNS_RECORDW;

1 0