October 2021 - Wine-commits

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

11 Oct '21

Module: wine Branch: master Commit: cc2e4d3d1ff233e7b26dceb9b3caf9ca90001915 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc2e4d3d1ff233e7b26dceb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:30:42 2021 +0200 dxerr8: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/dxerr8/Makefile.in | 0 {dlls => libs}/dxerr8/dxerr8.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 2438099dd8a..98285fc0753 100755 --- a/configure +++ b/configure @@ -1300,7 +1300,6 @@ enable_dwmapi enable_dwrite enable_dx8vb enable_dxdiagn -enable_dxerr8 enable_dxerr9 enable_dxgi enable_dxguid @@ -1786,6 +1785,7 @@ enable_fonts enable_include enable_adsiid enable_dmoguids +enable_dxerr8 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/dxerr8 enable_dxerr8 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 @@ -20922,6 +20921,7 @@ wine_fn_config_makefile fonts enable_fonts 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/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 cfea04f82db..eb4a19fbb30 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/dxerr8) WINE_CONFIG_MAKEFILE(dlls/dxerr9) WINE_CONFIG_MAKEFILE(dlls/dxgi) WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) @@ -3809,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(fonts) WINE_CONFIG_MAKEFILE(include) WINE_CONFIG_MAKEFILE(libs/adsiid) WINE_CONFIG_MAKEFILE(libs/dmoguids) +WINE_CONFIG_MAKEFILE(libs/dxerr8) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/dlls/dxerr8/Makefile.in b/libs/dxerr8/Makefile.in similarity index 100% rename from dlls/dxerr8/Makefile.in rename to libs/dxerr8/Makefile.in diff --git a/dlls/dxerr8/dxerr8.c b/libs/dxerr8/dxerr8.c similarity index 100% rename from dlls/dxerr8/dxerr8.c rename to libs/dxerr8/dxerr8.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

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 : 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 : 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 : 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 : 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

Huw Davies : maintainers: Update GDI files.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 7d4d3944d66e326444b3a8d42972bf0bd68e0f59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d4d3944d66e326444b3a8d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 11 09:41:21 2021 +0100 maintainers: Update GDI files. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 18478a8871f..5bf636cfd34 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -129,6 +129,26 @@ F: dlls/mscoree/ GDI M: Huw Davies <huw(a)codeweavers.com> F: dlls/gdi32/ +F: dlls/win32u/bitblt.c +F: dlls/win32u/bitmap.c +F: dlls/win32u/brush.c +F: dlls/win32u/clipping.c +F: dlls/win32u/dc.c +F: dlls/win32u/dib.c +F: dlls/win32u/dibdrv/ +F: dlls/win32u/driver.c +F: dlls/win32u/emfdrv.c +F: dlls/win32u/font.c +F: dlls/win32u/freetype.c +F: dlls/win32u/gdiobj.c +F: dlls/win32u/mapping.c +F: dlls/win32u/opentype.c +F: dlls/win32u/painting.c +F: dlls/win32u/palette.c +F: dlls/win32u/path.c +F: dlls/win32u/pen.c +F: dlls/win32u/printdrv.c +F: dlls/win32u/region.c GDIPlus M: Esme Povirk <vincent(a)codeweavers.com>

1 0

Rémi Bernon : dinput: Move device_instance_is_disabled to device.c.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 46d35211203201cbe1826db98c15f488ed91a883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46d35211203201cbe1826db9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 11 10:10:55 2021 +0200 dinput: Move device_instance_is_disabled to device.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dinput/device_private.h | 1 + dlls/dinput/joystick.c | 48 -------------------------------------------- 3 files changed, 49 insertions(+), 48 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d869f439101..61f6effad19 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -314,6 +314,54 @@ DWORD get_config_key( HKEY defkey, HKEY appkey, const WCHAR *name, WCHAR *buffer return ERROR_FILE_NOT_FOUND; } +BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ) +{ + static const WCHAR disabled_str[] = {'d', 'i', 's', 'a', 'b', 'l', 'e', 'd', 0}; + static const WCHAR override_str[] = {'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 0}; + static const WCHAR joystick_key[] = {'J', 'o', 'y', 's', 't', 'i', 'c', 'k', 's', 0}; + WCHAR buffer[MAX_PATH]; + HKEY hkey, appkey, temp; + BOOL disable = FALSE; + + get_app_key( &hkey, &appkey ); + if (override) *override = FALSE; + + /* Joystick settings are in the 'joysticks' subkey */ + if (appkey) + { + if (RegOpenKeyW( appkey, joystick_key, &temp )) temp = 0; + RegCloseKey( appkey ); + appkey = temp; + } + + if (hkey) + { + if (RegOpenKeyW( hkey, joystick_key, &temp )) temp = 0; + RegCloseKey( hkey ); + hkey = temp; + } + + /* Look for the "controllername"="disabled" key */ + if (!get_config_key( hkey, appkey, instance->tszInstanceName, buffer, sizeof(buffer) )) + { + if (!strcmpW( disabled_str, buffer )) + { + TRACE( "Disabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); + disable = TRUE; + } + else if (override && !strcmpW( override_str, buffer )) + { + TRACE( "Force enabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); + *override = TRUE; + } + } + + if (appkey) RegCloseKey( appkey ); + if (hkey) RegCloseKey( hkey ); + + return disable; +} + /* Conversion between internal data buffer and external data buffer */ void fill_DataFormat(void *out, DWORD size, const void *in, const DataFormat *df) { diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 90eab627c26..8aced6d84dd 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -98,6 +98,7 @@ extern const IDirectInputDevice8AVtbl dinput_device_a_vtbl DECLSPEC_HIDDEN; extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; extern DWORD get_config_key( HKEY, HKEY, const WCHAR *, WCHAR *, DWORD ) DECLSPEC_HIDDEN; +extern BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ) DECLSPEC_HIDDEN; /* Routines to do DataFormat / WineFormat conversions */ extern void fill_DataFormat(void *out, DWORD size, const void *in, const DataFormat *df) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 6e573e8741a..979d5a5c7f2 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -279,54 +279,6 @@ BOOL device_disabled_registry(const char* name) return device_instance_is_disabled( &instance, NULL ); } -BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ) -{ - static const WCHAR disabled_str[] = {'d', 'i', 's', 'a', 'b', 'l', 'e', 'd', 0}; - static const WCHAR override_str[] = {'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 0}; - static const WCHAR joystick_key[] = {'J', 'o', 'y', 's', 't', 'i', 'c', 'k', 's', 0}; - WCHAR buffer[MAX_PATH]; - HKEY hkey, appkey, temp; - BOOL disable = FALSE; - - get_app_key(&hkey, &appkey); - if (override) *override = FALSE; - - /* Joystick settings are in the 'joysticks' subkey */ - if (appkey) - { - if (RegOpenKeyW( appkey, joystick_key, &temp )) temp = 0; - RegCloseKey(appkey); - appkey = temp; - } - - if (hkey) - { - if (RegOpenKeyW( hkey, joystick_key, &temp )) temp = 0; - RegCloseKey(hkey); - hkey = temp; - } - - /* Look for the "controllername"="disabled" key */ - if (!get_config_key( hkey, appkey, instance->tszInstanceName, buffer, sizeof(buffer) )) - { - if (!strcmpW( disabled_str, buffer )) - { - TRACE( "Disabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); - disable = TRUE; - } - else if (override && !strcmpW( override_str, buffer )) - { - TRACE( "Force enabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); - *override = TRUE; - } - } - - if (appkey) RegCloseKey(appkey); - if (hkey) RegCloseKey(hkey); - - return disable; -} - BOOL is_xinput_device(const DIDEVCAPS *devcaps, WORD vid, WORD pid) { int i;

1 0

Rémi Bernon : dinput: Move PIDVID internal guid to device.c.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 7011685e1e705eacae8d46dd0ddec651cf140da3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7011685e1e705eacae8d46dd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 11 10:10:56 2021 +0200 dinput: Move PIDVID internal guid to device.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 9 +++++++++ dlls/dinput/device_private.h | 2 +- dlls/dinput/joystick.c | 8 -------- dlls/dinput/joystick_hid.c | 6 +++--- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 6 +++--- 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 61f6effad19..484fe904c2e 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -36,6 +36,9 @@ #include "winuser.h" #include "winerror.h" #include "dinput.h" +#include "dinputd.h" + +#include "initguid.h" #include "device_private.h" #include "dinput_private.h" @@ -43,6 +46,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); +/* Windows uses this GUID for guidProduct on non-keyboard/mouse devices. + * Data1 contains the device VID (low word) and PID (high word). + * Data4 ends with the ASCII bytes "PIDVID". + */ +DEFINE_GUID( dinput_pidvid_guid, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 'P', 'I', 'D', 'V', 'I', 'D' ); + static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) { return CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 8aced6d84dd..2b939fd5a0c 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -128,7 +128,7 @@ typedef struct LPDIRECTINPUTEFFECT ref; } effect_list_item; -extern const GUID DInput_PIDVID_Product_GUID DECLSPEC_HIDDEN; +extern const GUID dinput_pidvid_guid DECLSPEC_HIDDEN; /* Various debug tools */ extern void _dump_DIPROPHEADER(LPCDIPROPHEADER diph) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 979d5a5c7f2..afebaa022b7 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -52,14 +52,6 @@ static const WORD PID_XBOX_CONTROLLERS[] = { 0x0719, /* Xbox 360 Wireless Adapter */ }; -/* Windows uses this GUID for guidProduct on non-keyboard/mouse devices. - * Data1 contains the device VID (low word) and PID (high word). - * Data4 ends with the ASCII bytes "PIDVID". - */ -const GUID DInput_PIDVID_Product_GUID = { /* device_pidvid-0000-0000-0000-504944564944 */ - 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} -}; - static inline JoystickGenericImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) { return CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), JoystickGenericImpl, base); diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 728b98591d2..63193554405 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1737,7 +1737,7 @@ static BOOL hid_joystick_device_try_open( UINT32 handle, const WCHAR *path, HAND instance->guidInstance = hid_joystick_guid; instance->guidInstance.Data1 ^= handle; - instance->guidProduct = DInput_PIDVID_Product_GUID; + instance->guidProduct = dinput_pidvid_guid; instance->guidProduct.Data1 = MAKELONG( attrs->VendorID, attrs->ProductID ); instance->guidFFDriver = GUID_NULL; instance->wUsagePage = caps->UsagePage; @@ -2258,9 +2258,9 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); *out = NULL; - instance.guidProduct.Data1 = DInput_PIDVID_Product_GUID.Data1; + instance.guidProduct.Data1 = dinput_pidvid_guid.Data1; instance.guidInstance.Data1 = hid_joystick_guid.Data1; - if (IsEqualGUID( &DInput_PIDVID_Product_GUID, &instance.guidProduct )) + if (IsEqualGUID( &dinput_pidvid_guid, &instance.guidProduct )) instance.guidProduct = *guid; else if (IsEqualGUID( &hid_joystick_guid, &instance.guidInstance )) instance.guidInstance = *guid; diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 5b54e352c20..decd69b1e7e 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -315,7 +315,7 @@ static INT find_joystick_devices(void) else { /* Concatenate product_id with vendor_id to mimic Windows behaviour */ - joydev.guid_product = DInput_PIDVID_Product_GUID; + joydev.guid_product = dinput_pidvid_guid; joydev.guid_product.Data1 = MAKELONG(joydev.vendor_id, joydev.product_id); } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 949fd1da081..c7f4cc486fd 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -320,7 +320,7 @@ static void find_joydevs(void) joydev.bus_type = device_id.bustype; /* Concatenate product_id with vendor_id to mimic Windows behaviour */ - joydev.guid_product = DInput_PIDVID_Product_GUID; + joydev.guid_product = dinput_pidvid_guid; joydev.guid_product.Data1 = MAKELONG(joydev.vendor_id, joydev.product_id); } diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 9ee45e8a445..5796daf8e11 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1058,7 +1058,7 @@ static HRESULT joydev_enum_device(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINST /* Return joystick */ lpddi->guidInstance = DInput_Wine_OsX_Joystick_GUID; lpddi->guidInstance.Data3 = id; - lpddi->guidProduct = DInput_PIDVID_Product_GUID; + lpddi->guidProduct = dinput_pidvid_guid; lpddi->guidProduct.Data1 = make_vid_pid(device); lpddi->dwDevType = get_device_type(version, is_joystick); lpddi->dwDevType |= DIDEVTYPE_HID; @@ -1131,7 +1131,7 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm newDevice->generic.guidInstance = DInput_Wine_OsX_Joystick_GUID; newDevice->generic.guidInstance.Data3 = index; - newDevice->generic.guidProduct = DInput_PIDVID_Product_GUID; + newDevice->generic.guidProduct = dinput_pidvid_guid; newDevice->generic.guidProduct.Data1 = make_vid_pid(device); newDevice->generic.joy_polldev = poll_osx_device_state; @@ -1309,7 +1309,7 @@ static unsigned short get_joystick_index(REFGUID guid) if(IsEqualGUID(&wine_joystick, &dev_guid)) return guid->Data3; prod_guid.Data1 = 0; - if(IsEqualGUID(&DInput_PIDVID_Product_GUID, &prod_guid)) + if(IsEqualGUID(&dinput_pidvid_guid, &prod_guid)) { joystick_devices_count = find_joystick_devices(); for(i = 0; i < joystick_devices_count; i++)

1 0