July 2015 - Wine-commits - list.winehq.org

Aric Stewart : hid: Implement HidD_GetInputReport.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: eac15cae713df14e4c379e306fc2aec99c8c3259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eac15cae713df14e4c379e306… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:40:22 2015 -0500 hid: Implement HidD_GetInputReport. --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index c72b0b8..9cb6440 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -5,7 +5,7 @@ @ stdcall HidD_GetFeature(long ptr long) @ stdcall HidD_GetHidGuid(ptr) @ stub HidD_GetIndexedString -@ stub HidD_GetInputReport +@ stdcall HidD_GetInputReport(long ptr long) @ stdcall HidD_GetManufacturerString(long ptr long) @ stub HidD_GetMsGenreDescriptor @ stub HidD_GetNumInputBuffers diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 4c1c1fd..d880a5e 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -57,6 +57,12 @@ void WINAPI HidD_GetHidGuid(LPGUID guid) *guid = GUID_DEVINTERFACE_HID; } +BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) +{ + TRACE("(%p %p %u) \n", HidDeviceObject, ReportBuffer, ReportBufferLength); + return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL, NULL); +} + BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u) \n", HidDeviceObject, Buffer, BufferLength); diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index c8aae28..beac073 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -29,6 +29,7 @@ typedef LONG NTSTATUS; BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); void WINAPI HidD_GetHidGuid(LPGUID guid); +BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength);

1 0

Aric Stewart : hid: Implement HidD_GetAttributes.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 674080da914c13d1e435ae08de79f657f941fc3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=674080da914c13d1e435ae08d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:40:27 2015 -0500 hid: Implement HidD_GetAttributes. --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 20 +++++++++++++++++++- include/ddk/hidsdi.h | 8 ++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 9cb6440..2dad3c7 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -1,6 +1,6 @@ @ stub HidD_FlushQueue @ stdcall HidD_FreePreparsedData(ptr) -@ stub HidD_GetAttributes +@ stdcall HidD_GetAttributes(long ptr) @ stub HidD_GetConfiguration @ stdcall HidD_GetFeature(long ptr long) @ stdcall HidD_GetHidGuid(ptr) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index d880a5e..c83cdfd 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -34,7 +34,7 @@ #include "hidusage.h" #include "ddk/hidclass.h" -#include "ddk/hidpi.h" +#include "ddk/hidsdi.h" WINE_DEFAULT_DEBUG_CHANNEL(hid); @@ -45,6 +45,24 @@ BOOLEAN WINAPI HidD_FreePreparsedData(PHIDP_PREPARSED_DATA PreparsedData) return TRUE; } +BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) +{ + HID_COLLECTION_INFORMATION info; + BOOLEAN ret; + + TRACE("(%p %p)\n", HidDeviceObject, Attr); + + ret = DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION), NULL, NULL); + + if (ret) + { + Attr->VendorID = info.VendorID; + Attr->ProductID = info.ProductID; + Attr->VersionNumber = info.VersionNumber; + } + return ret; +} + BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index beac073..9ea89b5 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -27,6 +27,13 @@ typedef LONG NTSTATUS; #endif +typedef struct _HIDD_ATTRIBUTES { + ULONG Size; + USHORT VendorID; + USHORT ProductID; + USHORT VersionNumber; +} HIDD_ATTRIBUTES, *PHIDD_ATTRIBUTES; + BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); void WINAPI HidD_GetHidGuid(LPGUID guid); BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); @@ -35,5 +42,6 @@ BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetPreparsedData( HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData); BOOLEAN WINAPI HidD_FreePreparsedData(PHIDP_PREPARSED_DATA PreparsedData); +BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr); #endif /* __WINE_HIDSDI_H */

1 0

Aric Stewart : hid: Implement HidP_MaxUsageListLength.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 1174fc63adac9ccb6046898bd33973a33ff2e1db URL: http://source.winehq.org/git/wine.git/?a=commit;h=1174fc63adac9ccb6046898bd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:40:32 2015 -0500 hid: Implement HidP_MaxUsageListLength. --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/hidpi.h | 2 +- 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 2dad3c7..8772a35 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -33,7 +33,7 @@ @ stdcall HidP_GetValueCaps(long ptr ptr ptr) @ stdcall HidP_InitializeReportForID(long long ptr ptr long) @ stub HidP_MaxDataListLength -@ stub HidP_MaxUsageListLength +@ stdcall HidP_MaxUsageListLength(long long ptr) @ stub HidP_SetData @ stub HidP_SetScaledUsageValue @ stub HidP_SetUsageValue diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index d680f78..d263880 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -421,3 +421,56 @@ NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR Re return HIDP_STATUS_SUCCESS; } + +ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData) +{ + PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; + WINE_HID_REPORT *report = NULL; + int r_count; + int i; + int count = 0; + + TRACE("(%i, %x, %p)\n", ReportType, UsagePage, PreparsedData); + + if (data->magic != HID_MAGIC) + return 0; + + switch(ReportType) + { + case HidP_Input: + report = HID_INPUT_REPORTS(data); + r_count = data->dwInputReportCount; + break; + case HidP_Output: + report = HID_OUTPUT_REPORTS(data); + r_count = data->dwOutputReportCount; + break; + case HidP_Feature: + report = HID_FEATURE_REPORTS(data); + r_count = data->dwFeatureReportCount; + break; + default: + return HIDP_STATUS_INVALID_REPORT_TYPE; + } + + if (!r_count || !report) + return 0; + + for (i = 0; i < r_count; i++) + { + int j; + for (j = 0; j < report->elementCount; j++) + { + if (report->Elements[j].caps.button.UsagePage == UsagePage) + { + if (report->Elements[j].caps.button.IsRange) + count += (report->Elements[j].caps.button.u.Range.UsageMax - + report->Elements[j].caps.button.u.Range.UsageMin) + 1; + else + count++; + } + } + report = HID_NEXT_REPORT(data, report); + } + return count; +} diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index f4da89d..40821de 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -142,7 +142,7 @@ NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); - +ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData); #ifndef FACILITY_HID_ERROR_CODE #define FACILITY_HID_ERROR_CODE 0x11

1 0

Sebastian Lackner : windowscodecs: Fix build failure on OSX.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: e5f57e63424bbe0ab1c95ffbb598e1fef157238f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f57e63424bbe0ab1c95ffbb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jun 30 21:02:19 2015 +0200 windowscodecs: Fix build failure on OSX. --- dlls/windowscodecs/icnsformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index 54c7707..5d48a1a 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -179,7 +179,7 @@ static ULONG WINAPI IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface) if (This->icns_image != NULL) HeapFree(GetProcessHeap(), 0, This->icns_image); - IWICBitmapFrameEncode_Release(&This->encoder->IWICBitmapFrameEncode_iface); + IWICBitmapEncoder_Release(&This->encoder->IWICBitmapEncoder_iface); HeapFree(GetProcessHeap(), 0, This); }

1 0

Bernhard Übelacker : msi/tests: Test MsiSourceListEnumMediaDisks with volumeLabel and diskPrompt as NULL.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: db5f235a8b6f64e6d38ddb3d1e76f26604bfa8ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=db5f235a8b6f64e6d38ddb3d1… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Jun 30 14:37:59 2015 +0200 msi/tests: Test MsiSourceListEnumMediaDisks with volumeLabel and diskPrompt as NULL. --- dlls/msi/tests/source.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 1ef3c9d..3b3ba40 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -2888,6 +2888,26 @@ static void test_MsiSourceListEnumMediaDisks(void) ok(labelsz == MAX_PATH, "Expected MAX_PATH, got %d\n", labelsz); ok(!lstrcmpA(prompt, "bbb"), "Expected \"bbb\", got \"%s\"\n", prompt); + /* pcchVolumeLabel, szDiskPrompt and pcchDiskPrompt are NULL */ + id = 0; + lstrcpyA(label, "aaa"); + r = pMsiSourceListEnumMediaDisksA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, 0, &id, label, NULL, + NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label); + todo_wine + ok(id == 1, "Expected 1, got %d\n", id); + + /* szVolumeLabel, pcchVolumeLabel, szDiskPrompt and pcchDiskPrompt are NULL */ + id = 0; + r = pMsiSourceListEnumMediaDisksA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, 0, &id, NULL, NULL, + NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + ok(id == 1, "Expected 1, got %d\n", id); + /* pcchVolumeLabel is exactly 5 */ lstrcpyA(label, "aaa"); labelsz = 5;

1 0

Bernhard Übelacker : msi: Remove shortcut which calls RegEnumValueW with value and val_count as NULL.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: a1dbf4d78bba04db411908fb994cc28d0095b4e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1dbf4d78bba04db411908fb9… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Jun 30 14:38:00 2015 +0200 msi: Remove shortcut which calls RegEnumValueW with value and val_count as NULL. --- dlls/msi/source.c | 7 ------- dlls/msi/tests/source.c | 2 -- 2 files changed, 9 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index f4c139f..8f5d165 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -258,13 +258,6 @@ UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode, return ERROR_NO_MORE_ITEMS; } - if (!pcchVolumeLabel && !pcchDiskPrompt) - { - r = RegEnumValueW(media, dwIndex, NULL, NULL, NULL, - &type, NULL, NULL); - goto done; - } - res = RegQueryInfoKeyW(media, NULL, NULL, NULL, NULL, NULL, NULL, &numvals, &valuesz, &datasz, NULL, NULL); if (res != ERROR_SUCCESS) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 3b3ba40..94e168d 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -2896,7 +2896,6 @@ static void test_MsiSourceListEnumMediaDisks(void) NULL, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(label, "aaa"), "Expected \"aaa\", got \"%s\"\n", label); - todo_wine ok(id == 1, "Expected 1, got %d\n", id); /* szVolumeLabel, pcchVolumeLabel, szDiskPrompt and pcchDiskPrompt are NULL */ @@ -2905,7 +2904,6 @@ static void test_MsiSourceListEnumMediaDisks(void) MSICODE_PRODUCT, 0, &id, NULL, NULL, NULL, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(id == 1, "Expected 1, got %d\n", id); /* pcchVolumeLabel is exactly 5 */

1 0

Bernhard Übelacker : mpr/tests: Add tests for WNetCachePassword and friends.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: d1ca4e87c31e1cc2fa4e4c734eb3337fb035a48e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ca4e87c31e1cc2fa4e4c734… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Jun 30 14:38:01 2015 +0200 mpr/tests: Add tests for WNetCachePassword and friends. --- dlls/mpr/tests/mpr.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 6a15ebf..f3349df 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -160,8 +160,106 @@ static void test_WNetGetRemoteName(void) } } +static DWORD (WINAPI *pWNetCachePassword)( LPSTR, WORD, LPSTR, WORD, BYTE, WORD ); +static DWORD (WINAPI *pWNetGetCachedPassword)( LPSTR, WORD, LPSTR, LPWORD, BYTE ); +static UINT (WINAPI *pWNetEnumCachedPasswords)( LPSTR, WORD, BYTE, ENUMPASSWORDPROC, DWORD); +static UINT (WINAPI *pWNetRemoveCachedPassword)( LPSTR, WORD, BYTE ); + +#define MPR_GET_PROC(func) \ + p ## func = (void*)GetProcAddress(hmpr, #func) + +static void InitFunctionPtrs(void) +{ + HMODULE hmpr = GetModuleHandleA("mpr.dll"); + + MPR_GET_PROC(WNetCachePassword); + MPR_GET_PROC(WNetGetCachedPassword); + MPR_GET_PROC(WNetEnumCachedPasswords); + MPR_GET_PROC(WNetRemoveCachedPassword); +} + +static const char* m_resource = "wine-test-resource"; +static const char* m_password = "wine-test-password"; +static const BYTE m_type = 1; +static const DWORD m_param = 8; +static BOOL m_callback_reached; + +static BOOL CALLBACK enum_password_proc(PASSWORD_CACHE_ENTRY* pce, DWORD param) +{ + WORD size = 0; + char* buf; + + ok(param == m_param, "param, got %d, got %d\n", param, m_param); + + size = offsetof( PASSWORD_CACHE_ENTRY, abResource[pce->cbResource + pce->cbPassword] ); + ok(pce->cbEntry == size, "cbEntry, got %d, expected %d\n", pce->cbEntry, size); + ok(pce->cbResource == strlen(m_resource), "cbResource, got %d\n", pce->cbResource); + ok(pce->cbPassword == strlen(m_password), "cbPassword, got %d\n", pce->cbPassword); + ok(pce->iEntry == 0, "iEntry, got %d, got %d\n", pce->iEntry, 0); + ok(pce->nType == m_type, "nType, got %d, got %d\n", pce->nType, m_type); + + buf = (char*)pce->abResource; + ok(strncmp(buf, m_resource, pce->cbResource)==0, "enumerated ressource differs, got %.*s, expected %s\n", pce->cbResource, buf, m_resource); + + buf += pce->cbResource; + ok(strncmp(buf, m_password, pce->cbPassword)==0, "enumerated ressource differs, got %.*s, expected %s\n", pce->cbPassword, buf, m_password); + + m_callback_reached = 1; + return TRUE; +} + +static void test_WNetCachePassword(void) +{ + char resource_buf[32]; + char password_buf[32]; + char prefix_buf[32]; + WORD resource_len; + WORD password_len; + WORD prefix_len; + DWORD ret; + + InitFunctionPtrs(); + + if (pWNetCachePassword && + pWNetGetCachedPassword && + pWNetEnumCachedPasswords && + pWNetRemoveCachedPassword) + { + strcpy(resource_buf, m_resource); + resource_len = strlen(m_resource); + strcpy(password_buf, m_password); + password_len = strlen(m_password); + ret = pWNetCachePassword(resource_buf, resource_len, password_buf, password_len, m_type, 0); + ok(ret == WN_SUCCESS, "WNetCachePassword failed: got %d, expected %d\n", ret, WN_SUCCESS); + + strcpy(resource_buf, m_resource); + resource_len = strlen(m_resource); + strcpy(password_buf, "------"); + password_len = sizeof(password_buf); + ret = pWNetGetCachedPassword(resource_buf, resource_len, password_buf, &password_len, m_type); + ok(ret == WN_SUCCESS, "WNetGetCachedPassword failed: got %d, expected %d\n", ret, WN_SUCCESS); + ok(password_len == strlen(m_password), "password length different, got %d\n", password_len); + ok(strncmp(password_buf, m_password, password_len)==0, "passwords different, got %.*s, expected %s\n", password_len, password_buf, m_password); + + prefix_len = 9; + strcpy(prefix_buf, m_resource); + prefix_buf[prefix_len] = '0'; + ret = pWNetEnumCachedPasswords(prefix_buf, prefix_len, m_type, enum_password_proc, m_param); + ok(ret == WN_SUCCESS, "WNetEnumCachedPasswords failed: got %d, expected %d\n", ret, WN_SUCCESS); + ok(m_callback_reached == 1, "callback was not reached\n"); + + strcpy(resource_buf, m_resource); + resource_len = strlen(m_resource); + ret = pWNetRemoveCachedPassword(resource_buf, resource_len, m_type); + ok(ret == WN_SUCCESS, "WNetRemoveCachedPassword failed: got %d, expected %d\n", ret, WN_SUCCESS); + } else { + win_skip("WNetCachePassword() is not supported.\n"); + } +} + START_TEST(mpr) { test_WNetGetUniversalName(); test_WNetGetRemoteName(); + test_WNetCachePassword(); }

1 0

Bernhard Übelacker : mpr: Call RegEnumValueA with valid value parameter.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: b4ded3d77454cbcb2e1e06acde4c53b14cbd9ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ded3d77454cbcb2e1e06acd… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Jun 30 14:38:02 2015 +0200 mpr: Call RegEnumValueA with valid value parameter. --- dlls/mpr/pwcache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mpr/pwcache.c b/dlls/mpr/pwcache.c index 178d40f..aa09522 100644 --- a/dlls/mpr/pwcache.c +++ b/dlls/mpr/pwcache.c @@ -306,7 +306,8 @@ UINT WINAPI WNetEnumCachedPasswords( entry->cbPassword = data_sz; entry->iEntry = i; entry->nType = nType; - r = RegEnumValueA( hkey, i, NULL, &val_sz, NULL, &type, + size = sizeof val; + r = RegEnumValueA( hkey, i, val, &size, NULL, &type, &entry->abResource[val_sz], &data_sz ); if( r == ERROR_SUCCESS ) enumPasswordProc( entry, param );

1 0

Daniel Lehman : msvcp90: Make argument to _Locinfo__Getdays/months const.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 1ee74905bb7817747f545c56f907c048d7046302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ee74905bb7817747f545c56f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jun 26 09:59:20 2015 -0700 msvcp90: Make argument to _Locinfo__Getdays/months const. --- dlls/msvcp90/locale.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index b3275c1..f9a42e6 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -800,7 +800,7 @@ int __thiscall _Locinfo__Getdateorder(const _Locinfo *this) /* ?_Getdays(a)_Locinfo@std@@QBEPBDXZ */ /* ?_Getdays(a)_Locinfo@std@@QEBAPEBDXZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getdays, 4) -const char* __thiscall _Locinfo__Getdays(_Locinfo *this) +const char* __thiscall _Locinfo__Getdays(const _Locinfo *this) { char *days = _Getdays(); const char *ret; @@ -808,8 +808,8 @@ const char* __thiscall _Locinfo__Getdays(_Locinfo *this) TRACE("(%p)\n", this); if(days) { - locale_string_char_dtor(&this->days); - locale_string_char_ctor_cstr(&this->days, days); + locale_string_char_dtor((locale_string *)&this->days); + locale_string_char_ctor_cstr((locale_string *)&this->days, days); free(days); } @@ -822,7 +822,7 @@ const char* __thiscall _Locinfo__Getdays(_Locinfo *this) /* ?_W_Getdays(a)_Locinfo@std@@QBEPBGXZ */ /* ?_W_Getdays(a)_Locinfo@std@@QEBAPEBGXZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__W_Getdays, 4) -const wchar_t* __thiscall _Locinfo__W_Getdays(_Locinfo *this) +const wchar_t* __thiscall _Locinfo__W_Getdays(const _Locinfo *this) { static const wchar_t defdays[] = { @@ -840,8 +840,8 @@ const wchar_t* __thiscall _Locinfo__W_Getdays(_Locinfo *this) TRACE("(%p)\n", this); if(wdays) { - locale_string_wchar_dtor(&this->wdays); - locale_string_wchar_ctor_cstr(&this->wdays, wdays); + locale_string_wchar_dtor((locale_string_wchar *)&this->wdays); + locale_string_wchar_ctor_cstr((locale_string_wchar *)&this->wdays, wdays); free(wdays); } @@ -853,7 +853,7 @@ const wchar_t* __thiscall _Locinfo__W_Getdays(_Locinfo *this) /* ?_W_Getmonths(a)_Locinfo@std@@QBEPBGXZ */ /* ?_W_Getmonths(a)_Locinfo@std@@QEBAPEBGXZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__W_Getmonths, 4) -const wchar_t* __thiscall _Locinfo__W_Getmonths(_Locinfo *this) +const wchar_t* __thiscall _Locinfo__W_Getmonths(const _Locinfo *this) { static const wchar_t defmonths[] = { @@ -876,8 +876,8 @@ const wchar_t* __thiscall _Locinfo__W_Getmonths(_Locinfo *this) TRACE("(%p)\n", this); if(wmonths) { - locale_string_wchar_dtor(&this->wmonths); - locale_string_wchar_ctor_cstr(&this->wmonths, wmonths); + locale_string_wchar_dtor((locale_string_wchar *)&this->wmonths); + locale_string_wchar_ctor_cstr((locale_string_wchar *)&this->wmonths, wmonths); free(wmonths); } @@ -890,7 +890,7 @@ const wchar_t* __thiscall _Locinfo__W_Getmonths(_Locinfo *this) /* ?_Getmonths(a)_Locinfo@std@@QBEPBDXZ */ /* ?_Getmonths(a)_Locinfo@std@@QEBAPEBDXZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getmonths, 4) -const char* __thiscall _Locinfo__Getmonths(_Locinfo *this) +const char* __thiscall _Locinfo__Getmonths(const _Locinfo *this) { char *months = _Getmonths(); const char *ret; @@ -898,8 +898,8 @@ const char* __thiscall _Locinfo__Getmonths(_Locinfo *this) TRACE("(%p)\n", this); if(months) { - locale_string_char_dtor(&this->months); - locale_string_char_ctor_cstr(&this->months, months); + locale_string_char_dtor((locale_string *)&this->months); + locale_string_char_ctor_cstr((locale_string *)&this->months, months); free(months); }

1 0

Daniel Lehman : msvcp110: Add export for facet dtor.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: bfafef4e2ff8585def7717f021aa19abaddc4ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfafef4e2ff8585def7717f02… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jun 30 10:00:36 2015 -0700 msvcp110: Add export for facet dtor. --- dlls/msvcp110/msvcp110.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 9ba3224..cc4d157 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -517,9 +517,9 @@ @ cdecl -arch=arm ??1ctype_base(a)std@@UAA(a)XZ(ptr) ctype_base_dtor @ thiscall -arch=i386 ??1ctype_base(a)std@@UAE(a)XZ(ptr) ctype_base_dtor @ cdecl -arch=win64 ??1ctype_base(a)std@@UEAA(a)XZ(ptr) ctype_base_dtor -@ stub -arch=arm ??1facet(a)locale@std@@MAA(a)XZ -@ stub -arch=i386 ??1facet(a)locale@std@@MAE(a)XZ -@ stub -arch=win64 ??1facet(a)locale@std@@MEAA(a)XZ +@ cdecl -arch=arm ??1facet(a)locale@std@@MAA(a)XZ(ptr) locale_facet_dtor +@ thiscall -arch=i386 ??1facet(a)locale@std@@MAE(a)XZ(ptr) locale_facet_dtor +@ cdecl -arch=win64 ??1facet(a)locale@std@@MEAA(a)XZ(ptr) locale_facet_dtor @ cdecl -arch=arm ??1ios_base(a)std@@UAA(a)XZ(ptr) ios_base_dtor @ thiscall -arch=i386 ??1ios_base(a)std@@UAE(a)XZ(ptr) ios_base_dtor @ cdecl -arch=win64 ??1ios_base(a)std@@UEAA(a)XZ(ptr) ios_base_dtor

1 0