Paul Vriens : comctl32/tests: Run tests again on Win95.

Alexandre Julliard julliard at winehq.org
Wed Jul 30 08:36:00 CDT 2008


Module: wine
Branch: master
Commit: 47edb3cbab933d8ca7e12ef021f3f61920d29dfd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=47edb3cbab933d8ca7e12ef021f3f61920d29dfd

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Wed Jul 30 09:16:08 2008 +0200

comctl32/tests: Run tests again on Win95.

---

 dlls/comctl32/tests/comboex.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c
index 5714365..321b2a7 100644
--- a/dlls/comctl32/tests/comboex.c
+++ b/dlls/comctl32/tests/comboex.c
@@ -183,6 +183,13 @@ static void test_WM_LBUTTONDOWN(void)
     WCHAR buffer[3];
     static const UINT choices[] = {8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72};
     static const WCHAR stringFormat[] = {'%','2','d','\0'};
+    BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO);
+
+    pGetComboBoxInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo");
+    if (!pGetComboBoxInfo){
+        skip("GetComboBoxInfo is not available\n");
+        return;
+    }
 
     hComboEx = CreateWindowExA(0, WC_COMBOBOXEXA, NULL,
             WS_VISIBLE|WS_CHILD|CBS_DROPDOWN, 0, 0, 200, 150,
@@ -205,7 +212,7 @@ static void test_WM_LBUTTONDOWN(void)
     hEdit = (HWND)SendMessage(hComboEx, CBEM_GETEDITCONTROL, 0, 0);
 
     cbInfo.cbSize = sizeof(COMBOBOXINFO);
-    result = GetComboBoxInfo(hCombo, &cbInfo);
+    result = pGetComboBoxInfo(hCombo, &cbInfo);
     ok(result, "Failed to get combobox info structure. LastError=%d\n",
        GetLastError());
     hList = cbInfo.hwndList;




More information about the wine-cvs mailing list