September 2009 - Wine-Commits

Henri Verbeet : wined3d: Don' t free D3D surfaces until the wined3d surface is destroyed.
by Alexandre Julliard Sept. 16, 2009

Sept. 16, 2009

Module: wine Branch: master Commit: a5214c306fd82982ed10fd8221ac00230186c9a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5214c306fd82982ed10fd822… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 16 08:37:15 2009 +0200 wined3d: Don't free D3D surfaces until the wined3d surface is destroyed. This prevents for example a d3d9 depth stencil from being destroyed when it has no external references but is still in use by the device/stateblock. A nice side effect is that it simplifies handling of "implicit" surfaces like the frontbuffer and backbuffers, as well as the forwarding of reference counts for surfaces that are part of a texture. --- dlls/d3d10core/device.c | 6 ++ dlls/d3d10core/texture2d.c | 21 +++++++- dlls/d3d8/cubetexture.c | 2 +- dlls/d3d8/d3d8_private.h | 6 -- dlls/d3d8/device.c | 23 +++----- dlls/d3d8/directx.c | 20 ------- dlls/d3d8/surface.c | 31 ++++++++--- dlls/d3d8/swapchain.c | 2 +- dlls/d3d8/texture.c | 2 +- dlls/d3d9/cubetexture.c | 2 +- dlls/d3d9/d3d9_private.h | 6 -- dlls/d3d9/device.c | 22 +++----- dlls/d3d9/directx.c | 20 ------- dlls/d3d9/surface.c | 31 ++++++++--- dlls/d3d9/swapchain.c | 2 +- dlls/d3d9/texture.c | 2 +- dlls/ddraw/ddraw.c | 109 ++++++++-------------------------------- dlls/ddraw/ddraw_private.h | 3 - dlls/ddraw/main.c | 4 -- dlls/ddraw/surface.c | 9 +++- dlls/dxgi/swapchain.c | 14 +----- dlls/wined3d/cubetexture.c | 13 +++-- dlls/wined3d/device.c | 31 ++++------- dlls/wined3d/directx.c | 18 +++---- dlls/wined3d/surface.c | 6 ++- dlls/wined3d/surface_base.c | 4 +- dlls/wined3d/swapchain.c | 11 ++-- dlls/wined3d/swapchain_base.c | 2 +- dlls/wined3d/swapchain_gdi.c | 13 +++-- dlls/wined3d/texture.c | 13 +++-- dlls/wined3d/wined3d_private.h | 6 +- include/wine/wined3d.idl | 13 +++-- 32 files changed, 188 insertions(+), 279 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5214c306fd82982ed10f…

1 0

Huw Davies : include: Add DBSTATUSENUM.
by Alexandre Julliard Sept. 16, 2009

Sept. 16, 2009

Module: wine Branch: master Commit: 6b6d8ccc393a439453c5bb4fdea335e40cb1318b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6d8ccc393a439453c5bb4fd… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 16 11:44:00 2009 +0100 include: Add DBSTATUSENUM. --- include/dbs.idl | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index 2383d0c..e39ee97 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -152,3 +152,21 @@ enum DBTYPEENUM }; typedef DWORD DBSTATUS; + +enum DBSTATUSENUM +{ + DBSTATUS_S_OK = 0, + DBSTATUS_E_BADACCESSOR = 1, + DBSTATUS_E_CANTCONVERTVALUE = 2, + DBSTATUS_S_ISNULL = 3, + DBSTATUS_S_TRUNCATED = 4, + DBSTATUS_E_SIGNMISMATCH = 5, + DBSTATUS_E_DATAOVERFLOW = 6, + DBSTATUS_E_CANTCREATE = 7, + DBSTATUS_E_UNAVAILABLE = 8, + DBSTATUS_E_PERMISSIONDENIED = 9, + DBSTATUS_E_INTEGRITYVIOLATION = 10, + DBSTATUS_E_SCHEMAVIOLATION = 11, + DBSTATUS_E_BADSTATUS = 12, + DBSTATUS_S_DEFAULT = 13 +};

1 0

Huw Davies : include: Add a few more error codes.
by Alexandre Julliard Sept. 16, 2009

Sept. 16, 2009

Module: wine Branch: master Commit: 142af7e1b4e422421e1024484d89dfe8f847a0bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=142af7e1b4e422421e1024484… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 16 11:44:43 2009 +0100 include: Add a few more error codes. --- include/oledberr.h | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/oledberr.h b/include/oledberr.h index 6a169ef..b534531 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -21,10 +21,14 @@ #ifndef __WINE_OLEDBERR_H #define __WINE_OLEDBERR_H -#define DB_E_NOTFOUND 0x80040e19 +#define DB_E_NOTFOUND 0x80040e19 -#define DB_E_ERRORSOCCURRED 0x80040e21 +#define DB_E_UNSUPPORTEDCONVERSION 0x80040e1d -#define DB_S_ERRORSOCCURRED 0x00040eda +#define DB_E_ERRORSOCCURRED 0x80040e21 + +#define DB_E_DATAOVERFLOW 0x80040e57 + +#define DB_S_ERRORSOCCURRED 0x00040eda #endif /* __WINE_OLEDBERR_H */

1 0

Paul Vriens : comdlg32/tests: Test the correct path length for CDM_GETFOLDERPATH.
by Alexandre Julliard Sept. 16, 2009

Sept. 16, 2009

Module: wine Branch: master Commit: 6a3c56a5890395430619c873e08a01487c0fadfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a3c56a5890395430619c873e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Sep 16 11:52:04 2009 +0200 comdlg32/tests: Test the correct path length for CDM_GETFOLDERPATH. --- dlls/comdlg32/tests/filedlg.c | 62 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 8c32866..6583130 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -873,6 +873,67 @@ static void test_arrange(void) } } +static CHAR WINDIR[MAX_PATH]; + +static UINT_PTR CALLBACK path_hook_proc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + LPNMHDR nmh; + + if( msg == WM_NOTIFY) + { + nmh = (LPNMHDR) lParam; + if( nmh->code == CDN_INITDONE) + { + PostMessage( GetParent(hDlg), WM_COMMAND, IDCANCEL, FALSE); + } + else if ( nmh->code == CDN_FOLDERCHANGE) + { + char buf[1024]; + int ret; + + memset(buf, 0x66, sizeof(buf)); + ret = SendMessageA( GetParent(hDlg), CDM_GETFOLDERPATH, sizeof(buf), (LPARAM)buf); + ok(!lstrcmpA(WINDIR, buf), "Expected '%s', got '%s'\n", WINDIR, buf); + ok(lstrlenA(WINDIR) + 1 == ret, "Expected %d, got %d\n", lstrlenA(WINDIR) + 1, ret); + } + } + + return 0; +} + +static void test_getfolderpath(void) +{ + OPENFILENAMEA ofn; + BOOL result; + char szFileName[MAX_PATH] = ""; + char szInitialDir[MAX_PATH]; + + GetWindowsDirectory(szInitialDir, MAX_PATH); + lstrcpyA(WINDIR, szInitialDir); + + ZeroMemory(&ofn, sizeof(ofn)); + + ofn.lStructSize = sizeof(ofn); + ofn.hwndOwner = NULL; + ofn.lpstrFilter = "Text Files (*.txt)\0*.txt\0All Files (*.*)\0*.*\0"; + ofn.lpstrFile = szFileName; + ofn.nMaxFile = MAX_PATH; + ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_ENABLEHOOK; + ofn.lpstrDefExt = "txt"; + ofn.lpfnHook = path_hook_proc; + ofn.lpstrInitialDir = szInitialDir; + + result = GetOpenFileNameA(&ofn); + ok(0 == result, "expected 0, got %d\n", result); + ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", + CommDlgExtendedError()); + + result = GetSaveFileNameA(&ofn); + ok(0 == result, "expected 0, got %d\n", result); + ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", + CommDlgExtendedError()); +} + START_TEST(filedlg) { test_DialogCancel(); @@ -881,4 +942,5 @@ START_TEST(filedlg) test_arrange(); test_resize(); test_ok(); + test_getfolderpath(); }

1 0

Paul Vriens : comdlg32: Return the correct path length for CDM_GETFOLDERPATH.
by Alexandre Julliard Sept. 16, 2009

Sept. 16, 2009

Module: wine Branch: master Commit: e997909ba7796c169fc79f91efdddc461f688ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e997909ba7796c169fc79f91e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Sep 16 11:51:36 2009 +0200 comdlg32: Return the correct path length for CDM_GETFOLDERPATH. --- dlls/comdlg32/filedlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 4986122..a28c457 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -910,7 +910,7 @@ static INT_PTR FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM WideCharToMultiByte(CP_ACP, 0, lpstrPath, -1, (LPSTR)lParam, (int)wParam, NULL, NULL); } - retval = lstrlenW(lpstrPath); + retval = lstrlenW(lpstrPath) + 1; break; case CDM_GETFOLDERIDLIST:

1 0

Paul Vriens : comdlg32/tests: Fix a test failure on Vista/W2K.
by Alexandre Julliard Sept. 16, 2009

Sept. 16, 2009

Module: wine Branch: master Commit: e848a6f6e45b291fd8fa2c0bf536ff4bbe208b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e848a6f6e45b291fd8fa2c0bf… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Sep 16 14:27:43 2009 +0200 comdlg32/tests: Fix a test failure on Vista/W2K. --- dlls/comdlg32/tests/filedlg.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index be3cf8c..8c32866 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -200,6 +200,11 @@ static UINT_PTR CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wPa view_params.hwndView = NULL; hr = IShellView2_CreateViewWindow2(shell_view2, &view_params); + if (hr == E_FAIL) + { + win_skip("CreateViewWindow2 is broken on Vista/W2K8\n"); + goto cleanup; + } ok(SUCCEEDED(hr), "CreateViewWindow2 returned %#x\n", hr); if (FAILED(hr)) goto cleanup;

1 0

Vitaly Perov : shell32: Enlarge static to display multiline text correctly.
by Alexandre Julliard Sept. 16, 2009

Sept. 16, 2009

Module: wine Branch: master Commit: 749c86cd3f44ebc8a3927bf1ae5a7620b65c221f URL: http://source.winehq.org/git/wine.git/?a=commit;h=749c86cd3f44ebc8a3927bf1a… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Wed Sep 16 18:07:16 2009 +0400 shell32: Enlarge static to display multiline text correctly. --- dlls/shell32/shell32_Ru.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_Ru.rc b/dlls/shell32/shell32_Ru.rc index 70ef10c..65f670a 100644 --- a/dlls/shell32/shell32_Ru.rc +++ b/dlls/shell32/shell32_Ru.rc @@ -125,7 +125,7 @@ FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "Да", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Отмена", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP - LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_TITLE, 4, 4, 180, 25 LTEXT "", IDD_STATUS, 4, 25, 180, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT |

1 0

Vitaly Perov : comdlg32: Fix some Russian resources.
by Alexandre Julliard Sept. 16, 2009

Sept. 16, 2009

Module: wine Branch: master Commit: eb20cc1d019f7a3a47c81e600f30018169c9df37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb20cc1d019f7a3a47c81e600… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Wed Sep 16 18:19:58 2009 +0400 comdlg32: Fix some Russian resources. --- dlls/comdlg32/cdlg_Ru.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/cdlg_Ru.rc b/dlls/comdlg32/cdlg_Ru.rc index b3904cf..7c1eec5 100644 --- a/dlls/comdlg32/cdlg_Ru.rc +++ b/dlls/comdlg32/cdlg_Ru.rc @@ -261,8 +261,8 @@ FONT 8, "MS Shell Dlg" CONTROL "&Выделение", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 85,122, 20,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 20,12, WS_GROUP | ES_NUMBER - RTEXT "&от:", stc2, 70,124, 10,8 - RTEXT "&до:", stc3, 106,124, 10,8 + RTEXT "&от:", stc2, 72,124, 12,8 + RTEXT "&до:", stc3, 108,124, 12,8 } PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178

1 0

Hans Leidekker : msi: Set or override a user environment string when there is no prefix.
by Alexandre Julliard Sept. 16, 2009

Sept. 16, 2009

Module: wine Branch: master Commit: 659768e2035d9b721e9c2233b8fc3f862904a7ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=659768e2035d9b721e9c2233b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 15 20:52:39 2009 +0200 msi: Set or override a user environment string when there is no prefix. --- dlls/msi/action.c | 8 +++- dlls/msi/tests/install.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 6bff87a..8f004b3 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5313,8 +5313,7 @@ static LONG env_set_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags ) } } - if (!*flags || - check_flag_combo(*flags, ENV_ACT_SETALWAYS | ENV_ACT_SETABSENT) || + if (check_flag_combo(*flags, ENV_ACT_SETALWAYS | ENV_ACT_SETABSENT) || check_flag_combo(*flags, ENV_ACT_REMOVEMATCH | ENV_ACT_SETABSENT) || check_flag_combo(*flags, ENV_ACT_REMOVEMATCH | ENV_ACT_SETALWAYS) || check_flag_combo(*flags, ENV_ACT_SETABSENT | ENV_MOD_MASK)) @@ -5323,6 +5322,9 @@ static LONG env_set_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags ) return ERROR_FUNCTION_FAILED; } + if (!*flags) + *flags = ENV_ACT_SETALWAYS | ENV_ACT_REMOVE; + return ERROR_SUCCESS; } @@ -5350,6 +5352,8 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) name = MSI_RecordGetString(rec, 2); value = MSI_RecordGetString(rec, 3); + TRACE("name %s value %s\n", debugstr_w(name), debugstr_w(value)); + res = env_set_flags(&name, &value, &flags); if (res != ERROR_SUCCESS) goto done; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index b78e3dc..1e55c81 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -124,6 +124,7 @@ static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "MoveFiles\t\t1700\n" "InstallFiles\t\t4000\n" "DuplicateFiles\t\t4500\n" + "WriteEnvironmentStrings\t\t4550\n" "CreateShortcuts\t\t4600\n" "InstallServices\t\t5000\n" "InstallFinalize\t\t6600\n" @@ -165,6 +166,15 @@ static const CHAR shortcut_dat[] = "Shortcut\tDirectory_\tName\tComponent_\tTarg "Shortcut\tShortcut\n" "Shortcut\tMSITESTDIR\tShortcut\tcomponent\tShortcut\t\tShortcut\t\t\t\t\t\n"; +static const CHAR environment_dat[] = "Environment\tName\tValue\tComponent_\n" + "s72\tl255\tL255\ts72\n" + "Environment\tEnvironment\n" + "Var1\t=-MSITESTVAR1\t1\tOne\n" + "Var2\tMSITESTVAR2\t1\tOne\n" + "Var3\t=-MSITESTVAR3\t1\tOne\n" + "Var4\tMSITESTVAR4\t1\tOne\n"; + + static const CHAR up_property_dat[] = "Property\tValue\n" "s72\tl0\n" "Property\tProperty\n" @@ -904,6 +914,19 @@ static const msi_table sc_tables[] = ADD_TABLE(shortcut) }; +static const msi_table env_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property), + ADD_TABLE(environment) +}; + static const msi_table up_tables[] = { ADD_TABLE(component), @@ -6240,6 +6263,74 @@ static void test_shortcut(void) delete_test_files(); } +static void test_envvar(void) +{ + UINT r; + HKEY env; + LONG res; + DWORD type, size; + char buffer[16]; + + create_test_files(); + create_database(msifile, env_tables, sizeof(env_tables) / sizeof(msi_table)); + + res = RegCreateKeyExA(HKEY_CURRENT_USER, "Environment", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &env, NULL); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegSetValueExA(env, "MSITESTVAR1", 0, REG_SZ, (const BYTE *)"0", 2); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegSetValueExA(env, "MSITESTVAR2", 0, REG_SZ, (const BYTE *)"0", 2); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + type = REG_NONE; + size = sizeof(buffer); + buffer[0] = 0; + res = RegQueryValueExA(env, "MSITESTVAR1", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(type == REG_SZ, "Expected REG_SZ, got %u\n", type); + ok(!lstrcmp(buffer, "1"), "Expected \"1\", got %s\n", buffer); + + res = RegDeleteValueA(env, "MSITESTVAR1"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + type = REG_NONE; + size = sizeof(buffer); + buffer[0] = 0; + res = RegQueryValueExA(env, "MSITESTVAR2", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(type == REG_SZ, "Expected REG_SZ, got %u\n", type); + ok(!lstrcmp(buffer, "1"), "Expected \"1\", got %s\n", buffer); + + res = RegDeleteValueA(env, "MSITESTVAR2"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegDeleteValueA(env, "MSITESTVAR3"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegDeleteValueA(env, "MSITESTVAR4"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + RegCloseKey(env); + + delete_pf("msitest\\cabout\\new\\five.txt", TRUE); + delete_pf("msitest\\cabout\\new", FALSE); + delete_pf("msitest\\cabout\\four.txt", TRUE); + delete_pf("msitest\\cabout", FALSE); + delete_pf("msitest\\changed\\three.txt", TRUE); + delete_pf("msitest\\changed", FALSE); + delete_pf("msitest\\first\\two.txt", TRUE); + delete_pf("msitest\\first", FALSE); + delete_pf("msitest\\filename", TRUE); + delete_pf("msitest\\one.txt", TRUE); + delete_pf("msitest\\service.exe", TRUE); + delete_pf("msitest", FALSE); + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -6322,6 +6413,7 @@ START_TEST(install) test_propcase(); test_int_widths(); test_shortcut(); + test_envvar(); DeleteFileA(log_file);

1 0

Detlef Riekenberg : twain_32/tests: Avoid a Dialog from a DS when the scanner is not connected.
by Alexandre Julliard Sept. 16, 2009

Sept. 16, 2009

Module: wine Branch: master Commit: d13b2b658eaef9d3447ee9f3f46f92878e6fa370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d13b2b658eaef9d3447ee9f3f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 15 17:25:52 2009 +0200 twain_32/tests: Avoid a Dialog from a DS when the scanner is not connected. --- dlls/twain_32/tests/dsm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 0cc8220..f3b6f95 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -787,7 +787,8 @@ static void test_sources(TW_IDENTITY *appid) (rc == TWRC_FAILURE && status.ConditionCode == TWCC_NODS), "Get default invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode); - if (rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS) + /* A DS might display a Popup during MSG_OPENDS, when the scanner is not connected */ + if (rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS && winetest_interactive) { rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_OPENDS, &source); get_condition_code(appid, NULL, &status);

1 0