December 2014 - Wine-Commits

André Hentschel : secur32: Declare debug channels only when needed (Clang).
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: b8719ff85228d8fc903955db9f00122f760270bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8719ff85228d8fc903955db9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:54:33 2014 +0100 secur32: Declare debug channels only when needed (Clang). --- dlls/secur32/schannel_gnutls.c | 4 ++-- dlls/secur32/schannel_macosx.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 1b19544..638b3c5 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -36,10 +36,10 @@ #include "wine/debug.h" #include "wine/library.h" -WINE_DEFAULT_DEBUG_CHANNEL(secur32); - #if defined(SONAME_LIBGNUTLS) && !defined(HAVE_SECURITY_SECURITY_H) +WINE_DEFAULT_DEBUG_CHANNEL(secur32); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_alert_get); diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 7a29c7b..cfd2371 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -41,10 +41,10 @@ #include "wine/debug.h" #include "wine/library.h" -WINE_DEFAULT_DEBUG_CHANNEL(secur32); - #ifdef HAVE_SECURITY_SECURITY_H +WINE_DEFAULT_DEBUG_CHANNEL(secur32); + #if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 /* Defined in <Security/CipherSuite.h> in the 10.6 SDK or later. */ enum {

1 0

André Hentschel : winspool.drv: Remove unused strings (Clang).
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: 76272d6e6c2411a515a249e8a3bd060cb205782f URL: http://source.winehq.org/git/wine.git/?a=commit;h=76272d6e6c2411a515a249e8a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:54:23 2014 +0100 winspool.drv: Remove unused strings (Clang). --- dlls/winspool.drv/info.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 73323f8..073a8fb 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -202,8 +202,6 @@ static const WCHAR PrintersW[] = {'S','y','s','t','e','m','\\', 'P','r','i','n','t','\\', 'P','r','i','n','t','e','r','s',0}; -static const WCHAR LocalPortW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; - static const WCHAR user_default_reg_key[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s',' ','N','T','\\', @@ -216,19 +214,12 @@ static const WCHAR user_printers_reg_key[] = { 'S','o','f','t','w','a','r','e',' 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'D','e','v','i','c','e','s',0}; -static const WCHAR WinNT_CV_PortsW[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'P','o','r','t','s',0}; - static const WCHAR WinNT_CV_PrinterPortsW[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s',' ','N','T','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'P','r','i','n','t','e','r','P','o','r','t','s',0}; -static const WCHAR DefaultEnvironmentW[] = {'W','i','n','e',0}; static WCHAR envname_win40W[] = {'W','i','n','d','o','w','s',' ','4','.','0',0}; static const WCHAR envname_x64W[] = {'W','i','n','d','o','w','s',' ','x','6','4',0}; static WCHAR envname_x86W[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; @@ -240,8 +231,6 @@ static const WCHAR Version0_SubdirW[] = {'\\','0',0}; static const WCHAR Version3_RegPathW[] = {'\\','V','e','r','s','i','o','n','-','3',0}; static const WCHAR Version3_SubdirW[] = {'\\','3',0}; -static const WCHAR spooldriversW[] = {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\',0}; - static const WCHAR AttributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}; static const WCHAR backslashW[] = {'\\',0}; static const WCHAR Configuration_FileW[] = {'C','o','n','f','i','g','u','r','a','t', @@ -264,7 +253,6 @@ static const WCHAR ObjectGUIDW[] = {'O','b','j','e','c','t','G','U','I','D',0}; static const WCHAR OEM_UrlW[] = {'O','E','M',' ','U','r','l',0}; static const WCHAR ParametersW[] = {'P','a','r','a','m','e','t','e','r','s',0}; static const WCHAR PortW[] = {'P','o','r','t',0}; -static const WCHAR bs_Ports_bsW[] = {'\\','P','o','r','t','s','\\',0}; static const WCHAR Previous_NamesW[] = {'P','r','e','v','i','o','u','s',' ','N','a','m','e','s',0}; static const WCHAR Print_ProcessorW[] = {'P','r','i','n','t',' ','P','r','o','c','e','s','s','o','r',0}; static const WCHAR Printer_DriverW[] = {'P','r','i','n','t','e','r',' ','D','r','i','v','e','r',0}; @@ -278,7 +266,6 @@ static const WCHAR StartTimeW[] = {'S','t','a','r','t','T','i','m','e',0}; static const WCHAR StatusW[] = {'S','t','a','t','u','s',0}; static const WCHAR txTimeoutW[] = {'t','x','T','i','m','e','o','u','t',0}; static const WCHAR UntilTimeW[] = {'U','n','t','i','l','T','i','m','e',0}; -static const WCHAR VersionW[] = {'V','e','r','s','i','o','n',0}; static WCHAR WinPrintW[] = {'W','i','n','P','r','i','n','t',0}; static const WCHAR deviceW[] = {'d','e','v','i','c','e',0}; static const WCHAR devicesW[] = {'d','e','v','i','c','e','s',0};

1 0

Mark Harmstone : winealsa: Implement GetPropValue and return device path.
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: a73669aed8d21fa68cef46ec75062ca4dcdcab07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73669aed8d21fa68cef46ec7… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Thu Dec 4 17:59:20 2014 +0000 winealsa: Implement GetPropValue and return device path. --- dlls/winealsa.drv/mmdevdrv.c | 108 ++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/winealsa.drv.spec | 1 + 2 files changed, 109 insertions(+) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5ad72f9..827cdd8 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -3823,3 +3823,111 @@ HRESULT WINAPI AUDDRV_GetAudioSessionManager(IMMDevice *device, return S_OK; } + +enum AudioDeviceConnectionType { + AudioDeviceConnectionType_Unknown = 0, + AudioDeviceConnectionType_PCI, + AudioDeviceConnectionType_USB +}; + +HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARIANT *out) +{ + static const PROPERTYKEY devicepath_key = { /* undocumented? - {b3f8fa53-0004-438e-9003-51a46e139bfc},2 */ + {0xb3f8fa53, 0x0004, 0x438e, {0x90, 0x03, 0x51, 0xa4, 0x6e, 0x13, 0x9b, 0xfc}}, 2 + }; + + TRACE("%s, (%s,%u), %p\n", wine_dbgstr_guid(guid), wine_dbgstr_guid(&prop->fmtid), prop->pid, out); + + if(IsEqualPropertyKey(*prop, devicepath_key)) + { + char name[256], uevent[MAX_PATH]; + EDataFlow flow; + FILE *fuevent; + int card, device; + + if(!get_alsa_name_by_guid(guid, name, sizeof(name), &flow)) + { + WARN("Unknown interface %s\n", debugstr_guid(guid)); + return E_NOINTERFACE; + } + + /* only implemented for identifiable devices, i.e. not "default" */ + if(!sscanf(name, "plughw:%u,%u", &card, &device)) + return E_NOTIMPL; + + sprintf(uevent, "/sys/class/sound/card%u/device/uevent", card); + fuevent = fopen(uevent, "r"); + + if(fuevent){ + enum AudioDeviceConnectionType connection = AudioDeviceConnectionType_Unknown; + USHORT vendor_id = 0, product_id = 0; + char line[256]; + + while (fgets(line, sizeof(line), fuevent)) { + char *val; + size_t val_len; + + if((val = strchr(line, '='))) { + val[0] = 0; + val++; + + val_len = strlen(val); + if(val_len > 0 && val[val_len - 1] == '\n') { val[val_len - 1] = 0; } + + if(!strcmp(line, "PCI_ID")){ + connection = AudioDeviceConnectionType_PCI; + if(sscanf(val, "%hX:%hX", &vendor_id, &product_id)<2){ + WARN("Unexpected input when reading PCI_ID in uevent file.\n"); + connection = AudioDeviceConnectionType_Unknown; + break; + } + }else if(!strcmp(line, "DEVTYPE") && !strcmp(val,"usb_interface")) + connection = AudioDeviceConnectionType_USB; + else if(!strcmp(line, "PRODUCT")) + if(sscanf(val, "%hx/%hx/", &vendor_id, &product_id)<2){ + WARN("Unexpected input when reading PRODUCT in uevent file.\n"); + connection = AudioDeviceConnectionType_Unknown; + break; + } + } + } + + fclose(fuevent); + + if(connection == AudioDeviceConnectionType_USB || connection == AudioDeviceConnectionType_PCI){ + static const WCHAR usbformatW[] = { '{','1','}','.','U','S','B','\\','V','I','D','_', + '%','0','4','X','&','P','I','D','_','%','0','4','X','\\', + '%','u','&','%','0','8','X',0 }; /* "{1}.USB\VID_%04X&PID_%04X\%u&%08X" */ + static const WCHAR pciformatW[] = { '{','1','}','.','H','D','A','U','D','I','O','\\','F','U','N','C','_','0','1','&', + 'V','E','N','_','%','0','4','X','&','D','E','V','_', + '%','0','4','X','\\','%','u','&','%','0','8','X',0 }; /* "{1}.HDAUDIO\FUNC_01&VEN_%04X&DEV_%04X\%u&%08X" */ + UINT serial_number; + + /* As hardly any audio devices have serial numbers, Windows instead + appears to use a persistent random number. We emulate this here + by instead using the last 8 hex digits of the GUID. */ + serial_number = (guid->Data4[4] << 24) | (guid->Data4[5] << 16) | (guid->Data4[6] << 8) | guid->Data4[7]; + + out->vt = VT_LPWSTR; + out->u.pwszVal = CoTaskMemAlloc(128 * sizeof(WCHAR)); + + if(!out->u.pwszVal) + return E_OUTOFMEMORY; + + if(connection == AudioDeviceConnectionType_USB) + sprintfW( out->u.pwszVal, usbformatW, vendor_id, product_id, device, serial_number); + else if(connection == AudioDeviceConnectionType_PCI) + sprintfW( out->u.pwszVal, pciformatW, vendor_id, product_id, device, serial_number); + + return S_OK; + } + }else{ + WARN("Could not open %s for reading\n", uevent); + return E_NOTIMPL; + } + } + + TRACE("Unimplemented property %s,%u\n", wine_dbgstr_guid(&prop->fmtid), prop->pid); + + return E_NOTIMPL; +} diff --git a/dlls/winealsa.drv/winealsa.drv.spec b/dlls/winealsa.drv/winealsa.drv.spec index 04fa05a..bd83ea2 100644 --- a/dlls/winealsa.drv/winealsa.drv.spec +++ b/dlls/winealsa.drv/winealsa.drv.spec @@ -8,3 +8,4 @@ @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs @ stdcall -private GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint @ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager +@ stdcall -private GetPropValue(ptr ptr ptr) AUDDRV_GetPropValue

1 0

Michael Müller : api-ms-win-core-winrt-error-l1-1-1: Add stub dll.
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: a14c4f92f3052f10e91604ea64bd736fc14724a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14c4f92f3052f10e91604ea6… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Nov 26 20:13:34 2014 +0100 api-ms-win-core-winrt-error-l1-1-1: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-winrt-error-l1-1-1.spec | 19 +++++++++++++++++++ 4 files changed, 23 insertions(+) diff --git a/configure b/configure index 247f765..6d94a08 100755 --- a/configure +++ b/configure @@ -895,6 +895,7 @@ enable_api_ms_win_core_timezone_l1_1_0 enable_api_ms_win_core_url_l1_1_0 enable_api_ms_win_core_util_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 +enable_api_ms_win_core_winrt_error_l1_1_1 enable_api_ms_win_core_winrt_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_core_xstate_l2_1_0 @@ -16820,6 +16821,7 @@ wine_fn_config_dll api-ms-win-core-timezone-l1-1-0 enable_api_ms_win_core_timezo wine_fn_config_dll api-ms-win-core-url-l1-1-0 enable_api_ms_win_core_url_l1_1_0 wine_fn_config_dll api-ms-win-core-util-l1-1-0 enable_api_ms_win_core_util_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 +wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-1 enable_api_ms_win_core_winrt_error_l1_1_1 wine_fn_config_dll api-ms-win-core-winrt-l1-1-0 enable_api_ms_win_core_winrt_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-core-xstate-l2-1-0 enable_api_ms_win_core_xstate_l2_1_0 diff --git a/configure.ac b/configure.ac index e007f17..863f5e7 100644 --- a/configure.ac +++ b/configure.ac @@ -2687,6 +2687,7 @@ WINE_CONFIG_DLL(api-ms-win-core-timezone-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0) diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in b/dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in new file mode 100644 index 0000000..fe36f7b --- /dev/null +++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-winrt-error-l1-1-1.dll diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec new file mode 100644 index 0000000..b1ad813 --- /dev/null +++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec @@ -0,0 +1,19 @@ +@ stub GetRestrictedErrorInfo +@ stub IsErrorPropagationEnabled +@ stub RoCaptureErrorContext +@ stub RoClearError +@ stub RoFailFastWithErrorContext +@ stub RoGetErrorReportingFlags +@ stub RoGetMatchingRestrictedErrorInfo +@ stub RoInspectCapturedStackBackTrace +@ stub RoInspectThreadErrorInfo +@ stub RoOriginateError +@ stub RoOriginateErrorW +@ stub RoOriginateLanguageException +@ stub RoReportFailedDelegate +@ stub RoReportUnhandledError +@ stub RoResolveRestrictedErrorInfoReference +@ stub RoSetErrorReportingFlags +@ stub RoTransformError +@ stub RoTransformErrorW +@ stub SetRestrictedErrorInfo

1 0

Michael Müller : api-ms-win-core-xstate-l2-1-0: Add stub dll.
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: 3ee0a27e0fbf9082d2c177300f17c7daccac411c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ee0a27e0fbf9082d2c177300… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Nov 26 19:07:20 2014 +0100 api-ms-win-core-xstate-l2-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-xstate-l2-1-0/Makefile.in | 1 + .../api-ms-win-core-xstate-l2-1-0.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 11 insertions(+) diff --git a/configure b/configure index 342b299..247f765 100755 --- a/configure +++ b/configure @@ -897,6 +897,7 @@ enable_api_ms_win_core_util_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 +enable_api_ms_win_core_xstate_l2_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 enable_api_ms_win_downlevel_advapi32_l2_1_0 enable_api_ms_win_downlevel_normaliz_l1_1_0 @@ -16821,6 +16822,7 @@ wine_fn_config_dll api-ms-win-core-util-l1-1-0 enable_api_ms_win_core_util_l1_1_ wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-l1-1-0 enable_api_ms_win_core_winrt_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 +wine_fn_config_dll api-ms-win-core-xstate-l2-1-0 enable_api_ms_win_core_xstate_l2_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l2-1-0 enable_api_ms_win_downlevel_advapi32_l2_1_0 wine_fn_config_dll api-ms-win-downlevel-normaliz-l1-1-0 enable_api_ms_win_downlevel_normaliz_l1_1_0 diff --git a/configure.ac b/configure.ac index 30bc3ce..e007f17 100644 --- a/configure.ac +++ b/configure.ac @@ -2689,6 +2689,7 @@ WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l2-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-normaliz-l1-1-0) diff --git a/dlls/api-ms-win-core-xstate-l2-1-0/Makefile.in b/dlls/api-ms-win-core-xstate-l2-1-0/Makefile.in new file mode 100644 index 0000000..9fafff3 --- /dev/null +++ b/dlls/api-ms-win-core-xstate-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-xstate-l2-1-0.dll diff --git a/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec b/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec new file mode 100644 index 0000000..0f9438d --- /dev/null +++ b/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec @@ -0,0 +1,6 @@ +@ stub CopyContext +@ stub GetEnabledXStateFeatures +@ stub GetXStateFeaturesMask +@ stub InitializeContext +@ stub LocateXStateFeature +@ stub SetXStateFeaturesMask diff --git a/tools/make_specfiles b/tools/make_specfiles index a51ed00..7ef15d6 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -165,6 +165,7 @@ my @dll_groups = "api-ms-win-core-localization-l1-2-1", "api-ms-win-core-datetime-l1-1-0", "api-ms-win-core-datetime-l1-1-1", + "api-ms-win-core-xstate-l2-1-0", ], [ "ole32",

1 0

Michael Müller : api-ms-win-core-datetime-l1-1-0: Add dll.
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: 40732e16ad279523d35a19345a48519205956256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40732e16ad279523d35a19345… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Nov 26 21:50:28 2014 +0100 api-ms-win-core-datetime-l1-1-0: Add dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-datetime-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-datetime-l1-1-0.spec | 4 ++++ tools/make_specfiles | 1 + 5 files changed, 9 insertions(+) diff --git a/configure b/configure index 600f687..342b299 100755 --- a/configure +++ b/configure @@ -855,6 +855,7 @@ enable_advpack enable_amstream enable_api_ms_win_core_com_l1_1_0 enable_api_ms_win_core_console_l1_1_0 +enable_api_ms_win_core_datetime_l1_1_0 enable_api_ms_win_core_datetime_l1_1_1 enable_api_ms_win_core_debug_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_1 @@ -16778,6 +16779,7 @@ wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 +wine_fn_config_dll api-ms-win-core-datetime-l1-1-0 enable_api_ms_win_core_datetime_l1_1_0 wine_fn_config_dll api-ms-win-core-datetime-l1-1-1 enable_api_ms_win_core_datetime_l1_1_1 wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_1_1 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 diff --git a/configure.ac b/configure.ac index ded14e8..30bc3ce 100644 --- a/configure.ac +++ b/configure.ac @@ -2647,6 +2647,7 @@ WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) diff --git a/dlls/api-ms-win-core-datetime-l1-1-0/Makefile.in b/dlls/api-ms-win-core-datetime-l1-1-0/Makefile.in new file mode 100644 index 0000000..f722f65 --- /dev/null +++ b/dlls/api-ms-win-core-datetime-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-datetime-l1-1-0.dll diff --git a/dlls/api-ms-win-core-datetime-l1-1-0/api-ms-win-core-datetime-l1-1-0.spec b/dlls/api-ms-win-core-datetime-l1-1-0/api-ms-win-core-datetime-l1-1-0.spec new file mode 100644 index 0000000..c49cf5e --- /dev/null +++ b/dlls/api-ms-win-core-datetime-l1-1-0/api-ms-win-core-datetime-l1-1-0.spec @@ -0,0 +1,4 @@ +@ stdcall GetDateFormatA(long long ptr str ptr long) kernel32.GetDateFormatA +@ stdcall GetDateFormatW(long long ptr wstr ptr long) kernel32.GetDateFormatW +@ stdcall GetTimeFormatA(long long ptr str ptr long) kernel32.GetTimeFormatA +@ stdcall GetTimeFormatW(long long ptr wstr ptr long) kernel32.GetTimeFormatW diff --git a/tools/make_specfiles b/tools/make_specfiles index 8866ab2..a51ed00 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -163,6 +163,7 @@ my @dll_groups = "api-ms-win-core-fibers-l1-1-1", "api-ms-win-core-file-l2-1-0", "api-ms-win-core-localization-l1-2-1", + "api-ms-win-core-datetime-l1-1-0", "api-ms-win-core-datetime-l1-1-1", ], [

1 0

Michael Stefaniuc : joy.cpl: Avoid pointers to out of scope variables ( PVS-Studio).
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: 721c502db98fe020d0cde32c3b42d4c7432e2704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=721c502db98fe020d0cde32c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 4 11:00:43 2014 +0100 joy.cpl: Avoid pointers to out of scope variables (PVS-Studio). --- dlls/joy.cpl/main.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 53c0eae..d6ba5d5 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -721,6 +721,9 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) DWORD axes[2] = {DIJOFS_X, DIJOFS_Y}; int direction[2] = {0, 0}; struct Joystick *joystick = pvRef; + DIRAMPFORCE rforce; + DICONSTANTFORCE cforce; + DIPERIODIC pforce; if (joystick->effects == NULL) { @@ -744,8 +747,6 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) if (IsEqualGUID(&pdei->guid, &GUID_RampForce)) { - DIRAMPFORCE rforce; - rforce.lStart = 0; rforce.lEnd = DI_FFNOMINALMAX; @@ -755,8 +756,6 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) } else if (IsEqualGUID(&pdei->guid, &GUID_ConstantForce)) { - DICONSTANTFORCE cforce; - cforce.lMagnitude = DI_FFNOMINALMAX; dieffect.cbTypeSpecificParams = sizeof(cforce); @@ -769,8 +768,6 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) IsEqualGUID(&pdei->guid, &GUID_SawtoothUp) || IsEqualGUID(&pdei->guid, &GUID_SawtoothDown)) { - DIPERIODIC pforce; - pforce.dwMagnitude = DI_FFNOMINALMAX; pforce.lOffset = 0; pforce.dwPhase = 0;

1 0

André Hentschel : shell32/tests: Remove unused variables (Clang).
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: 2c1287871b6b9f0e19a9aab6a54ccad500b6e28e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c1287871b6b9f0e19a9aab6a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:54:41 2014 +0100 shell32/tests: Remove unused variables (Clang). --- dlls/shell32/tests/assoc.c | 1 - dlls/shell32/tests/shelllink.c | 2 -- dlls/shell32/tests/shlview.c | 5 ----- 3 files changed, 8 deletions(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index ff999e9..f35938b 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -103,7 +103,6 @@ struct assoc_getstring_test }; static const WCHAR httpW[] = {'h','t','t','p',0}; -static const WCHAR httpsW[] = {'h','t','t','p','s',0}; static const WCHAR badW[] = {'b','a','d','b','a','d',0}; static struct assoc_getstring_test getstring_tests[] = diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 0b2b7be..ba9d1eb 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -49,8 +49,6 @@ static const GUID _IID_IShellLinkDataList = { { 0xb9, 0x2f, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1 } }; -static const WCHAR notafile[]= { 'C',':','\\','n','o','n','e','x','i','s','t','e','n','t','\\','f','i','l','e',0 }; - /* For some reason SHILCreateFromPath does not work on Win98 and * SHSimpleIDListFromPathA does not work on NT4. But if we call both we diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 554e086..b9d07de 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -485,11 +485,6 @@ static const struct message folderview_getfocused_seq[] = { { 0 } }; -static const struct message folderview_itemcount_seq[] = { - { LVM_GETITEMCOUNT, sent }, - { 0 } -}; - static void test_IShellView_CreateViewWindow(void) { IShellFolder *desktop;

1 0

André Hentschel : shell32: Remove unused string ( Clang).
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: 8d50a8a246960749afba21eac117b4fcbbf2c79d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d50a8a246960749afba21eac… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:54:37 2014 +0100 shell32: Remove unused string (Clang). --- dlls/shell32/shellpath.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index f92d56e..e67babe 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -810,7 +810,6 @@ static const WCHAR MusicW[] = {'M','u','s','i','c','\0'}; static const WCHAR Music_PlaylistsW[] = {'M','u','s','i','c','\\','P','l','a','y','l','i','s','t','s','\0'}; static const WCHAR Music_Sample_MusicW[] = {'M','u','s','i','c','\\','S','a','m','p','l','e',' ','M','u','s','i','c','\0'}; static const WCHAR Music_Sample_PlaylistsW[] = {'M','u','s','i','c','\\','S','a','m','p','l','e',' ','P','l','a','y','l','i','s','t','s','\0'}; -static const WCHAR My_DocumentsW[] = {'M','y',' ','D','o','c','u','m','e','n','t','s','\0'}; static const WCHAR My_MusicW[] = {'M','y',' ','M','u','s','i','c','\0'}; static const WCHAR My_PicturesW[] = {'M','y',' ','P','i','c','t','u','r','e','s','\0'}; static const WCHAR My_VideosW[] = {'M','y',' ','V','i','d','e','o','s','\0'};

1 0

André Hentschel : urlmon/tests: Remove unused strings (Clang).
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: c2ffe6e1391cf3da30ebab8e5307f4ebabacaaeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ffe6e1391cf3da30ebab8e5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:54:47 2014 +0100 urlmon/tests: Remove unused strings (Clang). --- dlls/urlmon/tests/misc.c | 6 ++---- dlls/urlmon/tests/sec_mgr.c | 3 --- dlls/urlmon/tests/stream.c | 1 - dlls/urlmon/tests/url.c | 1 - 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 4c845aa..287fce0 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -300,9 +300,7 @@ static const WCHAR url8[] = {'t','e','s','t',':','1','2','3','a','b','c',0}; static const WCHAR url9[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g', '/','s','i','t','e','/','a','b','o','u','t',0}; -static const WCHAR url10[] = {'f','i','l','e',':','/','/','s','o','m','e','%','2','0','f','i','l','e', - '.','j','p','g',0}; -static const WCHAR url11[] = {'h','t','t','p',':','/','/','g','o','o','g','l','e','.','*','.', +static const WCHAR url10[] = {'h','t','t','p',':','/','/','g','o','o','g','l','e','.','*','.', 'c','o','m',0}; static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e', '.','j','p','g',0}; @@ -343,7 +341,7 @@ static const struct parse_test parse_tests[] = { {url4, E_FAIL, url4e, S_OK, path4, wszFile, wszEmpty, S_OK, NULL, E_FAIL}, {url5, E_FAIL, url5, E_INVALIDARG, NULL, wszHttp, wszWineHQ, S_OK, wszHttpWineHQ, S_OK}, {url6, S_OK, url6, E_INVALIDARG, NULL, wszAbout, NULL, E_FAIL, NULL, E_FAIL}, - {url11, E_FAIL, url11, E_INVALIDARG, NULL, wszHttp, wszGoogle, S_OK, wszHttpGoogle, S_OK} + {url10, E_FAIL, url10, E_INVALIDARG,NULL, wszHttp, wszGoogle, S_OK, wszHttpGoogle, S_OK} }; static void test_CoInternetParseUrl(void) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 91e1a3f..e41f0b6 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -112,9 +112,6 @@ static const WCHAR url16[] = {'f','i','l','e',':','/','/','/','c',':',0}; static const WCHAR url17[] = {'f','i','l','e',':','/','/','/','c',':','c','\\',0}; static const WCHAR url18[] = {'c',':','\\','t','e','s','t','.','h','t','m',0}; -static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e', - '.','j','p','g',0}; - static const WCHAR winetestW[] = {'w','i','n','e','t','e','s','t',0}; static const WCHAR security_urlW[] = {'w','i','n','e','t','e','s','t',':','t','e','s','t','i','n','g',0}; static const WCHAR security_url2W[] = {'w','i','n','e','t','e','s','t',':','t','e','s','t','i','n','g','2',0}; diff --git a/dlls/urlmon/tests/stream.c b/dlls/urlmon/tests/stream.c index fc3f639..9882a4d 100644 --- a/dlls/urlmon/tests/stream.c +++ b/dlls/urlmon/tests/stream.c @@ -77,7 +77,6 @@ DEFINE_EXPECT(OnDataAvailable); DEFINE_EXPECT(GetBindInfo); static const CHAR wszIndexHtmlA[] = "index.html"; -static const WCHAR wszIndexHtml[] = {'i','n','d','e','x','.','h','t','m','l',0}; static WCHAR INDEX_HTML[MAX_PATH]; static const char szHtmlDoc[] = "<HTML></HTML>"; diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 3d10323..ab564f7 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -162,7 +162,6 @@ static const WCHAR wszWineHQSite[] = static const WCHAR wszWineHQIP[] = {'2','0','9','.','3','2','.','1','4','1','.','3',0}; static const CHAR wszIndexHtmlA[] = "index.html"; -static const WCHAR wszIndexHtml[] = {'i','n','d','e','x','.','h','t','m','l',0}; static const WCHAR cache_fileW[] = {'c',':','\\','c','a','c','h','e','.','h','t','m',0}; static const CHAR dwl_htmlA[] = "dwl.html"; static const WCHAR dwl_htmlW[] = {'d','w','l','.','h','t','m','l',0};

1 0