September 2006 - Wine-Commits

Damjan Jovanovic : setupapi: Brace the guid in SetupDiOpenClassRegKeyExW.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: e6e96d3ea114790aabcdcbdcfa104fa393d07760 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e6e96d3ea114790aabcdcbd… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Sep 21 16:15:14 2006 +0200 setupapi: Brace the guid in SetupDiOpenClassRegKeyExW. --- dlls/setupapi/devinst.c | 10 +++++++--- dlls/setupapi/tests/Makefile.in | 2 +- dlls/setupapi/tests/devinst.c | 25 +++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 37a7302..35fa409 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1413,6 +1413,7 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( PVOID Reserved) { LPWSTR lpGuidString; + WCHAR bracedGuidString[39]; HKEY hClassesKey; HKEY hClassKey; LPCWSTR lpKeyName; @@ -1455,19 +1456,22 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( RegCloseKey(hClassesKey); return INVALID_HANDLE_VALUE; } + bracedGuidString[0] = '{'; + memcpy(&bracedGuidString[1], lpGuidString, 36*sizeof(WCHAR)); + bracedGuidString[37] = '}'; + bracedGuidString[38] = 0; + RpcStringFreeW(&lpGuidString); if (RegOpenKeyExW(hClassesKey, - lpGuidString, + bracedGuidString, 0, KEY_ALL_ACCESS, &hClassKey)) { - RpcStringFreeW(&lpGuidString); RegCloseKey(hClassesKey); return INVALID_HANDLE_VALUE; } - RpcStringFreeW(&lpGuidString); RegCloseKey(hClassesKey); return hClassKey; diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in index 2efcdbf..51e28fd 100644 --- a/dlls/setupapi/tests/Makefile.in +++ b/dlls/setupapi/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = setupapi.dll -IMPORTS = setupapi kernel32 +IMPORTS = setupapi advapi32 kernel32 CTESTS = \ devinst.c \ diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 703cfd9..5f02991 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -87,6 +87,7 @@ static void test_SetupDiOpenClassRegKeyE /* This is a unique guid for testing purposes */ GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; + static const CHAR guidString[] = "{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; HKEY hkey; /* Check return value for non-existent key */ @@ -94,6 +95,30 @@ static void test_SetupDiOpenClassRegKeyE DIOCR_INSTALLER, NULL, NULL); ok(hkey == INVALID_HANDLE_VALUE, "returned %p (expected INVALID_HANDLE_VALUE)\n", hkey); + + /* Test it for a key that exists */ + hkey = SetupDiOpenClassRegKey(NULL, KEY_ALL_ACCESS); + if (hkey != INVALID_HANDLE_VALUE) + { + HKEY classKey; + if (RegCreateKeyA(hkey, guidString, &classKey) == ERROR_SUCCESS) + { + RegCloseKey(classKey); + SetLastError(0xdeadbeef); + classKey = pSetupDiOpenClassRegKeyExA(&guid, KEY_ALL_ACCESS, + DIOCR_INSTALLER, NULL, NULL); + ok(classKey != INVALID_HANDLE_VALUE, + "opening class registry key failed with error %ld\n", + GetLastError()); + if (classKey != INVALID_HANDLE_VALUE) + RegCloseKey(classKey); + RegDeleteKeyA(hkey, guidString); + } + else + trace("failed to create registry key for test\n"); + } + else + trace("failed to open classes key\n"); } START_TEST(devinst)

1 0

Alexandre Julliard : explorer: Work around the latest HAL binary compatibility breakage.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 9ae4e8d98efc952918bcdae86b2f640c4b062a3b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9ae4e8d98efc952918bcdae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 20:29:15 2006 +0200 explorer: Work around the latest HAL binary compatibility breakage. --- configure | 92 ----------------------------------------------- configure.ac | 1 - include/config.h.in | 3 -- programs/explorer/hal.c | 12 ++++-- 4 files changed, 8 insertions(+), 100 deletions(-) diff --git a/configure b/configure index 2df837e..619a90e 100755 --- a/configure +++ b/configure @@ -17053,98 +17053,6 @@ _ACEOF fi - { echo "$as_me:$LINENO: checking for -ldbus-1 soname" >&5 -echo $ECHO_N "checking for -ldbus-1 soname... $ECHO_C" >&6; } -if test "${ac_cv_lib_soname_dbus_1+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_get_soname_save_LIBS=$LIBS -LIBS="-ldbus-1 $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dbus_error_init (); -int -main () -{ -return dbus_error_init (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - case "$LIBEXT" in - dylib) ac_cv_lib_soname_dbus_1=`otool -L conftest$ac_exeext | grep libdbus-1\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/$libdbus-1\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - so) ac_cv_lib_soname_dbus_1=`$ac_cv_path_LDD conftest$ac_exeext | grep libdbus-1\\.so | sed -e "s/^.*$libdbus-1\.so[^ ]*$.*$/\1/"';2,$d'` ;; - esac - if test "x$ac_cv_lib_soname_dbus_1" = "x" - then - ac_cv_lib_soname_dbus_1="libdbus-1.$LIBEXT" - fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_soname_dbus_1="libdbus-1.$LIBEXT" -fi - -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_get_soname_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_dbus_1" >&5 -echo "${ECHO_T}$ac_cv_lib_soname_dbus_1" >&6; } -if test "${ac_cv_lib_soname_dbus_1+set}" = set; then - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBDBUS_1 "$ac_cv_lib_soname_dbus_1" -_ACEOF - -fi - { echo "$as_me:$LINENO: checking for -lhal soname" >&5 echo $ECHO_N "checking for -lhal soname... $ECHO_C" >&6; } if test "${ac_cv_lib_soname_hal+set}" = set; then diff --git a/configure.ac b/configure.ac index f7246c0..0ccb9d3 100644 --- a/configure.ac +++ b/configure.ac @@ -1137,7 +1137,6 @@ then WINE_GET_SONAME(Xrandr,XRRQueryExtension,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS]) WINE_GET_SONAME(freetype,FT_Init_FreeType,[$X_LIBS]) WINE_GET_SONAME(GL,glXQueryExtension,[$X_LIBS $X_EXTRA_LIBS]) - WINE_GET_SONAME(dbus-1,dbus_error_init) WINE_GET_SONAME(hal,libhal_ctx_new) WINE_GET_SONAME(txc_dxtn,fetch_2d_texel_rgba_dxt1) WINE_GET_SONAME(cups,cupsGetDefault) diff --git a/include/config.h.in b/include/config.h.in index 7f0a419..3869898 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -977,9 +977,6 @@ #undef SONAME_LIBCUPS /* Define to the soname of the libcurses library. */ #undef SONAME_LIBCURSES -/* Define to the soname of the libdbus-1 library. */ -#undef SONAME_LIBDBUS_1 - /* Define to the soname of the libfontconfig library. */ #undef SONAME_LIBFONTCONFIG diff --git a/programs/explorer/hal.c b/programs/explorer/hal.c index adb1281..bcb1d98 100644 --- a/programs/explorer/hal.c +++ b/programs/explorer/hal.c @@ -88,13 +88,17 @@ #undef DO_FUNC static BOOL load_functions(void) { - void *dbus_handle, *hal_handle; + void *hal_handle; char error[128]; - if (!(dbus_handle = wine_dlopen(SONAME_LIBDBUS_1, RTLD_NOW, error, sizeof(error)))) goto failed; - if (!(hal_handle = wine_dlopen(SONAME_LIBHAL, RTLD_NOW, error, sizeof(error)))) goto failed; + /* Load libhal with RTLD_GLOBAL so that the dbus symbols are available. + * We can't load libdbus directly since libhal may have been built against a + * different version but with the same soname. Binary compatibility is for wimps. */ -#define DO_FUNC(f) if (!(p_##f = wine_dlsym( dbus_handle, #f, error, sizeof(error) ))) goto failed + if (!(hal_handle = wine_dlopen(SONAME_LIBHAL, RTLD_NOW|RTLD_GLOBAL, error, sizeof(error)))) + goto failed; + +#define DO_FUNC(f) if (!(p_##f = wine_dlsym( RTLD_DEFAULT, #f, error, sizeof(error) ))) goto failed DBUS_FUNCS; #undef DO_FUNC

1 0

Paul Vriens : crypt32: Add tests for CryptSIPRetrieveSubjectGuid.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 3863939168459e5346cebd207920c4b8aad4cff7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3863939168459e5346cebd2… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Sep 26 16:11:08 2006 +0200 crypt32: Add tests for CryptSIPRetrieveSubjectGuid. --- dlls/crypt32/tests/sip.c | 167 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 167 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 1a4db2d..04d2990 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -23,11 +23,25 @@ #include <stdarg.h> #include <windef.h> #include <winbase.h> #include <winerror.h> +#include <winnls.h> #include <wincrypt.h> #include <mssip.h> #include "wine/test.h" +static char *show_guid(const GUID *guid) +{ + static char guidstring[39]; + + sprintf(guidstring, + "{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + + return guidstring; +} + static void test_AddRemoveProvider(void) { BOOL ret; @@ -104,6 +118,158 @@ static void test_AddRemoveProvider(void) GetLastError()); } +static void test_SIPRetrieveSubjectGUID(void) +{ + BOOL ret; + GUID subject; + HANDLE file; + static const CHAR windir[] = "windir"; + static const CHAR regeditExe[] = "regedit.exe"; + static const GUID nullSubject = { 0x0, 0x0, 0x0, { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 }}; + static const WCHAR deadbeef[] = { 'c',':','\\','d','e','a','d','b','e','e','f','.','d','b','f',0 }; + /* Couldn't find a name for this GUID, it's the one used for 95% of the files */ + static const GUID unknownGUID = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; + static CHAR regeditPath[MAX_PATH]; + static WCHAR regeditPathW[MAX_PATH]; + static CHAR path[MAX_PATH]; + static CHAR tempfile[MAX_PATH]; + static WCHAR tempfileW[MAX_PATH]; + DWORD written; + + /* NULL check */ + SetLastError(0xdeadbeef); + ret = CryptSIPRetrieveSubjectGuid(NULL, NULL, NULL); + ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); + todo_wine + ok (GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + + /* Test with a non-existent file (hopefully) */ + SetLastError(0xdeadbeef); + /* Set subject to something other than zero's */ + memset(&subject, 1, sizeof(GUID)); + ret = CryptSIPRetrieveSubjectGuid(deadbeef, NULL, &subject); + ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); + todo_wine + { + ok (GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %ld.\n", GetLastError()); + ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), + "Expected a NULL GUID for c:\\deadbeef.dbf, not %s\n", show_guid(&subject)); + } + + /* Now with an executable that should exist + * + * Use A-functions where possible as that should be available on all platforms + */ + GetEnvironmentVariableA(windir, regeditPath, MAX_PATH); + sprintf(regeditPath, "%s\\%s", regeditPath, regeditExe); + MultiByteToWideChar( CP_ACP, 0, regeditPath, + strlen(regeditPath)+1, regeditPathW, + sizeof(regeditPathW)/sizeof(regeditPathW[0]) ); + + SetLastError(0xdeadbeef); + memset(&subject, 1, sizeof(GUID)); + ret = CryptSIPRetrieveSubjectGuid(regeditPathW, NULL, &subject); + todo_wine + { + ok ( ret, "Expected CryptSIPRetrieveSubjectGuid to succeed\n"); + ok ( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08lx\n", GetLastError()); + ok ( !memcmp(&subject, &unknownGUID, sizeof(GUID)), + "Expected (%s), got (%s).\n", show_guid(&unknownGUID), show_guid(&subject)); + } + + /* The same thing but now with a handle instead of a filename */ + file = CreateFileA(regeditPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + SetLastError(0xdeadbeef); + memset(&subject, 1, sizeof(GUID)); + ret = CryptSIPRetrieveSubjectGuid(NULL, file, &subject); + todo_wine + { + ok ( ret, "Expected CryptSIPRetrieveSubjectGuid to succeed\n"); + ok ( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08lx\n", GetLastError()); + ok ( !memcmp(&subject, &unknownGUID, sizeof(GUID)), + "Expected (%s), got (%s).\n", show_guid(&unknownGUID), show_guid(&subject)); + } + CloseHandle(file); + + /* And both */ + file = CreateFileA(regeditPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + SetLastError(0xdeadbeef); + memset(&subject, 1, sizeof(GUID)); + ret = CryptSIPRetrieveSubjectGuid(regeditPathW, file, &subject); + todo_wine + { + ok ( ret, "Expected CryptSIPRetrieveSubjectGuid to succeed\n"); + ok ( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08lx\n", GetLastError()); + ok ( !memcmp(&subject, &unknownGUID, sizeof(GUID)), + "Expected (%s), got (%s).\n", show_guid(&unknownGUID), show_guid(&subject)); + } + CloseHandle(file); + + /* Now with an empty file */ + GetTempPathA(sizeof(path), path); + GetTempFileNameA(path, "sip", 0 , tempfile); + MultiByteToWideChar( CP_ACP, 0, tempfile, + strlen(tempfile)+1, tempfileW, + sizeof(tempfileW)/sizeof(tempfileW[0]) ); + + SetLastError(0xdeadbeef); + memset(&subject, 1, sizeof(GUID)); + ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); + ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); + todo_wine + { + ok ( GetLastError() == ERROR_FILE_INVALID || + GetLastError() == S_OK /* Win98 */, + "Expected ERROR_FILE_INVALID or S_OK, got 0x%08lx\n", GetLastError()); + ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), + "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject)); + } + + /* Use a file with a size of 3 (at least < 4) */ + file = CreateFileA(tempfile, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + WriteFile(file, "123", 3, &written, NULL); + CloseHandle(file); + + SetLastError(0xdeadbeef); + memset(&subject, 1, sizeof(GUID)); + ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); + ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); + todo_wine + { + ok ( GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == S_OK /* Win98 */, + "Expected ERROR_INVALID_PARAMETER or S_OK, got 0x%08lx\n", GetLastError()); + ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), + "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject)); + } + + /* And now >= 4 */ + file = CreateFileA(tempfile, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + WriteFile(file, "1234", 4, &written, NULL); + CloseHandle(file); + + SetLastError(0xdeadbeef); + memset(&subject, 1, sizeof(GUID)); + ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); + ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); + todo_wine + { + ok ( GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN || + GetLastError() == S_OK /* Win98 */, + "Expected TRUST_E_SUBJECT_FORM_UNKNOWN or S_OK, got 0x%08lx\n", GetLastError()); + ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), + "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject)); + } + + /* Clean up */ + DeleteFileA(tempfile); +} + static void test_SIPLoad(void) { BOOL ret; @@ -182,5 +348,6 @@ static void test_SIPLoad(void) START_TEST(sip) { test_AddRemoveProvider(); + test_SIPRetrieveSubjectGUID(); test_SIPLoad(); }

1 0

James Hawkins : setupapi: Fix a typo.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 5dadca4dbca70cd98db68f1fb2d5fa0c8348a636 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5dadca4dbca70cd98db68f1… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Sep 22 16:52:07 2006 -0700 setupapi: Fix a typo. --- dlls/setupapi/queue.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 7c89efd..fdcd320 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -327,6 +327,7 @@ static void get_src_file_info( HINF hinf } if (!op->src_path && !(op->style & SP_COPY_SOURCE_ABSOLUTE)) { + len = len2 = 0; if (!(op->style & SP_COPY_SOURCEPATH_ABSOLUTE)) { /* retrieve relative path for this disk */ @@ -345,7 +346,7 @@ static void get_src_file_info( HINF hinf ptr = op->src_path + strlenW(op->src_path); if (len2 && ptr > op->src_path && ptr[-1] != '\\') *ptr++ = '\\'; } - if (!SetupGetStringFieldW( &disk_ctx, 4, ptr, len2, NULL )) *ptr = 0; + if (!SetupGetStringFieldW( &file_ctx, 2, ptr, len2, NULL )) *ptr = 0; } } if (!op->src_root) op->src_root = PARSER_get_src_root(hinf);

1 0

Vitaliy Margolen : d3d8: Remove no longer used imports.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 9e0426538a6693d1aaa9d7708f5e0c47ac475178 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e0426538a6693d1aaa9d77… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Tue Sep 26 07:25:11 2006 -0600 d3d8: Remove no longer used imports. --- dlls/d3d8/d3d8_main.c | 18 +++--------------- 1 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 0f6bc12..9e3c48b 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -26,10 +26,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); -void (*wine_tsx11_lock_ptr)(void) = NULL; -void (*wine_tsx11_unlock_ptr)(void) = NULL; - - HRESULT WINAPI D3D8GetSWInfo(void) { FIXME("(void): stub\n"); return 0; @@ -52,20 +48,12 @@ IDirect3D8* WINAPI Direct3DCreate8(UINT } /* At process attach */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ TRACE("fdwReason=%ld\n", fdwReason); - if (fdwReason == DLL_PROCESS_ATTACH) { - HMODULE mod; - + if (fdwReason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls(hInstDLL); - mod = GetModuleHandleA( "winex11.drv" ); - if (mod) - { - wine_tsx11_lock_ptr = (void*) GetProcAddress(mod, "wine_tsx11_lock"); - wine_tsx11_unlock_ptr = (void*) GetProcAddress(mod, "wine_tsx11_unlock"); - } - } return TRUE; }

1 0

Dmitry Timoshkov : gdi32: Add a test for GetKerningPairs.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: a41da1223def0336008d44595e356ece02068130 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a41da1223def0336008d445… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Sep 21 16:10:53 2006 +0900 gdi32: Add a test for GetKerningPairs. --- dlls/gdi/tests/font.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 134 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/tests/font.c b/dlls/gdi/tests/font.c index dd9ca11..2965c3e 100644 --- a/dlls/gdi/tests/font.c +++ b/dlls/gdi/tests/font.c @@ -428,6 +428,17 @@ static void test_text_extents(void) GetTextExtentPointA(hdc, "o", 1, &sz); ok(sz.cy == tm.tmHeight, "cy %ld tmHeight %ld\n", sz.cy, tm.tmHeight); + SetLastError(0xdeadbeef); + GetTextExtentExPointW(hdc, wt, 1, 1, &fit1, &fit2, &sz1); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + trace("Skipping remainder of text extents test on a Win9x platform\n"); + SelectObject(hdc, hfont); + DeleteObject(hfont); + ReleaseDC(0, hdc); + return; + } + len = lstrlenW(wt); extents = HeapAlloc(GetProcessHeap(), 0, len * sizeof extents[0]); memset(extents, 0, len * sizeof extents[0]); @@ -511,6 +522,128 @@ static void test_GetGlyphIndices() textm.tmDefaultChar, glyphs[4]); } +static void test_GetKerningPairs(void) +{ + static const struct kerning_data + { + const char face_name[LF_FACESIZE]; + LONG height; + /* small subset of kerning pairs to test */ + DWORD total_kern_pairs; + const KERNINGPAIR kern_pair[20]; + } kd[] = + { + {"Arial", -34, 20, + { + {' ','A',-2},{' ','T',-1},{' ','Y',-1},{'1','1',-3}, + {'A',' ',-2},{'A','T',-3},{'A','V',-3},{'A','W',-1}, + {'A','Y',-3},{'A','v',-1},{'A','w',-1},{'A','y',-1}, + {'F',',',-4},{'F','.',-4},{'F','A',-2},{'L',' ',-1}, + {'L','T',-3},{'L','V',-3},{'L','W',-3},{'L','Y',-3} + } + }, + { "Arial", 120, 20, + { + {' ','A',-6},{' ','T',-2},{' ','Y',-2},{'1','1',-8}, + {'A',' ',-6},{'A','T',-8},{'A','V',-8},{'A','W',-4}, + {'A','Y',-8},{'A','v',-2},{'A','w',-2},{'A','y',-2}, + {'F',',',-12},{'F','.',-12},{'F','A',-6},{'L',' ',-4}, + {'L','T',-8},{'L','V',-8},{'L','W',-8},{'L','Y',-8} + } + } + }; + LOGFONT lf; + HFONT hfont, hfont_old; + KERNINGPAIR *kern_pair; + HDC hdc; + DWORD total_kern_pairs, ret, i, n, matches; + + hdc = GetDC(0); + + /* GetKerningPairsA maps unicode set of kerning pairs to current code page + * which may render this test unusable, so we're trying to avoid that. + */ + SetLastError(0xdeadbeef); + GetKerningPairsW(hdc, 0, NULL); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + trace("Skipping the GetKerningPairs test on a Win9x platform\n"); + ReleaseDC(0, hdc); + return; + } + + for (i = 0; i < sizeof(kd)/sizeof(kd[0]); i++) + { + if (!is_font_installed(kd[i].face_name)) + { + trace("%s is not installed so skipping this test\n", kd[i].face_name); + continue; + } + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, kd[i].face_name); + lf.lfHeight = kd[i].height; + hfont = CreateFontIndirect(&lf); + assert(hfont != 0); + + hfont_old = SelectObject(hdc, hfont); + + total_kern_pairs = GetKerningPairsW(hdc, 0, NULL); + trace("font %s, height %ld, total_kern_pairs %lu\n", + kd[i].face_name, kd[i].height, total_kern_pairs); + kern_pair = HeapAlloc(GetProcessHeap(), 0, total_kern_pairs * sizeof(*kern_pair)); + +#if 0 /* Win98 (GetKerningPairsA) and XP behave differently here, the test passes on XP */ + SetLastError(0xdeadbeef); + ret = GetKerningPairsW(hdc, 0, kern_pair); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "got error %ld, expected ERROR_INVALID_PARAMETER\n", GetLastError()); + ok(ret == 0, "got %lu, expected 0\n", ret); +#endif + + ret = GetKerningPairsW(hdc, 100, NULL); + ok(ret == total_kern_pairs, "got %lu, expected %lu\n", ret, total_kern_pairs); + + ret = GetKerningPairsW(hdc, total_kern_pairs/2, kern_pair); + ok(ret == total_kern_pairs/2, "got %lu, expected %lu\n", ret, total_kern_pairs/2); + + ret = GetKerningPairsW(hdc, total_kern_pairs, kern_pair); + ok(ret == total_kern_pairs, "got %lu, expected %lu\n", ret, total_kern_pairs); + + matches = 0; + + for (n = 0; n < ret; n++) + { + DWORD j; +#if 0 + if (kern_pair[n].wFirst < 127 && kern_pair[n].wSecond < 127) + trace("wFirst '%c', wSecond '%c', iKernAmount %d\n", + kern_pair[n].wFirst, kern_pair[n].wSecond, kern_pair[n].iKernAmount); +#endif + for (j = 0; j < kd[i].total_kern_pairs; j++) + { + if (kern_pair[n].wFirst == kd[i].kern_pair[j].wFirst && + kern_pair[n].wSecond == kd[i].kern_pair[j].wSecond && + kern_pair[n].iKernAmount == kd[i].kern_pair[j].iKernAmount) + { + /*trace("match\n");*/ + matches++; + } + } + } + + ok(matches == kd[i].total_kern_pairs, "got matches %lu, expected %lu\n", + matches, kd[i].total_kern_pairs); + + HeapFree(GetProcessHeap(), 0, kern_pair); + + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + } + + ReleaseDC(0, hdc); +} + START_TEST(font) { test_logfont(); @@ -520,4 +653,5 @@ START_TEST(font) test_GetCharABCWidthsW(); test_text_extents(); test_GetGlyphIndices(); + test_GetKerningPairs(); }

1 0

Paul Vriens : mssip.h: Added function definition.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 8b776d0af432f2ee10d222a32f4c233f5fc83c7c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b776d0af432f2ee10d222a… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Sep 26 12:52:38 2006 +0200 mssip.h: Added function definition. --- include/mssip.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/mssip.h b/include/mssip.h index 4f00226..4aa2fa4 100644 --- a/include/mssip.h +++ b/include/mssip.h @@ -168,6 +168,7 @@ BOOL WINAPI CryptSIPVerifyIndirectData(S BOOL WINAPI CryptSIPRemoveSignedDataMsg(SIP_SUBJECTINFO *,DWORD); BOOL WINAPI CryptSIPLoad(const GUID *,DWORD,SIP_DISPATCH_INFO *); +BOOL WINAPI CryptSIPRetrieveSubjectGuid(LPCWSTR,HANDLE,GUID *); BOOL WINAPI CryptSIPRetrieveSubjectGuidForCatalogFile(LPCWSTR,HANDLE,GUID *); BOOL WINAPI CryptSIPAddProvider(SIP_ADD_NEWPROVIDER *); BOOL WINAPI CryptSIPRemoveProvider(GUID *);

1 0

Vitaliy Margolen : d3d9: Remove no longer used imports.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 0ffe5a34c6785e4e7fe00a03ba31e952781ef87f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0ffe5a34c6785e4e7fe00a0… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Tue Sep 26 07:25:07 2006 -0600 d3d9: Remove no longer used imports. --- dlls/d3d9/d3d9_main.c | 18 +++--------------- 1 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index b9bff60..a81fb01 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -29,10 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static int D3DPERF_event_level = 0; -void (*wine_tsx11_lock_ptr)(void) = NULL; -void (*wine_tsx11_unlock_ptr)(void) = NULL; - - HRESULT WINAPI D3D9GetSWInfo(void) { FIXME("(void): stub\n"); return 0; @@ -55,20 +51,12 @@ IDirect3D9* WINAPI Direct3DCreate9(UINT } /* At process attach */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ TRACE("fdwReason=%ld\n", fdwReason); - if (fdwReason == DLL_PROCESS_ATTACH) { - HMODULE mod; - + if (fdwReason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls(hInstDLL); - mod = GetModuleHandleA( "winex11.drv" ); - if (mod) - { - wine_tsx11_lock_ptr = (void*) GetProcAddress(mod, "wine_tsx11_lock"); - wine_tsx11_unlock_ptr = (void*) GetProcAddress(mod, "wine_tsx11_unlock"); - } - } return TRUE; }

1 0

Dmitry Timoshkov : gdi32: Implement GetKerningPairs for TrueType fonts.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: ce6d4c72ac276609148b113b1356e2fa3f47aded URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ce6d4c72ac276609148b113… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Sep 21 00:18:51 2006 +0900 gdi32: Implement GetKerningPairs for TrueType fonts. --- dlls/gdi/font.c | 80 ++++++++++++++-- dlls/gdi/freetype.c | 236 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi/gdi_private.h | 1 3 files changed, 307 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ce6d4c72ac276609148…

1 0

Dmitry Timoshkov : winex11.drv: Use a proper protector for X11/XKBlib.h.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 84a63306907869345be4381dad958735b77120a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=84a63306907869345be4381… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 26 16:37:00 2006 +0900 winex11.drv: Use a proper protector for X11/XKBlib.h. --- dlls/winex11.drv/keyboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 05e6f4a..5cebb27 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -30,7 +30,7 @@ #include <X11/keysym.h> #include <X11/Xlib.h> #include <X11/Xresource.h> #include <X11/Xutil.h> -#ifdef HAVE_XKB +#ifdef HAVE_X11_XKBLIB_H #include <X11/XKBlib.h> #endif

1 0