wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Piotr Caban : msvcrt: Don't crash on NULL in fclose.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: bb637469e13fe33220ca8eef95a26608b343d92a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb637469e13fe33220ca8eef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 11 16:15:32 2021 +0200 msvcrt: Don't crash on NULL in fclose. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 4 ++++ dlls/msvcrt/tests/file.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b0eeaf2a351..da43316ebb8 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3616,6 +3616,8 @@ int CDECL fclose(FILE* file) { int ret; + if (!MSVCRT_CHECK_PMT(file != NULL)) return EOF; + _lock_file(file); ret = _fclose_nolock(file); _unlock_file(file); @@ -3630,6 +3632,8 @@ int CDECL _fclose_nolock(FILE* file) { int r, flag; + if (!MSVCRT_CHECK_PMT(file != NULL)) return EOF; + if(!(file->_flag & (_IOREAD | _IOWRT | _IORW))) { file->_flag = 0; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 1d74c6135b8..7a33ae24230 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1878,6 +1878,9 @@ static void test_fopen_fclose_fcloseall( void ) ret = fclose(stream3); ok(ret == EOF, "Closing file '%s' returned %d\n", fname3, ret); ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ret = fclose(NULL); + ok(ret == EOF, "Closing NULL file returned %d\n", ret); + ok(errno = EINVAL, "errno = %d\n", errno); /* testing fcloseall() */ numclosed = _fcloseall();

1 0

Piotr Caban : ucrtbase: Add __std_terminate export.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 776c840aa5edf2bd0bd0617a673cf4e8f9ba48b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=776c840aa5edf2bd0bd0617a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 11 16:15:27 2021 +0200 ucrtbase: Add __std_terminate export. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 1 + dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 246dde7dbdf..ea6cfa2a7f9 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -45,7 +45,7 @@ @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy @ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy -@ cdecl __std_terminate() ucrtbase.terminate +@ cdecl __std_terminate() ucrtbase.__std_terminate @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ cdecl __std_type_info_destroy_list(ptr) ucrtbase.__std_type_info_destroy_list @ cdecl __std_type_info_hash(ptr) ucrtbase.__std_type_info_hash diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index cc6f2e70f6b..d39387d5f00 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -142,6 +142,7 @@ @ cdecl __setusermatherr(ptr) @ cdecl __std_exception_copy(ptr ptr) @ cdecl __std_exception_destroy(ptr) +@ cdecl __std_terminate() terminate @ cdecl __std_type_info_compare(ptr ptr) @ cdecl __std_type_info_destroy_list(ptr) @ cdecl __std_type_info_hash(ptr) diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index f799bcd4db5..9ca10cc2a70 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -38,7 +38,7 @@ @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy @ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy -@ cdecl __std_terminate() ucrtbase.terminate +@ cdecl __std_terminate() ucrtbase.__std_terminate @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ cdecl __std_type_info_destroy_list(ptr) ucrtbase.__std_type_info_destroy_list @ cdecl __std_type_info_hash(ptr) ucrtbase.__std_type_info_hash

1 0

Alistair Leslie-Hughes : wininet: Support option INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT for http requests.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 64728c618f73fd80993cb5dfa852f608f9b85d9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=64728c618f73fd80993cb5df… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 11 16:17:40 2021 +0200 wininet: Support option INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT for http requests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 13 +++++++++++++ dlls/wininet/tests/http.c | 15 +++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c9c4a060aac..1ca97cf3eb0 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2321,6 +2321,19 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *(ULONG*)buffer = hdr->ErrorMask; *size = sizeof(ULONG); + return ERROR_SUCCESS; + case INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT: + TRACE("INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT\n"); + + if (*size < sizeof(PCCERT_CHAIN_CONTEXT)) + return ERROR_INSUFFICIENT_BUFFER; + + if (!req->server->cert_chain) + return ERROR_INTERNET_INCORRECT_HANDLE_STATE; + + *(PCCERT_CHAIN_CONTEXT *)buffer = CertDuplicateCertificateChain(req->server->cert_chain); + *size = sizeof(PCCERT_CHAIN_CONTEXT); + return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index d1d7e678853..3b8f16a9fb2 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6855,6 +6855,7 @@ static void test_secure_connection(void) INTERNET_CERTIFICATE_INFOW *certificate_structW = NULL; char certstr1[512], certstr2[512]; BOOL ret; + PCCERT_CHAIN_CONTEXT chain; ses = InternetOpenA("Gizmo5", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); @@ -6886,6 +6887,13 @@ static void test_secure_connection(void) test_cert_struct(req, &test_winehq_org_cert); + size = sizeof(chain); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT, &chain, &size); + ok(ret || GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE /* < IE8 */, + "InternetQueryOption failed: %u\n", GetLastError()); + if (ret) CertFreeCertificateChain(chain); + /* Querying the same option through InternetQueryOptionW still results in * ANSI strings being returned. */ @@ -7825,6 +7833,7 @@ static void test_cert_string(void) char actual[512]; DWORD size; BOOL res; + PCCERT_CHAIN_CONTEXT chain; ses = InternetOpenA( "winetest", 0, NULL, NULL, 0 ); ok( ses != NULL, "InternetOpenA failed\n" ); @@ -7845,6 +7854,12 @@ static void test_cert_string(void) ok( size == 0, "unexpected size: %u\n", size ); ok( actual[0] == 0x55, "unexpected byte: %02x\n", actual[0] ); + size = sizeof(chain); + SetLastError(0xdeadbeef); + res = InternetQueryOptionA(req, INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT, &chain, &size); + ok(!res && (GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_STATE), + "InternetQueryOption failed: %u\n", GetLastError()); + InternetCloseHandle( req ); InternetCloseHandle( con ); InternetCloseHandle( ses );

1 0

Alexandre Julliard : wmcodecdspuuid: Move to the libs directory.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 83ca429073a4f9918013453021308c514fb15ed9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83ca429073a4f99180134530… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:34:03 2021 +0200 wmcodecdspuuid: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/wmcodecdspuuid/Makefile.in | 0 {dlls => libs}/wmcodecdspuuid/wmcodecdspuuid.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index fb8cd48920a..959c08e5506 100755 --- a/configure +++ b/configure @@ -1711,7 +1711,6 @@ enable_wlanapi enable_wlanui enable_wldap32 enable_wmasf -enable_wmcodecdspuuid enable_wmi enable_wmiutils enable_wmp @@ -1787,6 +1786,7 @@ enable_strmiids enable_uuid enable_wbemuuid enable_wine +enable_wmcodecdspuuid enable_loader enable_nls enable_po @@ -20833,7 +20833,6 @@ wine_fn_config_makefile dlls/wlanui enable_wlanui wine_fn_config_makefile dlls/wldap32 enable_wldap32 wine_fn_config_makefile dlls/wldap32/tests enable_tests wine_fn_config_makefile dlls/wmasf enable_wmasf -wine_fn_config_makefile dlls/wmcodecdspuuid enable_wmcodecdspuuid wine_fn_config_makefile dlls/wmi enable_wmi wine_fn_config_makefile dlls/wmiutils enable_wmiutils wine_fn_config_makefile dlls/wmiutils/tests enable_tests @@ -20923,6 +20922,7 @@ wine_fn_config_makefile libs/strmiids enable_strmiids wine_fn_config_makefile libs/uuid enable_uuid wine_fn_config_makefile libs/wbemuuid enable_wbemuuid wine_fn_config_makefile libs/wine enable_wine +wine_fn_config_makefile libs/wmcodecdspuuid enable_wmcodecdspuuid wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls wine_fn_config_makefile po enable_po diff --git a/configure.ac b/configure.ac index 5732f5aad70..4eecb1f24f4 100644 --- a/configure.ac +++ b/configure.ac @@ -3720,7 +3720,6 @@ WINE_CONFIG_MAKEFILE(dlls/wlanui) WINE_CONFIG_MAKEFILE(dlls/wldap32) WINE_CONFIG_MAKEFILE(dlls/wldap32/tests) WINE_CONFIG_MAKEFILE(dlls/wmasf) -WINE_CONFIG_MAKEFILE(dlls/wmcodecdspuuid) WINE_CONFIG_MAKEFILE(dlls/wmi) WINE_CONFIG_MAKEFILE(dlls/wmiutils) WINE_CONFIG_MAKEFILE(dlls/wmiutils/tests) @@ -3810,6 +3809,7 @@ WINE_CONFIG_MAKEFILE(libs/strmiids) WINE_CONFIG_MAKEFILE(libs/uuid) WINE_CONFIG_MAKEFILE(libs/wbemuuid) WINE_CONFIG_MAKEFILE(libs/wine) +WINE_CONFIG_MAKEFILE(libs/wmcodecdspuuid) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) WINE_CONFIG_MAKEFILE(po) diff --git a/dlls/wmcodecdspuuid/Makefile.in b/libs/wmcodecdspuuid/Makefile.in similarity index 100% rename from dlls/wmcodecdspuuid/Makefile.in rename to libs/wmcodecdspuuid/Makefile.in diff --git a/dlls/wmcodecdspuuid/wmcodecdspuuid.c b/libs/wmcodecdspuuid/wmcodecdspuuid.c similarity index 100% rename from dlls/wmcodecdspuuid/wmcodecdspuuid.c rename to libs/wmcodecdspuuid/wmcodecdspuuid.c

1 0

Alexandre Julliard : wbemuuid: Move to the libs directory.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: cbf9a44ee4b990b7ebea9be6c6fec2589d76065a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbf9a44ee4b990b7ebea9be6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:33:31 2021 +0200 wbemuuid: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/wbemuuid/Makefile.in | 0 {dlls => libs}/wbemuuid/wbemuuid.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 8b50a693e73..fb8cd48920a 100755 --- a/configure +++ b/configure @@ -1662,7 +1662,6 @@ enable_vssapi enable_vulkan_1 enable_wbemdisp enable_wbemprox -enable_wbemuuid enable_wdscore enable_webservices enable_websocket @@ -1786,6 +1785,7 @@ enable_dxguid enable_mfuuid enable_strmiids enable_uuid +enable_wbemuuid enable_wine enable_loader enable_nls @@ -20757,7 +20757,6 @@ wine_fn_config_makefile dlls/wbemdisp enable_wbemdisp wine_fn_config_makefile dlls/wbemdisp/tests enable_tests wine_fn_config_makefile dlls/wbemprox enable_wbemprox wine_fn_config_makefile dlls/wbemprox/tests enable_tests -wine_fn_config_makefile dlls/wbemuuid enable_wbemuuid wine_fn_config_makefile dlls/wdscore enable_wdscore wine_fn_config_makefile dlls/webservices enable_webservices wine_fn_config_makefile dlls/webservices/tests enable_tests @@ -20922,6 +20921,7 @@ wine_fn_config_makefile libs/dxguid enable_dxguid wine_fn_config_makefile libs/mfuuid enable_mfuuid wine_fn_config_makefile libs/strmiids enable_strmiids wine_fn_config_makefile libs/uuid enable_uuid +wine_fn_config_makefile libs/wbemuuid enable_wbemuuid wine_fn_config_makefile libs/wine enable_wine wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls diff --git a/configure.ac b/configure.ac index 8c35b36952b..5732f5aad70 100644 --- a/configure.ac +++ b/configure.ac @@ -3644,7 +3644,6 @@ WINE_CONFIG_MAKEFILE(dlls/wbemdisp) WINE_CONFIG_MAKEFILE(dlls/wbemdisp/tests) WINE_CONFIG_MAKEFILE(dlls/wbemprox) WINE_CONFIG_MAKEFILE(dlls/wbemprox/tests) -WINE_CONFIG_MAKEFILE(dlls/wbemuuid) WINE_CONFIG_MAKEFILE(dlls/wdscore) WINE_CONFIG_MAKEFILE(dlls/webservices) WINE_CONFIG_MAKEFILE(dlls/webservices/tests) @@ -3809,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(libs/dxguid) WINE_CONFIG_MAKEFILE(libs/mfuuid) WINE_CONFIG_MAKEFILE(libs/strmiids) WINE_CONFIG_MAKEFILE(libs/uuid) +WINE_CONFIG_MAKEFILE(libs/wbemuuid) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/dlls/wbemuuid/Makefile.in b/libs/wbemuuid/Makefile.in similarity index 100% rename from dlls/wbemuuid/Makefile.in rename to libs/wbemuuid/Makefile.in diff --git a/dlls/wbemuuid/wbemuuid.c b/libs/wbemuuid/wbemuuid.c similarity index 100% rename from dlls/wbemuuid/wbemuuid.c rename to libs/wbemuuid/wbemuuid.c

1 0

Alexandre Julliard : uuid: Move to the libs directory.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 4fa272b0031ade9d0c9bf6cba3df22053ad6e640 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fa272b0031ade9d0c9bf6cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:32:59 2021 +0200 uuid: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/uuid/Makefile.in | 0 {dlls => libs}/uuid/d2d.c | 0 {dlls => libs}/uuid/uuid.c | 0 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 4c61f110d90..8b50a693e73 100755 --- a/configure +++ b/configure @@ -1644,7 +1644,6 @@ enable_user32 enable_userenv enable_usp10 enable_utildll -enable_uuid enable_uxtheme enable_vbscript enable_vcomp @@ -1786,6 +1785,7 @@ enable_dxerr9 enable_dxguid enable_mfuuid enable_strmiids +enable_uuid enable_wine enable_loader enable_nls @@ -20721,7 +20721,6 @@ wine_fn_config_makefile dlls/userenv/tests enable_tests wine_fn_config_makefile dlls/usp10 enable_usp10 wine_fn_config_makefile dlls/usp10/tests enable_tests wine_fn_config_makefile dlls/utildll enable_utildll -wine_fn_config_makefile dlls/uuid enable_uuid wine_fn_config_makefile dlls/uxtheme enable_uxtheme wine_fn_config_makefile dlls/uxtheme/tests enable_tests wine_fn_config_makefile dlls/vbscript enable_vbscript @@ -20922,6 +20921,7 @@ wine_fn_config_makefile libs/dxerr9 enable_dxerr9 wine_fn_config_makefile libs/dxguid enable_dxguid wine_fn_config_makefile libs/mfuuid enable_mfuuid wine_fn_config_makefile libs/strmiids enable_strmiids +wine_fn_config_makefile libs/uuid enable_uuid wine_fn_config_makefile libs/wine enable_wine wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls diff --git a/configure.ac b/configure.ac index b1852a98da8..8c35b36952b 100644 --- a/configure.ac +++ b/configure.ac @@ -3608,7 +3608,6 @@ WINE_CONFIG_MAKEFILE(dlls/userenv/tests) WINE_CONFIG_MAKEFILE(dlls/usp10) WINE_CONFIG_MAKEFILE(dlls/usp10/tests) WINE_CONFIG_MAKEFILE(dlls/utildll) -WINE_CONFIG_MAKEFILE(dlls/uuid) WINE_CONFIG_MAKEFILE(dlls/uxtheme) WINE_CONFIG_MAKEFILE(dlls/uxtheme/tests) WINE_CONFIG_MAKEFILE(dlls/vbscript) @@ -3809,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(libs/dxerr9) WINE_CONFIG_MAKEFILE(libs/dxguid) WINE_CONFIG_MAKEFILE(libs/mfuuid) WINE_CONFIG_MAKEFILE(libs/strmiids) +WINE_CONFIG_MAKEFILE(libs/uuid) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/dlls/uuid/Makefile.in b/libs/uuid/Makefile.in similarity index 100% rename from dlls/uuid/Makefile.in rename to libs/uuid/Makefile.in diff --git a/dlls/uuid/d2d.c b/libs/uuid/d2d.c similarity index 100% rename from dlls/uuid/d2d.c rename to libs/uuid/d2d.c diff --git a/dlls/uuid/uuid.c b/libs/uuid/uuid.c similarity index 100% rename from dlls/uuid/uuid.c rename to libs/uuid/uuid.c

1 0

Alexandre Julliard : strmiids: Move to the libs directory.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 2390075361061de972e7f5fcef8762149ccbc58e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2390075361061de972e7f5fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:32:31 2021 +0200 strmiids: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/strmiids/Makefile.in | 0 {dlls => libs}/strmiids/evr.c | 0 {dlls => libs}/strmiids/strmiids.c | 0 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 59381148423..4c61f110d90 100755 --- a/configure +++ b/configure @@ -1620,7 +1620,6 @@ enable_stdole32_tlb enable_sti enable_strmbase enable_strmdll -enable_strmiids enable_svrapi enable_sxs enable_t2embed @@ -1786,6 +1785,7 @@ enable_dxerr8 enable_dxerr9 enable_dxguid enable_mfuuid +enable_strmiids enable_wine enable_loader enable_nls @@ -20680,7 +20680,6 @@ wine_fn_config_makefile dlls/storage.dll16 enable_win16 wine_fn_config_makefile dlls/stress.dll16 enable_win16 wine_fn_config_makefile dlls/strmbase enable_strmbase wine_fn_config_makefile dlls/strmdll enable_strmdll -wine_fn_config_makefile dlls/strmiids enable_strmiids wine_fn_config_makefile dlls/svrapi enable_svrapi wine_fn_config_makefile dlls/sxs enable_sxs wine_fn_config_makefile dlls/sxs/tests enable_tests @@ -20922,6 +20921,7 @@ wine_fn_config_makefile libs/dxerr8 enable_dxerr8 wine_fn_config_makefile libs/dxerr9 enable_dxerr9 wine_fn_config_makefile libs/dxguid enable_dxguid wine_fn_config_makefile libs/mfuuid enable_mfuuid +wine_fn_config_makefile libs/strmiids enable_strmiids wine_fn_config_makefile libs/wine enable_wine wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls diff --git a/configure.ac b/configure.ac index f0e6c4369ab..b1852a98da8 100644 --- a/configure.ac +++ b/configure.ac @@ -3567,7 +3567,6 @@ WINE_CONFIG_MAKEFILE(dlls/storage.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/stress.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/strmbase) WINE_CONFIG_MAKEFILE(dlls/strmdll) -WINE_CONFIG_MAKEFILE(dlls/strmiids) WINE_CONFIG_MAKEFILE(dlls/svrapi) WINE_CONFIG_MAKEFILE(dlls/sxs) WINE_CONFIG_MAKEFILE(dlls/sxs/tests) @@ -3809,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(libs/dxerr8) WINE_CONFIG_MAKEFILE(libs/dxerr9) WINE_CONFIG_MAKEFILE(libs/dxguid) WINE_CONFIG_MAKEFILE(libs/mfuuid) +WINE_CONFIG_MAKEFILE(libs/strmiids) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/dlls/strmiids/Makefile.in b/libs/strmiids/Makefile.in similarity index 100% rename from dlls/strmiids/Makefile.in rename to libs/strmiids/Makefile.in diff --git a/dlls/strmiids/evr.c b/libs/strmiids/evr.c similarity index 100% rename from dlls/strmiids/evr.c rename to libs/strmiids/evr.c diff --git a/dlls/strmiids/strmiids.c b/libs/strmiids/strmiids.c similarity index 100% rename from dlls/strmiids/strmiids.c rename to libs/strmiids/strmiids.c

1 0

Alexandre Julliard : mfuuid: Move to the libs directory.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: b52b43a7a2ad83a1d95058524c1fc2a00a51050a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b52b43a7a2ad83a1d9505852… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:31:59 2021 +0200 mfuuid: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/mfuuid/Makefile.in | 0 {dlls => libs}/mfuuid/mfplay.c | 0 {dlls => libs}/mfuuid/mfuuid.c | 0 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index eb6fe85b0b3..59381148423 100755 --- a/configure +++ b/configure @@ -1431,7 +1431,6 @@ enable_mfmediaengine enable_mfplat enable_mfplay enable_mfreadwrite -enable_mfuuid enable_mgmtapi enable_midimap enable_mlang @@ -1786,6 +1785,7 @@ enable_dmoguids enable_dxerr8 enable_dxerr9 enable_dxguid +enable_mfuuid enable_wine enable_loader enable_nls @@ -20383,7 +20383,6 @@ wine_fn_config_makefile dlls/mfplay enable_mfplay wine_fn_config_makefile dlls/mfplay/tests enable_tests wine_fn_config_makefile dlls/mfreadwrite enable_mfreadwrite wine_fn_config_makefile dlls/mfreadwrite/tests enable_tests -wine_fn_config_makefile dlls/mfuuid enable_mfuuid wine_fn_config_makefile dlls/mgmtapi enable_mgmtapi wine_fn_config_makefile dlls/midimap enable_midimap wine_fn_config_makefile dlls/mlang enable_mlang @@ -20922,6 +20921,7 @@ wine_fn_config_makefile libs/dmoguids enable_dmoguids wine_fn_config_makefile libs/dxerr8 enable_dxerr8 wine_fn_config_makefile libs/dxerr9 enable_dxerr9 wine_fn_config_makefile libs/dxguid enable_dxguid +wine_fn_config_makefile libs/mfuuid enable_mfuuid wine_fn_config_makefile libs/wine enable_wine wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls diff --git a/configure.ac b/configure.ac index e9286ef7674..f0e6c4369ab 100644 --- a/configure.ac +++ b/configure.ac @@ -3270,7 +3270,6 @@ WINE_CONFIG_MAKEFILE(dlls/mfplay) WINE_CONFIG_MAKEFILE(dlls/mfplay/tests) WINE_CONFIG_MAKEFILE(dlls/mfreadwrite) WINE_CONFIG_MAKEFILE(dlls/mfreadwrite/tests) -WINE_CONFIG_MAKEFILE(dlls/mfuuid) WINE_CONFIG_MAKEFILE(dlls/mgmtapi) WINE_CONFIG_MAKEFILE(dlls/midimap) WINE_CONFIG_MAKEFILE(dlls/mlang) @@ -3809,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(libs/dmoguids) WINE_CONFIG_MAKEFILE(libs/dxerr8) WINE_CONFIG_MAKEFILE(libs/dxerr9) WINE_CONFIG_MAKEFILE(libs/dxguid) +WINE_CONFIG_MAKEFILE(libs/mfuuid) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/dlls/mfuuid/Makefile.in b/libs/mfuuid/Makefile.in similarity index 100% rename from dlls/mfuuid/Makefile.in rename to libs/mfuuid/Makefile.in diff --git a/dlls/mfuuid/mfplay.c b/libs/mfuuid/mfplay.c similarity index 100% rename from dlls/mfuuid/mfplay.c rename to libs/mfuuid/mfplay.c diff --git a/dlls/mfuuid/mfuuid.c b/libs/mfuuid/mfuuid.c similarity index 100% rename from dlls/mfuuid/mfuuid.c rename to libs/mfuuid/mfuuid.c

1 0

Alexandre Julliard : dxguid: Move to the libs directory.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 3f1e7ac5b6158c62f418a1f6d57633125f036184 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f1e7ac5b6158c62f418a1f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:31:34 2021 +0200 dxguid: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/dxguid/Makefile.in | 0 {dlls => libs}/dxguid/dx10guid.c | 0 {dlls => libs}/dxguid/dx8guid.c | 0 {dlls => libs}/dxguid/dx9guid.c | 0 {dlls => libs}/dxguid/dxguid.c | 0 7 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 72bde82e1a7..eb6fe85b0b3 100755 --- a/configure +++ b/configure @@ -1301,7 +1301,6 @@ enable_dwrite enable_dx8vb enable_dxdiagn enable_dxgi -enable_dxguid enable_dxtrans enable_dxva2 enable_esent @@ -1786,6 +1785,7 @@ enable_adsiid enable_dmoguids enable_dxerr8 enable_dxerr9 +enable_dxguid enable_wine enable_loader enable_nls @@ -20214,7 +20214,6 @@ wine_fn_config_makefile dlls/dxdiagn enable_dxdiagn wine_fn_config_makefile dlls/dxdiagn/tests enable_tests wine_fn_config_makefile dlls/dxgi enable_dxgi wine_fn_config_makefile dlls/dxgi/tests enable_tests -wine_fn_config_makefile dlls/dxguid enable_dxguid wine_fn_config_makefile dlls/dxtrans enable_dxtrans wine_fn_config_makefile dlls/dxva2 enable_dxva2 wine_fn_config_makefile dlls/dxva2/tests enable_tests @@ -20922,6 +20921,7 @@ wine_fn_config_makefile libs/adsiid enable_adsiid wine_fn_config_makefile libs/dmoguids enable_dmoguids wine_fn_config_makefile libs/dxerr8 enable_dxerr8 wine_fn_config_makefile libs/dxerr9 enable_dxerr9 +wine_fn_config_makefile libs/dxguid enable_dxguid wine_fn_config_makefile libs/wine enable_wine wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls diff --git a/configure.ac b/configure.ac index 63c87ef51c8..e9286ef7674 100644 --- a/configure.ac +++ b/configure.ac @@ -3101,7 +3101,6 @@ WINE_CONFIG_MAKEFILE(dlls/dxdiagn) WINE_CONFIG_MAKEFILE(dlls/dxdiagn/tests) WINE_CONFIG_MAKEFILE(dlls/dxgi) WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) -WINE_CONFIG_MAKEFILE(dlls/dxguid) WINE_CONFIG_MAKEFILE(dlls/dxtrans) WINE_CONFIG_MAKEFILE(dlls/dxva2) WINE_CONFIG_MAKEFILE(dlls/dxva2/tests) @@ -3809,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(libs/adsiid) WINE_CONFIG_MAKEFILE(libs/dmoguids) WINE_CONFIG_MAKEFILE(libs/dxerr8) WINE_CONFIG_MAKEFILE(libs/dxerr9) +WINE_CONFIG_MAKEFILE(libs/dxguid) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/dlls/dxguid/Makefile.in b/libs/dxguid/Makefile.in similarity index 100% rename from dlls/dxguid/Makefile.in rename to libs/dxguid/Makefile.in diff --git a/dlls/dxguid/dx10guid.c b/libs/dxguid/dx10guid.c similarity index 100% rename from dlls/dxguid/dx10guid.c rename to libs/dxguid/dx10guid.c diff --git a/dlls/dxguid/dx8guid.c b/libs/dxguid/dx8guid.c similarity index 100% rename from dlls/dxguid/dx8guid.c rename to libs/dxguid/dx8guid.c diff --git a/dlls/dxguid/dx9guid.c b/libs/dxguid/dx9guid.c similarity index 100% rename from dlls/dxguid/dx9guid.c rename to libs/dxguid/dx9guid.c diff --git a/dlls/dxguid/dxguid.c b/libs/dxguid/dxguid.c similarity index 100% rename from dlls/dxguid/dxguid.c rename to libs/dxguid/dxguid.c

1 0

Alexandre Julliard : dxerr9: Move to the libs directory.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: e36fe96fdaddf0afc1129299a5cc260c18f514f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e36fe96fdaddf0afc1129299… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:31:03 2021 +0200 dxerr9: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/dxerr9/Makefile.in | 0 {dlls => libs}/dxerr9/dxerr9.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 98285fc0753..72bde82e1a7 100755 --- a/configure +++ b/configure @@ -1300,7 +1300,6 @@ enable_dwmapi enable_dwrite enable_dx8vb enable_dxdiagn -enable_dxerr9 enable_dxgi enable_dxguid enable_dxtrans @@ -1786,6 +1785,7 @@ enable_include enable_adsiid enable_dmoguids enable_dxerr8 +enable_dxerr9 enable_wine enable_loader enable_nls @@ -20212,7 +20212,6 @@ wine_fn_config_makefile dlls/dwrite/tests enable_tests wine_fn_config_makefile dlls/dx8vb enable_dx8vb wine_fn_config_makefile dlls/dxdiagn enable_dxdiagn wine_fn_config_makefile dlls/dxdiagn/tests enable_tests -wine_fn_config_makefile dlls/dxerr9 enable_dxerr9 wine_fn_config_makefile dlls/dxgi enable_dxgi wine_fn_config_makefile dlls/dxgi/tests enable_tests wine_fn_config_makefile dlls/dxguid enable_dxguid @@ -20922,6 +20921,7 @@ wine_fn_config_makefile include enable_include wine_fn_config_makefile libs/adsiid enable_adsiid wine_fn_config_makefile libs/dmoguids enable_dmoguids wine_fn_config_makefile libs/dxerr8 enable_dxerr8 +wine_fn_config_makefile libs/dxerr9 enable_dxerr9 wine_fn_config_makefile libs/wine enable_wine wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls diff --git a/configure.ac b/configure.ac index eb4a19fbb30..63c87ef51c8 100644 --- a/configure.ac +++ b/configure.ac @@ -3099,7 +3099,6 @@ WINE_CONFIG_MAKEFILE(dlls/dwrite/tests) WINE_CONFIG_MAKEFILE(dlls/dx8vb) WINE_CONFIG_MAKEFILE(dlls/dxdiagn) WINE_CONFIG_MAKEFILE(dlls/dxdiagn/tests) -WINE_CONFIG_MAKEFILE(dlls/dxerr9) WINE_CONFIG_MAKEFILE(dlls/dxgi) WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) WINE_CONFIG_MAKEFILE(dlls/dxguid) @@ -3809,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(include) WINE_CONFIG_MAKEFILE(libs/adsiid) WINE_CONFIG_MAKEFILE(libs/dmoguids) WINE_CONFIG_MAKEFILE(libs/dxerr8) +WINE_CONFIG_MAKEFILE(libs/dxerr9) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/dlls/dxerr9/Makefile.in b/libs/dxerr9/Makefile.in similarity index 100% rename from dlls/dxerr9/Makefile.in rename to libs/dxerr9/Makefile.in diff --git a/dlls/dxerr9/dxerr9.c b/libs/dxerr9/dxerr9.c similarity index 100% rename from dlls/dxerr9/dxerr9.c rename to libs/dxerr9/dxerr9.c

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 October 2021