wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Zebediah Figura : qcap/tests: Clean up test_AviMux_QueryInterface().
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 9c2dbb55521c309d399f3f187ebb47efc1fc4254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c2dbb55521c309d399f3f18… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 18 21:38:45 2019 -0500 qcap/tests: Clean up test_AviMux_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/Makefile.in | 1 + dlls/qcap/tests/avimux.c | 86 +++++++++++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/qcap.c | 41 --------------------- 3 files changed, 87 insertions(+), 41 deletions(-) diff --git a/dlls/qcap/tests/Makefile.in b/dlls/qcap/tests/Makefile.in index a5b9d0e..7df8e24 100644 --- a/dlls/qcap/tests/Makefile.in +++ b/dlls/qcap/tests/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = strmiids uuid oleaut32 ole32 advapi32 msvfw32 C_SRCS = \ audiorecord.c \ avico.c \ + avimux.c \ qcap.c \ smartteefilter.c \ videocapture.c diff --git a/dlls/qcap/tests/avimux.c b/dlls/qcap/tests/avimux.c new file mode 100644 index 0000000..e204ec7 --- /dev/null +++ b/dlls/qcap/tests/avimux.c @@ -0,0 +1,86 @@ +/* + * AVI muxer filter unit tests + * + * Copyright 2018 Zebediah Figura + * + * 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 COBJMACROS +#include "dshow.h" +#include "vfw.h" +#include "wine/test.h" + +static IBaseFilter *create_avi_mux(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_AviDest, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; +} + +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_avi_mux(); + + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IConfigAviMux, TRUE); + check_interface(filter, &IID_IConfigInterleaving, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IPersistMediaPropertyBag, TRUE); + check_interface(filter, &IID_ISpecifyPropertyPages, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IKsPropertySet, FALSE); + check_interface(filter, &IID_IMediaPosition, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IQualityControl, FALSE); + check_interface(filter, &IID_IQualProp, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + IBaseFilter_Release(filter); +} + +START_TEST(avimux) +{ + CoInitialize(NULL); + + test_interfaces(); + + CoUninitialize(); +} diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index c460991..d880a26 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1131,46 +1131,6 @@ static void init_test_filter(test_filter *This, PIN_DIRECTION dir, filter_type t This->filter_type = type; } -static void test_AviMux_QueryInterface(void) -{ - IUnknown *avimux, *unk; - HRESULT hr; - - hr = CoCreateInstance(&CLSID_AviDest, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&avimux); - ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), - "couldn't create AVI Mux filter, hr = %08x\n", hr); - if(hr != S_OK) { - win_skip("AVI Mux filter is not registered\n"); - return; - } - - hr = IUnknown_QueryInterface(avimux, &IID_IBaseFilter, (void**)&unk); - ok(hr == S_OK, "QueryInterface(IID_IBaseFilter) failed: %x\n", hr); - IUnknown_Release(unk); - - hr = IUnknown_QueryInterface(avimux, &IID_IConfigAviMux, (void**)&unk); - ok(hr == S_OK, "QueryInterface(IID_IConfigAviMux) failed: %x\n", hr); - IUnknown_Release(unk); - - hr = IUnknown_QueryInterface(avimux, &IID_IConfigInterleaving, (void**)&unk); - ok(hr == S_OK, "QueryInterface(IID_IConfigInterleaving) failed: %x\n", hr); - IUnknown_Release(unk); - - hr = IUnknown_QueryInterface(avimux, &IID_IMediaSeeking, (void**)&unk); - ok(hr == S_OK, "QueryInterface(IID_IMediaSeeking) failed: %x\n", hr); - IUnknown_Release(unk); - - hr = IUnknown_QueryInterface(avimux, &IID_IPersistMediaPropertyBag, (void**)&unk); - ok(hr == S_OK, "QueryInterface(IID_IPersistMediaPropertyBag) failed: %x\n", hr); - IUnknown_Release(unk); - - hr = IUnknown_QueryInterface(avimux, &IID_ISpecifyPropertyPages, (void**)&unk); - ok(hr == S_OK, "QueryInterface(IID_ISpecifyPropertyPages) failed: %x\n", hr); - IUnknown_Release(unk); - - IUnknown_Release(avimux); -} - static HRESULT WINAPI MemAllocator_QueryInterface(IMemAllocator *iface, REFIID riid, void **ppvObject) { if(IsEqualIID(riid, &IID_IUnknown)) { @@ -1867,7 +1827,6 @@ START_TEST(qcap) arg_c = winetest_get_mainargs(&arg_v); - test_AviMux_QueryInterface(); test_AviMux(arg_c>2 ? arg_v[2] : NULL); test_COM_vfwcapture();

1 0

Zebediah Figura : quartz/tests: Add some tests for IMediaSeeking on the filter graph.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 554ba1e42bd938cdbf61eea5117e68ebb4c2cae9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=554ba1e42bd938cdbf61eea5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 18 21:38:44 2019 -0500 quartz/tests: Add some tests for IMediaSeeking on the filter graph. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 441 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 427 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=554ba1e42bd938cdbf61…

1 0

Zebediah Figura : setupapi: Don' t fail a queued copy if no copy was necessary.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 8bc25b24af0276985ad080c8364c11cfff3a1fe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bc25b24af0276985ad080c8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 17:36:53 2019 -0500 setupapi: Don't fail a queued copy if no copy was necessary. This fixes a regression introduced by 3e5c9798a80641e0e39e95e4467c60405b22b062. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47219 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 2 +- dlls/setupapi/tests/install.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 4a70c5b..d51a228 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -1309,7 +1309,7 @@ static BOOL queue_copy_file( const WCHAR *source, const WCHAR *dest, if (op->dst_path && !create_full_pathW(op->dst_path)) return FALSE; - if (do_file_copyW(source, dest, op->style, handler, context)) + if (do_file_copyW(source, dest, op->style, handler, context) || GetLastError() == ERROR_SUCCESS) return TRUE; /* try to extract it from the cabinet file */ diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 624751f..a0a4596 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -1468,6 +1468,16 @@ static void test_need_media(void) ok(got_need_media == 1, "Got %u callbacks.\n", got_need_media); ok(delete_file("dst/one.txt"), "Destination file should exist.\n"); + got_need_media = 0; + queue = SetupOpenFileQueue(); + ok(queue != INVALID_HANDLE_VALUE, "Failed to open queue, error %#x.\n", GetLastError()); + ret = SetupQueueCopyA(queue, "src", NULL, "one.txt", "File One", NULL, + "dst", NULL, SP_COPY_WARNIFSKIP | SP_COPY_REPLACEONLY); + ok(ret, "Failed to queue copy, error %#x.\n", GetLastError()); + run_queue(queue, need_media_cb); + ok(got_need_media == 1, "Got %u callbacks.\n", got_need_media); + ok(!file_exists("dst/one.txt"), "Destination file should exist.\n"); + /* Test with a subdirectory. */ got_need_media = 0;

1 0

Zebediah Figura : setupapi: Clear the Win32 error if no copy was necessary.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: a748f685a502891bc8fa5f4719f80b6feb39ac9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a748f685a502891bc8fa5f47… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 17:36:52 2019 -0500 setupapi: Clear the Win32 error if no copy was necessary. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 2 ++ dlls/setupapi/tests/install.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index a0a9012..4a70c5b 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -1145,6 +1145,8 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, rc = CopyFileW(source,target,FALSE); TRACE("Did copy... rc was %i\n",rc); } + else + SetLastError(ERROR_SUCCESS); /* after copy processing */ if (style & SP_COPY_DELETESOURCE) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index c27c9ca..624751f 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -1369,7 +1369,7 @@ static void test_install_file(void) SetLastError(0xdeadbeef); ret = SetupInstallFileA(hinf, &infctx, "one.txt", "src", "one.txt", SP_COPY_REPLACEONLY, NULL, NULL); ok(!ret, "Expected failure.\n"); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "Got unexpected error %#x.\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Got unexpected error %#x.\n", GetLastError()); ok(!file_exists("dst/one.txt"), "Destination file should not exist.\n"); ret = SetupFindFirstLineA(hinf, "section1", "two.txt", &infctx);

1 0

Zebediah Figura : setupapi: Retrieve the default destination path in SetupInstallFile().
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: d5f6d6419b16ef81ce882f01a318189251320fcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5f6d6419b16ef81ce882f01… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 17:36:51 2019 -0500 setupapi: Retrieve the default destination path in SetupInstallFile(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 16 ++++++++++++++-- dlls/setupapi/tests/install.c | 6 +++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index cacab2d..a0a9012 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -1216,7 +1216,7 @@ BOOL WINAPI SetupInstallFileExW( HINF hinf, PINFCONTEXT inf_context, PCWSTR sour static const WCHAR CopyFiles[] = {'C','o','p','y','F','i','l','e','s',0}; BOOL ret, absolute = (root && *root && !(style & SP_COPY_SOURCE_ABSOLUTE)); - WCHAR *buffer, *p, *inf_source = NULL; + WCHAR *buffer, *p, *inf_source = NULL, dest_path[MAX_PATH]; unsigned int len; TRACE("%p %p %s %s %s %x %p %p %p\n", hinf, inf_context, debugstr_w(source), debugstr_w(root), @@ -1224,8 +1224,11 @@ BOOL WINAPI SetupInstallFileExW( HINF hinf, PINFCONTEXT inf_context, PCWSTR sour if (in_use) FIXME("no file in use support\n"); + dest_path[0] = 0; + if (hinf) { + WCHAR *dest_dir; INFCONTEXT ctx; if (!inf_context) @@ -1245,6 +1248,13 @@ BOOL WINAPI SetupInstallFileExW( HINF hinf, PINFCONTEXT inf_context, PCWSTR sour return FALSE; } source = inf_source; + + if ((dest_dir = get_destination_dir( hinf, NULL ))) + { + strcpyW( dest_path, dest_dir ); + strcatW( dest_path, backslashW ); + heap_free( dest_dir ); + } } else if (!source) { @@ -1271,7 +1281,9 @@ BOOL WINAPI SetupInstallFileExW( HINF hinf, PINFCONTEXT inf_context, PCWSTR sour while (*source == '\\') source++; strcpyW( p, source ); - ret = do_file_copyW( buffer, dest, style, handler, context ); + strcatW( dest_path, dest ); + + ret = do_file_copyW( buffer, dest_path, style, handler, context ); HeapFree( GetProcessHeap(), 0, inf_source ); HeapFree( GetProcessHeap(), 0, buffer ); diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 3677e0e..c27c9ca 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -1364,11 +1364,11 @@ static void test_install_file(void) ret = SetupInstallFileA(hinf, &infctx, "one.txt", "src", "one.txt", 0, NULL, NULL); ok(ret, "Expected success.\n"); ok(GetLastError() == ERROR_SUCCESS, "Got unexpected error %#x.\n", GetLastError()); - todo_wine ok(delete_file("dst/one.txt"), "Destination file should exist.\n"); + ok(delete_file("dst/one.txt"), "Destination file should exist.\n"); SetLastError(0xdeadbeef); ret = SetupInstallFileA(hinf, &infctx, "one.txt", "src", "one.txt", SP_COPY_REPLACEONLY, NULL, NULL); - todo_wine ok(!ret, "Expected failure.\n"); + ok(!ret, "Expected failure.\n"); todo_wine ok(GetLastError() == ERROR_SUCCESS, "Got unexpected error %#x.\n", GetLastError()); ok(!file_exists("dst/one.txt"), "Destination file should not exist.\n"); @@ -1394,7 +1394,7 @@ static void test_install_file(void) ret = SetupInstallFileA(hinf, &infctx, "three.txt", "src/alpha", "three.txt", 0, NULL, NULL); ok(ret, "Expected success.\n"); ok(GetLastError() == ERROR_SUCCESS, "Got unexpected error %#x.\n", GetLastError()); - todo_wine ok(delete_file("dst/three.txt"), "Destination file should exist.\n"); + ok(delete_file("dst/three.txt"), "Destination file should exist.\n"); SetupCloseInfFile(hinf); delete_file("src/one.txt");

1 0

Zebediah Figura : setupapi/tests: Add some tests for SetupInstallFile().
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 2ddc60c8f0276c739b2f512397d32e1b9425e4b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ddc60c8f0276c739b2f5123… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 17:36:50 2019 -0500 setupapi/tests: Add some tests for SetupInstallFile(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 91 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 85f532a..3677e0e 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -1317,6 +1317,96 @@ static void run_queue_(unsigned int line, HSPFILEQ queue, PSP_FILE_CALLBACK_A cb ok_(__FILE__,line)(ret, "Failed to close queue, error %#x.\n", GetLastError()); } +static void test_install_file(void) +{ + static const char inf_data[] = "[Version]\n" + "Signature=\"$Chicago$\"\n" + "[section1]\n" + "one.txt\n" + "two.txt\n" + "three.txt\n" + "[SourceDisksNames]\n" + "1=heis\n" + "2=duo,,,alpha\n" + "[SourceDisksFiles]\n" + "one.txt=1\n" + "two.txt=1,beta\n" + "three.txt=2\n" + "[DestinationDirs]\n" + "DefaultDestDir=40000,dst\n"; + + char path[MAX_PATH]; + INFCONTEXT infctx; + HINF hinf; + BOOL ret; + + create_inf_file(inffile, inf_data); + + sprintf(path, "%s\\%s", CURR_DIR, inffile); + hinf = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + ok(hinf != INVALID_HANDLE_VALUE, "Failed to open INF file, error %#x.\n", GetLastError()); + + ret = CreateDirectoryA("src", NULL); + ok(ret, "Failed to create test directory, error %u.\n", GetLastError()); + ret = CreateDirectoryA("src/alpha", NULL); + ok(ret, "Failed to create test directory, error %u.\n", GetLastError()); + ret = CreateDirectoryA("src/beta", NULL); + ok(ret, "Failed to create test directory, error %u.\n", GetLastError()); + ret = CreateDirectoryA("dst", NULL); + ok(ret, "Failed to create test directory, error %u.\n", GetLastError()); + create_file("src/one.txt"); + create_file("src/beta/two.txt"); + create_file("src/alpha/three.txt"); + + ret = SetupFindFirstLineA(hinf, "section1", "one.txt", &infctx); + ok(ret, "Failed to find line.\n"); + SetLastError(0xdeadbeef); + ret = SetupInstallFileA(hinf, &infctx, "one.txt", "src", "one.txt", 0, NULL, NULL); + ok(ret, "Expected success.\n"); + ok(GetLastError() == ERROR_SUCCESS, "Got unexpected error %#x.\n", GetLastError()); + todo_wine ok(delete_file("dst/one.txt"), "Destination file should exist.\n"); + + SetLastError(0xdeadbeef); + ret = SetupInstallFileA(hinf, &infctx, "one.txt", "src", "one.txt", SP_COPY_REPLACEONLY, NULL, NULL); + todo_wine ok(!ret, "Expected failure.\n"); + todo_wine ok(GetLastError() == ERROR_SUCCESS, "Got unexpected error %#x.\n", GetLastError()); + ok(!file_exists("dst/one.txt"), "Destination file should not exist.\n"); + + ret = SetupFindFirstLineA(hinf, "section1", "two.txt", &infctx); + ok(ret, "Failed to find line.\n"); + SetLastError(0xdeadbeef); + ret = SetupInstallFileA(hinf, &infctx, "two.txt", "src", "two.txt", 0, NULL, NULL); + todo_wine ok(ret, "Expected success.\n"); + todo_wine ok(GetLastError() == ERROR_SUCCESS, "Got unexpected error %#x.\n", GetLastError()); + todo_wine ok(delete_file("dst/two.txt"), "Destination file should exist.\n"); + + ret = SetupFindFirstLineA(hinf, "section1", "three.txt", &infctx); + ok(ret, "Failed to find line.\n"); + SetLastError(0xdeadbeef); + ret = SetupInstallFileA(hinf, &infctx, "three.txt", "src", "three.txt", 0, NULL, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Got unexpected error %#x.\n", GetLastError()); + ok(!file_exists("dst/three.txt"), "Destination file should not exist.\n"); + + ret = SetupFindFirstLineA(hinf, "section1", "three.txt", &infctx); + ok(ret, "Failed to find line.\n"); + SetLastError(0xdeadbeef); + ret = SetupInstallFileA(hinf, &infctx, "three.txt", "src/alpha", "three.txt", 0, NULL, NULL); + ok(ret, "Expected success.\n"); + ok(GetLastError() == ERROR_SUCCESS, "Got unexpected error %#x.\n", GetLastError()); + todo_wine ok(delete_file("dst/three.txt"), "Destination file should exist.\n"); + + SetupCloseInfFile(hinf); + delete_file("src/one.txt"); + delete_file("src/beta/two.txt"); + delete_file("src/beta/"); + delete_file("src/alpha/three.txt"); + delete_file("src/alpha/"); + delete_file("src/"); + delete_file("dst/"); + ok(delete_file(inffile), "Failed to delete INF file.\n"); +} + static void test_need_media(void) { static const char inf_data[] = "[Version]\n" @@ -1857,6 +1947,7 @@ START_TEST(install) test_install_files_queue(); test_need_media(); test_close_queue(); + test_install_file(); UnhookWindowsHookEx(hhook);

1 0

Alexandre Julliard : winedump: Print fake dll information also for NE files.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: ddadd9d84be8b241c0322623647d723848df7cd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddadd9d84be8b241c0322623… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 18 09:37:24 2019 +0200 winedump: Print fake dll information also for NE files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/ne.c | 1 + tools/winedump/pe.c | 2 +- tools/winedump/winedump.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/winedump/ne.c b/tools/winedump/ne.c index ae0388b..b4f4f89 100644 --- a/tools/winedump/ne.c +++ b/tools/winedump/ne.c @@ -427,6 +427,7 @@ void ne_dump( void ) dos = PRD(0, sizeof(*dos)); if (!dos) return; ne = PRD(dos->e_lfanew, sizeof(*ne)); + print_fake_dll(); if (globals.do_dumpheader || !globals.dumpsect) dump_ne_header( ne ); diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index d33e8ef..d24e30a 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -98,7 +98,7 @@ static const IMAGE_NT_HEADERS32 *get_nt_header( void ) return PRD(dos->e_lfanew, sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER)); } -static void print_fake_dll( void ) +void print_fake_dll( void ) { static const char builtin_signature[] = "Wine builtin DLL"; static const char fakedll_signature[] = "Wine placeholder DLL"; diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index ea95b27..c165872 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -228,6 +228,7 @@ unsigned int strlenW( const unsigned short *str ); void dump_unicode_str( const unsigned short *str, int len ); const char* get_guid_str(const GUID* guid); const char* get_symbol_str(const char* symname); +void print_fake_dll(void); void dump_file_header(const IMAGE_FILE_HEADER *); void dump_optional_header(const IMAGE_OPTIONAL_HEADER32 *, UINT); void dump_section(const IMAGE_SECTION_HEADER *, const char* strtable);

1 0

Alexandre Julliard : setupapi: Extract the 16-bit fake dll from the 32-bit PE one.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 16851b1c122e83549522ed01c3a303c2f2ca9097 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16851b1c122e83549522ed01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 18 09:29:04 2019 +0200 setupapi: Extract the 16-bit fake dll from the 32-bit PE one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 260eb1e..2802aed 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -190,6 +190,50 @@ failed: return FALSE; } +static int is_valid_ptr( const void *data, SIZE_T size, const void *ptr, SIZE_T ptr_size ) +{ + if (ptr < data) return 0; + if ((char *)ptr - (char *)data >= size) return 0; + return (size - ((char *)ptr - (char *)data) >= ptr_size); +} + +/* extract the 16-bit NE dll from a PE builtin */ +static void extract_16bit_image( IMAGE_NT_HEADERS *nt, void **data, SIZE_T *size ) +{ + DWORD exp_size, *size_ptr; + IMAGE_DOS_HEADER *dos; + IMAGE_EXPORT_DIRECTORY *exports; + IMAGE_SECTION_HEADER *section = NULL; + WORD *ordinals; + DWORD *names, *functions; + int i; + + exports = RtlImageDirectoryEntryToData( *data, FALSE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ); + if (!is_valid_ptr( *data, *size, exports, exp_size )) return; + ordinals = RtlImageRvaToVa( nt, *data, exports->AddressOfNameOrdinals, &section ); + names = RtlImageRvaToVa( nt, *data, exports->AddressOfNames, &section ); + functions = RtlImageRvaToVa( nt, *data, exports->AddressOfFunctions, &section ); + if (!is_valid_ptr( *data, *size, ordinals, exports->NumberOfNames * sizeof(*ordinals) )) return; + if (!is_valid_ptr( *data, *size, names, exports->NumberOfNames * sizeof(*names) )) return; + + for (i = 0; i < exports->NumberOfNames; i++) + { + char *ename = RtlImageRvaToVa( nt, *data, names[i], &section ); + if (strcmp( ename, "__wine_spec_dos_header" )) continue; + if (ordinals[i] >= exports->NumberOfFunctions) return; + if (!is_valid_ptr( *data, *size, functions, sizeof(*functions) )) return; + if (!functions[ordinals[i]]) return; + dos = RtlImageRvaToVa( nt, *data, functions[ordinals[i]], NULL ); + if (!is_valid_ptr( *data, *size, dos, sizeof(*dos) )) return; + if (dos->e_magic != IMAGE_DOS_SIGNATURE) return; + size_ptr = (DWORD *)dos->e_res2; + *size = min( *size_ptr, *size - ((const char *)dos - (const char *)*data) ); + *size_ptr = 0; + *data = dos; + break; + } +} + /* read in the contents of a file into the global file buffer */ /* return 1 on success, 0 on nonexistent file, -1 on other error */ static int read_file( const char *name, void **data, SIZE_T *size, BOOL expect_builtin ) @@ -238,6 +282,8 @@ static int read_file( const char *name, void **data, SIZE_T *size, BOOL expect_b st.st_size - header_size, header_size ) == st.st_size - header_size) { *data = file_buffer; + if (strlen(name) > 2 && !strcmp( name + strlen(name) - 2, "16" )) + extract_16bit_image( nt, data, size ); ret = 1; } done:

1 0

Alexandre Julliard : makefiles: Support cross-compilation of 16-bit libraries.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: c4e0b9d0925529faec050f023c669f7c58c1c5dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4e0b9d0925529faec050f02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 18 09:22:26 2019 +0200 makefiles: Support cross-compilation of 16-bit libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/exe16_entry.c | 2 +- tools/makedep.c | 20 ++++++++++++++------ tools/winegcc/winegcc.c | 5 +---- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/winecrt0/exe16_entry.c b/dlls/winecrt0/exe16_entry.c index 1e477bd..e6823b2 100644 --- a/dlls/winecrt0/exe16_entry.c +++ b/dlls/winecrt0/exe16_entry.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#if defined(__i386__) && !defined(_WIN32) +#ifdef __i386__ #include <stdarg.h> #include "windef.h" diff --git a/tools/makedep.c b/tools/makedep.c index 7ed9efd..23b3389 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3221,9 +3221,11 @@ static void output_module( struct makefile *make ) { strarray_add( &make->clean_files, strmake( "lib%s.def", make->importlib )); output( "%s.def: %s %s\n", importlib_path, tools_path( make, "winebuild" ), spec_file ); - output( "\t%s -w --def -o $@ --export %s", tools_path( make, "winebuild" ), spec_file ); + output( "\t%s -w --def -o $@", tools_path( make, "winebuild" ) ); output_filenames( target_flags ); if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); output( "\n" ); add_install_rule( make, make->importlib, strmake( "lib%s.def", make->importlib ), @@ -3240,8 +3242,11 @@ static void output_module( struct makefile *make ) output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); output_filenames_obj_dir( make, make->implib_objs ); output( "\n" ); - output( "\t%s -w --implib -o $@ --export %s", tools_path( make, "winebuild" ), spec_file ); + output( "\t%s -w --implib -o $@", tools_path( make, "winebuild" ) ); output_filenames( target_flags ); + if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); output_filenames_obj_dir( make, make->implib_objs ); output( "\n" ); add_install_rule( make, make->importlib, @@ -3264,8 +3269,10 @@ static void output_module( struct makefile *make ) output( ": %s %s", tools_path( make, "winebuild" ), spec_file ); output_filenames_obj_dir( make, cross_files ); output( "\n" ); - output( "\t%s -b %s -w --implib -o $@ --export %s", - tools_path( make, "winebuild" ), crosstarget, spec_file ); + output( "\t%s -b %s -w --implib -o $@", tools_path( make, "winebuild" ), crosstarget ); + if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); output_filenames_obj_dir( make, cross_files ); output( "\n" ); } @@ -3586,6 +3593,7 @@ static void output_subdirs( struct makefile *make ) output_filename( tools_path( make, "winebuild" )); output( "\n" ); output( "\t%s -b %s -w -o $@", tools_path( make, "winebuild" ), crosstarget ); + if (submake->is_win16) output_filename( "-m16" ); output_filename( "--implib" ); output_filename( "--export" ); output_filename( spec_file ); @@ -4175,14 +4183,14 @@ static void load_sources( struct makefile *make ) LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file ); - if (crosstarget && !make->is_win16 && !strarray_exists( &make->imports, "kernel" )) - make->is_cross = (make->testdll || make->use_msvcrt || !has_object_file( make )); + if (crosstarget) make->is_cross = (make->testdll || make->use_msvcrt || !has_object_file( make )); if (make->is_cross) { for (i = 0; i < make->imports.count; i++) strarray_add_uniq( &cross_import_libs, make->imports.str[i] ); if (make->use_msvcrt) strarray_add_uniq( &cross_import_libs, "msvcrt" ); + if (make->is_win16) strarray_add_uniq( &cross_import_libs, "kernel" ); strarray_add_uniq( &cross_import_libs, "winecrt0" ); strarray_add_uniq( &cross_import_libs, "kernel32" ); strarray_add_uniq( &cross_import_libs, "ntdll" ); diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 28dce1b..242df38 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -429,7 +429,7 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) case PLATFORM_WINDOWS: case PLATFORM_CYGWIN: - if (opts->shared) + if (opts->shared || opts->win16_app) { strarray_add( flags, "-shared" ); strarray_add( flags, "-Wl,--kill-at" ); @@ -999,9 +999,6 @@ static void build(struct options* opts) lang = file; } - if (opts->win16_app && is_pe) - error( "Building 16-bit code is not supported for Windows\n" ); - /* add the default libraries, if needed */ if (!opts->wine_objdir && !opts->nodefaultlibs)

1 0

Alexandre Julliard : winebuild: Add 16-bit support for PE builds.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: d58953b3002a749eeb584531319afb02011cd16a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d58953b3002a749eeb584531… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 18 09:21:49 2019 +0200 winebuild: Add 16-bit support for PE builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec16.c | 17 +++++++++++------ tools/winebuild/utils.c | 39 ++++++++++++++++++++++++++++----------- 2 files changed, 39 insertions(+), 17 deletions(-) diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index 9dce748..b21f472 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -55,6 +55,8 @@ static const char * const nop_sequence[4] = ".byte 0x8d,0x74,0x26,0x00,0x8d,0x74,0x26,0x00" /* lea 0x00(%esi),%esi; lea 0x00(%esi),%esi */ }; +static const char fakedll_signature[] = "Wine placeholder DLL"; + static inline int is_function( const ORDDEF *odp ) { if (odp->flags & FLAG_EXPORT32) return 0; @@ -565,7 +567,7 @@ static void output_module16( DLLSPEC *spec ) output( "\n/* module data */\n\n" ); output( "\t.data\n" ); - output( "\t.align %d\n", get_alignment(4) ); + output( "\t.align %d\n", get_alignment(16) ); output( ".L__wine_spec_dos_header:\n" ); output( "\t.short 0x5a4d\n" ); /* e_magic */ output( "\t.short 0\n" ); /* e_cblp */ @@ -584,9 +586,12 @@ static void output_module16( DLLSPEC *spec ) output( "\t.short 0,0,0,0\n" ); /* e_res */ output( "\t.short 0\n" ); /* e_oemid */ output( "\t.short 0\n" ); /* e_oeminfo */ - output( ".Lwine_ldt_copy_ptr:\t.long 0,0,0,0,0\n" ); /* e_res2, used for ldt_copy */ + output( ".Lwine_ldt_copy_ptr:\n" ); /* e_res2, used for private data */ + output( "\t.long .L__wine_spec_ne_header_end-.L__wine_spec_dos_header,0,0,0,0\n" ); output( "\t.long .L__wine_spec_ne_header-.L__wine_spec_dos_header\n" );/* e_lfanew */ + output( "\t%s \"%s\"\n", get_asm_string_keyword(), fakedll_signature ); + output( "\t.align %d\n", get_alignment(16) ); output( ".L__wine_spec_ne_header:\n" ); output( "\t.short 0x454e\n" ); /* ne_magic */ output( "\t.byte 0\n" ); /* ne_ver */ @@ -755,7 +760,7 @@ static void output_module16( DLLSPEC *spec ) output( ".L__wine_%s_%u:\n", spec->c_name, i ); output( "\tpushw %%bp\n" ); output( "\tpushl $%s\n", - asm_name( odp->type == TYPE_STUB ? get_stub_name( odp, spec ) : odp->link_name )); + asm_name( odp->type == TYPE_STUB ? get_stub_name( odp, spec ) : get_link_name( odp ))); output( "\tcallw .L__wine_spec_callfrom16_%s\n", get_callfrom16_name( odp ) ); } output( ".L__wine_spec_code_segment_end:\n" ); @@ -784,6 +789,7 @@ static void output_module16( DLLSPEC *spec ) output_res16_data( spec ); } + output( ".L__wine_spec_ne_header_end:\n" ); output( "\t.byte 0\n" ); /* make sure the last symbol points to something */ /* relay functions */ @@ -815,11 +821,11 @@ void output_spec16_file( DLLSPEC *spec16 ) needs_get_pc_thunk = 0; open_output_file(); output_standard_file_header(); - output_module( spec32 ); + if (target_platform != PLATFORM_WINDOWS) output_module( spec32 ); output_module16( spec16 ); output_stubs( spec16 ); output_exports( spec32 ); - output_imports( spec16 ); + if (target_platform != PLATFORM_WINDOWS) output_imports( spec16 ); if (is_undefined( "__wine_call_from_16" )) output_asm_relays16(); if (needs_get_pc_thunk) output_get_pc_thunk(); if (spec16->main_module) @@ -842,7 +848,6 @@ void output_fake_module16( DLLSPEC *spec ) { static const unsigned char code_segment[] = { 0x90, 0xc3 }; static const unsigned char data_segment[16] = { 0 }; - static const char fakedll_signature[] = "Wine placeholder DLL"; const unsigned int cseg = 2; const unsigned int lfanew = (0x40 + sizeof(fakedll_signature) + 15) & ~15; const unsigned int segtab = lfanew + 0x40; diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 315643c..dbfe7a4 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -900,20 +900,37 @@ const char *get_link_name( const ORDDEF *odp ) char *ret; if (target_cpu != CPU_x86) return odp->link_name; - if (odp->type != TYPE_STDCALL) return odp->link_name; - if (target_platform == PLATFORM_WINDOWS) + switch (odp->type) { - if (odp->flags & FLAG_THISCALL) return odp->link_name; - if (odp->flags & FLAG_FASTCALL) ret = strmake( "@%s@%u", odp->link_name, get_args_size( odp )); - else if (!kill_at) ret = strmake( "%s@%u", odp->link_name, get_args_size( odp )); - else return odp->link_name; - } - else - { - if (odp->flags & FLAG_THISCALL) ret = strmake( "__thiscall_%s", odp->link_name ); - else if (odp->flags & FLAG_FASTCALL) ret = strmake( "__fastcall_%s", odp->link_name ); + case TYPE_STDCALL: + if (target_platform == PLATFORM_WINDOWS) + { + if (odp->flags & FLAG_THISCALL) return odp->link_name; + if (odp->flags & FLAG_FASTCALL) ret = strmake( "@%s@%u", odp->link_name, get_args_size( odp )); + else if (!kill_at) ret = strmake( "%s@%u", odp->link_name, get_args_size( odp )); + else return odp->link_name; + } + else + { + if (odp->flags & FLAG_THISCALL) ret = strmake( "__thiscall_%s", odp->link_name ); + else if (odp->flags & FLAG_FASTCALL) ret = strmake( "__fastcall_%s", odp->link_name ); + else return odp->link_name; + } + break; + + case TYPE_PASCAL: + if (target_platform == PLATFORM_WINDOWS && !kill_at) + { + int args = get_args_size( odp ); + if (odp->flags & FLAG_REGISTER) args += get_ptr_size(); /* context argument */ + ret = strmake( "%s@%u", odp->link_name, args ); + } else return odp->link_name; + break; + + default: + return odp->link_name; } free( buffer );

1 0

Jump to page:

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-commits May 2019