ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32/tests: Fix Program Manager DDE conformance test failures.

This commit is contained in:
Mikey Alexander 2009-11-14 08:23:14 -08:00 committed by Alexandre Julliard
parent 2e3492f951
commit d51b4e19fb
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/shell32/tests/progman_dde.c
View File

@ -26,6 +26,13 @@
* as documented * as documented
* Better AddItem Tests (Lots of parameters to test) * Better AddItem Tests (Lots of parameters to test)
* Tests for Invalid Characters in Names / Invalid Parameters * Tests for Invalid Characters in Names / Invalid Parameters
* - Technically, calling as an administrator creates groups in the CSIDL_COMMON_PROGRAMS
* directory. Win 9x and non-administrator calls us CSIDL_PROGRAMS directory.
* Original plans were to check that items/groups were created in appropriate
* places. As of this writing and in order to simplify the test code, it now
* checks for existence in either place. From web searches, it is not at all
* obvious or trivial to detect if the call is coming from an administrator or
* non-administrator. IsUserAnAdmin
*/ */
#include <stdio.h> #include <stdio.h>
@ -39,9 +46,9 @@
/* Timeout on DdeClientTransaction Call */ /* Timeout on DdeClientTransaction Call */
#define MS_TIMEOUT_VAL 1000 #define MS_TIMEOUT_VAL 1000
/* # of times to poll for window creation */ /* # of times to poll for window creation */
#define PDDE_POLL_NUM 50 #define PDDE_POLL_NUM 150
/* time to sleep between polls */ /* time to sleep between polls */
#define PDDE_POLL_TIME 200 #define PDDE_POLL_TIME 300
/* Call Info */ /* Call Info */
#define DDE_TEST_MISC 0x00010000 #define DDE_TEST_MISC 0x00010000
@ -121,7 +128,6 @@ static const char * GetStringFromTestParams(int testParams)
#define DMLERR_TO_STR(x) case x: return#x; #define DMLERR_TO_STR(x) case x: return#x;
static const char * GetStringFromError(UINT err) static const char * GetStringFromError(UINT err)
{ {
const char * retstr;
switch (err) switch (err)
{ {
DMLERR_TO_STR(DMLERR_NO_ERROR); DMLERR_TO_STR(DMLERR_NO_ERROR);
@ -144,11 +150,8 @@ static const char * GetStringFromError(UINT err)
DMLERR_TO_STR(DMLERR_UNADVACKTIMEOUT); DMLERR_TO_STR(DMLERR_UNADVACKTIMEOUT);
DMLERR_TO_STR(DMLERR_UNFOUND_QUEUE_ID); DMLERR_TO_STR(DMLERR_UNFOUND_QUEUE_ID);
default: default:
retstr = "Unknown DML Error"; return "Unknown DML Error";
break;
} }
return retstr;
} }
/* Helper Function to Transfer DdeGetLastError into a String */ /* Helper Function to Transfer DdeGetLastError into a String */
@ -196,6 +199,7 @@ static void DdeExecuteCommand(DWORD instance, HCONV hConv, const char *strCmd, H
*hData, GetStringFromTestParams(testParams)); *hData, GetStringFromTestParams(testParams));
} }
} }
DdeFreeDataHandle(command);
} }
/* /*
@ -553,8 +557,13 @@ START_TEST(progman_dde)
hszProgman = DdeCreateStringHandle(instance, "PROGMAN", CP_WINANSI); hszProgman = DdeCreateStringHandle(instance, "PROGMAN", CP_WINANSI);
ok (hszProgman != NULL, "DdeCreateStringHandle Error %s\n", GetDdeLastErrorStr(instance)); ok (hszProgman != NULL, "DdeCreateStringHandle Error %s\n", GetDdeLastErrorStr(instance));
hConv = DdeConnect(instance, hszProgman, hszProgman, NULL); hConv = DdeConnect(instance, hszProgman, hszProgman, NULL);
ok (hConv != NULL, "DdeConnect Error %s\n", GetDdeLastErrorStr(instance));
ok (DdeFreeStringHandle(instance, hszProgman), "DdeFreeStringHandle failure\n"); ok (DdeFreeStringHandle(instance, hszProgman), "DdeFreeStringHandle failure\n");
/* Seeing failures on early versions of Windows Connecting to progman, exit if connection fails */
if (hConv == NULL)
{
ok (DdeUninitialize(instance), "DdeUninitialize failed\n");
return;
}
/* Run Tests */ /* Run Tests */
testnum = DdeTestProgman(instance, hConv); testnum = DdeTestProgman(instance, hConv);