[ODBCCP32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

svn path=/trunk/; revision=67204

diff --git a/rostests/winetests/odbccp32/misc.c b/rostests/winetests/odbccp32/misc.c
index 40846e5..cfe9532 100644 (file)
--- a/rostests/winetests/odbccp32/misc.c
+++ b/rostests/winetests/odbccp32/misc.c
@@ -36,11 +36,11 @@ static void test_SQLConfigMode(void)
     bool_ret = SQLGetConfigMode(&config_mode);
     ok(bool_ret && config_mode == ODBC_BOTH_DSN, "Failed to get the initial SQLGetConfigMode or it was not both\n");
 
     bool_ret = SQLGetConfigMode(&config_mode);
     ok(bool_ret && config_mode == ODBC_BOTH_DSN, "Failed to get the initial SQLGetConfigMode or it was not both\n");
 

-    bool_ret = SQLSetConfigMode(3);
+    /* try to set invalid mode */
+    bool_ret = SQLSetConfigMode(ODBC_SYSTEM_DSN+1);

     sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL);
     ok(!bool_ret && sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_PARAM_SEQUENCE, "SQLSetConfigMode with invalid argument did not fail correctly\n");
 
     sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL);
     ok(!bool_ret && sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_PARAM_SEQUENCE, "SQLSetConfigMode with invalid argument did not fail correctly\n");
 

-    ok (ODBC_SYSTEM_DSN == 2 && ODBC_USER_DSN == 1 && ODBC_BOTH_DSN == 0, "SQLSetConfigMode modes not as expected\n");

     for (i = ODBC_SYSTEM_DSN; i >= ODBC_BOTH_DSN; --i)
     {
         ok(SQLSetConfigMode((UWORD)i), "SQLSetConfigMode Failed to set config mode\n");
     for (i = ODBC_SYSTEM_DSN; i >= ODBC_BOTH_DSN; --i)
     {
         ok(SQLSetConfigMode((UWORD)i), "SQLSetConfigMode Failed to set config mode\n");