August 2009 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : shlwapi: Correct AssocCreate and tests.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: ffd2e69f5327439d0c27d6cff6b49ff13c4a6b0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd2e69f5327439d0c27d6cff… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 30 11:30:22 2009 +1000 shlwapi: Correct AssocCreate and tests. --- dlls/shlwapi/assoc.c | 11 ++++++++--- dlls/shlwapi/tests/assoc.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index d13f0aa..d6c4107 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -134,7 +134,8 @@ static BOOL SHLWAPI_ParamAToW(LPCSTR lpszParam, LPWSTR lpszBuff, DWORD dwLen, * Failure: An HRESULT error code indicating the error. * * NOTES - * refiid must be equal to IID_IQueryAssociations, or this function will fail. + * clsid must be equal to CLSID_QueryAssociations and + * refiid must be equal to IID_IQueryAssociations, IID_IUnknown or this function will fail */ HRESULT WINAPI AssocCreate(CLSID clsid, REFIID refiid, void **lpInterface) { @@ -149,8 +150,8 @@ HRESULT WINAPI AssocCreate(CLSID clsid, REFIID refiid, void **lpInterface) *(DWORD*)lpInterface = 0; - if (!IsEqualGUID(&clsid, &IID_IQueryAssociations)) - return E_NOTIMPL; + if (!IsEqualGUID(&clsid, &CLSID_QueryAssociations)) + return CLASS_E_CLASSNOTAVAILABLE; lpAssoc = IQueryAssociations_Constructor(); @@ -159,6 +160,10 @@ HRESULT WINAPI AssocCreate(CLSID clsid, REFIID refiid, void **lpInterface) hRet = IQueryAssociations_QueryInterface(lpAssoc, refiid, lpInterface); IQueryAssociations_Release(lpAssoc); + + if(hRet == E_NOINTERFACE) + return CLASS_E_CLASSNOTAVAILABLE; + return hRet; } diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index 3799ecc..fd2b868 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -21,12 +21,14 @@ #include "wine/test.h" #include "shlwapi.h" +#include "shlguid.h" #define expect(expected, got) ok ( expected == got, "Expected %d, got %d\n", expected, got) #define expect_hr(expected, got) ok ( expected == got, "Expected %08x, got %08x\n", expected, got) static HRESULT (WINAPI *pAssocQueryStringA)(ASSOCF,ASSOCSTR,LPCSTR,LPCSTR,LPSTR,LPDWORD) = NULL; static HRESULT (WINAPI *pAssocQueryStringW)(ASSOCF,ASSOCSTR,LPCWSTR,LPCWSTR,LPWSTR,LPDWORD) = NULL; +static HRESULT (WINAPI *pAssocCreate)(CLSID, REFIID, void **) = NULL; /* Every version of Windows with IE should have this association? */ static const WCHAR dotHtml[] = { '.','h','t','m','l',0 }; @@ -235,14 +237,55 @@ cleanup: } +static void test_assoc_create(void) +{ + HRESULT hr; + IQueryAssociations *pqa; + + if (!pAssocCreate) + { + win_skip("AssocCreate() is missing\n"); + return; + } + + hr = pAssocCreate(IID_NULL, &IID_NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected result : %08x\n", hr); + + hr = pAssocCreate(CLSID_QueryAssociations, &IID_NULL, (LPVOID*)&pqa); + ok(hr == CLASS_E_CLASSNOTAVAILABLE || hr == E_NOTIMPL /* win98 */ + , "Unexpected result : %08x\n", hr); + + hr = pAssocCreate(IID_NULL, &IID_IQueryAssociations, (LPVOID*)&pqa); + ok(hr == CLASS_E_CLASSNOTAVAILABLE || hr == E_NOTIMPL /* win98 */ + , "Unexpected result : %08x\n", hr); + + hr = pAssocCreate(CLSID_QueryAssociations, &IID_IQueryAssociations, (LPVOID*)&pqa); + ok(hr == S_OK || hr == E_NOTIMPL /* win98 */ + , "Unexpected result : %08x\n", hr); + if(hr == S_OK) + { + IQueryAssociations_Release(pqa); + } + + hr = pAssocCreate(CLSID_QueryAssociations, &IID_IUnknown, (LPVOID*)&pqa); + ok(hr == S_OK || hr == E_NOTIMPL /* win98 */ + , "Unexpected result : %08x\n", hr); + if(hr == S_OK) + { + IQueryAssociations_Release(pqa); + } +} + START_TEST(assoc) { HMODULE hshlwapi; hshlwapi = GetModuleHandleA("shlwapi.dll"); pAssocQueryStringA = (void*)GetProcAddress(hshlwapi, "AssocQueryStringA"); pAssocQueryStringW = (void*)GetProcAddress(hshlwapi, "AssocQueryStringW"); + pAssocCreate = (void*)GetProcAddress(hshlwapi, "AssocCreate"); test_getstring_bad(); test_getstring_basic(); test_getstring_no_extra(); + test_assoc_create(); }

1 0

André Hentschel : comctl32: Stop flicker when drawing themed and draw the correct image smoothly.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: b585ca0f64dc4b80f34d47cb514cb50a95202ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b585ca0f64dc4b80f34d47cb5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 26 15:57:06 2009 +0200 comctl32: Stop flicker when drawing themed and draw the correct image smoothly. --- dlls/comctl32/progress.c | 26 +++++--------------------- 1 files changed, 5 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 56f40bb..c44b816 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -263,38 +263,22 @@ static const ProgressDrawProc drawProcClassic[8] = { static void draw_theme_bar_H (const ProgressDrawInfo* di, int start, int end) { RECT r; - int right = di->rect.left + end; r.left = di->rect.left + start; r.top = di->rect.top; r.bottom = di->rect.bottom; - while (r.left < right) - { - r.right = min (r.left + di->ledW, right); - DrawThemeBackground (di->theme, di->hdc, PP_CHUNK, 0, &r, NULL); - r.left = r.right; - r.right = min (r.left + di->ledGap, right); - DrawThemeBackground (di->theme, di->hdc, PP_BAR, 0, &di->bgRect, &r); - r.left = r.right; - } + r.right = di->rect.left + end; + DrawThemeBackground (di->theme, di->hdc, PP_CHUNK, 0, &r, NULL); } -/* draw themed horizontal bar from 'start' to 'end' */ +/* draw themed vertical bar from 'start' to 'end' */ static void draw_theme_bar_V (const ProgressDrawInfo* di, int start, int end) { RECT r; - int top = di->rect.bottom - end; r.left = di->rect.left; r.right = di->rect.right; r.bottom = di->rect.bottom - start; - while (r.bottom > top) - { - r.top = max (r.bottom - di->ledW, top); - DrawThemeBackground (di->theme, di->hdc, PP_CHUNKVERT, 0, &r, NULL); - r.bottom = r.top; - r.top = max (r.bottom - di->ledGap, top); - DrawThemeBackground (di->theme, di->hdc, PP_BARVERT, 0, &di->bgRect, &r); - r.bottom = r.top; - } + r.top = di->rect.bottom - end; + DrawThemeBackground (di->theme, di->hdc, PP_CHUNKVERT, 0, &r, NULL); } /* draw themed horizontal background from 'start' to 'end' */

1 0

John Klehm : wintab32: Add a test for context validation by WTOpen.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: b4c5a62338f114fde6993869f61cf4ccf0fbe7d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c5a62338f114fde6993869f… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Sun Aug 2 16:23:35 2009 -0500 wintab32: Add a test for context validation by WTOpen. --- configure | 9 +++ configure.ac | 1 + dlls/wintab32/tests/Makefile.in | 13 ++++ dlls/wintab32/tests/context.c | 152 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 175 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2f74bac..199187a 100755 --- a/configure +++ b/configure @@ -28001,6 +28001,14 @@ dlls/wintab32/Makefile: dlls/wintab32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wintab32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/wintab32/tests/Makefile" +test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + wintab32/tests" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/wintab32/tests/Makefile: dlls/wintab32/tests/Makefile.in dlls/Maketest.rules" +ac_config_files="$ac_config_files dlls/wintab32/tests/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wintrust/Makefile" test "x$enable_wintrust" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ wintrust" @@ -29794,6 +29802,7 @@ do "dlls/winspool.drv/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winspool.drv/tests/Makefile" ;; "dlls/wintab.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintab.dll16/Makefile" ;; "dlls/wintab32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintab32/Makefile" ;; + "dlls/wintab32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintab32/tests/Makefile" ;; "dlls/wintrust/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintrust/Makefile" ;; "dlls/wintrust/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintrust/tests/Makefile" ;; "dlls/wldap32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wldap32/Makefile" ;; diff --git a/configure.ac b/configure.ac index 3b805fe..17bfc66 100644 --- a/configure.ac +++ b/configure.ac @@ -2431,6 +2431,7 @@ WINE_CONFIG_MAKEFILE([dlls/winspool.drv/Makefile],[dlls/Makedll.rules],[dlls],[A WINE_CONFIG_MAKEFILE([dlls/winspool.drv/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/wintab.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/wintab32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wintab32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/wintrust/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wintrust/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/wldap32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/wintab32/tests/Makefile.in b/dlls/wintab32/tests/Makefile.in new file mode 100644 index 0000000..07c2961 --- /dev/null +++ b/dlls/wintab32/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = wintab32.dll +IMPORTS = kernel32 user32 + +CTESTS = \ + context.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/wintab32/tests/context.c b/dlls/wintab32/tests/context.c new file mode 100644 index 0000000..c9f13fa --- /dev/null +++ b/dlls/wintab32/tests/context.c @@ -0,0 +1,152 @@ +/* + * tests for Wintab context behavior + * + * Copyright 2009 John Klehm + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <windows.h> +#include <wintab.h> + +#include "wine/test.h" + +static const CHAR wintab32Dll[] = "Wintab32.dll"; +static const CHAR defaultWindowName[] = "Wintab Test"; +static const CHAR wintabTestWindowClassName[] = "WintabTestWnd"; +static const CHAR contextName[] = "TestContext"; +static const UINT X = 0; +static const UINT Y = 0; +static const UINT WIDTH = 200; +static const UINT HEIGHT = 200; + +static HCTX (WINAPI *pWTOpenA)(HWND, LPLOGCONTEXTA, BOOL); +static BOOL (WINAPI *pWTClose)(HCTX); + +static HMODULE load_functions(void) +{ +#define GET_PROC(func) \ + (p ## func = (void *)GetProcAddress(hWintab, #func)) + + HMODULE hWintab = LoadLibraryA(wintab32Dll); + + if (!hWintab) + { + trace("LoadLibraryA(%s) failed\n", + wintab32Dll); + return NULL; + } + + if (GET_PROC(WTOpenA) && + GET_PROC(WTClose) ) + { + return hWintab; + } + else + { + FreeLibrary(hWintab); + trace("Library loaded but failed to load function pointers\n"); + return NULL; + } + +#undef GET_PROC +} + +static LRESULT CALLBACK wintabTestWndProc(HWND hwnd, UINT msg, WPARAM wParam, + LPARAM lParam) +{ + return DefWindowProcA(hwnd, msg, wParam, lParam); +} + +static void wintab_create_window(HWND* pHwnd) +{ + WNDCLASSA testWindowClass; + + if (!pHwnd) return; + + *pHwnd = NULL; + + ZeroMemory(&testWindowClass, sizeof(testWindowClass)); + + testWindowClass.lpfnWndProc = (WNDPROC)wintabTestWndProc; + testWindowClass.hInstance = NULL; + testWindowClass.hIcon = NULL; + testWindowClass.hCursor = NULL; + testWindowClass.hbrBackground = NULL; + testWindowClass.lpszMenuName = NULL; + testWindowClass.lpszClassName = wintabTestWindowClassName; + + assert(RegisterClassA(&testWindowClass)); + + *pHwnd = CreateWindowA(wintabTestWindowClassName, NULL, + WS_OVERLAPPED, X, Y, WIDTH, HEIGHT, NULL, NULL, + NULL, NULL); + + assert(*pHwnd != NULL); +} + +static void wintab_destroy_window(HWND hwnd) +{ + DestroyWindow(hwnd); + UnregisterClassA(wintabTestWindowClassName, NULL); +} + +/* test how a logcontext is validated by wtopen */ +static void test_WTOpenContextValidation(void) +{ + HWND defaultWindow = NULL; + HCTX hCtx = NULL; + LOGCONTEXTA testLogCtx; + LOGCONTEXTA refLogCtx; + int memdiff; + + wintab_create_window(&defaultWindow); + + ZeroMemory(&testLogCtx, sizeof(testLogCtx)); + strcpy(testLogCtx.lcName, contextName); + + ZeroMemory(&refLogCtx, sizeof(refLogCtx)); + strcpy(refLogCtx.lcName, contextName); + + /* a zeroed out context has values which makes WTOpen return null + * on wacom tablets but not on uclogic tablets */ + hCtx = pWTOpenA(defaultWindow, &testLogCtx, TRUE); + + /* check if the context gets updated */ + memdiff = memcmp(&testLogCtx, &refLogCtx, sizeof(LOGCONTEXTA)); + ok(0 == memdiff, "Expected 0 == memcmp(testLogCtx, refLogCtx), got %i\n", + memdiff); + + if (hCtx) + pWTClose(hCtx); + + wintab_destroy_window(defaultWindow); +} + +START_TEST(context) +{ + HMODULE hWintab = load_functions(); + + if (!hWintab) + { + skip("Wintab32.dll not available\n"); + return; + } + + test_WTOpenContextValidation(); + + FreeLibrary(hWintab); +}

1 0

Hans Leidekker : msi: Fix column width calculation.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: eb101df687d9002d7513dbdcb5a3822e00c18f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb101df687d9002d7513dbdcb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 4 12:20:10 2009 +0200 msi: Fix column width calculation. The iTunes 8 installer database has an integer column of size 1 which takes up two bytes at storage level, so adjust the column size calculation to account for this difference. --- dlls/msi/table.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 126769a..b963a20 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -127,11 +127,17 @@ static inline UINT bytes_per_column( MSIDATABASE *db, const MSICOLUMNINFO *col ) { if( MSITYPE_IS_BINARY(col->type) ) return 2; + if( col->type & MSITYPE_STRING ) return db->bytes_per_strref; - if( (col->type & 0xff) > 4 ) + + if( (col->type & 0xff) <= 2) + return 2; + + if( (col->type & 0xff) != 4 ) ERR("Invalid column size!\n"); - return col->type & 0xff; + + return 4; } static int utf2mime(int x)

1 0

Hans Leidekker : msi: Fix parsing of integer column width specifiers.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: 0b60ed8ff17dbf79eabb6ae79bc858b4c65fe360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b60ed8ff17dbf79eabb6ae79… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 4 12:19:42 2009 +0200 msi: Fix parsing of integer column width specifiers. --- dlls/msi/database.c | 10 ++++++- dlls/msi/tests/install.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 4c21876..173657e 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -413,10 +413,16 @@ static LPWSTR msi_build_createsql_columns(LPWSTR *columns_data, LPWSTR *types, D case 'i': lstrcpyW(extra, type_notnull); case 'I': - if (len == 2) + if (len <= 2) type = type_int; - else + else if (len == 4) type = type_long; + else + { + WARN("invalid int width %u\n", len); + msi_free(columns); + return NULL; + } break; case 'v': lstrcpyW(extra, type_notnull); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index e6c22fb..0a54ea6 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6050,6 +6050,66 @@ static void test_propcase(void) RemoveDirectory("msitest"); } +static void test_int_widths( void ) +{ + static const char int0[] = "int0\ni0\nint0\tint0\n1"; + static const char int1[] = "int1\ni1\nint1\tint1\n1"; + static const char int2[] = "int2\ni2\nint2\tint2\n1"; + static const char int3[] = "int3\ni3\nint3\tint3\n1"; + static const char int4[] = "int4\ni4\nint4\tint4\n1"; + static const char int5[] = "int5\ni5\nint5\tint5\n1"; + static const char int8[] = "int8\ni8\nint8\tint8\n1"; + + static const struct + { + const char *data; + unsigned int size; + UINT ret; + } + tests[] = + { + { int0, sizeof(int0) - 1, ERROR_SUCCESS }, + { int1, sizeof(int1) - 1, ERROR_SUCCESS }, + { int2, sizeof(int2) - 1, ERROR_SUCCESS }, + { int3, sizeof(int3) - 1, ERROR_FUNCTION_FAILED }, + { int4, sizeof(int4) - 1, ERROR_SUCCESS }, + { int5, sizeof(int5) - 1, ERROR_FUNCTION_FAILED }, + { int8, sizeof(int8) - 1, ERROR_FUNCTION_FAILED } + }; + + char tmpdir[MAX_PATH], msitable[MAX_PATH], msidb[MAX_PATH]; + MSIHANDLE db; + UINT r, i; + + GetTempPathA(MAX_PATH, tmpdir); + CreateDirectoryA(tmpdir, NULL); + + strcpy(msitable, tmpdir); + strcat(msitable, "\\msitable.idt"); + + strcpy(msidb, tmpdir); + strcat(msidb, "\\msitest.msi"); + + r = MsiOpenDatabaseA(msidb, MSIDBOPEN_CREATE, &db); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + write_file(msitable, tests[i].data, tests[i].size); + + r = MsiDatabaseImportA(db, tmpdir, "msitable.idt"); + ok(r == tests[i].ret, " %u expected %u, got %u\n", i, tests[i].ret, r); + + r = MsiDatabaseCommit(db); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + DeleteFileA(msitable); + } + + MsiCloseHandle(db); + DeleteFileA(msidb); + RemoveDirectoryA(tmpdir); +} + START_TEST(install) { DWORD len; @@ -6129,6 +6189,7 @@ START_TEST(install) test_sourcedirprop(); test_adminimage(); test_propcase(); + test_int_widths(); DeleteFileA(log_file);

1 0

Hans Leidekker : setupapi: Add stub implementations of CM_Get_Device_ID_ListW and CM_Enumerate_Classes .
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: ae45fa6864962bf186ecc80d69b22d1543458bf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae45fa6864962bf186ecc80d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 4 12:19:05 2009 +0200 setupapi: Add stub implementations of CM_Get_Device_ID_ListW and CM_Enumerate_Classes. --- dlls/setupapi/setupapi.spec | 6 +++--- dlls/setupapi/stubs.c | 27 ++++++++++++++++++++++++--- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index e3fe250..2cc20d0 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -38,7 +38,7 @@ @ stub CM_Dup_Range_List @ stub CM_Enable_DevNode @ stub CM_Enable_DevNode_Ex -@ stub CM_Enumerate_Classes +@ stdcall CM_Enumerate_Classes(long ptr long) @ stub CM_Enumerate_Classes_Ex @ stub CM_Enumerate_EnumeratorsA @ stub CM_Enumerate_EnumeratorsW @@ -75,8 +75,8 @@ @ stdcall CM_Get_Device_IDW(ptr ptr long long) @ stub CM_Get_Device_ID_ExA @ stub CM_Get_Device_ID_ExW -@ stdcall CM_Get_Device_ID_ListA(ptr ptr long long) -@ stub CM_Get_Device_ID_ListW +@ stdcall CM_Get_Device_ID_ListA(str ptr long long) +@ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) @ stub CM_Get_Device_ID_List_ExA @ stub CM_Get_Device_ID_List_ExW @ stub CM_Get_Device_ID_List_SizeA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index eed8972..438a7fc 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -100,12 +100,24 @@ CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE handle) /*********************************************************************** * CM_Get_Device_ID_ListA (SETUPAPI.@) */ - CONFIGRET WINAPI CM_Get_Device_ID_ListA( PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) { - FIXME("%p %p %d %d\n", pszFilter, Buffer, BufferLen, ulFlags ); - memset(Buffer,0,2); + FIXME("%s %p %d 0x%08x\n", debugstr_a(pszFilter), Buffer, BufferLen, ulFlags); + + if (BufferLen >= 2) Buffer[0] = Buffer[1] = 0; + return CR_SUCCESS; +} + +/*********************************************************************** + * CM_Get_Device_ID_ListW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Device_ID_ListW( + PCWSTR pszFilter, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) +{ + FIXME("%s %p %d 0x%08x\n", debugstr_w(pszFilter), Buffer, BufferLen, ulFlags); + + if (BufferLen >= 2) Buffer[0] = Buffer[1] = 0; return CR_SUCCESS; } @@ -305,3 +317,12 @@ CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExW(PULONG len, LPGUID class, FIXME("%p %p %s 0x%08x %p: stub\n", len, class, debugstr_w(id), flags, machine); return CR_FAILURE; } + +/*********************************************************************** + * CM_Enumerate_Classes (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags) +{ + FIXME("%u %p 0x%08x: stub\n", index, class, flags); + return CR_NO_SUCH_VALUE; +}

1 0

Nicolas Le Cam : comdlg32/tests: Fix a failing test on Win2k and below.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: b0dcfa7a23f7c2421597a7f2cd74379693297727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0dcfa7a23f7c2421597a7f2c… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon Aug 3 20:48:22 2009 +0200 comdlg32/tests: Fix a failing test on Win2k and below. --- dlls/comdlg32/tests/filedlg.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index a1536ec..99d2310 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -48,7 +48,8 @@ static void toolbarcheck( HWND hDlg) ret = SendMessage( ctrl, TB_ADDSTRING, 0, (LPARAM)"winetestwinetest\0\0"); ok( ret == 0, "addstring returned %d (expected 0)\n", ret); maxtextrows = SendMessage( ctrl, TB_GETTEXTROWS, 0, 0); - ok( maxtextrows == 0, "Get(Max)TextRows returned %d (expected 0)\n", maxtextrows); + ok( maxtextrows == 0 || broken(maxtextrows == 1), /* Win2k and below */ + "Get(Max)TextRows returned %d (expected 0)\n", maxtextrows); }

1 0

Nicolas Le Cam : comdlg32/tests: Hardcode expected values when possible.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: 9089c3e1d2fe056e3df16bfc66b0092f4f489c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9089c3e1d2fe056e3df16bfc6… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon Aug 3 20:29:48 2009 +0200 comdlg32/tests: Hardcode expected values when possible. --- dlls/comdlg32/tests/filedlg.c | 45 +++++++++++++++++++++-------------------- 1 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index d18065a..a1536ec 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -102,26 +102,26 @@ static void test_DialogCancel(void) ofn.lpstrInitialDir = szInitialDir; PrintDlgA(NULL); - ok(CDERR_INITIALIZATION == CommDlgExtendedError(), "expected %d, got %d\n", - CDERR_INITIALIZATION, CommDlgExtendedError()); + ok(CDERR_INITIALIZATION == CommDlgExtendedError(), + "expected CDERR_INITIALIZATION, got %d\n", CommDlgExtendedError()); result = GetOpenFileNameA(&ofn); - ok(0 == result, "expected %d, got %d\n", 0, result); - ok(0 == CommDlgExtendedError(), "expected %d, got %d\n", 0, + ok(0 == result, "expected 0, got %d\n", result); + ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); PrintDlgA(NULL); - ok(CDERR_INITIALIZATION == CommDlgExtendedError(), "expected %d, got %d\n", - CDERR_INITIALIZATION, CommDlgExtendedError()); + ok(CDERR_INITIALIZATION == CommDlgExtendedError(), + "expected CDERR_INITIALIZATION, got %d\n", CommDlgExtendedError()); result = GetSaveFileNameA(&ofn); - ok(0 == result, "expected %d, got %d\n", 0, result); - ok(0 == CommDlgExtendedError(), "expected %d, got %d\n", 0, + ok(0 == result, "expected 0, got %d\n", result); + ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); PrintDlgA(NULL); - ok(CDERR_INITIALIZATION == CommDlgExtendedError(), "expected %d, got %d\n", - CDERR_INITIALIZATION, CommDlgExtendedError()); + ok(CDERR_INITIALIZATION == CommDlgExtendedError(), + "expected CDERR_INITIALIZATION, got %d\n", CommDlgExtendedError()); /* Before passing the ofn to Unicode functions, remove the ANSI strings */ ofn.lpstrFilter = NULL; @@ -129,8 +129,8 @@ static void test_DialogCancel(void) ofn.lpstrDefExt = NULL; PrintDlgA(NULL); - ok(CDERR_INITIALIZATION == CommDlgExtendedError(), "expected %d, got %d\n", - CDERR_INITIALIZATION, CommDlgExtendedError()); + ok(CDERR_INITIALIZATION == CommDlgExtendedError(), + "expected CDERR_INITIALIZATION, got %d\n", CommDlgExtendedError()); SetLastError(0xdeadbeef); result = GetOpenFileNameW((LPOPENFILENAMEW) &ofn); @@ -138,11 +138,10 @@ static void test_DialogCancel(void) win_skip("GetOpenFileNameW is not implemented\n"); else { - ok(0 == result, "expected %d, got %d\n", 0, result); + ok(0 == result, "expected 0, got %d\n", result); ok(0 == CommDlgExtendedError() || - CDERR_INITIALIZATION == CommDlgExtendedError(), /* win9x */ - "expected %d or %d, got %d\n", 0, CDERR_INITIALIZATION, - CommDlgExtendedError()); + broken(CDERR_INITIALIZATION == CommDlgExtendedError()), /* win9x */ + "expected 0, got %d\n", CommDlgExtendedError()); } SetLastError(0xdeadbeef); @@ -151,11 +150,10 @@ static void test_DialogCancel(void) win_skip("GetSaveFileNameW is not implemented\n"); else { - ok(0 == result, "expected %d, got %d\n", 0, result); + ok(0 == result, "expected 0, got %d\n", result); ok(0 == CommDlgExtendedError() || - CDERR_INITIALIZATION == CommDlgExtendedError(), /* win9x */ - "expected %d or %d, got %d\n", 0, CDERR_INITIALIZATION, - CommDlgExtendedError()); + broken(CDERR_INITIALIZATION == CommDlgExtendedError()), /* win9x */ + "expected 0, got %d\n", CommDlgExtendedError()); } } @@ -206,7 +204,9 @@ static UINT_PTR CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wPa hr = IShellView2_GetCurrentInfo(shell_view2, &folder_settings); ok(SUCCEEDED(hr), "GetCurrentInfo returned %#x\n", hr); - ok(folder_settings.ViewMode == FVM_LIST, "view mode is %d, expected %d\n", folder_settings.ViewMode, FVM_LIST); + ok(folder_settings.ViewMode == FVM_LIST, + "view mode is %d, expected FVM_LIST\n", + folder_settings.ViewMode); hr = IShellView2_DestroyViewWindow(shell_view2); ok(SUCCEEDED(hr), "DestroyViewWindow returned %#x\n", hr); @@ -225,7 +225,8 @@ static UINT_PTR CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wPa ok(SUCCEEDED(hr), "GetCurrentInfo returned %#x\n", hr); ok(folder_settings.ViewMode == FVM_DETAILS || broken(folder_settings.ViewMode == FVM_LIST), /* Win9x */ - "view mode is %d, expected %d\n", folder_settings.ViewMode, FVM_DETAILS); + "view mode is %d, expected FVM_DETAILS\n", + folder_settings.ViewMode); cleanup: if (shell_view2) IShellView2_Release(shell_view2);

1 0

Henri Verbeet : wined3d: Statically initialize the filter lookup tables.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: d4159adbc84ab44c47a35adc3abd2cee27d20bfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4159adbc84ab44c47a35adc3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 08:30:25 2009 +0200 wined3d: Statically initialize the filter lookup tables. Also add some comments. --- dlls/wined3d/directx.c | 53 ++++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 4 +- 2 files changed, 26 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f9fb6b1..fc8fa61 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -168,19 +168,34 @@ const int maxLookup[MAX_LOOKUPS] = DWORD *stateLookup[MAX_LOOKUPS]; -struct min_lookup minMipLookup[WINED3DTEXF_ANISOTROPIC + 1]; -const struct min_lookup minMipLookup_noFilter[WINED3DTEXF_ANISOTROPIC + 1] = +const struct min_lookup minMipLookup[] = { - {{GL_NEAREST, GL_NEAREST, GL_NEAREST}}, - {{GL_NEAREST, GL_NEAREST, GL_NEAREST}}, - {{GL_NEAREST, GL_NEAREST, GL_NEAREST}}, - {{GL_NEAREST, GL_NEAREST, GL_NEAREST}}, + /* NONE POINT LINEAR */ + {{GL_LINEAR, GL_LINEAR, GL_LINEAR}}, /* NONE */ + {{GL_NEAREST, GL_NEAREST_MIPMAP_NEAREST, GL_NEAREST_MIPMAP_LINEAR}}, /* POINT*/ + {{GL_LINEAR, GL_LINEAR_MIPMAP_NEAREST, GL_LINEAR_MIPMAP_LINEAR}}, /* LINEAR */ + {{GL_LINEAR, GL_LINEAR_MIPMAP_NEAREST, GL_LINEAR_MIPMAP_LINEAR}}, /* ANISOTROPIC */ }; -GLenum magLookup[WINED3DTEXF_ANISOTROPIC + 1]; -const GLenum magLookup_noFilter[WINED3DTEXF_ANISOTROPIC + 1] = +const struct min_lookup minMipLookup_noFilter[] = { - GL_NEAREST, GL_NEAREST, GL_NEAREST, GL_NEAREST + /* NONE POINT LINEAR */ + {{GL_NEAREST, GL_NEAREST, GL_NEAREST}}, /* NONE */ + {{GL_NEAREST, GL_NEAREST, GL_NEAREST}}, /* POINT */ + {{GL_NEAREST, GL_NEAREST, GL_NEAREST}}, /* LINEAR */ + {{GL_NEAREST, GL_NEAREST, GL_NEAREST}}, /* ANISOTROPIC */ +}; + +const GLenum magLookup[] = +{ + /* NONE POINT LINEAR ANISOTROPIC */ + GL_NEAREST, GL_NEAREST, GL_LINEAR, GL_LINEAR, +}; + +const GLenum magLookup_noFilter[] = +{ + /* NONE POINT LINEAR ANISOTROPIC */ + GL_NEAREST, GL_NEAREST, GL_NEAREST, GL_NEAREST, }; /* drawStridedSlow attributes */ @@ -1991,26 +2006,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) stateLookup[WINELOOKUP_WARPPARAM][WINED3DTADDRESS_MIRRORONCE - minLookup[WINELOOKUP_WARPPARAM]] = gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; - magLookup[WINED3DTEXF_NONE - WINED3DTEXF_NONE] = GL_NEAREST; - magLookup[WINED3DTEXF_POINT - WINED3DTEXF_NONE] = GL_NEAREST; - magLookup[WINED3DTEXF_LINEAR - WINED3DTEXF_NONE] = GL_LINEAR; - magLookup[WINED3DTEXF_ANISOTROPIC - WINED3DTEXF_NONE] = GL_LINEAR; - - minMipLookup[WINED3DTEXF_NONE].mip[WINED3DTEXF_NONE] = GL_LINEAR; - minMipLookup[WINED3DTEXF_NONE].mip[WINED3DTEXF_POINT] = GL_LINEAR; - minMipLookup[WINED3DTEXF_NONE].mip[WINED3DTEXF_LINEAR] = GL_LINEAR; - minMipLookup[WINED3DTEXF_POINT].mip[WINED3DTEXF_NONE] = GL_NEAREST; - minMipLookup[WINED3DTEXF_POINT].mip[WINED3DTEXF_POINT] = GL_NEAREST_MIPMAP_NEAREST; - minMipLookup[WINED3DTEXF_POINT].mip[WINED3DTEXF_LINEAR] = GL_NEAREST_MIPMAP_LINEAR; - minMipLookup[WINED3DTEXF_LINEAR].mip[WINED3DTEXF_NONE] = GL_LINEAR; - minMipLookup[WINED3DTEXF_LINEAR].mip[WINED3DTEXF_POINT] = GL_LINEAR_MIPMAP_NEAREST; - minMipLookup[WINED3DTEXF_LINEAR].mip[WINED3DTEXF_LINEAR] = GL_LINEAR_MIPMAP_LINEAR; - minMipLookup[WINED3DTEXF_ANISOTROPIC].mip[WINED3DTEXF_NONE] = GL_LINEAR; - minMipLookup[WINED3DTEXF_ANISOTROPIC].mip[WINED3DTEXF_POINT] = GL_LINEAR_MIPMAP_NEAREST; - minMipLookup[WINED3DTEXF_ANISOTROPIC].mip[WINED3DTEXF_LINEAR] = GL_LINEAR_MIPMAP_LINEAR; - -/* TODO: config lookups */ - /* Make sure there's an active HDC else the WGL extensions will fail */ hdc = pwglGetCurrentDC(); if (hdc) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1a3314a..bb8aae8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -176,9 +176,9 @@ struct min_lookup GLenum mip[WINED3DTEXF_LINEAR + 1]; }; -struct min_lookup minMipLookup[WINED3DTEXF_ANISOTROPIC + 1]; +const struct min_lookup minMipLookup[WINED3DTEXF_ANISOTROPIC + 1]; const struct min_lookup minMipLookup_noFilter[WINED3DTEXF_ANISOTROPIC + 1]; -GLenum magLookup[WINED3DTEXF_ANISOTROPIC + 1]; +const GLenum magLookup[WINED3DTEXF_ANISOTROPIC + 1]; const GLenum magLookup_noFilter[WINED3DTEXF_ANISOTROPIC + 1]; extern const struct filter_lookup filter_lookup_nofilter;

1 0

Henri Verbeet : wined3d: Set a more appropriate value for the ANISOTROPIC/ NONE min/mip filter.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: b30a31e09a6b8b843ac75eccbd5405468d2c1371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30a31e09a6b8b843ac75eccb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 08:30:24 2009 +0200 wined3d: Set a more appropriate value for the ANISOTROPIC/NONE min/mip filter. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 93fdc43..f9fb6b1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2005,7 +2005,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) minMipLookup[WINED3DTEXF_LINEAR].mip[WINED3DTEXF_NONE] = GL_LINEAR; minMipLookup[WINED3DTEXF_LINEAR].mip[WINED3DTEXF_POINT] = GL_LINEAR_MIPMAP_NEAREST; minMipLookup[WINED3DTEXF_LINEAR].mip[WINED3DTEXF_LINEAR] = GL_LINEAR_MIPMAP_LINEAR; - minMipLookup[WINED3DTEXF_ANISOTROPIC].mip[WINED3DTEXF_NONE] = GL_LINEAR_MIPMAP_LINEAR; + minMipLookup[WINED3DTEXF_ANISOTROPIC].mip[WINED3DTEXF_NONE] = GL_LINEAR; minMipLookup[WINED3DTEXF_ANISOTROPIC].mip[WINED3DTEXF_POINT] = GL_LINEAR_MIPMAP_NEAREST; minMipLookup[WINED3DTEXF_ANISOTROPIC].mip[WINED3DTEXF_LINEAR] = GL_LINEAR_MIPMAP_LINEAR;

1 0