Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[cwittich] 41774: thanks for breaking sysreg Arch!
by cwittich＠svn.reactos.org 04 Jul '09

04 Jul '09

Author: cwittich Date: Sat Jul 4 21:03:41 2009 New Revision: 41774 URL: http://svn.reactos.org/svn/reactos?rev=41774&view=rev Log: thanks for breaking sysreg Arch! Modified: trunk/tools/sysreg2/raddr2line.c Modified: trunk/tools/sysreg2/raddr2line.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/raddr2line.c?rev=417… ============================================================================== --- trunk/tools/sysreg2/raddr2line.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/raddr2line.c [iso-8859-1] Sat Jul 4 21:03:41 2009 @@ -84,7 +84,7 @@ char* ptr; if (!outdir) outdir = emptystr; - sprintf(Command, "%s/tools/raddr2line %s/%s %s 2>&1", + sprintf(Command, "%s/tools/rsym/raddr2line %s/%s %s 2>&1", outdir, outdir, PkgData, Addr); FILE* p = popen(Command, "r"); char buf[100] = {'\0'};

1 0

[jimtabor] 41773: - Cleanup patch tab removeal.
by jimtabor＠svn.reactos.org 04 Jul '09

04 Jul '09

Author: jimtabor Date: Sat Jul 4 20:43:59 2009 New Revision: 41773 URL: http://svn.reactos.org/svn/reactos?rev=41773&view=rev Log: - Cleanup patch tab removeal. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat Jul 4 20:43:59 2009 @@ -1317,11 +1317,11 @@ MSG Message; LARGE_INTEGER LargeTickCount; - if (FindMsgMemory(Msg) != 0) - { - SetLastWin32Error(ERROR_MESSAGE_SYNC_ONLY ); - return FALSE; - } + if (FindMsgMemory(Msg) != 0) + { + SetLastWin32Error(ERROR_MESSAGE_SYNC_ONLY ); + return FALSE; + } pti = PsGetCurrentThreadWin32Thread(); if (Wnd == HWND_BROADCAST) @@ -1412,11 +1412,11 @@ DPRINT("Enter NtUserPostThreadMessage\n"); - if (FindMsgMemory(Msg) != 0) - { - SetLastWin32Error(ERROR_MESSAGE_SYNC_ONLY ); - return FALSE; - } + if (FindMsgMemory(Msg) != 0) + { + SetLastWin32Error(ERROR_MESSAGE_SYNC_ONLY ); + return FALSE; + } UserEnterExclusive(); @@ -1869,11 +1869,11 @@ { BOOL Result = TRUE; - if (FindMsgMemory(Msg) != 0) - { - SetLastWin32Error(ERROR_MESSAGE_SYNC_ONLY ); - return FALSE; - } + if (FindMsgMemory(Msg) != 0) + { + SetLastWin32Error(ERROR_MESSAGE_SYNC_ONLY ); + return FALSE; + } // Basicly the same as IntPostOrSendMessage if (hWnd == HWND_BROADCAST) //Handle Broadcast

1 0

[jimtabor] 41772: - Updates and changes to, with one add on and removal: MenuWindowProc (Not supported in kernel space), PopupMenuWndProcA, PostMessage, SendNotifyMessage and win32k hook debugs. - Patch by Smiley <johnyadams@hotmail.com>: Wrong PostMessage and SendNotifyMessage behavior, see Bug 4646. - Reference: Related to TranslateMessage: http://msdn.microsoft.com/en-us/library/aa912145.aspx , Related to PopupMenuWndProcA: Registration of Atom classes, Unicode only: http://www.reactos.org/ar
by jimtabor＠svn.reactos.org 04 Jul '09

04 Jul '09

Author: jimtabor Date: Sat Jul 4 20:31:11 2009 New Revision: 41772 URL: http://svn.reactos.org/svn/reactos?rev=41772&view=rev Log: - Updates and changes to, with one add on and removal: MenuWindowProc (Not supported in kernel space), PopupMenuWndProcA, PostMessage, SendNotifyMessage and win32k hook debugs. - Patch by Smiley <johnyadams(a)hotmail.com>: Wrong PostMessage and SendNotifyMessage behavior, see Bug 4646. - Reference: Related to TranslateMessage: http://msdn.microsoft.com/en-us/library/aa912145.aspx , Related to PopupMenuWndProcA: Registration of Atom classes, Unicode only: http://www.reactos.org/archives/public/ros-dev/2007-October/009976.html Modified: trunk/reactos/dll/win32/user32/user32.pspec trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/user32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.ps… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] Sat Jul 4 20:31:11 2009 @@ -483,8 +483,8 @@ @ stdcall MapVirtualKeyW(long long) @ stdcall MapWindowPoints(long long ptr long) @ stdcall MenuItemFromPoint(long long double) ; Direct call NtUserMenuItemFromPoint -@ stdcall MenuWindowProcA (long long long long) -@ stdcall MenuWindowProcW (long long long long) +@ stdcall MenuWindowProcA (long ptr long long long) +@ stdcall MenuWindowProcW (long ptr long long long) @ stdcall MessageBeep(long) @ stdcall MessageBoxA(long str str long) @ stdcall MessageBoxExA(long str str long long) Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sat Jul 4 20:31:11 2009 @@ -72,6 +72,7 @@ POINT Pt; } MTRACKER; +static LRESULT WINAPI PopupMenuWndProcA(HWND hWnd, UINT Message, WPARAM wParam, LPARAM lParam); static LRESULT WINAPI PopupMenuWndProcW(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); /********************************************************************* @@ -972,6 +973,70 @@ } static LRESULT WINAPI +PopupMenuWndProcA(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam) +{ + TRACE("YES! hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam); + + switch(Message) + { + case WM_CREATE: + { + CREATESTRUCTA *cs = (CREATESTRUCTA *) lParam; + SetWindowLongPtrA(Wnd, 0, (LONG) cs->lpCreateParams); + return 0; + } + + case WM_MOUSEACTIVATE: /* We don't want to be activated */ + return MA_NOACTIVATE; + + case WM_PAINT: + { + PAINTSTRUCT ps; + BeginPaint(Wnd, &ps); + MenuDrawPopupMenu(Wnd, ps.hdc, (HMENU)GetWindowLongPtrA(Wnd, 0)); + EndPaint(Wnd, &ps); + return 0; + } + + case WM_ERASEBKGND: + return 1; + + case WM_DESTROY: + /* zero out global pointer in case resident popup window was destroyed. */ + if (Wnd == TopPopup) + { + TopPopup = NULL; + } + break; + + case WM_SHOWWINDOW: + if (0 != wParam) + { + if (0 == GetWindowLongPtrA(Wnd, 0)) + { + OutputDebugStringA("no menu to display\n"); + } + } + else + { + SetWindowLongPtrA(Wnd, 0, 0); + } + break; + + case MM_SETMENUHANDLE: + SetWindowLongPtrA(Wnd, 0, wParam); + break; + + case MM_GETMENUHANDLE: + return GetWindowLongPtrA(Wnd, 0); + + default: + return DefWindowProcA(Wnd, Message, wParam, lParam); + } + return 0; +} + +static LRESULT WINAPI PopupMenuWndProcW(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam) { TRACE("hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam); @@ -5161,33 +5226,56 @@ /* * @unimplemented */ -LRESULT +BOOL WINAPI MenuWindowProcA( HWND hWnd, + ULONG_PTR Result, UINT Msg, WPARAM wParam, LPARAM lParam ) { - UNIMPLEMENTED; - return FALSE; + if ( Msg < WM_USER) + { + LRESULT lResult; + lResult = PopupMenuWndProcA(hWnd, Msg, wParam, lParam ); + if (Result) + { + Result = (ULONG_PTR)lResult; + return TRUE; + } + return FALSE; + } + return NtUserMessageCall(hWnd, Msg, wParam, lParam, Result, FNID_MENU, TRUE); + } /* * @unimplemented */ -LRESULT +BOOL WINAPI MenuWindowProcW( HWND hWnd, + ULONG_PTR Result, UINT Msg, WPARAM wParam, LPARAM lParam ) { - UNIMPLEMENTED; - return FALSE; + if ( Msg < WM_USER) + { + LRESULT lResult; + lResult = PopupMenuWndProcW(hWnd, Msg, wParam, lParam ); + if (Result) + { + Result = (ULONG_PTR)lResult; + return TRUE; + } + return FALSE; + } + return NtUserMessageCall(hWnd, Msg, wParam, lParam, Result, FNID_MENU, FALSE); } /* Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Sat Jul 4 20:31:11 2009 @@ -1632,51 +1632,12 @@ return Res; } - -/* - * @implemented - */ +// +// Worker function for post message. +// BOOL -WINAPI -PostMessageA( - HWND Wnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) -{ - MSG AnsiMsg, UcMsg; - MSG KMMsg; - LRESULT Result; - - AnsiMsg.hwnd = Wnd; - AnsiMsg.message = Msg; - AnsiMsg.wParam = wParam; - AnsiMsg.lParam = lParam; - if (! MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg)) - { - return FALSE; - } - - if (! MsgiUMToKMMessage(&UcMsg, &KMMsg, TRUE)) - { - MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); - return FALSE; - } - Result = NtUserPostMessage(KMMsg.hwnd, KMMsg.message, - KMMsg.wParam, KMMsg.lParam); - MsgiUMToKMCleanup(&UcMsg, &KMMsg); - MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); - - return Result; -} - - -/* - * @implemented - */ -BOOL -WINAPI -PostMessageW( +FASTCALL +PostMessageWorker( HWND Wnd, UINT Msg, WPARAM wParam, @@ -1690,19 +1651,56 @@ UMMsg.wParam = wParam; UMMsg.lParam = lParam; if (! MsgiUMToKMMessage(&UMMsg, &KMMsg, TRUE)) - { - return FALSE; - } - Result = NtUserPostMessage(KMMsg.hwnd, KMMsg.message, - KMMsg.wParam, KMMsg.lParam); + { + return FALSE; + } + Result = NtUserPostMessage( KMMsg.hwnd, + KMMsg.message, + KMMsg.wParam, + KMMsg.lParam); + MsgiUMToKMCleanup(&UMMsg, &KMMsg); return Result; } +/* + * @implemented + */ BOOL WINAPI -PostMessageWX( +PostMessageA( + HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + MSG AnsiMsg, UcMsg; + BOOL Ret; + + AnsiMsg.hwnd = hWnd; + AnsiMsg.message = Msg; + AnsiMsg.wParam = wParam; + AnsiMsg.lParam = lParam; + + if (!MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg)) + { + return FALSE; + } + + Ret = PostMessageW( hWnd, UcMsg.message, UcMsg.wParam, UcMsg.lParam); + + MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); + + return Ret; +} + +/* + * @implemented + */ +BOOL +WINAPI +PostMessageW( HWND hWnd, UINT Msg, WPARAM wParam, @@ -1718,7 +1716,7 @@ combo/list box. Forces a call like DlgDirListComboBox. */ wParam |= DDL_POSTMSGS; - return NtUserPostMessage(hWnd, Msg, wParam, lParam); + return PostMessageWorker(hWnd, Msg, wParam, lParam); } /* No drop files or current Process, just post message. */ @@ -1726,10 +1724,10 @@ ( NtUserQueryWindow( hWnd, QUERY_WINDOW_UNIQUE_PROCESS_ID) == PtrToUint(NtCurrentTeb()->ClientId.UniqueProcess) ) ) { - return NtUserPostMessage(hWnd, Msg, wParam, lParam); + return PostMessageWorker(hWnd, Msg, wParam, lParam); } - /* We have drop files or this is not the same process for this window. */ + /* We have drop files and this is not the same process for this window. */ /* Just incase, check wParam for Global memory handle and send size. */ Ret = SendMessageW( hWnd, @@ -1737,36 +1735,9 @@ (WPARAM)GlobalSize((HGLOBAL)wParam), // Zero if not a handle. (LPARAM)wParam); // Send wParam as lParam. - if ( Ret ) return NtUserPostMessage(hWnd, Msg, (WPARAM)Ret, lParam); + if ( Ret ) return PostMessageWorker(hWnd, Msg, (WPARAM)Ret, lParam); return FALSE; -} -BOOL -WINAPI -PostMessageAX( - HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) -{ - MSG AnsiMsg, UcMsg; - BOOL Ret; - - AnsiMsg.hwnd = hWnd; - AnsiMsg.message = Msg; - AnsiMsg.wParam = wParam; - AnsiMsg.lParam = lParam; - - if (!MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg)) - { - return FALSE; - } - - Ret = PostMessageWX( hWnd, UcMsg.message, UcMsg.wParam, UcMsg.lParam); - - MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); - - return Ret; } /* @@ -2113,77 +2084,12 @@ return Result; } - -/* - * @unimplemented +/* + * @implemented */ BOOL WINAPI SendNotifyMessageA( - HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) -{ - MSG AnsiMsg, UcMsg; - MSG KMMsg; - LRESULT Result; - - AnsiMsg.hwnd = hWnd; - AnsiMsg.message = Msg; - AnsiMsg.wParam = wParam; - AnsiMsg.lParam = lParam; - if (! MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg)) - { - return FALSE; - } - - if (! MsgiUMToKMMessage(&UcMsg, &KMMsg, TRUE)) - { - MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); - return FALSE; - } - Result = NtUserSendNotifyMessage(KMMsg.hwnd, KMMsg.message, - KMMsg.wParam, KMMsg.lParam); - MsgiUMToKMCleanup(&UcMsg, &KMMsg); - MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); - - return Result; -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -SendNotifyMessageW( - HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) -{ - MSG UMMsg, KMMsg; - LRESULT Result; - - UMMsg.hwnd = hWnd; - UMMsg.message = Msg; - UMMsg.wParam = wParam; - UMMsg.lParam = lParam; - if (! MsgiUMToKMMessage(&UMMsg, &KMMsg, TRUE)) - { - return FALSE; - } - Result = NtUserSendNotifyMessage(KMMsg.hwnd, KMMsg.message, - KMMsg.wParam, KMMsg.lParam); - MsgiUMToKMCleanup(&UMMsg, &KMMsg); - - return Result; -} - -BOOL -WINAPI -SendNotifyMessageAX( HWND hWnd, UINT Msg, WPARAM wParam, @@ -2200,23 +2106,46 @@ { return FALSE; } - /* ATM, ReactOS does not support Ansi in win32k. */ - Ret = NtUserMessageCall(hWnd, UcMsg.message, UcMsg.wParam, UcMsg.lParam, 0, FNID_SENDNOTIFYMESSAGE, FALSE); + Ret = SendNotifyMessageW(hWnd, UcMsg.message, UcMsg.wParam, UcMsg.lParam); MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); return Ret; } +/* + * @implemented + */ BOOL WINAPI -SendNotifyMessageWX( +SendNotifyMessageW( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - return NtUserMessageCall(hWnd, Msg, wParam, lParam, 0, FNID_SENDNOTIFYMESSAGE, FALSE); + MSG UMMsg, KMMsg; + LRESULT Result; + + UMMsg.hwnd = hWnd; + UMMsg.message = Msg; + UMMsg.wParam = wParam; + UMMsg.lParam = lParam; + if (! MsgiUMToKMMessage(&UMMsg, &KMMsg, TRUE)) + { + return FALSE; + } + Result = NtUserMessageCall( hWnd, + KMMsg.message, + KMMsg.wParam, + KMMsg.lParam, + 0, + FNID_SENDNOTIFYMESSAGE, + FALSE); + + MsgiUMToKMCleanup(&UMMsg, &KMMsg); + + return Result; } /* @@ -2234,6 +2163,8 @@ return(NtUserTranslateMessage((LPMSG)lpMsg, (HKL)unk)); default: + if ( lpMsg->message & ~WM_MAXIMUM ) + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } } @@ -2245,7 +2176,20 @@ BOOL WINAPI TranslateMessage(CONST MSG *lpMsg) { - return(TranslateMessageEx((LPMSG)lpMsg, 0)); + BOOL Ret = FALSE; + +// Ref: msdn ImmGetVirtualKey: +// http://msdn.microsoft.com/en-us/library/aa912145.aspx +/* + if ( (LOWORD(lpMsg->wParam) != VK_PROCESSKEY) || + !(Ret = IMM_ImmTranslateMessage( lpMsg->hwnd, + lpMsg->message, + lpMsg->wParam, + lpMsg->lParam)) )*/ + { + Ret = TranslateMessageEx((LPMSG)lpMsg, 0); + } + return Ret; } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Jul 4 20:31:11 2009 @@ -566,6 +566,7 @@ #define WM_SYSTIMER 280 #define WM_POPUPSYSTEMMENU 787 #define WM_CBT 1023 // ReactOS only. +#define WM_MAXIMUM 0x0001FFFF // // Non SDK DCE types. @@ -3078,16 +3079,6 @@ ULONG_PTR *uResult, PNTUSERSENDMESSAGEINFO Info); -/* use NtUserMessageCall */ -BOOL -NTAPI -NtUserSendNotifyMessage( - HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam); - - typedef struct _SETSCROLLBARINFO { int nTrackPos; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Sat Jul 4 20:31:11 2009 @@ -785,14 +785,14 @@ } case WH_CBT: - DPRINT1("HOOK WH_CBT!\n"); + DPRINT("HOOK WH_CBT!\n"); switch (Code) { case HCBT_CREATEWND: { LPCBT_CREATEWNDW pcbtcww = (LPCBT_CREATEWNDW)lParam; - DPRINT1("HOOK HCBT_CREATEWND\n"); + DPRINT("HOOK HCBT_CREATEWND\n"); _SEH2_TRY { if (Ansi) @@ -856,7 +856,7 @@ { RECTL rt; - DPRINT1("HOOK HCBT_MOVESIZE\n"); + DPRINT("HOOK HCBT_MOVESIZE\n"); if (lParam) { @@ -893,7 +893,7 @@ { CBTACTIVATESTRUCT CbAs; - DPRINT1("HOOK HCBT_ACTIVATE\n"); + DPRINT("HOOK HCBT_ACTIVATE\n"); if (lParam) { _SEH2_TRY @@ -927,7 +927,7 @@ /* The rest just use default. */ default: - DPRINT1("HOOK HCBT_ %d\n",Code); + DPRINT("HOOK HCBT_ %d\n",Code); lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); break; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat Jul 4 20:31:11 2009 @@ -1314,10 +1314,14 @@ LPARAM lParam) { PTHREADINFO pti; - MSG UserModeMsg, KernelModeMsg; + MSG Message; LARGE_INTEGER LargeTickCount; - NTSTATUS Status; - PMSGMEMORY MsgMemoryEntry; + + if (FindMsgMemory(Msg) != 0) + { + SetLastWin32Error(ERROR_MESSAGE_SYNC_ONLY ); + return FALSE; + } pti = PsGetCurrentThreadWin32Thread(); if (Wnd == HWND_BROADCAST) @@ -1358,24 +1362,14 @@ } else { - UserModeMsg.hwnd = Wnd; - UserModeMsg.message = Msg; - UserModeMsg.wParam = wParam; - UserModeMsg.lParam = lParam; - MsgMemoryEntry = FindMsgMemory(UserModeMsg.message); - Status = CopyMsgToKernelMem(&KernelModeMsg, &UserModeMsg, MsgMemoryEntry); - if (! NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - IntGetCursorLocation(pti->Desktop->WindowStation, - &KernelModeMsg.pt); + Message.hwnd = Wnd; + Message.message = Msg; + Message.wParam = wParam; + Message.lParam = lParam; + IntGetCursorLocation(pti->Desktop->WindowStation, &Message.pt); KeQueryTickCount(&LargeTickCount); - pti->timeLast = KernelModeMsg.time = MsqCalculateMessageTime(&LargeTickCount); - MsqPostMessage(Window->MessageQueue, &KernelModeMsg, - NULL != MsgMemoryEntry && 0 != KernelModeMsg.lParam, - QS_POSTMESSAGE); + pti->timeLast = Message.time = MsqCalculateMessageTime(&LargeTickCount); + MsqPostMessage(Window->MessageQueue, &Message, FALSE, QS_POSTMESSAGE); } } @@ -1410,14 +1404,20 @@ WPARAM wParam, LPARAM lParam) { - MSG UserModeMsg, KernelModeMsg; + MSG Message; PETHREAD peThread; PTHREADINFO pThread; NTSTATUS Status; - PMSGMEMORY MsgMemoryEntry; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserPostThreadMessage\n"); + + if (FindMsgMemory(Msg) != 0) + { + SetLastWin32Error(ERROR_MESSAGE_SYNC_ONLY ); + return FALSE; + } + UserEnterExclusive(); Status = PsLookupThreadByThreadId((HANDLE)idThread,&peThread); @@ -1431,21 +1431,11 @@ RETURN( FALSE); } - UserModeMsg.hwnd = NULL; - UserModeMsg.message = Msg; - UserModeMsg.wParam = wParam; - UserModeMsg.lParam = lParam; - MsgMemoryEntry = FindMsgMemory(UserModeMsg.message); - Status = CopyMsgToKernelMem(&KernelModeMsg, &UserModeMsg, MsgMemoryEntry); - if (! NT_SUCCESS(Status)) - { - ObDereferenceObject( peThread ); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN( FALSE); - } - MsqPostMessage(pThread->MessageQueue, &KernelModeMsg, - NULL != MsgMemoryEntry && 0 != KernelModeMsg.lParam, - QS_POSTMESSAGE); + Message.hwnd = NULL; + Message.message = Msg; + Message.wParam = wParam; + Message.lParam = lParam; + MsqPostMessage(pThread->MessageQueue, &Message, FALSE, QS_POSTMESSAGE); ObDereferenceObject( peThread ); RETURN( TRUE); } @@ -1682,7 +1672,7 @@ } pti = PsGetCurrentThreadWin32Thread(); - if(Window->MessageQueue != pti->MessageQueue) + if(Window->MessageQueue != pti->MessageQueue && FindMsgMemory(Msg) ==0) { Result = UserPostMessage(hWnd, Msg, wParam, lParam); } @@ -1878,6 +1868,13 @@ LPARAM lParam) { BOOL Result = TRUE; + + if (FindMsgMemory(Msg) != 0) + { + SetLastWin32Error(ERROR_MESSAGE_SYNC_ONLY ); + return FALSE; + } + // Basicly the same as IntPostOrSendMessage if (hWnd == HWND_BROADCAST) //Handle Broadcast { @@ -1902,10 +1899,7 @@ ULONG_PTR PResult; PTHREADINFO pti; PWINDOW_OBJECT Window; - NTSTATUS Status; - MSG UserModeMsg; - MSG KernelModeMsg; - PMSGMEMORY MsgMemoryEntry; + MSG Message; if(!(Window = UserGetWindowObject(hWnd))) return FALSE; @@ -1916,52 +1910,15 @@ } else { // Handle message and callback. - UserModeMsg.hwnd = hWnd; - UserModeMsg.message = Msg; - UserModeMsg.wParam = wParam; - UserModeMsg.lParam = lParam; - MsgMemoryEntry = FindMsgMemory(UserModeMsg.message); - Status = CopyMsgToKernelMem(&KernelModeMsg, &UserModeMsg, MsgMemoryEntry); - if (! NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - Result = co_IntSendMessageTimeoutSingle( - KernelModeMsg.hwnd, KernelModeMsg.message, - KernelModeMsg.wParam, KernelModeMsg.lParam, - SMTO_NORMAL, 0, &PResult); - - Status = CopyMsgToUserMem(&UserModeMsg, &KernelModeMsg); - if (! NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } + Message.hwnd = hWnd; + Message.message = Msg; + Message.wParam = wParam; + Message.lParam = lParam; + + Result = co_IntSendMessageTimeoutSingle( hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &PResult); } } return Result; -} - - -BOOL APIENTRY -NtUserSendNotifyMessage(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) -{ - DECLARE_RETURN(BOOL); - - DPRINT("EnterNtUserSendNotifyMessage\n"); - UserEnterExclusive(); - - RETURN(UserSendNotifyMessage(hWnd, Msg, wParam, lParam)); - -CLEANUP: - DPRINT("Leave NtUserSendNotifyMessage, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; - } Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sat Jul 4 20:31:11 2009 @@ -699,5 +699,4 @@ NtUserMonitorFromWindow 2 NtUserSendMessage 5 NtUserSendMessageTimeout 8 -NtUserSendNotifyMessage 4 NtUserSetScrollBarInfo 3

1 0

[tkreuzer] 41771: Implement PALETTE_ulGetNearestPaletteIndex and PALETTE_ulGetRGBColorFromIndex, replacing COLOR_LookupNearestColor and COLOR_PaletteLookupPixel Implement PALETTE_vGetBitMasks
by tkreuzer＠svn.reactos.org 04 Jul '09

04 Jul '09

Author: tkreuzer Date: Sat Jul 4 17:56:33 2009 New Revision: 41771 URL: http://svn.reactos.org/svn/reactos?rev=41771&view=rev Log: Implement PALETTE_ulGetNearestPaletteIndex and PALETTE_ulGetRGBColorFromIndex, replacing COLOR_LookupNearestColor and COLOR_PaletteLookupPixel Implement PALETTE_vGetBitMasks Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h trunk/reactos/subsystems/win32/win32k/objects/palette.c Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] Sat Jul 4 17:56:33 2009 @@ -80,9 +80,19 @@ INT FASTCALL PALETTE_ToPhysical (PDC dc, COLORREF color); INT FASTCALL PALETTE_GetObject(PPALETTE pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer); +ULONG NTAPI PALETTE_ulGetNearestPaletteIndex(PALETTE* ppal, ULONG iColor); +VOID NTAPI PALETTE_vGetBitMasks(PPALETTE ppal, PULONG pulColors); PPALETTEENTRY FASTCALL ReturnSystemPalette (VOID); HPALETTE FASTCALL GdiSelectPalette(HDC, HPALETTE, BOOL); +FORCEINLINE +ULONG +PALETTE_ulGetRGBColorFromIndex(PPALETTE ppal, ULONG ulIndex) +{ + return RGB(ppal->IndexedColors[ulIndex].peRed, + ppal->IndexedColors[ulIndex].peGreen, + ppal->IndexedColors[ulIndex].peBlue); +} #endif /* not _WIN32K_PALETTE_H */ Modified: trunk/reactos/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] Sat Jul 4 17:56:33 2009 @@ -45,45 +45,6 @@ { 0xff, 0xff, 0xff, PC_SYS_USED } // last 10 }; -INT APIENTRY COLOR_PaletteLookupPixel(PALETTEENTRY *palPalEntry, INT size, - XLATEOBJ *XlateObj, COLORREF col, BOOL skipReserved) -{ - int i, best = 0, diff = 0x7fffffff; - int r, g, b; - - for( i = 0; i < size && diff ; i++ ) - { -#if 0 - if(!(palPalEntry[i].peFlags & PC_SYS_USED) || (skipReserved && palPalEntry[i].peFlags & PC_SYS_RESERVED)) - continue; -#endif - - r = abs((SHORT)palPalEntry[i].peRed - GetRValue(col)); - g = abs((SHORT)palPalEntry[i].peGreen - GetGValue(col)); - b = abs((SHORT)palPalEntry[i].peBlue - GetBValue(col)); - - r = r*r + g*g + b*b; - - if( r < diff ) { best = i; diff = r; } - } - - if (XlateObj == NULL) - return best; - else - return (XlateObj->pulXlate) ? (INT)XlateObj->pulXlate[best] : best; -} - -COLORREF APIENTRY COLOR_LookupNearestColor( PALETTEENTRY* palPalEntry, int size, COLORREF color ) -{ - INT index; - - index = COLOR_PaletteLookupPixel(palPalEntry, size, NULL, color, FALSE); - return RGB( - palPalEntry[index].peRed, - palPalEntry[index].peGreen, - palPalEntry[index].peBlue); -} - unsigned short GetNumberOfBits(unsigned int dwMask) { unsigned short wBits; @@ -258,7 +219,7 @@ } INT FASTCALL -PALETTE_GetObject(PPALETTE pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer) +PALETTE_GetObject(PPALETTE ppal, INT cbCount, LPLOGBRUSH lpBuffer) { if (!lpBuffer) { @@ -266,8 +227,67 @@ } if ((UINT)cbCount < sizeof(WORD)) return 0; - *((WORD*)lpBuffer) = (WORD)pGdiObject->NumColors; + *((WORD*)lpBuffer) = (WORD)ppal->NumColors; return sizeof(WORD); +} + +ULONG +NTAPI +PALETTE_ulGetNearestPaletteIndex(PALETTE* ppal, ULONG iColor) +{ + ULONG ulDiff, ulColorDiff, ulMinimalDiff = 0xFFFFFF; + ULONG i, ulBestIndex = 0; + PALETTEENTRY peColor = *(PPALETTEENTRY)&iColor; + + /* Loop all palette entries, break on exact match */ + for (i = 0; i < ppal->NumColors && ulMinimalDiff != 0; i++) + { + /* Calculate distance in the color cube */ + ulDiff = peColor.peRed - ppal->IndexedColors[i].peRed; + ulColorDiff = ulDiff * ulDiff; + ulDiff = peColor.peGreen - ppal->IndexedColors[i].peGreen; + ulColorDiff += ulDiff * ulDiff; + ulDiff = peColor.peBlue - ppal->IndexedColors[i].peBlue; + ulColorDiff += ulDiff * ulDiff; + + /* Check for a better match */ + if (ulColorDiff < ulMinimalDiff) + { + ulBestIndex = i; + ulMinimalDiff = ulColorDiff; + } + } + + return ulBestIndex; +} + +VOID +NTAPI +PALETTE_vGetBitMasks(PPALETTE ppal, PULONG pulColors) +{ + ASSERT(pulColors); + + switch (ppal->Mode) + { + case PAL_INDEXED: + case PAL_RGB: + pulColors[0] = RGB(0xFF, 0x00, 0x00); + pulColors[1] = RGB(0x00, 0xFF, 0x00); + pulColors[2] = RGB(0x00, 0x00, 0xFF); + break; + + case PAL_BGR: + pulColors[0] = RGB(0x00, 0x00, 0xFF); + pulColors[1] = RGB(0x00, 0xFF, 0x00); + pulColors[2] = RGB(0xFF, 0x00, 0x00); + break; + + case PAL_BITFIELDS: + pulColors[0] = ppal->RedMask; + pulColors[1] = ppal->GreenMask; + pulColors[2] = ppal->BlueMask; + break; + } } VOID @@ -585,9 +605,12 @@ switch (palGDI->Mode) { case PAL_INDEXED: - nearest = COLOR_LookupNearestColor(palGDI->IndexedColors, - palGDI->NumColors, Color); + { + ULONG index; + index = PALETTE_ulGetNearestPaletteIndex(palGDI, Color); + nearest = PALETTE_ulGetRGBColorFromIndex(palGDI, index); break; + } case PAL_BGR: case PAL_RGB: nearest = Color; @@ -621,11 +644,7 @@ if (ppal) { /* Return closest match for the given RGB color */ - index = COLOR_PaletteLookupPixel(ppal->IndexedColors, - ppal->NumColors, - NULL, - crColor, - FALSE); + index = PALETTE_ulGetNearestPaletteIndex(ppal, crColor); PALETTE_UnlockPalette(ppal); }

1 0

[cwittich] 41770: sync localui with wine 1.1.25
by cwittich＠svn.reactos.org 04 Jul '09

04 Jul '09

Author: cwittich Date: Sat Jul 4 15:52:35 2009 New Revision: 41770 URL: http://svn.reactos.org/svn/reactos?rev=41770&view=rev Log: sync localui with wine 1.1.25 Added: trunk/reactos/dll/win32/localui/ui_Lt.rc (with props) Modified: trunk/reactos/dll/win32/localui/localui.h trunk/reactos/dll/win32/localui/localui.rbuild trunk/reactos/dll/win32/localui/localui.rc trunk/reactos/dll/win32/localui/ui_Da.rc trunk/reactos/dll/win32/localui/ui_De.rc trunk/reactos/dll/win32/localui/ui_En.rc trunk/reactos/dll/win32/localui/ui_Fr.rc trunk/reactos/dll/win32/localui/ui_Ko.rc trunk/reactos/dll/win32/localui/ui_Nl.rc trunk/reactos/dll/win32/localui/ui_No.rc trunk/reactos/dll/win32/localui/ui_Pl.rc trunk/reactos/dll/win32/localui/ui_Pt.rc trunk/reactos/dll/win32/localui/ui_Ro.rc trunk/reactos/dll/win32/localui/ui_Ru.rc trunk/reactos/dll/win32/localui/ui_Si.rc trunk/reactos/dll/win32/localui/ui_Sv.rc trunk/reactos/dll/win32/localui/ui_Zh.rc Modified: trunk/reactos/dll/win32/localui/localui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.… ============================================================================== --- trunk/reactos/dll/win32/localui/localui.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/localui.h [iso-8859-1] Sat Jul 4 15:52:35 2009 @@ -21,6 +21,8 @@ #ifndef __WINE_LOCALUI__ #define __WINE_LOCALUI__ +#include <windef.h> +#include <winuser.h> /* ## Resource-ID ## */ #define ADDPORT_DIALOG 100 Modified: trunk/reactos/dll/win32/localui/localui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.… ============================================================================== --- trunk/reactos/dll/win32/localui/localui.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/localui.rbuild [iso-8859-1] Sat Jul 4 15:52:35 2009 @@ -8,6 +8,21 @@ <define name="__WINESRC__" /> <file>localui.c</file> <file>localui.rc</file> + <file>ui_Da.rc</file> + <file>ui_De.rc</file> + <file>ui_En.rc</file> + <file>ui_Fr.rc</file> + <file>ui_Ko.rc</file> + <file>ui_Lt.rc</file> + <file>ui_Nl.rc</file> + <file>ui_No.rc</file> + <file>ui_Pl.rc</file> + <file>ui_Pt.rc</file> + <file>ui_Ro.rc</file> + <file>ui_Ru.rc</file> + <file>ui_Si.rc</file> + <file>ui_Sv.rc</file> + <file>ui_Zh.rc</file> <library>wine</library> <library>winspool</library> <library>user32</library> Modified: trunk/reactos/dll/win32/localui/localui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.… ============================================================================== --- trunk/reactos/dll/win32/localui/localui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/localui.rc [iso-8859-1] Sat Jul 4 15:52:35 2009 @@ -19,10 +19,6 @@ * */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winver.h" #include "localui.h" #define WINE_FILENAME_STR "localui.dll" @@ -36,19 +32,3 @@ #define WINE_PRODUCTVERSION_STR "5.1.2600.2180" #include "wine/wine_common_ver.rc" - - -#include "ui_Da.rc" -#include "ui_De.rc" -#include "ui_En.rc" -#include "ui_Fr.rc" -#include "ui_Ko.rc" -#include "ui_Nl.rc" -#include "ui_No.rc" -#include "ui_Pl.rc" -#include "ui_Pt.rc" -#include "ui_Ro.rc" -#include "ui_Ru.rc" -#include "ui_Si.rc" -#include "ui_Sv.rc" -#include "ui_Zh.rc" Modified: trunk/reactos/dll/win32/localui/ui_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Da.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Da.rc [iso-8859-1] Sat Jul 4 15:52:35 2009 @@ -17,6 +17,8 @@ * 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 "localui.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/localui/ui_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_De.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_De.rc [iso-8859-1] Sat Jul 4 15:52:35 2009 @@ -17,6 +17,8 @@ * 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 "localui.h" LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/localui/ui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_En.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_En.rc [iso-8859-1] Sat Jul 4 15:52:35 2009 @@ -17,6 +17,8 @@ * 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 "localui.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/localui/ui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Fr.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Fr.rc [iso-8859-1] Sat Jul 4 15:52:35 2009 @@ -17,6 +17,9 @@ * 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 "localui.h" + #pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -53,5 +56,3 @@ IDS_PORTEXISTS "Le port %s existe dÃ©jÃ " IDS_NOTHINGTOCONFIG "Ce port n'a pas d'options de configuration" } - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/localui/ui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ko.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Ko.rc [iso-8859-1] Sat Jul 4 15:52:35 2009 @@ -18,6 +18,8 @@ * 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 "localui.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Added: trunk/reactos/dll/win32/localui/ui_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Lt.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Lt.rc (added) +++ trunk/reactos/dll/win32/localui/ui_Lt.rc [iso-8859-1] Sat Jul 4 15:52:35 2009 @@ -1,0 +1,59 @@ +/* + * Lithuanian resources for localui + * + * Copyright 2009 Aurimas FiÅ¡eras <aurimas(a)gmail.com> + * + * 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 "localui.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +ADDPORT_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 "PridÄti vietinÄ¯ prievadÄ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ä®veskite pridedamo prievado vardÄ:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "Gerai", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Atsisakyti", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "KonfigÅ«ruoti LPT prievadÄ" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Laukimo laikas (sekundÄmis)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Perdavimo pakartojimas:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "Gerai", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Atsisakyti", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Vietinis prievadas" + IDS_INVALIDNAME "'%s' yra netinkamas prievado vardas" + IDS_PORTEXISTS "Prievadas %s jau egzistuoja" + IDS_NOTHINGTOCONFIG "Å is prievadas neturi parinkÄiÅ³ konfigÅ«ravimui" +} Propchange: trunk/reactos/dll/win32/localui/ui_Lt.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/localui/ui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Nl.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Nl.rc [iso-8859-1] Sat Jul 4 15:52:35 2009 @@ -17,6 +17,8 @@ * 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 "localui.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/localui/ui_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_No.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_No.rc [iso-8859-1] Sat Jul 4 15:52:35 2009 @@ -17,6 +17,8 @@ * 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 "localui.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/localui/ui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Pl.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Pl.rc [iso-8859-1] Sat Jul 4 15:52:35 2009 @@ -18,6 +18,8 @@ * 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 "localui.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/localui/ui_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Pt.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Pt.rc [iso-8859-1] Sat Jul 4 15:52:35 2009 @@ -17,6 +17,8 @@ * 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 "localui.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/localui/ui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ro.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Ro.rc [iso-8859-1] Sat Jul 4 15:52:35 2009 @@ -16,6 +16,8 @@ * 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 "localui.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -53,5 +55,3 @@ IDS_PORTEXISTS "Portul %s existsÄ deja" IDS_NOTHINGTOCONFIG "Acest port nu are opÈiuni de configurat" } - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/localui/ui_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ru.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Ru.rc [iso-8859-1] Sat Jul 4 15:52:35 2009 @@ -17,6 +17,8 @@ * 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 "localui.h" LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/localui/ui_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Si.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Si.rc [iso-8859-1] Sat Jul 4 15:52:35 2009 @@ -17,6 +17,8 @@ * 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 "localui.h" #pragma code_page(65001) @@ -54,5 +56,3 @@ IDS_PORTEXISTS "Vrata z imenom %s Å¾e obstajajo" IDS_NOTHINGTOCONFIG "Ta vrata nimajo moÅ¾nosti nastavitve" } - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/localui/ui_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Sv.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Sv.rc [iso-8859-1] Sat Jul 4 15:52:35 2009 @@ -17,6 +17,8 @@ * 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 "localui.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/localui/ui_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Zh.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Zh.rc [iso-8859-1] Sat Jul 4 15:52:35 2009 @@ -17,6 +17,8 @@ * 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 "localui.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -90,5 +92,3 @@ IDS_PORTEXISTS "ç«¯å£ %s å·²ç¶åå¨" IDS_NOTHINGTOCONFIG "éåç«¯å£æ²æå¯è¨å®é¸é " } - -#pragma code_page(default)

1 0

[cwittich] 41769: sync jscript with wine 1.1.25
by cwittich＠svn.reactos.org 04 Jul '09

04 Jul '09

Author: cwittich Date: Sat Jul 4 15:49:53 2009 New Revision: 41769 URL: http://svn.reactos.org/svn/reactos?rev=41769&view=rev Log: sync jscript with wine 1.1.25 Modified: trunk/reactos/dll/win32/jscript/array.c trunk/reactos/dll/win32/jscript/bool.c trunk/reactos/dll/win32/jscript/date.c trunk/reactos/dll/win32/jscript/dispex.c trunk/reactos/dll/win32/jscript/function.c trunk/reactos/dll/win32/jscript/jscript.h trunk/reactos/dll/win32/jscript/number.c trunk/reactos/dll/win32/jscript/object.c trunk/reactos/dll/win32/jscript/regexp.c trunk/reactos/dll/win32/jscript/string.c Modified: trunk/reactos/dll/win32/jscript/array.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/array.c?… ============================================================================== --- trunk/reactos/dll/win32/jscript/array.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/array.c [iso-8859-1] Sat Jul 4 15:49:53 2009 @@ -829,7 +829,7 @@ if(FAILED(hres)) return hres; - hres = create_builtin_function(ctx, ArrayConstr_value, PROPF_CONSTR, &array->dispex, ret); + hres = create_builtin_function(ctx, ArrayConstr_value, NULL, PROPF_CONSTR, &array->dispex, ret); IDispatchEx_Release(_IDispatchEx_(&array->dispex)); return hres; Modified: trunk/reactos/dll/win32/jscript/bool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/bool.c?r… ============================================================================== --- trunk/reactos/dll/win32/jscript/bool.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/bool.c [iso-8859-1] Sat Jul 4 15:49:53 2009 @@ -142,7 +142,7 @@ if(FAILED(hres)) return hres; - hres = create_builtin_function(ctx, BoolConstr_value, PROPF_CONSTR, &bool->dispex, ret); + hres = create_builtin_function(ctx, BoolConstr_value, NULL, PROPF_CONSTR, &bool->dispex, ret); jsdisp_release(&bool->dispex); return hres; Modified: trunk/reactos/dll/win32/jscript/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/date.c?r… ============================================================================== --- trunk/reactos/dll/win32/jscript/date.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/date.c [iso-8859-1] Sat Jul 4 15:49:53 2009 @@ -35,6 +35,10 @@ DOUBLE time; LONG bias; + SYSTEMTIME standardDate; + LONG standardBias; + SYSTEMTIME daylightDate; + LONG daylightBias; } DateInstance; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; @@ -83,18 +87,33 @@ static const WCHAR setFullYearW[] = {'s','e','t','F','u','l','l','Y','e','a','r',0}; static const WCHAR setUTCFullYearW[] = {'s','e','t','U','T','C','F','u','l','l','Y','e','a','r',0}; -/*ECMA-262 3th Edition 15.9.1.2 */ +static const WCHAR UTCW[] = {'U','T','C',0}; +static const WCHAR parseW[] = {'p','a','r','s','e',0}; + +/*ECMA-262 3rd Edition 15.9.1.2 */ #define MS_PER_DAY 86400000 #define MS_PER_HOUR 3600000 #define MS_PER_MINUTE 60000 -/* ECMA-262 3th Edition 15.9.1.2 */ +/* ECMA-262 3rd Edition 15.9.1.2 */ static inline DOUBLE day(DOUBLE time) { return floor(time / MS_PER_DAY); } -/* ECMA-262 3th Edition 15.9.1.3 */ +/* ECMA-262 3rd Edition 15.9.1.2 */ +static inline DOUBLE time_within_day(DOUBLE time) +{ + DOUBLE ret; + + ret = fmod(time, MS_PER_DAY); + if(ret < 0) + ret += MS_PER_DAY; + + return ret; +} + +/* ECMA-262 3rd Edition 15.9.1.3 */ static inline DOUBLE days_in_year(DOUBLE year) { int y; @@ -109,26 +128,54 @@ return 366; } -/* ECMA-262 3th Edition 15.9.1.3 */ +/* ECMA-262 3rd Edition 15.9.1.3 */ static inline DOUBLE day_from_year(DOUBLE year) { - int y; - if(year != (int)year) return ret_nan(); - y = year; - return 365*(y-1970) + floor((y-1969)/4) - - floor((y-1901)/100) + floor((y-1601)/400); -} - -/* ECMA-262 3th Edition 15.9.1.3 */ + return floor(365.0*(year-1970) + floor((year-1969)/4) + - floor((year-1901)/100) + floor((year-1601)/400)); +} + +static inline int day_from_month(int month, int in_leap_year) +{ + switch(month) + { + case 0: + return 0; + case 1: + return 31; + case 2: + return 59+in_leap_year; + case 3: + return 90+in_leap_year; + case 4: + return 120+in_leap_year; + case 5: + return 151+in_leap_year; + case 6: + return 181+in_leap_year; + case 7: + return 212+in_leap_year; + case 8: + return 243+in_leap_year; + case 9: + return 273+in_leap_year; + case 10: + return 304+in_leap_year; + default: + return 334+in_leap_year; + } +} + +/* ECMA-262 3rd Edition 15.9.1.3 */ static inline DOUBLE time_from_year(DOUBLE year) { return MS_PER_DAY*day_from_year(year); } -/* ECMA-262 3th Edition 15.9.1.3 */ +/* ECMA-262 3rd Edition 15.9.1.3 */ static inline DOUBLE year_from_time(DOUBLE time) { int y; @@ -146,7 +193,7 @@ return y; } -/* ECMA-262 3th Edition 15.9.1.3 */ +/* ECMA-262 3rd Edition 15.9.1.3 */ static inline int in_leap_year(DOUBLE time) { if(days_in_year(year_from_time(time))==366) @@ -154,13 +201,13 @@ return 0; } -/* ECMA-262 3th Edition 15.9.1.4 */ +/* ECMA-262 3rd Edition 15.9.1.4 */ static inline int day_within_year(DOUBLE time) { return day(time) - day_from_year(year_from_time(time)); } -/* ECMA-262 3th Edition 15.9.1.4 */ +/* ECMA-262 3rd Edition 15.9.1.4 */ static inline DOUBLE month_from_time(DOUBLE time) { int ily = in_leap_year(time); @@ -183,7 +230,7 @@ return 11; } -/* ECMA-262 3th Edition 15.9.1.5 */ +/* ECMA-262 3rd Edition 15.9.1.5 */ static inline DOUBLE date_from_time(DOUBLE time) { int dwy = day_within_year(time); @@ -207,7 +254,7 @@ return dwy-333-ily; } -/* ECMA-262 3th Edition 15.9.1.6 */ +/* ECMA-262 3rd Edition 15.9.1.6 */ static inline DOUBLE week_day(DOUBLE time) { DOUBLE ret; @@ -221,7 +268,81 @@ return ret; } -/* ECMA-262 3th Edition 15.9.1.10 */ +static inline DOUBLE convert_time(int year, SYSTEMTIME st) +{ + DOUBLE time; + int set_week_day; + + if(st.wMonth == 0) + return ret_nan(); + + if(st.wYear != 0) + year = st.wYear; + + time = time_from_year(year); + time += (DOUBLE)day_from_month(st.wMonth-1, in_leap_year(time)) * MS_PER_DAY; + + if(st.wYear == 0) { + set_week_day = st.wDayOfWeek-week_day(time); + if(set_week_day < 0) + set_week_day += 7; + time += set_week_day * MS_PER_DAY; + + time += (DOUBLE)(st.wDay-1) * 7 * MS_PER_DAY; + if(month_from_time(time) != st.wMonth-1) + time -= 7 * MS_PER_DAY; + } + else + time += st.wDay * MS_PER_DAY; + + time += st.wHour * MS_PER_HOUR; + time += st.wMinute * MS_PER_MINUTE; + + return time; +} + +/* ECMA-262 3rd Edition 15.9.1.9 */ +static inline DOUBLE daylight_saving_ta(DOUBLE time, DateInstance *date) +{ + int year = year_from_time(time); + DOUBLE standardTime, daylightTime; + + if(isnan(time)) + return 0; + + standardTime = convert_time(year, date->standardDate); + daylightTime = convert_time(year, date->daylightDate); + + if(isnan(standardTime) || isnan(daylightTime)) + return 0; + else if(standardTime > daylightTime) { + if(daylightTime <= time && time < standardTime) + return date->daylightBias; + + return date->standardBias; + } + else { + if(standardTime <= time && time < daylightTime) + return date->standardBias; + + return date->daylightBias; + } +} + +/* ECMA-262 3rd Edition 15.9.1.9 */ +static inline DOUBLE local_time(DOUBLE time, DateInstance *date) +{ + return time - (daylight_saving_ta(time, date)+date->bias)*MS_PER_MINUTE; +} + +/* ECMA-262 3rd Edition 15.9.1.9 */ +static inline DOUBLE utc(DOUBLE time, DateInstance *date) +{ + time += date->bias * MS_PER_MINUTE; + return time + daylight_saving_ta(time, date)*MS_PER_MINUTE; +} + +/* ECMA-262 3rd Edition 15.9.1.10 */ static inline DOUBLE hour_from_time(DOUBLE time) { DOUBLE ret; @@ -235,7 +356,7 @@ return ret; } -/* ECMA-262 3th Edition 15.9.1.10 */ +/* ECMA-262 3rd Edition 15.9.1.10 */ static inline DOUBLE min_from_time(DOUBLE time) { DOUBLE ret; @@ -249,7 +370,7 @@ return ret; } -/* ECMA-262 3th Edition 15.9.1.10 */ +/* ECMA-262 3rd Edition 15.9.1.10 */ static inline DOUBLE sec_from_time(DOUBLE time) { DOUBLE ret; @@ -263,7 +384,7 @@ return ret; } -/* ECMA-262 3th Edition 15.9.1.10 */ +/* ECMA-262 3rd Edition 15.9.1.10 */ static inline DOUBLE ms_from_time(DOUBLE time) { DOUBLE ret; @@ -277,6 +398,36 @@ return ret; } +/* ECMA-262 3rd Edition 15.9.1.11 */ +static inline DOUBLE make_time(DOUBLE hour, DOUBLE min, DOUBLE sec, DOUBLE ms) +{ + return hour*MS_PER_HOUR + min*MS_PER_MINUTE + sec*1000 + ms; +} + +/* ECMA-262 3rd Edition 15.9.1.12 */ +static inline DOUBLE make_day(DOUBLE year, DOUBLE month, DOUBLE day) +{ + DOUBLE time; + + year += floor(month/12); + + month = fmod(month, 12); + if(month<0) month += 12; + + time = time_from_year(year); + + day += floor(time / MS_PER_DAY); + day += day_from_month(month, in_leap_year(time)); + + return day-1; +} + +/* ECMA-262 3rd Edition 15.9.1.13 */ +static inline DOUBLE make_date(DOUBLE day, DOUBLE time) +{ + return day*MS_PER_DAY + time; +} + /* ECMA-262 3rd Edition 15.9.1.14 */ static inline DOUBLE time_clip(DOUBLE time) { @@ -287,81 +438,609 @@ return floor(time); } +static SYSTEMTIME create_systemtime(DOUBLE time) +{ + SYSTEMTIME st; + + st.wYear = year_from_time(time); + st.wMonth = month_from_time(time) + 1; + st.wDayOfWeek = week_day(time); + st.wDay = date_from_time(time); + st.wHour = hour_from_time(time); + st.wMinute = min_from_time(time); + st.wSecond = sec_from_time(time); + st.wMilliseconds = ms_from_time(time); + + return st; +} + +/* ECMA-262 3rd Edition 15.9.1.2 */ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + static const WCHAR NaNW[] = { 'N','a','N',0 }; + static const WCHAR formatW[] = { '%','s',' ','%','s',' ','%','d',' ', + '%','0','2','d',':','%','0','2','d',':','%','0','2','d',' ', + 'U','T','C','%','c','%','0','2','d','%','0','2','d',' ','%','d','%','s',0 }; + static const WCHAR formatUTCW[] = { '%','s',' ','%','s',' ','%','d',' ', + '%','0','2','d',':','%','0','2','d',':','%','0','2','d',' ', + 'U','T','C',' ','%','d','%','s',0 }; + static const WCHAR ADW[] = { 0 }; + static const WCHAR BCW[] = { ' ','B','.','C','.',0 }; + + static const DWORD week_ids[] = { LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1, + LOCALE_SABBREVDAYNAME2, LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, + LOCALE_SABBREVDAYNAME5, LOCALE_SABBREVDAYNAME6 }; + static const DWORD month_ids[] = { LOCALE_SABBREVMONTHNAME1, LOCALE_SABBREVMONTHNAME2, + LOCALE_SABBREVMONTHNAME3, LOCALE_SABBREVMONTHNAME4, + LOCALE_SABBREVMONTHNAME5, LOCALE_SABBREVMONTHNAME6, + LOCALE_SABBREVMONTHNAME7, LOCALE_SABBREVMONTHNAME8, + LOCALE_SABBREVMONTHNAME9, LOCALE_SABBREVMONTHNAME10, + LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 }; + + BOOL formatAD = TRUE; + BSTR week, month; + DateInstance *date; + BSTR date_str; + DOUBLE time; + int len, size, year, day, offset; + DWORD lcid_en, week_id, month_id; + WCHAR sign = '-'; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + date = (DateInstance*)dispex; + + if(isnan(date->time)) { + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(NaNW); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + return S_OK; + } + + time = local_time(date->time, date); + + if(retv) { + len = 21; + + lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); + + week_id = week_ids[(int)week_day(time)]; + size = GetLocaleInfoW(lcid_en, week_id, NULL, 0); + week = SysAllocStringLen(NULL, size); + if(!week) + return E_OUTOFMEMORY; + GetLocaleInfoW(lcid_en, week_id, week, size); + len += size-1; + + month_id = month_ids[(int)month_from_time(time)]; + size = GetLocaleInfoW(lcid_en, month_id, NULL, 0); + month = SysAllocStringLen(NULL, size); + if(!month) { + SysFreeString(week); + return E_OUTOFMEMORY; + } + GetLocaleInfoW(lcid_en, month_id, month, size); + len += size-1; + + year = year_from_time(time); + if(year<0) + year = -year+1; + do { + year /= 10; + len++; + } while(year); + + year = year_from_time(time); + if(year<0) { + formatAD = FALSE; + year = -year+1; + len += 5; + } + + day = date_from_time(time); + do { + day /= 10; + len++; + } while(day); + day = date_from_time(time); + + offset = date->bias + + daylight_saving_ta(time, date); + + if(offset == 0) len -= 5; + else if(offset < 0) { + sign = '+'; + offset = -offset; + } + + date_str = SysAllocStringLen(NULL, len); + if(!date_str) { + SysFreeString(week); + SysFreeString(month); + return E_OUTOFMEMORY; + } + + if(offset) + sprintfW(date_str, formatW, week, month, day, + (int)hour_from_time(time), (int)min_from_time(time), + (int)sec_from_time(time), sign, offset/60, offset%60, + year, formatAD?ADW:BCW); + else + sprintfW(date_str, formatUTCW, week, month, day, + (int)hour_from_time(time), (int)min_from_time(time), + (int)sec_from_time(time), year, formatAD?ADW:BCW); + + SysFreeString(week); + SysFreeString(month); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = date_str; + } + return S_OK; +} + +/* ECMA-262 3rd Edition 15.9.1.5 */ +static HRESULT Date_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + static const WCHAR NaNW[] = { 'N','a','N',0 }; + SYSTEMTIME st; + DateInstance *date; + BSTR date_str; + int date_len, time_len; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + date = (DateInstance*)dispex; + + if(isnan(date->time)) { + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(NaNW); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + return S_OK; + } + + st = create_systemtime(local_time(date->time, date)); + + if(st.wYear<1601 || st.wYear>9999) + return Date_toString(dispex, lcid, flags, dp, retv, ei, caller); + + if(retv) { + date_len = GetDateFormatW(lcid, DATE_LONGDATE, &st, NULL, NULL, 0); + time_len = GetTimeFormatW(lcid, 0, &st, NULL, NULL, 0); + date_str = SysAllocStringLen(NULL, date_len+time_len-1); + if(!date_str) + return E_OUTOFMEMORY; + GetDateFormatW(lcid, DATE_LONGDATE, &st, NULL, date_str, date_len); + GetTimeFormatW(lcid, 0, &st, NULL, &date_str[date_len], time_len); + date_str[date_len-1] = ' '; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = date_str; + } + return S_OK; +} + +static HRESULT Date_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT Date_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_propertyIsEnumerable(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT Date_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT Date_propertyIsEnumerable(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT Date_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Date_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) -{ - FIXME("\n"); - return E_NOTIMPL; -} - +/* ECMA-262 3rd Edition 15.9.5.42 */ static HRESULT Date_toUTCString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; -} - + static const WCHAR NaNW[] = { 'N','a','N',0 }; + static const WCHAR formatADW[] = { '%','s',',',' ','%','d',' ','%','s',' ','%','d',' ', + '%','0','2','d',':','%','0','2','d',':','%','0','2','d',' ','U','T','C',0 }; + static const WCHAR formatBCW[] = { '%','s',',',' ','%','d',' ','%','s',' ','%','d',' ','B','.','C','.',' ', + '%','0','2','d',':','%','0','2','d',':','%','0','2','d',' ','U','T','C',0 }; + + static const DWORD week_ids[] = { LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1, + LOCALE_SABBREVDAYNAME2, LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, + LOCALE_SABBREVDAYNAME5, LOCALE_SABBREVDAYNAME6 }; + static const DWORD month_ids[] = { LOCALE_SABBREVMONTHNAME1, LOCALE_SABBREVMONTHNAME2, + LOCALE_SABBREVMONTHNAME3, LOCALE_SABBREVMONTHNAME4, + LOCALE_SABBREVMONTHNAME5, LOCALE_SABBREVMONTHNAME6, + LOCALE_SABBREVMONTHNAME7, LOCALE_SABBREVMONTHNAME8, + LOCALE_SABBREVMONTHNAME9, LOCALE_SABBREVMONTHNAME10, + LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 }; + + BOOL formatAD = TRUE; + BSTR week, month; + DateInstance *date; + BSTR date_str; + int len, size, year, day; + DWORD lcid_en, week_id, month_id; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + date = (DateInstance*)dispex; + + if(isnan(date->time)) { + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(NaNW); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + return S_OK; + } + + if(retv) { + len = 17; + + lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); + + week_id = week_ids[(int)week_day(date->time)]; + size = GetLocaleInfoW(lcid_en, week_id, NULL, 0); + week = SysAllocStringLen(NULL, size); + if(!week) + return E_OUTOFMEMORY; + GetLocaleInfoW(lcid_en, week_id, week, size); + len += size-1; + + month_id = month_ids[(int)month_from_time(date->time)]; + size = GetLocaleInfoW(lcid_en, month_id, NULL, 0); + month = SysAllocStringLen(NULL, size); + if(!month) { + SysFreeString(week); + return E_OUTOFMEMORY; + } + GetLocaleInfoW(lcid_en, month_id, month, size); + len += size-1; + + year = year_from_time(date->time); + if(year<0) + year = -year+1; + do { + year /= 10; + len++; + } while(year); + + year = year_from_time(date->time); + if(year<0) { + formatAD = FALSE; + year = -year+1; + len += 5; + } + + day = date_from_time(date->time); + do { + day /= 10; + len++; + } while(day); + day = date_from_time(date->time); + + date_str = SysAllocStringLen(NULL, len); + if(!date_str) { + SysFreeString(week); + SysFreeString(month); + return E_OUTOFMEMORY; + } + sprintfW(date_str, formatAD?formatADW:formatBCW, week, day, month, year, + (int)hour_from_time(date->time), (int)min_from_time(date->time), + (int)sec_from_time(date->time)); + + SysFreeString(week); + SysFreeString(month); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = date_str; + } + return S_OK; +} + +/* ECMA-262 3rd Edition 15.9.5.3 */ static HRESULT Date_toDateString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; -} - + static const WCHAR NaNW[] = { 'N','a','N',0 }; + static const WCHAR formatADW[] = { '%','s',' ','%','s',' ','%','d',' ','%','d',0 }; + static const WCHAR formatBCW[] = { '%','s',' ','%','s',' ','%','d',' ','%','d',' ','B','.','C','.',0 }; + + static const DWORD week_ids[] = { LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1, + LOCALE_SABBREVDAYNAME2, LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, + LOCALE_SABBREVDAYNAME5, LOCALE_SABBREVDAYNAME6 }; + static const DWORD month_ids[] = { LOCALE_SABBREVMONTHNAME1, LOCALE_SABBREVMONTHNAME2, + LOCALE_SABBREVMONTHNAME3, LOCALE_SABBREVMONTHNAME4, + LOCALE_SABBREVMONTHNAME5, LOCALE_SABBREVMONTHNAME6, + LOCALE_SABBREVMONTHNAME7, LOCALE_SABBREVMONTHNAME8, + LOCALE_SABBREVMONTHNAME9, LOCALE_SABBREVMONTHNAME10, + LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 }; + + BOOL formatAD = TRUE; + BSTR week, month; + DateInstance *date; + BSTR date_str; + DOUBLE time; + int len, size, year, day; + DWORD lcid_en, week_id, month_id; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + date = (DateInstance*)dispex; + + if(isnan(date->time)) { + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(NaNW); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + return S_OK; + } + + time = local_time(date->time, date); + + if(retv) { + len = 5; + + lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); + + week_id = week_ids[(int)week_day(time)]; + size = GetLocaleInfoW(lcid_en, week_id, NULL, 0); + week = SysAllocStringLen(NULL, size); + if(!week) + return E_OUTOFMEMORY; + GetLocaleInfoW(lcid_en, week_id, week, size); + len += size-1; + + month_id = month_ids[(int)month_from_time(time)]; + size = GetLocaleInfoW(lcid_en, month_id, NULL, 0); + month = SysAllocStringLen(NULL, size); + if(!month) { + SysFreeString(week); + return E_OUTOFMEMORY; + } + GetLocaleInfoW(lcid_en, month_id, month, size); + len += size-1; + + year = year_from_time(time); + if(year<0) + year = -year+1; + do { + year /= 10; + len++; + } while(year); + + year = year_from_time(time); + if(year<0) { + formatAD = FALSE; + year = -year+1; + len += 5; + } + + day = date_from_time(time); + do { + day /= 10; + len++; + } while(day); + day = date_from_time(time); + + date_str = SysAllocStringLen(NULL, len); + if(!date_str) { + SysFreeString(week); + SysFreeString(month); + return E_OUTOFMEMORY; + } + sprintfW(date_str, formatAD?formatADW:formatBCW, week, month, day, year); + + SysFreeString(week); + SysFreeString(month); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = date_str; + } + return S_OK; +} + +/* ECMA-262 3rd Edition 15.9.5.4 */ static HRESULT Date_toTimeString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; -} - + static const WCHAR NaNW[] = { 'N','a','N',0 }; + static const WCHAR formatW[] = { '%','0','2','d',':','%','0','2','d',':','%','0','2','d', + ' ','U','T','C','%','c','%','0','2','d','%','0','2','d',0 }; + static const WCHAR formatUTCW[] = { '%','0','2','d',':','%','0','2','d', + ':','%','0','2','d',' ','U','T','C',0 }; + DateInstance *date; + BSTR date_str; + DOUBLE time; + WCHAR sign; + int offset; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + date = (DateInstance*)dispex; + + if(isnan(date->time)) { + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(NaNW); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + return S_OK; + } + + time = local_time(date->time, date); + + if(retv) { + date_str = SysAllocStringLen(NULL, 17); + if(!date_str) + return E_OUTOFMEMORY; + + offset = date->bias + + daylight_saving_ta(time, date); + + if(offset < 0) { + sign = '+'; + offset = -offset; + } + else sign = '-'; + + if(offset) + sprintfW(date_str, formatW, (int)hour_from_time(time), + (int)min_from_time(time), (int)sec_from_time(time), + sign, offset/60, offset%60); + else + sprintfW(date_str, formatUTCW, (int)hour_from_time(time), + (int)min_from_time(time), (int)sec_from_time(time)); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = date_str; + } + return S_OK; +} + +/* ECMA-262 3rd Edition 15.9.5.6 */ static HRESULT Date_toLocaleDateString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; -} - + static const WCHAR NaNW[] = { 'N','a','N',0 }; + SYSTEMTIME st; + DateInstance *date; + BSTR date_str; + int len; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + date = (DateInstance*)dispex; + + if(isnan(date->time)) { + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(NaNW); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + return S_OK; + } + + st = create_systemtime(local_time(date->time, date)); + + if(st.wYear<1601 || st.wYear>9999) + return Date_toDateString(dispex, lcid, flags, dp, retv, ei, caller); + + if(retv) { + len = GetDateFormatW(lcid, DATE_LONGDATE, &st, NULL, NULL, 0); + date_str = SysAllocStringLen(NULL, len); + if(!date_str) + return E_OUTOFMEMORY; + GetDateFormatW(lcid, DATE_LONGDATE, &st, NULL, date_str, len); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = date_str; + } + return S_OK; +} + +/* ECMA-262 3rd Edition 15.9.5.7 */ static HRESULT Date_toLocaleTimeString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR NaNW[] = { 'N','a','N',0 }; + SYSTEMTIME st; + DateInstance *date; + BSTR date_str; + int len; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + date = (DateInstance*)dispex; + + if(isnan(date->time)) { + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(NaNW); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + return S_OK; + } + + st = create_systemtime(local_time(date->time, date)); + + if(st.wYear<1601 || st.wYear>9999) + return Date_toTimeString(dispex, lcid, flags, dp, retv, ei, caller); + + if(retv) { + len = GetTimeFormatW(lcid, 0, &st, NULL, NULL, 0); + date_str = SysAllocStringLen(NULL, len); + if(!date_str) + return E_OUTOFMEMORY; + GetTimeFormatW(lcid, 0, &st, NULL, date_str, len); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = date_str; + } + return S_OK; } /* ECMA-262 3rd Edition 15.9.5.9 */ @@ -382,7 +1061,7 @@ return S_OK; } -/* ECMA-262 3th Edition 15.9.1.3 */ +/* ECMA-262 3rd Edition 15.9.5.10 */ static HRESULT Date_getFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -395,14 +1074,14 @@ if(retv) { DateInstance *date = (DateInstance*)dispex; - DOUBLE time = date->time - date->bias*MS_PER_MINUTE; + DOUBLE time = local_time(date->time, date); num_set_val(retv, year_from_time(time)); } return S_OK; } -/* ECMA-262 3th Edition 15.9.1.3 */ +/* ECMA-262 3rd Edition 15.9.5.11 */ static HRESULT Date_getUTCFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -420,7 +1099,7 @@ return S_OK; } -/* ECMA-262 3th Edition 15.9.1.4 */ +/* ECMA-262 3rd Edition 15.9.5.12 */ static HRESULT Date_getMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -433,14 +1112,14 @@ if(retv) { DateInstance *date = (DateInstance*)dispex; - DOUBLE time = date->time - date->bias*MS_PER_MINUTE; + DOUBLE time = local_time(date->time, date); num_set_val(retv, month_from_time(time)); } return S_OK; } -/* ECMA-262 3th Edition 15.9.1.4 */ +/* ECMA-262 3rd Edition 15.9.5.13 */ static HRESULT Date_getUTCMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -458,7 +1137,7 @@ return S_OK; } -/* ECMA-262 3th Edition 15.9.1.5 */ +/* ECMA-262 3rd Edition 15.9.5.14 */ static HRESULT Date_getDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -471,14 +1150,14 @@ if(retv) { DateInstance *date = (DateInstance*)dispex; - DOUBLE time = date->time - date->bias*MS_PER_MINUTE; + DOUBLE time = local_time(date->time, date); num_set_val(retv, date_from_time(time)); } return S_OK; } -/* ECMA-262 3th Edition 15.9.1.5 */ +/* ECMA-262 3rd Edition 15.9.5.15 */ static HRESULT Date_getUTCDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -496,7 +1175,7 @@ return S_OK; } -/* ECMA-262 3th Edition 15.9.1.6 */ +/* ECMA-262 3rd Edition 15.9.5.16 */ static HRESULT Date_getDay(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -509,14 +1188,14 @@ if(retv) { DateInstance *date = (DateInstance*)dispex; - DOUBLE time = date->time - date->bias*MS_PER_MINUTE; + DOUBLE time = local_time(date->time, date); num_set_val(retv, week_day(time)); } return S_OK; } -/* ECMA-262 3th Edition 15.9.1.6 */ +/* ECMA-262 3rd Edition 15.9.5.17 */ static HRESULT Date_getUTCDay(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -534,7 +1213,7 @@ return S_OK; } -/* ECMA-262 3th Edition 15.9.1.10 */ +/* ECMA-262 3rd Edition 15.9.5.18 */ static HRESULT Date_getHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -547,14 +1226,14 @@ if(retv) { DateInstance *date = (DateInstance*)dispex; - DOUBLE time = date->time - date->bias*MS_PER_MINUTE; + DOUBLE time = local_time(date->time, date); num_set_val(retv, hour_from_time(time)); } return S_OK; } -/* ECMA-262 3th Edition 15.9.1.10 */ +/* ECMA-262 3rd Edition 15.9.5.19 */ static HRESULT Date_getUTCHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -572,7 +1251,7 @@ return S_OK; } -/* ECMA-262 3th Edition 15.9.1.10 */ +/* ECMA-262 3rd Edition 15.9.5.20 */ static HRESULT Date_getMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -585,14 +1264,14 @@ if(retv) { DateInstance *date = (DateInstance*)dispex; - DOUBLE time = date->time - date->bias*MS_PER_MINUTE; + DOUBLE time = local_time(date->time, date); num_set_val(retv, min_from_time(time)); } return S_OK; } -/* ECMA-262 3th Edition 15.9.1.10 */ +/* ECMA-262 3rd Edition 15.9.5.21 */ static HRESULT Date_getUTCMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -610,7 +1289,7 @@ return S_OK; } -/* ECMA-262 3th Edition 15.9.1.10 */ +/* ECMA-262 3rd Edition 15.9.5.22 */ static HRESULT Date_getSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -623,14 +1302,14 @@ if(retv) { DateInstance *date = (DateInstance*)dispex; - DOUBLE time = date->time - date->bias*MS_PER_MINUTE; + DOUBLE time = local_time(date->time, date); num_set_val(retv, sec_from_time(time)); } return S_OK; } -/* ECMA-262 3th Edition 15.9.1.10 */ +/* ECMA-262 3rd Edition 15.9.5.23 */ static HRESULT Date_getUTCSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -648,7 +1327,7 @@ return S_OK; } -/* ECMA-262 3th Edition 15.9.1.10 */ +/* ECMA-262 3rd Edition 15.9.5.24 */ static HRESULT Date_getMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -661,14 +1340,14 @@ if(retv) { DateInstance *date = (DateInstance*)dispex; - DOUBLE time = date->time - date->bias*MS_PER_MINUTE; + DOUBLE time = local_time(date->time, date); num_set_val(retv, ms_from_time(time)); } return S_OK; } -/* ECMA-262 3th Edition 15.9.1.10 */ +/* ECMA-262 3rd Edition 15.9.5.25 */ static HRESULT Date_getUTCMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -686,13 +1365,26 @@ return S_OK; } +/* ECMA-262 3rd Edition 15.9.5.26 */ static HRESULT Date_getTimezoneOffset(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; -} - + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + DateInstance *date = (DateInstance*)dispex; + num_set_val(retv, floor( + (date->time-local_time(date->time, date))/MS_PER_MINUTE)); + } + return S_OK; +} + +/* ECMA-262 3rd Edition 15.9.5.27 */ static HRESULT Date_setTime(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -726,12 +1418,14 @@ return S_OK; } +/* ECMA-262 3rd Edition 15.9.5.28 */ static HRESULT Date_setMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; HRESULT hres; DateInstance *date; + DOUBLE t; TRACE("\n"); @@ -751,7 +1445,10 @@ return hres; date = (DateInstance*)dispex; - date->time = time_clip(date->time - ms_from_time(date->time) + num_val(&v)); + t = local_time(date->time, date); + t = make_date(day(t), make_time(hour_from_time(t), min_from_time(t), + sec_from_time(t), num_val(&v))); + date->time = time_clip(utc(t, date)); if(retv) num_set_val(retv, date->time); @@ -759,18 +1456,14 @@ return S_OK; } +/* ECMA-262 3rd Edition 15.9.5.29 */ static HRESULT Date_setUTCMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) -{ - return Date_setMilliseconds(dispex, lcid, flags, dp, retv, ei, caller); -} - -static HRESULT Date_setSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; HRESULT hres; DateInstance *date; + DOUBLE t; TRACE("\n"); @@ -790,7 +1483,10 @@ return hres; date = (DateInstance*)dispex; - date->time = time_clip(date->time - (sec_from_time(date->time) - num_val(&v))*1000.0); + t = date->time; + t = make_date(day(t), make_time(hour_from_time(t), min_from_time(t), + sec_from_time(t), num_val(&v))); + date->time = time_clip(t); if(retv) num_set_val(retv, date->time); @@ -798,18 +1494,14 @@ return S_OK; } -static HRESULT Date_setUTCSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) -{ - return Date_setSeconds(dispex, lcid, flags, dp, retv, ei, caller); -} - -static HRESULT Date_setMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +/* ECMA-262 3rd Edition 15.9.5.30 */ +static HRESULT Date_setSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; HRESULT hres; DateInstance *date; + DOUBLE t, sec, ms; TRACE("\n"); @@ -824,12 +1516,25 @@ return S_OK; } + date = (DateInstance*)dispex; + t = local_time(date->time, date); + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) return hres; - - date = (DateInstance*)dispex; - date->time = time_clip(date->time - (min_from_time(date->time) - num_val(&v))*MS_PER_MINUTE); + sec = num_val(&v); + + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + ms = num_val(&v); + } + else ms = ms_from_time(t); + + t = make_date(day(t), make_time(hour_from_time(t), + min_from_time(t), sec, ms)); + date->time = time_clip(utc(t, date)); if(retv) num_set_val(retv, date->time); @@ -837,18 +1542,14 @@ return S_OK; } -static HRESULT Date_setUTCMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) -{ - return Date_setMinutes(dispex, lcid, flags, dp, retv, ei, caller); -} - -static HRESULT Date_setHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +/* ECMA-262 3rd Edition 15.9.5.31 */ +static HRESULT Date_setUTCSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; HRESULT hres; DateInstance *date; + DOUBLE t, sec, ms; TRACE("\n"); @@ -863,14 +1564,25 @@ return S_OK; } + date = (DateInstance*)dispex; + t = date->time; + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) return hres; - - date = (DateInstance*)dispex; - date->time = time_clip(date->time - - (hour_from_time(date->time - date->bias*MS_PER_MINUTE) - - num_val(&v))*MS_PER_HOUR); + sec = num_val(&v); + + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + ms = num_val(&v); + } + else ms = ms_from_time(t); + + t = make_date(day(t), make_time(hour_from_time(t), + min_from_time(t), sec, ms)); + date->time = time_clip(t); if(retv) num_set_val(retv, date->time); @@ -878,12 +1590,14 @@ return S_OK; } -static HRESULT Date_setUTCHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +/* ECMA-262 3rd Edition 15.9.5.33 */ +static HRESULT Date_setMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; HRESULT hres; DateInstance *date; + DOUBLE t, min, sec, ms; TRACE("\n"); @@ -898,13 +1612,33 @@ return S_OK; } + date = (DateInstance*)dispex; + t = local_time(date->time, date); + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) return hres; - - date = (DateInstance*)dispex; - date->time = time_clip(date->time - - (hour_from_time(date->time) - num_val(&v))*MS_PER_HOUR); + min = num_val(&v); + + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + sec = num_val(&v); + } + else sec = sec_from_time(t); + + if(arg_cnt(dp) > 2) { + hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &v); + if(FAILED(hres)) + return hres; + ms = num_val(&v); + } + else ms = ms_from_time(t); + + t = make_date(day(t), make_time(hour_from_time(t), + min, sec, ms)); + date->time = time_clip(utc(t, date)); if(retv) num_set_val(retv, date->time); @@ -912,46 +1646,468 @@ return S_OK; } +/* ECMA-262 3rd Edition 15.9.5.34 */ +static HRESULT Date_setUTCMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + VARIANT v; + HRESULT hres; + DateInstance *date; + DOUBLE t, min, sec, ms; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + FIXME("throw ArgumentNotOptional\n"); + if(retv) num_set_nan(retv); + return S_OK; + } + + date = (DateInstance*)dispex; + t = date->time; + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + min = num_val(&v); + + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + sec = num_val(&v); + } + else sec = sec_from_time(t); + + if(arg_cnt(dp) > 2) { + hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &v); + if(FAILED(hres)) + return hres; + ms = num_val(&v); + } + else ms = ms_from_time(t); + + t = make_date(day(t), make_time(hour_from_time(t), + min, sec, ms)); + date->time = time_clip(t); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; +} + +/* ECMA-262 3rd Edition 15.9.5.35 */ +static HRESULT Date_setHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + VARIANT v; + HRESULT hres; + DateInstance *date; + DOUBLE t, hour, min, sec, ms; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + FIXME("throw ArgumentNotOptional\n"); + if(retv) num_set_nan(retv); + return S_OK; + } + + date = (DateInstance*)dispex; + t = local_time(date->time, date); + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + hour = num_val(&v); + + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + min = num_val(&v); + } + else min = min_from_time(t); + + if(arg_cnt(dp) > 2) { + hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &v); + if(FAILED(hres)) + return hres; + sec = num_val(&v); + } + else sec = sec_from_time(t); + + if(arg_cnt(dp) > 3) { + hres = to_number(dispex->ctx, get_arg(dp, 3), ei, &v); + if(FAILED(hres)) + return hres; + ms = num_val(&v); + } + else ms = ms_from_time(t); + + t = make_date(day(t), make_time(hour, min, sec, ms)); + date->time = time_clip(utc(t, date)); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; +} + +/* ECMA-262 3rd Edition 15.9.5.36 */ +static HRESULT Date_setUTCHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + VARIANT v; + HRESULT hres; + DateInstance *date; + DOUBLE t, hour, min, sec, ms; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + FIXME("throw ArgumentNotOptional\n"); + if(retv) num_set_nan(retv); + return S_OK; + } + + date = (DateInstance*)dispex; + t = date->time; + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + hour = num_val(&v); + + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + min = num_val(&v); + } + else min = min_from_time(t); + + if(arg_cnt(dp) > 2) { + hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &v); + if(FAILED(hres)) + return hres; + sec = num_val(&v); + } + else sec = sec_from_time(t); + + if(arg_cnt(dp) > 3) { + hres = to_number(dispex->ctx, get_arg(dp, 3), ei, &v); + if(FAILED(hres)) + return hres; + ms = num_val(&v); + } + else ms = ms_from_time(t); + + t = make_date(day(t), make_time(hour, min, sec, ms)); + date->time = time_clip(t); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; +} + +/* ECMA-262 3rd Edition 15.9.5.36 */ static HRESULT Date_setDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; -} - + VARIANT v; + HRESULT hres; + DateInstance *date; + DOUBLE t; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + FIXME("throw ArgumentNotOptional\n"); + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + date = (DateInstance*)dispex; + t = local_time(date->time, date); + t = make_date(make_day(year_from_time(t), month_from_time(t), + num_val(&v)), time_within_day(t)); + date->time = time_clip(utc(t, date)); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; +} + +/* ECMA-262 3rd Edition 15.9.5.37 */ static HRESULT Date_setUTCDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; -} - + VARIANT v; + HRESULT hres; + DateInstance *date; + DOUBLE t; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + FIXME("throw ArgumentNotOptional\n"); + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + date = (DateInstance*)dispex; + t = date->time; + t = make_date(make_day(year_from_time(t), month_from_time(t), + num_val(&v)), time_within_day(t)); + date->time = time_clip(t); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; +} + +/* ECMA-262 3rd Edition 15.9.5.38 */ static HRESULT Date_setMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; -} - + VARIANT v; + HRESULT hres; + DateInstance *date; + DOUBLE t, month, ddate; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + FIXME("throw ArgumentNotOptional\n"); + if(retv) num_set_nan(retv); + return S_OK; + } + + date = (DateInstance*)dispex; + t = local_time(date->time, date); + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + month = num_val(&v); + + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + ddate = num_val(&v); + } + else ddate = date_from_time(t); + + t = make_date(make_day(year_from_time(t), month, ddate), + time_within_day(t)); + date->time = time_clip(utc(t, date)); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; +} + +/* ECMA-262 3rd Edition 15.9.5.39 */ static HRESULT Date_setUTCMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; -} - + VARIANT v; + HRESULT hres; + DateInstance *date; + DOUBLE t, month, ddate; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + FIXME("throw ArgumentNotOptional\n"); + if(retv) num_set_nan(retv); + return S_OK; + } + + date = (DateInstance*)dispex; + t = date->time; + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + month = num_val(&v); + + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + ddate = num_val(&v); + } + else ddate = date_from_time(t); + + t = make_date(make_day(year_from_time(t), month, ddate), + time_within_day(t)); + date->time = time_clip(t); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; +} + +/* ECMA-262 3rd Edition 15.9.5.40 */ static HRESULT Date_setFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; -} - + VARIANT v; + HRESULT hres; + DateInstance *date; + DOUBLE t, year, month, ddate; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + FIXME("throw ArgumentNotOptional\n"); + if(retv) num_set_nan(retv); + return S_OK; + } + + date = (DateInstance*)dispex; + t = local_time(date->time, date); + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + year = num_val(&v); + + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + month = num_val(&v); + } + else month = month_from_time(t); + + if(arg_cnt(dp) > 2) { + hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &v); + if(FAILED(hres)) + return hres; + ddate = num_val(&v); + } + else ddate = date_from_time(t); + + t = make_date(make_day(year, month, ddate), time_within_day(t)); + date->time = time_clip(utc(t, date)); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; +} + +/* ECMA-262 3rd Edition 15.9.5.41 */ static HRESULT Date_setUTCFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + DateInstance *date; + DOUBLE t, year, month, ddate; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + FIXME("throw ArgumentNotOptional\n"); + if(retv) num_set_nan(retv); + return S_OK; + } + + date = (DateInstance*)dispex; + t = date->time; + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + year = num_val(&v); + + if(arg_cnt(dp) > 1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + month = num_val(&v); + } + else month = month_from_time(t); + + if(arg_cnt(dp) > 2) { + hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &v); + if(FAILED(hres)) + return hres; + ddate = num_val(&v); + } + else ddate = date_from_time(t); + + t = make_date(make_day(year, month, ddate), time_within_day(t)); + date->time = time_clip(t); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; } static HRESULT Date_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -1040,8 +2196,110 @@ date->time = time; date->bias = tzi.Bias; + date->standardDate = tzi.StandardDate; + date->standardBias = tzi.StandardBias; + date->daylightDate = tzi.DaylightDate; + date->daylightBias = tzi.DaylightBias; *ret = &date->dispex; + return S_OK; +} + +static HRESULT DateConstr_parse(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT DateConstr_UTC(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + VARIANT year, month, vdate, hours, minutes, seconds, ms; + DOUBLE y; + int arg_no = arg_cnt(dp); + HRESULT hres; + + TRACE("\n"); + + if(arg_no>0) { + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &year); + if(FAILED(hres)) + return hres; + y = num_val(&year); + if(0<=y && y<=99) + y += 1900; + } + else y = 1900; + + if(arg_no>1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &month); + if(FAILED(hres)) + return hres; + } + else { + V_VT(&month) = VT_R8; + V_R8(&month) = 0; + } + + if(arg_no>2) { + hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &vdate); + if(FAILED(hres)) + return hres; + } + else { + V_VT(&vdate) = VT_R8; + V_R8(&vdate) = 1; + } + + if(arg_no>3) { + hres = to_number(dispex->ctx, get_arg(dp, 3), ei, &hours); + if(FAILED(hres)) + return hres; + } + else { + V_VT(&hours) = VT_R8; + V_R8(&hours) = 0; + } + + if(arg_no>4) { + hres = to_number(dispex->ctx, get_arg(dp, 4), ei, &minutes); + if(FAILED(hres)) + return hres; + } + else { + V_VT(&minutes) = VT_R8; + V_R8(&minutes) = 0; + } + + if(arg_no>5) { + hres = to_number(dispex->ctx, get_arg(dp, 5), ei, &seconds); + if(FAILED(hres)) + return hres; + } + else { + V_VT(&seconds) = VT_R8; + V_R8(&seconds) = 0; + } + + if(arg_no>6) { + hres = to_number(dispex->ctx, get_arg(dp, 6), ei, &ms); + if(FAILED(hres)) + return hres; + } + else { + V_VT(&ms) = VT_R8; + V_R8(&ms) = 0; + } + + if(retv) { + V_VT(retv) = VT_R8; + V_R8(retv) = time_clip(make_date( + make_day(y, num_val(&month), num_val(&vdate)), + make_time(num_val(&hours), num_val(&minutes), + num_val(&seconds), num_val(&ms)))); + } + return S_OK; } @@ -1095,9 +2353,20 @@ break; } - default: - FIXME("unimplemented argcnt %d\n", arg_cnt(dp)); - return E_NOTIMPL; + /* ECMA-262 3rd Edition 15.9.3.1 */ + default: { + VARIANT ret_date; + DateInstance *di; + + DateConstr_UTC(dispex, lcid, flags, dp, &ret_date, ei, sp); + + hres = create_date(dispex->ctx, TRUE, num_val(&ret_date), &date); + if(FAILED(hres)) + return hres; + + di = (DateInstance*)date; + di->time = utc(di->time, di); + } } V_VT(retv) = VT_DISPATCH; @@ -1112,6 +2381,20 @@ return S_OK; } +static const builtin_prop_t DateConstr_props[] = { + {UTCW, DateConstr_UTC, PROPF_METHOD}, + {parseW, DateConstr_parse, PROPF_METHOD} +}; + +static const builtin_info_t DateConstr_info = { + JSCLASS_FUNCTION, + {NULL, Function_value, 0}, + sizeof(DateConstr_props)/sizeof(*DateConstr_props), + DateConstr_props, + NULL, + NULL +}; + HRESULT create_date_constr(script_ctx_t *ctx, DispatchEx **ret) { DispatchEx *date; @@ -1121,7 +2404,7 @@ if(FAILED(hres)) return hres; - hres = create_builtin_function(ctx, DateConstr_value, PROPF_CONSTR, date, ret); + hres = create_builtin_function(ctx, DateConstr_value, &DateConstr_info, PROPF_CONSTR, date, ret); jsdisp_release(date); return hres; Modified: trunk/reactos/dll/win32/jscript/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/dispex.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/dispex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/dispex.c [iso-8859-1] Sat Jul 4 15:49:53 2009 @@ -293,7 +293,7 @@ case PROP_BUILTIN: if(prop->u.p->flags & PROPF_METHOD) { DispatchEx *obj; - hres = create_builtin_function(This->ctx, prop->u.p->invoke, prop->u.p->flags, NULL, &obj); + hres = create_builtin_function(This->ctx, prop->u.p->invoke, NULL, prop->u.p->flags, NULL, &obj); if(FAILED(hres)) break; Modified: trunk/reactos/dll/win32/jscript/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/function… ============================================================================== --- trunk/reactos/dll/win32/jscript/function.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/function.c [iso-8859-1] Sat Jul 4 15:49:53 2009 @@ -341,7 +341,7 @@ return E_NOTIMPL; } -static HRESULT Function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +HRESULT Function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { FunctionInstance *function; @@ -435,7 +435,8 @@ return E_NOTIMPL; } -static HRESULT create_function(script_ctx_t *ctx, DWORD flags, BOOL funcprot, DispatchEx *prototype, FunctionInstance **ret) +static HRESULT create_function(script_ctx_t *ctx, const builtin_info_t *builtin_info, DWORD flags, + BOOL funcprot, DispatchEx *prototype, FunctionInstance **ret) { FunctionInstance *function; HRESULT hres; @@ -446,6 +447,8 @@ if(funcprot) hres = init_dispex(&function->dispex, ctx, &Function_info, prototype); + else if(builtin_info) + hres = init_dispex_from_constr(&function->dispex, ctx, builtin_info, ctx->function_constr); else hres = init_dispex_from_constr(&function->dispex, ctx, &Function_info, ctx->function_constr); if(FAILED(hres)) @@ -473,13 +476,13 @@ return S_OK; } -HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, DWORD flags, - DispatchEx *prototype, DispatchEx **ret) +HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, + const builtin_info_t *builtin_info, DWORD flags, DispatchEx *prototype, DispatchEx **ret) { FunctionInstance *function; HRESULT hres; - hres = create_function(ctx, flags, FALSE, prototype, &function); + hres = create_function(ctx, builtin_info, flags, FALSE, prototype, &function); if(FAILED(hres)) return hres; @@ -502,7 +505,7 @@ if(FAILED(hres)) return hres; - hres = create_function(ctx->script, PROPF_CONSTR, FALSE, prototype, &function); + hres = create_function(ctx->script, NULL, PROPF_CONSTR, FALSE, prototype, &function); jsdisp_release(prototype); if(FAILED(hres)) return hres; @@ -534,13 +537,13 @@ FunctionInstance *prot, *constr; HRESULT hres; - hres = create_function(ctx, PROPF_CONSTR, TRUE, NULL, &prot); + hres = create_function(ctx, NULL, PROPF_CONSTR, TRUE, NULL, &prot); if(FAILED(hres)) return hres; prot->value_proc = FunctionProt_value; - hres = create_function(ctx, PROPF_CONSTR, TRUE, &prot->dispex, &constr); + hres = create_function(ctx, NULL, PROPF_CONSTR, TRUE, &prot->dispex, &constr); jsdisp_release(&prot->dispex); if(FAILED(hres)) return hres; Modified: trunk/reactos/dll/win32/jscript/jscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript.h [iso-8859-1] Sat Jul 4 15:49:53 2009 @@ -132,7 +132,10 @@ HRESULT jsdisp_propget_idx(DispatchEx*,DWORD,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_get_id(DispatchEx*,const WCHAR*,DWORD,DISPID*); -HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,DWORD,DispatchEx*,DispatchEx**); +HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const builtin_info_t*,DWORD, + DispatchEx*,DispatchEx**); +HRESULT Function_value(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); + HRESULT create_object(script_ctx_t*,DispatchEx*,DispatchEx**); HRESULT create_math(script_ctx_t*,DispatchEx**); Modified: trunk/reactos/dll/win32/jscript/number.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/number.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/number.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/number.c [iso-8859-1] Sat Jul 4 15:49:53 2009 @@ -263,7 +263,7 @@ return hres; V_VT(&number->num) = VT_I4; - hres = create_builtin_function(ctx, NumberConstr_value, PROPF_CONSTR, &number->dispex, ret); + hres = create_builtin_function(ctx, NumberConstr_value, NULL, PROPF_CONSTR, &number->dispex, ret); jsdisp_release(&number->dispex); return hres; Modified: trunk/reactos/dll/win32/jscript/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/object.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/object.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/object.c [iso-8859-1] Sat Jul 4 15:49:53 2009 @@ -154,7 +154,7 @@ if(FAILED(hres)) return hres; - hres = create_builtin_function(ctx, ObjectConstr_value, PROPF_CONSTR, object, ret); + hres = create_builtin_function(ctx, ObjectConstr_value, NULL, PROPF_CONSTR, object, ret); jsdisp_release(object); return hres; Modified: trunk/reactos/dll/win32/jscript/regexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/regexp.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/regexp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/regexp.c [iso-8859-1] Sat Jul 4 15:49:53 2009 @@ -3685,7 +3685,7 @@ if(FAILED(hres)) return hres; - hres = create_builtin_function(ctx, RegExpConstr_value, PROPF_CONSTR, &regexp->dispex, ret); + hres = create_builtin_function(ctx, RegExpConstr_value, NULL, PROPF_CONSTR, &regexp->dispex, ret); jsdisp_release(&regexp->dispex); return hres; Modified: trunk/reactos/dll/win32/jscript/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/string.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/string.c [iso-8859-1] Sat Jul 4 15:49:53 2009 @@ -1370,7 +1370,7 @@ if(FAILED(hres)) return hres; - hres = create_builtin_function(ctx, StringConstr_value, PROPF_CONSTR, &string->dispex, ret); + hres = create_builtin_function(ctx, StringConstr_value, NULL, PROPF_CONSTR, &string->dispex, ret); jsdisp_release(&string->dispex); return hres;

1 0

[cwittich] 41768: sync cryptui with wine 1.1.25
by cwittich＠svn.reactos.org 04 Jul '09

04 Jul '09

Author: cwittich Date: Sat Jul 4 15:47:38 2009 New Revision: 41768 URL: http://svn.reactos.org/svn/reactos?rev=41768&view=rev Log: sync cryptui with wine 1.1.25 Added: trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc (with props) Modified: trunk/reactos/dll/win32/cryptui/cryptui.rbuild trunk/reactos/dll/win32/cryptui/cryptui.rc trunk/reactos/dll/win32/cryptui/cryptui_De.rc trunk/reactos/dll/win32/cryptui/cryptui_En.rc trunk/reactos/dll/win32/cryptui/cryptui_Ko.rc trunk/reactos/dll/win32/cryptui/cryptui_Nl.rc trunk/reactos/dll/win32/cryptui/cryptuires.h trunk/reactos/dll/win32/cryptui/main.c Modified: trunk/reactos/dll/win32/cryptui/cryptui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.rbuild [iso-8859-1] Sat Jul 4 15:47:38 2009 @@ -9,6 +9,11 @@ <define name="__WINESRC__" /> <file>main.c</file> <file>cryptui.rc</file> + <file>cryptui_De.rc</file> + <file>cryptui_En.rc</file> + <file>cryptui_Fr.rc</file> + <file>cryptui_Ko.rc</file> + <file>cryptui_Nl.rc</file> <library>wine</library> <library>kernel32</library> <library>user32</library> Modified: trunk/reactos/dll/win32/cryptui/cryptui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.rc [iso-8859-1] Sat Jul 4 15:47:38 2009 @@ -17,11 +17,6 @@ * 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 "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "commctrl.h" -#include "dlgs.h" #include "cryptuires.h" @@ -45,8 +40,3 @@ /* @makedep: certheader.bmp */ IDB_CERT_HEADER BITMAP LOADONCALL DISCARDABLE certheader.bmp - -#include "cryptui_De.rc" -#include "cryptui_En.rc" -#include "cryptui_Ko.rc" -#include "cryptui_Nl.rc" Modified: trunk/reactos/dll/win32/cryptui/cryptui_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui_De.rc [iso-8859-1] Sat Jul 4 15:47:38 2009 @@ -17,6 +17,8 @@ * 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 "cryptuires.h" #pragma code_page(65001) @@ -461,5 +463,3 @@ LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 115,67,174,100 END - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/cryptui/cryptui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui_En.rc [iso-8859-1] Sat Jul 4 15:47:38 2009 @@ -17,6 +17,8 @@ * 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 "cryptuires.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Added: trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc (added) +++ trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc [iso-8859-1] Sat Jul 4 15:47:38 2009 @@ -1,0 +1,466 @@ +/* + * cryptui dll French resources + * + * Copyright 2009 FrÃ©dÃ©ric Delanoy + * + * 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 "cryptuires.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_CERTIFICATE "Certificat" + IDS_CERTIFICATEINFORMATION "Informations sur le certificat" + IDS_CERT_INFO_BAD_SIG "Ce certificat a une signature invalide. Le certificat peut avoir Ã©tÃ© modifiÃ© ou corrompu." + IDS_CERT_INFO_UNTRUSTED_CA "Ce certificat racine n'est pas approuvÃ©. Pour lui faire confiance, ajoutez-le au magasin de certificats racine de confiance de votre systÃ¨me." + IDS_CERT_INFO_UNTRUSTED_ROOT "Ce certificat n'a pu Ãªtre validÃ© par un certificat racine de confiance." + IDS_CERT_INFO_PARTIAL_CHAIN "L'Ã©metteur de ce certificat n'a pas Ã©tÃ© trouvÃ©." + IDS_CERT_INFO_BAD_PURPOSES "Impossible de vÃ©rifier tous les rÃ´les prÃ©vus pour ce certificat." + IDS_CERT_INFO_PURPOSES "Ce certificat n'est prÃ©vu que pour les rÃ´les suivants :" + IDS_SUBJECT_HEADING "Ãmis pour : " + IDS_ISSUER_HEADING "Ãmis par : " + IDS_VALID_FROM "Valide Ã partir du " + IDS_VALID_TO " jusqu'au " + IDS_CERTIFICATE_BAD_SIGNATURE "Ce certificat a une signature invalide." + IDS_CERTIFICATE_BAD_TIME "Ce certificat a expirÃ© ou n'est pas encore valable." + IDS_CERTIFICATE_BAD_TIMENEST "La pÃ©riode de validitÃ© de ce certificat dÃ©passe celle de son Ã©metteur." + IDS_CERTIFICATE_REVOKED "Ce certificat a Ã©tÃ© rÃ©voquÃ© par son Ã©metteur." + IDS_CERTIFICATE_VALID "Ce certificat est valide." + IDS_FIELD "Champ" + IDS_VALUE "Valeur" + IDS_FIELDS_ALL "<Tous>" + IDS_FIELDS_V1 "Champs de version 1 uniquement" + IDS_FIELDS_EXTENSIONS "Extensions uniquement" + IDS_FIELDS_CRITICAL_EXTENSIONS "Extensions critiques uniquement" + IDS_FIELDS_PROPERTIES "PropriÃ©tÃ©s uniquement" + IDS_FIELD_VERSION "Version" + IDS_FIELD_SERIAL_NUMBER "NumÃ©ro de sÃ©rie" + IDS_FIELD_ISSUER "Ãmetteur" + IDS_FIELD_VALID_FROM "Valide Ã partir du" + IDS_FIELD_VALID_TO "Valide jusqu'au" + IDS_FIELD_SUBJECT "Sujet" + IDS_FIELD_PUBLIC_KEY "ClÃ© publique" + IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d bits)" + IDS_PROP_HASH "Empreinte SHA1" + IDS_PROP_ENHKEY_USAGE "Utilisation complÃ©mentaire de la clÃ© (propriÃ©tÃ©)" + IDS_PROP_FRIENDLY_NAME "Nom convivial" + IDS_PROP_DESCRIPTION "Description" + IDS_CERTIFICATE_PROPERTIES "PropriÃ©tÃ©s du certificat" + IDS_CERTIFICATE_PURPOSE_ERROR "Veuillez entrer l'OID sous la forme 1.2.3.4" + IDS_CERTIFICATE_PURPOSE_EXISTS "L'OID que vous avez entrÃ© existe dÃ©jÃ ." + IDS_SELECT_STORE_TITLE "SÃ©lectionnez le magasin de certificats" + IDS_SELECT_STORE "Veuillez sÃ©lectionner un magasin de certificats." + IDS_IMPORT_WIZARD "Assistant d'importation de certificats" + IDS_IMPORT_TYPE_MISMATCH "Le fichier contient des objets ne satisfaisant pas aux critÃ¨res spÃ©cifiÃ©s. Veuillez sÃ©lectionner un autre fichier." + IDS_IMPORT_FILE_TITLE "Fichier Ã importer" + IDS_IMPORT_FILE_SUBTITLE "SpÃ©cifiez le fichier Ã importer." + IDS_IMPORT_STORE_TITLE "Magasin de certificats" + IDS_IMPORT_STORE_SUBTITLE "Les magasins de certificats sont des collections de certificats, de listes de rÃ©vocation de certificats et de listes de certificats de confiance." + IDS_IMPORT_FILTER_CERT "Certificat X.509 (*.cer; *.crt)" + IDS_IMPORT_FILTER_PFX "Ãchange d'informations personnelles (*.pfx; *.p12)" + IDS_IMPORT_FILTER_CRL "Liste de rÃ©vocation de certificats (*.crl)" + IDS_IMPORT_FILTER_CTL "Liste de certificats de confiance (*.stl)" + IDS_IMPORT_FILTER_SERIALIZED_STORE "Magasin de certificats sÃ©rialisÃ©s Microsoft (*.sst)" + IDS_IMPORT_FILTER_CMS "Messages CMS/PKCS #7 (*.spc; *.p7b)" + IDS_IMPORT_FILTER_ALL "Tous les fichiers (*.*)" + IDS_IMPORT_EMPTY_FILE "SÃ©lectionnez un fichier." + IDS_IMPORT_BAD_FORMAT "Le format du fichier n'est pas reconnu. SÃ©lectionnez un autre fichier." + IDS_IMPORT_OPEN_FAILED "N'a pu ouvrir " + IDS_IMPORT_DEST_DETERMINED "DÃ©terminÃ© par le programme" + IDS_IMPORT_SELECT_STORE "Veuillez sÃ©lectionner un magasin" + IDS_IMPORT_STORE_SELECTION "Magasin de certificats sÃ©lectionnÃ©" + IDS_IMPORT_DEST_AUTOMATIC "DÃ©terminÃ© automatiquement par le programme" + IDS_IMPORT_FILE "Fichier" + IDS_IMPORT_CONTENT "Contenu" + IDS_IMPORT_CONTENT_CERT "Certificat" + IDS_IMPORT_CONTENT_CRL "Liste de rÃ©vocation de certificats" + IDS_IMPORT_CONTENT_CTL "Liste de certificats de confiance" + IDS_IMPORT_CONTENT_CMS "Message CMS/PKCS #7" + IDS_IMPORT_CONTENT_PFX "Ãchange d'informations personnelles" + IDS_IMPORT_CONTENT_STORE "Magasin de certificats" + IDS_IMPORT_SUCCEEDED "L'importation a rÃ©ussi." + IDS_IMPORT_FAILED "L'importation a Ã©chouÃ©." + IDS_WIZARD_TITLE_FONT "Arial" + IDS_PURPOSE_ALL "<Tous>" + IDS_PURPOSE_ADVANCED "<RÃ´les avancÃ©s>" + IDS_SUBJECT_COLUMN "Ãmis pour" + IDS_ISSUER_COLUMN "Ãmis par" + IDS_EXPIRATION_COLUMN "Date d'expiration" + IDS_FRIENDLY_NAME_COLUMN "Nom convivial" + IDS_ALLOWED_PURPOSE_ALL "<Tous>" + IDS_ALLOWED_PURPOSE_NONE "<Aucun>" + IDS_WARN_REMOVE_MY "Vous ne pourrez plus dÃ©chiffrer ou signer de messages avec ce certificat.\nVoulez-vous rÃ©ellement supprimer ce certificat ?" + IDS_WARN_REMOVE_PLURAL_MY "Vous ne pourrez plus dÃ©chiffrer ou signer de messages avec ces certificats.\nVoulez-vous rÃ©ellement supprimer ces certificats ?" + IDS_WARN_REMOVE_ADDRESSBOOK "Vous ne pourrez plus chiffrer ou vÃ©rifier de signature de messages avec ce certificat.\nVoulez-vous rÃ©ellement supprimer ce certificat ?" + IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "Vous ne pourrez plus chiffrer ou vÃ©rifier de signature de messages avec ces certificats.\nVoulez-vous rÃ©ellement supprimer ces certificats ?" + IDS_WARN_REMOVE_CA "Les certificats Ã©mis par cette autoritÃ© de certification ne seront plus considÃ©rÃ©s comme valables.\nVoulez-vous rÃ©ellement supprimer ce certificat ?" + IDS_WARN_REMOVE_PLURAL_CA "Les certificats Ã©mis par cette autoritÃ© de certification ne seront plus considÃ©rÃ©s comme valables.\nVoulez-vous rÃ©ellement supprimer ces certificats ?" + IDS_WARN_REMOVE_ROOT "Les certificats Ã©mis par cette autoritÃ© de certification racine, ou par toute autoritÃ© de certification qu'elle valide, ne seront plus considÃ©rÃ©s comme valables.\nVoulez-vous rÃ©ellement supprimer ce certificat racine de confiance ?" + IDS_WARN_REMOVE_PLURAL_ROOT "Les certificats Ã©mis par ces autoritÃ©s de certification racines, ou par toute autoritÃ© de certification qu'elles valident, ne seront plus considÃ©rÃ©s comme valables.\nVoulez-vous rÃ©ellement supprimer ces certificats racines de confiance ?" + IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Les logiciels signÃ©s par cet Ã©diteur ne seront plus considÃ©rÃ©s comme valables.\nVoulez-vous rÃ©ellement supprimer ce certificat ?" + IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Les logiciels signÃ©s par ces Ã©diteurs ne seront plus considÃ©rÃ©s comme valables.\nVoulez-vous rÃ©ellement supprimer ces certificats ?" + IDS_WARN_REMOVE_DEFAULT "Voulez-vous rÃ©ellement supprimer ce certificat ?" + IDS_WARN_REMOVE_PLURAL_DEFAULT "Voulez-vous rÃ©ellement supprimer ces certificats ?" + IDS_CERT_MGR "Certificats" + IDS_PURPOSE_SERVER_AUTH "Prouve l'identitÃ© d'un ordinateur distant" + IDS_PURPOSE_CLIENT_AUTH "Prouve votre identitÃ© Ã un ordinateur distant" + IDS_PURPOSE_CODE_SIGNING "Garantit que des logiciels proviennent bien d'un Ã©diteur de logiciels donnÃ©\nProtÃ¨ge le logiciel contre toute altÃ©ration aprÃ¨s publication" + IDS_PURPOSE_EMAIL_PROTECTION "ProtÃ¨ge les courriers Ã©lectroniques" + IDS_PURPOSE_IPSEC "Permet des communications sÃ©curisÃ©es sur Internet" + IDS_PURPOSE_TIMESTAMP_SIGNING "Permet de signer des donnÃ©es avec l'heure courante" + IDS_PURPOSE_CTL_USAGE_SIGNING "Permet de signer numÃ©riquement une liste de certificats de confiance" + IDS_PURPOSE_EFS "Permet le chiffrement de donnÃ©es sur disque" + IDS_PURPOSE_EFS_RECOVERY "Restauration de fichier" + IDS_PURPOSE_WHQL "VÃ©rification des pilotes matÃ©riels de Windows" + IDS_PURPOSE_NT5 "VÃ©rification des composants systÃ¨me de Windows" + IDS_PURPOSE_OEM_WHQL "VÃ©rification des composants systÃ¨me de Windows OEM" + IDS_PURPOSE_EMBEDDED_NT "VÃ©rification des composants systÃ¨me de Windows embarquÃ©" + IDS_PURPOSE_ROOT_LIST_SIGNER "Signataire de la liste racine" + IDS_PURPOSE_QUALIFIED_SUBORDINATION "Subordination conditionnelle" + IDS_PURPOSE_KEY_RECOVERY "Recouvrement de clÃ©" + IDS_PURPOSE_DOCUMENT_SIGNING "Signature de documents" + IDS_PURPOSE_LIFETIME_SIGNING "Signature Ã vie" + IDS_PURPOSE_DRM "Droits numÃ©riques" + IDS_PURPOSE_LICENSES "Licences de jeux de clÃ©s" + IDS_PURPOSE_LICENSE_SERVER "VÃ©rification du serveur de licences" + IDS_PURPOSE_ENROLLMENT_AGENT "Agent de demande de certificat" + IDS_PURPOSE_SMARTCARD_LOGON "Connexion avec carte Ã puce" + IDS_PURPOSE_CA_EXCHANGE "Archivage de clÃ© privÃ©e" + IDS_PURPOSE_KEY_RECOVERY_AGENT "Agent de recouvrement de clÃ©" + IDS_PURPOSE_DS_EMAIL_REPLICATION "RÃ©plication de courriers Ã©lectroniques du service d'annuaire" + IDS_EXPORT_WIZARD "Assistant Exportation de certificat" + IDS_EXPORT_FORMAT_TITLE "Format d'export" + IDS_EXPORT_FORMAT_SUBTITLE "Choisissez le format dans lequel le contenu sera sauvÃ©." + IDS_EXPORT_FILE_TITLE "Nom du fichier Ã exporter" + IDS_EXPORT_FILE_SUBTITLE "Choisissez le nom du fichier dans lequel le contenu sera sauvÃ©." + IDS_EXPORT_FILE_EXISTS "Le fichier spÃ©cifiÃ© existe dÃ©jÃ . Voulez-vous le remplacer ?" + IDS_EXPORT_FILTER_CERT "Binaire codÃ© DER X.509 (*.cer)" + IDS_EXPORT_FILTER_BASE64_CERT "Binaire codÃ© Base64 X.509 (*.cer)" + IDS_EXPORT_FILTER_CRL "Liste de rÃ©vocation de certificats (*.crl)" + IDS_EXPORT_FILTER_CTL "Liste de certificats de confiance (*.stl)" + IDS_EXPORT_FILTER_CMS "Messages CMS/PKCS #7 (*.p7b)" + IDS_EXPORT_FILTER_PFX "Ãchange d'informations personnelles (*.pfx)" + IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "Magasin de certificats sÃ©rialisÃ©s (*.sst)" + IDS_EXPORT_FORMAT "Format de fichier" + IDS_EXPORT_INCLUDE_CHAIN "Inclure tous les certificats dans le chemin de certification" + IDS_EXPORT_KEYS "Exporter des clÃ©s" + IDS_YES "Oui" + IDS_NO "Non" + IDS_EXPORT_SUCCEEDED "L'export a rÃ©ussi." + IDS_EXPORT_FAILED "L'export a Ã©chouÃ©." + IDS_EXPORT_PRIVATE_KEY_TITLE "Exporter la clÃ© privÃ©e" + IDS_EXPORT_PRIVATE_KEY_SUBTITLE "Le certificat contient une clÃ© privÃ©e qui peut Ãªtre exportÃ©e avec le certificat." + IDS_EXPORT_PASSWORD_TITLE "Entrez le mot de passe" + IDS_EXPORT_PASSWORD_SUBTITLE "Vous pouvez protÃ©ger une clÃ© privÃ©e par un mot de passe." + IDS_EXPORT_PASSWORD_MISMATCH "Les mots de passe ne correspondent pas." + IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "Note : la clÃ© privÃ©e de ce certificat n'a pu Ãªtre ouverte." + IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Note : la clÃ© privÃ©e de ce certificat n'est pas exportable." +} + +IDD_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "GÃ©nÃ©ral" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200 + CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", + ES_READONLY|WS_DISABLED,8,11,26,26 + CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", + ES_READONLY|WS_DISABLED,34,11,212,26 + CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1 + CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", + ES_READONLY|ES_MULTILINE,8,38,238,78 + CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1 + CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", + ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90 + PUSHBUTTON "&Installer un certificat...", IDC_ADDTOSTORE,103,216,70,14 + PUSHBUTTON "&DÃ©claration de l'Ã©metteur", IDC_ISSUERSTATEMENT,177,216,70,14 +END + +IDD_DETAIL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "DÃ©tails" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Afficher :", -1, 6,12,40,14 + COMBOBOX IDC_DETAIL_SELECT, 28,10,100,14, + CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + CONTROL "", IDC_DETAIL_LIST, "SysListView32", + LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 6,28,241,100 + CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", + ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 + PUSHBUTTON "Ã&diter les propriÃ©tÃ©s...", IDC_EDITPROPERTIES,103,216,70,14 + PUSHBUTTON "&Copier dans le fichier...", IDC_EXPORT,177,216,70,14 +END + +IDD_HIERARCHY DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "Chemin de certification" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Chemin de &certification", -1,6,10,245,165, BS_GROUPBOX + CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER, + 13,22,231,130 + PUSHBUTTON "&Voir le certificat", IDC_VIEWCERTIFICATE,175,156,70,14 + LTEXT "Ã&tant du certificat :", IDC_CERTIFICATESTATUS,6,183,70,14 + CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W", + WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36 +END + +IDD_USERNOTICE DIALOG DISCARDABLE 0, 0, 255, 256 +CAPTION "Avis de non-responsabilitÃ©" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_USERNOTICE,"RichEdit20W", + WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200 + PUSHBUTTON "Fermer", IDOK,103,216,70,14 + PUSHBUTTON "&Informations complÃ©mentaires", IDC_CPS,177,216,70,14 +END + +IDD_CERT_PROPERTIES_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "GÃ©nÃ©ral" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nom convivial :", -1, 6,14,60,14 + EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP + LTEXT "&Description:", -1, 6,32,60,14 + EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL + GROUPBOX "RÃ´les du certificat", -1,6,48,245,165, BS_GROUPBOX + AUTORADIOBUTTON "Activer &tous les rÃ´les prÃ©vus pour ce certificat", + IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "&DÃ©sactiver tous les rÃ´les prÃ©vus pour ce certificat", + IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "N'activer &que les rÃ´les suivants pour ce certificat :", + IDC_ENABLE_SELECTED_PURPOSES, 12,82,180,14, BS_AUTORADIOBUTTON + CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 24,100,220,90 + PUSHBUTTON "&Ajouter un rÃ´le...", IDC_ADD_PURPOSE,184,194,60,14 +END + +IDD_ADD_CERT_PURPOSE DIALOG DISCARDABLE 0,0,200,68 +CAPTION "Ajouter un rÃ´le" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Adjoindre l'identifiant d'objet (OIS) au rÃ´le de certificat Ã ajouter :", + -1, 6,6,190,28 + EDITTEXT IDC_NEW_PURPOSE, 6,28,190,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL + PUSHBUTTON "OK", IDOK, 33,48,60,14 + PUSHBUTTON "Annuler", IDCANCEL, 100,48,60,14 +END + +IDD_SELECT_STORE DIALOG DISCARDABLE 0,0,200,136 +CAPTION "SÃ©lectionner un magasin de certificats" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "SÃ©lectionnez le magasin de certificats Ã utiliser :", IDC_STORE_TEXT, 6,6,190,28 + CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP, + 6,28,188,70 + CHECKBOX "&Montrer les magasins (emplacements de stockage) physiques", IDC_SHOW_PHYSICAL_STORES, 6,102,90,14, + BS_AUTOCHECKBOX|WS_TABSTOP + PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON + PUSHBUTTON "Annuler", IDCANCEL, 144,118,50,14 +END + +IDD_IMPORT_WELCOME DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Assistant d'importation de certificats" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bienvenue dans l'assistant d'importation de certificats", IDC_IMPORT_TITLE, + 115,1,195,40 + LTEXT "Cet assistant vous aide Ã importer des certificats, des listes de rÃ©vocation de certificats et des listes de certificats de confiance dans un magasin de certificats Ã partir d'un fichier.", + -1, 115,33,195,16 + LTEXT "Un certificat peut Ãªtre utilisÃ© pour vous identifier, ou pour identifier l'ordinateur avec lequel vous communiquez. Il peut Ã©galement Ãªtre utilisÃ© Ã des fins d'authentification ou de signature de messages. Les magasins de certificats sont des collections de certificats, de listes de rÃ©vocation de certificats et de listes de certificats de confiance.", + -1, 115,56,195,40 + LTEXT "Pour continuer, cliquez Suivant.", + -1, 115,103,195,8 +END + +IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Assistant Importation de certificats" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nom du fichier :", -1, 21,1,195,10 + EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + PUSHBUTTON "Parco&urir...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 + LTEXT "Remarque : les formats de fichiers suivants peuvent contenir plus d'un certificat, liste de rÃ©vocation de certificats ou liste de certificats de confiance :", + -1, 21,26,265,16 + LTEXT "Standard de syntaxe de message cryptographique - Messages PKCS #7 (.p7b)", + -1, 31,49,265,10 + LTEXT "Ãchange d'informations personnelles - PKCS #12 (.pfx, .p12)", + -1, 31,64,265,10 + LTEXT "Magasin de certificats sÃ©rialisÃ©s Microsoft (.sst)", + -1, 31,79,265,10 +END + +IDD_IMPORT_STORE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Assistant Importation de certificats" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Wine peut sÃ©lectionner automatiquement un magasin de certificats, ou vous pouvez spÃ©cifier l'emplacement des certificats.", + -1, 21,1,195,20 + AUTORADIOBUTTON "SÃ©lectionner &automatiquement un magasin de certificats", + IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "Placer tous les certificats dans le &magasin suivant :", + IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON + EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY + PUSHBUTTON "&Parcourir...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14 +END + +IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Assistant Importation de certificat" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ClÃ´turer l'assistant d'importation de certificat", IDC_IMPORT_TITLE, + 115,1,195,40 + LTEXT "Vous avez terminÃ© avec succÃ¨s l'assistant d'importation de certificat.", + -1, 115,33,195,24 + LTEXT "Vous avez spÃ©cifiÃ© les paramÃ¨tres suivants :", + -1, 115,57,195,12 + CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 115,67,174,100 +END + +IDD_CERT_MGR DIALOG DISCARDABLE 0,0,335,270 +CAPTION "Certificats" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&RÃ´le prÃ©vu :", -1, 7,9,100,12 + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, + CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + CONTROL "", IDC_MGR_STORES, "SysTabControl32", + WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 + CONTROL "", IDC_MGR_CERTS, "SysListView32", + LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 + PUSHBUTTON "&Importer...", IDC_MGR_IMPORT, 7,172,51,14 + PUSHBUTTON "&Exporter...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED + PUSHBUTTON "&Supprimer", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED + PUSHBUTTON "&AvancÃ©...", IDC_MGR_ADVANCED, 277,172,51,14 + GROUPBOX "RÃ´les prÃ©vus pour le certificat", -1,7,194,321,47, BS_GROUPBOX + LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30 + PUSHBUTTON "&DÃ©tails...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED + PUSHBUTTON "&Fermer", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON +END + +IDD_CERT_MGR_ADVANCED DIALOG DISCARDABLE 0,0,248,176 +CAPTION "Options avancÃ©es" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "RÃ´le du certificat", -1, 7,7,234,141, BS_GROUPBOX + LTEXT "SÃ©lectionnez un ou plusieurs rÃ´les Ã lister quand les options avancÃ©es sont sÃ©lectionnÃ©es.", + -1, 14,18,220,16 + LTEXT "&RÃ´les du certificat :", -1, 14,41,90,12, WS_TABSTOP + CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 14,51,220,90 + PUSHBUTTON "OK", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON + PUSHBUTTON "Annuler", IDCANCEL, 190,155,51,14 +END + +IDD_EXPORT_WELCOME DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Assistant d'exportation de certificats" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bienvenue dans l'assistant d'exportation de certificats", IDC_EXPORT_TITLE, + 115,1,195,40 + LTEXT "Cet assistant vous aide Ã exporter des certificats, des listes de rÃ©vocation de certificats et des listes de certificats de confiance dans un fichier Ã partir d'un magasin de certificats.", + -1, 115,33,195,16 + LTEXT "Un certificat peut Ãªtre utilisÃ© pour vous identifier, ou pour identifier l'ordinateur avec lequel vous communiquez. Il peut Ã©galement Ãªtre utilisÃ© Ã des fins d'authentification ou de signature de messages. Les magasins de certificats sont des collections de certificats, de listes de rÃ©vocation de certificats et de listes de certificats de confiance.", + -1, 115,56,195,40 + LTEXT "Pour continuer, cliquez Suivant.", + -1, 115,103,195,8 +END + +IDD_EXPORT_PRIVATE_KEY DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Assistant Exportation de certificat" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Si vous choisissez d'exporter la clÃ© privÃ©e, on vous demandera un mot de passe pour protÃ©ger la clÃ© privÃ©e dans une page ultÃ©rieure.", -1, 21,1,195,23 + LTEXT "Voulez-vous exporter la clÃ© privÃ©e ?", -1, 21,24,195,15 + AUTORADIOBUTTON "&Oui, exporter la clÃ© privÃ©e", + IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "&Non, ne pas exporter la clÃ© privÃ©e", + IDC_EXPORT_PRIVATE_KEY_NO, 31,48,200,12, BS_AUTORADIOBUTTON + LTEXT "", IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE, 21,60,200,24 +END + +IDD_EXPORT_PASSWORD DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Assistant Exportation de certificat" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Mot de passe :", -1, 21,1,195,10 + EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + LTEXT "&Confirmez le mot de passe:", -1, 21,35,195,10 + EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP +END + +IDD_EXPORT_FORMAT DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Assistant Exportation de certificat" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "SÃ©lectionnez le format Ã utiliser :", -1, 21,1,195,10 + AUTORADIOBUTTON "Binaire codÃ© &DER X.509 (*.cer)", + IDC_EXPORT_FORMAT_DER, 31,18,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "Binaire codÃ© Ba&se64 X.509 (.cer):", + IDC_EXPORT_FORMAT_BASE64, 31,30,200,12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "Standard de syntaxe de message cryptographique - Messages PKCS #7 (.p7b)", + IDC_EXPORT_FORMAT_CMS, 31,42,200,12, BS_AUTORADIOBUTTON + CHECKBOX "&Inclure tous les certificats dans le chemin de certification si possible" + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + AUTORADIOBUTTON "Ãchange d'informations &Personnelles - PKCS #12 (.pfx)", + IDC_EXPORT_FORMAT_PFX, 31,72,200,12, BS_AUTORADIOBUTTON|WS_DISABLED + CHECKBOX "Inclure &tous les certificats dans le chemin de certification si possible", + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + CHECKBOX "&Activer le chiffrement fort", + IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,200,8, + BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + CHECKBOX "&Effacer la clÃ© privÃ©e si l'export a rÃ©ussi", + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,200,8, + BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED +END + +IDD_EXPORT_FILE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Assistant Exportation de certificat" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nom du fichier :", -1, 21,1,195,10 + EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + PUSHBUTTON "Parco&urir...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14 +END + +IDD_EXPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Assistant Exportation de certificat" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ClÃ´turer l'assistant d'exportation de certificat", IDC_EXPORT_TITLE, + 115,1,195,40 + LTEXT "Vous avez terminÃ© avec succÃ¨s l'assistant d'importation de certificat.", + -1, 115,33,195,24 + LTEXT "Vous avez spÃ©cifiÃ© les paramÃ¨tres suivants :", + -1, 115,57,195,12 + CONTROL "", IDC_EXPORT_SETTINGS, "SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 115,67,174,100 +END Propchange: trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/cryptui/cryptui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui_Ko.rc [iso-8859-1] Sat Jul 4 15:47:38 2009 @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptuires.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/cryptui/cryptui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui_Nl.rc [iso-8859-1] Sat Jul 4 15:47:38 2009 @@ -17,6 +17,8 @@ * 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 "cryptuires.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/cryptui/cryptuires.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptuir… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptuires.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptuires.h [iso-8859-1] Sat Jul 4 15:47:38 2009 @@ -17,6 +17,10 @@ */ #ifndef __CRYPTUIRES_H_ #define __CRYPTUIRES_H_ + +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> #define IDS_CERTIFICATE 1000 #define IDS_CERTIFICATEINFORMATION 1001 Modified: trunk/reactos/dll/win32/cryptui/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] Sat Jul 4 15:47:38 2009 @@ -2146,7 +2146,7 @@ return ret; } -static WCHAR *get_cps_str_from_qualifier(CRYPT_OBJID_BLOB *qualifier) +static WCHAR *get_cps_str_from_qualifier(const CRYPT_OBJID_BLOB *qualifier) { LPWSTR qualifierStr = NULL; CERT_NAME_VALUE *qualifierValue; @@ -2167,7 +2167,7 @@ return qualifierStr; } -static WCHAR *get_user_notice_from_qualifier(CRYPT_OBJID_BLOB *qualifier) +static WCHAR *get_user_notice_from_qualifier(const CRYPT_OBJID_BLOB *qualifier) { LPWSTR str = NULL; CERT_POLICY_QUALIFIER_USER_NOTICE *qualifierValue; @@ -2773,7 +2773,7 @@ add_v1_field(hwnd, data, &v1_fields[i]); } -static WCHAR *crypt_format_extension(PCERT_EXTENSION ext, DWORD formatStrType) +static WCHAR *crypt_format_extension(const CERT_EXTENSION *ext, DWORD formatStrType) { WCHAR *str = NULL; DWORD size; @@ -2788,7 +2788,7 @@ return str; } -static WCHAR *field_format_extension_hex_with_ascii(PCERT_EXTENSION ext) +static WCHAR *field_format_extension_hex_with_ascii(const CERT_EXTENSION *ext) { WCHAR *str = NULL; @@ -3986,7 +3986,7 @@ } } -static void set_certificate_status(HWND hwnd, CRYPT_PROVIDER_CERT *cert) +static void set_certificate_status(HWND hwnd, const CRYPT_PROVIDER_CERT *cert) { /* Select all the text in the control, the next update will replace it */ SendMessageW(hwnd, EM_SETSEL, 0, -1); @@ -5602,7 +5602,7 @@ return info; } -static BOOL export_acquire_private_key(PCRYPT_KEY_PROV_INFO info, +static BOOL export_acquire_private_key(const CRYPT_KEY_PROV_INFO *info, HCRYPTPROV *phProv) { BOOL ret; @@ -5733,7 +5733,7 @@ return ret; } -static void export_format_enable_controls(HWND hwnd, struct ExportWizData *data) +static void export_format_enable_controls(HWND hwnd, const struct ExportWizData *data) { int defaultFormatID; @@ -5874,7 +5874,7 @@ return ret; } -static void export_password_mismatch(HWND hwnd, struct ExportWizData *data) +static void export_password_mismatch(HWND hwnd, const struct ExportWizData *data) { WCHAR title[MAX_STRING_LEN], error[MAX_STRING_LEN]; LPCWSTR pTitle; @@ -5979,7 +5979,7 @@ return ret; } -static LPWSTR export_append_extension(struct ExportWizData *data, +static LPWSTR export_append_extension(const struct ExportWizData *data, LPWSTR fileName) { static const WCHAR cer[] = { '.','c','e','r',0 }; @@ -6305,7 +6305,7 @@ return ret; } -static void show_export_details(HWND lv, struct ExportWizData *data) +static void show_export_details(HWND lv, const struct ExportWizData *data) { WCHAR text[MAX_STRING_LEN]; LVITEMW item; @@ -6783,7 +6783,7 @@ } static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, - LPCWSTR pwszWizardTitle, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, void *pvoid) + LPCWSTR pwszWizardTitle, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, const void *pvoid) { PROPSHEETHEADERW hdr; PROPSHEETPAGEW pages[6];

1 0

[tkreuzer] 41767: Remove useless function
by tkreuzer＠svn.reactos.org 04 Jul '09

04 Jul '09

Author: tkreuzer Date: Sat Jul 4 15:45:42 2009 New Revision: 41767 URL: http://svn.reactos.org/svn/reactos?rev=41767&view=rev Log: Remove useless function Modified: trunk/reactos/subsystems/win32/win32k/objects/palette.c Modified: trunk/reactos/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] Sat Jul 4 15:45:42 2009 @@ -14,7 +14,7 @@ static UINT SystemPaletteUse = SYSPAL_NOSTATIC; /* the program need save the pallete and restore it */ -const PALETTEENTRY COLOR_sysPalTemplate[NB_RESERVED_COLORS] = +const PALETTEENTRY g_sysPalTemplate[NB_RESERVED_COLORS] = { // first 10 entries in the system palette // red green blue flags @@ -45,11 +45,6 @@ { 0xff, 0xff, 0xff, PC_SYS_USED } // last 10 }; -const PALETTEENTRY* FASTCALL COLOR_GetSystemPaletteTemplate(void) -{ - return (const PALETTEENTRY*)&COLOR_sysPalTemplate; -} - INT APIENTRY COLOR_PaletteLookupPixel(PALETTEENTRY *palPalEntry, INT size, XLATEOBJ *XlateObj, COLORREF col, BOOL skipReserved) { @@ -106,7 +101,6 @@ #ifndef NO_MAPPING PALOBJ *palObj; #endif - const PALETTEENTRY* __sysPalTemplate = (const PALETTEENTRY*)COLOR_GetSystemPaletteTemplate(); // create default palette (20 system colors) palPtr = ExAllocatePoolWithTag(PagedPool, @@ -119,9 +113,9 @@ palPtr->palNumEntries = NB_RESERVED_COLORS; for (i=0; i<NB_RESERVED_COLORS; i++) { - palPtr->palPalEntry[i].peRed = __sysPalTemplate[i].peRed; - palPtr->palPalEntry[i].peGreen = __sysPalTemplate[i].peGreen; - palPtr->palPalEntry[i].peBlue = __sysPalTemplate[i].peBlue; + palPtr->palPalEntry[i].peRed = g_sysPalTemplate[i].peRed; + palPtr->palPalEntry[i].peGreen = g_sysPalTemplate[i].peGreen; + palPtr->palPalEntry[i].peBlue = g_sysPalTemplate[i].peBlue; palPtr->palPalEntry[i].peFlags = 0; }

1 0

[cwittich] 41766: sync cryptdlg with wine 1.1.25
by cwittich＠svn.reactos.org 04 Jul '09

04 Jul '09

Author: cwittich Date: Sat Jul 4 15:44:39 2009 New Revision: 41766 URL: http://svn.reactos.org/svn/reactos?rev=41766&view=rev Log: sync cryptdlg with wine 1.1.25 Added: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Lt.rc (with props) trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ro.rc (with props) Removed: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rbuild trunk/reactos/dll/win32/cryptdlg/cryptdlg_De.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_En.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ko.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg_Nl.rc trunk/reactos/dll/win32/cryptdlg/cryptres.h Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg.rbuild [iso-8859-1] Sat Jul 4 15:44:39 2009 @@ -15,5 +15,11 @@ <library>wintrust</library> <library>ntdll</library> <file>main.c</file> - <file>cryptdlg.rc</file> + <file>cryptdlg_De.rc</file> + <file>cryptdlg_En.rc</file> + <file>cryptdlg_Fr.rc</file> + <file>cryptdlg_Ko.rc</file> + <file>cryptdlg_Lt.rc</file> + <file>cryptdlg_Nl.rc</file> + <file>cryptdlg_Ro.rc</file> </module> Removed: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc (removed) @@ -1,29 +1,0 @@ -/* - * cryptdlg dll resources - * - * Copyright 2008 Juan Lang - * - * 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 "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "cryptres.h" - -#include "cryptdlg_De.rc" -#include "cryptdlg_En.rc" -#include "cryptdlg_Fr.rc" -#include "cryptdlg_Ko.rc" -#include "cryptdlg_Nl.rc" Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_De.rc [iso-8859-1] Sat Jul 4 15:44:39 2009 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_En.rc [iso-8859-1] Sat Jul 4 15:44:39 2009 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc [iso-8859-1] Sat Jul 4 15:44:39 2009 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ko.rc [iso-8859-1] Sat Jul 4 15:44:39 2009 @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE Added: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Lt.rc (added) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Lt.rc [iso-8859-1] Sat Jul 4 15:44:39 2009 @@ -1,0 +1,41 @@ +/* + * cryptdlg dll Lithuanian resources + * + * Copyright 2009 Aurimas FiÅ¡eras <aurimas(a)gmail.com> + * + * 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 "cryptres.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_CERT_POLICY "Liudijimo politika" + IDS_POLICY_ID "Politikos identifikatorius: " + IDS_POLICY_QUALIFIER_INFO "Politikos kvalifikatoriaus informacija" + IDS_POLICY_QUALIFIER_ID "Politikos kvalifikatoriaus identifikatorius=" + IDS_CPS "CPS" + IDS_USER_NOTICE "Naudotojo praneÅ¡imas" + IDS_QUALIFIER "Kvalifikatorius" + IDS_NOTICE_REF "PraneÅ¡imo nuoroda" + IDS_ORGANIZATION "Organizacija=" + IDS_NOTICE_NUM "PraneÅ¡imo numeris=" + IDS_NOTICE_TEXT "PraneÅ¡imo tekstas=" +} Propchange: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Lt.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Nl.rc [iso-8859-1] Sat Jul 4 15:44:39 2009 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE Added: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ro.rc (added) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ro.rc [iso-8859-1] Sat Jul 4 15:44:39 2009 @@ -1,0 +1,41 @@ +/* + * cryptdlg dll Romanian resources + * + * Copyright 2009 Paul Chitescu + * + * 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 "cryptres.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_CERT_POLICY "Politica certificatului" + IDS_POLICY_ID "Identificatorul politicii: " + IDS_POLICY_QUALIFIER_INFO "InformaÈia calificatorului politicii" + IDS_POLICY_QUALIFIER_ID "Identificatorul calificatorului politicii=" + IDS_CPS "CPS" + IDS_USER_NOTICE "NotiÈÄ utilizator" + IDS_QUALIFIER "Calificator" + IDS_NOTICE_REF "ReferinÈa notiÈei" + IDS_ORGANIZATION "OrganizaÈia=" + IDS_NOTICE_NUM "NumÄrul notiÈei=" + IDS_NOTICE_TEXT "Textul notiÈei=" +} Propchange: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ro.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/cryptdlg/cryptres.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptre… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptres.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptres.h [iso-8859-1] Sat Jul 4 15:44:39 2009 @@ -18,6 +18,8 @@ #ifndef __CRYPTRES_H__ #define __CRYPTRES_H__ +#include <windef.h> + #define IDS_CERT_POLICY 100 #define IDS_POLICY_ID 101 #define IDS_POLICY_QUALIFIER_INFO 102

1 0

[cwittich] 41765: sync crypt32 with wine 1.1.25
by cwittich＠svn.reactos.org 04 Jul '09

04 Jul '09

Author: cwittich Date: Sat Jul 4 15:41:32 2009 New Revision: 41765 URL: http://svn.reactos.org/svn/reactos?rev=41765&view=rev Log: sync crypt32 with wine 1.1.25 Added: trunk/reactos/dll/win32/crypt32/crypt32_Ro.rc (with props) Removed: trunk/reactos/dll/win32/crypt32/crypt32.rc Modified: trunk/reactos/dll/win32/crypt32/cert.c trunk/reactos/dll/win32/crypt32/crypt32.rbuild trunk/reactos/dll/win32/crypt32/crypt32.spec trunk/reactos/dll/win32/crypt32/crypt32_De.rc trunk/reactos/dll/win32/crypt32/crypt32_En.rc trunk/reactos/dll/win32/crypt32/crypt32_Fr.rc trunk/reactos/dll/win32/crypt32/crypt32_Ko.rc trunk/reactos/dll/win32/crypt32/crypt32_Nl.rc trunk/reactos/dll/win32/crypt32/crypt32_No.rc trunk/reactos/dll/win32/crypt32/crypt32_Pt.rc trunk/reactos/dll/win32/crypt32/crypt32_Sv.rc trunk/reactos/dll/win32/crypt32/cryptres.h trunk/reactos/dll/win32/crypt32/decode.c trunk/reactos/dll/win32/crypt32/encode.c trunk/reactos/dll/win32/crypt32/oid.c Modified: trunk/reactos/dll/win32/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cert.c?r… ============================================================================== --- trunk/reactos/dll/win32/crypt32/cert.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/cert.c [iso-8859-1] Sat Jul 4 15:41:32 2009 @@ -2951,3 +2951,35 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +const void * WINAPI CertCreateContext(DWORD dwContextType, DWORD dwEncodingType, + const BYTE *pbEncoded, DWORD cbEncoded, + DWORD dwFlags, PCERT_CREATE_CONTEXT_PARA pCreatePara) +{ + TRACE("(0x%x, 0x%x, %p, %d, 0x%08x, %p)\n", dwContextType, dwEncodingType, + pbEncoded, cbEncoded, dwFlags, pCreatePara); + + if (dwFlags) + { + FIXME("dwFlags 0x%08x not handled\n", dwFlags); + return NULL; + } + if (pCreatePara) + { + FIXME("pCreatePara not handled\n"); + return NULL; + } + + switch (dwContextType) + { + case CERT_STORE_CERTIFICATE_CONTEXT: + return CertCreateCertificateContext(dwEncodingType, pbEncoded, cbEncoded); + case CERT_STORE_CRL_CONTEXT: + return CertCreateCRLContext(dwEncodingType, pbEncoded, cbEncoded); + case CERT_STORE_CTL_CONTEXT: + return CertCreateCTLContext(dwEncodingType, pbEncoded, cbEncoded); + default: + WARN("unknown context type: 0x%x\n", dwContextType); + return NULL; + } +} Modified: trunk/reactos/dll/win32/crypt32/crypt32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.rbuild [iso-8859-1] Sat Jul 4 15:41:32 2009 @@ -35,7 +35,16 @@ <file>str.c</file> <file>ctl.c</file> <file>message.c</file> - <file>crypt32.rc</file> + <file>crypt32_De.rc</file> + <file>crypt32_En.rc</file> + <file>crypt32_Fr.rc</file> + <file>crypt32_Ko.rc</file> + <file>crypt32_Nl.rc</file> + <file>crypt32_No.rc</file> + <file>crypt32_Pt.rc</file> + <file>crypt32_Ro.rc</file> + <file>crypt32_Sv.rc</file> + <file>version.rc</file>  <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Removed: trunk/reactos/dll/win32/crypt32/crypt32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.rc (removed) @@ -1,34 +1,0 @@ -/* - * crypt32 dll resources - * - * Copyright (C) 2006 Juan Lang - * - * 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 "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "cryptres.h" - -#include "version.rc" - -#include "crypt32_De.rc" -#include "crypt32_En.rc" -#include "crypt32_Fr.rc" -#include "crypt32_Ko.rc" -#include "crypt32_Nl.rc" -#include "crypt32_No.rc" -#include "crypt32_Pt.rc" -#include "crypt32_Sv.rc" Modified: trunk/reactos/dll/win32/crypt32/crypt32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.spec [iso-8859-1] Sat Jul 4 15:41:32 2009 @@ -20,6 +20,7 @@ @ stdcall CertCreateCTLContext(long ptr long) @ stdcall CertCreateCertificateChainEngine(ptr ptr) @ stdcall CertCreateCertificateContext(long ptr long) +@ stdcall CertCreateContext(long long ptr long long ptr) @ stdcall CertCreateSelfSignCertificate(long ptr long ptr ptr ptr ptr ptr) @ stdcall CertDeleteCRLFromStore(ptr) @ stdcall CertDeleteCTLFromStore(ptr) @@ -162,7 +163,7 @@ @ stdcall CryptQueryObject(long ptr long long long ptr ptr ptr ptr ptr ptr) @ stdcall CryptRegisterDefaultOIDFunction(long str long wstr) @ stdcall CryptRegisterOIDFunction(long str str wstr str) -@ stub CryptRegisterOIDInfo +@ stdcall CryptRegisterOIDInfo(ptr long) @ stdcall CryptSIPAddProvider(ptr) @ stdcall CryptSIPCreateIndirectData(ptr ptr ptr) @ stdcall CryptSIPGetSignedDataMsg(ptr ptr long ptr ptr) Modified: trunk/reactos/dll/win32/crypt32/crypt32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_De.rc [iso-8859-1] Sat Jul 4 15:41:32 2009 @@ -18,6 +18,8 @@ * 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 "cryptres.h" LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -239,5 +241,3 @@ IDS_NETSCAPE_SMIME_CA "S/MIME ZertifikationsautoritÃ¤t" IDS_NETSCAPE_SIGN_CA "ZertifikationsautoritÃ¤t der Signatur" } - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/crypt32/crypt32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_En.rc [iso-8859-1] Sat Jul 4 15:41:32 2009 @@ -17,6 +17,8 @@ * 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 "cryptres.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/crypt32/crypt32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_Fr.rc [iso-8859-1] Sat Jul 4 15:41:32 2009 @@ -2,6 +2,7 @@ * crypt32 dll French resources * * Copyright 2006-2009 Jonathan Ernst + * Copyright 2009 FrÃ©dÃ©ric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,221 +19,225 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - IDS_AUTHORITY_KEY_ID "Identifiant de l'authorité de la clé" - IDS_KEY_ATTRIBUTES "Attributs de la clé" - IDS_KEY_USAGE_RESTRICTION "Restrictions de l'utilisation de la clé" - IDS_SUBJECT_ALT_NAME "Subject Alternative Name" - IDS_ISSUER_ALT_NAME "Issuer Alternative Name" - IDS_BASIC_CONSTRAINTS "Basic Constraints" - IDS_KEY_USAGE "Utilisation de la clé" - IDS_CERT_POLICIES "Certificate Policies" - IDS_SUBJECT_KEY_IDENTIFIER "Subject Key Identifier" - IDS_CRL_REASON_CODE "CRL Reason Code" - IDS_CRL_DIST_POINTS "CRL Distribution Points" - IDS_ENHANCED_KEY_USAGE "Enhanced Key Usage" - IDS_AUTHORITY_INFO_ACCESS "Authority Information Access" - IDS_CERT_EXTENSIONS "Certificate Extensions" - IDS_NEXT_UPDATE_LOCATION "Next Update Location" - IDS_YES_OR_NO_TRUST "Yes or No Trust" - IDS_EMAIL_ADDRESS "Email Address" - IDS_UNSTRUCTURED_NAME "Unstructured Name" - IDS_CONTENT_TYPE "Content Type" - IDS_MESSAGE_DIGEST "Message Digest" - IDS_SIGNING_TIME "Signing Time" - IDS_COUNTER_SIGN "Counter Sign" - IDS_CHALLENGE_PASSWORD "Challenge Password" - IDS_UNSTRUCTURED_ADDRESS "Unstructured Address" - IDS_SMIME_CAPABILITIES "SMIME Capabilities" - IDS_PREFER_SIGNED_DATA "Prefer Signed Data" - IDS_CPS "CPS" + IDS_AUTHORITY_KEY_ID "Identifiant de l'autoritÃ© de la clÃ©" + IDS_KEY_ATTRIBUTES "Attributs de la clÃ©" + IDS_KEY_USAGE_RESTRICTION "Restrictions de l'utilisation de la clÃ©" + IDS_SUBJECT_ALT_NAME "Nom alternatif du sujet" + IDS_ISSUER_ALT_NAME "Nom alternatif de l'Ã©metteur" + IDS_BASIC_CONSTRAINTS "Contraintes de base" + IDS_KEY_USAGE "Utilisation de la clÃ©" + IDS_CERT_POLICIES "Politiques de certificats" + IDS_SUBJECT_KEY_IDENTIFIER "Identifiant de clÃ© du sujet" + IDS_CRL_REASON_CODE "Code de raison pour la LRC" + IDS_CRL_DIST_POINTS "Points de distribution de LRC" + IDS_ENHANCED_KEY_USAGE "Utilisation complÃ©mentaire de la clÃ©" + IDS_AUTHORITY_INFO_ACCESS "AccÃ¨s aux informations de l'autoritÃ©" + IDS_CERT_EXTENSIONS "Extensions de certificats" + IDS_NEXT_UPDATE_LOCATION "Emplacement de la mise Ã jour suivante" + IDS_YES_OR_NO_TRUST "Confiance Oui ou Non" + IDS_EMAIL_ADDRESS "Adresse Ã©lectronique" + IDS_UNSTRUCTURED_NAME "Nom non structurÃ©" + IDS_CONTENT_TYPE "Type de contenu" + IDS_MESSAGE_DIGEST "Empreinte du message" + IDS_SIGNING_TIME "Heure de la signature" + IDS_COUNTER_SIGN "Contresignature" + IDS_CHALLENGE_PASSWORD "Mot de passe dÃ©fi" + IDS_UNSTRUCTURED_ADDRESS "Adresse non structurÃ©e" + IDS_SMIME_CAPABILITIES "Aptitudes SMIME" + IDS_PREFER_SIGNED_DATA "PrÃ©fÃ©rer les donnÃ©es signÃ©es" + IDS_CPS "ÃnoncÃ© des pratiques de certification (CPS)" IDS_USER_NOTICE "Notice utilisateur" - IDS_OCSP "On-line Certificate Status Protocol" - IDS_CA_ISSUER "Certification Authority Issuer" - IDS_CERT_TEMPLATE_NAME "Certification Template Name" - IDS_CERT_TYPE "Certificate Type" + IDS_OCSP "Protocole de vÃ©rification en ligne de certificat" + IDS_CA_ISSUER "Ãmetteur de l'autoritÃ© de certification" + IDS_CERT_TEMPLATE_NAME "Nom de modÃ¨le de certification" + IDS_CERT_TYPE "Type de certificat" IDS_CERT_MANIFOLD "Certificate Manifold" IDS_NETSCAPE_CERT_TYPE "Type de certificat Netscape" IDS_NETSCAPE_BASE_URL "URL Netscape de base" - IDS_NETSCAPE_REVOCATION_URL "URL Netscape de révocation" - IDS_NETSCAPE_CA_REVOCATION_URL "URL Netscape de révocation du certificat" + IDS_NETSCAPE_REVOCATION_URL "URL Netscape de rÃ©vocation" + IDS_NETSCAPE_CA_REVOCATION_URL "URL Netscape de rÃ©vocation de l'AC" IDS_NETSCAPE_CERT_RENEWAL_URL "URL Netscape de renouvellement du certificat" - IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Policy URL" - IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName" + IDS_NETSCAPE_CA_POLICY_URL "URL Netscape des stratÃ©gies d'ACL" + IDS_NETSCAPE_SSL_SERVER_NAME "Nom du serveur SSL de Netscape" IDS_NETSCAPE_COMMENT "Commentaire Netscape" IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" - IDS_COUNTRY "Pays/Région" + IDS_COUNTRY "Pays/RÃ©gion" IDS_ORGANIZATION "Organisation" - IDS_ORGANIZATIONAL_UNIT "Unité d'organisation" + IDS_ORGANIZATIONAL_UNIT "UnitÃ© d'organisation" IDS_COMMON_NAME "Nom commun" - IDS_LOCALITY "Locality" - IDS_STATE_OR_PROVINCE "État ou province" + IDS_LOCALITY "LocalitÃ©" + IDS_STATE_OR_PROVINCE "Ãtat ou province" IDS_TITLE "Titre" - IDS_GIVEN_NAME "Nom donné" + IDS_GIVEN_NAME "Nom donnÃ©" IDS_INITIALS "Initiales" IDS_SUR_NAME "Nom de famille" - IDS_DOMAIN_COMPONENT "Domain Component" + IDS_DOMAIN_COMPONENT "Composant de domaine" IDS_STREET_ADDRESS "Adresse" - IDS_SERIAL_NUMBER "Numéro de série" + IDS_SERIAL_NUMBER "NumÃ©ro de sÃ©rie" IDS_CA_VERSION "Version du CA" - IDS_CROSS_CA_VERSION "Cross CA Version" - IDS_SERIALIZED_SIG_SERIAL_NUMBER "Serialized Signature Serial Number" + IDS_CROSS_CA_VERSION "Version de certification croisÃ©es d'AC" + IDS_SERIALIZED_SIG_SERIAL_NUMBER "NumÃ©ro de sÃ©rie de signature sÃ©rialisÃ©e" IDS_PRINCIPAL_NAME "Nom principal" - IDS_WINDOWS_PRODUCT_UPDATE "Mise à jour de Windows" - IDS_ENROLLMENT_NAME_VALUE_PAIR "Enrollment Name Value Pair" - IDS_OS_VERSION "Version du système d'exploitation" - IDS_ENROLLMENT_CSP "Enrollment CSP" - IDS_CRL_NUMBER "Numéro CRL" - IDS_DELTA_CRL_INDICATOR "Delta CRL Indicator" - IDS_ISSUING_DIST_POINT "Issuing Distribution Point" - IDS_FRESHEST_CRL "Freshest CRL" + IDS_WINDOWS_PRODUCT_UPDATE "Mise Ã jour de Windows" + IDS_ENROLLMENT_NAME_VALUE_PAIR "Paire nom/value d'enrÃ´lement" + IDS_OS_VERSION "Version du systÃ¨me d'exploitation" + IDS_ENROLLMENT_CSP "Fournisseur de service cryptographique (CSP) d'enrÃ´lement" + IDS_CRL_NUMBER "NumÃ©ro de la LRC" + IDS_DELTA_CRL_INDICATOR "Indicateur de delta-LRC" + IDS_ISSUING_DIST_POINT "Point de distribution d'Ã©mission" + IDS_FRESHEST_CRL "LRC la plus rÃ©cente" IDS_NAME_CONSTRAINTS "Contraintes de nom" - IDS_POLICY_MAPPINGS "Policy Mappings" - IDS_POLICY_CONSTRAINTS "Policy Constraints" - IDS_CROSS_CERT_DIST_POINTS "Cross-Certificate Distribution Points" - IDS_APPLICATION_POLICIES "Application Policies" - IDS_APPLICATION_POLICY_MAPPINGS "Application Policy Mappings" - IDS_APPLICATION_POLICY_CONSTRAINTS "Application Policy Constraints" - IDS_CMC_DATA "Données CMC" - IDS_CMC_RESPONSE "Réponse CMC" - IDS_UNSIGNED_CMC_REQUEST "Unsigned CMC Request" - IDS_CMC_STATUS_INFO "CMC Status Info" - IDS_CMC_EXTENSIONS "CMC Extensions" - IDS_CMC_ATTRIBUTES "CMC Attributes" - IDS_PKCS_7_DATA "Données PKCS 7" - IDS_PKCS_7_SIGNED "Signé avec PKCS 7" - IDS_PKCS_7_ENVELOPED "Enveloppé avec PKCS 7" - IDS_PKCS_7_SIGNED_ENVELOPED "Enveloppé et signé avec PKCS 7" - IDS_PKCS_7_DIGESTED "Haché avec PKCS 7" - IDS_PKCS_7_ENCRYPTED "Chiffré avec PKCS 7" - IDS_PREVIOUS_CA_CERT_HASH "Previous CA Certificate Hash" - IDS_CRL_VIRTUAL_BASE "Virtual Base CRL Number" - IDS_CRL_NEXT_PUBLISH "Next CRL Publish" + IDS_POLICY_MAPPINGS "Mappings de politiques" + IDS_POLICY_CONSTRAINTS "Contraintes de politiques" + IDS_CROSS_CERT_DIST_POINTS "Points de distribution de certificats croisÃ©s" + IDS_APPLICATION_POLICIES "Politiques applicatives" + IDS_APPLICATION_POLICY_MAPPINGS "Mappings de politiques applicatives" + IDS_APPLICATION_POLICY_CONSTRAINTS "Contraintes de politiques applicatives" + IDS_CMC_DATA "DonnÃ©es CMC" + IDS_CMC_RESPONSE "RÃ©ponse CMC" + IDS_UNSIGNED_CMC_REQUEST "RequÃªte CMC non signÃ©e" + IDS_CMC_STATUS_INFO "Informations sur le statut CMC" + IDS_CMC_EXTENSIONS "Extensions CMC" + IDS_CMC_ATTRIBUTES "Attributs CMC" + IDS_PKCS_7_DATA "DonnÃ©es PKCS 7" + IDS_PKCS_7_SIGNED "SignÃ© avec PKCS 7" + IDS_PKCS_7_ENVELOPED "EnveloppÃ© avec PKCS 7" + IDS_PKCS_7_SIGNED_ENVELOPED "EnveloppÃ© et signÃ© avec PKCS 7" + IDS_PKCS_7_DIGESTED "HachÃ© avec PKCS 7" + IDS_PKCS_7_ENCRYPTED "ChiffrÃ© avec PKCS 7" + IDS_PREVIOUS_CA_CERT_HASH "Empreinte prÃ©cÃ©dente du certificat de l'AC" + IDS_CRL_VIRTUAL_BASE "NumÃ©ro de LRC de base virtuelle" + IDS_CRL_NEXT_PUBLISH "Prochaine publication de LRC" IDS_CA_EXCHANGE "Certificat de chiffrement CA" - IDS_KEY_RECOVERY_AGENT "Key Recovery Agent" - IDS_CERTIFICATE_TEMPLATE "Certificate Template Information" - IDS_ENTERPRISE_ROOT_OID "Enterprise Root OID" + IDS_KEY_RECOVERY_AGENT "Agent de recouvrement de clÃ©" + IDS_CERTIFICATE_TEMPLATE "Informations sur le modÃ¨le de certificats" + IDS_ENTERPRISE_ROOT_OID "OID racine de l'entreprise" IDS_RDN_DUMMY_SIGNER "Signataire factice" - IDS_ARCHIVED_KEY_ATTR "Clé de chiffrement privée" - IDS_CRL_SELF_CDP "Published CRL Locations" - IDS_REQUIRE_CERT_CHAIN_POLICY "Enforce Certificate Chain Policy" - IDS_TRANSACTION_ID "Transaction Id" - IDS_SENDER_NONCE "Sender Nonce" - IDS_RECIPIENT_NONCE "Recipient Nonce" - IDS_REG_INFO "Reg Info" - IDS_GET_CERTIFICATE "Get Certificate" - IDS_GET_CRL "Get CRL" - IDS_REVOKE_REQUEST "Revoke Request" - IDS_QUERY_PENDING "Query Pending" - IDS_SORTED_CTL "Certificate Trust List" - IDS_ARCHIVED_KEY_CERT_HASH "Archived Key Certificate Hash" - IDS_PRIVATE_KEY_USAGE_PERIOD "Private Key Usage Period" - IDS_CLIENT_INFORMATION "Client Information" - IDS_SERVER_AUTHENTICATION "Server Authentication" - IDS_CLIENT_AUTHENTICATION "Client Authentication" - IDS_CODE_SIGNING "Code Signing" - IDS_SECURE_EMAIL "Secure Email" - IDS_TIME_STAMPING "Time Stamping" - IDS_MICROSOFT_TRUST_LIST_SIGNING "Microsoft Trust List Signing" - IDS_MICROSOFT_TIME_STAMPING "Microsoft Time Stamping" - IDS_IPSEC_END_SYSTEM "IP security end system" - IDS_IPSEC_TUNNEL "IP security tunnel termination" - IDS_IPSEC_USER "IP security user" - IDS_EFS "Encrypting File System" - IDS_WHQL_CRYPTO "Windows Hardware Driver Verification" - IDS_NT5_CRYPTO "Windows System Component Verification" - IDS_OEM_WHQL_CRYPTO "OEM Windows System Component Verification" - IDS_EMBEDDED_NT_CRYPTO "Embedded Windows System Component Verification" - IDS_KEY_PACK_LICENSES "Key Pack Licenses" - IDS_LICENSE_SERVER "License Server Verification" - IDS_SMART_CARD_LOGON "Smart Card Logon" - IDS_DIGITAL_RIGHTS "Digital Rights" - IDS_QUALIFIED_SUBORDINATION "Qualified Subordination" - IDS_KEY_RECOVERY "Récupération de clé" + IDS_ARCHIVED_KEY_ATTR "ClÃ© de chiffrement privÃ©e" + IDS_CRL_SELF_CDP "Emplacement des LRC publiÃ©es" + IDS_REQUIRE_CERT_CHAIN_POLICY "RequÃ©rir une polique de chaÃ®ne de certification" + IDS_TRANSACTION_ID "Identifiant de transaction" + IDS_SENDER_NONCE "Nonce de l'Ã©metteur" + IDS_RECIPIENT_NONCE "Nonce du rÃ©cepteur" + IDS_REG_INFO "Informations d'enregistrement" + IDS_GET_CERTIFICATE "Obtenir un certificat" + IDS_GET_CRL "Obtenir une LRC" + IDS_REVOKE_REQUEST "RÃ©voquer une requÃªte" + IDS_QUERY_PENDING "RequÃªte en attente" + IDS_SORTED_CTL "Liste de certificats de confiance" + IDS_ARCHIVED_KEY_CERT_HASH "Empreinte du certificat de clÃ© archivÃ©e" + IDS_PRIVATE_KEY_USAGE_PERIOD "PÃ©riode d'utilisation de la clÃ© privÃ©e" + IDS_CLIENT_INFORMATION "Informations sur le client" + IDS_SERVER_AUTHENTICATION "Authentification du serveur" + IDS_CLIENT_AUTHENTICATION "Authentification du client" + IDS_CODE_SIGNING "Signature de code" + IDS_SECURE_EMAIL "Messagerie sÃ©curisÃ©" + IDS_TIME_STAMPING "Horodatage" + IDS_MICROSOFT_TRUST_LIST_SIGNING "Signature de la liste de confiance Microsoft" + IDS_MICROSOFT_TIME_STAMPING "Horodatage Microsoft" + IDS_IPSEC_END_SYSTEM "SystÃ¨me terminal IPsec" + IDS_IPSEC_TUNNEL "Terminaison du tunnel IPsec" + IDS_IPSEC_USER "Utilisateur IPsec" + IDS_EFS "SystÃ¨me de fichiers chiffrÃ© (EFS)" + IDS_WHQL_CRYPTO "VÃ©rification des pilotes matÃ©riels de Windows" + IDS_NT5_CRYPTO "VÃ©rification des composants systÃ¨me de Windows" + IDS_OEM_WHQL_CRYPTO "VÃ©rification des composants systÃ¨me de Windows OEM" + IDS_EMBEDDED_NT_CRYPTO "VÃ©rification des composants systÃ¨me de Windows embarquÃ©" + IDS_KEY_PACK_LICENSES "Licences de jeux de clÃ©s" + IDS_LICENSE_SERVER "VÃ©rification du serveur de licence" + IDS_SMART_CARD_LOGON "Connexion avec carte Ã puce" + IDS_DIGITAL_RIGHTS "Droits numÃ©riques" + IDS_QUALIFIED_SUBORDINATION "Subordination conditionnelle" + IDS_KEY_RECOVERY "Recouvrement de clÃ©" IDS_DOCUMENT_SIGNING "Signature de document" - IDS_IPSEC_IKE_INTERMEDIATE "IP security IKE intermediate" - IDS_FILE_RECOVERY "Récupération de fichier" + IDS_IPSEC_IKE_INTERMEDIATE "IntermÃ©diaire IKE IPsec" + IDS_FILE_RECOVERY "Restauration de fichier" IDS_ROOT_LIST_SIGNER "Signataires de la liste racine" - IDS_ANY_APPLICATION_POLICIES "All application policies" - IDS_DS_EMAIL_REPLICATION "Directory Service Email Replication" - IDS_ENROLLMENT_AGENT "Certificate Request Agent" - IDS_LIFETIME_SIGNING "Lifetime Signing" - IDS_ANY_CERT_POLICY "All issuance policies" + IDS_ANY_APPLICATION_POLICIES "Toutes les politiques applicatives" + IDS_DS_EMAIL_REPLICATION "RÃ©plication de courriers Ã©lectroniques du service d'annuaire" + IDS_ENROLLMENT_AGENT "Agent de demande de certificat" + IDS_LIFETIME_SIGNING "Signature Ã vie" + IDS_ANY_CERT_POLICY "Toutes les politiques d'Ã©mission" } STRINGTABLE DISCARDABLE { - IDS_LOCALIZEDNAME_ROOT "Autorités de certification de confiance" + IDS_LOCALIZEDNAME_ROOT "AutoritÃ©s de certification de confiance" IDS_LOCALIZEDNAME_MY "Personnel" - IDS_LOCALIZEDNAME_CA "Autorités intermédiaires" + IDS_LOCALIZEDNAME_CA "AutoritÃ©s intermÃ©diaires" IDS_LOCALIZEDNAME_ADDRESSBOOK "Autres personnes" - IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Éditeurs de confiance" + IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Ãditeurs de confiance" } STRINGTABLE DISCARDABLE { - IDS_KEY_ID "KeyID=" - IDS_CERT_ISSUER "Certificate Issuer" - IDS_CERT_SERIAL_NUMBER "Certificate Serial Number=" - IDS_ALT_NAME_OTHER_NAME "Other Name=" - IDS_ALT_NAME_RFC822_NAME "Email Address=" - IDS_ALT_NAME_DNS_NAME "DNS Name=" - IDS_ALT_NAME_DIRECTORY_NAME "Directory Address" + IDS_KEY_ID "ID de clÃ© =" + IDS_CERT_ISSUER "Ãmetteur du certificat" + IDS_CERT_SERIAL_NUMBER "NumÃ©ro de sÃ©rie du certificat =" + IDS_ALT_NAME_OTHER_NAME "Autre nom =" + IDS_ALT_NAME_RFC822_NAME "Adresse Ã©lectronique =" + IDS_ALT_NAME_DNS_NAME "Nom DNS =" + IDS_ALT_NAME_DIRECTORY_NAME "Adresse du rÃ©pertoire" IDS_ALT_NAME_URL "URL=" - IDS_ALT_NAME_IP_ADDRESS "Adresse IP=" - IDS_ALT_NAME_MASK "Mask=" - IDS_ALT_NAME_REGISTERED_ID "Registered ID=" - IDS_USAGE_UNKNOWN "Unknown Key Usage" - IDS_SUBJECT_TYPE "Subject Type=" - IDS_SUBJECT_TYPE_CA "CA" - IDS_SUBJECT_TYPE_END_CERT "End Entity" - IDS_PATH_LENGTH "Path Length Constraint=" + IDS_ALT_NAME_IP_ADDRESS "Adresse IP =" + IDS_ALT_NAME_MASK "Masque =" + IDS_ALT_NAME_REGISTERED_ID "ID enregistrÃ© =" + IDS_USAGE_UNKNOWN "Utilisation de la clÃ© inconnue" + IDS_SUBJECT_TYPE "Type de sujet =" + IDS_SUBJECT_TYPE_CA "AC" + IDS_SUBJECT_TYPE_END_CERT "EntitÃ© terminale" + IDS_PATH_LENGTH "Contrainte de longueur de chemin =" IDS_PATH_LENGTH_NONE "Aucune" - IDS_INFO_NOT_AVAILABLE "Information Not Available" - IDS_AIA "Authority Info Access" - IDS_ACCESS_METHOD "Access Method=" + IDS_INFO_NOT_AVAILABLE "Informations non disponibles" + IDS_AIA "AccÃ¨s aux informations de l'autoritÃ©" + IDS_ACCESS_METHOD "MÃ©thode d'accÃ¨s =" IDS_ACCESS_METHOD_OCSP "OCSP" - IDS_ACCESS_METHOD_CA_ISSUERS "CA Issuers" - IDS_ACCESS_METHOD_UNKNOWN "Unknown Access Method" - IDS_ACCESS_LOCATION "Alternative Name" - IDS_CRL_DIST_POINT "CRL Distribution Point" - IDS_CRL_DIST_POINT_NAME "Distribution Point Name" - IDS_CRL_DIST_POINT_FULL_NAME "Full Name" - IDS_CRL_DIST_POINT_RDN_NAME "RDN Name" - IDS_CRL_DIST_POINT_REASON "CRL Reason=" - IDS_CRL_DIST_POINT_ISSUER "CRL Issuer" - IDS_REASON_KEY_COMPROMISE "Key Compromise" - IDS_REASON_CA_COMPROMISE "CA Compromise" - IDS_REASON_AFFILIATION_CHANGED "Affiliation Changed" - IDS_REASON_SUPERSEDED "Superseded" - IDS_REASON_CESSATION_OF_OPERATION "Operation Ceased" - IDS_REASON_CERTIFICATE_HOLD "Certificate Hold" - IDS_FINANCIAL_CRITERIA "Financial Information=" - IDS_FINANCIAL_CRITERIA_AVAILABLE "Available" - IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "Not Available" - IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Meets Criteria=" + IDS_ACCESS_METHOD_CA_ISSUERS "Ãmetteurs de l'AC" + IDS_ACCESS_METHOD_UNKNOWN "MÃ©thode d'accÃ¨s inconnue" + IDS_ACCESS_LOCATION "Nom alternatif" + IDS_CRL_DIST_POINT "Point de distribution de LRC" + IDS_CRL_DIST_POINT_NAME "Nom du point de distribution" + IDS_CRL_DIST_POINT_FULL_NAME "Nom complet" + IDS_CRL_DIST_POINT_RDN_NAME "Nom distinguÃ© relatif (RDN)" + IDS_CRL_DIST_POINT_REASON "Raison de la LRC =" + IDS_CRL_DIST_POINT_ISSUER "Ãmetteur de la LRC" + IDS_REASON_KEY_COMPROMISE "ClÃ© compromise" + IDS_REASON_CA_COMPROMISE "AC compromise" + IDS_REASON_AFFILIATION_CHANGED "Affiliation modifiÃ©e" + IDS_REASON_SUPERSEDED "SupplantÃ©" + IDS_REASON_CESSATION_OF_OPERATION "Cessation de opÃ©rations" + IDS_REASON_CERTIFICATE_HOLD "Certificat suspendu" + IDS_FINANCIAL_CRITERIA "Informations financiÃ¨res =" + IDS_FINANCIAL_CRITERIA_AVAILABLE "Disponible" + IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "Non disponible" + IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Respecte les critÃ¨res =" IDS_YES "Oui" IDS_NO "Non" - IDS_DIGITAL_SIGNATURE "Signature numérique" - IDS_NON_REPUDIATION "Non-répudiation" - IDS_KEY_ENCIPHERMENT "Key Encipherment" - IDS_DATA_ENCIPHERMENT "Data Encipherment" - IDS_KEY_AGREEMENT "Key Agreement" - IDS_CERT_SIGN "Certificate Signing" - IDS_OFFLINE_CRL_SIGN "Off-line CRL Signing" - IDS_CRL_SIGN "CRL Signing" + IDS_DIGITAL_SIGNATURE "Signature numÃ©rique" + IDS_NON_REPUDIATION "Non-rÃ©pudiation" + IDS_KEY_ENCIPHERMENT "Chiffrement de la clÃ©" + IDS_DATA_ENCIPHERMENT "Chiffrement de donnÃ©es" + IDS_KEY_AGREEMENT "Accord sur la clÃ©" + IDS_CERT_SIGN "Signature de certificat" + IDS_OFFLINE_CRL_SIGN "Signature de LRC hors-ligne" + IDS_CRL_SIGN "Signature de LRC" IDS_ENCIPHER_ONLY "Chiffrement seul" - IDS_DECIPHER_ONLY "Déchiffrement seul" - IDS_NETSCAPE_SSL_CLIENT "SSL Client Authentication" - IDS_NETSCAPE_SSL_SERVER "SSL Server Authentication" + IDS_DECIPHER_ONLY "DÃ©chiffrement seul" + IDS_NETSCAPE_SSL_CLIENT "Authentification de client SSL" + IDS_NETSCAPE_SSL_SERVER "Authentification de serveur SSL" IDS_NETSCAPE_SMIME "S/MIME" IDS_NETSCAPE_SIGN "Signature" - IDS_NETSCAPE_SSL_CA "SSL CA" - IDS_NETSCAPE_SMIME_CA "S/MIME CA" + IDS_NETSCAPE_SSL_CA "AC SSL" + IDS_NETSCAPE_SMIME_CA "AC S/MIME" IDS_NETSCAPE_SIGN_CA "Signature CA" } Modified: trunk/reactos/dll/win32/crypt32/crypt32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_Ko.rc [iso-8859-1] Sat Jul 4 15:41:32 2009 @@ -18,6 +18,8 @@ * 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 "cryptres.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/crypt32/crypt32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_Nl.rc [iso-8859-1] Sat Jul 4 15:41:32 2009 @@ -17,6 +17,8 @@ * 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 "cryptres.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/crypt32/crypt32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_No.rc [iso-8859-1] Sat Jul 4 15:41:32 2009 @@ -17,6 +17,8 @@ * 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 "cryptres.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/crypt32/crypt32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_Pt.rc [iso-8859-1] Sat Jul 4 15:41:32 2009 @@ -17,6 +17,8 @@ * 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 "cryptres.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL Added: trunk/reactos/dll/win32/crypt32/crypt32_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_Ro.rc (added) +++ trunk/reactos/dll/win32/crypt32/crypt32_Ro.rc [iso-8859-1] Sat Jul 4 15:41:32 2009 @@ -1,0 +1,243 @@ +/* + * crypt32 dll Romanian resources + * + * Copyright (C) 2009 Paul Chitescu + * + * 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 "cryptres.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_AUTHORITY_KEY_ID "Identificatorul cheii autoritÄÈii" + IDS_KEY_ATTRIBUTES "Atributele cheii" + IDS_KEY_USAGE_RESTRICTION "RestricÈii de folosire a cheii" + IDS_SUBJECT_ALT_NAME "Nume alternativ al subiectului" + IDS_ISSUER_ALT_NAME "Nume alternativ al emitentului" + IDS_BASIC_CONSTRAINTS "ConstrÃ¢ngeri de bazÄ" + IDS_KEY_USAGE "Folosirea cheii" + IDS_CERT_POLICIES "Politicile certificatului" + IDS_SUBJECT_KEY_IDENTIFIER "Identificatorul subiectului cheii" + IDS_CRL_REASON_CODE "Codul motivului CRL" + IDS_CRL_DIST_POINTS "Puncte de distribuire CRL" + IDS_ENHANCED_KEY_USAGE "Extensii de folosirea a cheii" + IDS_AUTHORITY_INFO_ACCESS "Acces la informaÈiile de autoritate" + IDS_CERT_EXTENSIONS "Extensiile certificatului" + IDS_NEXT_UPDATE_LOCATION "UrmÄtoarea locaÈie de actualizare" + IDS_YES_OR_NO_TRUST "Ãncredere Da sau Nu" + IDS_EMAIL_ADDRESS "AdresÄ de e-mail" + IDS_UNSTRUCTURED_NAME "Nume nestructurat" + IDS_CONTENT_TYPE "Tipul conÈinutului" + IDS_MESSAGE_DIGEST "Rezumatul mesajului" + IDS_SIGNING_TIME "Momentul semnÄrii" + IDS_COUNTER_SIGN "Contrasemnat" + IDS_CHALLENGE_PASSWORD "Parola de provocare" + IDS_UNSTRUCTURED_ADDRESS "AdresÄ nestructuratÄ" + IDS_SMIME_CAPABILITIES "CapabilitÄÈi S/MIME" + IDS_PREFER_SIGNED_DATA "PreferÄ datele semnate" + IDS_CPS "CPS" + IDS_USER_NOTICE "NotiÈÄ utilizator" + IDS_OCSP "Protocol online de verificare a stÄrii certificatului" + IDS_CA_ISSUER "Autoritatea de certificare emitentÄ" + IDS_CERT_TEMPLATE_NAME "Numele Èablonului de certificat" + IDS_CERT_TYPE "Tipul certificatului" + IDS_CERT_MANIFOLD "Ramurile certificatului" + IDS_NETSCAPE_CERT_TYPE "Tipul certificatului Netscape" + IDS_NETSCAPE_BASE_URL "URL-ul de bazÄ Netscape" + IDS_NETSCAPE_REVOCATION_URL "URL-ul de revocare Netscape" + IDS_NETSCAPE_CA_REVOCATION_URL "URL-ul de revocare a CA Netscape" + IDS_NETSCAPE_CERT_RENEWAL_URL "URL-ul de Ã®nnoire a certificatului Netscape" + IDS_NETSCAPE_CA_POLICY_URL "URL-ul politicii CA Netscape" + IDS_NETSCAPE_SSL_SERVER_NAME "Nume server SSL Netscape" + IDS_NETSCAPE_COMMENT "Comentariul Netscape" + IDS_SPC_SP_AGENCY_INFO "InformaÈiiAgenÈieSpcSp" + IDS_SPC_FINANCIAL_CRITERIA "CriteriiFinanciareSpc" + IDS_SPC_MINIMAL_CRITERIA "CriteriiMinimaleSpc" + IDS_COUNTRY "Èara/regiunea" + IDS_ORGANIZATION "OrganizaÈia" + IDS_ORGANIZATIONAL_UNIT "Unitatea organizaÈionalÄ" + IDS_COMMON_NAME "Nume uzual" + IDS_LOCALITY "Localitatea" + IDS_STATE_OR_PROVINCE "Statul sau provincia" + IDS_TITLE "Titlul" + IDS_GIVEN_NAME "Prenume" + IDS_INITIALS "IniÈiale" + IDS_SUR_NAME "Nume" + IDS_DOMAIN_COMPONENT "ComponentÄ de domeniu" + IDS_STREET_ADDRESS "Adresa" + IDS_SERIAL_NUMBER "NumÄr de serie" + IDS_CA_VERSION "Versiunea CA" + IDS_CROSS_CA_VERSION "Versiunea Ã®ncruciÈatÄ CA" + IDS_SERIALIZED_SIG_SERIAL_NUMBER "NumÄr de serie al semnÄturii serializate" + IDS_PRINCIPAL_NAME "Nume principal" + IDS_WINDOWS_PRODUCT_UPDATE "Actualizarea produsului Windows" + IDS_ENROLLMENT_NAME_VALUE_PAIR "Pereche nume-valoare de Ã®nscriere" + IDS_OS_VERSION "Versiunea sistemului de operare" + IDS_ENROLLMENT_CSP "CSP de Ã®nscriere" + IDS_CRL_NUMBER "NumÄrul CRL" + IDS_DELTA_CRL_INDICATOR "Indicator diferenÈÄ CRL" + IDS_ISSUING_DIST_POINT "Punct de distribuÈie emitent" + IDS_FRESHEST_CRL "Cel mai proaspÄt CRL" + IDS_NAME_CONSTRAINTS "ConstrÃ¢ngeri de nume" + IDS_POLICY_MAPPINGS "MapÄri de politicÄ" + IDS_POLICY_CONSTRAINTS "ConstrÃ¢ngeri de politicÄ" + IDS_CROSS_CERT_DIST_POINTS "Puncte Ã®ncruciÈate de distribuÈie certificate" + IDS_APPLICATION_POLICIES "Politici de aplicaÈie" + IDS_APPLICATION_POLICY_MAPPINGS "MapÄri de politicÄ aplicaÈie" + IDS_APPLICATION_POLICY_CONSTRAINTS "ConstrÃ¢ngeri de politicÄ aplicaÈie" + IDS_CMC_DATA "Date CMC" + IDS_CMC_RESPONSE "RÄspuns CMC" + IDS_UNSIGNED_CMC_REQUEST "Cerere CMC nesemnatÄ" + IDS_CMC_STATUS_INFO "InformaÈii de stare CMC" + IDS_CMC_EXTENSIONS "Extensii CMC" + IDS_CMC_ATTRIBUTES "Atribute CMC" + IDS_PKCS_7_DATA "Date PKCS 7" + IDS_PKCS_7_SIGNED "PKCS 7 semnat" + IDS_PKCS_7_ENVELOPED "PKCS 7 Ã®ncapsulat" + IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 semnat Èi Ã®ncapsulat" + IDS_PKCS_7_DIGESTED "PKCS 7 rezumat" + IDS_PKCS_7_ENCRYPTED "PKCS 7 criptat" + IDS_PREVIOUS_CA_CERT_HASH "Rezumatul certificatului CA anterior" + IDS_CRL_VIRTUAL_BASE "Baza virtualÄ a numerelor CRL" + IDS_CRL_NEXT_PUBLISH "UrmÄtorul editor CRL" + IDS_CA_EXCHANGE "Certificat de criptare CA" + IDS_KEY_RECOVERY_AGENT "Agent de recuperare a cheilor" + IDS_CERTIFICATE_TEMPLATE "Èablon de informaÈii de certificat" + IDS_ENTERPRISE_ROOT_OID "OID rÄdÄcinÄ al Ã®ntreprinderii" + IDS_RDN_DUMMY_SIGNER "Semnatar implicit" + IDS_ARCHIVED_KEY_ATTR "Cheie privatÄ criptatÄ" + IDS_CRL_SELF_CDP "LocaÈii CRL publicate" + IDS_REQUIRE_CERT_CHAIN_POLICY "Impune politica de certificare Ã®n lanÈ" + IDS_TRANSACTION_ID "Identificator de tranzacÈie" + IDS_SENDER_NONCE "Identificator unic al expeditorului" + IDS_RECIPIENT_NONCE "Identificator unic al destinatarului" + IDS_REG_INFO "InformaÈii de Ã®nregistrare" + IDS_GET_CERTIFICATE "ObÈinere certificat" + IDS_GET_CRL "ObÈinere CRL" + IDS_REVOKE_REQUEST "Cerere de revocare" + IDS_QUERY_PENDING "Interogare Ã®n curs" + IDS_SORTED_CTL "Lista certificatelor de Ã®ncredere" + IDS_ARCHIVED_KEY_CERT_HASH "Rezumatul certificatului cheii arhivate" + IDS_PRIVATE_KEY_USAGE_PERIOD "Perioada de folosire a cheii private" + IDS_CLIENT_INFORMATION "InformaÈii client" + IDS_SERVER_AUTHENTICATION "Autentificare server" + IDS_CLIENT_AUTHENTICATION "Autentificare client" + IDS_CODE_SIGNING "Semnarea codului" + IDS_SECURE_EMAIL "E-mail securizat" + IDS_TIME_STAMPING "Marcare temporalÄ" + IDS_MICROSOFT_TRUST_LIST_SIGNING "Semnare listÄ de Ã®ncredere Microsoft" + IDS_MICROSOFT_TIME_STAMPING "Marcare temporalÄ Microsoft" + IDS_IPSEC_END_SYSTEM "Sistem terminal de securitate IP" + IDS_IPSEC_TUNNEL "CapÄt de tunel de securitate IP" + IDS_IPSEC_USER "Utilizator de securitate IP" + IDS_EFS "Sistem de fiÈiere criptat" + IDS_WHQL_CRYPTO "Verificarea driverelor hardware Windows" + IDS_NT5_CRYPTO "Verificarea componentelor sistem Windows" + IDS_OEM_WHQL_CRYPTO "Verificarea componentelor sistem Windows OEM" + IDS_EMBEDDED_NT_CRYPTO "Verificarea componentelor sistem Windows Embedded" + IDS_KEY_PACK_LICENSES "LicenÈiere pachet de chei" + IDS_LICENSE_SERVER "Verificarea serverului de licenÈÄ" + IDS_SMART_CARD_LOGON "Log on cu Smart Card" + IDS_DIGITAL_RIGHTS "Drepturi digitale" + IDS_QUALIFIED_SUBORDINATION "Subordonare calificatÄ" + IDS_KEY_RECOVERY "Recuperare de chei" + IDS_DOCUMENT_SIGNING "Semnare de documente" + IDS_IPSEC_IKE_INTERMEDIATE "Intermediar IKE de securitate IP" + IDS_FILE_RECOVERY "Recuperare de fiÈiere" + IDS_ROOT_LIST_SIGNER "Semnatarul listei rÄdÄcinÄ" + IDS_ANY_APPLICATION_POLICIES "Toate politicile de aplicaÈie" + IDS_DS_EMAIL_REPLICATION "Replicarea serviciilor repertoar de e-mail" + IDS_ENROLLMENT_AGENT "Agent de cerere de certificate" + IDS_LIFETIME_SIGNING "Semnare pe toatÄ durata vieÈii" + IDS_ANY_CERT_POLICY "Toate politicile de emitere" +} + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALIZEDNAME_ROOT "AutoritÄÈi de Ã®ncredere de bazÄ de certificare" + IDS_LOCALIZEDNAME_MY "Personale" + IDS_LOCALIZEDNAME_CA "AutoritÄÈi intermediare de certificare" + IDS_LOCALIZEDNAME_ADDRESSBOOK "Alte persoane" + IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Editor de Ã®ncredere" +} + +STRINGTABLE DISCARDABLE +{ + IDS_KEY_ID "KeyID=" + IDS_CERT_ISSUER "Emitentul certificatului" + IDS_CERT_SERIAL_NUMBER "NumÄrul de serie al certificatului=" + IDS_ALT_NAME_OTHER_NAME "Nume alternativ=" + IDS_ALT_NAME_RFC822_NAME "Addresa de e-mail=" + IDS_ALT_NAME_DNS_NAME "Nume de DNS=" + IDS_ALT_NAME_DIRECTORY_NAME "Adresa de repertoar" + IDS_ALT_NAME_URL "URL=" + IDS_ALT_NAME_IP_ADDRESS "Adresa IP=" + IDS_ALT_NAME_MASK "Masca=" + IDS_ALT_NAME_REGISTERED_ID "Identificator Ã®nregistrat=" + IDS_USAGE_UNKNOWN "Folosire necunoscutÄ a cheii" + IDS_SUBJECT_TYPE "Tipul subiectului=" + IDS_SUBJECT_TYPE_CA "CA" + IDS_SUBJECT_TYPE_END_CERT "Entitate finalÄ" + IDS_PATH_LENGTH "ConstrÃ¢ngere de lungime a cÄii=" + IDS_PATH_LENGTH_NONE "FÄrÄ" + IDS_INFO_NOT_AVAILABLE "InformaÈie indisponibilÄ" + IDS_AIA "Acces la informaÈiile de autoritate" + IDS_ACCESS_METHOD "Metoda de acces=" + IDS_ACCESS_METHOD_OCSP "OCSP" + IDS_ACCESS_METHOD_CA_ISSUERS "EmitenÈi CA" + IDS_ACCESS_METHOD_UNKNOWN "MetodÄ de acces necunoscutÄ" + IDS_ACCESS_LOCATION "Nume alternativ" + IDS_CRL_DIST_POINT "Punct de distribuÈie CRL" + IDS_CRL_DIST_POINT_NAME "Numele punctului de distribuÈie" + IDS_CRL_DIST_POINT_FULL_NAME "Nume complet" + IDS_CRL_DIST_POINT_RDN_NAME "Nume RDN" + IDS_CRL_DIST_POINT_REASON "Motiv CRL=" + IDS_CRL_DIST_POINT_ISSUER "Emitent CRL" + IDS_REASON_KEY_COMPROMISE "Cheia compromisÄ" + IDS_REASON_CA_COMPROMISE "CA compromisÄ" + IDS_REASON_AFFILIATION_CHANGED "Afiliere schimbatÄ" + IDS_REASON_SUPERSEDED "Ãnlocuit" + IDS_REASON_CESSATION_OF_OPERATION "Ãncetarea operaÈiunilor" + IDS_REASON_CERTIFICATE_HOLD "Certificat reÈinut" + IDS_FINANCIAL_CRITERIA "InformaÈia financiarÄ=" + IDS_FINANCIAL_CRITERIA_AVAILABLE "DisponibilÄ" + IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "IndisponibilÄ" + IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "ÃndeplineÈte criteriul=" + IDS_YES "Da" + IDS_NO "Nu" + IDS_DIGITAL_SIGNATURE "SemnÄturÄ digitalÄ" + IDS_NON_REPUDIATION "Non-repudiere" + IDS_KEY_ENCIPHERMENT "Cifrare cheie" + IDS_DATA_ENCIPHERMENT "Cifrare date" + IDS_KEY_AGREEMENT "ÃnÈelegere la cheie" + IDS_CERT_SIGN "Semnare certificat" + IDS_OFFLINE_CRL_SIGN "Semnare CRL offline" + IDS_CRL_SIGN "Semnare CRL" + IDS_ENCIPHER_ONLY "Doar cifreazÄ" + IDS_DECIPHER_ONLY "Doar descifreazÄ" + IDS_NETSCAPE_SSL_CLIENT "Autentificare client SSL" + IDS_NETSCAPE_SSL_SERVER "Autentificare server SSL" + IDS_NETSCAPE_SMIME "S/MIME" + IDS_NETSCAPE_SIGN "SemnÄturÄ" + IDS_NETSCAPE_SSL_CA "SSL CA" + IDS_NETSCAPE_SMIME_CA "S/MIME CA" + IDS_NETSCAPE_SIGN_CA "SemnÄturÄ CA" +} Propchange: trunk/reactos/dll/win32/crypt32/crypt32_Ro.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/crypt32/crypt32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_Sv.rc [iso-8859-1] Sat Jul 4 15:41:32 2009 @@ -17,6 +17,9 @@ * 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 "cryptres.h" + #pragma code_page(65001) LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL @@ -160,5 +163,3 @@ IDS_FILE_RECOVERY "File Recovery" IDS_ROOT_LIST_SIGNER "Root List Signer" } - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/crypt32/cryptres.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cryptres… ============================================================================== --- trunk/reactos/dll/win32/crypt32/cryptres.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/cryptres.h [iso-8859-1] Sat Jul 4 15:41:32 2009 @@ -17,6 +17,8 @@ */ #ifndef __WINE_CRYPTRES_H__ #define __WINE_CRYPTRES_H__ + +#include <windef.h> #define IDS_AUTHORITY_KEY_ID 1000 #define IDS_KEY_ATTRIBUTES 1001 Modified: trunk/reactos/dll/win32/crypt32/decode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/decode.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/decode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/decode.c [iso-8859-1] Sat Jul 4 15:41:32 2009 @@ -523,7 +523,7 @@ for (i = 0; i < cItem; i++) { bytesNeeded += items[i].size; - structSize += items[i].minSize; + structSize = max( structSize, items[i].offset + items[i].minSize ); } if (pcbDecoded) *pcbDecoded = 1 + lenBytes + cbDecoded; Modified: trunk/reactos/dll/win32/crypt32/encode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/encode.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/encode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/encode.c [iso-8859-1] Sat Jul 4 15:41:32 2009 @@ -564,13 +564,12 @@ LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { - DWORD cCRLEntry = *(const DWORD *)pvStructInfo; DWORD bytesNeeded, dataLen, lenBytes, i; - const CRL_ENTRY *rgCRLEntry = *(const CRL_ENTRY *const *) - ((const BYTE *)pvStructInfo + sizeof(DWORD)); + const CRL_INFO *info = pvStructInfo; + const CRL_ENTRY *rgCRLEntry = info->rgCRLEntry; BOOL ret = TRUE; - for (i = 0, dataLen = 0; ret && i < cCRLEntry; i++) + for (i = 0, dataLen = 0; ret && i < info->cCRLEntry; i++) { DWORD size; @@ -594,7 +593,7 @@ *pbEncoded++ = ASN_SEQUENCEOF; CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); pbEncoded += lenBytes; - for (i = 0; i < cCRLEntry; i++) + for (i = 0; i < info->cCRLEntry; i++) { DWORD size = dataLen; @@ -659,7 +658,7 @@ } if (info->cCRLEntry) { - items[cItem].pvStructInfo = &info->cCRLEntry; + items[cItem].pvStructInfo = info; items[cItem].encodeFunc = CRYPT_AsnEncodeCRLEntries; cItem++; } Modified: trunk/reactos/dll/win32/crypt32/oid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/oid.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] Sat Jul 4 15:41:32 2009 @@ -662,6 +662,16 @@ } return TRUE; +} + +/*********************************************************************** + * CryptRegisterOIDInfo (CRYPT32.@) + */ +BOOL WINAPI CryptRegisterOIDInfo(PCCRYPT_OID_INFO pInfo, DWORD dwFlags) +{ + FIXME("(%p, %x): stub\n", pInfo, dwFlags ); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /***********************************************************************

1 0

← Newer
1
...
53
54
55
56
57
58
59
60
61
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2009