April 2018 - Wine-devel - list.winehq.org

[PATCH] wintrust: Add parameter check in WTHelperGetProvCertFromChain
by Alistair Leslie-Hughes 18 Apr '18

18 Apr '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wintrust/tests/softpub.c | 9 +++++++++ dlls/wintrust/wintrust_main.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 6e7913f710..eb72512ddc 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -929,6 +929,14 @@ static void test_get_known_usages(void) "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } +static void test_WTHelperGetProvCertFromChain(void) +{ + CRYPT_PROVIDER_CERT *cert; + + cert = WTHelperGetProvCertFromChain(NULL, 0); + ok(!cert, "got certificate\n"); +} + START_TEST(softpub) { InitFunctionPtrs(); @@ -936,4 +944,5 @@ START_TEST(softpub) test_sip_create_indirect_data(); test_wintrust(); test_get_known_usages(); + test_WTHelperGetProvCertFromChain(); } diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 58e3ac39c0..bb5228286f 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -787,7 +787,7 @@ CRYPT_PROVIDER_CERT * WINAPI WTHelperGetProvCertFromChain( TRACE("(%p %d)\n", pSgnr, idxCert); - if (idxCert >= pSgnr->csCertChain || !pSgnr->pasCertChain) + if (!pSgnr || idxCert >= pSgnr->csCertChain || !pSgnr->pasCertChain) return NULL; cert = &pSgnr->pasCertChain[idxCert]; TRACE("returning %p\n", cert); -- 2.17.0

1 0

[PATCH] dxgi: Return S_OK in GetMaximumFrameLatency
by Alistair Leslie-Hughes 18 Apr '18

18 Apr '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dxgi/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index c266caea2f..ee5f3e6434 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -262,7 +262,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_SetMaximumFrameLatency(IWineDXGIDev if (max_latency > DXGI_FRAME_LATENCY_MAX) return DXGI_ERROR_INVALID_CALL; - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_device_GetMaximumFrameLatency(IWineDXGIDevice *iface, UINT *max_latency) -- 2.17.0

1 0

[PATCH] kernel32: Implement GetCurrencyFormatEx
by Alistair Leslie-Hughes 18 Apr '18

18 Apr '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/lcformat.c | 13 +++++++++++++ include/winnls.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7470d2b60b..e78c1ca8ab 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -621,7 +621,7 @@ @ stdcall GetConsoleTitleW(ptr long) @ stdcall GetConsoleWindow() @ stdcall GetCurrencyFormatA(long long str ptr str long) -# @ stub GetCurrencyFormatEx +@ stdcall GetCurrencyFormatEx(wstr long wstr ptr ptr long) @ stdcall GetCurrencyFormatW(long long str ptr str long) @ stdcall GetCurrentActCtx(ptr) @ stdcall GetCurrentConsoleFont(long long ptr) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index ecadd435d4..aeb48c6ea0 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1756,6 +1756,19 @@ error: return 0; } +/*********************************************************************** + * GetCurrencyFormatEx (KERNEL32.@) + */ +int WINAPI GetCurrencyFormatEx(LPCWSTR localename, DWORD flags, LPCWSTR value, + const CURRENCYFMTW *format, LPWSTR str, int len) +{ + TRACE("(%s,0x%08x,%s,%p,%p,%d)\n", debugstr_w(localename), flags, + debugstr_w(value), format, str, len); + + return GetCurrencyFormatW( LocaleNameToLCID(localename, 0), flags, value, format, str, len); +} + + /* FIXME: Everything below here needs to move somewhere else along with the * other EnumXXX functions, when a method for storing resources for * alternate calendars is determined. diff --git a/include/winnls.h b/include/winnls.h index 99a30e4677..7475f97051 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -896,6 +896,7 @@ WINBASEAPI INT WINAPI GetCalendarInfoA(LCID,DWORD,DWORD,LPSTR,INT,LPDWOR WINBASEAPI INT WINAPI GetCalendarInfoW(LCID,DWORD,DWORD,LPWSTR,INT,LPDWORD); #define GetCalendarInfo WINELIB_NAME_AW(GetCalendarInfo) WINBASEAPI INT WINAPI GetCurrencyFormatA(LCID,DWORD,LPCSTR,const CURRENCYFMTA*,LPSTR,INT); +WINBASEAPI INT WINAPI GetCurrencyFormatEx(LPCWSTR,DWORD,LPCWSTR,const CURRENCYFMTW*,LPWSTR,int); WINBASEAPI INT WINAPI GetCurrencyFormatW(LCID,DWORD,LPCWSTR,const CURRENCYFMTW*,LPWSTR,INT); #define GetCurrencyFormat WINELIB_NAME_AW(GetCurrencyFormat) WINBASEAPI INT WINAPI GetDateFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,INT); -- 2.17.0

1 0

[PATCH] winebus.sys: Fix a typo in a comment.
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winebus.sys/bus.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 0b378015584..bf93c04259f 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -18,7 +18,7 @@ typedef int(*enum_func)(DEVICE_OBJECT *device, void *context); -/* Busses */ +/* Buses */ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) DECLSPEC_HIDDEN; NTSTATUS WINAPI iohid_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) DECLSPEC_HIDDEN; NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) DECLSPEC_HIDDEN; -- 2.17.0

2 1

[PATCH] kernel32/tests: Add a trailing '\n' to an ok() call.
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b9b36d8a132..91a870362c3 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5612,7 +5612,7 @@ static void test_NormalizeString(void) todo_wine { dstlen = pNormalizeString( NormalizationD, ptest->str, -1, dst, 1 ); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Should have failed with ERROR_INSUFFICIENT_BUFFER"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Should have failed with ERROR_INSUFFICIENT_BUFFER\n"); } /* -- 2.17.0

1 0

[PATCH] wsdapi: Make send_udp_multicast_of_type() static.
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wsdapi/network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c index bea63fb67e3..f86b3b4a3e0 100644 --- a/dlls/wsdapi/network.c +++ b/dlls/wsdapi/network.c @@ -98,7 +98,7 @@ static DWORD WINAPI sending_thread(LPVOID lpParam) return 0; } -BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_delay, ULONG family) +static BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_delay, ULONG family) { IP_ADAPTER_ADDRESSES *adapter_addresses = NULL, *adapter_addr; static const struct in6_addr i_addr_zero; -- 2.17.0

1 0

[PATCH] bthprops.cpl: Remove an unused NONAMELESSUNION directive.
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/bthprops.cpl/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/bthprops.cpl/main.c b/dlls/bthprops.cpl/main.c index 02ee371f1d7..d670f2e358a 100644 --- a/dlls/bthprops.cpl/main.c +++ b/dlls/bthprops.cpl/main.c @@ -19,8 +19,6 @@ * */ -#define NONAMELESSUNION - #include <stdarg.h> #include <windef.h> #include <winbase.h> -- 2.17.0

1 0

[PATCH] amstream: Remove an unused NONAMELESSSTRUCT directive.
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/amstream/mediastream.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 58f9f204b32..787690d9bc7 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -19,7 +19,6 @@ */ #define NONAMELESSUNION -#define NONAMELESSSTRUCT #define COBJMACROS #include <stdarg.h> -- 2.17.0

1 0

[PATCH] user32: Fix the name of an unused debugging function.
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/exticon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index a16ae522c7e..a03cc6071bb 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -89,7 +89,7 @@ typedef struct #include "poppack.h" #if 0 -static void dumpIcoDirEnty ( LPicoICONDIRENTRY entry ) +static void dumpIcoDirEntry ( LPicoICONDIRENTRY entry ) { TRACE("width = 0x%08x height = 0x%08x\n", entry->bWidth, entry->bHeight); TRACE("colors = 0x%08x planes = 0x%08x\n", entry->bColorCount, entry->wPlanes); -- 2.17.0

1 0

[PATCH] winevulkan: Tweak the wording of a comment.
by Francois Gouget 18 Apr '18

18 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 7d84cfb375d..f0583b40038 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -576,7 +576,7 @@ class VkFunction(object): Args prefix (str, optional): prefix to prepend to entry point name. - symbol (str, optional): allows to override function name implementing entry point. + symbol (str, optional): allows overriding the name of the function implementing the entry point. """ spec = "" -- 2.17.0

1 0