October 2006 - Wine-Commits

Jonathan Ernst : taskmgr: Updated French translation.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: d26c693144b6974c45f40cca52c4e3cf56dc33e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d26c693144b6974c45f40cca5… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Wed Oct 4 21:46:57 2006 +0200 taskmgr: Updated French translation. --- programs/taskmgr/Fr.rc | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/taskmgr/Fr.rc b/programs/taskmgr/Fr.rc index 4dce969..c9b3465 100644 --- a/programs/taskmgr/Fr.rc +++ b/programs/taskmgr/Fr.rc @@ -130,10 +130,13 @@ END IDR_TRAY_POPUP MENU DISCARDABLE BEGIN - MENUITEM "&Restaurer", ID_RESTORE - MENUITEM "&Fermer", ID_FILE_EXIT - MENUITEM SEPARATOR - MENUITEM "Toujours &visible", ID_OPTIONS_ALWAYSONTOP, CHECKED + POPUP "DUMMY" + BEGIN + MENUITEM "&Restaurer", ID_RESTORE + MENUITEM "&Fermer", ID_FILE_EXIT + MENUITEM SEPARATOR + MENUITEM "Toujours &visible", ID_OPTIONS_ALWAYSONTOP, CHECKED + END END IDR_PROCESS_PAGE_CONTEXT MENU DISCARDABLE

1 0

Alexandre Julliard : ntdll: Fixed typo in serial.c.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: d9634e397c3f5058f66a9d3c00e5db9ce6eae7f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9634e397c3f5058f66a9d3c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 4 22:16:34 2006 +0200 ntdll: Fixed typo in serial.c. --- dlls/ntdll/serial.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index c78770c..fc7bc4e 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -1095,7 +1095,7 @@ #endif #if !defined(TIOCINQ) || (!(defined(TIOCSERGETLSR) && defined(TIOCSER_TEMT)) || !defined(TIOCINQ)) || !defined(TIOCMGET) || !defined(TIOCM_CTS) ||!defined(TIOCM_DSR) || !defined(TIOCM_RNG) || !defined(TIOCM_CAR) error_caps: FIXME("Returning error because of missing capabilities\n"); - status STATUS_INVALID_PARAMETER; + status = STATUS_INVALID_PARAMETER; #endif out_now: RtlFreeHeap(GetProcessHeap(), 0, commio);

1 0

Mikołaj Zalewski : winspool.drv: Add Polish translation.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: 4b1be0a11e2dbce8ace74852cf5363e15a119721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1be0a11e2dbce8ace74852c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Oct 4 21:00:38 2006 +0200 winspool.drv: Add Polish translation. --- dlls/winspool.drv/Pl.rc | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/winspool.drv/winspool.rc | 1 + 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/Pl.rc b/dlls/winspool.drv/Pl.rc new file mode 100644 index 0000000..0dfee64 --- /dev/null +++ b/dlls/winspool.drv/Pl.rc @@ -0,0 +1,40 @@ +/* + * Polish resources for winspool + * + * Copyright 2005 Huw Davies + * Copyright 2006 Mikolaj Zalewski + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Drukuj do pliku" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nazwa pliku do kt�rego ma by� zapisany wydruk:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Anuluj", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_CAPTION "Port lokalny" + IDS_FILE_EXISTS "Plik ju� istnieje. Wybierz OK aby zast�pi� plik." + IDS_CANNOT_OPEN "Nie mog� utworzy� pliku." +} diff --git a/dlls/winspool.drv/winspool.rc b/dlls/winspool.drv/winspool.rc index f4e8ab2..3ca9dda 100644 --- a/dlls/winspool.drv/winspool.rc +++ b/dlls/winspool.drv/winspool.rc @@ -49,5 +49,6 @@ #include "It.rc" #include "Ko.rc" #include "Nl.rc" #include "No.rc" +#include "Pl.rc" #include "Ru.rc" #include "Tr.rc"

1 0

Mikołaj Zalewski : taskmgr: Add Polish translation.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: 19ad9644c823337e09414eb7583f63df510f2699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19ad9644c823337e09414eb75… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Oct 4 20:47:49 2006 +0200 taskmgr: Add Polish translation. --- programs/taskmgr/Pl.rc | 500 +++++++++++++++++++++++++++++++++++++++++++ programs/taskmgr/taskmgr.rc | 1 2 files changed, 501 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19ad9644c823337e09414…

1 0

Alexandre Julliard : user32: The per-window user data must be a DWORD_PTR.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: 81c14724498f29c6e2cf7baf4736f4ae091ab868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c14724498f29c6e2cf7baf4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 4 21:49:11 2006 +0200 user32: The per-window user data must be a DWORD_PTR. --- dlls/user/win.c | 6 +++--- include/win.h | 2 +- include/wine/server_protocol.h | 6 +++--- server/protocol.def | 4 ++-- server/trace.c | 4 ++-- server/window.c | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/user/win.c b/dlls/user/win.c index 6118848..a6f1b37 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -1780,7 +1780,7 @@ static LONG_PTR WIN_GetWindowLong( HWND case GWL_EXSTYLE: retvalue = reply->old_ex_style; break; case GWLP_ID: retvalue = reply->old_id; break; case GWLP_HINSTANCE: retvalue = (ULONG_PTR)reply->old_instance; break; - case GWLP_USERDATA: retvalue = (ULONG_PTR)reply->old_user_data; break; + case GWLP_USERDATA: retvalue = reply->old_user_data; break; default: if (offset >= 0) retvalue = get_win_data( &reply->old_extra_value, size ); else SetLastError( ERROR_INVALID_INDEX ); @@ -1982,7 +1982,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, I break; case GWLP_USERDATA: req->flags = SET_WIN_USERDATA; - req->user_data = (void *)newval; + req->user_data = newval; break; default: req->flags = SET_WIN_EXTRA; @@ -2014,7 +2014,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, I break; case GWLP_USERDATA: wndPtr->userdata = newval; - retval = (ULONG_PTR)reply->old_user_data; + retval = reply->old_user_data; break; default: retval = get_win_data( (char *)wndPtr->wExtra + offset, size ); diff --git a/include/win.h b/include/win.h index d6268cf..951eeac 100644 --- a/include/win.h +++ b/include/win.h @@ -57,7 +57,7 @@ typedef struct tagWND HICON hIcon; /* window's icon */ HICON hIconSmall; /* window's small icon */ int cbWndExtra; /* class cbWndExtra at window creation */ - DWORD userdata; /* User private data */ + DWORD_PTR userdata; /* User private data */ DWORD wExtra[1]; /* Window extra bytes */ } WND; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 14b4b82..f88f416 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2643,7 +2643,7 @@ struct set_window_info_request unsigned int id; int is_unicode; void* instance; - void* user_data; + unsigned long user_data; int extra_offset; data_size_t extra_size; unsigned long extra_value; @@ -2655,7 +2655,7 @@ struct set_window_info_reply unsigned int old_ex_style; unsigned int old_id; void* old_instance; - void* old_user_data; + unsigned long old_user_data; unsigned long old_extra_value; }; #define SET_WIN_STYLE 0x01 @@ -4426,6 +4426,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 251 +#define SERVER_PROTOCOL_VERSION 252 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 7694287..7934e48 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1883,7 +1883,7 @@ #define NAMED_PIPE_SERVER_END unsigned int id; /* window id */ int is_unicode; /* ANSI or unicode */ void* instance; /* creator instance */ - void* user_data; /* user-specific data */ + unsigned long user_data; /* user-specific data */ int extra_offset; /* offset to set in extra bytes */ data_size_t extra_size; /* size to set in extra bytes */ unsigned long extra_value; /* value to set in extra bytes */ @@ -1892,7 +1892,7 @@ #define NAMED_PIPE_SERVER_END unsigned int old_ex_style; /* old window extended style */ unsigned int old_id; /* old window id */ void* old_instance; /* old creator instance */ - void* old_user_data; /* old user-specific data */ + unsigned long old_user_data; /* old user-specific data */ unsigned long old_extra_value; /* old value in extra bytes */ @END #define SET_WIN_STYLE 0x01 diff --git a/server/trace.c b/server/trace.c index 160a8e1..f6aafcb 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2382,7 +2382,7 @@ static void dump_set_window_info_request fprintf( stderr, " id=%08x,", req->id ); fprintf( stderr, " is_unicode=%d,", req->is_unicode ); fprintf( stderr, " instance=%p,", req->instance ); - fprintf( stderr, " user_data=%p,", req->user_data ); + fprintf( stderr, " user_data=%lx,", req->user_data ); fprintf( stderr, " extra_offset=%d,", req->extra_offset ); fprintf( stderr, " extra_size=%u,", req->extra_size ); fprintf( stderr, " extra_value=%lx", req->extra_value ); @@ -2394,7 +2394,7 @@ static void dump_set_window_info_reply( fprintf( stderr, " old_ex_style=%08x,", req->old_ex_style ); fprintf( stderr, " old_id=%08x,", req->old_id ); fprintf( stderr, " old_instance=%p,", req->old_instance ); - fprintf( stderr, " old_user_data=%p,", req->old_user_data ); + fprintf( stderr, " old_user_data=%lx,", req->old_user_data ); fprintf( stderr, " old_extra_value=%lx", req->old_extra_value ); } diff --git a/server/window.c b/server/window.c index 91930d0..ac97de5 100644 --- a/server/window.c +++ b/server/window.c @@ -78,7 +78,7 @@ struct window unsigned int id; /* window id */ void* instance; /* creator instance */ int is_unicode; /* ANSI or unicode */ - void* user_data; /* user-specific data */ + unsigned long user_data; /* user-specific data */ WCHAR *text; /* window caption text */ unsigned int paint_flags; /* various painting flags */ int prop_inuse; /* number of in-use window properties */ @@ -401,7 +401,7 @@ static struct window *create_window( str win->id = 0; win->instance = NULL; win->is_unicode = 1; - win->user_data = NULL; + win->user_data = 0; win->text = NULL; win->paint_flags = 0; win->prop_inuse = 0;

1 0

Alexandre Julliard : server: Rearrange a few fields to avoid wasting padding space on 64 bits.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: e0dcf4fddbf5d6c98b758bf1b200b2dd4709a09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0dcf4fddbf5d6c98b758bf1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 4 21:41:32 2006 +0200 server: Rearrange a few fields to avoid wasting padding space on 64 bits. --- include/wine/server_protocol.h | 16 ++++++++-------- server/protocol.def | 14 +++++++------- server/trace.c | 18 +++++++++--------- 3 files changed, 24 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0dcf4fddbf5d6c98b758…

1 0

Juan Lang : crypt32: Implement CertVerifyValidityNesting.
by Alexandre Julliard Oct. 4, 2006

Oct. 4, 2006

Module: wine Branch: master Commit: 94a9b5a2bf6122ddbdacb9d45c4ddcd8e3168db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a9b5a2bf6122ddbdacb9d45… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Oct 4 07:49:29 2006 -0700 crypt32: Implement CertVerifyValidityNesting. --- dlls/crypt32/cert.c | 9 +++++++++ dlls/crypt32/crypt32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 44bdbb7..b520c0f 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1125,6 +1125,15 @@ LONG WINAPI CertVerifyTimeValidity(LPFIL return ret; } +BOOL WINAPI CertVerifyValidityNesting(PCERT_INFO pSubjectInfo, + PCERT_INFO pIssuerInfo) +{ + TRACE("(%p, %p)\n", pSubjectInfo, pIssuerInfo); + + return CertVerifyTimeValidity(&pSubjectInfo->NotBefore, pIssuerInfo) == 0 + && CertVerifyTimeValidity(&pSubjectInfo->NotAfter, pIssuerInfo) == 0; +} + BOOL WINAPI CryptHashCertificate(HCRYPTPROV hCryptProv, ALG_ID Algid, DWORD dwFlags, const BYTE *pbEncoded, DWORD cbEncoded, BYTE *pbComputedHash, DWORD *pcbComputedHash) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index aa5c1cb..7ee23f4 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -88,7 +88,7 @@ @ stub CertVerifyRevocation @ stdcall CertVerifySubjectCertificateContext(ptr ptr ptr) @ stdcall CertVerifyTimeValidity(ptr ptr) -@ stub CertVerifyValidityNesting +@ stdcall CertVerifyValidityNesting(ptr ptr) @ stdcall CreateFileU(wstr long long ptr long long ptr) kernel32.CreateFileW @ stdcall CryptBinaryToStringA(ptr long long ptr ptr) @ stub CryptBinaryToStringW # (ptr long long ptr ptr)

1 0

James Hawkins : user: Add missing sizeof(WCHAR) multiplier.
by Alexandre Julliard Oct. 4, 2006

Oct. 4, 2006

Module: wine Branch: master Commit: 96963d2bc18aa8fc46aad623c6c122cfa8e4054c URL: http://source.winehq.org/git/wine.git/?a=commit;h=96963d2bc18aa8fc46aad623c… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Oct 4 03:16:23 2006 -0700 user: Add missing sizeof(WCHAR) multiplier. --- dlls/user/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user/dialog.c b/dlls/user/dialog.c index c2f6d95..8934a54 100644 --- a/dlls/user/dialog.c +++ b/dlls/user/dialog.c @@ -1651,7 +1651,7 @@ static BOOL DIALOG_DlgDirSelect( HWND hw size = SendMessageW(listbox, combo ? CB_GETLBTEXTLEN : LB_GETTEXTLEN, 0, 0 ); if (size == LB_ERR) return FALSE; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size+1 ))) return FALSE; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (size+1) * sizeof(WCHAR) ))) return FALSE; SendMessageW( listbox, combo ? CB_GETLBTEXT : LB_GETTEXT, item, (LPARAM)buffer );

1 0

Paul Vriens : crypt32: More tests for CryptSIPLoad.
by Alexandre Julliard Oct. 4, 2006

Oct. 4, 2006

Module: wine Branch: master Commit: f99efa38351dddb52b2f1d99be33fb75ac8d42c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f99efa38351dddb52b2f1d99b… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Oct 4 12:15:35 2006 +0200 crypt32: More tests for CryptSIPLoad. --- dlls/crypt32/tests/sip.c | 97 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 80 insertions(+), 17 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 866951f..faff684 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -261,7 +261,10 @@ static void test_SIPLoad(void) BOOL ret; GUID subject; static GUID dummySubject = { 0xdeadbeef, 0xdead, 0xbeef, { 0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef }}; - static GUID unknown = { 0xC689AABA, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; + static GUID unknown = { 0xC689AABA, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; /* WINTRUST.DLL */ + static GUID unknown2 = { 0xDE351A43, 0x8E59, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; /* WINTRUST.DLL */ + /* The next SIP is available on Windows (not on a clean Wine install) */ + static GUID unknown3 = { 0x000C10F1, 0x0000, 0x0000, { 0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46 }}; /* MSISIP.DLL */ SIP_DISPATCH_INFO sdi; HMODULE hCrypt; @@ -293,6 +296,18 @@ static void test_SIPLoad(void) "Expected TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08x\n", GetLastError()); ok( sdi.pfGet == (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected no change to the function pointer\n"); + hCrypt = LoadLibraryA("crypt32.dll"); + if (hCrypt) + { + funcCryptSIPGetSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPGetSignedDataMsg"); + funcCryptSIPPutSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPPutSignedDataMsg"); + funcCryptSIPCreateIndirectData = (void*)GetProcAddress(hCrypt, "CryptSIPCreateIndirectData"); + funcCryptSIPVerifyIndirectData = (void*)GetProcAddress(hCrypt, "CryptSIPVerifyIndirectData"); + funcCryptSIPRemoveSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPRemoveSignedDataMsg"); + } + /* We're not going to use the functions, so we can free already here */ + FreeLibrary(hCrypt); + /* All OK */ SetLastError(0xdeadbeef); memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); @@ -304,7 +319,8 @@ static void test_SIPLoad(void) ok ( ret, "Expected CryptSIPLoad to succeed\n"); /* This error will always be there as native searches for the function DllCanUnloadNow * in WINTRUST.DLL (in this case). This function is not available in WINTRUST.DLL. - * For now there's no need to implement this is Wine. + * For now there's no need to implement this is Wine as I doubt any program will rely on + * this last error when the call succeeded. */ ok ( GetLastError() == ERROR_PROC_NOT_FOUND, "Expected ERROR_PROC_NOT_FOUND, got 0x%08x\n", GetLastError()); @@ -316,27 +332,70 @@ static void test_SIPLoad(void) * calling crypt32 functions which in it's turn call the equivalent in the SIP * as dictated by the given GUID. */ - hCrypt = LoadLibrary("crypt32.dll"); - if (hCrypt) + if (funcCryptSIPGetSignedDataMsg && funcCryptSIPPutSignedDataMsg && funcCryptSIPCreateIndirectData && + funcCryptSIPVerifyIndirectData && funcCryptSIPRemoveSignedDataMsg) + todo_wine + ok (sdi.pfGet == funcCryptSIPGetSignedDataMsg && + sdi.pfPut == funcCryptSIPPutSignedDataMsg && + sdi.pfCreate == funcCryptSIPCreateIndirectData && + sdi.pfVerify == funcCryptSIPVerifyIndirectData && + sdi.pfRemove == funcCryptSIPRemoveSignedDataMsg, + "Expected function addresses to be from crypt32\n"); + else + trace("Couldn't load function pointers\n"); + + /* All OK, but different GUID (same SIP though) */ + SetLastError(0xdeadbeef); + memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); + sdi.cbSize = sizeof(SIP_DISPATCH_INFO); + sdi.pfGet = (pCryptSIPGetSignedDataMsg)0xdeadbeef; + ret = CryptSIPLoad(&unknown2, 0, &sdi); + todo_wine { - funcCryptSIPGetSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPGetSignedDataMsg"); - funcCryptSIPPutSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPPutSignedDataMsg"); - funcCryptSIPCreateIndirectData = (void*)GetProcAddress(hCrypt, "CryptSIPCreateIndirectData"); - funcCryptSIPVerifyIndirectData = (void*)GetProcAddress(hCrypt, "CryptSIPVerifyIndirectData"); - funcCryptSIPRemoveSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPRemoveSignedDataMsg"); - if (funcCryptSIPGetSignedDataMsg && funcCryptSIPPutSignedDataMsg && funcCryptSIPCreateIndirectData && - funcCryptSIPVerifyIndirectData && funcCryptSIPRemoveSignedDataMsg) - todo_wine + ok ( ret, "Expected CryptSIPLoad to succeed\n"); + /* This call on it's own would have resulted in a ERROR_PROC_NOT_FOUND, but the previous + * call to CryptSIPLoad already loaded wintrust.dll. As this information is cached, + * CryptSIPLoad will not try to search for the already mentioned DllCanUnloadNow. + */ + } + ok ( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08x\n", GetLastError()); + todo_wine + ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n"); + + /* All OK, but other SIP */ + SetLastError(0xdeadbeef); + memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); + sdi.cbSize = sizeof(SIP_DISPATCH_INFO); + sdi.pfGet = (pCryptSIPGetSignedDataMsg)0xdeadbeef; + ret = CryptSIPLoad(&unknown3, 0, &sdi); + if (ret) + { + /* The SIP is known so we can safely assume that the next tests can be done */ + + /* As msisip.dll is not checked yet by any of the previous calls, the + * function DllCanUnloadNow will be checked again in msisip.dll (it's not present) + */ + todo_wine + { + ok ( GetLastError() == ERROR_PROC_NOT_FOUND, + "Expected ERROR_PROC_NOT_FOUND, got 0x%08x\n", GetLastError()); + ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n"); + + /* This is another SIP but this test proves the function addresses are the same as + * in the previous test. + */ + if (funcCryptSIPGetSignedDataMsg && funcCryptSIPPutSignedDataMsg && funcCryptSIPCreateIndirectData && + funcCryptSIPVerifyIndirectData && funcCryptSIPRemoveSignedDataMsg) ok (sdi.pfGet == funcCryptSIPGetSignedDataMsg && sdi.pfPut == funcCryptSIPPutSignedDataMsg && sdi.pfCreate == funcCryptSIPCreateIndirectData && sdi.pfVerify == funcCryptSIPVerifyIndirectData && sdi.pfRemove == funcCryptSIPRemoveSignedDataMsg, "Expected function addresses to be from crypt32\n"); - else - trace("Couldn't load function pointers\n"); - - FreeLibrary(hCrypt); + else + trace("Couldn't load function pointers\n"); + } } /* Reserved parameter not 0 */ @@ -355,6 +414,10 @@ static void test_SIPLoad(void) START_TEST(sip) { test_AddRemoveProvider(); - test_SIPRetrieveSubjectGUID(); + /* It seems that the caching for loaded dlls is shared between CryptSIPRetrieveSubjectGUID + * and CryptSIPLoad. The tests have to be in this order to succeed. This is because in the last + * test for CryptSIPRetrieveSubjectGUID, several SIPs will be loaded (on Windows). + */ test_SIPLoad(); + test_SIPRetrieveSubjectGUID(); }

1 0

Hans Leidekker : advapi32/tests: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 4, 2006

Oct. 4, 2006

Module: wine Branch: master Commit: 53535d6e134a187fd0ffd270a979cec70c95dbc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53535d6e134a187fd0ffd270a… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Oct 4 12:37:30 2006 +0200 advapi32/tests: Win64 printf format warning fixes. --- dlls/advapi32/tests/Makefile.in | 1 dlls/advapi32/tests/crypt.c | 134 ++++++++++--------- dlls/advapi32/tests/lsa.c | 14 +- dlls/advapi32/tests/registry.c | 270 ++++++++++++++++++++------------------- dlls/advapi32/tests/security.c | 138 ++++++++++---------- 5 files changed, 278 insertions(+), 279 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53535d6e134a187fd0ffd…

1 0