Module: wine Branch: master Commit: a700b6208961351b37d26280cb5f731fab2e45e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/a700b6208961351b37d26280cb5f731...
Author: Mohamad Al-Jaf mohamadaljaf@gmail.com Date: Sat Feb 18 18:23:34 2023 -0500
bthprops.cpl: Move implementations to bluetoothapis and import them.
---
dlls/bluetoothapis/Makefile.in | 4 ++++ dlls/bluetoothapis/bluetoothapis.spec | 14 +++++++------- dlls/{bthprops.cpl => bluetoothapis}/main.c | 4 ++-- dlls/bthprops.cpl/Makefile.in | 6 ++---- dlls/bthprops.cpl/bthprops.cpl.spec | 14 +++++++------- dlls/irprops.cpl/Makefile.in | 3 ++- dlls/irprops.cpl/irprops.cpl.spec | 14 +++++++------- 7 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/dlls/bluetoothapis/Makefile.in b/dlls/bluetoothapis/Makefile.in index 51b2871d81d..50799b90435 100644 --- a/dlls/bluetoothapis/Makefile.in +++ b/dlls/bluetoothapis/Makefile.in @@ -1,3 +1,7 @@ MODULE = bluetoothapis.dll +IMPORTLIB = bluetoothapis
EXTRADLLFLAGS = -Wb,--prefer-native + +C_SRCS = \ + main.c diff --git a/dlls/bluetoothapis/bluetoothapis.spec b/dlls/bluetoothapis/bluetoothapis.spec index 39354b8c9a8..421934f6a71 100644 --- a/dlls/bluetoothapis/bluetoothapis.spec +++ b/dlls/bluetoothapis/bluetoothapis.spec @@ -7,28 +7,28 @@ @ stub BluetoothEnumerateLocalServices @ stub BluetoothFindBrowseGroupClose @ stub BluetoothFindClassIdClose -@ stub BluetoothFindDeviceClose +@ stdcall BluetoothFindDeviceClose(ptr) @ stub BluetoothFindFirstBrowseGroup @ stub BluetoothFindFirstClassId -@ stub BluetoothFindFirstDevice +@ stdcall BluetoothFindFirstDevice(ptr ptr) @ stub BluetoothFindFirstProfileDescriptor @ stub BluetoothFindFirstProtocolDescriptorStack @ stub BluetoothFindFirstProtocolEntry -@ stub BluetoothFindFirstRadio +@ stdcall BluetoothFindFirstRadio(ptr ptr) @ stub BluetoothFindFirstService @ stub BluetoothFindFirstServiceEx @ stub BluetoothFindNextBrowseGroup @ stub BluetoothFindNextClassId -@ stub BluetoothFindNextDevice +@ stdcall BluetoothFindNextDevice(ptr ptr) @ stub BluetoothFindNextProfileDescriptor @ stub BluetoothFindNextProtocolDescriptorStack @ stub BluetoothFindNextProtocolEntry -@ stub BluetoothFindNextRadio +@ stdcall BluetoothFindNextRadio(ptr ptr) @ stub BluetoothFindNextService @ stub BluetoothFindProfileDescriptorClose @ stub BluetoothFindProtocolDescriptorStackClose @ stub BluetoothFindProtocolEntryClose -@ stub BluetoothFindRadioClose +@ stdcall BluetoothFindRadioClose(ptr) @ stub BluetoothFindServiceClose @ stub BluetoothGATTAbortReliableWrite @ stub BluetoothGATTBeginReliableWrite @@ -45,7 +45,7 @@ @ stub BluetoothGATTUnregisterEvent @ stub BluetoothGetDeviceInfo @ stub BluetoothGetLocalServiceInfo -@ stub BluetoothGetRadioInfo +@ stdcall BluetoothGetRadioInfo(ptr ptr) @ stub BluetoothGetServicePnpInstance @ stub BluetoothIsConnectable @ stub BluetoothIsDiscoverable diff --git a/dlls/bthprops.cpl/main.c b/dlls/bluetoothapis/main.c similarity index 97% rename from dlls/bthprops.cpl/main.c rename to dlls/bluetoothapis/main.c index 2dcb18458b7..49a731b8522 100644 --- a/dlls/bthprops.cpl/main.c +++ b/dlls/bluetoothapis/main.c @@ -1,5 +1,5 @@ /* - * Bluetooth properties control panel + * Bluetooth APIs * * Copyright 2016 Austin English * @@ -27,7 +27,7 @@ #include "bthsdpdef.h" #include "bluetoothapis.h"
-WINE_DEFAULT_DEBUG_CHANNEL(bthpropscpl); +WINE_DEFAULT_DEBUG_CHANNEL(bluetoothapis);
/********************************************************************* * BluetoothFindFirstDevice diff --git a/dlls/bthprops.cpl/Makefile.in b/dlls/bthprops.cpl/Makefile.in index 41dc9dfdb98..e1a3936fde9 100644 --- a/dlls/bthprops.cpl/Makefile.in +++ b/dlls/bthprops.cpl/Makefile.in @@ -1,4 +1,2 @@ -MODULE = bthprops.cpl - -C_SRCS = \ - main.c +MODULE = bthprops.cpl +IMPORTS = bluetoothapis diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index 30b5bfa0040..ac9c2994337 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -11,31 +11,31 @@ @ stub BluetoothEnumerateInstalledServicesEx @ stub BluetoothFindBrowseGroupClose @ stub BluetoothFindClassIdClose -@ stdcall BluetoothFindDeviceClose(ptr) +@ stdcall -import BluetoothFindDeviceClose(ptr) @ stub BluetoothFindFirstBrowseGroup @ stub BluetoothFindFirstClassId -@ stdcall BluetoothFindFirstDevice(ptr ptr) +@ stdcall -import BluetoothFindFirstDevice(ptr ptr) @ stub BluetoothFindFirstProfileDescriptor @ stub BluetoothFindFirstProtocolDescriptorStack @ stub BluetoothFindFirstProtocolEntry -@ stdcall BluetoothFindFirstRadio(ptr ptr) +@ stdcall -import BluetoothFindFirstRadio(ptr ptr) @ stub BluetoothFindFirstService @ stub BluetoothFindFirstServiceEx @ stub BluetoothFindNextBrowseGroup @ stub BluetoothFindNextClassId -@ stdcall BluetoothFindNextDevice(ptr ptr) +@ stdcall -import BluetoothFindNextDevice(ptr ptr) @ stub BluetoothFindNextProfileDescriptor @ stub BluetoothFindNextProtocolDescriptorStack @ stub BluetoothFindNextProtocolEntry -@ stdcall BluetoothFindNextRadio(ptr ptr) +@ stdcall -import BluetoothFindNextRadio(ptr ptr) @ stub BluetoothFindNextService @ stub BluetoothFindProfileDescriptorClose @ stub BluetoothFindProtocolDescriptorStackClose @ stub BluetoothFindProtocolEntryClose -@ stdcall BluetoothFindRadioClose(ptr) +@ stdcall -import BluetoothFindRadioClose(ptr) @ stub BluetoothFindServiceClose @ stub BluetoothGetDeviceInfo -@ stdcall BluetoothGetRadioInfo(ptr ptr) +@ stdcall -import BluetoothGetRadioInfo(ptr ptr) @ stub BluetoothIsConnectable @ stub BluetoothIsDiscoverable @ stub BluetoothIsVersionAvailable diff --git a/dlls/irprops.cpl/Makefile.in b/dlls/irprops.cpl/Makefile.in index 7270ca32b83..89f72d17b0c 100644 --- a/dlls/irprops.cpl/Makefile.in +++ b/dlls/irprops.cpl/Makefile.in @@ -1 +1,2 @@ -MODULE = irprops.cpl +MODULE = irprops.cpl +IMPORTS = bluetoothapis diff --git a/dlls/irprops.cpl/irprops.cpl.spec b/dlls/irprops.cpl/irprops.cpl.spec index 252410f589f..8ca19fc9631 100644 --- a/dlls/irprops.cpl/irprops.cpl.spec +++ b/dlls/irprops.cpl/irprops.cpl.spec @@ -8,30 +8,30 @@ @ stub BluetoothEnumerateInstalledServices @ stub BluetoothFindBrowseGroupClose @ stub BluetoothFindClassIdClose -@ stdcall BluetoothFindDeviceClose(ptr) bthprops.cpl.BluetoothFindDeviceClose +@ stdcall -import BluetoothFindDeviceClose(ptr) @ stub BluetoothFindFirstBrowseGroup @ stub BluetoothFindFirstClassId -@ stdcall BluetoothFindFirstDevice(ptr ptr) bthprops.cpl.BluetoothFindFirstDevice +@ stdcall -import BluetoothFindFirstDevice(ptr ptr) @ stub BluetoothFindFirstProfileDescriptor @ stub BluetoothFindFirstProtocolDescriptorStack @ stub BluetoothFindFirstProtocolEntry -@ stdcall BluetoothFindFirstRadio(ptr ptr) bthprops.cpl.BluetoothFindFirstRadio +@ stdcall -import BluetoothFindFirstRadio(ptr ptr) @ stub BluetoothFindFirstService @ stub BluetoothFindNextBrowseGroup @ stub BluetoothFindNextClassId -@ stdcall BluetoothFindNextDevice(ptr ptr) bthprops.cpl.BluetoothFindNextDevice +@ stdcall -import BluetoothFindNextDevice(ptr ptr) @ stub BluetoothFindNextProfileDescriptor @ stub BluetoothFindNextProtocolDescriptorStack @ stub BluetoothFindNextProtocolEntry -@ stdcall BluetoothFindNextRadio(ptr ptr) bthprops.cpl.BluetoothFindNextRadio +@ stdcall -import BluetoothFindNextRadio(ptr ptr) @ stub BluetoothFindNextService @ stub BluetoothFindProfileDescriptorClose @ stub BluetoothFindProtocolDescriptorStackClose @ stub BluetoothFindProtocolEntryClose -@ stdcall BluetoothFindRadioClose(ptr) bthprops.cpl.BluetoothFindRadioClose +@ stdcall -import BluetoothFindRadioClose(ptr) @ stub BluetoothFindServiceClose @ stub BluetoothGetDeviceInfo -@ stdcall BluetoothGetRadioInfo(ptr ptr) bthprops.cpl.BluetoothGetRadioInfo +@ stdcall -import BluetoothGetRadioInfo(ptr ptr) @ stub BluetoothIsConnectable @ stub BluetoothIsDiscoverable @ stub BluetoothMapClassOfDeviceToImageIndex