[Wine-devel] Eter's patch is applied to winehq repo 02/14/13
builder-robot на etersoft.ru
builder-robot на etersoft.ru
Чт Фев 14 07:01:20 MSK 2013
New Etersoft's patches since last build time:
commit b8d081b0a88c55e142e0c3419326365b119a377f
Author: Roman Dadkov <romand на etersoft.ru>
mpr/tests: Test to check the return values of WNetGetUniversalNameA.
commit 8a4557ac8b84177d9718f9c83f792840902fe84d
Author: Roman Dadkov <romand на etersoft.ru>
ole32/tests: Add test for SetClientSite.
---
commit b8d081b0a88c55e142e0c3419326365b119a377f
Author: Roman Dadkov <romand на etersoft.ru>
Date: Tue Feb 12 18:26:00 2013 +0400
mpr/tests: Test to check the return values of WNetGetUniversalNameA.
diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c
index 8ccce78..90e1aec 100644
--- a/dlls/mpr/tests/mpr.c
+++ b/dlls/mpr/tests/mpr.c
@@ -28,11 +28,12 @@ static void test_WNetGetUniversalName(void)
{
DWORD ret;
char buffer[1024];
- DWORD drive_type, info_size;
+ DWORD drive_type, info_size, fail_size;
char driveA[] = "A:\\";
+ char driveandpathA[] = "A:\\file.txt";
WCHAR driveW[] = {'A',':','\\',0};
- for(; *driveA <= 'Z'; ++*driveA, ++*driveW){
+ for(; *driveA <= 'Z'; ++*driveA, ++*driveandpathA, ++*driveW){
drive_type = GetDriveTypeW(driveW);
info_size = sizeof(buffer);
@@ -50,6 +51,25 @@ static void test_WNetGetUniversalName(void)
ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size);
+ fail_size = 0;
+ ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL,
+ buffer, &fail_size);
+ if(drive_type == DRIVE_REMOTE)
+ todo_wine ok(ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret);
+ else
+ ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA gave wrong error: %08x\n", ret);
+
+ fail_size = sizeof(driveA) / sizeof(char) - 1;
+ ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL,
+ buffer, &fail_size);
+ if(drive_type == DRIVE_REMOTE)
+ ok(ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret);
+
+ ret = WNetGetUniversalNameA(driveandpathA, UNIVERSAL_NAME_INFO_LEVEL,
+ buffer, &info_size);
+ if(drive_type == DRIVE_REMOTE)
+ todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret);
+
info_size = sizeof(buffer);
ret = WNetGetUniversalNameW(driveW, UNIVERSAL_NAME_INFO_LEVEL,
buffer, &info_size);
@@ -60,7 +80,78 @@ static void test_WNetGetUniversalName(void)
ok((ret == WN_NOT_CONNECTED) || (ret == WN_NO_NET_OR_BAD_PATH),
"WNetGetUniversalNameW(%s, ...) returned %u (drive_type: %u)\n",
wine_dbgstr_w(driveW), ret, drive_type);
+ if(drive_type != DRIVE_REMOTE)
+ ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size);
+ }
+}
+static void test_WNetGetRemoteName(void)
+{
+ DWORD ret;
+ char buffer[1024];
+ DWORD drive_type, info_size, fail_size;
+ char driveA[] = "A:\\";
+ char driveandpathA[] = "A:\\file.txt";
+ WCHAR driveW[] = {'A',':','\\',0};
+
+ for(; *driveA <= 'Z'; ++*driveA, ++*driveandpathA, ++*driveW){
+ drive_type = GetDriveTypeW(driveW);
+
+ info_size = sizeof(buffer);
+ ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
+ buffer, &info_size);
+ todo_wine{
+ if(drive_type == DRIVE_REMOTE)
+ ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret);
+ else
+ ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA gave wrong error: %08x\n", ret);
+ }
+ ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size);
+
+ fail_size = 0;
+ ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
+ buffer, &fail_size);
+ todo_wine{
+ if(drive_type == DRIVE_REMOTE)
+ ok(ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret);
+ else
+ ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA gave wrong error: %08x\n", ret);
+ }
+ ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
+ buffer, NULL);
+ todo_wine ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret);
+
+ ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
+ NULL, &info_size);
+
+ todo_wine{
+ if(((GetVersion() & 0x8000ffff) == 0x00000004) || /* NT40 */
+ (drive_type == DRIVE_REMOTE))
+ ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret);
+ else
+ ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA failed: %08x\n", ret);
+ }
+
+ fail_size = sizeof(driveA) / sizeof(char) - 1;
+ ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
+ buffer, &fail_size);
+ if(drive_type == DRIVE_REMOTE)
+ todo_wine ok(ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret);
+
+ ret = WNetGetUniversalNameA(driveandpathA, REMOTE_NAME_INFO_LEVEL,
+ buffer, &info_size);
+ if(drive_type == DRIVE_REMOTE)
+ todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret);
+
+ info_size = sizeof(buffer);
+ ret = WNetGetUniversalNameW(driveW, REMOTE_NAME_INFO_LEVEL,
+ buffer, &info_size);
+ todo_wine{
+ if(drive_type == DRIVE_REMOTE)
+ ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret);
+ else
+ ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameW gave wrong error: %08x\n", ret);
+ }
ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size);
}
}
@@ -68,4 +159,5 @@ static void test_WNetGetUniversalName(void)
START_TEST(mpr)
{
test_WNetGetUniversalName();
+ test_WNetGetRemoteName();
}
commit 8a4557ac8b84177d9718f9c83f792840902fe84d
Author: Roman Dadkov <romand на etersoft.ru>
Date: Wed Feb 13 17:27:15 2013 +0400
ole32/tests: Add test for SetClientSite.
diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c
index 27653c1..4ef6638 100644
--- a/dlls/ole32/tests/ole2.c
+++ b/dlls/ole32/tests/ole2.c
@@ -1701,6 +1701,9 @@ static void test_default_handler(void)
hr = IOleObject_GetClientSite(pObject, &pClientSite);
ok_ole_success(hr, "IOleObject_GetClientSite");
+ hr = IOleObject_SetClientSite(pObject, pClientSite);
+ ok_ole_success(hr, "IOleObject_SetClientSite");
+
hr = IOleObject_GetClipboardData(pObject, 0, &pDataObject);
ok(hr == OLE_E_NOTRUNNING,
"IOleObject_GetClipboardData should have returned OLE_E_NOTRUNNING instead of 0x%08x\n",
Подробная информация о списке рассылки Wine-devel