wine-commits May 2008

wine-commits@winehq.org

4 participants
722 discussions

Maarten Lankhorst : include: Add missing RpcMgmtIsServerListening declaration.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: c77f02c0311e3c1e283bc91b4d150240753d65f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c77f02c0311e3c1e283bc91b4… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri May 23 09:35:35 2008 -0700 include: Add missing RpcMgmtIsServerListening declaration. --- include/rpcdce.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/rpcdce.h b/include/rpcdce.h index 79716ae..4e08999 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -376,6 +376,9 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtStopServerListening( RPC_BINDING_HANDLE Binding ); RPCRTAPI RPC_STATUS RPC_ENTRY + RpcMgmtIsServerListening(RPC_BINDING_HANDLE Binding); + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtInqIfIds( RPC_BINDING_HANDLE Binding, RPC_IF_ID_VECTOR** IfIdVector ); RPCRTAPI RPC_STATUS RPC_ENTRY

1 0

Kai Blin : ws2_32: Add support for FROM_PROTOCOL_INFO to WSASocket().
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: cabb350f2f7310759b2c2cd9232980d260e6d584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cabb350f2f7310759b2c2cd92… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon May 26 10:02:42 2008 +0200 ws2_32: Add support for FROM_PROTOCOL_INFO to WSASocket(). --- dlls/ws2_32/socket.c | 29 +++++++++++------------------ dlls/ws2_32/tests/sock.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/winsock2.h | 2 ++ 3 files changed, 55 insertions(+), 18 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d0d2a13..ab57388 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -297,6 +297,7 @@ static const int ws_af_map[][2] = #ifdef HAVE_IPX MAP_OPTION( AF_IPX ), #endif + {FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO}, }; static const int ws_socktype_map[][2] = @@ -304,6 +305,7 @@ static const int ws_socktype_map[][2] = MAP_OPTION( SOCK_DGRAM ), MAP_OPTION( SOCK_STREAM ), MAP_OPTION( SOCK_RAW ), + {FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO}, }; static const int ws_proto_map[][2] = @@ -314,6 +316,7 @@ static const int ws_proto_map[][2] = MAP_OPTION( IPPROTO_ICMP ), MAP_OPTION( IPPROTO_IGMP ), MAP_OPTION( IPPROTO_RAW ), + {FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO}, }; static const int ws_aiflag_map[][2] = @@ -3781,28 +3784,18 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, return ret; } - /* check and convert the socket family */ + /* convert the socket family and type */ af = convert_af_w2u(af); - if (af == -1) - { - FIXME("Unsupported socket family %d!\n", af); - SetLastError(WSAEAFNOSUPPORT); - return INVALID_SOCKET; - } - - /* check the socket type */ type = convert_socktype_w2u(type); - if (type == -1) - { - SetLastError(WSAESOCKTNOSUPPORT); - return INVALID_SOCKET; - } - /* check the protocol type */ - if ( protocol < 0 ) /* don't support negative values */ + if (lpProtocolInfo) { - SetLastError(WSAEPROTONOSUPPORT); - return INVALID_SOCKET; + if (af == FROM_PROTOCOL_INFO) + af = lpProtocolInfo->iAddressFamily; + if (type == FROM_PROTOCOL_INFO) + type = lpProtocolInfo->iSocketType; + if (protocol == FROM_PROTOCOL_INFO) + protocol = lpProtocolInfo->iProtocol; } if ( af == AF_UNSPEC) /* did they not specify the address family? */ diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 405b47e..8aaa72f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1115,6 +1115,47 @@ static void test_getservbyname(void) } } +static void test_WSASocket(void) +{ + SOCKET sock = INVALID_SOCKET; + WSAPROTOCOL_INFOA *pi; + int providers[] = {6, 0}; + int ret, err; + UINT pi_size; + + ret = WSAEnumProtocolsA(providers, NULL, &pi_size); + ok(ret == SOCKET_ERROR, "WSAEnumProtocolsA({6,0}, NULL, 0) returned %d\n", + ret); + err = WSAGetLastError(); + ok(err == WSAENOBUFS, "WSAEnumProtocolsA error is %d, not WSAENOBUFS(%d)\n", + err, WSAENOBUFS); + + pi = HeapAlloc(GetProcessHeap(), 0, pi_size); + ok(pi != NULL, "Failed to allocate memory\n"); + if (pi == NULL) { + skip("Can't continue without memory.\n"); + return; + } + + ret = WSAEnumProtocolsA(providers, pi, &pi_size); + ok(ret != SOCKET_ERROR, "WSAEnumProtocolsA failed, last error is %d\n", + WSAGetLastError()); + + if (ret == 0) { + skip("No protocols enumerated.\n"); + HeapFree(GetProcessHeap(), 0, pi); + return; + } + + sock = WSASocketA(FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO, + FROM_PROTOCOL_INFO, &pi[0], 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + + closesocket(sock); + HeapFree(GetProcessHeap(), 0, pi); +} + static void test_WSAAddressToStringA(void) { INT ret; @@ -2054,6 +2095,7 @@ START_TEST( sock ) test_UDP(); test_getservbyname(); + test_WSASocket(); test_WSAAddressToStringA(); test_WSAAddressToStringW(); diff --git a/include/winsock2.h b/include/winsock2.h index a302331..b73fde3 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -75,6 +75,8 @@ extern "C" { /* protocol types */ +#define FROM_PROTOCOL_INFO (-1) + #ifndef USE_WS_PREFIX #define SOCK_STREAM 1 #define SOCK_DGRAM 2

1 0

James Hawkins : rpcrt4: Trace the results of two statuses that return different results across platforms .
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 3978df4e52424f414b976f991e2a96fdfdab6568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3978df4e52424f414b976f991… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon May 26 00:21:16 2008 -0500 rpcrt4: Trace the results of two statuses that return different results across platforms. --- dlls/rpcrt4/tests/rpc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 9fd9993..176ae0c 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -643,6 +643,10 @@ static void test_I_RpcExceptionFilter(void) ok(retval == EXCEPTION_CONTINUE_SEARCH, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", exception, EXCEPTION_CONTINUE_SEARCH, retval); break; + case STATUS_IN_PAGE_ERROR: + case STATUS_HANDLE_NOT_CLOSABLE: + trace("I_RpcExceptionFilter(0x%x) returned %d\n", exception, retval); + break; default: ok(retval == EXCEPTION_EXECUTE_HANDLER, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", exception, EXCEPTION_EXECUTE_HANDLER, retval);

1 0

James Hawkins : shell32: Test against the long form of the path.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: f2aa3259b913d75a273296f2850025cd8bb05f3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2aa3259b913d75a273296f28… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon May 26 00:19:54 2008 -0500 shell32: Test against the long form of the path. --- dlls/shell32/tests/shelllink.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index ec3481a..27e8032 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -533,10 +533,13 @@ static void test_load_save(void) if (p) *p='\0'; + /* IShellLink returns path in long form */ + GetLongPathNameA(mypath, realpath, MAX_PATH); + /* Overwrite the existing lnk file and point it to existing files */ desc.description="test 2"; desc.workdir=mydir; - desc.path=mypath; + desc.path=realpath; desc.pidl=NULL; desc.arguments="/option1 /option2 \"Some string\""; desc.showcmd=SW_SHOWNORMAL;

1 0

James Hawkins : winetest: Use the win32 API to extract the tests.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: cf0420cbbc6842a2836cdca93555f3a31f56531c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf0420cbbc6842a2836cdca93… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon May 26 00:18:55 2008 -0500 winetest: Use the win32 API to extract the tests. --- programs/winetest/main.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 79f7e79..90c4449 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -276,24 +276,30 @@ extract_test (struct wine_test *test, const char *dir, LPTSTR res_name) { BYTE* code; DWORD size; - FILE* fout; char *exepos; + HANDLE hfile; + DWORD written; code = extract_rcdata (res_name, TESTRES, &size); if (!code) report (R_FATAL, "Can't find test resource %s: %d", res_name, GetLastError ()); test->name = xstrdup( res_name ); - test->exename = strmake (NULL, "%s/%s", dir, test->name); + test->exename = strmake (NULL, "%s\\%s", dir, test->name); exepos = strstr (test->name, testexe); if (!exepos) report (R_FATAL, "Not an .exe file: %s", test->name); *exepos = 0; test->name = xrealloc (test->name, exepos - test->name + 1); report (R_STEP, "Extracting: %s", test->name); - if (!(fout = fopen (test->exename, "wb")) || - (fwrite (code, size, 1, fout) != 1) || - fclose (fout)) report (R_FATAL, "Failed to write file %s.", - test->exename); + hfile = CreateFileA(test->exename, GENERIC_READ | GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (hfile == INVALID_HANDLE_VALUE) + report (R_FATAL, "Failed to open file %s.", test->exename); + + if (!WriteFile(hfile, code, size, &written, NULL)) + report (R_FATAL, "Failed to write file %s.", test->exename); + + CloseHandle(hfile); } /* Run a command for MS milliseconds. If OUT != NULL, also redirect

1 0

James Hawkins : mshtml: Fix a test failure in win2k3.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 173d79a3f484849e8bea0d1acf8e1dd3b883e37e URL: http://source.winehq.org/git/wine.git/?a=commit;h=173d79a3f484849e8bea0d1ac… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon May 26 00:17:58 2008 -0500 mshtml: Fix a test failure in win2k3. --- dlls/mshtml/tests/htmldoc.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 11ec3fe..d46e11a 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2225,8 +2225,16 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } if(IsEqualGUID(&CGID_DocHostCommandHandler, pguidCmdGroup)) { - ok(0, "unexpected cmd %d of CGID_DocHostCommandHandler\n", nCmdID); - return E_NOTIMPL; + switch (nCmdID) { + case OLECMDID_PAGEACTIONBLOCKED: /* win2k3 */ + SET_EXPECT(SetStatusText); + ok(pvaIn == NULL, "pvaIn != NULL\n"); + ok(pvaOut == NULL, "pvaOut != NULL\n"); + return S_OK; + default: + ok(0, "unexpected command %d\n", nCmdID); + return E_FAIL; + } } ok(0, "unexpected pguidCmdGroup: %s\n", debugstr_guid(pguidCmdGroup));

1 0

James Hawkins : mshtml: Add missing OLECMDID definitions.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: eb70c4ae47c7fce4760051db15297f0e8ac37627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb70c4ae47c7fce4760051db1… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon May 26 00:14:56 2008 -0500 mshtml: Add missing OLECMDID definitions. --- include/docobj.idl | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/include/docobj.idl b/include/docobj.idl index efa2066..c47d111 100644 --- a/include/docobj.idl +++ b/include/docobj.idl @@ -262,7 +262,19 @@ interface IOleCommandTarget : IUnknown OLECMDID_PRINT2 = 49, OLECMDID_PRINTPREVIEW2 = 50, OLECMDID_SETPRINTTEMPLATE = 51, - OLECMDID_GETPRINTTEMPLATE = 52 + OLECMDID_GETPRINTTEMPLATE = 52, + OLECMDID_PAGEACTIONBLOCKED = 55, + OLECMDID_PAGEACTIONUIQUERY = 56, + OLECMDID_FOCUSVIEWCONTROLS = 57, + OLECMDID_FOCUSVIEWCONTROLSQUERY = 58, + OLECMDID_SHOWPAGEACTIONMENU = 59, + OLECMDID_ADDTRAVELENTRY = 60, + OLECMDID_UPDATETRAVELENTRY = 61, + OLECMDID_UPDATEBACKFORWARDSTATE = 62, + OLECMDID_OPTICAL_ZOOM = 63, + OLECMDID_OPTICAL_GETZOOMRANGE = 64, + OLECMDID_WINDOWSTATECHANGED = 65, + OLECMDID_ACTIVEXINSTALLSCOPE = 66 } OLECMDID; HRESULT QueryStatus(

1 0

Eric Pouech : dbghelp: Don' t crash when parsing the forward declaration of a function.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 1a34d70354dcb8f790d7c840822094b78407b770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a34d70354dcb8f790d7c8408… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 25 19:29:58 2008 +0200 dbghelp: Don't crash when parsing the forward declaration of a function. --- dlls/dbghelp/dwarf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5f6458f..ccd39fb 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1679,7 +1679,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, symt_add_function_point(ctx->module, subpgm.func, SymTagCustom, &subpgm.frame, NULL); } - symt_normalize_function(subpgm.ctx->module, subpgm.func); + if (subpgm.func) symt_normalize_function(subpgm.ctx->module, subpgm.func); return di->symt; }

1 0

Andrej Sinicyn : regedit: Update the German translation.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 34c0bd760feefb3e7a98959e9263f1e4b232037c URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c0bd760feefb3e7a98959e9… Author: Andrej Sinicyn <Andrej.Sinicyn(a)gmx.de> Date: Sun May 25 23:54:53 2008 +0200 regedit: Update the German translation. --- programs/regedit/De.rc | 79 ++++++++++++++++++++++++----------------------- 1 files changed, 40 insertions(+), 39 deletions(-) diff --git a/programs/regedit/De.rc b/programs/regedit/De.rc index f2d3dda..c5805ea 100644 --- a/programs/regedit/De.rc +++ b/programs/regedit/De.rc @@ -41,50 +41,50 @@ BEGIN ID_REGISTRY_DISCONNECTNETWORKREGISTRY , GRAYED MENUITEM SEPARATOR - MENUITEM "&Drucken\tStrg+P", ID_REGISTRY_PRINT, GRAYED + MENUITEM "&Drucken\tStrg+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "&Beenden", ID_REGISTRY_EXIT END POPUP "&Bearbeiten" BEGIN - MENUITEM "&�ndern", ID_EDIT_MODIFY + MENUITEM "&�ndern", ID_EDIT_MODIFY MENUITEM SEPARATOR POPUP "&Neu" BEGIN - MENUITEM "&Schl�ssel", ID_EDIT_NEW_KEY + MENUITEM "&Schl�ssel", ID_EDIT_NEW_KEY MENUITEM SEPARATOR MENUITEM "&Zeichenfolge", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Bin�rwert", ID_EDIT_NEW_BINARYVALUE - MENUITEM "&DWORD Wert", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&DWORD-Wert", ID_EDIT_NEW_DWORDVALUE MENUITEM "&Mehrteilige Zeichenfolge", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR - MENUITEM "&L�schen\tEntf", ID_EDIT_DELETE - MENUITEM "&Umbenennen", ID_EDIT_RENAME + MENUITEM "&L�schen\tEntf", ID_EDIT_DELETE + MENUITEM "&Umbenennen", ID_EDIT_RENAME MENUITEM SEPARATOR - MENUITEM "Schl�sselname &kopieren", ID_EDIT_COPYKEYNAME + MENUITEM "Schl�sselnamen &kopieren", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR - MENUITEM "&Suchen\tStrg+F", ID_EDIT_FIND, GRAYED - MENUITEM "&N�chstes finden\tF3", ID_EDIT_FINDNEXT, GRAYED + MENUITEM "&Suchen\tStrg+F", ID_EDIT_FIND, GRAYED + MENUITEM "&Weitersuchen\tF3", ID_EDIT_FINDNEXT, GRAYED END POPUP "&Ansicht" BEGIN - MENUITEM "Status&leiste", ID_VIEW_STATUSBAR + MENUITEM "Status&leiste", ID_VIEW_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Trennen", ID_VIEW_SPLIT + MENUITEM "&Trennen", ID_VIEW_SPLIT MENUITEM SEPARATOR - MENUITEM "&Aktualisieren\tF5", ID_VIEW_REFRESH + MENUITEM "&Aktualisieren\tF5", ID_VIEW_REFRESH END POPUP "&Favoriten" BEGIN - MENUITEM "Zu den Favoriten &hinzuf�gen", ID_FAVORITES_ADDTOFAVORITES - MENUITEM "Von den Favoriten &l�schen", ID_FAVORITES_REMOVEFAVORITE + MENUITEM "Zu den Favoriten &hinzuf�gen", ID_FAVORITES_ADDTOFAVORITES + MENUITEM "Von den Favoriten &l�schen", ID_FAVORITES_REMOVEFAVORITE END POPUP "&Hilfe" BEGIN - MENUITEM "&Hilfethemen\tF1", ID_HELP_HELPTOPICS + MENUITEM "&Hilfethemen\tF1", ID_HELP_HELPTOPICS MENUITEM SEPARATOR - MENUITEM "&�ber Registry Editor", ID_HELP_ABOUT + MENUITEM "&�ber Registry Editor", ID_HELP_ABOUT END END @@ -92,30 +92,31 @@ IDR_POPUP_MENUS MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "&�ndern", ID_EDIT_MODIFY - MENUITEM "Bin�re Daten �ndern", ID_EDIT_MODIFY_BIN + MENUITEM "&�ndern", ID_EDIT_MODIFY + MENUITEM "Bin�re Daten �ndern", ID_EDIT_MODIFY_BIN MENUITEM SEPARATOR - MENUITEM "&L�schen\tEntf", ID_EDIT_DELETE - MENUITEM "&Umbennenen", ID_EDIT_RENAME + MENUITEM "&L�schen\tEntf", ID_EDIT_DELETE + MENUITEM "&Umbennenen", ID_EDIT_RENAME END POPUP "" BEGIN POPUP "&Neu" BEGIN - MENUITEM "&Schl�ssel", ID_EDIT_NEW_KEY + MENUITEM "&Schl�ssel", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&Zeichenfolge", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Bin�rwert", ID_EDIT_NEW_BINARYVALUE - MENUITEM "&DWORD Wert", ID_EDIT_NEW_DWORDVALUE - MENUITEM "&Mehrteilige Zeichenfolge", ID_EDIT_NEW_MULTI_STRINGVALUE + MENUITEM "&Zeichenfolge", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Bin�rwert", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD Wert", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Mehrteilige Zeichenfolge", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR - MENUITEM "&L�schen\tEntf", ID_EDIT_DELETE - MENUITEM "&Umbenennen", ID_EDIT_RENAME + MENUITEM "&L�schen\tEntf", ID_EDIT_DELETE + MENUITEM "&Umbenennen", ID_EDIT_RENAME MENUITEM SEPARATOR - MENUITEM "Schl�sselname &kopieren", ID_EDIT_COPYKEYNAME + MENUITEM "&Exportieren...", ID_EDIT_EXPORT + MENUITEM "Schl�sselnamen &kopieren", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR - MENUITEM "&Suchen\tStrg+F", ID_EDIT_FIND, GRAYED + MENUITEM "&Suchen\tStrg+F", ID_EDIT_FIND, GRAYED END END @@ -188,7 +189,7 @@ END IDD_EDIT_DWORD DIALOG DISCARDABLE 22, 17, 210, 100 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU -CAPTION "DWORD Wert editieren" +CAPTION "DWORD-Wert editieren" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Name:",IDC_STATIC,5,5,119,8 @@ -241,17 +242,17 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_APP_TITLE "Registry Editor" + IDS_APP_TITLE "Registry-Editor" END STRINGTABLE DISCARDABLE BEGIN - ID_REGISTRY_MENU "Befehle f�r das Bearbeiten der ganzen Registry" - ID_EDIT_MENU "Befehle f�r um Schl�ssel oder Werte zu �ndern" - ID_VIEW_MENU "Befehle um das Fenster anzupassen" + ID_REGISTRY_MENU "Befehle zum Bearbeiten der ganzen Registry" + ID_EDIT_MENU "Befehle zum �ndern von Schl�sseln oder Werten" + ID_VIEW_MENU "Befehle zum Anpassen des Fensters" ID_FAVORITES_MENU "Befehle f�r die Favoriten" - ID_HELP_MENU "Befehle um die Hilfe oder Informationen �ber das Programm anzuzeigen" - ID_EDIT_NEW_MENU "Befehle f�r das Erstellen von neuen Schl�sseln oder Daten" + ID_HELP_MENU "Befehle zum Anzeigen von Hilfe oder Informationen �ber das Programm" + ID_EDIT_NEW_MENU "Befehle zum Erstellen von neuen Schl�sseln oder Daten" END STRINGTABLE DISCARDABLE @@ -260,13 +261,13 @@ BEGIN ID_EDIT_NEW_KEY "F�gt einen neuen Schl�ssel hinzu" ID_EDIT_NEW_STRINGVALUE "F�gt eine neue Zeichenfolge hinzu " ID_EDIT_NEW_BINARYVALUE "F�gt einen neuen Bin�rwert hinzu" - ID_EDIT_NEW_DWORDVALUE "F�gt einen neuen DWORD Wert hinzu" + ID_EDIT_NEW_DWORDVALUE "F�gt einen neuen DWORD-Wert hinzu" ID_EDIT_NEW_MULTI_STRINGVALUE "F�gt eine neue mehrteilige Zeichenfolge hinzu" ID_REGISTRY_IMPORTREGISTRYFILE "Importiert eine Textdatei in die Registry" ID_REGISTRY_EXPORTREGISTRYFILE "Exportiert Teile oder die ganze Registry in eine Textdatei" ID_REGISTRY_CONNECTNETWORKREGISTRY - "Verbindet zu einer Registry eines Fremdcomputers" + "Verbindet zu der Registry eines Fremdcomputers" ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Trennt die Verbindung zu der Registry eines Fremdcomputers" ID_REGISTRY_PRINT "Druckt Teile oder die gesamte Registry aus" @@ -276,7 +277,7 @@ END STRINGTABLE DISCARDABLE BEGIN - ID_REGISTRY_EXIT "Beendet den Registry Editor" + ID_REGISTRY_EXIT "Beendet den Registry-Editor" ID_FAVORITES_ADDTOFAVORITES "F�gt Schl�ssel zu den Favoriten hinzu" ID_FAVORITES_REMOVEFAVORITE "L�scht Schl�ssel von den Favoriten" ID_VIEW_STATUSBAR "Zeigt oder versteckt die Statusleiste"

1 0

Michael Karcher : crypt32: CertGetPublicKeyLength should check only cert encoding type.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 8d4d7b267de514c3c72820faa31c3403a4a488cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4d7b267de514c3c72820faa… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun May 25 19:23:44 2008 +0200 crypt32: CertGetPublicKeyLength should check only cert encoding type. pktextract calls CertGetPublicKeyLength with dwCertEncodingType of X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, MSDN explicitly allows it. --- dlls/crypt32/cert.c | 2 +- dlls/crypt32/tests/cert.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 41d3998..b916ce3 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -809,7 +809,7 @@ DWORD WINAPI CertGetPublicKeyLength(DWORD dwCertEncodingType, TRACE("(%08x, %p)\n", dwCertEncodingType, pPublicKey); - if (dwCertEncodingType != X509_ASN_ENCODING) + if (GET_CERT_ENCODING_TYPE(dwCertEncodingType) != X509_ASN_ENCODING) { SetLastError(ERROR_FILE_NOT_FOUND); return 0; diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 3fce85e..64aba83 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2958,6 +2958,11 @@ static void testGetPublicKeyLength(void) SetLastError(0xdeadbeef); ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); ok(ret == 56, "Expected length 56, got %d\n", ret); + /* With the RSA OID and a message encoding */ + info.Algorithm.pszObjId = oid_rsa_rsa; + SetLastError(0xdeadbeef); + ret = CertGetPublicKeyLength(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, &info); + ok(ret == 56, "Expected length 56, got %d\n", ret); } START_TEST(cert)

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2008