mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Added patch with stub for winscard.SCardListReadersA/W.
This commit is contained in:
parent
7c2dfd1e28
commit
5628355586
@ -39,10 +39,11 @@ Wine. All those differences are also documented on the
|
||||
Included bug fixes and improvements
|
||||
-----------------------------------
|
||||
|
||||
**Bug fixes and features included in the next upcoming release [19]:**
|
||||
**Bug fixes and features included in the next upcoming release [20]:**
|
||||
|
||||
* Add implementation for kernel32.GetNumaProcessorNode ([Wine Bug #38660](https://bugs.winehq.org/show_bug.cgi?id=38660))
|
||||
* Add semi-stub for FileFsVolumeInformation information class ([Wine Bug #21466](https://bugs.winehq.org/show_bug.cgi?id=21466))
|
||||
* Add stub for winscard.SCardListReadersA/W ([Wine Bug #26978](https://bugs.winehq.org/show_bug.cgi?id=26978))
|
||||
* Allow to enable/disable InsertMode in wineconsole settings ([Wine Bug #38697](https://bugs.winehq.org/show_bug.cgi?id=38697))
|
||||
* Allow to set pixel format for desktop window
|
||||
* Ensure console InsertMode changes take effect immediately
|
||||
|
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -43,6 +43,7 @@ wine-staging (1.7.45) UNRELEASED; urgency=low
|
||||
* Added patch to forward GIF encoder requests to windowscodecs.
|
||||
* Added patch to ensure console InsertMode changes take effect immediately.
|
||||
* Added patch to send WM_DROPFILES only when OLE dnd fails.
|
||||
* Added patch with stub for winscard.SCardListReadersA/W.
|
||||
* Removed patch to handle '\r' as whitespace in wbemprox queries (accepted
|
||||
upstream).
|
||||
* Removed patch to make sure OpenClipboard with current owner doesn't fail
|
||||
|
@ -280,6 +280,7 @@ patch_enable_all ()
|
||||
enable_wininet_Cleanup="$1"
|
||||
enable_wininet_ParseX509EncodedCertificateForListBoxEntry="$1"
|
||||
enable_winmm_Delay_Import_Depends="$1"
|
||||
enable_winscard_SCardListReaders="$1"
|
||||
enable_winsta_WinStationEnumerateW="$1"
|
||||
enable_wpcap_Dynamic_Linking="$1"
|
||||
enable_ws2_32_APC_Performance="$1"
|
||||
@ -919,6 +920,9 @@ patch_enable ()
|
||||
winmm-Delay_Import_Depends)
|
||||
enable_winmm_Delay_Import_Depends="$2"
|
||||
;;
|
||||
winscard-SCardListReaders)
|
||||
enable_winscard_SCardListReaders="$2"
|
||||
;;
|
||||
winsta-WinStationEnumerateW)
|
||||
enable_winsta_WinStationEnumerateW="$2"
|
||||
;;
|
||||
@ -5822,6 +5826,21 @@ if test "$enable_winmm_Delay_Import_Depends" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset winscard-SCardListReaders
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#26978] Add stub for winscard.SCardListReadersA/W
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/winscard/winscard.c, dlls/winscard/winscard.spec
|
||||
# |
|
||||
if test "$enable_winscard_SCardListReaders" -eq 1; then
|
||||
patch_apply winscard-SCardListReaders/0001-winscard-add-stubs-for-SCardListReadersA-W.patch
|
||||
(
|
||||
echo '+ { "Austin English", "winscard: add stubs for SCardListReadersA/W.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset winsta-WinStationEnumerateW
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
@ -0,0 +1,49 @@
|
||||
From e0e2272251fbefafd7b5b46838aa37aca293f5e4 Mon Sep 17 00:00:00 2001
|
||||
From: Austin English <austinenglish@gmail.com>
|
||||
Date: Sun, 1 May 2011 13:48:32 -0500
|
||||
Subject: winscard: add stubs for SCardListReadersA/W
|
||||
|
||||
Fixes http://bugs.winehq.org/show_bug.cgi?id=26978
|
||||
---
|
||||
dlls/winscard/winscard.c | 12 ++++++++++++
|
||||
dlls/winscard/winscard.spec | 4 ++--
|
||||
2 files changed, 14 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c
|
||||
index bcf8129..cf7d52d 100644
|
||||
--- a/dlls/winscard/winscard.c
|
||||
+++ b/dlls/winscard/winscard.c
|
||||
@@ -129,3 +129,15 @@ void WINAPI SCardReleaseStartedEvent(void)
|
||||
{
|
||||
FIXME("stub\n");
|
||||
}
|
||||
+
|
||||
+LONG WINAPI SCardListReadersA(SCARDCONTEXT context, LPCSTR groups, LPSTR readers, LPDWORD buflen)
|
||||
+{
|
||||
+ FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_a(groups), readers, buflen);
|
||||
+ return SCARD_F_INTERNAL_ERROR;
|
||||
+}
|
||||
+
|
||||
+LONG WINAPI SCardListReadersW(SCARDCONTEXT context, LPCWSTR groups, LPWSTR readers, LPDWORD buflen)
|
||||
+{
|
||||
+ FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_w(groups), readers, buflen);
|
||||
+ return SCARD_F_INTERNAL_ERROR;
|
||||
+}
|
||||
diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec
|
||||
index 8ecf988..5fd8903 100644
|
||||
--- a/dlls/winscard/winscard.spec
|
||||
+++ b/dlls/winscard/winscard.spec
|
||||
@@ -40,8 +40,8 @@
|
||||
@ stub SCardListInterfacesW
|
||||
@ stub SCardListReaderGroupsA
|
||||
@ stub SCardListReaderGroupsW
|
||||
-@ stub SCardListReadersA
|
||||
-@ stub SCardListReadersW
|
||||
+@ stdcall SCardListReadersA(long str ptr ptr)
|
||||
+@ stdcall SCardListReadersW(long wstr ptr ptr)
|
||||
@ stub SCardLocateCardsA
|
||||
@ stub SCardLocateCardsByATRA
|
||||
@ stub SCardLocateCardsByATRW
|
||||
--
|
||||
2.4.2
|
||||
|
1
patches/winscard-SCardListReaders/definition
Normal file
1
patches/winscard-SCardListReaders/definition
Normal file
@ -0,0 +1 @@
|
||||
Fixes: [26978] Add stub for winscard.SCardListReadersA/W
|
Loading…
Reference in New Issue
Block a user