winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
March 2019
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
1097 discussions
Start a n
N
ew thread
Zhiyi Zhang : setupapi: Implement SetupDiOpenDeviceInfoA().
by Alexandre Julliard
18 Mar '19
18 Mar '19
Module: wine Branch: master Commit: 17d58c93f373e636812434711e245f8ac78620af URL:
https://source.winehq.org/git/wine.git/?a=commit;h=17d58c93f373e63681243471…
Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 15 11:41:57 2019 +0800 setupapi: Implement SetupDiOpenDeviceInfoA(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 20 ++++++++++++++++++++ dlls/setupapi/stubs.c | 11 ----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 81b6e35..cdad889 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3317,6 +3317,26 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( } /*********************************************************************** + * SetupDiOpenDeviceInfoA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO devinfo, PCSTR instance_id, HWND hwnd_parent, DWORD flags, + PSP_DEVINFO_DATA device_data) +{ + WCHAR instance_idW[MAX_DEVICE_ID_LEN]; + + TRACE("%p %s %p 0x%08x %p\n", devinfo, debugstr_a(instance_id), hwnd_parent, flags, device_data); + + if (!instance_id || strlen(instance_id) >= MAX_DEVICE_ID_LEN) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + MultiByteToWideChar(CP_ACP, 0, instance_id, -1, instance_idW, ARRAY_SIZE(instance_idW)); + return SetupDiOpenDeviceInfoW(devinfo, instance_idW, hwnd_parent, flags, device_data); +} + +/*********************************************************************** * SetupDiOpenDeviceInfoW (SETUPAPI.@) */ BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO devinfo, PCWSTR instance_id, HWND hwnd_parent, DWORD flags, diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index b64c1a1..ede878f 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -312,17 +312,6 @@ BOOL WINAPI SetupDiGetClassImageIndex(PSP_CLASSIMAGELIST_DATA ClassImageListData } /*********************************************************************** - * SetupDiOpenDeviceInfoA (SETUPAPI.@) - */ -BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceInstanceId, - HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData) -{ - FIXME("%p %s %p 0x%08x %p: stub\n", DeviceInfoSet, debugstr_a(DeviceInstanceId), - hwndParent, OpenFlags, DeviceInfoData); - return FALSE; -} - -/*********************************************************************** * CM_Locate_DevNodeA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags)
1
0
0
0
Zhiyi Zhang : setupapi: Implement SetupDiOpenDeviceInfoW().
by Alexandre Julliard
18 Mar '19
18 Mar '19
Module: wine Branch: master Commit: cb5d191064e56e9d846d7515b43f09633e9fcb66 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=cb5d191064e56e9d846d7515…
Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 15 11:41:14 2019 +0800 setupapi: Implement SetupDiOpenDeviceInfoW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/stubs.c | 11 ------- 2 files changed, 86 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 331db87..81b6e35 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3317,6 +3317,92 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( } /*********************************************************************** + * SetupDiOpenDeviceInfoW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO devinfo, PCWSTR instance_id, HWND hwnd_parent, DWORD flags, + PSP_DEVINFO_DATA device_data) +{ + struct DeviceInfoSet *set; + struct device *device = NULL, *enum_device; + WCHAR classW[40]; + GUID guid; + HKEY enumKey = NULL; + HKEY instanceKey = NULL; + DWORD phantom; + DWORD size; + DWORD error = ERROR_NO_SUCH_DEVINST; + + TRACE("%p %s %p 0x%08x %p\n", devinfo, debugstr_w(instance_id), hwnd_parent, flags, device_data); + + if (!(set = get_device_set(devinfo))) + return FALSE; + + if (!instance_id) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (hwnd_parent) + FIXME("hwnd_parent unsupported\n"); + + if (flags) + FIXME("flags unsupported: 0x%08x\n", flags); + + RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &enumKey, NULL); + /* Instance needs to be already existent in registry, if not, report ERROR_NO_SUCH_DEVINST */ + if (RegOpenKeyExW(enumKey, instance_id, 0, KEY_READ, &instanceKey)) + goto done; + + /* If it's an unregistered instance, aka phantom instance, report ERROR_NO_SUCH_DEVINST */ + size = sizeof(phantom); + if (!RegQueryValueExW(instanceKey, Phantom, NULL, NULL, (BYTE *)&phantom, &size)) + goto done; + + /* Check class GUID */ + size = sizeof(classW); + if (RegQueryValueExW(instanceKey, ClassGUID, NULL, NULL, (BYTE *)classW, &size)) + goto done; + + classW[37] = 0; + UuidFromStringW(&classW[1], &guid); + + if (!IsEqualGUID(&set->ClassGuid, &GUID_NULL) && !IsEqualGUID(&guid, &set->ClassGuid)) + { + error = ERROR_CLASS_MISMATCH; + goto done; + } + + /* If current set already contains a same instance, don't create new ones */ + LIST_FOR_EACH_ENTRY(enum_device, &set->devices, struct device, entry) + { + if (!strcmpiW(instance_id, enum_device->instanceId)) + { + device = enum_device; + break; + } + } + + if (!device && !(device = SETUPDI_CreateDeviceInfo(set, &guid, instance_id, FALSE))) + goto done; + + if (!device_data || device_data->cbSize == sizeof(SP_DEVINFO_DATA)) + { + if (device_data) + copy_device_data(device_data, device); + error = NO_ERROR; + } + else + error = ERROR_INVALID_USER_BUFFER; + +done: + RegCloseKey(instanceKey); + RegCloseKey(enumKey); + SetLastError(error); + return !error; +} + +/*********************************************************************** * SetupDiOpenDeviceInterfaceW (SETUPAPI.@) */ BOOL WINAPI SetupDiOpenDeviceInterfaceW( diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4db32dd..b64c1a1 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -323,17 +323,6 @@ BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceInstanceI } /*********************************************************************** - * SetupDiOpenDeviceInfoW (SETUPAPI.@) - */ -BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO DeviceInfoSet, PCWSTR DeviceInstanceId, - HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData) -{ - FIXME("%p %s %p 0x%08x %p: stub\n", DeviceInfoSet, debugstr_w(DeviceInstanceId), - hwndParent, OpenFlags, DeviceInfoData); - return FALSE; -} - -/*********************************************************************** * CM_Locate_DevNodeA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags)
1
0
0
0
Zhiyi Zhang : setupapi: Set phantom value after device creation.
by Alexandre Julliard
18 Mar '19
18 Mar '19
Module: wine Branch: master Commit: 64c09819cf937b87344b41d049d43e4b8754fb64 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=64c09819cf937b87344b41d0…
Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 15 11:41:02 2019 +0800 setupapi: Set phantom value after device creation. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 4 ++++ dlls/setupapi/tests/devinst.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 2c95b5c..331db87 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -723,6 +723,7 @@ static void delete_device(struct device *device) static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, const GUID *class, const WCHAR *instanceid, BOOL phantom) { + const DWORD one = 1; struct device *device; WCHAR guidstr[39]; @@ -752,6 +753,9 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, device->removed = FALSE; list_add_tail(&set->devices, &device->entry); + if (phantom) + RegSetValueExW(device->key, Phantom, 0, REG_DWORD, (const BYTE *)&one, sizeof(one)); + SETUPDI_GuidToString(class, guidstr); SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_CLASSGUID, (const BYTE *)guidstr, sizeof(guidstr)); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 3add9b2..75ac8fe 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -778,9 +778,9 @@ static void test_register_device_info(void) RegOpenKeyA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Enum\\ROOT\\LEGACY_BOGUS\\0000", &hkey); size = sizeof(phantom); ls = RegQueryValueExA(hkey, "Phantom", NULL, &type, (BYTE *)&phantom, &size); - todo_wine ok(ls == ERROR_SUCCESS, "Got wrong error code %#x\n", ls); - todo_wine ok(phantom == 1, "Got wrong phantom value %d\n", phantom); - todo_wine ok(type == REG_DWORD, "Got wrong phantom type %#x\n", type); + ok(ls == ERROR_SUCCESS, "Got wrong error code %#x\n", ls); + ok(phantom == 1, "Got wrong phantom value %d\n", phantom); + ok(type == REG_DWORD, "Got wrong phantom type %#x\n", type); ok(size == sizeof(phantom), "Got wrong phantom size %d\n", size); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError());
1
0
0
0
Zhiyi Zhang : setupapi/tests: Test phantom value after device creation.
by Alexandre Julliard
18 Mar '19
18 Mar '19
Module: wine Branch: master Commit: 35673c7e8e0709276fe6f0bb2727da3da438ec11 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=35673c7e8e0709276fe6f0bb…
Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 15 11:40:41 2019 +0800 setupapi/tests: Test phantom value after device creation. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 004a956..3add9b2 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -742,6 +742,11 @@ static void test_register_device_info(void) SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; + HKEY hkey; + LSTATUS ls; + DWORD type = 0; + DWORD phantom = 0; + DWORD size; int i = 0; SetLastError(0xdeadbeef); @@ -770,8 +775,19 @@ static void test_register_device_info(void) ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + RegOpenKeyA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Enum\\ROOT\\LEGACY_BOGUS\\0000", &hkey); + size = sizeof(phantom); + ls = RegQueryValueExA(hkey, "Phantom", NULL, &type, (BYTE *)&phantom, &size); + todo_wine ok(ls == ERROR_SUCCESS, "Got wrong error code %#x\n", ls); + todo_wine ok(phantom == 1, "Got wrong phantom value %d\n", phantom); + todo_wine ok(type == REG_DWORD, "Got wrong phantom type %#x\n", type); + ok(size == sizeof(phantom), "Got wrong phantom size %d\n", size); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + size = sizeof(phantom); + ls = RegQueryValueExA(hkey, "Phantom", NULL, NULL, (BYTE *)&phantom, &size); + ok(ls == ERROR_FILE_NOT_FOUND, "Got wrong error code %#x\n", ls); + RegCloseKey(hkey); ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0001", &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#x.\n", GetLastError());
1
0
0
0
Piotr Caban : msvcrt: Use correct locale when comparing strings in getenv.
by Alexandre Julliard
18 Mar '19
18 Mar '19
Module: wine Branch: master Commit: b633777ed4d02821029a3b83fdb89fb6fbb66933 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=b633777ed4d02821029a3b83…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 17 20:19:50 2019 +0100 msvcrt: Use correct locale when comparing strings in getenv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/environ.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index f48eabf..cce62bc 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -38,7 +38,7 @@ char * CDECL MSVCRT_getenv(const char *name) { char *str = *environ; char *pos = strchr(str,'='); - if (pos && ((pos - str) == length) && !strncasecmp(str,name,length)) + if (pos && ((pos - str) == length) && !MSVCRT__strnicmp(str,name,length)) { TRACE("(%s): got %s\n", debugstr_a(name), debugstr_a(pos + 1)); return pos + 1; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index aad8c95..8df8e3b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1145,6 +1145,7 @@ void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_ const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg); int __cdecl MSVCRT__toupper_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__tolower_l(int,MSVCRT__locale_t); +int __cdecl MSVCRT__strnicmp(const char*, const char*, MSVCRT_size_t); int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); int __cdecl MSVCRT__strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); unsigned int __cdecl MSVCRT__get_output_format(void);
1
0
0
0
Piotr Caban : msvcrt: Correctly set _stat64.st_dev fields in _wstat64.
by Alexandre Julliard
18 Mar '19
18 Mar '19
Module: wine Branch: master Commit: 513eb41f9a5f94f792b4eadedad38e95f3a43a59 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=513eb41f9a5f94f792b4eade…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 17 20:19:44 2019 +0100 msvcrt: Correctly set _stat64.st_dev fields in _wstat64. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index e06bb00..af769dc 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3157,8 +3157,8 @@ int CDECL MSVCRT__wstat64(const MSVCRT_wchar_t* path, struct MSVCRT__stat64 * bu memset(buf,0,sizeof(struct MSVCRT__stat64)); /* FIXME: rdev isn't drive num, despite what the docs says-what is it? */ - if (MSVCRT_iswalpha(*path)) - buf->st_dev = buf->st_rdev = toupperW(*path - 'A'); /* drive num */ + if (MSVCRT_iswalpha(*path) && path[1] == ':') + buf->st_dev = buf->st_rdev = toupperW(*path) - 'A'; /* drive num */ else buf->st_dev = buf->st_rdev = MSVCRT__getdrive() - 1;
1
0
0
0
Francois Gouget : mfplat/tests: A wording tweak in a win_skip() messages.
by Alexandre Julliard
18 Mar '19
18 Mar '19
Module: wine Branch: master Commit: 82060ae8df98cca80016f796675e9adb1ae0c37d URL:
https://source.winehq.org/git/wine.git/?a=commit;h=82060ae8df98cca80016f796…
Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 16 23:50:28 2019 +0100 mfplat/tests: A wording tweak in a win_skip() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 38151d9..3a102e2 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -825,7 +825,7 @@ static void test_MFCreateMFByteStreamOnStream(void) if (hr != S_OK) { - win_skip("Can not retrieve IMFAttributes interface from IMFByteStream\n"); + win_skip("Cannot retrieve IMFAttributes interface from IMFByteStream\n"); IStream_Release(stream); IMFByteStream_Release(bytestream); return;
1
0
0
0
Francois Gouget : dbghelp: Make minidump_add_memory64_block() static.
by Alexandre Julliard
18 Mar '19
18 Mar '19
Module: wine Branch: master Commit: 5651c9dd2819e67ff8aba698eed8d77abe4abcb8 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=5651c9dd2819e67ff8aba698…
Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 16 23:50:12 2019 +0100 dbghelp: Make minidump_add_memory64_block() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/minidump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index b096476..6a2525f 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -294,7 +294,7 @@ static BOOL fetch_macho_module_info_cb(const WCHAR* name, unsigned long base, return TRUE; } -void minidump_add_memory64_block(struct dump_context* dc, ULONG64 base, ULONG64 size) +static void minidump_add_memory64_block(struct dump_context* dc, ULONG64 base, ULONG64 size) { if (!dc->mem64) {
1
0
0
0
Francois Gouget : ntoskrnl.exe/tests: Make vskip_(), win_skip_() and kmemcpy() static.
by Alexandre Julliard
18 Mar '19
18 Mar '19
Module: wine Branch: master Commit: 7604174e5b9e9ca1ad3121f7ae3ae57bb120b070 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=7604174e5b9e9ca1ad3121f7…
Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 16 23:48:41 2019 +0100 ntoskrnl.exe/tests: Make vskip_(), win_skip_() and kmemcpy() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 7f2e68c..ae15df3 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -126,7 +126,7 @@ static void WINAPIV ok_(const char *file, int line, int condition, const char *m __ms_va_end(args); } -void vskip_(const char *file, int line, const char *msg, __ms_va_list args) +static void vskip_(const char *file, int line, const char *msg, __ms_va_list args) { const char *current_file; @@ -141,7 +141,7 @@ void vskip_(const char *file, int line, const char *msg, __ms_va_list args) skipped++; } -void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) +static void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) { __ms_va_list args; __ms_va_start(args, msg); @@ -185,7 +185,7 @@ static unsigned int strlenW( const WCHAR *str ) return s - str; } -void *kmemcpy(void *dest, const void *src, SIZE_T n) +static void *kmemcpy(void *dest, const void *src, SIZE_T n) { const char *s = src; char *d = dest;
1
0
0
0
Francois Gouget : kernel32/tests: A spelling fix in a win_skip() message.
by Alexandre Julliard
18 Mar '19
18 Mar '19
Module: wine Branch: master Commit: 193df74fde62b65f5a214e9d8c547efd8ceb5647 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=193df74fde62b65f5a214e9d…
Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 16 23:48:21 2019 +0100 kernel32/tests: A spelling fix in a win_skip() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 4c7df3d..3f30cce 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3680,7 +3680,7 @@ static void test_multiple_instances(void) if(!pCancelIoEx) { - win_skip("Skiping multiple instance tests on too old Windows\n"); + win_skip("Skipping multiple instance tests on too old Windows\n"); return; }
1
0
0
0
← Newer
1
...
37
38
39
40
41
42
43
...
110
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
Results per page:
10
25
50
100
200