October 2021 - Wine-Commits

Nikolay Sivov : mfplay: Do not clear media item when playback ends.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: c6c3d6f9635bfa1aae8934b70f3ae9c7e549fe26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6c3d6f9635bfa1aae8934b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 22 08:22:58 2021 +0300 mfplay: Do not clear media item when playback ends. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index f7832598ae6..42b40b99ea1 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1860,21 +1860,6 @@ static void media_player_create_forward_event(struct media_player *player, HRESU LeaveCriticalSection(&player->cs); } -static void media_player_create_playback_ended_event(struct media_player *player, HRESULT event_status, - struct media_event **event) -{ - EnterCriticalSection(&player->cs); - - if (SUCCEEDED(media_event_create(player, MFP_EVENT_TYPE_PLAYBACK_ENDED, event_status, player->item, event))) - { - if (player->item) - IMFPMediaItem_Release(player->item); - player->item = NULL; - } - - LeaveCriticalSection(&player->cs); -} - static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { @@ -1936,7 +1921,7 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba if (SUCCEEDED(IMFMediaEvent_GetUINT32(session_event, &MF_EVENT_TOPOLOGY_STATUS, &status)) && status == MF_TOPOSTATUS_ENDED) { - media_player_create_playback_ended_event(player, event_status, &event); + media_event_create(player, MFP_EVENT_TYPE_PLAYBACK_ENDED, event_status, player->item, &event); } break;

1 0

Nikolay Sivov : mfplat: Use wide strings for registry paths.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 7d43ac947412c7981539a34a557d7b310e084163 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d43ac947412c7981539a34a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 22 08:24:22 2021 +0300 mfplat: Use wide strings for registry paths. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 5bd19190ed5..37a66798b2f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5944,7 +5944,6 @@ static HRESULT resolver_create_registered_handler(HKEY hkey, REFIID riid, void * static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHAR *url, DWORD flags, IMFByteStreamHandler **handler) { - static const char streamhandlerspath[] = "Software\\Microsoft\\Windows Media Foundation\\ByteStreamHandlers"; static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; WCHAR *mimeW = NULL, *urlW = NULL; IMFAttributes *attributes; @@ -6008,7 +6007,7 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA const WCHAR *namesW[2] = { mimeW, url_ext }; HKEY hkey, hkey_handler; - if (RegOpenKeyA(hkey_roots[i], streamhandlerspath, &hkey)) + if (RegOpenKeyW(hkey_roots[i], L"Software\\Microsoft\\Windows Media Foundation\\ByteStreamHandlers", &hkey)) continue; for (j = 0; j < ARRAY_SIZE(namesW); ++j) @@ -6045,7 +6044,6 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA static HRESULT resolver_create_scheme_handler(const WCHAR *scheme, DWORD flags, IMFSchemeHandler **handler) { - static const char schemehandlerspath[] = "Software\\Microsoft\\Windows Media Foundation\\SchemeHandlers"; static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; HRESULT hr = MF_E_UNSUPPORTED_SCHEME; unsigned int i; @@ -6082,7 +6080,7 @@ static HRESULT resolver_create_scheme_handler(const WCHAR *scheme, DWORD flags, hr = MF_E_UNSUPPORTED_SCHEME; - if (RegOpenKeyA(hkey_roots[i], schemehandlerspath, &hkey)) + if (RegOpenKeyW(hkey_roots[i], L"Software\\Microsoft\\Windows Media Foundation\\SchemeHandlers", &hkey)) continue; if (!RegOpenKeyW(hkey, scheme, &hkey_handler))

1 0

Rémi Bernon : dinput: Factor all IDirectInputDevice8W vtables together.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: b242273482616a3f98fb2cf0ce7a648bf4caf16c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b242273482616a3f98fb2cf0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 22 09:33:54 2021 +0200 dinput: Factor all IDirectInputDevice8W vtables together. And remove "internal" suffix from internal functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 189 +++++++++++++++++++++++++------------------ dlls/dinput/device_private.h | 80 +----------------- dlls/dinput/joystick_hid.c | 108 ++++++++----------------- dlls/dinput/keyboard.c | 73 +++++------------ dlls/dinput/mouse.c | 73 +++++------------ 5 files changed, 181 insertions(+), 342 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b242273482616a3f98fb…

1 0

Alexandre Julliard : aclui: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 13e707b4074cbdf3c1b1ca75af8bb7a758bbdf8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e707b4074cbdf3c1b1ca75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:11:11 2021 +0200 aclui: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/aclui/aclui_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 8fd3db4d58c..ace58127674 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -65,14 +65,14 @@ static HINSTANCE aclui_instance; static WCHAR *WINAPIV load_formatstr(UINT resource, ...) { - __ms_va_list valist; + va_list valist; WCHAR *str; DWORD ret; - __ms_va_start(valist, resource); + va_start(valist, resource); ret = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE, aclui_instance, resource, 0, (WCHAR*)&str, 0, &valist); - __ms_va_end(valist); + va_end(valist); return ret ? str : NULL; }

1 0

Nikolay Sivov : mfplat: Consider MF_BYTESTREAM_ORIGIN_NAME when looking for bytestream handler.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 030008f6cc2907a140588244f767e8b4c6b121a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=030008f6cc2907a140588244… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 22 08:24:21 2021 +0300 mfplat: Consider MF_BYTESTREAM_ORIGIN_NAME when looking for bytestream handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7fd713261fc..5bd19190ed5 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5946,9 +5946,9 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA { static const char streamhandlerspath[] = "Software\\Microsoft\\Windows Media Foundation\\ByteStreamHandlers"; static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; + WCHAR *mimeW = NULL, *urlW = NULL; IMFAttributes *attributes; const WCHAR *url_ext; - WCHAR *mimeW = NULL; HRESULT hr = E_FAIL; unsigned int i, j; UINT32 length; @@ -5959,6 +5959,11 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA if (SUCCEEDED(IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes))) { IMFAttributes_GetAllocatedString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, &mimeW, &length); + if (!url) + { + IMFAttributes_GetAllocatedString(attributes, &MF_BYTESTREAM_ORIGIN_NAME, &urlW, &length); + url = urlW; + } IMFAttributes_Release(attributes); } @@ -5967,7 +5972,7 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA if (!url_ext && !mimeW) { - CoTaskMemFree(mimeW); + CoTaskMemFree(urlW); return MF_E_UNSUPPORTED_BYTESTREAM_TYPE; } @@ -5991,7 +5996,11 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA LeaveCriticalSection(&local_handlers_section); if (*handler) + { + CoTaskMemFree(mimeW); + CoTaskMemFree(urlW); return hr; + } } for (i = 0, hr = E_FAIL; i < ARRAY_SIZE(hkey_roots); ++i) @@ -6030,6 +6039,7 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA } CoTaskMemFree(mimeW); + CoTaskMemFree(urlW); return hr; }

1 0

Jefferson Carpenter : msxml3/saxreader: Handle null url in parseURL().
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: b7386cec716013e8a17abae54f1609ba2e8518c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7386cec716013e8a17abae5… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Fri Oct 22 09:56:54 2021 +0300 msxml3/saxreader: Handle null url in parseURL(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51267 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/saxreader.c | 14 +++++++------- dlls/msxml3/tests/saxreader.c | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index c610ffcaccb..8c202bddccd 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2728,23 +2728,23 @@ static HRESULT internal_onDataAvailable(void *obj, char *ptr, DWORD len) return internal_parseBuffer(This, ptr, len, FALSE); } -static HRESULT internal_parseURL( - saxreader* This, - const WCHAR *url, - BOOL vbInterface) +static HRESULT internal_parseURL(saxreader *reader, const WCHAR *url, BOOL vbInterface) { IMoniker *mon; bsc_t *bsc; HRESULT hr; - TRACE("(%p)->(%s)\n", This, debugstr_w(url)); + TRACE("%p, %s.\n", reader, debugstr_w(url)); + + if (!url && reader->version < MSXML4) + return E_INVALIDARG; hr = create_moniker_from_url(url, &mon); if(FAILED(hr)) return hr; - if(vbInterface) hr = bind_url(mon, internal_vbonDataAvailable, This, &bsc); - else hr = bind_url(mon, internal_onDataAvailable, This, &bsc); + if(vbInterface) hr = bind_url(mon, internal_vbonDataAvailable, reader, &bsc); + else hr = bind_url(mon, internal_onDataAvailable, reader, &bsc); IMoniker_Release(mon); if(FAILED(hr)) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ad093af6a12..20c5e07443b 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2325,6 +2325,22 @@ static void test_saxreader(void) WriteFile(file, testXML, sizeof(testXML)-1, &written, NULL); CloseHandle(file); + /* crashes on newer versions */ + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader30)) + { + IVBSAXXMLReader *vb_reader; + + hr = ISAXXMLReader_parseURL(reader, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = ISAXXMLReader_QueryInterface(reader, &IID_IVBSAXXMLReader, (void **)&vb_reader); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IVBSAXXMLReader_parseURL(vb_reader, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IVBSAXXMLReader_Release(vb_reader); + } + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) || IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) test_seq = content_handler_test1_alternate;

1 0

Nikolay Sivov : mfplay: Handle NULL item in SetMediaItem().
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 66948f8934b8aaca70cd0d2faafb81bfc51e67c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66948f8934b8aaca70cd0d2f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 22 08:22:59 2021 +0300 mfplay: Handle NULL item in SetMediaItem(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 6 +++++- dlls/mfplay/tests/mfplay.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 42b40b99ea1..28226f92962 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1224,12 +1224,16 @@ static HRESULT media_item_create_topology(struct media_player *player, struct me static HRESULT WINAPI media_player_SetMediaItem(IMFPMediaPlayer *iface, IMFPMediaItem *item_iface) { struct media_player *player = impl_from_IMFPMediaPlayer(iface); - struct media_item *item = unsafe_impl_from_IMFPMediaItem(item_iface); + struct media_item *item; IMFTopology *topology; HRESULT hr; TRACE("%p, %p.\n", iface, item_iface); + if (!item_iface) + return E_POINTER; + + item = unsafe_impl_from_IMFPMediaItem(item_iface); if (item->player != iface) return E_INVALIDARG; diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index a2d6da54f3e..438d636daa2 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -198,8 +198,23 @@ static void test_shutdown(void) IMFPMediaPlayer_Release(player); } +static void test_media_item(void) +{ + IMFPMediaPlayer *player; + HRESULT hr; + + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetMediaItem(player, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + IMFPMediaPlayer_Release(player); +} + START_TEST(mfplay) { test_create_player(); test_shutdown(); + test_media_item(); }

1 0

Rémi Bernon : dinput: Set high DIK bit for extended scancodes.
by Alexandre Julliard Oct. 21, 2021

Oct. 21, 2021

Module: wine Branch: master Commit: 7c67ebfd568eaf56f5289596fc03caecba98f6fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c67ebfd568eaf56f5289596… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 21 18:07:46 2021 +0200 dinput: Set high DIK bit for extended scancodes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51910 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/keyboard.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index fb6cf33b911..fd8e9e8fd12 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -80,7 +80,8 @@ static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType, DWORD vers break; } } - return scanCode; + if (scanCode & 0x100) scanCode |= 0x80; + return (BYTE)scanCode; } int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam ) @@ -89,6 +90,7 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa BYTE new_diks, subtype = GET_DIDEVICE_SUBTYPE( This->base.instance.dwDevType ); int dik_code, ret = This->base.dwCoopLevel & DISCL_EXCLUSIVE; KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam; + DWORD scan_code; if (wparam != WM_KEYDOWN && wparam != WM_KEYUP && wparam != WM_SYSKEYDOWN && wparam != WM_SYSKEYUP) @@ -105,9 +107,9 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa case VK_NUMLOCK : dik_code = DIK_NUMLOCK; break; case VK_SUBTRACT: dik_code = DIK_SUBTRACT; break; default: - dik_code = map_dik_code( hook->scanCode & 0xff, hook->vkCode, subtype, - This->base.dinput->dwVersion ); - if (hook->flags & LLKHF_EXTENDED) dik_code |= 0x80; + scan_code = hook->scanCode & 0xff; + if (hook->flags & LLKHF_EXTENDED) scan_code |= 0x100; + dik_code = map_dik_code( scan_code, hook->vkCode, subtype, This->base.dinput->dwVersion ); } new_diks = hook->flags & LLKHF_UP ? 0 : 0x80;

1 0

Alexandre Julliard : winebuild: Wrap 16-bit fake dlls in a PE module.
by Alexandre Julliard Oct. 21, 2021

Oct. 21, 2021

Module: wine Branch: master Commit: 5a8f7d1f745d3fb8fd48d577103ac5068d3c1746 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a8f7d1f745d3fb8fd48d577… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 12:50:13 2021 +0200 winebuild: Wrap 16-bit fake dlls in a PE module. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51564 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/main.c | 3 +- tools/winebuild/spec16.c | 13 +++++---- tools/winebuild/spec32.c | 75 +++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 80 insertions(+), 11 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 45e21f8c462..1a9be3c7ae7 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -727,8 +727,7 @@ int main(int argc, char **argv) if (fake_module) { - if (spec->type == SPEC_WIN16) output_fake_module16( spec ); - else output_fake_module( spec ); + output_fake_module( spec ); break; } if (!is_pe()) diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index e82f5f81d9a..8d4f96ea323 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -829,7 +829,8 @@ void output_fake_module16( DLLSPEC *spec ) const unsigned int lfanew = (0x40 + sizeof(fakedll_signature) + 15) & ~15; const unsigned int segtab = lfanew + 0x40; - unsigned int i, rsrctab, restab, namelen, modtab, imptab, enttab, cbenttab, codeseg, dataseg, rsrcdata; + unsigned int i, rsrctab, restab, namelen, modtab, imptab, enttab, cbenttab, codeseg, dataseg, rsrcdata, rsrc_size = 0; + void *rsrc_ptr = NULL; init_output_buffer(); @@ -843,6 +844,10 @@ void output_fake_module16( DLLSPEC *spec ) restab += output_buffer_pos; free( output_buffer ); init_output_buffer(); + output_bin_res16_data( spec ); + rsrc_ptr = output_buffer; + rsrc_size = output_buffer_pos; + init_output_buffer(); } namelen = strlen( spec->dll_name ); @@ -874,7 +879,7 @@ void output_fake_module16( DLLSPEC *spec ) put_dword( 0 ); put_word( 0 ); /* e_oemid */ put_word( 0 ); /* e_oeminfo */ - put_dword( 0 ); /* e_res2 */ + put_dword( rsrcdata + rsrc_size ); /* e_res2 */ put_dword( 0 ); put_dword( 0 ); put_dword( 0 ); @@ -953,7 +958,5 @@ void output_fake_module16( DLLSPEC *spec ) put_data( data_segment, sizeof(data_segment) ); /* resource data */ - output_bin_res16_data( spec ); - - flush_output_buffer(); + put_data( rsrc_ptr, rsrc_size ); } diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 7a28777fb77..513778ad10c 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -790,13 +790,21 @@ struct dir_data unsigned int size; }; +struct exp_data +{ + unsigned int rva; + const char *name; +}; + static struct { unsigned int section_align; unsigned int file_align; unsigned int sec_count; + unsigned int exp_count; struct dir_data dir[16]; struct sec_data sec[8]; + struct exp_data exp[8]; } pe; static void set_dir( unsigned int idx, unsigned int rva, unsigned int size ) @@ -805,6 +813,13 @@ static void set_dir( unsigned int idx, unsigned int rva, unsigned int size ) pe.dir[idx].size = size; } +static void add_export( unsigned int rva, const char *name ) +{ + pe.exp[pe.exp_count].rva = rva; + pe.exp[pe.exp_count].name = name; + pe.exp_count++; +} + static unsigned int current_rva(void) { if (!pe.sec_count) return pe.section_align; @@ -864,16 +879,68 @@ void output_fake_module( DLLSPEC *spec ) else put_data( exe_code_section, sizeof(exe_code_section) ); flush_output_to_section( ".text", -1, 0x60000020 /* CNT_CODE|MEM_EXECUTE|MEM_READ */ ); + if (spec->type == SPEC_WIN16) + { + add_export( current_rva(), "__wine_spec_dos_header" ); + + /* .rodata section */ + output_fake_module16( spec ); + if (spec->main_module) + { + add_export( current_rva() + output_buffer_pos, "__wine_spec_main_module" ); + put_data( spec->main_module, strlen(spec->main_module) + 1 ); + } + flush_output_to_section( ".rodata", -1, 0x40000040 /* CNT_INITIALIZED_DATA|MEM_READ */ ); + } + + if (pe.exp_count) + { + /* .edata section */ + unsigned int exp_rva = current_rva() + 40; /* sizeof(IMAGE_EXPORT_DIRECTORY) */ + unsigned int pos, str_rva = exp_rva + 10 * pe.exp_count; + + put_dword( 0 ); /* Characteristics */ + put_dword( hash_filename(spec->file_name) ); /* TimeDateStamp */ + put_word( 0 ); /* MajorVersion */ + put_word( 0 ); /* MinorVersion */ + put_dword( str_rva ); /* Name */ + put_dword( 1 ); /* Base */ + put_dword( pe.exp_count ); /* NumberOfFunctions */ + put_dword( pe.exp_count ); /* NumberOfNames */ + put_dword( exp_rva ); /* AddressOfFunctions */ + put_dword( exp_rva + 4 * pe.exp_count ); /* AddressOfNames */ + put_dword( exp_rva + 8 * pe.exp_count ); /* AddressOfNameOrdinals */ + + /* functions */ + for (i = 0; i < pe.exp_count; i++) put_dword( pe.exp[i].rva ); + /* names */ + for (i = 0, pos = str_rva + strlen(spec->file_name) + 1; i < pe.exp_count; i++) + { + put_dword( pos ); + pos += strlen( pe.exp[i].name ) + 1; + } + /* ordinals */ + for (i = 0; i < pe.exp_count; i++) put_word( i ); + /* strings */ + put_data( spec->file_name, strlen(spec->file_name) + 1 ); + for (i = 0; i < pe.exp_count; i++) put_data( pe.exp[i].name, strlen(pe.exp[i].name) + 1 ); + flush_output_to_section( ".edata", 0 /* IMAGE_DIRECTORY_ENTRY_EXPORT */, + 0x40000040 /* CNT_INITIALIZED_DATA|MEM_READ */ ); + } + /* .reloc section */ put_dword( 0 ); /* VirtualAddress */ put_dword( 0 ); /* Size */ flush_output_to_section( ".reloc", 5 /* IMAGE_DIRECTORY_ENTRY_BASERELOC */, 0x42000040 /* CNT_INITIALIZED_DATA|MEM_DISCARDABLE|MEM_READ */ ); - /* .rsrc section */ - output_bin_resources( spec, current_rva() ); - flush_output_to_section( ".rsrc", 2 /* IMAGE_DIRECTORY_ENTRY_RESOURCE */, - 0x40000040 /* CNT_INITIALIZED_DATA|MEM_READ */ ); + if (spec->type == SPEC_WIN32) + { + /* .rsrc section */ + output_bin_resources( spec, current_rva() ); + flush_output_to_section( ".rsrc", 2 /* IMAGE_DIRECTORY_ENTRY_RESOURCE */, + 0x40000040 /* CNT_INITIALIZED_DATA|MEM_READ */ ); + } put_word( 0x5a4d ); /* e_magic */ put_word( 0x40 ); /* e_cblp */

1 0

Bernhard Kölbl : oleaut32: Register a typelib's name if a documentation is not available.
by Alexandre Julliard Oct. 21, 2021

Oct. 21, 2021

Module: wine Branch: master Commit: fdc2d415b0dd5c12c83156bd41161ff135d25105 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdc2d415b0dd5c12c83156bd… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Oct 20 16:21:39 2021 +0200 oleaut32: Register a typelib's name if a documentation is not available. Windows writes a typelib's name into the registry when the typelib doesn't provide a documentation. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 13 +++++++++---- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 78290c94dfe..fd83c3abb8a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -6850,6 +6850,7 @@ static void test_register_typelib(BOOL system_registration) static void test_register_typelib_64(void) { + REGSAM opposite = (sizeof(void*) == 8 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY); ICreateTypeInfo *createti, *createti_co; ELEMDESC elemdesc[5], elemdesc2[5]; FUNCDESC funcdesc, funcdesc2; @@ -6857,6 +6858,7 @@ static void test_register_typelib_64(void) ITypeLib *stdole, *typelib; ICreateTypeLib2 *createtl; WCHAR filename[MAX_PATH]; + BOOL is_wow64 = FALSE; HREFTYPE hreftype; HRESULT hr; @@ -6879,6 +6881,9 @@ static void test_register_typelib_64(void) static const SYSKIND sys = SYS_WIN64; + if (pIsWow64Process) + pIsWow64Process(GetCurrentProcess(), &is_wow64); + hr = LoadTypeLib(wszStdOle2, &stdole); ok(hr == S_OK, "got %08x\n", hr); @@ -7011,6 +7016,11 @@ static void test_register_typelib_64(void) if(typelib) { + WCHAR key_name[MAX_PATH], uuid[40]; + OLECHAR tlb_name[16]; + HKEY hkey; + LONG size; + hr = RegisterTypeLib(typelib, filename, NULL); if (hr == TYPE_E_REGISTRYACCESS) { @@ -7022,6 +7032,35 @@ static void test_register_typelib_64(void) ok(hr == S_OK, "got: %08x\n", hr); ITypeLib_Release(typelib); + + StringFromGUID2(&tlcustguid, uuid, ARRAY_SIZE(uuid)); + swprintf(key_name, sizeof(key_name), L"TypeLib\\%ls\\1.0", uuid); + + hr = RegOpenKeyExW(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ, &hkey); + ok(hr == S_OK, "got %08x\n", hr); + + size = sizeof(tlb_name); + hr = RegQueryValueW(hkey, L"", tlb_name, &size); + ok(hr == S_OK, "got %08x\n", hr); + + /* The typelib should be registered in WoW64_32 and WoW64_64 mode */ + if(is_win64 || is_wow64) + { + hr = RegOpenKeyExW(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ | opposite, &hkey); + ok(hr == S_OK, "got %08x\n", hr); + + if(hkey) + { + size = sizeof(tlb_name); + hr = RegQueryValueW(hkey, L"", tlb_name, &size); + ok(hr == S_OK, "got %08x\n", hr); + + RegCloseKey(hkey); + } + } + + ok(!wcscmp(tlb_name, typelibW), + "Got unexpected TypLib description: %ls\n", tlb_name); } DeleteFileW(filename); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ef546379174..e050726a4ee 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -636,17 +636,22 @@ HRESULT WINAPI RegisterTypeLib(ITypeLib *ptlib, const WCHAR *szFullPath, const W KEY_WRITE, NULL, &key, NULL) == ERROR_SUCCESS) { LPOLESTR doc; + LPOLESTR libName; - /* Set the human-readable name of the typelib */ - if (FAILED(ITypeLib_GetDocumentation(ptlib, -1, NULL, &doc, NULL, NULL))) + /* Set the human-readable name of the typelib to + the typelib's doc, if it exists, else to the typelib's name. */ + if (FAILED(ITypeLib_GetDocumentation(ptlib, -1, &libName, &doc, NULL, NULL))) res = E_FAIL; - else if (doc) + else if (doc || libName) { + WCHAR *name = doc ? doc : libName; + if (RegSetValueExW(key, NULL, 0, REG_SZ, - (BYTE *)doc, (lstrlenW(doc)+1) * sizeof(OLECHAR)) != ERROR_SUCCESS) + (BYTE *)name, (lstrlenW(name)+1) * sizeof(OLECHAR)) != ERROR_SUCCESS) res = E_FAIL; SysFreeString(doc); + SysFreeString(libName); } /* Make up the name of the typelib path subkey */

1 0