Module: wine Branch: master Commit: 54e38a95fc76ee400fcdbd5cdf0b938c8a0fdbe4 URL: https://gitlab.winehq.org/wine/wine/-/commit/54e38a95fc76ee400fcdbd5cdf0b938...
Author: Fabian Maurer dark.shadow4@web.de Date: Fri Jul 7 23:06:23 2023 +0200
geolocation: Rename from windows.devices.geolocation.geolocator.
---
configure | 6 +++--- configure.ac | 4 ++-- .../Makefile.in | 2 +- .../classes.idl | 2 +- .../geolocation.spec} | 0 dlls/{windows.devices.geolocation.geolocator => geolocation}/main.c | 0 .../private.h | 4 ++-- dlls/geolocation/tests/Makefile.in | 5 +++++ .../tests/geolocator.c | 0 dlls/windows.devices.geolocation.geolocator/tests/Makefile.in | 5 ----- 10 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/configure b/configure index e4cdaacd5e2..a8f85ebe05c 100755 --- a/configure +++ b/configure @@ -1141,6 +1141,7 @@ enable_gameux enable_gamingtcui enable_gdi32 enable_gdiplus +enable_geolocation enable_glu32 enable_gphoto2_ds enable_gpkcsp @@ -1457,7 +1458,6 @@ enable_wimgapi enable_win32u enable_windows_devices_bluetooth enable_windows_devices_enumeration -enable_windows_devices_geolocation_geolocator enable_windows_gaming_input enable_windows_gaming_ui_gamebar enable_windows_globalization @@ -21436,6 +21436,8 @@ wine_fn_config_makefile dlls/gdi32 enable_gdi32 wine_fn_config_makefile dlls/gdi32/tests enable_tests wine_fn_config_makefile dlls/gdiplus enable_gdiplus wine_fn_config_makefile dlls/gdiplus/tests enable_tests +wine_fn_config_makefile dlls/geolocation enable_geolocation +wine_fn_config_makefile dlls/geolocation/tests enable_tests wine_fn_config_makefile dlls/glu32 enable_glu32 wine_fn_config_makefile dlls/gphoto2.ds enable_gphoto2_ds wine_fn_config_makefile dlls/gpkcsp enable_gpkcsp @@ -21945,8 +21947,6 @@ wine_fn_config_makefile dlls/windows.devices.bluetooth enable_windows_devices_bl wine_fn_config_makefile dlls/windows.devices.bluetooth/tests enable_tests wine_fn_config_makefile dlls/windows.devices.enumeration enable_windows_devices_enumeration wine_fn_config_makefile dlls/windows.devices.enumeration/tests enable_tests -wine_fn_config_makefile dlls/windows.devices.geolocation.geolocator enable_windows_devices_geolocation_geolocator -wine_fn_config_makefile dlls/windows.devices.geolocation.geolocator/tests enable_tests wine_fn_config_makefile dlls/windows.gaming.input enable_windows_gaming_input wine_fn_config_makefile dlls/windows.gaming.input/tests enable_tests wine_fn_config_makefile dlls/windows.gaming.ui.gamebar enable_windows_gaming_ui_gamebar diff --git a/configure.ac b/configure.ac index 87a05fa903d..d1c5063201f 100644 --- a/configure.ac +++ b/configure.ac @@ -2631,6 +2631,8 @@ WINE_CONFIG_MAKEFILE(dlls/gdi32) WINE_CONFIG_MAKEFILE(dlls/gdi32/tests) WINE_CONFIG_MAKEFILE(dlls/gdiplus) WINE_CONFIG_MAKEFILE(dlls/gdiplus/tests) +WINE_CONFIG_MAKEFILE(dlls/geolocation) +WINE_CONFIG_MAKEFILE(dlls/geolocation/tests) WINE_CONFIG_MAKEFILE(dlls/glu32) WINE_CONFIG_MAKEFILE(dlls/gphoto2.ds) WINE_CONFIG_MAKEFILE(dlls/gpkcsp) @@ -3140,8 +3142,6 @@ WINE_CONFIG_MAKEFILE(dlls/windows.devices.bluetooth) WINE_CONFIG_MAKEFILE(dlls/windows.devices.bluetooth/tests) WINE_CONFIG_MAKEFILE(dlls/windows.devices.enumeration) WINE_CONFIG_MAKEFILE(dlls/windows.devices.enumeration/tests) -WINE_CONFIG_MAKEFILE(dlls/windows.devices.geolocation.geolocator) -WINE_CONFIG_MAKEFILE(dlls/windows.devices.geolocation.geolocator/tests) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input/tests) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.ui.gamebar) diff --git a/dlls/windows.devices.geolocation.geolocator/Makefile.in b/dlls/geolocation/Makefile.in similarity index 56% rename from dlls/windows.devices.geolocation.geolocator/Makefile.in rename to dlls/geolocation/Makefile.in index 42b5e50442b..b1274a1e2c8 100644 --- a/dlls/windows.devices.geolocation.geolocator/Makefile.in +++ b/dlls/geolocation/Makefile.in @@ -1,4 +1,4 @@ -MODULE = windows.devices.geolocation.geolocator.dll +MODULE = geolocation.dll IMPORTS = combase uuid
C_SRCS = \ diff --git a/dlls/windows.devices.geolocation.geolocator/classes.idl b/dlls/geolocation/classes.idl similarity index 93% rename from dlls/windows.devices.geolocation.geolocator/classes.idl rename to dlls/geolocation/classes.idl index 9c55cf20446..9a21dba5edc 100644 --- a/dlls/windows.devices.geolocation.geolocator/classes.idl +++ b/dlls/geolocation/classes.idl @@ -1,4 +1,4 @@ -/* Runtime Classes for windows.devices.geolocation.geolocator.dll +/* Runtime Classes for geolocation.dll * * Copyright 2023 Fabian Maurer * diff --git a/dlls/windows.devices.geolocation.geolocator/windows.devices.geolocation.geolocator.spec b/dlls/geolocation/geolocation.spec similarity index 100% rename from dlls/windows.devices.geolocation.geolocator/windows.devices.geolocation.geolocator.spec rename to dlls/geolocation/geolocation.spec diff --git a/dlls/windows.devices.geolocation.geolocator/main.c b/dlls/geolocation/main.c similarity index 100% rename from dlls/windows.devices.geolocation.geolocator/main.c rename to dlls/geolocation/main.c diff --git a/dlls/windows.devices.geolocation.geolocator/private.h b/dlls/geolocation/private.h similarity index 90% rename from dlls/windows.devices.geolocation.geolocator/private.h rename to dlls/geolocation/private.h index 7250bc1fe36..a188b5dacf3 100644 --- a/dlls/windows.devices.geolocation.geolocator/private.h +++ b/dlls/geolocation/private.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#ifndef __WINE_WINDOWS_DEVICES_GEOLOCATION_GEOLOCATOR_PRIVATE_H -#define __WINE_WINDOWS_DEVICES_GEOLOCATION_GEOLOCATOR_PRIVATE_H +#ifndef __WINE_GEOLOCATION_PRIVATE_H +#define __WINE_GEOLOCATION_PRIVATE_H
#include <stdarg.h>
diff --git a/dlls/geolocation/tests/Makefile.in b/dlls/geolocation/tests/Makefile.in new file mode 100644 index 00000000000..216e741fea8 --- /dev/null +++ b/dlls/geolocation/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = geolocation.dll +IMPORTS = combase uuid + +C_SRCS = \ + geolocator.c diff --git a/dlls/windows.devices.geolocation.geolocator/tests/geolocator.c b/dlls/geolocation/tests/geolocator.c similarity index 100% rename from dlls/windows.devices.geolocation.geolocator/tests/geolocator.c rename to dlls/geolocation/tests/geolocator.c diff --git a/dlls/windows.devices.geolocation.geolocator/tests/Makefile.in b/dlls/windows.devices.geolocation.geolocator/tests/Makefile.in deleted file mode 100644 index 1be5ca78258..00000000000 --- a/dlls/windows.devices.geolocation.geolocator/tests/Makefile.in +++ /dev/null @@ -1,5 +0,0 @@ -TESTDLL = windows.devices.geolocation.geolocator.dll -IMPORTS = combase uuid - -C_SRCS = \ - geolocator.c