Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 06:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MPR] Sync with Wine Staging 3.17. CORE-15127

Browse source
This commit is contained in:
Pierre Schweitzer 2018-12-08 11:42:23 +01:00
parent bcad6700ec
commit e02f3356b1
No known key found for this signature in database
GPG key ID: 7545556C3D585B0B
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dll/win32/mpr/wnet.c
View file

@ -139,9 +139,8 @@ static void _tryLoadProvider(PCWSTR provider)
HKEY hKey; HKEY hKey;
TRACE("%s\n", debugstr_w(provider)); TRACE("%s\n", debugstr_w(provider));
snprintfW(serviceName, sizeof(serviceName) / sizeof(WCHAR), serviceFmt, snprintfW(serviceName, ARRAY_SIZE(serviceName), serviceFmt, servicePrefix, provider);
servicePrefix, provider); serviceName[ARRAY_SIZE(serviceName) - 1] = '\0';
serviceName[sizeof(serviceName) / sizeof(WCHAR) - 1] = '\0';
if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, serviceName, 0, KEY_READ, &hKey) == if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, serviceName, 0, KEY_READ, &hKey) ==
ERROR_SUCCESS) ERROR_SUCCESS)
{ {
@ -2373,7 +2372,7 @@ DWORD WINAPI WNetGetConnectionA( LPCSTR lpLocalName,
if (wideLocalName) if (wideLocalName)
{ {
WCHAR wideRemoteStatic[MAX_PATH]; WCHAR wideRemoteStatic[MAX_PATH];
DWORD wideRemoteSize = sizeof(wideRemoteStatic) / sizeof(WCHAR); DWORD wideRemoteSize = ARRAY_SIZE(wideRemoteStatic);
MultiByteToWideChar(CP_ACP, 0, lpLocalName, -1, wideLocalName, len); MultiByteToWideChar(CP_ACP, 0, lpLocalName, -1, wideLocalName, len);
@ -2659,6 +2658,7 @@ DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel,
size = sizeof(*info) + (lstrlenW(lpLocalPath) + 1) * sizeof(WCHAR); size = sizeof(*info) + (lstrlenW(lpLocalPath) + 1) * sizeof(WCHAR);
if (*lpBufferSize < size) if (*lpBufferSize < size)
{ {
*lpBufferSize = size;
err = WN_MORE_DATA; err = WN_MORE_DATA;
break; break;
} }

2
media/doc/README.WINE
View file

@ -98,7 +98,7 @@ reactos/dll/win32/mciwave # Synced to WineStaging-3.3
reactos/dll/win32/mgmtapi # Synced to WineStaging-3.3 reactos/dll/win32/mgmtapi # Synced to WineStaging-3.3
reactos/dll/win32/mlang # Synced to WineStaging-3.3 reactos/dll/win32/mlang # Synced to WineStaging-3.3
reactos/dll/win32/mmdevapi # Synced to WineStaging-3.3 reactos/dll/win32/mmdevapi # Synced to WineStaging-3.3
reactos/dll/win32/mpr # Synced to WineStaging-3.3 reactos/dll/win32/mpr # Synced to WineStaging-3.17
reactos/dll/win32/mprapi # Synced to WineStaging-3.3 reactos/dll/win32/mprapi # Synced to WineStaging-3.3
reactos/dll/win32/msacm32 # Synced to WineStaging-3.3 reactos/dll/win32/msacm32 # Synced to WineStaging-3.3
reactos/dll/win32/msacm32.drv # Synced to WineStaging-3.3 reactos/dll/win32/msacm32.drv # Synced to WineStaging-3.3